diff --git a/.github/scripts/check-google-java-format.sh b/.github/scripts/check-google-java-format.sh
new file mode 100755
index 0000000000..8e12296a74
--- /dev/null
+++ b/.github/scripts/check-google-java-format.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -u
+
+script_name=""
+
+case "$(uname -sr)" in
+
+   Darwin*)
+     script_name="google-java-format_darwin-arm64"
+     ;;
+
+   Linux*)
+     script_name="google-java-format_linux-x86-64"
+     ;;
+   *)
+     echo 'Unsupported OS'
+     exit 1
+     ;;
+esac
+
+JAVA_FILES=$(find . -name "*.java" -type f)
+
+invalid_files=0
+
+echo "Following files are formatted incorrectly:";
+# TODO: remove '--skip-reflowing-long-strings' once https://github.com/google/google-java-format/issues/566 is fixed
+for FILE in $JAVA_FILES; do
+  if [[ "$*" == *--fix* ]]; then
+    ./$script_name --skip-reflowing-long-strings --replace "$FILE" > /dev/null
+  else
+    ./$script_name --set-exit-if-changed --skip-reflowing-long-strings "$FILE" > /dev/null
+  fi
+  if [ $? -ne 0 ]; then
+    echo "$FILE"
+    ((invalid_files++))
+  fi
+done
+
+if [ "$invalid_files" -ne 0 ]; then
+  echo "Found $invalid_files incorrectly formatted files (listed above), run google-java-format to fix them.";
+  exit 1
+else
+   echo "All files are formatted correctly."
+fi
+
diff --git a/.github/scripts/download_reports.sh b/.github/scripts/download_reports.sh
deleted file mode 100644
index 79e93f818c..0000000000
--- a/.github/scripts/download_reports.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-TMPDIR="test"
-mkdir $TMPDIR
-
-REPO="allegro/hermes"
-BUILDS_FILE="builds.json"
-PAST_BUILDS="$TMPDIR/$BUILDS_FILE"
-
-UNIT_TEST_ARTIFACT="check-test-report"
-E2E_REPORT_ARTIFACT="integrationTest-test-report"
-
-gh run list --repo $REPO --branch master --workflow ci --json "status,databaseId" --limit 20 >> $PAST_BUILDS
-
-cd $TMPDIR
-
-jq -c '.[]' "$BUILDS_FILE" | while read i; do
-    STATUS=$(echo $i | jq '.status')
-    if [[ "$STATUS" == 'completed' ]]; then
-        continue
-    fi
-    RUN_ID=$(echo $i | jq '.databaseId')
-
-    echo "downloading results for run: $RUN_ID"
-    RUN_DIR=$RUN_ID
-
-    mkdir $RUN_DIR
-    echo "creating dir $RUN_DIR"
-    cd $RUN_DIR
-
-    mkdir $UNIT_TEST_ARTIFACT
-    cd $UNIT_TEST_ARTIFACT
-    gh run download --repo $REPO -n $UNIT_TEST_ARTIFACT $RUN_ID
-    echo "Downloaded unit test report"
-    cd ..
-
-    mkdir $E2E_REPORT_ARTIFACT
-    cd $E2E_REPORT_ARTIFACT
-    gh run download --repo $REPO -n $E2E_REPORT_ARTIFACT $RUN_ID
-    echo "Downloaded integrationTest report"
-
-    cd ../..
-done
diff --git a/.github/scripts/reporter.py b/.github/scripts/reporter.py
deleted file mode 100755
index 5e124b1471..0000000000
--- a/.github/scripts/reporter.py
+++ /dev/null
@@ -1,118 +0,0 @@
-import dataclasses
-import os
-import sys
-from typing import List, Set, Dict
-import xml.etree.ElementTree as ET
-
-
-@dataclasses.dataclass
-class TestResults:
-    failed: Set[str]
-    passed: Set[str]
-    run_id: str
-    test_cnt: int = 0
-    skipped_cnt: int = 0
-    failed_cnt: int = 0
-    error_cnt: int = 0
-
-
-def get_test_files(dir: str) -> List[str]:
-    files = [
-        os.path.join(dp, f)
-        for dp, dn, filenames in os.walk(dir)
-        for f in filenames
-        if os.path.splitext(f)[1] == '.xml'
-           and os.path.splitext(f)[0].startswith("TEST-")
-    ]
-    return files
-
-
-def parse_test_file(file: str, run_id: str) -> TestResults:
-    root = ET.parse(file).getroot()
-    result = TestResults(
-        skipped_cnt=int(root.get("skipped")),
-        test_cnt=int(root.get("tests")),
-        failed_cnt=int(root.get("failures")),
-        error_cnt=int(root.get("errors")),
-        failed=set(),
-        passed=set(),
-        run_id=run_id
-    )
-    name = root.get("name")
-    name = '.'.join(name.split('.')[4:])  # remove common prefix
-
-    for testcase in root.findall("testcase"):
-        testname = testcase.get("name")
-        test_failed = testcase.findall("failure")
-        if test_failed:
-            result.failed.add(f"{name}#{testname}")
-        else:
-            result.passed.add(f"{name}#{testname}")
-    return result
-
-
-def aggregate_results(test_dir: str, run_id: str) -> TestResults:
-    test_files = get_test_files(test_dir)
-    results = []
-    for test_file in test_files:
-        result = parse_test_file(test_file, run_id)
-        results.append(result)
-
-    agg = TestResults(set(), set(), run_id)
-
-    for result in results:
-        agg.test_cnt += result.test_cnt
-        agg.skipped_cnt += result.skipped_cnt
-        agg.error_cnt += result.error_cnt
-        agg.failed_cnt += result.failed_cnt
-        for fail in result.failed:
-            agg.failed.add(fail)
-        for pas in result.passed:
-            agg.passed.add(pas)
-    return agg
-
-
-def report(type: str, runs: List[TestResults]) -> str:
-    failed = {}
-    markdown = ""
-    for run in runs:
-        for fail in run.failed:
-            if fail in failed:
-                failed[fail]["count"] += 1
-                failed[fail]["runs"].append(run.run_id)
-            else:
-                failed[fail] = {"count": 1, "runs": [run.run_id]}
-    markdown += f"## {type} \n"
-    markdown += "| Test name | Fail count | Failed in runs |\n"
-    markdown += "|--|--|--|\n"
-    for k, v in sorted(failed.items(), key=lambda item: -item[1]["count"]):
-        markdown += f"| {k} | {v['count']} | {v['runs']} |\n"
-    markdown += "\n"
-    return markdown
-
-
-if __name__ == '__main__':
-    root = sys.argv[1]
-    print(f"Parsing tests results from directory: {root}")
-    run_dirs = [f.path for f in os.scandir(root) if f.is_dir()]
-    print(f"Found {len(run_dirs)} run dirs")
-    unittest_runs = []
-    e2e_runs = []
-
-    for run in run_dirs:
-        run_id = os.path.basename(os.path.normpath(run))
-        unit_test_dir = os.path.join(run, "check-test-report")
-        unit_test_results = aggregate_results(unit_test_dir, run_id)
-        unittest_runs.append(unit_test_results)
-
-        e2e_test_dir = os.path.join(run, "integrationTest-test-report")
-        e2e_test_results = aggregate_results(e2e_test_dir, run_id)
-        e2e_runs.append(e2e_test_results)
-
-    step_summary = "# Failing tests report\n"
-    step_summary += report("Unit tests", unittest_runs)
-    step_summary += report("Integration tests", e2e_runs)
-
-    result_file = os.environ["GITHUB_STEP_SUMMARY"]
-    with open(result_file, 'w') as f:
-        f.write(step_summary)
diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
deleted file mode 100644
index 8d99e40474..0000000000
--- a/.github/workflows/checkstyle.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Checkstyle
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  checkstyle:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: reviewdog/action-setup@v1
-        with:
-          reviewdog_version: latest
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: 'temurin'
-      - name: Run check style
-        # ignore lengthy console setup tasks
-        run: ./gradlew --continue clean checkstyleMain checkstyleTest checkstyleIntegration checkstyleJmh -PmaxCheckstyleWarnings=0 -x attachHermesConsole -x prepareIndexTemplate
-      - name: Run reviewdog
-        if: ${{ success() || failure() }}
-        env:
-          REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          for f in $(find . -regex '.*/build/reports/checkstyle/.*\.xml'); do
-            module_name=$(echo "$f" | cut -d "/" -f2)
-            reviewdog -f=checkstyle -level=warning -filter-mode=nofilter -reporter=github-check -name="checkstyle-$module_name" < $f
-          done
diff --git a/.github/workflows/ci-console.yml b/.github/workflows/ci-console.yml
deleted file mode 100644
index 628fa9a7ee..0000000000
--- a/.github/workflows/ci-console.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Console CI
-
-# Configured for all pushes and PRs for the sake of new console development on dev branches.
-# Later it could be changed to pushes and PRs only to master branch to match main CI config.
-on: [ push, pull_request ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./hermes-console-vue
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Run linter
-        run: yarn && yarn lint
-      - name: Run frontend tests
-        run: yarn test:unit
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 691ef82521..03e0af5fb5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,16 +2,40 @@ name: CI
 
 on:
   push:
-    branches: [ master, integration_tests_framework ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, integration_tests_framework ]
+    branches: [ master ]
 
 jobs:
+  console:
+    name: ci-console
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./hermes-console
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Run linter
+        run: yarn && yarn lint
+      - name: Run frontend tests
+        run: yarn test:unit
+      - name: Upload artifact
+        if: always() && github.ref == 'refs/heads/master'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ci-console
+          path: ./hermes-console/allure-results
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         tasks: [
+          # Add/remove task in Allure Report job also
           {alias: "unitTests", name: "check"},
           {alias: "integrationTests", name: "integrationTest"},
           {alias: "slowIntegrationTests", name: "slowIntegrationTest"},
@@ -20,22 +44,16 @@ jobs:
       fail-fast: false
     name: ${{ matrix.tasks.alias }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Build with Gradle
         run: ./gradlew assemble
       - name: Run task with Gradle
@@ -53,3 +71,61 @@ jobs:
         with:
           paths: '**/build/test-results/**/TEST-*.xml'
           show: fail, skip
+      - name: Upload artifact
+        if: always() && github.ref == 'refs/heads/master' && matrix.tasks.alias != 'benchmark'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.tasks.alias }}
+          path: build/allure-results
+
+  allureReport:
+    if: always() && github.ref == 'refs/heads/master'
+    name: Generate Allure Report
+    needs: [ build, console ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifact unitTests
+        uses: actions/download-artifact@v4
+        if: always()
+        with:
+          name: unitTests
+          path: allure-results
+      - name: Download artifact integrationTests
+        uses: actions/download-artifact@v4
+        if: always()
+        with:
+          name: integrationTests
+          path: allure-results
+      - name: Download artifact slowIntegrationTests
+        uses: actions/download-artifact@v4
+        if: always()
+        with:
+          name: slowIntegrationTests
+          path: allure-results
+      - name: Download artifact ci-console
+        uses: actions/download-artifact@v4
+        if: always()
+        with:
+          name: ci-console
+          path: allure-results
+      - name: Load test report history
+        uses: actions/checkout@v4
+        if: always()
+        continue-on-error: true
+        with:
+          ref: gh-pages
+          path: gh-pages
+      - name: Build test report
+        uses: simple-elf/allure-report-action@v1.9
+        if: always()
+        with:
+          gh_pages: gh-pages
+          allure_history: allure-history
+          allure_results: allure-results
+      - name: Publish test report
+        uses: peaceiris/actions-gh-pages@v4
+        if: always()
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages
+          publish_dir: allure-history
\ No newline at end of file
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 56c5ff5084..c43d90c2db 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,17 +35,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -70,4 +70,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/google-java-format.yml b/.github/workflows/google-java-format.yml
new file mode 100644
index 0000000000..2ec1c5bf8b
--- /dev/null
+++ b/.github/workflows/google-java-format.yml
@@ -0,0 +1,26 @@
+name: Google java format
+
+on:
+  workflow_dispatch:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.head_ref }}
+
+      - name: Download and run google java format
+        run: |
+          ls -la
+          curl -sSLO "https://github.com/google/google-java-format/releases/download/v$VERSION/google-java-format_linux-x86-64"
+          chmod a+x google-java-format_linux-x86-64
+          ./.github/scripts/check-google-java-format.sh
+        shell: bash
+        env:
+            VERSION: 1.23.0
+
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index d3c1263959..eda69f9d27 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -12,5 +12,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/markdown-links-check.yml b/.github/workflows/markdown-links-check.yml
index 6920411bd5..4d186efa1e 100644
--- a/.github/workflows/markdown-links-check.yml
+++ b/.github/workflows/markdown-links-check.yml
@@ -12,7 +12,7 @@ jobs:
   check-links:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           use-quiet-mode: 'yes'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c6485311cc..9d0bec195f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,15 +16,16 @@ jobs:
     environment: ci
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Release
         if: github.ref == 'refs/heads/master'
         run: ./gradlew release -Prelease.customPassword=${GITHUB_TOKEN} -Prelease.customUsername=${GITHUB_ACTOR} -Prelease.forceVersion=${FORCE_VERSION}
diff --git a/.github/workflows/test_report.yml b/.github/workflows/test_report.yml
deleted file mode 100644
index 2b52cbedb8..0000000000
--- a/.github/workflows/test_report.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: "Test report"
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  validation:
-    name: "Test report"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Grant execute permission for report downloader
-        run: chmod +x ./.github/scripts/download_reports.sh
-      - name: Download past reports
-        run: ./.github/scripts/download_reports.sh
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Aggregate reports
-        run: python ./.github/scripts/reporter.py "test"
diff --git a/.gitignore b/.gitignore
index d085ce8969..475005bac9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 build
 .gradle
 classes
-.idea
 *.iml
 *.ipr
 *.iws
@@ -39,3 +38,38 @@ scripts/lib/
 scripts/pip-selfcheck.json
 
 .DS_Store
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+.idea/artifacts
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml
new file mode 100644
index 0000000000..679f74ca17
--- /dev/null
+++ b/.idea/externalDependencies.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalDependencies">
+    <plugin id="google-java-format" min-version="1.23.0.0"/>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/google-java-format.xml b/.idea/google-java-format.xml
new file mode 100644
index 0000000000..8b57f4527a
--- /dev/null
+++ b/.idea/google-java-format.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GoogleJavaFormatSettings">
+    <option name="enabled" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000..4336a05b15
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="jakarta.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
+    <option name="myNullables">
+      <value>
+        <list size="17">
+          <item index="0" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="org.jspecify.nullness.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="5" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="10" class="java.lang.String" itemvalue="jakarta.annotation.Nullable" />
+          <item index="11" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="12" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="15" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="16" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="17">
+          <item index="0" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="1" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="2" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
+          <item index="3" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="6" class="java.lang.String" itemvalue="lombok.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="9" class="java.lang.String" itemvalue="org.jspecify.nullness.NonNull" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="13" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="14" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="15" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="16" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..35eb1ddfbb
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a5377d8bfe..262c86384e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,5 +27,5 @@ You can also use other *magic words* from [GitHub handbook](https://help.github.
 
 * use `spock` when writing new unit tests in all modules
 * when changing old tests use your best judgement as to when rewrite them to `spock`
-* use `TestNG` with defined environment in `integration` module
+* use `JUnit5` with defined environment in `integration-tests` module
 * prepend configuration options with module name, i.e. `frontend.` or `consumer.` when it applies to single module
diff --git a/README.md b/README.md
index 9b0545b9c9..eadb83bfd6 100644
--- a/README.md
+++ b/README.md
@@ -20,3 +20,40 @@ If you have any question or idea regarding the project, please feel free to reac
 ## License
 
 **hermes** is published under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
+
+## Development 
+
+### Code formatting
+For code formatting we use [google-java-format](https://github.com/google/google-java-format/tree/master).
+Following steps are required for optimal dev experience in IJ:
+
+1. Download [google-java-format plugin](https://plugins.jetbrains.com/plugin/8527-google-java-format)
+2. [Set custom VM options required for IJ plugin](https://github.com/google/google-java-format/tree/master?tab=readme-ov-file#intellij-jre-config)
+3. Go to `Settings > google-java-format` and click `Enable google java-format` (should be checked by default)
+4. Go to `Settings > Tools > Actions on Save` and enable `Reformat code` and `Optimize imports` for Java files
+
+Each save should automatically trigger reformat.
+
+If you want to debug the CLI check on macOS:
+
+```shell
+wget https://github.com/google/google-java-format/releases/download/v1.23.0/google-java-format_darwin-arm64
+chmod a+x google-java-format_darwin-arm64
+chmod a+x .github/scripts/check-google-java-format.sh
+./.github/scripts/check-google-java-format.sh                                                                                                                     
+```
+
+or if you are on Linux:
+
+```shell
+wget https://github.com/google/google-java-format/releases/download/v1.23.0/google-java-format_linux-x86-64
+chmod a+x google-java-format_linux-x86-64
+chmod a+x .github/scripts/check-google-java-format.sh
+./.github/scripts/check-google-java-format.sh        
+```
+
+You can also run the following command to fix formatting for the whole project:
+
+```shell
+./.github/scripts/check-google-java-format.sh --fix
+```
diff --git a/build.gradle b/build.gradle
index b89f19fe60..02f86f4e6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,6 @@ nexusPublishing {
 allprojects {
     apply plugin: 'java'
     apply plugin: 'groovy'
-    apply plugin: 'checkstyle'
 
     group = 'pl.allegro.tech.hermes'
     version = scmVersion.version
@@ -49,26 +48,28 @@ allprojects {
 
     project.ext.versions = [
             kafka             : '2.8.2',
-            guava             : '23.0',
-            jackson           : '2.15.2',
-            jersey            : '3.1.2',
-            jetty             : '11.0.15',
+            guava             : '33.1.0-jre',
+            jackson           : '2.17.0',
+            jersey            : '3.1.6',
+            jetty             : '12.0.8',
             curator           : '5.4.0',
-            dropwizard_metrics: '4.1.0',
-            micrometer_metrics: '1.11.1',
-            wiremock          : '3.0.1',
-            spock             : '2.4-M1-groovy-4.0',
-            groovy            : '4.0.12',
-            avro              : '1.9.1',
+            dropwizard_metrics: '4.2.25',
+            micrometer_metrics: '1.12.5',
+            wiremock          : '3.9.0',
+            spock             : '2.4-M4-groovy-4.0',
+            groovy            : '4.0.21',
+            avro              : '1.11.3',
             json2avro         : '0.2.14',
+            // TODO: newest version requires subject alternative name in a certificate during host verification, current test cert does not have a one
             okhttp            : '3.9.1',
-            undertow          : '2.0.29.Final',
-            spring_web        : '6.0.8',
-            failsafe          : '2.3.1',
-            junit_jupiter     : '5.9.1',
-            testcontainers    : '1.18.1',
-            spring            : '3.0.6',
-            assertj           : '3.24.2'
+            undertow          : '2.3.12.Final',
+            spring_web        : '6.1.6',
+            failsafe          : '2.4.4',
+            junit_jupiter     : '5.10.2',
+            testcontainers    : '1.19.8',
+            spring            : '3.2.4',
+            assertj           : '3.25.3',
+            allure            : '2.24.0'
     ]
 
     repositories {
@@ -77,15 +78,23 @@ allprojects {
 
     dependencies {
         implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.4'
-        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
+        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
+
+        // Allure Spock adapter
+        testImplementation(platform("io.qameta.allure:allure-bom:${versions.allure}"))
+        testImplementation("io.qameta.allure:allure-spock2")
+        testImplementation("io.qameta.allure:allure-junit-platform")
+
+        // Spock framework
+        testImplementation(platform("org.spockframework:spock-bom:${versions.spock}"))
+        testImplementation("org.spockframework:spock-core")
 
         testImplementation group: 'junit', name: 'junit', version: '4.11'
         testImplementation group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.10.0'
         testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: '1.0.2'
-        testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
+        testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.11.0'
         testImplementation group: 'org.assertj', name: 'assertj-core', version: versions.assertj
-        testImplementation group: 'com.jayway.awaitility', name: 'awaitility', version: '1.6.1'
-        testImplementation group: 'com.googlecode.catch-exception', name: 'catch-exception', version: '1.2.0'
+        testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.2.1'
 
         annotationProcessor group: 'org.springframework.boot', name: 'spring-boot-configuration-processor', version: versions.spring
     }
@@ -113,7 +122,7 @@ allprojects {
 }
 
 
-configure(subprojects - project(':integration')) {
+configure(subprojects - project(':integration-tests')) {
     apply plugin: 'jacoco'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
@@ -123,6 +132,8 @@ configure(subprojects - project(':integration')) {
         withSourcesJar()
     }
 
+    javadoc.options.addStringOption('Xdoclint:none', '-quiet')
+
     publishing {
         publications {
             mavenJava(MavenPublication) {
@@ -194,18 +205,6 @@ subprojects {
             events 'passed', 'skipped', 'failed'
         }
     }
-
-    tasks.withType(Checkstyle) {
-        reports {
-            xml.required = true
-            html.required = false
-        }
-    }
-
-    checkstyle {
-        toolVersion '10.3.4'
-        maxWarnings getIntProperty('maxCheckstyleWarnings', Integer.MAX_VALUE)
-    }
 }
 
 def getIntProperty(String name, int defaultValue) {
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
deleted file mode 100644
index 68ce4fd71d..0000000000
--- a/config/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html
-
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.org (or in your downloaded distribution).
-
-    To completely disable a check, just comment it out or delete it from the file.
-    To suppress certain violations please review suppression filters.
-
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
-
-<module name="Checker">
-    <module name="SuppressWarningsFilter"/>
-
-    <property name="charset" value="UTF-8"/>
-
-    <property name="severity" value="warning"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Excludes all 'module-info.java' files              -->
-    <!-- See https://checkstyle.org/config_filefilters.html -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="module\-info\.java$"/>
-    </module>
-    <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
-    <module name="SuppressionFilter">
-        <property name="file" value="${config_loc}/suppressions.xml"/>
-    </module>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.org/config_whitespace.html -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-    </module>
-
-    <!--
-        CUSTOMIZED:
-        Use 140 characters maximum line length.
-    -->
-    <module name="LineLength">
-        <property name="fileExtensions" value="java"/>
-        <property name="max" value="140"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-    </module>
-
-    <module name="TreeWalker">
-        <module name="OuterTypeFilename"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format"
-                      value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message"
-                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
-        </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="AvoidStarImport"/>
-        <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap">
-            <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
-        </module>
-        <module name="EmptyBlock">
-            <property name="option" value="TEXT"/>
-            <property name="tokens"
-                      value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-        </module>
-        <module name="NeedBraces">
-            <property name="tokens"
-                      value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
-        </module>
-        <module name="LeftCurly">
-            <property name="tokens"
-                      value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
-                    INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
-                    LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
-                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
-                    OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlySame"/>
-            <property name="tokens"
-                      value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
-                    LITERAL_DO"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
-            <property name="tokens"
-                      value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
-                    INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
-                    COMPACT_CTOR_DEF"/>
-        </module>
-        <module name="SuppressionXpathSingleFilter">
-            <!-- suppresion is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="query" value="//RCURLY[parent::SLIST[count(./*)=1]
-                                     or preceding-sibling::*[last()][self::LCURLY]]"/>
-        </module>
-        <module name="WhitespaceAfter">
-            <property name="tokens"
-                      value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN,
-                    LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS,
-                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA,
-                    LITERAL_YIELD, LITERAL_CASE"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyLambdas" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <property name="ignoreEnhancedForColon" value="false"/>
-            <property name="tokens"
-                      value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
-                    BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
-                    LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
-                    LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
-                    LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
-                    NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
-                    SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
-            <message key="ws.notFollowed"
-                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks
-               may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-            <message key="ws.notPreceded"
-                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="OneStatementPerLine"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="FallThrough"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
-        <module name="EmptyLineSeparator">
-            <property name="tokens"
-                      value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
-                    STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
-                    COMPACT_CTOR_DEF"/>
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapDot"/>
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapComma"/>
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/259 -->
-            <property name="id" value="SeparatorWrapEllipsis"/>
-            <property name="tokens" value="ELLIPSIS"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/258 -->
-            <property name="id" value="SeparatorWrapArrayDeclarator"/>
-            <property name="tokens" value="ARRAY_DECLARATOR"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapMethodRef"/>
-            <property name="tokens" value="METHOD_REF"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-                     value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
-                    ANNOTATION_DEF, RECORD_DEF"/>
-            <message key="name.invalidPattern"
-                     value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <!--
-                CUSTOMIZED:
-                Changed Google checkstyle regex from "[a-z][a-z0-9][a-zA-Z0-9]*$"
-                to "^[a-z][a-zA-Z0-9]*$". Requiring at least two leading lowercase letters
-                was problematic for member names starting with "oAuth..." etc.
-            -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <!--
-                CUSTOMIZED:
-                Changed Google checkstyle regex from "[a-z]([a-z0-9][a-zA-Z0-9]*)?$"
-                to "^[a-z][a-zA-Z0-9]*$". Requiring at least two leading lowercase letters
-                was problematic for parameter names starting with "oAuth...()" etc.
-            -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LambdaParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="CatchParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <!--
-                CUSTOMIZED:
-                Changed Google checkstyle regex from "[a-z]([a-z0-9][a-zA-Z0-9]*)?$"
-                to "^[a-z][a-zA-Z0-9]*$". Requiring at least two leading lowercase letters
-                was problematic for local variable names starting with "oAuth...()" etc.
-            -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="PatternVariableName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="RecordComponentName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Record component name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="RecordTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Record type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-            <message key="ws.preceded"
-                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-            <message key="ws.illegalFollow"
-                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-            <message key="ws.notPreceded"
-                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-
-        <!--
-            DISABLED: Google suggests 2-space indentation.
-            Hermes codebase uses 4-space indentation consistently.
-
-        <module name="Indentation">
-            <property name="basicOffset" value="2"/>
-            <property name="braceAdjustment" value="2"/>
-            <property name="caseIndent" value="2"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="2"/>
-        </module>
-        -->
-
-        <!--
-            DISABLED: impacts existing codebase significantly
-            and would require breaking hermes-client public API.
-
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="0"/>
-            <property name="allowedAbbreviations" value="O,IO,Q,JX"/>
-            <property name="tokens"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
-                    PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
-                    RECORD_COMPONENT_DEF"/>
-        </module>
-        -->
-
-        <module name="NoWhitespaceBeforeCaseDefaultColon"/>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="VariableDeclarationUsageDistance"/>
-
-        <!--
-            CUSTOMIZED:
-            Use default IntelliJ IDEA order import (3rd party, Java stdlib, statics).
-        -->
-        <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###STATIC"/>
-            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
-        </module>
-
-        <module name="MethodParamPad">
-            <property name="tokens"
-                      value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
-                    SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
-        </module>
-        <module name="NoWhitespaceBefore">
-            <property name="tokens"
-                      value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
-                    LABELED_STAT, METHOD_REF"/>
-            <property name="allowLineBreaks" value="true"/>
-        </module>
-        <module name="ParenPad">
-            <property name="tokens"
-                      value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
-                    EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
-                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
-                    METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA,
-                    RECORD_DEF"/>
-        </module>
-        <module name="OperatorWrap">
-            <property name="option" value="NL"/>
-            <property name="tokens"
-                      value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
-                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
-                    TYPE_EXTENSION_AND "/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationMostCases"/>
-            <property name="tokens"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
-                      RECORD_DEF, COMPACT_CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationVariables"/>
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="InvalidJavadocPosition"/>
-        <module name="JavadocTagContinuationIndentation"/>
-        <module name="SummaryJavadoc">
-            <property name="forbiddenSummaryFragments"
-                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
-        <module name="JavadocParagraph"/>
-        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
-        <module name="AtclauseOrder">
-            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-            <property name="target"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="accessModifiers" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
-        </module>
-
-        <!--
-            DISABLED: Hermes codebase doesn't have any Javadoc comments on public methods.
-
-        <module name="MissingJavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,
-                                   COMPACT_CTOR_DEF"/>
-        </module>
-        <module name="MissingJavadocType">
-            <property name="scope" value="protected"/>
-            <property name="tokens"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
-                      RECORD_DEF, ANNOTATION_DEF"/>
-            <property name="excludeScope" value="nothing"/>
-        </module>
-        -->
-
-        <module name="MethodName">
-            <!--
-                CUSTOMIZED:
-                Changed Google checkstyle regex from "[a-z][a-z0-9][a-zA-Z0-9]*$"
-                to "^[a-z][a-zA-Z0-9]*$". Requiring at least two leading lowercase letters
-                was problematic for method names starting with "oAuth...()" etc.
-            -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="SingleLineJavadoc"/>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
-        </module>
-        <module name="CommentsIndentation">
-            <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
-        </module>
-        <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
-        <module name="SuppressionXpathFilter">
-            <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
-                      default="checkstyle-xpath-suppressions.xml" />
-            <property name="optional" value="true"/>
-        </module>
-        <module name="SuppressWarningsHolder" />
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="CHECKSTYLE\.OFF\: ([\w\|]+)" />
-            <property name="onCommentFormat" value="CHECKSTYLE\.ON\: ([\w\|]+)" />
-            <property name="checkFormat" value="$1" />
-        </module>
-
-        <!--
-            CUSTOMIZED:
-            Suppress warnings on provided lines.
-        -->
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat" value="CHECKSTYLE\.SUPPRESS\: ([\w\|]+)"/>
-            <!-- $1 refers to the first match group in the regex defined in commentFormat -->
-            <property name="checkFormat" value="$1"/>
-            <!-- The check is suppressed in the next line of code after the comment -->
-            <property name="influenceFormat" value="1"/>
-        </module>
-    </module>
-</module>
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
deleted file mode 100644
index 91465ba4ee..0000000000
--- a/config/checkstyle/suppressions.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.2//EN"
-        "https://checkstyle.org/dtds/suppressions_1_2.dtd">
-
-<suppressions>
-    <!-- Suppress all checks in test helpers -->
-    <suppress checks="[a-zA-Z0-9]*"
-              files="test\/helper\/"
-            />
-    
-    <!-- Suppress magic strings in default properties -->
-    <suppress checks="MagicNumber"
-              files="[/\\]src[/\\](main)[/\\]java[/\\].+Properties\.java$"
-            />
-
-    <!-- Suppressions for unit testing code -->
-    <suppress checks="MagicNumber"
-              files="[/\\]src[/\\](test|integration|jmh)[/\\]java[/\\]"
-            />
-    <suppress checks="JavadocMethod"
-              files="[/\\]src[/\\](test|integration)[/\\]java[/\\]"
-            />
-    <suppress checks="JavadocVariable"
-              files="[/\\]src[/\\](test|integration)[/\\]java[/\\]"
-            />
-    <suppress checks="JavadocType"
-              files="[/\\]src[/\\](test|integration)[/\\]java[/\\]"
-            />
-    <suppress checks="IllegalThrows"
-              files="[/\\]src[/\\](test|integration)[/\\]java[/\\]"
-            />
-    <suppress checks="ImportControl"
-              files="[/\\]src[/\\](test|integration)[/\\]java[/\\]"
-            />
-    <suppress checks="VisibilityModifier"
-              files="[/\\]src[/\\](test|integration)[/\\]java[/\\]"
-            />
-
-    <!-- Build dirs -->
-    <suppress checks="[a-zA-Z0-9]*"
-              files="[/\\]build[/\\]generated[/\\]java[/\\]" />
-
-    <!-- Classes repackaged from external libraries -->
-    <suppress checks="[a-zA-Z0-9]*"
-              files="(DirectBufferPool|LinkedHashSetBlockingQueue)\.java" />
-</suppressions>
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index dc2d859510..9f07d83fc8 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -30,19 +30,6 @@ services:
       - kafka_data:/var/lib/kafka/data
       - kafka_secrets:/etc/kafka/secrets
 
-  graphite:
-    image: graphiteapp/graphite-statsd:1.1.3
-    ports:
-      - '2003-2004:2003-2004'
-      - '2023-2024:2023-2024'
-      - '8125:8125/udp'
-      - '8126:8126'
-      - '8082:80'
-    volumes:
-      - graphite_conf:/opt/graphite/conf
-      - graphite_data:/opt/graphite/storage
-      - statsd_data:/opt/statsd
-
   frontend:
     build:
       context: ../
@@ -52,7 +39,6 @@ services:
     depends_on:
       - zk
       - kafka
-      - graphite
 
   consumers:
     build:
@@ -61,7 +47,6 @@ services:
     depends_on:
       - zk
       - kafka
-      - graphite
 
   management:
     build:
@@ -72,7 +57,6 @@ services:
     depends_on:
       - zk
       - kafka
-      - graphite
 
   schema-registry:
     image: "confluentinc/cp-schema-registry:${CONFLUENT_IMAGES_TAG}"
@@ -87,9 +71,6 @@ services:
       - "8081:8081"
 
 volumes:
-  graphite_conf:
-  graphite_data:
-  statsd_data:
   zk_secrets:
   zk_data:
   zk_log:
diff --git a/docker/latest/consumers/consumers.yaml b/docker/latest/consumers/consumers.yaml
index 76af83d9b5..f64008630f 100644
--- a/docker/latest/consumers/consumers.yaml
+++ b/docker/latest/consumers/consumers.yaml
@@ -8,11 +8,6 @@ consumer:
     clusters:
       - datacenter: "dc"
         brokerList: "kafka:29092"
-  graphite:
-    host: "graphite"
-  metrics:
-    metric-registry:
-      graphiteReporterEnabled: true
   workload:
     consumerPerSubscription: 1
   schema:
diff --git a/docker/latest/frontend/frontend.yaml b/docker/latest/frontend/frontend.yaml
index 2ccd0f3432..0ba33ab769 100644
--- a/docker/latest/frontend/frontend.yaml
+++ b/docker/latest/frontend/frontend.yaml
@@ -8,11 +8,6 @@ frontend:
     clusters:
       - datacenter: "dc"
         brokerList: "kafka:29092"
-  graphite:
-    host: "graphite"
-  metrics:
-    metric-registry:
-      graphiteReporterEnabled: true
   schema:
     cache:
       refreshAfterWrite: 1m
diff --git a/docker/latest/management/management.yaml b/docker/latest/management/management.yaml
index 0953e3660d..8aaec73c04 100644
--- a/docker/latest/management/management.yaml
+++ b/docker/latest/management/management.yaml
@@ -17,11 +17,6 @@ kafka:
       connectionTimeout: 3000
       bootstrapKafkaServer: kafka:29092
 
-graphite:
-  client:
-    enabled: true
-    externalMonitoringUrl: graphite:8082
-
 server:
   port: 8090
 
@@ -59,6 +54,10 @@ schema.repository:
   serverUrl: http://schema-registry:8081
   validationEnabled: true
 
+prometheus:
+  client:
+    enabled: true
+
 console:
   configurationLocation: console/config-local.json
   configurationType: classpath_resource
diff --git a/docs/docs/configuration/buffer-persistence.md b/docs/docs/configuration/buffer-persistence.md
index a4e3b9ca66..875776f508 100644
--- a/docs/docs/configuration/buffer-persistence.md
+++ b/docs/docs/configuration/buffer-persistence.md
@@ -1,4 +1,4 @@
-# Publishing buffer persistence
+# Publishing buffer persistence [deprecated]
 
 Hermes Frontend API has option to register callbacks triggered during different phases of message lifetime:
 
@@ -15,7 +15,7 @@ to disk. Map structure is continuously persisted to disk, as it is stored in off
 
 When Hermes Frontend starts up it scans filesystem in search of existing persisted map. If found, it is read and any
 persisted events are sent to Message Store. This way recovering after crash is fully automatic. If Hermes process or
-server crashes, nothing is lost.
+server crashes, events that were flushed to disk are recovered. 
 
 There is additional protection against flooding subscribers with outdated events. When reading events from persisted
 storage, Hermes filters out messages older than N hours, where N is a system parameter and is set to 3 days by default.
diff --git a/docs/docs/configuration/console.md b/docs/docs/configuration/console.md
index f327d0dd63..a67d509c6d 100644
--- a/docs/docs/configuration/console.md
+++ b/docs/docs/configuration/console.md
@@ -15,14 +15,12 @@ dashboard.docs    | link to documentation, available on Console home page
 
 ## Metric Store integration
 
-Hermes Console can be integrated with Metric Store. This means, that metrics shown in Console can link to actual graphs
-plotted by Metric Store. At the moment only Graphite is supported.
-
-Option                  | Description
------------------------ | ---------------------------------------------------------------------------
-metrics.type            | type of metrics storage to link to (currently only `graphite` is supported)
-metrics.graphite.url    | URL to graphite
-metrics.graphite.prefix | prefix to graphite metrics
+Hermes console could have a button on the topics and subscriptions view that takes you to a dashboard with metrics.
+In order to make it work you have to provide an implementation of `pl.allegro.tech.hermes.management.domain.MetricsDashboardUrlService`.
+
+ Option                              | Description                                                                      
+-------------------------------------|--------------------------------------------------------------------------------------
+ metrics.fetchingDashboardUrlEnabled | enable fetching dashboard url from hermes-management and show the referring UI button 
 
 ## Authorization
 
diff --git a/docs/docs/configuration/consumers-tuning.md b/docs/docs/configuration/consumers-tuning.md
index f4433b819f..904df5eede 100644
--- a/docs/docs/configuration/consumers-tuning.md
+++ b/docs/docs/configuration/consumers-tuning.md
@@ -2,18 +2,18 @@
 
 ## HTTP Sender
 
-Option                                               | Description                                                 | Default value
----------------------------------------------------- | ----------------------------------------------------------- | -------------
-consumer.http-client.serial.http1.threadPoolSize                  | size of thread pool for sender threads (global)             | 30
-consumer.http-client.serial.http1.maxConnectionsPerDestination    | max connections per remote host                             | 100
+| Option                                                         | Description                                     | Default value |
+|----------------------------------------------------------------|-------------------------------------------------|---------------|
+| consumer.http-client.serial.http1.threadPoolSize               | size of thread pool for sender threads (global) | 30            |
+| consumer.http-client.serial.http1.maxConnectionsPerDestination | max connections per remote host                 | 100           |
 
 ## Consumers core
 
-Option                        | Description                                                              | Default value
------------------------------ | ------------------------------------------------------------------------ | -------------
-consumer.commit.offset.period | interval between committing offsets to Kafka                             | 60s
-consumer.threadPoolSize       | thread pool for threads involved in consuming, 1 thread per subscription | 500
-consumer.serialConsumer.inflightSize         | how many messages can be kept in send queue, per subscription            | 100
+| Option                               | Description                                                              | Default value |
+|--------------------------------------|--------------------------------------------------------------------------|---------------|
+| consumer.commit.offset.period        | interval between committing offsets to Kafka                             | 60s           |
+| consumer.threadPoolSize              | thread pool for threads involved in consuming, 1 thread per subscription | 500           |
+| consumer.serialConsumer.inflightSize | how many messages can be kept in send queue, per subscription            | 100           |
 
 ## Workload constraints management
 
@@ -26,10 +26,10 @@ subscriptions assigned to itself.
 
 These numbers can be configured:
 
-Option                                              | Description                               | Default value
---------------------------------------------------- | ----------------------------------------- | ---------------------
-consumer.workload.consumersPerSubscription          | Number of consumers to which the subscription will be assigned. If this value is greater than the number of available consumers, Hermes will assign the subscription to all available consumers. | 2
-consumer.workload.maxSubscriptionsPerConsumer       | The maximum number of subscriptions assigned to a single consumer. If all consumers have the maximum number of subscriptions assigned, a new subscription will not be activated until a new consumer is added or another subscription is unassigned. | 200
+| Option                                        | Description                                                                                                                                                                                                                                          | Default value |
+|-----------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
+| consumer.workload.consumersPerSubscription    | Number of consumers to which the subscription will be assigned. If this value is greater than the number of available consumers, Hermes will assign the subscription to all available consumers.                                                     | 2             |
+| consumer.workload.maxSubscriptionsPerConsumer | The maximum number of subscriptions assigned to a single consumer. If all consumers have the maximum number of subscriptions assigned, a new subscription will not be activated until a new consumer is added or another subscription is unassigned. | 200           |
 
 Additionally, Hermes allows to configure the property `consumer.workload.consumersPerSubscription` for specific
 topics or subscriptions in the runtime via REST API.
diff --git a/docs/docs/configuration/metrics.md b/docs/docs/configuration/metrics.md
index 86f78fe134..5e172d4ebf 100644
--- a/docs/docs/configuration/metrics.md
+++ b/docs/docs/configuration/metrics.md
@@ -12,9 +12,9 @@ Option                                         | Description
 {modulePrefix}.metrics.prometheus.step         | The step size to use in computing windowed statistics | 60s
 {modulePrefix}.metrics.prometheus.descriptions | If meter descriptions should be sent to Prometheus    | true
 
-In order to be able to access basic metrics via Management API, it needs to be configured to reach VictoriaMetrics API:
+In order to be able to access basic metrics via Management API, it needs to be configured to reach Prometheus API:
 
 Option                                    | Description                                   | Default value
 ------------------------------------------|-----------------------------------------------| -------------
 prometheus.client.enabled                 | Should fetch external metrics from Prometheus | true
-prometheus.client.externalMonitoringUrl   | URI to VictoriaMetrics HTTP API               | http://localhost:18090
+prometheus.client.externalMonitoringUrl   | URI to Prometheus HTTP API                    | http://localhost:18090
diff --git a/docs/docs/overview/architecture.md b/docs/docs/overview/architecture.md
index 7726745068..6d647e64d2 100644
--- a/docs/docs/overview/architecture.md
+++ b/docs/docs/overview/architecture.md
@@ -16,7 +16,7 @@ Hermes integrates with multiple systems, each having different role.
 
 * **Message Store** - stores and routes messages, current implementation: Kafka
 * **Metadata Store** - shared metadata storage for all Hermes modules, current implementation: Zookeeper
-* **Metrics Store** *[optional]* - stores metrics gathered by Hermes, current implementation: Graphite
+* **Metrics Store** *[optional]* - stores metrics gathered by Hermes, currently Hermes exposes metrics in Prometheus format
 * **Tracking Store** *[optional]* - stores tracking (message trace) information, current implementation: ElasticSearch
 
 ## Message flow
diff --git a/docs/docs/quickstart.md b/docs/docs/quickstart.md
index c31db5a01a..3ad00ea47b 100644
--- a/docs/docs/quickstart.md
+++ b/docs/docs/quickstart.md
@@ -56,7 +56,7 @@ image: allegro/hermes-management:hermes-[specific version tag]
 ## Development
 
 The default `docker-compose` setup will start all hermes modules (consumers, frontend, management), together
-with its dependencies (Kafka, ZooKeeper, Graphite, Schema Registry). To run a specific module with gradle/IntelliJ,
+with its dependencies (Kafka, ZooKeeper, Schema Registry). To run a specific module with gradle/IntelliJ,
 just comment out the module in `services` section of the `docker-compose.yml` file, and start the java process locally:
 
 `./gradlew -p hermes-frontend run`
@@ -175,7 +175,6 @@ management:
     depends_on:
       - zk
       - kafka
-      - graphite
 [...]
 ```
 
diff --git a/docs/docs/user/java-client.md b/docs/docs/user/java-client.md
index 57e78b766b..942c9675a7 100644
--- a/docs/docs/user/java-client.md
+++ b/docs/docs/user/java-client.md
@@ -19,7 +19,7 @@ At the moment there are four implementations of `HermesSender`:
   for asynchronous transmission
 * **WebClientHermesSender** - for services using [Spring WebFlux](https://docs.spring.io/spring-framework/docs/current/reference/html/web-reactive.html); 
   uses [WebClient](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/reactive/function/client/WebClient.html)
-* **JerseyHermesSender** - recommended for services using  [Jersey](<https://jersey.java.net/>)
+* **JerseyHermesSender** - recommended for services using  [Jersey](<https://eclipse-ee4j.github.io/jersey/>)
 * **OkHttpHermesSender** - supports both HTTP/1.1 and HTTP/2 protocols, uses [OkHttp3 client](http://square.github.io/okhttp/)
 
 
diff --git a/docs/docs/user/publishing.md b/docs/docs/user/publishing.md
index 16ba94f0ff..044535aa61 100644
--- a/docs/docs/user/publishing.md
+++ b/docs/docs/user/publishing.md
@@ -134,22 +134,21 @@ Failure statuses:
 Each topic can define level of acknowledgement (ACK):
 
 * leader ACK - only one Kafka node (leader) needs to acknowledge reception of message
-* all ACK - all nodes that hold copy of message need to acknowledge reception of message
+* all ACK - at least [min.insync.replicas](https://kafka.apache.org/documentation/#brokerconfigs_min.insync.replicas) nodes must acknowledge reception of message
 
-For most of the topic leader ACK is enough. This guarantees roughly 99.999..% reception rate. Only in rare cases, during
-Kafka cluster rebalancing or nodes outage Kafka might confirm that message was received, while it was not saved and it
-will be lost.
+ACK configuration has the following consequences:
 
-What does it mean in practice? Numbers differ per case and they are affected by multiple factors like frequency of
-rebalancing taking place on Kafka clusters, Kafka version etc. In our production environment using ACK leader means we falsely
-believe message was received by Kafka once per 20 million events. This is a very rough estimate that should show you
-the scale, if you need numbers to base your decision on - please conduct own measurements.
+- with `ACK leader` message writes are replicated asynchronously, thus the acknowledgment latency will be low. However, message write may be lost 
+when there is a topic leadership change - e.g. due to rebalance or broker restart.
+- with `ACK all` messages writes are synchronously replicated to replicas. Write acknowledgement latency will be much higher than with leader ACK,
+it will also have higher variance due to tail latency. However, messages will be persisted as long as the whole replica set does not go down simultaneously. 
 
-If you need 100% guarantee that message was saved, force all replicas to send ACK. The downside of this is much longer
-response times, they tend to vary a lot as well. Thanks to Hermes buffering (described in paragraphs below), we are able
-to guarantee some sane response times to our clients even in *ACK all* mode.
+Publishers are advised to select topic ACK level based on their latency and durability requirements. 
 
-## Buffering
+Hermes also provides a feature called Buffering (described in paragraphs below) which provides consistent write latency 
+despite long Kafka response times. Note that, however, this mode may decrease message durability for `ACK all` setting.
+
+## Buffering [deprecated]
 
 Hermes administrator can set maximum time, for which Hermes will wait for Kafka acknowledgment. By default, it is set to
 65ms. After that time, **202** response is sent to client. Event is kept in Kafka producer buffer and it's delivery will
@@ -161,10 +160,54 @@ Kafka is back online.
 
 ### Buffer persistence
 
-By default events are buffered in memory only. This raises the question about what happens in case of Hermes node failure
+By default, events are buffered in memory only. This raises the question about what happens in case of Hermes node failure
 (or force kill of process). Hermes Frontend API exposes callbacks that can be used to implement persistence model of
 buffered events.
 
 Default implementation uses [OpenHFT ChronicleMap](https://github.com/OpenHFT/Chronicle-Map) to persist unsent messages
 to disk. Map structure is continuously persisted to disk, as it is stored in offheap memory as
 [memory mapped file](https://en.wikipedia.org/wiki/Memory-mapped_file).
+
+Using buffering with ACK all setting means that durability of events may be lowered when **202** status code is received. If Hermes instance
+is killed before message is spilled to disk or the data on disk becomes corrupted, the message is gone. Thus `ACK all` with **202** status code
+is similar to `ACK leader` because a single node failure could cause the message be lost.
+
+### Deprecation notice
+The buffering mechanism in Hermes is considered deprecated and is set to be removed in the future.
+
+## Remote DC fallback
+
+Hermes supports a remote datacenter fallback mechanism for [multi datacenter deployments](https://hermes-pubsub.readthedocs.io/en/latest/configuration/kafka-and-zookeeper/#multiple-kafka-and-zookeeper-clusters).
+
+Fallback is configured on per topic basis, using a `fallbackToRemoteDatacenterEnabled` property:
+
+```http
+PUT /topics/my.group.my-topic
+
+{
+  "fallbackToRemoteDatacenterEnabled": true
+}
+```
+
+Using this setting automatically disables buffering mechanism for a topic.
+
+When using this setting for a topic, Hermes will try to send a message to a local datacenter Kafka first and will fall back to remote datacenter Kafka 
+if the local send fails. 
+
+Hermes also provides a speculative fallback mechanism which will send messages to remote Kafka if the local Kafka is not responding in a timely manner. 
+Speculative send is performed after `frontend.kafka.fail-fast-producer.speculativeSendDelay` elapses.
+
+When using remote DC fallback, Hermes attempts to send a message to Kafka for the duration of `frontend.handlers.maxPublishRequestDuration` property. If after
+`maxPublishRequestDuration` Hermes has not received an acknowledgment from Kafka, it will respond with **500** status code to the client.
+
+Table below summarizes remote fallback configuration options:
+
+| Option                                                 | Scope  | Default value |
+|--------------------------------------------------------|--------|---------------|
+| fallbackToRemoteDatacenterEnabled                      | topic  | false         |
+| frontend.kafka.fail-fast-producer.speculativeSendDelay | global | 250ms         |
+| frontend.handlers.maxPublishRequestDuration            | global | 500ms         |
+
+## Partition assignment
+`Partition-Key` header can be used by publishers to specify Kafka `key` which will be used for partition assignment for a message. This will ensure 
+that all messages with given `Partition-Key` will be sent to the same Kafka partition. 
diff --git a/docs/docs/user/subscribing.md b/docs/docs/user/subscribing.md
index df0321155e..8112b6a809 100644
--- a/docs/docs/user/subscribing.md
+++ b/docs/docs/user/subscribing.md
@@ -39,22 +39,17 @@ Minimal request:
 
 All options:
 
-Option                               | Description                                         | Default value
------------------------------------- | ----------------------------------------------------| -------------
-trackingMode                         | track outgoing messages                             | trackingOff
-subscriptionPolicy.rate              | maximum sending speed in rps (per DC)               | 400
-subscriptionPolicy.messageTtl        | inflight Time To Live in seconds                    | 3600
-subscriptionPolicy.messageBackoff    | backoff time between retry attempts in millis       | 1000
-subscriptionPolicy.retryClientErrors | retry on receiving 4xx status                       | false
-subscriptionPolicy.requestTimeout    | request timeout in millis                           | 1000
-subscriptionPolicy.socketTimeout     | maximum time of inactivity between two data packets | infinity
-subscriptionPolicy.inflightSize      | max number of pending requests                      | 100
-subscriptionPolicy.backoffMultiplier | backoff multiplier for calculating message backoff  | 1
-subscriptionPolicy.backoffMaxIntervalInSec | maximal retry backoff in seconds              | 600
-headers                              | additional HTTP request headers                     | [] (array of headers)
-filters                              | used for skipping unwanted messages                 | [] (array of filters)
-endpointAddressResolverMetadata      | additional address resolver metadata                | {} (map)
-subscriptionIdentityHeadersEnabled   | attach HTTP headers with subscription identity      | false
+| Option                             | Description                                                                           | Default value                                        |
+|------------------------------------|---------------------------------------------------------------------------------------|------------------------------------------------------|
+| trackingMode                       | track outgoing messages                                                               | trackingOff                                          |
+| contentType                        | delivered message format (JSON or BATCH)                                              | JSON                                                 |
+| deliveryType                       | delivery type (SERIAL or BATCH)                                                       | SERIAL                                               |
+| subscriptionPolicy                 | see [delivery types](#delivery-type)                                                  | [serial](#serial-delivery), [batch](#batch-delivery) |
+| mode                               | whether to send message to single (ANYCAST) or all (BROADCAST) subscription endpoints | ANYCAST                                              |
+| headers                            | additional HTTP request headers                                                       | [] (array of headers)                                |
+| filters                            | used for skipping unwanted messages                                                   | [] (array of filters)                                |
+| endpointAddressResolverMetadata    | additional address resolver metadata                                                  | {} (map)                                             |
+| subscriptionIdentityHeadersEnabled | attach HTTP headers with subscription identity                                        | false                                                |
 
 Possible values for **trackingMode** are:
 
@@ -76,6 +71,7 @@ Request that specifies all available options:
         "id": "My Team"
     },
     "contact": "my-team@my-company.com",
+    "deliveryType": "SERIAL",
     "subscriptionPolicy": {
         "rate": 100,
         "messageTtl": 3600,
@@ -87,6 +83,7 @@ Request that specifies all available options:
         "backoffMultiplier": 1.0,
         "backoffMaxIntervalInSec": 600
     },
+    "mode": "ANYCAST",
     "headers": [
         {"name": "SOME_HEADER", "value": "ABC"},
         {"name": "OTHER_HEADER", "value": "123"}
@@ -141,6 +138,66 @@ no matter how many times Hermes would try to deliver it. This behavior can be ch
 flag on subscription. When this flag is set to true, message with response code **4xx** will be retried, 
 also causing slowing down overall sending speed. See [back pressure section](#back-pressure) for more details.
 
+## Content type
+
+Hermes can deliver messages to subscribers in two formats:
+
+- JSON - if topic content type was of type JSON or AVRO
+- AVRO - if topic content type was of type AVRO
+
+## Delivery type
+
+Hermes supports two delivery types: SERIAL and BATCH. 
+
+### Serial delivery
+With serial delivery, each hermes consumer will process at most `inflightSize` messages concurrently. Messages are sent individually 
+(number of published messages = number of messages sent to subscriber).
+
+
+Options for `subscriptionPolicy`:
+
+| Option                  | Description                                         | Default value |
+|-------------------------|-----------------------------------------------------|---------------|
+| rate                    | maximum sending speed in rps (per DC)               | 400           |
+| messageTtl              | inflight Time To Live in seconds                    | 3600          |
+| messageBackoff          | backoff time between retry attempts in millis       | 1000          |
+| retryClientErrors       | retry on receiving 4xx status                       | false         |
+| requestTimeout          | request timeout in millis                           | 1000          |
+| socketTimeout           | maximum time of inactivity between two data packets | infinity      |
+| inflightSize            | max number of pending requests                      | 100           |
+| backoffMultiplier       | backoff multiplier for calculating message backoff  | 1             |
+| backoffMaxIntervalInSec | maximal retry backoff in seconds                    | 600           |
+
+
+### Batch delivery
+With batch delivery hermes consumer aggregates messages in a batch before sending the batch to the subscriber. There are 3 
+configurable thresholds that determine when the batch will be ready to be sent - number of messages in the batch, duration of the batch 
+and size of the batch in bytes. Batch is considered ready whenever one of these thresholds is surpassed.
+
+Messages will be sent as an array of JSON messages, e.g.
+
+```json
+[{"foo": "bar1"}, {"foo":  "bar2"}, ...]
+```
+
+Options for `subscriptionPolicy`:
+
+| Option                  | Description                                                     | Default value |
+|-------------------------|-----------------------------------------------------------------|---------------|
+| messageTtl              | inflight Time To Live in seconds                                | 3600          |
+| messageBackoff          | backoff time between retry attempts in millis                   | 500           |
+| retryClientErrors       | retry on receiving 4xx status                                   | false         |
+| requestTimeout          | request timeout in millis                                       | 30000         |
+| batchSize               | maximum number of messages in a batch                           | 100           |
+| batchTime               | maximum duration in millis for which messages can be aggregated | 30000         |
+| batchVolume             | maximum batch size in bytes                                     | 64000         |
+
+#### Limitations
+Following subscription options are not available with batch delivery:   
+
+- AVRO subscription contentType 
+- BROADCAST mode 
+
 ## Retries
 
 Hermes Consumers have been optimized towards maximizing chances of successful message delivery. Retry policy is
@@ -178,12 +235,11 @@ current_backoff = previous_backoff * backoff_multiplier
 ```
 This has the following consequences:
 
-Backoff multiplier               | Retry policy type                                      
----------------------------------|--------------------------------
-1                                | Constant retry backoff
-  above 1                        | Exponential retry backoff
-  
-  
+| Backoff multiplier | Retry policy type         |
+|--------------------|---------------------------|
+| 1                  | Constant retry backoff    |
+| above 1            | Exponential retry backoff |
+
 The hard limit to current backoff is defined by maximum backoff parameter and by default is equal to 600 s. 
 
 It is worth mentioning that the calculation of current backoff is ignored when the  **Retry-After** header is used.                    
@@ -261,6 +317,17 @@ It's ignored by the default implementation.
 
 See [console integration](../configuration/console.md#subscription-configuration) for more information.
 
+## Mode
+
+Hermes supports two delivery modes:
+
+- ANYCAST - messages will be sent to endpoint returned by `EndpointAddressResolver#resolve`
+- BROADCAST - messages will be sent to endpoint returned by `EndpointAddressResolver#resolveAll`
+
+Example usage of this feature would be to provide `EndpointAddressResolver` implementation which returns any subscriber address (e.g. single 
+service instance) for `resolve` and all subscriber addresses for `resolveAll` (e.g. all instances of a service). ANYCAST subscription messages
+would then be delivered to any subscribing service instance and BROADCAST subscription messages would then be delivered to all subscribing service instances.
+
 ## Message filtering
 
 Each subscription can define set of filters that are going to be applied after receiving message from kafka in order
@@ -271,10 +338,10 @@ of their declaration.
 This mainly concerns message content type. Filtering is done *before* any conversion takes place so all messages have
 the same content type as topic on which they were published.
 
-Topic content-type    | Filter type
---------------------- | -----------
-avro                  | avropath
-json                  | jsonpath
+| Topic content-type | Filter type |
+|--------------------|-------------|
+| avro               | avropath    |
+| json               | jsonpath    |
 
 ### Matching strategy
 
@@ -304,12 +371,12 @@ In case when `matchingStrategy` would be set to `any` then all messages with *GB
 JsonPath filter is based on popular [library](https://github.com/jayway/JsonPath) of the same name that can query
 json documents. In this case it is used as a selector to retrieve value that is later matched by regexp.
 
-Option                | Description
---------------------- | ---------------------------------------------------
-type                  | type of filter
-path                  | JsonPath expression to query json document
-matcher               | regexp expression to match value from json document
-matchingStrategy      | type of matching strategy. Default is `all`
+| Option           | Description                                         |
+|------------------|-----------------------------------------------------|
+| type             | type of filter                                      |
+| path             | JsonPath expression to query json document          |
+| matcher          | regexp expression to match value from json document |
+| matchingStrategy | type of matching strategy. Default is `all`         |
 
 Example:
 ```
@@ -323,12 +390,12 @@ avro so we decided to introduce very simple dotted path format without any advan
 understand if you're familiar with JsonPath. Right now array and basic selectors that point to specific fields are
 supported.
 
-Option                | Description
---------------------- | ---------------------------------------------------
-type                  | type of filter
-path                  | dotted expression to query avro document. When array selector is used then wildcard sign `*` can be used as index
-matcher               | regexp expression to match value from avro document
-matchingStrategy      | type of matching strategy. Default is `all`
+| Option           | Description                                                                                                       |
+|------------------|-------------------------------------------------------------------------------------------------------------------|
+| type             | type of filter                                                                                                    |
+| path             | dotted expression to query avro document. When array selector is used then wildcard sign `*` can be used as index |
+| matcher          | regexp expression to match value from avro document                                                               |
+| matchingStrategy | type of matching strategy. Default is `all`                                                                       |
 
 Example:
 ```
@@ -664,3 +731,32 @@ It returns array of message tracking information in following format:
 Sending delay can be defined for each serial subscription. Consumers will wait for a given time before trying to deliver a message.
 This might be useful in situations when there are multiple topics that sends events in the same time, but you want to increase
 chance that events from one topic will be delivered later than events from another topic.
+
+## Ordering guarantees
+For subscriptions with `SERIAL` deliveryType hermes will deliver `inflightSize` messages concurrently. 
+Because of that messages may be delivered out of partition order (unless `inflightSize=1` but this can have poor performance).    
+
+With `BATCH` deliveryType messages are guaranteed to be delivered in partition order (batches are sent sequentially). 
+
+Note that by default Hermes does not give any guarantees about assigning messages to partitions. To do that, publishers must specify [partition key explicitly](publishing.md#partition-assignment).
+
+When messages are published with `parition-key` and consumed with `BATCH` mode (or `SERIAL` with `inflightSize=1`) they will be ordered as long as they were published to one DC. 
+Publishing messages with same `parition-key` to multiple DCs does not guarantee ordering because messages are stored in separate kafka clusters. 
+
+## Message duplication
+
+Hermes messages can be duplicated on different levels. Publishers are advised to include an idempotency key in message schema to allow 
+consumers to process messages idempotently, relying on Hermes `messageId` is not sufficient.
+
+Scenarios in which subscribes may receive logically duplicated messages: 
+
+- Publisher sends a message to Hermes, the request is timed out and retried. In this case both the first and the second message may end up on Kafka and
+they will have different Hermes `messageId`. Both messages are later sent to subscriber.
+- Once message is received by Hermes it is relayed to Kafka. Message may then be duplicated because of Kafka producer level retries. Duplicated messages will
+have the same Hermes `messageId`.
+- When using [remote DC fallback](https://hermes-pubsub.readthedocs.io/en/latest/user/publishing/#remote-dc-fallback), slow messages are speculatively
+sent to remote DC. This may result in a message being duplicated across DCs if both the local and remote message are saved, both copies will have the 
+same `messageId`.
+- Even if there is one instance of a given message on a given topic, the message may still be delivered to subscriber multiple times. 
+When message is acknowledged by a subscriber its offset is not commited to Kafka synchronously. If Hermes instance is restarted 
+after receiving an ack from subscriber but before commiting the message offset to Kafka, the message will be redelivered.
diff --git a/hermes-api/build.gradle b/hermes-api/build.gradle
index c6554f612b..9a3542da0a 100644
--- a/hermes-api/build.gradle
+++ b/hermes-api/build.gradle
@@ -4,20 +4,19 @@ plugins {
 }
 
 dependencies {
-    api group: 'org.hibernate.validator', name: 'hibernate-validator', version: '8.0.0.Final'
+    api group: 'org.hibernate.validator', name: 'hibernate-validator', version: '8.0.1.Final'
 
     api group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.1.0'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: versions.jackson
     api group: 'com.fasterxml.jackson.jakarta.rs', name: 'jackson-jakarta-rs-json-provider', version: versions.jackson
     api group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: versions.jackson
     implementation group: 'com.google.guava', name: 'guava', version: versions.guava
-    api group: 'com.damnhandy', name: 'handy-uri-templates', version: '2.0.2'
+    api group: 'com.damnhandy', name: 'handy-uri-templates', version: '2.1.8'
     api group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.0'
 
-    implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '4.0.3'
-    implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '4.0.3'
-    implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '2.1.1'
-
+    implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '4.0.5'
+    implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '4.0.5'
+    implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '3.0.0'
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Anonymizable.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Anonymizable.java
index ca360e371d..272b8ccccb 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Anonymizable.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Anonymizable.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.api;
 
 public interface Anonymizable {
-    Anonymizable anonymize();
+  Anonymizable anonymize();
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/AvroMediaType.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/AvroMediaType.java
index 165befe5a7..6d1faa8844 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/AvroMediaType.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/AvroMediaType.java
@@ -2,7 +2,7 @@
 
 public class AvroMediaType {
 
-    public static final String AVRO_BINARY = "avro/binary";
+  public static final String AVRO_BINARY = "avro/binary";
 
-    public static final String AVRO_JSON = "avro/json";
+  public static final String AVRO_JSON = "avro/json";
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BatchSubscriptionPolicy.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BatchSubscriptionPolicy.java
index 1c06f0ee03..79b26f3bb5 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BatchSubscriptionPolicy.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BatchSubscriptionPolicy.java
@@ -3,202 +3,208 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.google.common.base.MoreObjects;
 import jakarta.validation.constraints.Min;
-import pl.allegro.tech.hermes.api.helpers.Patch;
-
 import java.util.Map;
 import java.util.Objects;
+import pl.allegro.tech.hermes.api.helpers.Patch;
 
 public class BatchSubscriptionPolicy {
 
-    private static final int DEFAULT_MESSAGE_TTL = 60;
-    private static final int DEFAULT_MESSAGE_BACKOFF = 500;
-    private static final int DEFAULT_REQUEST_TIMEOUT = 30 * 1000;
-    private static final int DEFAULT_BATCH_SIZE = 100;
-    private static final int DEFAULT_BATCH_TIME = 30 * 1000;
-    private static final int DEFAULT_BATCH_VOLUME = 64 * 1000;
-
-    @Min(0)
-    private int messageTtl;
-
-    private boolean retryClientErrors;
-
-    @Min(0)
-    private int messageBackoff;
-
-    @Min(1)
-    private int requestTimeout;
-
-    @Min(1)
-    private int batchSize;
-
-    @Min(1)
-    private int batchTime;
-
-    @Min(1)
-    private int batchVolume;
-
-    private BatchSubscriptionPolicy() {}
-
-    public BatchSubscriptionPolicy(int messageTtl,
-                                   boolean retryClientErrors,
-                                   int messageBackoff,
-                                   int requestTimeout,
-                                   int batchSize,
-                                   int batchTime,
-                                   int batchVolume) {
-        this.messageTtl = messageTtl;
-        this.retryClientErrors = retryClientErrors;
-        this.messageBackoff = messageBackoff;
-        this.requestTimeout = requestTimeout;
-        this.batchSize = batchSize;
-        this.batchTime = batchTime;
-        this.batchVolume = batchVolume;
+  private static final int DEFAULT_MESSAGE_TTL = 60;
+  private static final int DEFAULT_MESSAGE_BACKOFF = 500;
+  private static final int DEFAULT_REQUEST_TIMEOUT = 30 * 1000;
+  private static final int DEFAULT_BATCH_SIZE = 100;
+  private static final int DEFAULT_BATCH_TIME = 30 * 1000;
+  private static final int DEFAULT_BATCH_VOLUME = 64 * 1000;
+
+  @Min(0)
+  private int messageTtl;
+
+  private boolean retryClientErrors;
+
+  @Min(0)
+  private int messageBackoff;
+
+  @Min(1)
+  private int requestTimeout;
+
+  @Min(1)
+  private int batchSize;
+
+  @Min(1)
+  private int batchTime;
+
+  @Min(1)
+  private int batchVolume;
+
+  private BatchSubscriptionPolicy() {}
+
+  public BatchSubscriptionPolicy(
+      int messageTtl,
+      boolean retryClientErrors,
+      int messageBackoff,
+      int requestTimeout,
+      int batchSize,
+      int batchTime,
+      int batchVolume) {
+    this.messageTtl = messageTtl;
+    this.retryClientErrors = retryClientErrors;
+    this.messageBackoff = messageBackoff;
+    this.requestTimeout = requestTimeout;
+    this.batchSize = batchSize;
+    this.batchTime = batchTime;
+    this.batchVolume = batchVolume;
+  }
+
+  @JsonCreator
+  public static BatchSubscriptionPolicy create(Map<String, Object> properties) {
+    return new BatchSubscriptionPolicy(
+        (Integer) properties.getOrDefault("messageTtl", DEFAULT_MESSAGE_TTL),
+        (Boolean) properties.getOrDefault("retryClientErrors", false),
+        (Integer) properties.getOrDefault("messageBackoff", DEFAULT_MESSAGE_BACKOFF),
+        (Integer) properties.getOrDefault("requestTimeout", DEFAULT_REQUEST_TIMEOUT),
+        (Integer) properties.getOrDefault("batchSize", DEFAULT_BATCH_SIZE),
+        (Integer) properties.getOrDefault("batchTime", DEFAULT_BATCH_TIME),
+        (Integer) properties.getOrDefault("batchVolume", DEFAULT_BATCH_VOLUME));
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        messageTtl,
+        retryClientErrors,
+        messageBackoff,
+        requestTimeout,
+        batchSize,
+        batchTime,
+        batchVolume);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    @JsonCreator
-    public static BatchSubscriptionPolicy create(Map<String, Object> properties) {
-        return new BatchSubscriptionPolicy(
-                (Integer) properties.getOrDefault("messageTtl", DEFAULT_MESSAGE_TTL),
-                (Boolean) properties.getOrDefault("retryClientErrors", false),
-                (Integer) properties.getOrDefault("messageBackoff", DEFAULT_MESSAGE_BACKOFF),
-                (Integer) properties.getOrDefault("requestTimeout", DEFAULT_REQUEST_TIMEOUT),
-                (Integer) properties.getOrDefault("batchSize", DEFAULT_BATCH_SIZE),
-                (Integer) properties.getOrDefault("batchTime", DEFAULT_BATCH_TIME),
-                (Integer) properties.getOrDefault("batchVolume", DEFAULT_BATCH_VOLUME)
-        );
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    final BatchSubscriptionPolicy other = (BatchSubscriptionPolicy) obj;
+    return Objects.equals(this.messageTtl, other.messageTtl)
+        && Objects.equals(this.retryClientErrors, other.retryClientErrors)
+        && Objects.equals(this.messageBackoff, other.messageBackoff)
+        && Objects.equals(this.requestTimeout, other.requestTimeout)
+        && Objects.equals(this.batchSize, other.batchSize)
+        && Objects.equals(this.batchTime, other.batchTime)
+        && Objects.equals(this.batchVolume, other.batchVolume);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("messageTtl", messageTtl)
+        .add("messageBackoff", messageBackoff)
+        .add("retryClientErrors", retryClientErrors)
+        .add("batchSize", batchSize)
+        .add("batchTime", batchTime)
+        .add("batchVolume", batchVolume)
+        .add("requestTimeout", requestTimeout)
+        .toString();
+  }
+
+  public Integer getMessageTtl() {
+    return messageTtl;
+  }
+
+  public Integer getMessageBackoff() {
+    return messageBackoff;
+  }
+
+  public Boolean isRetryClientErrors() {
+    return retryClientErrors;
+  }
+
+  public Integer getBatchSize() {
+    return batchSize;
+  }
+
+  public Integer getBatchTime() {
+    return batchTime;
+  }
+
+  public Integer getBatchVolume() {
+    return batchVolume;
+  }
+
+  public Integer getRequestTimeout() {
+    return requestTimeout;
+  }
+
+  public static class Builder {
+
+    private BatchSubscriptionPolicy subscriptionPolicy;
+
+    public static Builder batchSubscriptionPolicy() {
+      return new Builder();
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(messageTtl, retryClientErrors, messageBackoff, requestTimeout, batchSize, batchTime, batchVolume);
+    public Builder() {
+      subscriptionPolicy = new BatchSubscriptionPolicy();
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final BatchSubscriptionPolicy other = (BatchSubscriptionPolicy) obj;
-        return Objects.equals(this.messageTtl, other.messageTtl)
-                && Objects.equals(this.retryClientErrors, other.retryClientErrors)
-                && Objects.equals(this.messageBackoff, other.messageBackoff)
-                && Objects.equals(this.requestTimeout, other.requestTimeout)
-                && Objects.equals(this.batchSize, other.batchSize)
-                && Objects.equals(this.batchTime, other.batchTime)
-                && Objects.equals(this.batchVolume, other.batchVolume);
+    public Builder withMessageTtl(int messageTtl) {
+      subscriptionPolicy.messageTtl = messageTtl;
+      return this;
     }
 
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("messageTtl", messageTtl)
-                .add("messageBackoff", messageBackoff)
-                .add("retryClientErrors", retryClientErrors)
-                .add("batchSize", batchSize)
-                .add("batchTime", batchTime)
-                .add("batchVolume", batchVolume)
-                .add("requestTimeout", requestTimeout)
-                .toString();
+    public Builder withMessageBackoff(int messageBackoff) {
+      subscriptionPolicy.messageBackoff = messageBackoff;
+      return this;
     }
 
-    public Integer getMessageTtl() {
-        return messageTtl;
+    public Builder withClientErrorRetry(boolean retryClientErrors) {
+      subscriptionPolicy.retryClientErrors = retryClientErrors;
+      return this;
     }
 
-    public Integer getMessageBackoff() {
-        return messageBackoff;
+    public Builder withBatchSize(int batchSize) {
+      subscriptionPolicy.batchSize = batchSize;
+      return this;
     }
 
-    public Boolean isRetryClientErrors() {
-        return retryClientErrors;
+    public Builder withBatchTime(int batchTime) {
+      subscriptionPolicy.batchTime = batchTime;
+      return this;
     }
 
-    public Integer getBatchSize() {
-        return batchSize;
+    public Builder withBatchVolume(int batchVolume) {
+      subscriptionPolicy.batchVolume = batchVolume;
+      return this;
     }
 
-    public Integer getBatchTime() {
-        return batchTime;
+    public Builder withRequestTimeout(int requestTimeout) {
+      subscriptionPolicy.requestTimeout = requestTimeout;
+      return this;
     }
 
-    public Integer getBatchVolume() {
-        return batchVolume;
+    public BatchSubscriptionPolicy build() {
+      return new BatchSubscriptionPolicy(
+          subscriptionPolicy.messageTtl,
+          subscriptionPolicy.retryClientErrors,
+          subscriptionPolicy.messageBackoff,
+          subscriptionPolicy.requestTimeout,
+          subscriptionPolicy.batchSize,
+          subscriptionPolicy.batchTime,
+          subscriptionPolicy.batchVolume);
     }
 
-    public Integer getRequestTimeout() {
-        return requestTimeout;
+    public Builder applyDefaults() {
+      return this;
     }
 
-    public static class Builder {
-
-        private BatchSubscriptionPolicy subscriptionPolicy;
-
-        public static Builder batchSubscriptionPolicy() {
-            return new Builder();
-        }
-
-        public Builder() {
-            subscriptionPolicy = new BatchSubscriptionPolicy();
-        }
-
-        public Builder withMessageTtl(int messageTtl) {
-            subscriptionPolicy.messageTtl = messageTtl;
-            return this;
-        }
-
-        public Builder withMessageBackoff(int messageBackoff) {
-            subscriptionPolicy.messageBackoff = messageBackoff;
-            return this;
-        }
-
-        public Builder withClientErrorRetry(boolean retryClientErrors) {
-            subscriptionPolicy.retryClientErrors = retryClientErrors;
-            return this;
-        }
-
-        public Builder withBatchSize(int batchSize) {
-            subscriptionPolicy.batchSize = batchSize;
-            return this;
-        }
-
-        public Builder withBatchTime(int batchTime) {
-            subscriptionPolicy.batchTime = batchTime;
-            return this;
-        }
-
-        public Builder withBatchVolume(int batchVolume) {
-            subscriptionPolicy.batchVolume = batchVolume;
-            return this;
-        }
-
-        public Builder withRequestTimeout(int requestTimeout) {
-            subscriptionPolicy.requestTimeout = requestTimeout;
-            return this;
-        }
-
-        public BatchSubscriptionPolicy build() {
-            return new BatchSubscriptionPolicy(
-                    subscriptionPolicy.messageTtl,
-                    subscriptionPolicy.retryClientErrors,
-                    subscriptionPolicy.messageBackoff,
-                    subscriptionPolicy.requestTimeout,
-                    subscriptionPolicy.batchSize,
-                    subscriptionPolicy.batchTime,
-                    subscriptionPolicy.batchVolume);
-        }
-
-        public Builder applyDefaults() {
-            return this;
-        }
-
-        public <T> Builder applyPatch(PatchData patch) {
-            if (patch != null) {
-                subscriptionPolicy = Patch.apply(subscriptionPolicy, patch);
-            }
-            return this;
-        }
+    public <T> Builder applyPatch(PatchData patch) {
+      if (patch != null) {
+        subscriptionPolicy = Patch.apply(subscriptionPolicy, patch);
+      }
+      return this;
     }
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BlacklistStatus.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BlacklistStatus.java
index 8be8d8d53b..250b9a54f5 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BlacklistStatus.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BlacklistStatus.java
@@ -2,39 +2,38 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public final class BlacklistStatus {
 
-    public static final BlacklistStatus BLACKLISTED = new BlacklistStatus(true);
-    public static final BlacklistStatus NOT_BLACKLISTED = new BlacklistStatus(false);
+  public static final BlacklistStatus BLACKLISTED = new BlacklistStatus(true);
+  public static final BlacklistStatus NOT_BLACKLISTED = new BlacklistStatus(false);
 
-    private final boolean blacklisted;
+  private final boolean blacklisted;
 
-    @JsonCreator
-    private BlacklistStatus(@JsonProperty("blacklisted") boolean blacklisted) {
-        this.blacklisted = blacklisted;
-    }
+  @JsonCreator
+  private BlacklistStatus(@JsonProperty("blacklisted") boolean blacklisted) {
+    this.blacklisted = blacklisted;
+  }
 
-    public boolean isBlacklisted() {
-        return blacklisted;
-    }
+  public boolean isBlacklisted() {
+    return blacklisted;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BlacklistStatus that = (BlacklistStatus) o;
-        return blacklisted == that.blacklisted;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(blacklisted);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    BlacklistStatus that = (BlacklistStatus) o;
+    return blacklisted == that.blacklisted;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(blacklisted);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Constraints.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Constraints.java
index 60d71c6e40..fcf82f100a 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Constraints.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Constraints.java
@@ -3,37 +3,36 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.Min;
-
 import java.util.Objects;
 
 public class Constraints {
 
-    @Min(1)
-    private final int consumersNumber;
+  @Min(1)
+  private final int consumersNumber;
 
-    @JsonCreator
-    public Constraints(@JsonProperty("consumersNumber") int consumersNumber) {
-        this.consumersNumber = consumersNumber;
-    }
+  @JsonCreator
+  public Constraints(@JsonProperty("consumersNumber") int consumersNumber) {
+    this.consumersNumber = consumersNumber;
+  }
 
-    public int getConsumersNumber() {
-        return consumersNumber;
-    }
+  public int getConsumersNumber() {
+    return consumersNumber;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Constraints that = (Constraints) o;
-        return consumersNumber == that.consumersNumber;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(consumersNumber);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    Constraints that = (Constraints) o;
+    return consumersNumber == that.consumersNumber;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(consumersNumber);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ConsumerGroup.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ConsumerGroup.java
index d7acd8e37e..61528237df 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ConsumerGroup.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ConsumerGroup.java
@@ -2,62 +2,62 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 import java.util.Set;
 
 public class ConsumerGroup {
 
-    private final String clusterName;
-    private final String groupId;
-    private final String state;
-
-    private final Set<ConsumerGroupMember> members;
-
-    @JsonCreator
-    public ConsumerGroup(@JsonProperty("clusterName") String clusterName,
-                         @JsonProperty("groupId") String groupId,
-                         @JsonProperty("state") String state,
-                         @JsonProperty("members") Set<ConsumerGroupMember> members) {
-        this.clusterName = clusterName;
-        this.groupId = groupId;
-        this.state = state;
-        this.members = members;
-    }
-
-    public String getClusterName() {
-        return clusterName;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public Set<ConsumerGroupMember> getMembers() {
-        return members;
+  private final String clusterName;
+  private final String groupId;
+  private final String state;
+
+  private final Set<ConsumerGroupMember> members;
+
+  @JsonCreator
+  public ConsumerGroup(
+      @JsonProperty("clusterName") String clusterName,
+      @JsonProperty("groupId") String groupId,
+      @JsonProperty("state") String state,
+      @JsonProperty("members") Set<ConsumerGroupMember> members) {
+    this.clusterName = clusterName;
+    this.groupId = groupId;
+    this.state = state;
+    this.members = members;
+  }
+
+  public String getClusterName() {
+    return clusterName;
+  }
+
+  public String getGroupId() {
+    return groupId;
+  }
+
+  public String getState() {
+    return state;
+  }
+
+  public Set<ConsumerGroupMember> getMembers() {
+    return members;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerGroup that = (ConsumerGroup) o;
-        return Objects.equals(clusterName, that.clusterName)
-                && Objects.equals(groupId, that.groupId)
-                && Objects.equals(state, that.state)
-                && Objects.equals(members, that.members);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clusterName, groupId, state, members);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumerGroup that = (ConsumerGroup) o;
+    return Objects.equals(clusterName, that.clusterName)
+        && Objects.equals(groupId, that.groupId)
+        && Objects.equals(state, that.state)
+        && Objects.equals(members, that.members);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(clusterName, groupId, state, members);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ConsumerGroupMember.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ConsumerGroupMember.java
index 62348cb9b6..94d0491b9d 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ConsumerGroupMember.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ConsumerGroupMember.java
@@ -2,61 +2,61 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 import java.util.Set;
 
 public class ConsumerGroupMember {
-    private final String consumerId;
-    private final String clientId;
-    private final String host;
-
-    private final Set<TopicPartition> partitions;
-
-    @JsonCreator
-    public ConsumerGroupMember(@JsonProperty("consumerId") String consumerId,
-                               @JsonProperty("clientId") String clientId,
-                               @JsonProperty("host")String host,
-                               @JsonProperty("partitions") Set<TopicPartition> partitions) {
-        this.consumerId = consumerId;
-        this.clientId = clientId;
-        this.host = host;
-        this.partitions = partitions;
-    }
-
-    public String getConsumerId() {
-        return consumerId;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public Set<TopicPartition> getPartitions() {
-        return partitions;
+  private final String consumerId;
+  private final String clientId;
+  private final String host;
+
+  private final Set<TopicPartition> partitions;
+
+  @JsonCreator
+  public ConsumerGroupMember(
+      @JsonProperty("consumerId") String consumerId,
+      @JsonProperty("clientId") String clientId,
+      @JsonProperty("host") String host,
+      @JsonProperty("partitions") Set<TopicPartition> partitions) {
+    this.consumerId = consumerId;
+    this.clientId = clientId;
+    this.host = host;
+    this.partitions = partitions;
+  }
+
+  public String getConsumerId() {
+    return consumerId;
+  }
+
+  public String getClientId() {
+    return clientId;
+  }
+
+  public String getHost() {
+    return host;
+  }
+
+  public Set<TopicPartition> getPartitions() {
+    return partitions;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerGroupMember that = (ConsumerGroupMember) o;
-        return Objects.equals(consumerId, that.consumerId)
-                && Objects.equals(clientId, that.clientId)
-                && Objects.equals(host, that.host)
-                && Objects.equals(partitions, that.partitions);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(consumerId, clientId, host, partitions);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumerGroupMember that = (ConsumerGroupMember) o;
+    return Objects.equals(consumerId, that.consumerId)
+        && Objects.equals(clientId, that.clientId)
+        && Objects.equals(host, that.host)
+        && Objects.equals(partitions, that.partitions);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(consumerId, clientId, host, partitions);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ContentType.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ContentType.java
index 383f1cdf47..1980a07a1e 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ContentType.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ContentType.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.api;
 
 public enum ContentType {
-    JSON, AVRO
+  JSON,
+  AVRO
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/CrowdGroupDescription.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/CrowdGroupDescription.java
deleted file mode 100644
index 8e0a65db96..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/CrowdGroupDescription.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package pl.allegro.tech.hermes.api;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class CrowdGroupDescription {
-
-    private final String name;
-
-    public CrowdGroupDescription(@JsonProperty("name") String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/CrowdGroups.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/CrowdGroups.java
deleted file mode 100644
index 16bc708a10..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/CrowdGroups.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package pl.allegro.tech.hermes.api;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class CrowdGroups {
-
-    private final List<CrowdGroupDescription> crowdGroupDescriptions;
-
-    public CrowdGroups(@JsonProperty("groups") List<CrowdGroupDescription> crowdGroupDescriptions) {
-        this.crowdGroupDescriptions = crowdGroupDescriptions;
-    }
-
-    public List<CrowdGroupDescription> getCrowdGroupDescriptions() {
-        return crowdGroupDescriptions;
-    }
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/DatacenterReadiness.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/DatacenterReadiness.java
index 024c9d32b1..279bffc33e 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/DatacenterReadiness.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/DatacenterReadiness.java
@@ -2,57 +2,52 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public class DatacenterReadiness {
-    private final String datacenter;
-    private final ReadinessStatus status;
-
-    @JsonCreator
-    public DatacenterReadiness(@JsonProperty("datacenter") String datacenter,
-                               @JsonProperty("status") ReadinessStatus status) {
-        this.datacenter = datacenter;
-        this.status = status;
-    }
-
-    public String getDatacenter() {
-        return datacenter;
-    }
-
-    public ReadinessStatus getStatus() {
-        return status;
-    }
-
-    @Override
-    public String toString() {
-        return "DatacenterReadiness{"
-                + "datacenter='" + datacenter + '\''
-                + ", status=" + status
-                + '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof DatacenterReadiness)) {
-            return false;
-        }
-        DatacenterReadiness that = (DatacenterReadiness) o;
-        return status == that.status
-                && Objects.equals(datacenter, that.datacenter);
+  private final String datacenter;
+  private final ReadinessStatus status;
+
+  @JsonCreator
+  public DatacenterReadiness(
+      @JsonProperty("datacenter") String datacenter,
+      @JsonProperty("status") ReadinessStatus status) {
+    this.datacenter = datacenter;
+    this.status = status;
+  }
+
+  public String getDatacenter() {
+    return datacenter;
+  }
+
+  public ReadinessStatus getStatus() {
+    return status;
+  }
+
+  @Override
+  public String toString() {
+    return "DatacenterReadiness{" + "datacenter='" + datacenter + '\'' + ", status=" + status + '}';
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(datacenter, status);
-    }
-
-    public enum ReadinessStatus {
-        READY,
-        NOT_READY,
-        UNDEFINED
+    if (!(o instanceof DatacenterReadiness)) {
+      return false;
     }
+    DatacenterReadiness that = (DatacenterReadiness) o;
+    return status == that.status && Objects.equals(datacenter, that.datacenter);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(datacenter, status);
+  }
+
+  public enum ReadinessStatus {
+    READY,
+    NOT_READY
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/DeliveryType.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/DeliveryType.java
index 9edad2adb3..ade2c08947 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/DeliveryType.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/DeliveryType.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.api;
 
 public enum DeliveryType {
-    SERIAL, BATCH
+  SERIAL,
+  BATCH
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddress.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddress.java
index 140a932de1..0dfdeacff9 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddress.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddress.java
@@ -5,145 +5,145 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import pl.allegro.tech.hermes.api.jackson.EndpointAddressDeserializer;
-import pl.allegro.tech.hermes.api.jackson.EndpointAddressSerializer;
-
 import java.net.URI;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import pl.allegro.tech.hermes.api.jackson.EndpointAddressDeserializer;
+import pl.allegro.tech.hermes.api.jackson.EndpointAddressSerializer;
 
 @JsonDeserialize(using = EndpointAddressDeserializer.class)
 @JsonSerialize(using = EndpointAddressSerializer.class)
 public class EndpointAddress implements Anonymizable {
 
-    private static final String ANONYMIZED_PASSWORD = "*****";
+  private static final String ANONYMIZED_PASSWORD = "*****";
 
-    private static final Pattern URL_PATTERN = Pattern.compile("([a-zA-Z0-9]*)://(([a-zA-Z0-9\\.\\~\\-\\_]*):(.*)@)?(.*)");
+  private static final Pattern URL_PATTERN =
+      Pattern.compile("([a-zA-Z0-9]*)://(([a-zA-Z0-9\\.\\~\\-\\_]*):(.*)@)?(.*)");
 
-    private static final int PROTOCOL_GROUP = 1;
+  private static final int PROTOCOL_GROUP = 1;
 
-    private static final int ADDRESS_GROUP = 5;
+  private static final int ADDRESS_GROUP = 5;
 
-    private static final int USER_INFO_GROUP = 2;
+  private static final int USER_INFO_GROUP = 2;
 
-    private static final int USERNAME_GROUP = 3;
+  private static final int USERNAME_GROUP = 3;
 
-    private static final int PASSWORD_GROUP = 4;
+  private static final int PASSWORD_GROUP = 4;
 
-    private final boolean containsCredentials;
+  private final boolean containsCredentials;
 
-    private final String protocol;
+  private final String protocol;
 
-    private final String username;
+  private final String username;
 
-    private final String password;
+  private final String password;
 
-    private final String endpoint;
+  private final String endpoint;
 
-    private final String rawEndpoint;
+  private final String rawEndpoint;
 
-    public EndpointAddress(String endpoint) {
-        this.rawEndpoint = endpoint;
+  public EndpointAddress(String endpoint) {
+    this.rawEndpoint = endpoint;
 
-        Matcher matcher = URL_PATTERN.matcher(endpoint);
-        if (matcher.matches()) {
-            this.protocol = matcher.group(PROTOCOL_GROUP);
-            this.containsCredentials = !Strings.isNullOrEmpty(matcher.group(USER_INFO_GROUP));
+    Matcher matcher = URL_PATTERN.matcher(endpoint);
+    if (matcher.matches()) {
+      this.protocol = matcher.group(PROTOCOL_GROUP);
+      this.containsCredentials = !Strings.isNullOrEmpty(matcher.group(USER_INFO_GROUP));
 
-            this.username = containsCredentials ? matcher.group(USERNAME_GROUP) : null;
-            this.password = containsCredentials ? matcher.group(PASSWORD_GROUP) : null;
+      this.username = containsCredentials ? matcher.group(USERNAME_GROUP) : null;
+      this.password = containsCredentials ? matcher.group(PASSWORD_GROUP) : null;
 
-            this.endpoint = containsCredentials ? protocol + "://" + matcher.group(ADDRESS_GROUP) : endpoint;
-        } else {
-            this.protocol = null;
-            this.containsCredentials = false;
-            this.username = null;
-            this.password = null;
-            this.endpoint = endpoint;
-        }
+      this.endpoint =
+          containsCredentials ? protocol + "://" + matcher.group(ADDRESS_GROUP) : endpoint;
+    } else {
+      this.protocol = null;
+      this.containsCredentials = false;
+      this.username = null;
+      this.password = null;
+      this.endpoint = endpoint;
     }
+  }
 
-    private EndpointAddress(String protocol, String endpoint, String username) {
-        this.protocol = protocol;
-        this.endpoint = endpoint;
-        this.containsCredentials = true;
-        this.username = username;
-        this.password = ANONYMIZED_PASSWORD;
+  private EndpointAddress(String protocol, String endpoint, String username) {
+    this.protocol = protocol;
+    this.endpoint = endpoint;
+    this.containsCredentials = true;
+    this.username = username;
+    this.password = ANONYMIZED_PASSWORD;
 
-        this.rawEndpoint = protocol + "://" + username + ":" + password + "@" + endpoint.replace(protocol + "://", "");
-    }
+    this.rawEndpoint =
+        protocol + "://" + username + ":" + password + "@" + endpoint.replace(protocol + "://", "");
+  }
 
-    public static EndpointAddress of(String endpoint) {
-        return new EndpointAddress(endpoint);
-    }
+  public static EndpointAddress of(String endpoint) {
+    return new EndpointAddress(endpoint);
+  }
 
-    public static EndpointAddress of(URI endpoint) {
-        return new EndpointAddress(endpoint.toString());
-    }
+  public static EndpointAddress of(URI endpoint) {
+    return new EndpointAddress(endpoint.toString());
+  }
 
-    public static String extractProtocolFromAddress(String endpoint) {
-        Preconditions.checkArgument(endpoint.indexOf(':') != -1);
+  public static String extractProtocolFromAddress(String endpoint) {
+    Preconditions.checkArgument(endpoint.indexOf(':') != -1);
 
-        return endpoint.substring(0, endpoint.indexOf(':'));
-    }
+    return endpoint.substring(0, endpoint.indexOf(':'));
+  }
 
-    public String getEndpoint() {
-        return endpoint;
-    }
+  public String getEndpoint() {
+    return endpoint;
+  }
 
-    public String getRawEndpoint() {
-        return rawEndpoint;
-    }
+  public String getRawEndpoint() {
+    return rawEndpoint;
+  }
 
-    public URI getUri() {
-        return URI.create(endpoint);
-    }
+  public URI getUri() {
+    return URI.create(endpoint);
+  }
 
-    public String getProtocol() {
-        return protocol;
-    }
+  public String getProtocol() {
+    return protocol;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(rawEndpoint);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(rawEndpoint);
+  }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final EndpointAddress other = (EndpointAddress) obj;
-        return Objects.equals(this.rawEndpoint, other.rawEndpoint);
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("endpoint", endpoint)
-                .toString();
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
+    final EndpointAddress other = (EndpointAddress) obj;
+    return Objects.equals(this.rawEndpoint, other.rawEndpoint);
+  }
 
-    public boolean containsCredentials() {
-        return containsCredentials;
-    }
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this).add("endpoint", endpoint).toString();
+  }
 
-    public String getPassword() {
-        return password;
-    }
+  public boolean containsCredentials() {
+    return containsCredentials;
+  }
 
-    public String getUsername() {
-        return username;
-    }
+  public String getPassword() {
+    return password;
+  }
 
-    public EndpointAddress anonymize() {
-        if (containsCredentials) {
-            return new EndpointAddress(protocol, endpoint, username);
-        }
-        return this;
-    }
+  public String getUsername() {
+    return username;
+  }
+
+  public EndpointAddress anonymize() {
+    if (containsCredentials) {
+      return new EndpointAddress(protocol, endpoint, username);
+    }
+    return this;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddressResolverMetadata.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddressResolverMetadata.java
index 8cd3f20bd8..cf863ee8d9 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddressResolverMetadata.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddressResolverMetadata.java
@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.google.common.collect.ImmutableMap;
 import jakarta.validation.constraints.NotNull;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -15,81 +14,84 @@
 import java.util.Objects;
 import java.util.Optional;
 
-@JsonSerialize(using = EndpointAddressResolverMetadata.EndpointAddressResolverMetadataSerializer.class)
+@JsonSerialize(
+    using = EndpointAddressResolverMetadata.EndpointAddressResolverMetadataSerializer.class)
 public class EndpointAddressResolverMetadata {
 
-    private static final EndpointAddressResolverMetadata EMPTY_INSTANCE = new EndpointAddressResolverMetadata(Collections.emptyMap());
+  private static final EndpointAddressResolverMetadata EMPTY_INSTANCE =
+      new EndpointAddressResolverMetadata(Collections.emptyMap());
 
-    @NotNull
-    private Map<String, Object> entries;
+  @NotNull private Map<String, Object> entries;
 
-    @JsonCreator
-    public EndpointAddressResolverMetadata(Map<String, Object> entries) {
-        this.entries = ImmutableMap.copyOf(entries);
-    }
+  @JsonCreator
+  public EndpointAddressResolverMetadata(Map<String, Object> entries) {
+    this.entries = ImmutableMap.copyOf(entries);
+  }
 
-    public static EndpointAddressResolverMetadata empty() {
-        return EMPTY_INSTANCE;
-    }
+  public static EndpointAddressResolverMetadata empty() {
+    return EMPTY_INSTANCE;
+  }
 
-    public static Builder endpointAddressResolverMetadata() {
-        return new Builder();
-    }
+  public static Builder endpointAddressResolverMetadata() {
+    return new Builder();
+  }
 
-    public Optional<Object> get(String key) {
-        return Optional.ofNullable(entries.get(key));
-    }
+  public Optional<Object> get(String key) {
+    return Optional.ofNullable(entries.get(key));
+  }
 
-    @SuppressWarnings("unchecked")
-    public <T> T getOrDefault(String key, T defaultValue) {
-        return (T) entries.getOrDefault(key, defaultValue);
-    }
+  @SuppressWarnings("unchecked")
+  public <T> T getOrDefault(String key, T defaultValue) {
+    return (T) entries.getOrDefault(key, defaultValue);
+  }
 
-    public Map<String, Object> getEntries() {
-        return entries;
-    }
+  public Map<String, Object> getEntries() {
+    return entries;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        EndpointAddressResolverMetadata that = (EndpointAddressResolverMetadata) o;
-        return Objects.equals(entries, that.entries);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(entries);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    EndpointAddressResolverMetadata that = (EndpointAddressResolverMetadata) o;
+    return Objects.equals(entries, that.entries);
+  }
 
-    public static class EndpointAddressResolverMetadataSerializer extends StdSerializer<EndpointAddressResolverMetadata> {
+  @Override
+  public int hashCode() {
+    return Objects.hash(entries);
+  }
 
-        protected EndpointAddressResolverMetadataSerializer() {
-            super(EndpointAddressResolverMetadata.class);
-        }
+  public static class EndpointAddressResolverMetadataSerializer
+      extends StdSerializer<EndpointAddressResolverMetadata> {
 
-        @Override
-        public void serialize(EndpointAddressResolverMetadata metadata, JsonGenerator jgen, SerializerProvider provider)
-                throws IOException {
-            jgen.writeObject(metadata.entries);
-        }
+    protected EndpointAddressResolverMetadataSerializer() {
+      super(EndpointAddressResolverMetadata.class);
     }
 
-    public static class Builder {
+    @Override
+    public void serialize(
+        EndpointAddressResolverMetadata metadata, JsonGenerator jgen, SerializerProvider provider)
+        throws IOException {
+      jgen.writeObject(metadata.entries);
+    }
+  }
+
+  public static class Builder {
 
-        private Map<String, Object> entries = new HashMap<>();
+    private Map<String, Object> entries = new HashMap<>();
 
-        public Builder withEntry(String key, Object value) {
-            entries.put(key, value);
-            return this;
-        }
+    public Builder withEntry(String key, Object value) {
+      entries.put(key, value);
+      return this;
+    }
 
-        public EndpointAddressResolverMetadata build() {
-            return new EndpointAddressResolverMetadata(entries);
-        }
+    public EndpointAddressResolverMetadata build() {
+      return new EndpointAddressResolverMetadata(entries);
     }
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorCode.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorCode.java
index 9e48226597..a000f436e1 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorCode.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorCode.java
@@ -1,81 +1,81 @@
 package pl.allegro.tech.hermes.api;
 
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.core.Response;
-
 import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
 import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
 import static jakarta.ws.rs.core.Response.Status.NOT_ACCEPTABLE;
 import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static jakarta.ws.rs.core.Response.Status.REQUEST_TIMEOUT;
+import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
+
+import jakarta.ws.rs.core.Response;
 
 public enum ErrorCode {
-    TIMEOUT(REQUEST_TIMEOUT),
-    TOPIC_ALREADY_EXISTS(BAD_REQUEST),
-    TOPIC_NOT_EXISTS(NOT_FOUND),
-    GROUP_NOT_EXISTS(NOT_FOUND),
-    GROUP_NAME_IS_INVALID(BAD_REQUEST),
-    SUBSCRIPTION_NOT_EXISTS(BAD_REQUEST),
-    SUBSCRIPTION_ALREADY_EXISTS(BAD_REQUEST),
-    VALIDATION_ERROR(BAD_REQUEST),
-    INTERNAL_ERROR(INTERNAL_SERVER_ERROR),
-    FORMAT_ERROR(BAD_REQUEST),
-    GROUP_NOT_EMPTY(FORBIDDEN),
-    TOPIC_NOT_EMPTY(FORBIDDEN),
-    GROUP_ALREADY_EXISTS(BAD_REQUEST),
-    OPERATION_DISABLED(NOT_ACCEPTABLE),
-    OTHER(INTERNAL_SERVER_ERROR),
-    UNAVAILABLE_RATE(BAD_REQUEST),
-    SINGLE_MESSAGE_READER_EXCEPTION(INTERNAL_SERVER_ERROR),
-    PARTITIONS_NOT_FOUND_FOR_TOPIC(NOT_FOUND),
-    OFFSET_NOT_FOUND_EXCEPTION(NOT_FOUND),
-    OFFSETS_NOT_AVAILABLE_EXCEPTION(INTERNAL_SERVER_ERROR),
-    UNABLE_TO_MOVE_OFFSETS_EXCEPTION(INTERNAL_SERVER_ERROR),
-    BROKERS_CLUSTER_NOT_FOUND_EXCEPTION(NOT_FOUND),
-    BROKERS_CLUSTER_COMMUNICATION_EXCEPTION(INTERNAL_SERVER_ERROR),
-    SIMPLE_CONSUMER_POOL_EXCEPTION(INTERNAL_SERVER_ERROR),
-    RETRANSMISSION_EXCEPTION(INTERNAL_SERVER_ERROR),
-    TOKEN_NOT_PROVIDED(FORBIDDEN),
-    GROUP_NOT_PROVIDED(FORBIDDEN),
-    AUTH_ERROR(FORBIDDEN),
-    SCHEMA_REPOSITORY_INTERNAL_ERROR(INTERNAL_SERVER_ERROR),
-    SCHEMA_BAD_REQUEST(BAD_REQUEST),
-    SCHEMA_COULD_NOT_BE_LOADED(INTERNAL_SERVER_ERROR),
-    SCHEMA_VERSION_DOES_NOT_EXIST(BAD_REQUEST),
-    SCHEMA_ALREADY_EXISTS(BAD_REQUEST),
-    AVRO_SCHEMA_INVALID_METADATA(BAD_REQUEST),
-    SUBSCRIPTION_ENDPOINT_ADDRESS_CHANGE_EXCEPTION(INTERNAL_SERVER_ERROR),
-    OAUTH_PROVIDER_NOT_EXISTS(NOT_FOUND),
-    OAUTH_PROVIDER_ALREADY_EXISTS(BAD_REQUEST),
-    CROWD_GROUPS_COULD_NOT_BE_LOADED(INTERNAL_SERVER_ERROR),
-    TOPIC_BLACKLISTED(FORBIDDEN),
-    THROUGHPUT_QUOTA_VIOLATION(429),
-    TOPIC_NOT_UNBLACKLISTED(BAD_REQUEST),
-    TOPIC_CONSTRAINTS_ALREADY_EXIST(BAD_REQUEST),
-    TOPIC_CONSTRAINTS_DO_NOT_EXIST(BAD_REQUEST),
-    SUBSCRIPTION_CONSTRAINTS_ALREADY_EXIST(BAD_REQUEST),
-    SUBSCRIPTION_CONSTRAINTS_DO_NOT_EXIST(BAD_REQUEST),
-    OWNER_SOURCE_NOT_FOUND(NOT_FOUND),
-    OWNER_SOURCE_DOESNT_SUPPORT_AUTOCOMPLETE(BAD_REQUEST),
-    OWNER_NOT_FOUND(NOT_FOUND),
-    PERMISSION_DENIED(FORBIDDEN),
-    UNKNOWN_MIGRATION(NOT_FOUND),
-    INVALID_QUERY(BAD_REQUEST),
-    IMPLEMENTATION_ABSENT(NOT_FOUND),
-    MOVING_SUBSCRIPTION_OFFSETS_VALIDATION_ERROR(BAD_REQUEST);
+  TIMEOUT(REQUEST_TIMEOUT),
+  TOPIC_ALREADY_EXISTS(BAD_REQUEST),
+  TOPIC_NOT_EXISTS(NOT_FOUND),
+  GROUP_NOT_EXISTS(NOT_FOUND),
+  GROUP_NAME_IS_INVALID(BAD_REQUEST),
+  SUBSCRIPTION_NOT_EXISTS(BAD_REQUEST),
+  SUBSCRIPTION_ALREADY_EXISTS(BAD_REQUEST),
+  VALIDATION_ERROR(BAD_REQUEST),
+  INTERNAL_ERROR(INTERNAL_SERVER_ERROR),
+  FORMAT_ERROR(BAD_REQUEST),
+  GROUP_NOT_EMPTY(FORBIDDEN),
+  TOPIC_NOT_EMPTY(FORBIDDEN),
+  GROUP_ALREADY_EXISTS(BAD_REQUEST),
+  OPERATION_DISABLED(NOT_ACCEPTABLE),
+  OTHER(INTERNAL_SERVER_ERROR),
+  UNAVAILABLE_RATE(BAD_REQUEST),
+  SINGLE_MESSAGE_READER_EXCEPTION(INTERNAL_SERVER_ERROR),
+  PARTITIONS_NOT_FOUND_FOR_TOPIC(NOT_FOUND),
+  OFFSET_NOT_FOUND_EXCEPTION(NOT_FOUND),
+  OFFSETS_NOT_AVAILABLE_EXCEPTION(INTERNAL_SERVER_ERROR),
+  UNABLE_TO_MOVE_OFFSETS_EXCEPTION(INTERNAL_SERVER_ERROR),
+  BROKERS_CLUSTER_NOT_FOUND_EXCEPTION(NOT_FOUND),
+  BROKERS_CLUSTER_COMMUNICATION_EXCEPTION(INTERNAL_SERVER_ERROR),
+  SIMPLE_CONSUMER_POOL_EXCEPTION(INTERNAL_SERVER_ERROR),
+  RETRANSMISSION_EXCEPTION(INTERNAL_SERVER_ERROR),
+  TOKEN_NOT_PROVIDED(FORBIDDEN),
+  GROUP_NOT_PROVIDED(FORBIDDEN),
+  AUTH_ERROR(FORBIDDEN),
+  SCHEMA_REPOSITORY_INTERNAL_ERROR(INTERNAL_SERVER_ERROR),
+  SCHEMA_BAD_REQUEST(BAD_REQUEST),
+  SCHEMA_COULD_NOT_BE_LOADED(INTERNAL_SERVER_ERROR),
+  SCHEMA_VERSION_DOES_NOT_EXIST(BAD_REQUEST),
+  SCHEMA_ALREADY_EXISTS(BAD_REQUEST),
+  AVRO_SCHEMA_INVALID_METADATA(BAD_REQUEST),
+  SUBSCRIPTION_ENDPOINT_ADDRESS_CHANGE_EXCEPTION(INTERNAL_SERVER_ERROR),
+  OAUTH_PROVIDER_NOT_EXISTS(NOT_FOUND),
+  OAUTH_PROVIDER_ALREADY_EXISTS(BAD_REQUEST),
+  TOPIC_BLACKLISTED(FORBIDDEN),
+  THROUGHPUT_QUOTA_VIOLATION(429),
+  TOPIC_NOT_UNBLACKLISTED(BAD_REQUEST),
+  TOPIC_CONSTRAINTS_ALREADY_EXIST(BAD_REQUEST),
+  TOPIC_CONSTRAINTS_DO_NOT_EXIST(BAD_REQUEST),
+  SUBSCRIPTION_CONSTRAINTS_ALREADY_EXIST(BAD_REQUEST),
+  SUBSCRIPTION_CONSTRAINTS_DO_NOT_EXIST(BAD_REQUEST),
+  OWNER_SOURCE_NOT_FOUND(NOT_FOUND),
+  OWNER_SOURCE_DOESNT_SUPPORT_AUTOCOMPLETE(BAD_REQUEST),
+  OWNER_NOT_FOUND(NOT_FOUND),
+  PERMISSION_DENIED(FORBIDDEN),
+  UNKNOWN_MIGRATION(NOT_FOUND),
+  INVALID_QUERY(BAD_REQUEST),
+  IMPLEMENTATION_ABSENT(NOT_FOUND),
+  MOVING_SUBSCRIPTION_OFFSETS_VALIDATION_ERROR(BAD_REQUEST),
+  SENDING_TO_KAFKA_TIMEOUT(SERVICE_UNAVAILABLE);
 
-    private final int httpCode;
+  private final int httpCode;
 
-    ErrorCode(Response.Status httpCode) {
-        this.httpCode = httpCode.getStatusCode();
-    }
+  ErrorCode(Response.Status httpCode) {
+    this.httpCode = httpCode.getStatusCode();
+  }
 
-    ErrorCode(int httpCode) {
-        this.httpCode = httpCode;
-    }
+  ErrorCode(int httpCode) {
+    this.httpCode = httpCode;
+  }
 
-    public int getHttpCode() {
-        return httpCode;
-    }
+  public int getHttpCode() {
+    return httpCode;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorDescription.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorDescription.java
index 2e542f4ec2..bb4038fcd2 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorDescription.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorDescription.java
@@ -5,24 +5,25 @@
 
 public class ErrorDescription {
 
-    private final String message;
-    private final ErrorCode code;
+  private final String message;
+  private final ErrorCode code;
 
-    public static ErrorDescription error(String message, ErrorCode errorCode) {
-        return new ErrorDescription(message, errorCode);
-    }
+  public static ErrorDescription error(String message, ErrorCode errorCode) {
+    return new ErrorDescription(message, errorCode);
+  }
 
-    @JsonCreator
-    public ErrorDescription(@JsonProperty("message") String message, @JsonProperty("code") ErrorCode code) {
-        this.message = message;
-        this.code = code;
-    }
+  @JsonCreator
+  public ErrorDescription(
+      @JsonProperty("message") String message, @JsonProperty("code") ErrorCode code) {
+    this.message = message;
+    this.code = code;
+  }
 
-    public String getMessage() {
-        return message;
-    }
+  public String getMessage() {
+    return message;
+  }
 
-    public ErrorCode getCode() {
-        return code;
-    }
+  public ErrorCode getCode() {
+    return code;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Group.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Group.java
index 6d58c2f8b2..e0a05eb857 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Group.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Group.java
@@ -3,47 +3,45 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
-
 import java.util.Objects;
 
 public class Group {
 
-    @NotNull
-    private final String groupName;
+  @NotNull private final String groupName;
 
-    @JsonCreator
-    public Group(@JsonProperty("groupName") String groupName) {
-        this.groupName = groupName;
-    }
+  @JsonCreator
+  public Group(@JsonProperty("groupName") String groupName) {
+    this.groupName = groupName;
+  }
 
-    public static Group from(String groupName) {
-        return new Group(groupName);
-    }
+  public static Group from(String groupName) {
+    return new Group(groupName);
+  }
 
-    public String getGroupName() {
-        return groupName;
-    }
+  public String getGroupName() {
+    return groupName;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof Group)) {
-            return false;
-        }
-        Group group = (Group) o;
-
-        return Objects.equals(this.getGroupName(), group.getGroupName());
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(groupName);
+    if (!(o instanceof Group)) {
+      return false;
     }
+    Group group = (Group) o;
 
-    @Override
-    public String toString() {
-        return "Group(" + groupName + ")";
-    }
+    return Objects.equals(this.getGroupName(), group.getGroupName());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(groupName);
+  }
+
+  @Override
+  public String toString() {
+    return "Group(" + groupName + ")";
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Header.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Header.java
index af96c6371e..9b11b464fa 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Header.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Header.java
@@ -3,46 +3,42 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
-
 import java.util.Objects;
 
 public class Header {
 
-    @NotNull
-    private String name;
+  @NotNull private String name;
 
-    @NotNull
-    private String value;
+  @NotNull private String value;
 
-    @JsonCreator
-    public Header(@JsonProperty("name") String name, @JsonProperty("value") String value) {
-        this.name = name;
-        this.value = value;
-    }
+  @JsonCreator
+  public Header(@JsonProperty("name") String name, @JsonProperty("value") String value) {
+    this.name = name;
+    this.value = value;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public String getValue() {
-        return value;
-    }
+  public String getValue() {
+    return value;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Header header = (Header) o;
-        return Objects.equals(name, header.name)
-                && Objects.equals(value, header.value);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, value);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    Header header = (Header) o;
+    return Objects.equals(name, header.name) && Objects.equals(value, header.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, value);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentGroup.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentGroup.java
index 2cf02419ed..8eaec6eabf 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentGroup.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentGroup.java
@@ -2,32 +2,32 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.List;
 
 public class InconsistentGroup {
-    private final String name;
-    private final List<InconsistentMetadata> inconsistentMetadata;
-    private final List<InconsistentTopic> inconsistentTopics;
+  private final String name;
+  private final List<InconsistentMetadata> inconsistentMetadata;
+  private final List<InconsistentTopic> inconsistentTopics;
 
-    @JsonCreator
-    public InconsistentGroup(@JsonProperty("name") String name,
-                             @JsonProperty("inconsistentMetadata") List<InconsistentMetadata> inconsistentMetadata,
-                             @JsonProperty("inconsistentTopics") List<InconsistentTopic> inconsistentTopics) {
-        this.name = name;
-        this.inconsistentMetadata = inconsistentMetadata;
-        this.inconsistentTopics = inconsistentTopics;
-    }
+  @JsonCreator
+  public InconsistentGroup(
+      @JsonProperty("name") String name,
+      @JsonProperty("inconsistentMetadata") List<InconsistentMetadata> inconsistentMetadata,
+      @JsonProperty("inconsistentTopics") List<InconsistentTopic> inconsistentTopics) {
+    this.name = name;
+    this.inconsistentMetadata = inconsistentMetadata;
+    this.inconsistentTopics = inconsistentTopics;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public List<InconsistentMetadata> getInconsistentMetadata() {
-        return inconsistentMetadata;
-    }
+  public List<InconsistentMetadata> getInconsistentMetadata() {
+    return inconsistentMetadata;
+  }
 
-    public List<InconsistentTopic> getInconsistentTopics() {
-        return inconsistentTopics;
-    }
+  public List<InconsistentTopic> getInconsistentTopics() {
+    return inconsistentTopics;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentMetadata.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentMetadata.java
index 27e6e9bc4d..e94ec573d0 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentMetadata.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentMetadata.java
@@ -4,21 +4,21 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class InconsistentMetadata {
-    private final String datacenter;
-    private final String content;
+  private final String datacenter;
+  private final String content;
 
-    @JsonCreator
-    public InconsistentMetadata(@JsonProperty("datacenter") String datacenter,
-                                @JsonProperty("content") String content) {
-        this.datacenter = datacenter;
-        this.content = content;
-    }
+  @JsonCreator
+  public InconsistentMetadata(
+      @JsonProperty("datacenter") String datacenter, @JsonProperty("content") String content) {
+    this.datacenter = datacenter;
+    this.content = content;
+  }
 
-    public String getDatacenter() {
-        return datacenter;
-    }
+  public String getDatacenter() {
+    return datacenter;
+  }
 
-    public String getContent() {
-        return content;
-    }
+  public String getContent() {
+    return content;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentSubscription.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentSubscription.java
index 7418459f55..27e239078e 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentSubscription.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentSubscription.java
@@ -2,25 +2,25 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.List;
 
 public class InconsistentSubscription {
-    private final String name;
-    private final List<InconsistentMetadata> inconsistentMetadata;
+  private final String name;
+  private final List<InconsistentMetadata> inconsistentMetadata;
 
-    @JsonCreator
-    public InconsistentSubscription(@JsonProperty("name") String name,
-                                    @JsonProperty("inconsistentMetadata") List<InconsistentMetadata> inconsistentMetadata) {
-        this.name = name;
-        this.inconsistentMetadata = inconsistentMetadata;
-    }
+  @JsonCreator
+  public InconsistentSubscription(
+      @JsonProperty("name") String name,
+      @JsonProperty("inconsistentMetadata") List<InconsistentMetadata> inconsistentMetadata) {
+    this.name = name;
+    this.inconsistentMetadata = inconsistentMetadata;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public List<InconsistentMetadata> getInconsistentMetadata() {
-        return inconsistentMetadata;
-    }
+  public List<InconsistentMetadata> getInconsistentMetadata() {
+    return inconsistentMetadata;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentTopic.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentTopic.java
index 3b4c609efc..549f30554e 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentTopic.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/InconsistentTopic.java
@@ -2,32 +2,33 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.List;
 
 public class InconsistentTopic {
-    private final String name;
-    private final List<InconsistentMetadata> inconsistentMetadata;
-    private final List<InconsistentSubscription> inconsistentSubscriptions;
+  private final String name;
+  private final List<InconsistentMetadata> inconsistentMetadata;
+  private final List<InconsistentSubscription> inconsistentSubscriptions;
 
-    @JsonCreator
-    public InconsistentTopic(@JsonProperty("name") String name,
-                             @JsonProperty("inconsistentMetadata") List<InconsistentMetadata> inconsistentMetadata,
-                             @JsonProperty("inconsistentSubscriptions") List<InconsistentSubscription> inconsistentSubscriptions) {
-        this.name = name;
-        this.inconsistentMetadata = inconsistentMetadata;
-        this.inconsistentSubscriptions = inconsistentSubscriptions;
-    }
+  @JsonCreator
+  public InconsistentTopic(
+      @JsonProperty("name") String name,
+      @JsonProperty("inconsistentMetadata") List<InconsistentMetadata> inconsistentMetadata,
+      @JsonProperty("inconsistentSubscriptions")
+          List<InconsistentSubscription> inconsistentSubscriptions) {
+    this.name = name;
+    this.inconsistentMetadata = inconsistentMetadata;
+    this.inconsistentSubscriptions = inconsistentSubscriptions;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public List<InconsistentMetadata> getInconsistentMetadata() {
-        return inconsistentMetadata;
-    }
+  public List<InconsistentMetadata> getInconsistentMetadata() {
+    return inconsistentMetadata;
+  }
 
-    public List<InconsistentSubscription> getInconsistentSubscriptions() {
-        return inconsistentSubscriptions;
-    }
+  public List<InconsistentSubscription> getInconsistentSubscriptions() {
+    return inconsistentSubscriptions;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFilterSpecification.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFilterSpecification.java
index 018d8d7c11..bc0293ebbb 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFilterSpecification.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFilterSpecification.java
@@ -2,69 +2,67 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-
 import java.util.Map;
 import java.util.Objects;
 
 public class MessageFilterSpecification {
-    private final String type;
-    private final Map<String, Object> spec;
+  private final String type;
+  private final Map<String, Object> spec;
 
-    @JsonCreator
-    public MessageFilterSpecification(Map<String, Object> spec) {
-        this.spec = spec;
-        this.type = getStringValue("type");
-    }
+  @JsonCreator
+  public MessageFilterSpecification(Map<String, Object> spec) {
+    this.spec = spec;
+    this.type = getStringValue("type");
+  }
 
-    public String getType() {
-        return type;
-    }
+  public String getType() {
+    return type;
+  }
 
-    public String getPath() {
-        return getStringValue("path");
-    }
+  public String getPath() {
+    return getStringValue("path");
+  }
 
-    public String getMatcher() {
-        return getStringValue("matcher");
-    }
+  public String getMatcher() {
+    return getStringValue("matcher");
+  }
 
-    public String getHeader() {
-        return getStringValue("header");
-    }
+  public String getHeader() {
+    return getStringValue("header");
+  }
 
-    public String getMatchingStrategy() {
-        return getStringValue("matchingStrategy");
-    }
+  public String getMatchingStrategy() {
+    return getStringValue("matchingStrategy");
+  }
 
-    @SuppressWarnings("unchecked")
-    public <T> T getFieldValue(String key) {
-        return (T) spec.get(key);
-    }
+  @SuppressWarnings("unchecked")
+  public <T> T getFieldValue(String key) {
+    return (T) spec.get(key);
+  }
 
-    public String getStringValue(String key) {
-        return getFieldValue(key);
-    }
+  public String getStringValue(String key) {
+    return getFieldValue(key);
+  }
 
-    @JsonValue
-    public Object getJsonValue() {
-        return spec;
-    }
+  @JsonValue
+  public Object getJsonValue() {
+    return spec;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MessageFilterSpecification that = (MessageFilterSpecification) o;
-        return Objects.equals(type, that.type)
-                && Objects.equals(spec, that.spec);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(type, spec);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    MessageFilterSpecification that = (MessageFilterSpecification) o;
+    return Objects.equals(type, that.type) && Objects.equals(spec, that.spec);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(type, spec);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationInput.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationInput.java
index eecb9e6dda..2d81c2d371 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationInput.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationInput.java
@@ -3,27 +3,26 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
-
 import java.util.List;
 
 public class MessageFiltersVerificationInput {
-    private final List<MessageFilterSpecification> filters;
+  private final List<MessageFilterSpecification> filters;
 
-    @NotNull
-    private final byte[] message;
+  @NotNull private final byte[] message;
 
-    @JsonCreator
-    public MessageFiltersVerificationInput(@JsonProperty("filters") List<MessageFilterSpecification> filters,
-                                           @JsonProperty("message") byte[] message) {
-        this.filters = filters;
-        this.message = message;
-    }
+  @JsonCreator
+  public MessageFiltersVerificationInput(
+      @JsonProperty("filters") List<MessageFilterSpecification> filters,
+      @JsonProperty("message") byte[] message) {
+    this.filters = filters;
+    this.message = message;
+  }
 
-    public List<MessageFilterSpecification> getFilters() {
-        return filters;
-    }
+  public List<MessageFilterSpecification> getFilters() {
+    return filters;
+  }
 
-    public byte[] getMessage() {
-        return message;
-    }
+  public byte[] getMessage() {
+    return message;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationResult.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationResult.java
index 17ea37cb0f..39f0bfb01f 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationResult.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationResult.java
@@ -4,27 +4,28 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class MessageFiltersVerificationResult {
-    private final VerificationStatus status;
-    private final String errorMessage;
+  private final VerificationStatus status;
+  private final String errorMessage;
 
-    public enum VerificationStatus {
-        NOT_MATCHED,
-        MATCHED,
-        ERROR
-    }
+  public enum VerificationStatus {
+    NOT_MATCHED,
+    MATCHED,
+    ERROR
+  }
 
-    @JsonCreator
-    public MessageFiltersVerificationResult(@JsonProperty("status") VerificationStatus status,
-                                            @JsonProperty("errorMessage") String errorMessage) {
-        this.status = status;
-        this.errorMessage = errorMessage;
-    }
+  @JsonCreator
+  public MessageFiltersVerificationResult(
+      @JsonProperty("status") VerificationStatus status,
+      @JsonProperty("errorMessage") String errorMessage) {
+    this.status = status;
+    this.errorMessage = errorMessage;
+  }
 
-    public VerificationStatus getStatus() {
-        return status;
-    }
+  public VerificationStatus getStatus() {
+    return status;
+  }
 
-    public String getErrorMessage() {
-        return errorMessage;
-    }
+  public String getErrorMessage() {
+    return errorMessage;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageTextPreview.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageTextPreview.java
index fe475434bd..c756ddb4e0 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageTextPreview.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageTextPreview.java
@@ -5,21 +5,22 @@
 
 public class MessageTextPreview {
 
-    private final String content;
+  private final String content;
 
-    private final boolean truncated;
+  private final boolean truncated;
 
-    @JsonCreator
-    public MessageTextPreview(@JsonProperty("content") String content, @JsonProperty("truncated") boolean truncated) {
-        this.content = content;
-        this.truncated = truncated;
-    }
+  @JsonCreator
+  public MessageTextPreview(
+      @JsonProperty("content") String content, @JsonProperty("truncated") boolean truncated) {
+    this.content = content;
+    this.truncated = truncated;
+  }
 
-    public String getContent() {
-        return content;
-    }
+  public String getContent() {
+    return content;
+  }
 
-    public boolean isTruncated() {
-        return truncated;
-    }
+  public boolean isTruncated() {
+    return truncated;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageTrace.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageTrace.java
index d84f209e26..4250dc00bc 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageTrace.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageTrace.java
@@ -1,4 +1,3 @@
 package pl.allegro.tech.hermes.api;
 
-public interface MessageTrace {
-}
+public interface MessageTrace {}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MetricDecimalValue.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MetricDecimalValue.java
index ff033e775a..3fa2e56fbe 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MetricDecimalValue.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MetricDecimalValue.java
@@ -1,68 +1,76 @@
 package pl.allegro.tech.hermes.api;
 
+import static java.lang.Double.parseDouble;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-
 import java.util.Objects;
 
-import static java.lang.Double.parseDouble;
-
 public class MetricDecimalValue {
-    private static final String UNAVAILABLE_STRING = "unavailable";
-    private static final MetricDecimalValue UNAVAILABLE = new MetricDecimalValue(false, "-1.0");
+  private static final String UNAVAILABLE_STRING = "unavailable";
+  private static final MetricDecimalValue UNAVAILABLE = new MetricDecimalValue(false, "-1.0");
+  private static final MetricDecimalValue DEFAULT_VALUE = new MetricDecimalValue(true, "0.0");
 
-    private final boolean available;
-    private final String value;
+  private final boolean available;
+  private final String value;
 
-    private MetricDecimalValue(boolean available, String value) {
-        this.available = available;
-        this.value = value;
-    }
+  private MetricDecimalValue(boolean available, String value) {
+    this.available = available;
+    this.value = value;
+  }
 
-    public static MetricDecimalValue unavailable() {
-        return UNAVAILABLE;
-    }
+  public static MetricDecimalValue unavailable() {
+    return UNAVAILABLE;
+  }
 
-    public static MetricDecimalValue of(String value) {
-        return new MetricDecimalValue(true, value);
-    }
+  public static MetricDecimalValue defaultValue() {
+    return DEFAULT_VALUE;
+  }
 
-    @JsonCreator
-    public static MetricDecimalValue deserialize(String value) {
-        if (UNAVAILABLE_STRING.equals(value)) {
-            return unavailable();
-        }
-        return of(value);
-    }
+  public static MetricDecimalValue of(String value) {
+    return new MetricDecimalValue(true, value);
+  }
 
-    @JsonValue
-    public String asString() {
-        return available ? value : UNAVAILABLE_STRING;
+  @JsonCreator
+  public static MetricDecimalValue deserialize(String value) {
+    if (UNAVAILABLE_STRING.equals(value)) {
+      return unavailable();
     }
+    return of(value);
+  }
 
-    public double toDouble() {
-        return parseDouble(value);
-    }
+  @JsonValue
+  public String asString() {
+    return available ? value : UNAVAILABLE_STRING;
+  }
 
-    public boolean isAvailable() {
-        return available;
-    }
+  public double toDouble() {
+    return parseDouble(value);
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetricDecimalValue that = (MetricDecimalValue) o;
-        return available == that.available
-                && Objects.equals(value, that.value);
-    }
+  public boolean isAvailable() {
+    return available;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(available, value);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MetricDecimalValue that = (MetricDecimalValue) o;
+    return available == that.available && Objects.equals(value, that.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(available, value);
+  }
+
+  @Override
+  public String toString() {
+    return "MetricDecimalValue{" + "available=" + available + ", value='" + value + '\'' + '}';
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MetricLongValue.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MetricLongValue.java
index 77753fb51a..648154b301 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MetricLongValue.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MetricLongValue.java
@@ -2,65 +2,63 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-
 import java.util.Objects;
 
 public class MetricLongValue {
-    private static final String UNAVAILABLE_STRING = "unavailable";
-    private static final MetricLongValue UNAVAILABLE = new MetricLongValue(false, -1);
+  private static final String UNAVAILABLE_STRING = "unavailable";
+  private static final MetricLongValue UNAVAILABLE = new MetricLongValue(false, -1);
 
-    private final boolean available;
-    private final long value;
+  private final boolean available;
+  private final long value;
 
-    private MetricLongValue(boolean available, long value) {
-        this.available = available;
-        this.value = value;
-    }
+  private MetricLongValue(boolean available, long value) {
+    this.available = available;
+    this.value = value;
+  }
 
-    public static MetricLongValue unavailable() {
-        return UNAVAILABLE;
-    }
+  public static MetricLongValue unavailable() {
+    return UNAVAILABLE;
+  }
 
-    public static MetricLongValue of(long value) {
-        return new MetricLongValue(true, value);
-    }
+  public static MetricLongValue of(long value) {
+    return new MetricLongValue(true, value);
+  }
 
-    @JsonCreator
-    public static MetricLongValue deserialize(String value) {
-        if (UNAVAILABLE_STRING.equals(value)) {
-            return unavailable();
-        }
-        return of(Long.valueOf(value));
+  @JsonCreator
+  public static MetricLongValue deserialize(String value) {
+    if (UNAVAILABLE_STRING.equals(value)) {
+      return unavailable();
     }
+    return of(Long.valueOf(value));
+  }
 
-    @JsonValue
-    public String asString() {
-        return available ? String.valueOf(value) : UNAVAILABLE_STRING;
-    }
+  @JsonValue
+  public String asString() {
+    return available ? String.valueOf(value) : UNAVAILABLE_STRING;
+  }
 
-    public long toLong() {
-        return value;
-    }
+  public long toLong() {
+    return value;
+  }
 
-    public boolean isAvailable() {
-        return available;
-    }
+  public boolean isAvailable() {
+    return available;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MetricLongValue that = (MetricLongValue) o;
-        return available == that.available
-                && value == that.value;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(available, value);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    MetricLongValue that = (MetricLongValue) o;
+    return available == that.available && value == that.value;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(available, value);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MonitoringDetails.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MonitoringDetails.java
index d35e99cc26..502a646c2d 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MonitoringDetails.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MonitoringDetails.java
@@ -3,65 +3,58 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
-
 import java.util.Objects;
 
 public final class MonitoringDetails {
-    public static final MonitoringDetails EMPTY = new MonitoringDetails(Severity.NON_IMPORTANT, "");
+  public static final MonitoringDetails EMPTY = new MonitoringDetails(Severity.NON_IMPORTANT, "");
 
-    @NotNull
-    private final Severity severity;
+  @NotNull private final Severity severity;
 
-    @NotNull
-    private final String reaction;
+  @NotNull private final String reaction;
 
-    @JsonCreator
-    public MonitoringDetails(@JsonProperty("severity") Severity severity,
-                             @JsonProperty("reaction") String reaction) {
-        this.severity = severity;
-        this.reaction = reaction;
-    }
+  @JsonCreator
+  public MonitoringDetails(
+      @JsonProperty("severity") Severity severity, @JsonProperty("reaction") String reaction) {
+    this.severity = severity;
+    this.reaction = reaction;
+  }
 
-    public Severity getSeverity() {
-        return severity;
-    }
+  public Severity getSeverity() {
+    return severity;
+  }
 
-    public String getReaction() {
-        return reaction;
-    }
+  public String getReaction() {
+    return reaction;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof MonitoringDetails)) {
-            return false;
-        }
-        MonitoringDetails that = (MonitoringDetails) o;
-        return severity == that.severity
-                && Objects.equals(reaction, that.reaction);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(severity, reaction);
-    }
-
-    @Override
-    public String toString() {
-        return "MonitoringDetails{"
-                + "severity=" + severity
-                + ", reaction='" + reaction + '\''
-                + '}';
-    }
-
-    public enum Severity {
-        @JsonProperty("CRITICAL")
-        CRITICAL,
-        @JsonProperty("IMPORTANT")
-        IMPORTANT,
-        @JsonProperty("NON_IMPORTANT")
-        NON_IMPORTANT
+    if (!(o instanceof MonitoringDetails)) {
+      return false;
     }
+    MonitoringDetails that = (MonitoringDetails) o;
+    return severity == that.severity && Objects.equals(reaction, that.reaction);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(severity, reaction);
+  }
+
+  @Override
+  public String toString() {
+    return "MonitoringDetails{" + "severity=" + severity + ", reaction='" + reaction + '\'' + '}';
+  }
+
+  public enum Severity {
+    @JsonProperty("CRITICAL")
+    CRITICAL,
+    @JsonProperty("IMPORTANT")
+    IMPORTANT,
+    @JsonProperty("NON_IMPORTANT")
+    NON_IMPORTANT
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OAuthProvider.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OAuthProvider.java
index 2654d1990d..a9accea130 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OAuthProvider.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OAuthProvider.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.api;
 
+import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.Max;
@@ -7,119 +9,121 @@
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
-
 import java.util.Objects;
 
-import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX;
-
 public class OAuthProvider implements Anonymizable {
 
-    private static final String ANONYMIZED_CLIENT_SECRET = "******";
-    private static final int DEFAULT_SOCKET_TIMEOUT = 0;
-
-    @NotEmpty
-    @Pattern(regexp = ALLOWED_NAME_REGEX)
-    private final String name;
-
-    @NotEmpty
-    private final String tokenEndpoint;
-
-    @NotEmpty
-    private final String clientId;
-
-    @NotEmpty
-    private final String clientSecret;
-
-    @Min(0)
-    @Max(3600_000)
-    @NotNull
-    private final Integer tokenRequestInitialDelay;
-
-    @Min(0)
-    @Max(3600_000)
-    @NotNull
-    private final Integer tokenRequestMaxDelay;
-
-    @Min(100)
-    @Max(60_000)
-    @NotNull
-    private Integer requestTimeout;
-
-    @Min(0)
-    @Max(60_000)
-    @NotNull
-    private Integer socketTimeout;
-
-    @JsonCreator
-    public OAuthProvider(@JsonProperty("name") String name,
-                         @JsonProperty("tokenEndpoint") String tokenEndpoint,
-                         @JsonProperty("clientId") String clientId,
-                         @JsonProperty("clientSecret") String clientSecret,
-                         @JsonProperty("tokenRequestInitialDelay") Integer tokenRequestInitialDelay,
-                         @JsonProperty("tokenRequestMaxDelay") Integer tokenRequestMaxDelay,
-                         @JsonProperty("requestTimeout") Integer requestTimeout,
-                         @JsonProperty("socketTimeout") Integer socketTimeout) {
-        this.name = name;
-        this.tokenEndpoint = tokenEndpoint;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.tokenRequestInitialDelay = tokenRequestInitialDelay;
-        this.tokenRequestMaxDelay = tokenRequestMaxDelay;
-        this.requestTimeout = requestTimeout;
-        this.socketTimeout = socketTimeout != null ? socketTimeout : DEFAULT_SOCKET_TIMEOUT;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getTokenEndpoint() {
-        return tokenEndpoint;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public String getClientSecret() {
-        return clientSecret;
+  private static final String ANONYMIZED_CLIENT_SECRET = "******";
+  private static final int DEFAULT_SOCKET_TIMEOUT = 0;
+
+  @NotEmpty
+  @Pattern(regexp = ALLOWED_NAME_REGEX)
+  private final String name;
+
+  @NotEmpty private final String tokenEndpoint;
+
+  @NotEmpty private final String clientId;
+
+  @NotEmpty private final String clientSecret;
+
+  @Min(0)
+  @Max(3600_000)
+  @NotNull
+  private final Integer tokenRequestInitialDelay;
+
+  @Min(0)
+  @Max(3600_000)
+  @NotNull
+  private final Integer tokenRequestMaxDelay;
+
+  @Min(100)
+  @Max(60_000)
+  @NotNull
+  private Integer requestTimeout;
+
+  @Min(0)
+  @Max(60_000)
+  @NotNull
+  private Integer socketTimeout;
+
+  @JsonCreator
+  public OAuthProvider(
+      @JsonProperty("name") String name,
+      @JsonProperty("tokenEndpoint") String tokenEndpoint,
+      @JsonProperty("clientId") String clientId,
+      @JsonProperty("clientSecret") String clientSecret,
+      @JsonProperty("tokenRequestInitialDelay") Integer tokenRequestInitialDelay,
+      @JsonProperty("tokenRequestMaxDelay") Integer tokenRequestMaxDelay,
+      @JsonProperty("requestTimeout") Integer requestTimeout,
+      @JsonProperty("socketTimeout") Integer socketTimeout) {
+    this.name = name;
+    this.tokenEndpoint = tokenEndpoint;
+    this.clientId = clientId;
+    this.clientSecret = clientSecret;
+    this.tokenRequestInitialDelay = tokenRequestInitialDelay;
+    this.tokenRequestMaxDelay = tokenRequestMaxDelay;
+    this.requestTimeout = requestTimeout;
+    this.socketTimeout = socketTimeout != null ? socketTimeout : DEFAULT_SOCKET_TIMEOUT;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getTokenEndpoint() {
+    return tokenEndpoint;
+  }
+
+  public String getClientId() {
+    return clientId;
+  }
+
+  public String getClientSecret() {
+    return clientSecret;
+  }
+
+  public Integer getTokenRequestInitialDelay() {
+    return tokenRequestInitialDelay;
+  }
+
+  public Integer getTokenRequestMaxDelay() {
+    return tokenRequestMaxDelay;
+  }
+
+  public Integer getRequestTimeout() {
+    return requestTimeout;
+  }
+
+  public Integer getSocketTimeout() {
+    return socketTimeout;
+  }
+
+  public OAuthProvider anonymize() {
+    return new OAuthProvider(
+        name,
+        tokenEndpoint,
+        clientId,
+        ANONYMIZED_CLIENT_SECRET,
+        tokenRequestInitialDelay,
+        tokenRequestMaxDelay,
+        requestTimeout,
+        socketTimeout);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    public Integer getTokenRequestInitialDelay() {
-        return tokenRequestInitialDelay;
-    }
-
-    public Integer getTokenRequestMaxDelay() {
-        return tokenRequestMaxDelay;
-    }
-
-    public Integer getRequestTimeout() {
-        return requestTimeout;
-    }
-
-    public Integer getSocketTimeout() {
-        return socketTimeout;
-    }
-
-    public OAuthProvider anonymize() {
-        return new OAuthProvider(name, tokenEndpoint, clientId, ANONYMIZED_CLIENT_SECRET,
-                tokenRequestInitialDelay, tokenRequestMaxDelay, requestTimeout, socketTimeout);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OAuthProvider that = (OAuthProvider) o;
-        return Objects.equals(name, that.name);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    OAuthProvider that = (OAuthProvider) o;
+    return Objects.equals(name, that.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetentionTime.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetentionTime.java
index 850b2fa389..9aad1854a6 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetentionTime.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetentionTime.java
@@ -2,52 +2,51 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.Min;
-
 import java.util.Objects;
 
 public class OfflineRetentionTime {
 
-    @Min(1)
-    private final Integer duration;
+  @Min(1)
+  private final Integer duration;
 
-    private final boolean infinite;
+  private final boolean infinite;
 
-    public OfflineRetentionTime(@JsonProperty("duration") Integer duration, @JsonProperty("infinite") boolean infinite) {
-        this.infinite = infinite;
-        this.duration = infinite ? null : duration;
-    }
+  public OfflineRetentionTime(
+      @JsonProperty("duration") Integer duration, @JsonProperty("infinite") boolean infinite) {
+    this.infinite = infinite;
+    this.duration = infinite ? null : duration;
+  }
 
-    public static OfflineRetentionTime of(int duration) {
-        return new OfflineRetentionTime(duration, false);
-    }
+  public static OfflineRetentionTime of(int duration) {
+    return new OfflineRetentionTime(duration, false);
+  }
 
-    public static OfflineRetentionTime infinite() {
-        return new OfflineRetentionTime(null, false);
-    }
+  public static OfflineRetentionTime infinite() {
+    return new OfflineRetentionTime(null, false);
+  }
 
-    public Integer getDuration() {
-        return duration;
-    }
+  public Integer getDuration() {
+    return duration;
+  }
 
-    public boolean isInfinite() {
-        return infinite;
-    }
+  public boolean isInfinite() {
+    return infinite;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof OfflineRetentionTime)) {
-            return false;
-        }
-        OfflineRetentionTime that = (OfflineRetentionTime) o;
-        return infinite == that.infinite
-                && Objects.equals(duration, that.duration);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(duration, infinite);
+    if (!(o instanceof OfflineRetentionTime)) {
+      return false;
     }
+    OfflineRetentionTime that = (OfflineRetentionTime) o;
+    return infinite == that.infinite && Objects.equals(duration, that.duration);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(duration, infinite);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java
index ef79fef7fd..dfa21e8569 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java
@@ -5,57 +5,102 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import pl.allegro.tech.hermes.api.jackson.InstantIsoSerializer;
-
 import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.List;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.constraints.OneSourceRetransmission;
+import pl.allegro.tech.hermes.api.jackson.InstantIsoSerializer;
 
+@OneSourceRetransmission
 public class OfflineRetransmissionRequest {
-    @NotEmpty
-    private final String sourceTopic;
-    @NotEmpty
-    private final String targetTopic;
-    @NotNull
-    private final Instant startTimestamp;
-    @NotNull
-    private final Instant endTimestamp;
-
-    @JsonCreator
-    public OfflineRetransmissionRequest(
-            @JsonProperty("sourceTopic") String sourceTopic,
-            @JsonProperty("targetTopic") String targetTopic,
-            @JsonProperty("startTimestamp") Instant startTimestamp,
-            @JsonProperty("endTimestamp") Instant endTimestamp) {
-        this.sourceTopic = sourceTopic;
-        this.targetTopic = targetTopic;
-        this.startTimestamp = startTimestamp;
-        this.endTimestamp = endTimestamp;
-    }
 
-    public String getSourceTopic() {
-        return sourceTopic;
-    }
+  private static final List<DateTimeFormatter> formatters =
+      List.of(
+          DateTimeFormatter.ISO_INSTANT,
+          DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'").withZone(ZoneId.of("UTC")),
+          DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm'Z'").withZone(ZoneId.of("UTC")));
+  private static final Logger logger = LoggerFactory.getLogger(OfflineRetransmissionRequest.class);
 
-    public String getTargetTopic() {
-        return targetTopic;
-    }
+  private final String sourceViewPath;
+  private final String sourceTopic;
+  @NotEmpty private final String targetTopic;
+  @NotNull private Instant startTimestamp;
+  @NotNull private Instant endTimestamp;
 
-    @JsonSerialize(using = InstantIsoSerializer.class)
-    public Instant getStartTimestamp() {
-        return startTimestamp;
-    }
+  @JsonCreator
+  public OfflineRetransmissionRequest(
+      @JsonProperty("sourceViewPath") String sourceViewPath,
+      @JsonProperty("sourceTopic") String sourceTopic,
+      @JsonProperty("targetTopic") String targetTopic,
+      @JsonProperty("startTimestamp") String startTimestamp,
+      @JsonProperty("endTimestamp") String endTimestamp) {
+    this.sourceViewPath = sourceViewPath;
+    this.sourceTopic = sourceTopic;
+    this.targetTopic = targetTopic;
+    this.startTimestamp = initializeTimestamp(startTimestamp);
+    this.endTimestamp = initializeTimestamp(endTimestamp);
+  }
 
-    @JsonSerialize(using = InstantIsoSerializer.class)
-    public Instant getEndTimestamp() {
-        return endTimestamp;
+  private Instant initializeTimestamp(String timestamp) {
+    if (timestamp == null) {
+      return null;
     }
 
-    @Override
-    public String toString() {
-        return "OfflineRetransmissionRequest{"
-                + "sourceTopic='" + sourceTopic + '\''
-                + ", targetTopic='" + targetTopic + '\''
-                + ", startTimestamp=" + startTimestamp
-                + ", endTimestamp=" + endTimestamp
-                + '}';
+    for (DateTimeFormatter formatter : formatters) {
+      try {
+        return formatter.parse(timestamp, Instant::from);
+      } catch (DateTimeParseException e) {
+        // ignore
+      }
     }
+
+    logger.warn("Provided date [{}] has an invalid format", timestamp);
+    return null;
+  }
+
+  public Optional<String> getSourceViewPath() {
+    return Optional.ofNullable(sourceViewPath);
+  }
+
+  public Optional<String> getSourceTopic() {
+    return Optional.ofNullable(sourceTopic);
+  }
+
+  public String getTargetTopic() {
+    return targetTopic;
+  }
+
+  @JsonSerialize(using = InstantIsoSerializer.class)
+  public Instant getStartTimestamp() {
+    return startTimestamp;
+  }
+
+  @JsonSerialize(using = InstantIsoSerializer.class)
+  public Instant getEndTimestamp() {
+    return endTimestamp;
+  }
+
+  @Override
+  public String toString() {
+    return "OfflineRetransmissionRequest{"
+        + "sourceTopic='"
+        + sourceTopic
+        + '\''
+        + ", sourceViewPath='"
+        + sourceViewPath
+        + '\''
+        + ", targetTopic='"
+        + targetTopic
+        + '\''
+        + ", startTimestamp="
+        + startTimestamp
+        + ", endTimestamp="
+        + endTimestamp
+        + '}';
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionTask.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionTask.java
index ed1c69753e..a94a6d54c9 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionTask.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionTask.java
@@ -4,69 +4,80 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import pl.allegro.tech.hermes.api.jackson.InstantIsoSerializer;
-
 import java.time.Instant;
+import java.util.Optional;
+import pl.allegro.tech.hermes.api.jackson.InstantIsoSerializer;
 
 public class OfflineRetransmissionTask {
-    private final String taskId;
-    private final OfflineRetransmissionRequest request;
-    private final Instant createdAt;
+  private final String taskId;
+  private final OfflineRetransmissionRequest request;
+  private final Instant createdAt;
+
+  @JsonCreator
+  public OfflineRetransmissionTask(
+      @JsonProperty("taskId") String taskId,
+      @JsonProperty("sourceViewPath") String sourceViewPath,
+      @JsonProperty("sourceTopic") String sourceTopic,
+      @JsonProperty("targetTopic") String targetTopic,
+      @JsonProperty("startTimestamp") Instant startTimestamp,
+      @JsonProperty("endTimestamp") Instant endTimestamp,
+      @JsonProperty("createdAt") Instant createdAt) {
+    this(
+        taskId,
+        new OfflineRetransmissionRequest(
+            sourceViewPath,
+            sourceTopic,
+            targetTopic,
+            startTimestamp.toString(),
+            endTimestamp.toString()),
+        createdAt);
+  }
 
-    @JsonCreator
-    public OfflineRetransmissionTask(
-            @JsonProperty("taskId") String taskId,
-            @JsonProperty("sourceTopic") String sourceTopic,
-            @JsonProperty("targetTopic") String targetTopic,
-            @JsonProperty("startTimestamp") Instant startTimestamp,
-            @JsonProperty("endTimestamp") Instant endTimestamp,
-            @JsonProperty("createdAt") Instant createdAt) {
-        this(taskId, new OfflineRetransmissionRequest(sourceTopic, targetTopic, startTimestamp, endTimestamp), createdAt);
-    }
+  public OfflineRetransmissionTask(
+      String taskId, OfflineRetransmissionRequest request, Instant createdAt) {
+    this.taskId = taskId;
+    this.request = request;
+    this.createdAt = createdAt;
+  }
 
-    public OfflineRetransmissionTask(String taskId, OfflineRetransmissionRequest request, Instant createdAt) {
-        this.taskId = taskId;
-        this.request = request;
-        this.createdAt = createdAt;
-    }
+  public String getTaskId() {
+    return taskId;
+  }
 
-    public String getTaskId() {
-        return taskId;
-    }
+  public Optional<String> getSourceTopic() {
+    return request.getSourceTopic();
+  }
 
-    public String getSourceTopic() {
-        return request.getSourceTopic();
-    }
+  public Optional<String> getSourceViewPath() {
+    return request.getSourceViewPath();
+  }
 
-    public String getTargetTopic() {
-        return request.getTargetTopic();
-    }
+  public String getTargetTopic() {
+    return request.getTargetTopic();
+  }
 
-    @JsonSerialize(using = InstantIsoSerializer.class)
-    public Instant getStartTimestamp() {
-        return request.getStartTimestamp();
-    }
+  @JsonSerialize(using = InstantIsoSerializer.class)
+  public Instant getStartTimestamp() {
+    return request.getStartTimestamp();
+  }
 
-    @JsonSerialize(using = InstantIsoSerializer.class)
-    public Instant getEndTimestamp() {
-        return request.getEndTimestamp();
-    }
+  @JsonSerialize(using = InstantIsoSerializer.class)
+  public Instant getEndTimestamp() {
+    return request.getEndTimestamp();
+  }
 
-    @JsonSerialize(using = InstantIsoSerializer.class)
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
+  @JsonSerialize(using = InstantIsoSerializer.class)
+  public Instant getCreatedAt() {
+    return createdAt;
+  }
 
-    @JsonIgnore
-    public OfflineRetransmissionRequest getRequest() {
-        return request;
-    }
+  @JsonIgnore
+  public OfflineRetransmissionRequest getRequest() {
+    return request;
+  }
 
-    @Override
-    public String toString() {
-        return "OfflineRetransmissionTask{"
-                + "taskId='" + taskId + '\''
-                + ", request=" + request
-                + '}';
-    }
+  @Override
+  public String toString() {
+    return "OfflineRetransmissionTask{" + "taskId='" + taskId + '\'' + ", request=" + request + '}';
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OffsetRetransmissionDate.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OffsetRetransmissionDate.java
index acd1270616..63e8d202b8 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OffsetRetransmissionDate.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OffsetRetransmissionDate.java
@@ -3,21 +3,20 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import jakarta.validation.constraints.NotNull;
-import pl.allegro.tech.hermes.api.jackson.OffsetDateTimeSerializer;
-
 import java.time.OffsetDateTime;
+import pl.allegro.tech.hermes.api.jackson.OffsetDateTimeSerializer;
 
 public class OffsetRetransmissionDate {
 
-    @NotNull
-    private final OffsetDateTime retransmissionDate;
+  @NotNull private final OffsetDateTime retransmissionDate;
 
-    public OffsetRetransmissionDate(@JsonProperty("retransmissionDate") OffsetDateTime retransmissionDate) {
-        this.retransmissionDate = retransmissionDate;
-    }
+  public OffsetRetransmissionDate(
+      @JsonProperty("retransmissionDate") OffsetDateTime retransmissionDate) {
+    this.retransmissionDate = retransmissionDate;
+  }
 
-    @JsonSerialize(using = OffsetDateTimeSerializer.class)
-    public OffsetDateTime getRetransmissionDate() {
-        return retransmissionDate;
-    }
+  @JsonSerialize(using = OffsetDateTimeSerializer.class)
+  public OffsetDateTime getRetransmissionDate() {
+    return retransmissionDate;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Owner.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Owner.java
index e3f960303f..29f0ba1f25 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Owner.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Owner.java
@@ -4,65 +4,61 @@
 
 public class Owner {
 
-    private final String id;
-    private final String name;
-    private final String url;
+  private final String id;
+  private final String name;
+  private final String url;
 
-    public Owner() {
-        this.id = null;
-        this.name = null;
-        this.url = null;
-    }
+  public Owner() {
+    this.id = null;
+    this.name = null;
+    this.url = null;
+  }
 
-    public Owner(String id, String name) {
-        this.id = id;
-        this.name = name;
-        this.url = null;
-    }
+  public Owner(String id, String name) {
+    this.id = id;
+    this.name = name;
+    this.url = null;
+  }
 
-    public Owner(String id, String name, String url) {
-        this.id = id;
-        this.name = name;
-        this.url = url;
-    }
+  public Owner(String id, String name, String url) {
+    this.id = id;
+    this.name = name;
+    this.url = url;
+  }
 
-    public String getId() {
-        return id;
-    }
+  public String getId() {
+    return id;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public String getUrl() {
-        return url;
-    }
+  public String getUrl() {
+    return url;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Owner owner = (Owner) o;
-        return Objects.equals(id, owner.id)
-                && Objects.equals(name, owner.name)
-                && Objects.equals(url, owner.url);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, name, url);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    Owner owner = (Owner) o;
+    return Objects.equals(id, owner.id)
+        && Objects.equals(name, owner.name)
+        && Objects.equals(url, owner.url);
+  }
 
-    @Override
-    public String toString() {
-        return "Owner{"
-                + "id='" + id + '\''
-                + ", name='" + name + '\''
-                + ", url='" + url + '\''
-                + '}';
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name, url);
+  }
+
+  @Override
+  public String toString() {
+    return "Owner{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", url='" + url + '\'' + '}';
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OwnerId.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OwnerId.java
index b8838b9279..50afd1fbfc 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OwnerId.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OwnerId.java
@@ -3,55 +3,47 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
-
 import java.util.Objects;
 
 public final class OwnerId {
 
-    @NotNull
-    private final String source;
+  @NotNull private final String source;
 
-    @NotNull
-    private final String id;
+  @NotNull private final String id;
 
-    @JsonCreator
-    public OwnerId(@JsonProperty("source") String source,
-                   @JsonProperty("id") String id) {
-        this.source = source;
-        this.id = id;
-    }
+  @JsonCreator
+  public OwnerId(@JsonProperty("source") String source, @JsonProperty("id") String id) {
+    this.source = source;
+    this.id = id;
+  }
 
-    public String getSource() {
-        return source;
-    }
+  public String getSource() {
+    return source;
+  }
 
-    public String getId() {
-        return id;
-    }
+  public String getId() {
+    return id;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OwnerId that = (OwnerId) o;
-        return Objects.equals(source, that.source)
-                && Objects.equals(id, that.id);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(source, id);
-    }
-
-    @Override
-    public String toString() {
-        return "OwnerId{"
-                + "source='" + source + '\''
-                + ", id='" + id + '\''
-                + '}';
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    OwnerId that = (OwnerId) o;
+    return Objects.equals(source, that.source) && Objects.equals(id, that.id);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(source, id);
+  }
+
+  @Override
+  public String toString() {
+    return "OwnerId{" + "source='" + source + '\'' + ", id='" + id + '\'' + '}';
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PatchData.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PatchData.java
index 5cb408bba5..d4a1aaaed0 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PatchData.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PatchData.java
@@ -2,49 +2,48 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import pl.allegro.tech.hermes.api.jackson.PatchDataDeserializer;
-import pl.allegro.tech.hermes.api.jackson.PatchDataSerializer;
-
 import java.util.HashMap;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.jackson.PatchDataDeserializer;
+import pl.allegro.tech.hermes.api.jackson.PatchDataSerializer;
 
 @JsonDeserialize(using = PatchDataDeserializer.class)
 @JsonSerialize(using = PatchDataSerializer.class)
 public class PatchData {
 
-    private final Map<String, Object> patch;
+  private final Map<String, Object> patch;
 
-    public PatchData(Map<String, Object> patch) {
-        this.patch = patch;
-    }
+  public PatchData(Map<String, Object> patch) {
+    this.patch = patch;
+  }
 
-    public static PatchData from(Map<String, Object> patch) {
-        return new PatchData(patch);
-    }
+  public static PatchData from(Map<String, Object> patch) {
+    return new PatchData(patch);
+  }
 
-    public static Builder patchData() {
-        return new Builder();
-    }
+  public static Builder patchData() {
+    return new Builder();
+  }
 
-    public Map<String, Object> getPatch() {
-        return patch;
-    }
+  public Map<String, Object> getPatch() {
+    return patch;
+  }
 
-    public boolean valueChanged(String field, Object originalValue) {
-        return patch.containsKey(field) && !patch.get(field).equals(originalValue);
-    }
+  public boolean valueChanged(String field, Object originalValue) {
+    return patch.containsKey(field) && !patch.get(field).equals(originalValue);
+  }
 
-    public static class Builder {
+  public static class Builder {
 
-        private final Map<String, Object> map = new HashMap<>();
+    private final Map<String, Object> map = new HashMap<>();
 
-        public PatchData build() {
-            return PatchData.from(map);
-        }
+    public PatchData build() {
+      return PatchData.from(map);
+    }
 
-        public Builder set(String field, Object value) {
-            this.map.put(field, value);
-            return this;
-        }
+    public Builder set(String field, Object value) {
+      this.map.put(field, value);
+      return this;
     }
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PersistentSubscriptionMetrics.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PersistentSubscriptionMetrics.java
index b3cf53ee4f..0ad876225e 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PersistentSubscriptionMetrics.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PersistentSubscriptionMetrics.java
@@ -5,40 +5,41 @@
 
 public class PersistentSubscriptionMetrics {
 
-    private long delivered;
-    private long discarded;
-    private long volume;
-
-    @JsonCreator
-    public PersistentSubscriptionMetrics(@JsonProperty("delivered") long delivered,
-                                         @JsonProperty("discarded") long discarded,
-                                         @JsonProperty("volume") long volume) {
-        this.delivered = delivered;
-        this.discarded = discarded;
-        this.volume = volume;
-    }
-
-    public long getDelivered() {
-        return delivered;
-    }
-
-    public void setDelivered(long delivered) {
-        this.delivered = delivered;
-    }
-
-    public long getDiscarded() {
-        return discarded;
-    }
-
-    public void setDiscarded(long discarded) {
-        this.discarded = discarded;
-    }
-
-    public long getVolume() {
-        return volume;
-    }
-
-    public void setVolume(long volume) {
-        this.volume = volume;
-    }
+  private long delivered;
+  private long discarded;
+  private long volume;
+
+  @JsonCreator
+  public PersistentSubscriptionMetrics(
+      @JsonProperty("delivered") long delivered,
+      @JsonProperty("discarded") long discarded,
+      @JsonProperty("volume") long volume) {
+    this.delivered = delivered;
+    this.discarded = discarded;
+    this.volume = volume;
+  }
+
+  public long getDelivered() {
+    return delivered;
+  }
+
+  public void setDelivered(long delivered) {
+    this.delivered = delivered;
+  }
+
+  public long getDiscarded() {
+    return discarded;
+  }
+
+  public void setDiscarded(long discarded) {
+    this.discarded = discarded;
+  }
+
+  public long getVolume() {
+    return volume;
+  }
+
+  public void setVolume(long volume) {
+    this.volume = volume;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishedMessageTrace.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishedMessageTrace.java
index 5e6fa397eb..bda7e00508 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishedMessageTrace.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishedMessageTrace.java
@@ -4,92 +4,100 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class PublishedMessageTrace implements MessageTrace {
 
-    private final String messageId;
-    private final long timestamp;
-    private final PublishedMessageTraceStatus status;
-    private final TopicName topicName;
-    private final String reason;
-    private final String message;
-    private final String cluster;
-    private final String extraRequestHeaders;
-
-    @JsonCreator
-    public PublishedMessageTrace(@JsonProperty("messageId") String messageId,
-                            @JsonProperty("timestamp") Long timestamp,
-                            @JsonProperty("topicName") String topicName,
-                            @JsonProperty("status") PublishedMessageTraceStatus status,
-                            @JsonProperty("reason") String reason,
-                            @JsonProperty("message") String message,
-                            @JsonProperty("cluster") String cluster,
-                            @JsonProperty("extraRequestHeaders") String extraRequestHeaders) {
-        this.messageId = messageId;
-        this.timestamp = timestamp;
-        this.status = status;
-        this.topicName = TopicName.fromQualifiedName(topicName);
-        this.reason = reason;
-        this.message = message;
-        this.cluster = cluster;
-        this.extraRequestHeaders = extraRequestHeaders;
-    }
-
-    public String getMessageId() {
-        return messageId;
-    }
-
-    public Long getTimestamp() {
-        return timestamp;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("topicName")
-    public String getQualifiedTopicName() {
-        return TopicName.toQualifiedName(topicName);
-    }
-
-    @JsonIgnore
-    public TopicName getTopicName() {
-        return topicName;
+  private final String messageId;
+  private final long timestamp;
+  private final PublishedMessageTraceStatus status;
+  private final TopicName topicName;
+  private final String reason;
+  private final String message;
+  private final String cluster;
+  private final String extraRequestHeaders;
+  private final String storageDatacenter;
+
+  @JsonCreator
+  public PublishedMessageTrace(
+      @JsonProperty("messageId") String messageId,
+      @JsonProperty("timestamp") Long timestamp,
+      @JsonProperty("topicName") String topicName,
+      @JsonProperty("status") PublishedMessageTraceStatus status,
+      @JsonProperty("reason") String reason,
+      @JsonProperty("message") String message,
+      @JsonProperty("cluster") String cluster,
+      @JsonProperty("extraRequestHeaders") String extraRequestHeaders,
+      @JsonProperty("storageDc") String storageDatacenter) {
+    this.messageId = messageId;
+    this.timestamp = timestamp;
+    this.status = status;
+    this.topicName = TopicName.fromQualifiedName(topicName);
+    this.reason = reason;
+    this.message = message;
+    this.cluster = cluster;
+    this.extraRequestHeaders = extraRequestHeaders;
+    this.storageDatacenter = storageDatacenter;
+  }
+
+  public String getMessageId() {
+    return messageId;
+  }
+
+  public Long getTimestamp() {
+    return timestamp;
+  }
+
+  public String getReason() {
+    return reason;
+  }
+
+  @JsonProperty("topicName")
+  public String getQualifiedTopicName() {
+    return TopicName.toQualifiedName(topicName);
+  }
+
+  @JsonIgnore
+  public TopicName getTopicName() {
+    return topicName;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public PublishedMessageTraceStatus getStatus() {
+    return status;
+  }
+
+  public String getCluster() {
+    return cluster;
+  }
+
+  public String getExtraRequestHeaders() {
+    return extraRequestHeaders;
+  }
+
+  @JsonProperty("storageDc")
+  public String getStorageDatacenter() {
+    return storageDatacenter;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(messageId);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public PublishedMessageTraceStatus getStatus() {
-        return status;
-    }
-
-    public String getCluster() {
-        return cluster;
-    }
-
-    public String getExtraRequestHeaders() {
-        return extraRequestHeaders;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(messageId);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final PublishedMessageTrace other = (PublishedMessageTrace) obj;
-        return Objects.equals(this.messageId, other.messageId);
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
+    final PublishedMessageTrace other = (PublishedMessageTrace) obj;
+    return Objects.equals(this.messageId, other.messageId);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishedMessageTraceStatus.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishedMessageTraceStatus.java
index ea3bab63be..d386e91c13 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishedMessageTraceStatus.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishedMessageTraceStatus.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.api;
 
 public enum PublishedMessageTraceStatus {
-    INFLIGHT, SUCCESS, ERROR
+  INFLIGHT,
+  SUCCESS,
+  ERROR
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishingAuth.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishingAuth.java
index 3b09192b47..1ef9ee9a2b 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishingAuth.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishingAuth.java
@@ -2,63 +2,63 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 public class PublishingAuth {
 
-    private final List<String> publishers;
-    private final boolean enabled;
-    private final boolean unauthenticatedAccessEnabled;
+  private final List<String> publishers;
+  private final boolean enabled;
+  private final boolean unauthenticatedAccessEnabled;
 
-    @JsonCreator
-    public PublishingAuth(@JsonProperty("publishers") List<String> publishers,
-        @JsonProperty("enabled") boolean enabled,
-        @JsonProperty("unauthenticatedAccessEnabled") boolean unauthenticatedAccessEnabled) {
+  @JsonCreator
+  public PublishingAuth(
+      @JsonProperty("publishers") List<String> publishers,
+      @JsonProperty("enabled") boolean enabled,
+      @JsonProperty("unauthenticatedAccessEnabled") boolean unauthenticatedAccessEnabled) {
 
-            this.publishers = publishers;
-            this.enabled = enabled;
-            this.unauthenticatedAccessEnabled = unauthenticatedAccessEnabled;
-        }
+    this.publishers = publishers;
+    this.enabled = enabled;
+    this.unauthenticatedAccessEnabled = unauthenticatedAccessEnabled;
+  }
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public boolean isUnauthenticatedAccessEnabled() {
-        return unauthenticatedAccessEnabled;
-    }
+  public boolean isUnauthenticatedAccessEnabled() {
+    return unauthenticatedAccessEnabled;
+  }
 
-    public boolean hasPermission(String publisher) {
-        return publishers.contains(publisher);
-    }
+  public boolean hasPermission(String publisher) {
+    return publishers.contains(publisher);
+  }
 
-    public List<String> getPublishers() {
-        return publishers;
-    }
+  public List<String> getPublishers() {
+    return publishers;
+  }
 
-    public static PublishingAuth disabled() {
-        return new PublishingAuth(new ArrayList<>(), false, true);
-    }
+  public static PublishingAuth disabled() {
+    return new PublishingAuth(new ArrayList<>(), false, true);
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PublishingAuth that = (PublishingAuth) o;
-        return enabled == that.enabled
-                && unauthenticatedAccessEnabled == that.unauthenticatedAccessEnabled
-                && Objects.equals(publishers, that.publishers);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(publishers, enabled, unauthenticatedAccessEnabled);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    PublishingAuth that = (PublishingAuth) o;
+    return enabled == that.enabled
+        && unauthenticatedAccessEnabled == that.unauthenticatedAccessEnabled
+        && Objects.equals(publishers, that.publishers);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(publishers, enabled, unauthenticatedAccessEnabled);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishingChaosPolicy.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishingChaosPolicy.java
new file mode 100644
index 0000000000..1dfb0e3d4a
--- /dev/null
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/PublishingChaosPolicy.java
@@ -0,0 +1,46 @@
+package pl.allegro.tech.hermes.api;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Collections;
+import java.util.Map;
+
+public record PublishingChaosPolicy(
+    ChaosMode mode, ChaosPolicy globalPolicy, Map<String, ChaosPolicy> datacenterPolicies) {
+
+  @JsonCreator
+  public PublishingChaosPolicy(
+      @JsonProperty("mode") ChaosMode mode,
+      @JsonProperty("globalPolicy") ChaosPolicy globalPolicy,
+      @JsonProperty("datacenterPolicies") Map<String, ChaosPolicy> datacenterPolicies) {
+    this.mode = mode;
+    this.globalPolicy = globalPolicy;
+    this.datacenterPolicies = datacenterPolicies == null ? Map.of() : datacenterPolicies;
+  }
+
+  public static PublishingChaosPolicy disabled() {
+    return new PublishingChaosPolicy(ChaosMode.DISABLED, null, Collections.emptyMap());
+  }
+
+  public record ChaosPolicy(
+      int probability, int delayFrom, int delayTo, boolean completeWithError) {
+
+    @JsonCreator
+    public ChaosPolicy(
+        @JsonProperty("probability") int probability,
+        @JsonProperty("delayFrom") int delayFrom,
+        @JsonProperty("delayTo") int delayTo,
+        @JsonProperty("completeWithError") boolean completeWithError) {
+      this.probability = probability;
+      this.delayFrom = delayFrom;
+      this.delayTo = delayTo;
+      this.completeWithError = completeWithError;
+    }
+  }
+
+  public enum ChaosMode {
+    DISABLED,
+    GLOBAL,
+    DATACENTER
+  }
+}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Query.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Query.java
index a004e97f46..28a53016a7 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Query.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Query.java
@@ -5,15 +5,15 @@
 
 public interface Query<T> {
 
-    Stream<T> filter(Stream<T> input);
+  Stream<T> filter(Stream<T> input);
 
-    default Stream<T> filter(Collection<T> input) {
-        return filter(input.stream());
-    }
+  default Stream<T> filter(Collection<T> input) {
+    return filter(input.stream());
+  }
 
-    <K> Stream<K> filterNames(Stream<K> input);
+  <K> Stream<K> filterNames(Stream<K> input);
 
-    default <K> Stream<K> filterNames(Collection<K> input) {
-        return filterNames(input.stream());
-    }
+  default <K> Stream<K> filterNames(Collection<K> input) {
+    return filterNames(input.stream());
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RawSchema.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RawSchema.java
index 132566500a..9554f2d8d6 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RawSchema.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RawSchema.java
@@ -1,47 +1,47 @@
 package pl.allegro.tech.hermes.api;
 
-import java.util.Objects;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Strings.emptyToNull;
 
+import java.util.Objects;
+
 public final class RawSchema {
 
-    private final String value;
+  private final String value;
 
-    private RawSchema(String value) {
-        this.value = checkNotNull(emptyToNull(value));
-    }
+  private RawSchema(String value) {
+    this.value = checkNotNull(emptyToNull(value));
+  }
 
-    public static RawSchema valueOf(String schema) {
-        return new RawSchema(schema);
-    }
+  public static RawSchema valueOf(String schema) {
+    return new RawSchema(schema);
+  }
 
-    public String value() {
-        return value;
-    }
+  public String value() {
+    return value;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
 
-        RawSchema that = (RawSchema) o;
+    RawSchema that = (RawSchema) o;
 
-        return value.equals(that.value);
-    }
+    return value.equals(that.value);
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(value);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(value);
+  }
 
-    @Override
-    public String toString() {
-        return "RawSource(" + value + ")";
-    }
+  @Override
+  public String toString() {
+    return "RawSource(" + value + ")";
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RawSchemaWithMetadata.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RawSchemaWithMetadata.java
index bb6b833172..4e9094b00e 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RawSchemaWithMetadata.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RawSchemaWithMetadata.java
@@ -1,66 +1,67 @@
 package pl.allegro.tech.hermes.api;
 
 import com.google.common.base.MoreObjects;
-
 import java.util.Objects;
 
 public final class RawSchemaWithMetadata {
 
-    private final RawSchema schema;
-    private final int id;
-    private final int version;
+  private final RawSchema schema;
+  private final int id;
+  private final int version;
 
-    private RawSchemaWithMetadata(RawSchema schema, int id, int version) {
-        this.schema = schema;
-        this.id = id;
-        this.version = version;
-    }
+  private RawSchemaWithMetadata(RawSchema schema, int id, int version) {
+    this.schema = schema;
+    this.id = id;
+    this.version = version;
+  }
 
-    public static RawSchemaWithMetadata of(String schema, int id, int version) {
-        return new RawSchemaWithMetadata(RawSchema.valueOf(schema), id, version);
-    }
+  public static RawSchemaWithMetadata of(String schema, int id, int version) {
+    return new RawSchemaWithMetadata(RawSchema.valueOf(schema), id, version);
+  }
 
-    public RawSchema getSchema() {
-        return schema;
-    }
+  public RawSchema getSchema() {
+    return schema;
+  }
 
-    public String getSchemaString() {
-        return schema.value();
-    }
+  public String getSchemaString() {
+    return schema.value();
+  }
 
-    public int getId() {
-        return id;
-    }
+  public int getId() {
+    return id;
+  }
 
-    public int getVersion() {
-        return version;
-    }
+  public int getVersion() {
+    return version;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
 
-        RawSchemaWithMetadata that = (RawSchemaWithMetadata) o;
+    RawSchemaWithMetadata that = (RawSchemaWithMetadata) o;
 
-        return schema.equals(that.schema) && Objects.equals(id, that.id) && Objects.equals(version, that.version);
-    }
+    return schema.equals(that.schema)
+        && Objects.equals(id, that.id)
+        && Objects.equals(version, that.version);
+  }
 
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("schema", schema)
-                .add("id", id)
-                .add("version", version)
-                .toString();
-    }
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("schema", schema)
+        .add("id", id)
+        .add("version", version)
+        .toString();
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(schema, id, version);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(schema, id, version);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Readiness.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Readiness.java
index 4223df0e1c..d730b467e2 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Readiness.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Readiness.java
@@ -6,16 +6,15 @@
 import jakarta.validation.constraints.NotNull;
 
 public class Readiness {
-    @NotNull
-    private final boolean isReady;
+  @NotNull private final boolean isReady;
 
-    @JsonCreator
-    public Readiness(@JsonProperty("isReady") boolean isReady) {
-        this.isReady = isReady;
-    }
+  @JsonCreator
+  public Readiness(@JsonProperty("isReady") boolean isReady) {
+    this.isReady = isReady;
+  }
 
-    @JsonGetter("isReady")
-    public boolean isReady() {
-        return isReady;
-    }
+  @JsonGetter("isReady")
+  public boolean isReady() {
+    return isReady;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RetentionTime.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RetentionTime.java
index bf6478b702..8d2c8668dc 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RetentionTime.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RetentionTime.java
@@ -2,58 +2,62 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
-import pl.allegro.tech.hermes.api.constraints.AdminPermitted;
-
+import java.util.EnumSet;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 public class RetentionTime {
-    private static final TimeUnit DEFAULT_UNIT = TimeUnit.DAYS;
+  private static final TimeUnit DEFAULT_UNIT = TimeUnit.DAYS;
 
-    @Min(0)
-    @Max(value = 7, groups = AdminPermitted.class)
-    private final int duration;
+  public static RetentionTime MAX = new RetentionTime(7, TimeUnit.DAYS);
+  public static Set<TimeUnit> allowedUnits =
+      EnumSet.of(TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS, TimeUnit.DAYS);
 
-    private final TimeUnit retentionUnit;
+  @Min(0)
+  private final int duration;
 
-    public RetentionTime(@JsonProperty("duration") int duration, @JsonProperty("retentionUnit") TimeUnit unit) {
-        this.duration = duration;
-        this.retentionUnit = unit == null ? DEFAULT_UNIT : unit;
-    }
+  private final TimeUnit retentionUnit;
 
-    public static RetentionTime of(int duration, TimeUnit unit) {
-        return new RetentionTime(duration, unit);
-    }
+  public RetentionTime(
+      @JsonProperty("duration") int duration, @JsonProperty("retentionUnit") TimeUnit unit) {
+    this.duration = duration;
+    this.retentionUnit = unit == null ? DEFAULT_UNIT : unit;
+  }
 
-    public int getDuration() {
-        return duration;
-    }
+  public static RetentionTime of(int duration, TimeUnit unit) {
+    return new RetentionTime(duration, unit);
+  }
 
-    @JsonIgnore
-    public long getDurationInMillis() {
-        return retentionUnit.toMillis(duration);
-    }
+  public int getDuration() {
+    return duration;
+  }
 
-    public TimeUnit getRetentionUnit() {
-        return retentionUnit;
-    }
+  @JsonIgnore
+  public long getDurationInMillis() {
+    return retentionUnit.toMillis(duration);
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(duration);
-    }
+  public TimeUnit getRetentionUnit() {
+    return retentionUnit;
+  }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final RetentionTime other = (RetentionTime) obj;
-        return Objects.equals(this.duration, other.duration) && Objects.equals(this.retentionUnit, other.retentionUnit);
+  @Override
+  public int hashCode() {
+    return Objects.hash(duration);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
+    final RetentionTime other = (RetentionTime) obj;
+    return Objects.equals(this.duration, other.duration)
+        && Objects.equals(this.retentionUnit, other.retentionUnit);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SentMessageTrace.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SentMessageTrace.java
index eb03b91350..494660d899 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SentMessageTrace.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SentMessageTrace.java
@@ -4,191 +4,202 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class SentMessageTrace implements MessageTrace {
 
+  private final String messageId;
+  private final String batchId;
+  private final String subscription;
+  private final long timestamp;
+  private final SentMessageTraceStatus status;
+  private final Integer partition;
+  private final Long offset;
+  private final TopicName topicName;
+  private final String reason;
+  private final String message;
+  private final String cluster;
+
+  @JsonCreator
+  public SentMessageTrace(
+      @JsonProperty("messageId") String messageId,
+      @JsonProperty("batchId") String batchId,
+      @JsonProperty("timestamp") Long timestamp,
+      @JsonProperty("subscription") String subscription,
+      @JsonProperty("topicName") String topicName,
+      @JsonProperty("status") SentMessageTraceStatus status,
+      @JsonProperty("reason") String reason,
+      @JsonProperty("message") String message,
+      @JsonProperty("partition") Integer partition,
+      @JsonProperty("offset") Long offset,
+      @JsonProperty("cluster") String cluster) {
+    this.messageId = messageId;
+    this.batchId = batchId;
+    this.timestamp = timestamp;
+    this.subscription = subscription;
+    this.status = status;
+    this.partition = partition;
+    this.offset = offset;
+    this.topicName = TopicName.fromQualifiedName(topicName);
+    this.reason = reason;
+    this.message = message;
+    this.cluster = cluster;
+  }
+
+  public String getMessageId() {
+    return messageId;
+  }
+
+  public String getBatchId() {
+    return batchId;
+  }
+
+  public Long getTimestamp() {
+    return timestamp;
+  }
+
+  public String getSubscription() {
+    return subscription;
+  }
+
+  public String getReason() {
+    return reason;
+  }
+
+  public Integer getPartition() {
+    return partition;
+  }
+
+  public Long getOffset() {
+    return offset;
+  }
+
+  @JsonProperty("topicName")
+  public String getQualifiedTopicName() {
+    return TopicName.toQualifiedName(topicName);
+  }
+
+  @JsonIgnore
+  public TopicName getTopicName() {
+    return topicName;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public SentMessageTraceStatus getStatus() {
+    return status;
+  }
+
+  public String getCluster() {
+    return cluster;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(messageId);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    final SentMessageTrace other = (SentMessageTrace) obj;
+    return Objects.equals(this.messageId, other.messageId)
+        && Objects.equals(this.subscription, other.subscription)
+        && Objects.equals(this.timestamp, other.timestamp)
+        && Objects.equals(this.status, other.status);
+  }
+
+  public static class Builder {
+
     private final String messageId;
     private final String batchId;
-    private final String subscription;
-    private final long timestamp;
     private final SentMessageTraceStatus status;
-    private final Integer partition;
-    private final Long offset;
-    private final TopicName topicName;
-    private final String reason;
-    private final String message;
-    private final String cluster;
-
-    @JsonCreator
-    public SentMessageTrace(@JsonProperty("messageId") String messageId,
-                            @JsonProperty("batchId") String batchId,
-                            @JsonProperty("timestamp") Long timestamp,
-                            @JsonProperty("subscription") String subscription,
-                            @JsonProperty("topicName") String topicName,
-                            @JsonProperty("status") SentMessageTraceStatus status,
-                            @JsonProperty("reason") String reason,
-                            @JsonProperty("message") String message,
-                            @JsonProperty("partition") Integer partition,
-                            @JsonProperty("offset") Long offset,
-                            @JsonProperty("cluster") String cluster) {
-        this.messageId = messageId;
-        this.batchId = batchId;
-        this.timestamp = timestamp;
-        this.subscription = subscription;
-        this.status = status;
-        this.partition = partition;
-        this.offset = offset;
-        this.topicName = TopicName.fromQualifiedName(topicName);
-        this.reason = reason;
-        this.message = message;
-        this.cluster = cluster;
-    }
-
-    public String getMessageId() {
-        return messageId;
-    }
-
-    public String getBatchId() {
-        return batchId;
-    }
 
-    public Long getTimestamp() {
-        return timestamp;
-    }
+    private String subscription;
+    private long timestamp;
+    private Integer partition;
+    private Long offset;
+    private String topicName;
+    private String reason;
+    private String message;
+    private String cluster;
 
-    public String getSubscription() {
-        return subscription;
+    private Builder(String messageId, String batchId, SentMessageTraceStatus status) {
+      this.messageId = messageId;
+      this.batchId = batchId;
+      this.status = status;
     }
 
-    public String getReason() {
-        return reason;
+    public Builder withSubscription(String subscription) {
+      this.subscription = subscription;
+      return this;
     }
 
-    public Integer getPartition() {
-        return partition;
+    public Builder withTimestamp(long timestamp) {
+      this.timestamp = timestamp;
+      return this;
     }
 
-    public Long getOffset() {
-        return offset;
+    public Builder withPartition(Integer partition) {
+      this.partition = partition;
+      return this;
     }
 
-    @JsonProperty("topicName")
-    public String getQualifiedTopicName() {
-        return TopicName.toQualifiedName(topicName);
+    public Builder withOffset(Long offset) {
+      this.offset = offset;
+      return this;
     }
 
-    @JsonIgnore
-    public TopicName getTopicName() {
-        return topicName;
+    public Builder withTopicName(String topicName) {
+      this.topicName = topicName;
+      return this;
     }
 
-    public String getMessage() {
-        return message;
+    public Builder withReason(String reason) {
+      this.reason = reason;
+      return this;
     }
 
-    public SentMessageTraceStatus getStatus() {
-        return status;
+    public Builder withMessage(String message) {
+      this.message = message;
+      return this;
     }
 
-    public String getCluster() {
-        return cluster;
+    public Builder withCluster(String cluster) {
+      this.cluster = cluster;
+      return this;
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(messageId);
+    public static Builder sentMessageTrace(
+        String messageId, String batchId, SentMessageTraceStatus status) {
+      return new Builder(messageId, batchId, status);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final SentMessageTrace other = (SentMessageTrace) obj;
-        return Objects.equals(this.messageId, other.messageId)
-                && Objects.equals(this.subscription, other.subscription)
-                && Objects.equals(this.timestamp, other.timestamp)
-                && Objects.equals(this.status, other.status);
+    public static Builder undeliveredMessage() {
+      return new Builder(null, null, SentMessageTraceStatus.DISCARDED);
     }
 
-    public static class Builder {
-
-        private final String messageId;
-        private final String batchId;
-        private final SentMessageTraceStatus status;
-
-        private String subscription;
-        private long timestamp;
-        private Integer partition;
-        private Long offset;
-        private String topicName;
-        private String reason;
-        private String message;
-        private String cluster;
-
-        private Builder(String messageId, String batchId, SentMessageTraceStatus status) {
-            this.messageId = messageId;
-            this.batchId = batchId;
-            this.status = status;
-        }
-
-        public Builder withSubscription(String subscription) {
-            this.subscription = subscription;
-            return this;
-        }
-
-        public Builder withTimestamp(long timestamp) {
-            this.timestamp = timestamp;
-            return this;
-        }
-
-        public Builder withPartition(Integer partition) {
-            this.partition = partition;
-            return this;
-        }
-
-        public Builder withOffset(Long offset) {
-            this.offset = offset;
-            return this;
-        }
-
-        public Builder withTopicName(String topicName) {
-            this.topicName = topicName;
-            return this;
-        }
-
-        public Builder withReason(String reason) {
-            this.reason = reason;
-            return this;
-        }
-
-        public Builder withMessage(String message) {
-            this.message = message;
-            return this;
-        }
-
-        public Builder withCluster(String cluster) {
-            this.cluster = cluster;
-            return this;
-        }
-
-        public static Builder sentMessageTrace(String messageId, String batchId, SentMessageTraceStatus status) {
-            return new Builder(messageId, batchId, status);
-        }
-
-        public static Builder undeliveredMessage() {
-            return new Builder(null, null, SentMessageTraceStatus.DISCARDED);
-        }
-
-        public SentMessageTrace build() {
-            return new SentMessageTrace(messageId, batchId, timestamp, subscription, topicName, status,
-                reason, message, partition, offset, cluster);
-        }
+    public SentMessageTrace build() {
+      return new SentMessageTrace(
+          messageId,
+          batchId,
+          timestamp,
+          subscription,
+          topicName,
+          status,
+          reason,
+          message,
+          partition,
+          offset,
+          cluster);
     }
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SentMessageTraceStatus.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SentMessageTraceStatus.java
index f194a7cb63..5597d71be9 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SentMessageTraceStatus.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SentMessageTraceStatus.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.api;
 
 public enum SentMessageTraceStatus {
-    INFLIGHT, SUCCESS, FAILED, DISCARDED, FILTERED
+  INFLIGHT,
+  SUCCESS,
+  FAILED,
+  DISCARDED,
+  FILTERED
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Stats.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Stats.java
index fbcf73a1c3..8dea4566a5 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Stats.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Stats.java
@@ -2,52 +2,48 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public class Stats {
-    private final TopicStats topicStats;
-    private final SubscriptionStats subscriptionStats;
-
-    @JsonCreator
-    public Stats(
-            @JsonProperty("topicStats")
-            TopicStats topicStats,
-            @JsonProperty("subscriptionStats") SubscriptionStats subscriptionStats) {
-        this.topicStats = topicStats;
-        this.subscriptionStats = subscriptionStats;
-    }
-
-    public TopicStats getTopicStats() {
-        return topicStats;
-    }
-
-    public SubscriptionStats getSubscriptionStats() {
-        return subscriptionStats;
+  private final TopicStats topicStats;
+  private final SubscriptionStats subscriptionStats;
+
+  @JsonCreator
+  public Stats(
+      @JsonProperty("topicStats") TopicStats topicStats,
+      @JsonProperty("subscriptionStats") SubscriptionStats subscriptionStats) {
+    this.topicStats = topicStats;
+    this.subscriptionStats = subscriptionStats;
+  }
+
+  public TopicStats getTopicStats() {
+    return topicStats;
+  }
+
+  public SubscriptionStats getSubscriptionStats() {
+    return subscriptionStats;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Stats stats = (Stats) o;
-        return Objects.equals(topicStats, stats.topicStats) && Objects.equals(subscriptionStats, stats.subscriptionStats);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(topicStats, subscriptionStats);
-    }
-
-    @Override
-    public String toString() {
-        return "Stats{"
-                + "topicStats=" + topicStats
-                + ", subscriptionStats=" + subscriptionStats
-                + '}';
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    Stats stats = (Stats) o;
+    return Objects.equals(topicStats, stats.topicStats)
+        && Objects.equals(subscriptionStats, stats.subscriptionStats);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(topicStats, subscriptionStats);
+  }
+
+  @Override
+  public String toString() {
+    return "Stats{" + "topicStats=" + topicStats + ", subscriptionStats=" + subscriptionStats + '}';
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Subscription.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Subscription.java
index 3a8c673590..359206d487 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Subscription.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Subscription.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.api;
 
+import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -8,8 +10,6 @@
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
-import pl.allegro.tech.hermes.api.constraints.ValidContentType;
-
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,439 +17,523 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
-import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX;
+import pl.allegro.tech.hermes.api.constraints.ValidContentType;
 
 @ValidContentType(message = "AVRO content type is not supported in BATCH delivery mode")
-@JsonIgnoreProperties(value = {"createdAt", "modifiedAt"}, allowGetters = true)
+@JsonIgnoreProperties(
+    value = {"createdAt", "modifiedAt"},
+    allowGetters = true)
 public class Subscription implements Anonymizable {
 
-    @NotNull
-    private final MonitoringDetails monitoringDetails;
-    private final SubscriptionName subscriptionName;
-    @Valid
-    @NotNull
-    private TopicName topicName;
-    @NotEmpty
-    @Pattern(regexp = ALLOWED_NAME_REGEX)
-    private String name;
-    private State state = State.PENDING;
-    @NotNull
-    @Valid
-    private EndpointAddress endpoint;
-    @NotNull
-    private ContentType contentType = ContentType.JSON;
-    @NotNull
-    private String description;
-    @Valid
-    private SubscriptionPolicy serialSubscriptionPolicy;
-    @Valid
-    private BatchSubscriptionPolicy batchSubscriptionPolicy;
-    /**
-     * Use trackingMode field instead.
-     */
-    @Deprecated
-    private boolean trackingEnabled = false;
-    private TrackingMode trackingMode = TrackingMode.TRACKING_OFF;
-    private boolean http2Enabled = false;
-    @Valid
-    @NotNull
-    private OwnerId owner;
-    @NotNull
-    private DeliveryType deliveryType = DeliveryType.SERIAL;
-    @NotNull
-    private SubscriptionMode mode = SubscriptionMode.ANYCAST;
-    private List<MessageFilterSpecification> filters = new ArrayList<>();
-
-    private List<Header> headers;
-
-    private EndpointAddressResolverMetadata endpointAddressResolverMetadata;
-
-    @Valid
-    private SubscriptionOAuthPolicy oAuthPolicy;
-
-    private boolean subscriptionIdentityHeadersEnabled;
-
-    private boolean autoDeleteWithTopicEnabled;
-
-    private Instant createdAt;
-
-    private Instant modifiedAt;
-
-    private Subscription(TopicName topicName,
-                         String name,
-                         EndpointAddress endpoint,
-                         State state,
-                         String description,
-                         Object subscriptionPolicy,
-                         boolean trackingEnabled,
-                         TrackingMode trackingMode,
-                         OwnerId owner,
-                         MonitoringDetails monitoringDetails,
-                         ContentType contentType,
-                         DeliveryType deliveryType,
-                         List<MessageFilterSpecification> filters,
-                         SubscriptionMode mode,
-                         List<Header> headers,
-                         EndpointAddressResolverMetadata endpointAddressResolverMetadata,
-                         SubscriptionOAuthPolicy oAuthPolicy,
-                         boolean http2Enabled,
-                         boolean subscriptionIdentityHeadersEnabled,
-                         boolean autoDeleteWithTopicEnabled) {
-        this.topicName = topicName;
-        this.name = name;
-        this.endpoint = endpoint;
-        this.state = state != null ? state : State.PENDING;
-        this.description = description;
-        this.trackingEnabled = trackingEnabled;
-        this.trackingMode = trackingMode;
-        this.owner = owner;
-        this.monitoringDetails = monitoringDetails == null ? MonitoringDetails.EMPTY : monitoringDetails;
-        this.contentType = contentType == null ? ContentType.JSON : contentType;
-        this.deliveryType = deliveryType;
-        this.batchSubscriptionPolicy = this.deliveryType == DeliveryType.BATCH ? (BatchSubscriptionPolicy) subscriptionPolicy : null;
-        this.serialSubscriptionPolicy = this.deliveryType == DeliveryType.SERIAL ? (SubscriptionPolicy) subscriptionPolicy : null;
-        this.filters = filters;
-        this.mode = mode;
-        this.http2Enabled = http2Enabled;
-        this.subscriptionName = new SubscriptionName(name, topicName);
-        this.headers = headers;
-        this.endpointAddressResolverMetadata = endpointAddressResolverMetadata;
-        this.oAuthPolicy = oAuthPolicy;
-        this.subscriptionIdentityHeadersEnabled = subscriptionIdentityHeadersEnabled;
-        this.autoDeleteWithTopicEnabled = autoDeleteWithTopicEnabled;
-    }
-
-    public static Subscription createSerialSubscription(TopicName topicName,
-                                                        String name,
-                                                        EndpointAddress endpoint,
-                                                        State state,
-                                                        String description,
-                                                        SubscriptionPolicy subscriptionPolicy,
-                                                        boolean trackingEnabled,
-                                                        TrackingMode trackingMode,
-                                                        OwnerId owner,
-                                                        MonitoringDetails monitoringDetails,
-                                                        ContentType contentType,
-                                                        List<MessageFilterSpecification> filters,
-                                                        SubscriptionMode mode,
-                                                        List<Header> headers,
-                                                        EndpointAddressResolverMetadata endpointAddressResolverMetadata,
-                                                        SubscriptionOAuthPolicy oAuthPolicy,
-                                                        boolean http2Enabled,
-                                                        boolean subscriptionIdentityHeadersEnabled,
-                                                        boolean autoDeleteWithTopicEnabled) {
-        return new Subscription(topicName, name, endpoint, state, description, subscriptionPolicy, trackingEnabled, trackingMode,
-                owner, monitoringDetails, contentType, DeliveryType.SERIAL, filters, mode, headers,
-                endpointAddressResolverMetadata, oAuthPolicy, http2Enabled, subscriptionIdentityHeadersEnabled, autoDeleteWithTopicEnabled);
-    }
-
-    public static Subscription createBatchSubscription(TopicName topicName,
-                                                       String name,
-                                                       EndpointAddress endpoint,
-                                                       State state,
-                                                       String description,
-                                                       BatchSubscriptionPolicy subscriptionPolicy,
-                                                       boolean trackingEnabled,
-                                                       TrackingMode trackingMode,
-                                                       OwnerId owner,
-                                                       MonitoringDetails monitoringDetails,
-                                                       ContentType contentType,
-                                                       List<MessageFilterSpecification> filters,
-                                                       List<Header> headers,
-                                                       EndpointAddressResolverMetadata endpointAddressResolverMetadata,
-                                                       SubscriptionOAuthPolicy oAuthPolicy,
-                                                       boolean http2Enabled,
-                                                       boolean subscriptionIdentityHeadersEnabled,
-                                                       boolean autoDeleteWithTopicEnabled) {
-        return new Subscription(topicName, name, endpoint, state, description, subscriptionPolicy, trackingEnabled, trackingMode,
-                owner, monitoringDetails, contentType, DeliveryType.BATCH, filters, SubscriptionMode.ANYCAST, headers,
-                endpointAddressResolverMetadata, oAuthPolicy, http2Enabled, subscriptionIdentityHeadersEnabled, autoDeleteWithTopicEnabled);
-    }
-
-    @JsonCreator
-    public static Subscription create(
-            @JsonProperty("topicName") String topicName,
-            @JsonProperty("name") String name,
-            @JsonProperty("endpoint") EndpointAddress endpoint,
-            @JsonProperty("state") State state,
-            @JsonProperty("description") String description,
-            @JsonProperty("subscriptionPolicy") Map<String, Object> subscriptionPolicy,
-            @JsonProperty("trackingEnabled") boolean trackingEnabled,
-            @JsonProperty("trackingMode") String trackingMode,
-            @JsonProperty("owner") OwnerId owner,
-            @JsonProperty("monitoringDetails") MonitoringDetails monitoringDetails,
-            @JsonProperty("contentType") ContentType contentType,
-            @JsonProperty("deliveryType") DeliveryType deliveryType,
-            @JsonProperty("filters") List<MessageFilterSpecification> filters,
-            @JsonProperty("mode") SubscriptionMode mode,
-            @JsonProperty("headers") List<Header> headers,
-            @JsonProperty("endpointAddressResolverMetadata") EndpointAddressResolverMetadata endpointAddressResolverMetadata,
-            @JsonProperty("oAuthPolicy") SubscriptionOAuthPolicy oAuthPolicy,
-            @JsonProperty("http2Enabled") boolean http2Enabled,
-            @JsonProperty("subscriptionIdentityHeadersEnabled") boolean subscriptionIdentityHeadersEnabled,
-            @JsonProperty("autoDeleteWithTopicEnabled") boolean autoDeleteWithTopicEnabled) {
-
-        DeliveryType validDeliveryType = deliveryType == null ? DeliveryType.SERIAL : deliveryType;
-        SubscriptionMode subscriptionMode = mode == null ? SubscriptionMode.ANYCAST : mode;
-        Map<String, Object> validSubscriptionPolicy = subscriptionPolicy == null ? new HashMap<>() : subscriptionPolicy;
-
-        TrackingMode validTrackingMode = TrackingMode.fromString(trackingMode)
-                .orElse(trackingEnabled ? TrackingMode.TRACK_ALL : TrackingMode.TRACKING_OFF);
-        boolean validTrackingEnabled = validTrackingMode != TrackingMode.TRACKING_OFF;
-
-        return new Subscription(
-                TopicName.fromQualifiedName(topicName),
-                name,
-                endpoint,
-                state,
-                description,
-                validDeliveryType == DeliveryType.SERIAL
-                        ? SubscriptionPolicy.create(validSubscriptionPolicy)
-                        : BatchSubscriptionPolicy.create(validSubscriptionPolicy),
-                validTrackingEnabled,
-                validTrackingMode,
-                owner,
-                monitoringDetails,
-                contentType,
-                validDeliveryType,
-                filters == null ? Collections.emptyList() : filters,
-                subscriptionMode,
-                headers == null ? Collections.emptyList() : headers,
-                endpointAddressResolverMetadata == null ? EndpointAddressResolverMetadata.empty() : endpointAddressResolverMetadata,
-                oAuthPolicy,
-                http2Enabled,
-                subscriptionIdentityHeadersEnabled,
-                autoDeleteWithTopicEnabled
-        );
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(endpoint, topicName, name, description, serialSubscriptionPolicy, batchSubscriptionPolicy,
-                trackingEnabled, trackingMode, owner, monitoringDetails, contentType, filters, mode, headers,
-                endpointAddressResolverMetadata, oAuthPolicy, http2Enabled, subscriptionIdentityHeadersEnabled);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final Subscription other = (Subscription) obj;
-
-        return Objects.equals(this.endpoint, other.endpoint)
-                && Objects.equals(this.topicName, other.topicName)
-                && Objects.equals(this.name, other.name)
-                && Objects.equals(this.description, other.description)
-                && Objects.equals(this.serialSubscriptionPolicy, other.serialSubscriptionPolicy)
-                && Objects.equals(this.batchSubscriptionPolicy, other.batchSubscriptionPolicy)
-                && Objects.equals(this.trackingEnabled, other.trackingEnabled)
-                && Objects.equals(this.trackingMode, other.trackingMode)
-                && Objects.equals(this.owner, other.owner)
-                && Objects.equals(this.monitoringDetails, other.monitoringDetails)
-                && Objects.equals(this.contentType, other.contentType)
-                && Objects.equals(this.filters, other.filters)
-                && Objects.equals(this.mode, other.mode)
-                && Objects.equals(this.headers, other.headers)
-                && Objects.equals(this.endpointAddressResolverMetadata, other.endpointAddressResolverMetadata)
-                && Objects.equals(this.http2Enabled, other.http2Enabled)
-                && Objects.equals(this.oAuthPolicy, other.oAuthPolicy)
-                && Objects.equals(this.subscriptionIdentityHeadersEnabled, other.subscriptionIdentityHeadersEnabled)
-                && Objects.equals(this.autoDeleteWithTopicEnabled, other.autoDeleteWithTopicEnabled);
-    }
-
-    @JsonIgnore
-    public SubscriptionName getQualifiedName() {
-        return subscriptionName;
-    }
-
-    public EndpointAddress getEndpoint() {
-        return endpoint;
-    }
-
-    @JsonProperty("topicName")
-    public String getQualifiedTopicName() {
-        return TopicName.toQualifiedName(topicName);
-    }
-
-    @JsonIgnore
-    public TopicName getTopicName() {
-        return topicName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public State getState() {
-        return state;
-    }
-
-    public void setState(State state) {
-        this.state = state;
-    }
-
-    @JsonProperty("subscriptionPolicy")
-    public Object getSubscriptionPolicy() {
-        return isBatchSubscription() ? batchSubscriptionPolicy : serialSubscriptionPolicy;
-    }
-
-    public boolean isTrackingEnabled() {
-        return trackingMode != TrackingMode.TRACKING_OFF;
-    }
-
-    @JsonProperty("trackingMode")
-    public String getTrackingModeString() {
-        return trackingMode.getValue();
-    }
-
-    @JsonIgnore
-    public TrackingMode getTrackingMode() {
-        return trackingMode;
-    }
-
-    public OwnerId getOwner() {
-        return owner;
-    }
-
-    public MonitoringDetails getMonitoringDetails() {
-        return monitoringDetails;
-    }
-
-    public ContentType getContentType() {
-        return contentType;
-    }
-
-    public DeliveryType getDeliveryType() {
-        return deliveryType;
-    }
-
-    public List<MessageFilterSpecification> getFilters() {
-        return Collections.unmodifiableList(filters);
-    }
-
-    public List<Header> getHeaders() {
-        return Collections.unmodifiableList(headers);
-    }
-
-    public EndpointAddressResolverMetadata getEndpointAddressResolverMetadata() {
-        return endpointAddressResolverMetadata;
-    }
-
-    @JsonIgnore
-    public boolean isBatchSubscription() {
-        return this.deliveryType == DeliveryType.BATCH;
-    }
-
-    @JsonIgnore
-    public BatchSubscriptionPolicy getBatchSubscriptionPolicy() {
-        return batchSubscriptionPolicy;
-    }
-
-    @JsonIgnore
-    public SubscriptionPolicy getSerialSubscriptionPolicy() {
-        return serialSubscriptionPolicy;
-    }
-
-    public void setSerialSubscriptionPolicy(SubscriptionPolicy serialSubscriptionPolicy) {
-        this.serialSubscriptionPolicy = serialSubscriptionPolicy;
-    }
-
-    @JsonIgnore
-    public boolean isActive() {
-        return state == State.ACTIVE || state == State.PENDING;
-    }
-
-    public SubscriptionMode getMode() {
-        return mode;
-    }
-
-    @JsonProperty("oAuthPolicy")
-    public SubscriptionOAuthPolicy getOAuthPolicy() {
-        return oAuthPolicy;
-    }
-
-    @JsonIgnore
-    public boolean hasOAuthPolicy() {
-        return oAuthPolicy != null;
-    }
-
-    @JsonIgnore
-    public boolean isSeverityNotImportant() {
-        return getMonitoringDetails().getSeverity() == MonitoringDetails.Severity.NON_IMPORTANT;
-    }
-
-    public boolean isHttp2Enabled() {
-        return http2Enabled;
-    }
-
-    public boolean isSubscriptionIdentityHeadersEnabled() {
-        return subscriptionIdentityHeadersEnabled;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Long createdAt) {
-        this.createdAt = Instant.ofEpochMilli(createdAt);
-    }
-
-    public Instant getModifiedAt() {
-        return modifiedAt;
-    }
-
-    public void setModifiedAt(Long modifiedAt) {
-        this.modifiedAt = Instant.ofEpochMilli(modifiedAt);
-    }
-
-    public boolean isAutoDeleteWithTopicEnabled() {
-        return autoDeleteWithTopicEnabled;
-    }
-
-    @Override
-    public Subscription anonymize() {
-        if (getEndpoint() != null && getEndpoint().containsCredentials() || hasOAuthPolicy()) {
-            return new Subscription(
-                    topicName,
-                    name,
-                    endpoint.anonymize(),
-                    state,
-                    description,
-                    deliveryType == DeliveryType.BATCH ? batchSubscriptionPolicy : serialSubscriptionPolicy,
-                    trackingEnabled,
-                    trackingMode,
-                    owner,
-                    monitoringDetails,
-                    contentType,
-                    deliveryType,
-                    filters,
-                    mode,
-                    headers,
-                    endpointAddressResolverMetadata,
-                    oAuthPolicy != null ? oAuthPolicy.anonymize() : null,
-                    http2Enabled,
-                    subscriptionIdentityHeadersEnabled,
-                    autoDeleteWithTopicEnabled
-            );
-        }
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "Subscription(" + getQualifiedName() + ")";
-    }
-
-    public enum State {
-        PENDING, ACTIVE, SUSPENDED
-    }
+  @NotNull private final MonitoringDetails monitoringDetails;
+  private final SubscriptionName subscriptionName;
+  @Valid @NotNull private TopicName topicName;
+
+  @NotEmpty
+  @Pattern(regexp = ALLOWED_NAME_REGEX)
+  private String name;
+
+  private State state = State.PENDING;
+  @NotNull @Valid private EndpointAddress endpoint;
+  @NotNull private ContentType contentType = ContentType.JSON;
+  @NotNull private String description;
+  @Valid private SubscriptionPolicy serialSubscriptionPolicy;
+  @Valid private BatchSubscriptionPolicy batchSubscriptionPolicy;
+
+  /** Use trackingMode field instead. */
+  @Deprecated private boolean trackingEnabled = false;
+
+  private TrackingMode trackingMode = TrackingMode.TRACKING_OFF;
+  private boolean http2Enabled = false;
+  private boolean profilingEnabled = false;
+  private long profilingThresholdMs = 0;
+  @Valid @NotNull private OwnerId owner;
+  @NotNull private DeliveryType deliveryType = DeliveryType.SERIAL;
+  @NotNull private SubscriptionMode mode = SubscriptionMode.ANYCAST;
+  private List<MessageFilterSpecification> filters = new ArrayList<>();
+
+  private List<Header> headers;
+
+  private EndpointAddressResolverMetadata endpointAddressResolverMetadata;
+
+  @Valid private SubscriptionOAuthPolicy oAuthPolicy;
+
+  private boolean subscriptionIdentityHeadersEnabled;
+
+  private boolean autoDeleteWithTopicEnabled;
+
+  private Instant createdAt;
+
+  private Instant modifiedAt;
+
+  private Subscription(
+      TopicName topicName,
+      String name,
+      EndpointAddress endpoint,
+      State state,
+      String description,
+      Object subscriptionPolicy,
+      boolean trackingEnabled,
+      TrackingMode trackingMode,
+      OwnerId owner,
+      MonitoringDetails monitoringDetails,
+      ContentType contentType,
+      DeliveryType deliveryType,
+      List<MessageFilterSpecification> filters,
+      SubscriptionMode mode,
+      List<Header> headers,
+      EndpointAddressResolverMetadata endpointAddressResolverMetadata,
+      SubscriptionOAuthPolicy oAuthPolicy,
+      boolean http2Enabled,
+      boolean profilingEnabled,
+      long profilingThresholdMs,
+      boolean subscriptionIdentityHeadersEnabled,
+      boolean autoDeleteWithTopicEnabled) {
+    this.topicName = topicName;
+    this.name = name;
+    this.endpoint = endpoint;
+    this.state = state != null ? state : State.PENDING;
+    this.description = description;
+    this.trackingEnabled = trackingEnabled;
+    this.trackingMode = trackingMode;
+    this.owner = owner;
+    this.monitoringDetails =
+        monitoringDetails == null ? MonitoringDetails.EMPTY : monitoringDetails;
+    this.contentType = contentType == null ? ContentType.JSON : contentType;
+    this.deliveryType = deliveryType;
+    this.batchSubscriptionPolicy =
+        this.deliveryType == DeliveryType.BATCH
+            ? (BatchSubscriptionPolicy) subscriptionPolicy
+            : null;
+    this.serialSubscriptionPolicy =
+        this.deliveryType == DeliveryType.SERIAL ? (SubscriptionPolicy) subscriptionPolicy : null;
+    this.filters = filters;
+    this.mode = mode;
+    this.http2Enabled = http2Enabled;
+    this.profilingEnabled = profilingEnabled;
+    this.profilingThresholdMs = profilingThresholdMs;
+    this.subscriptionName = new SubscriptionName(name, topicName);
+    this.headers = headers;
+    this.endpointAddressResolverMetadata = endpointAddressResolverMetadata;
+    this.oAuthPolicy = oAuthPolicy;
+    this.subscriptionIdentityHeadersEnabled = subscriptionIdentityHeadersEnabled;
+    this.autoDeleteWithTopicEnabled = autoDeleteWithTopicEnabled;
+  }
+
+  public static Subscription createSerialSubscription(
+      TopicName topicName,
+      String name,
+      EndpointAddress endpoint,
+      State state,
+      String description,
+      SubscriptionPolicy subscriptionPolicy,
+      boolean trackingEnabled,
+      TrackingMode trackingMode,
+      OwnerId owner,
+      MonitoringDetails monitoringDetails,
+      ContentType contentType,
+      List<MessageFilterSpecification> filters,
+      SubscriptionMode mode,
+      List<Header> headers,
+      EndpointAddressResolverMetadata endpointAddressResolverMetadata,
+      SubscriptionOAuthPolicy oAuthPolicy,
+      boolean http2Enabled,
+      boolean profilingEnabled,
+      long profilingThresholdMs,
+      boolean subscriptionIdentityHeadersEnabled,
+      boolean autoDeleteWithTopicEnabled) {
+    return new Subscription(
+        topicName,
+        name,
+        endpoint,
+        state,
+        description,
+        subscriptionPolicy,
+        trackingEnabled,
+        trackingMode,
+        owner,
+        monitoringDetails,
+        contentType,
+        DeliveryType.SERIAL,
+        filters,
+        mode,
+        headers,
+        endpointAddressResolverMetadata,
+        oAuthPolicy,
+        http2Enabled,
+        profilingEnabled,
+        profilingThresholdMs,
+        subscriptionIdentityHeadersEnabled,
+        autoDeleteWithTopicEnabled);
+  }
+
+  public static Subscription createBatchSubscription(
+      TopicName topicName,
+      String name,
+      EndpointAddress endpoint,
+      State state,
+      String description,
+      BatchSubscriptionPolicy subscriptionPolicy,
+      boolean trackingEnabled,
+      TrackingMode trackingMode,
+      OwnerId owner,
+      MonitoringDetails monitoringDetails,
+      ContentType contentType,
+      List<MessageFilterSpecification> filters,
+      List<Header> headers,
+      EndpointAddressResolverMetadata endpointAddressResolverMetadata,
+      SubscriptionOAuthPolicy oAuthPolicy,
+      boolean http2Enabled,
+      boolean subscriptionIdentityHeadersEnabled,
+      boolean autoDeleteWithTopicEnabled) {
+    return new Subscription(
+        topicName,
+        name,
+        endpoint,
+        state,
+        description,
+        subscriptionPolicy,
+        trackingEnabled,
+        trackingMode,
+        owner,
+        monitoringDetails,
+        contentType,
+        DeliveryType.BATCH,
+        filters,
+        SubscriptionMode.ANYCAST,
+        headers,
+        endpointAddressResolverMetadata,
+        oAuthPolicy,
+        http2Enabled,
+        false,
+        0,
+        subscriptionIdentityHeadersEnabled,
+        autoDeleteWithTopicEnabled);
+  }
+
+  @JsonCreator
+  public static Subscription create(
+      @JsonProperty("topicName") String topicName,
+      @JsonProperty("name") String name,
+      @JsonProperty("endpoint") EndpointAddress endpoint,
+      @JsonProperty("state") State state,
+      @JsonProperty("description") String description,
+      @JsonProperty("subscriptionPolicy") Map<String, Object> subscriptionPolicy,
+      @JsonProperty("trackingEnabled") boolean trackingEnabled,
+      @JsonProperty("trackingMode") String trackingMode,
+      @JsonProperty("owner") OwnerId owner,
+      @JsonProperty("monitoringDetails") MonitoringDetails monitoringDetails,
+      @JsonProperty("contentType") ContentType contentType,
+      @JsonProperty("deliveryType") DeliveryType deliveryType,
+      @JsonProperty("filters") List<MessageFilterSpecification> filters,
+      @JsonProperty("mode") SubscriptionMode mode,
+      @JsonProperty("headers") List<Header> headers,
+      @JsonProperty("endpointAddressResolverMetadata")
+          EndpointAddressResolverMetadata endpointAddressResolverMetadata,
+      @JsonProperty("oAuthPolicy") SubscriptionOAuthPolicy oAuthPolicy,
+      @JsonProperty("http2Enabled") boolean http2Enabled,
+      @JsonProperty("profilingEnabled") boolean profilingEnabled,
+      @JsonProperty("profilingThresholdMs") long profilingThresholdMs,
+      @JsonProperty("subscriptionIdentityHeadersEnabled")
+          boolean subscriptionIdentityHeadersEnabled,
+      @JsonProperty("autoDeleteWithTopicEnabled") boolean autoDeleteWithTopicEnabled) {
+
+    DeliveryType validDeliveryType = deliveryType == null ? DeliveryType.SERIAL : deliveryType;
+    SubscriptionMode subscriptionMode = mode == null ? SubscriptionMode.ANYCAST : mode;
+    Map<String, Object> validSubscriptionPolicy =
+        subscriptionPolicy == null ? new HashMap<>() : subscriptionPolicy;
+
+    TrackingMode validTrackingMode =
+        TrackingMode.fromString(trackingMode)
+            .orElse(trackingEnabled ? TrackingMode.TRACK_ALL : TrackingMode.TRACKING_OFF);
+    boolean validTrackingEnabled = validTrackingMode != TrackingMode.TRACKING_OFF;
+
+    return new Subscription(
+        TopicName.fromQualifiedName(topicName),
+        name,
+        endpoint,
+        state,
+        description,
+        validDeliveryType == DeliveryType.SERIAL
+            ? SubscriptionPolicy.create(validSubscriptionPolicy)
+            : BatchSubscriptionPolicy.create(validSubscriptionPolicy),
+        validTrackingEnabled,
+        validTrackingMode,
+        owner,
+        monitoringDetails,
+        contentType,
+        validDeliveryType,
+        filters == null ? Collections.emptyList() : filters,
+        subscriptionMode,
+        headers == null ? Collections.emptyList() : headers,
+        endpointAddressResolverMetadata == null
+            ? EndpointAddressResolverMetadata.empty()
+            : endpointAddressResolverMetadata,
+        oAuthPolicy,
+        http2Enabled,
+        profilingEnabled,
+        profilingThresholdMs,
+        subscriptionIdentityHeadersEnabled,
+        autoDeleteWithTopicEnabled);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        endpoint,
+        topicName,
+        name,
+        description,
+        serialSubscriptionPolicy,
+        batchSubscriptionPolicy,
+        trackingEnabled,
+        trackingMode,
+        owner,
+        monitoringDetails,
+        contentType,
+        filters,
+        mode,
+        headers,
+        endpointAddressResolverMetadata,
+        oAuthPolicy,
+        http2Enabled,
+        subscriptionIdentityHeadersEnabled);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    final Subscription other = (Subscription) obj;
+
+    return Objects.equals(this.endpoint, other.endpoint)
+        && Objects.equals(this.topicName, other.topicName)
+        && Objects.equals(this.name, other.name)
+        && Objects.equals(this.description, other.description)
+        && Objects.equals(this.serialSubscriptionPolicy, other.serialSubscriptionPolicy)
+        && Objects.equals(this.batchSubscriptionPolicy, other.batchSubscriptionPolicy)
+        && Objects.equals(this.trackingEnabled, other.trackingEnabled)
+        && Objects.equals(this.trackingMode, other.trackingMode)
+        && Objects.equals(this.owner, other.owner)
+        && Objects.equals(this.monitoringDetails, other.monitoringDetails)
+        && Objects.equals(this.contentType, other.contentType)
+        && Objects.equals(this.filters, other.filters)
+        && Objects.equals(this.mode, other.mode)
+        && Objects.equals(this.headers, other.headers)
+        && Objects.equals(
+            this.endpointAddressResolverMetadata, other.endpointAddressResolverMetadata)
+        && Objects.equals(this.http2Enabled, other.http2Enabled)
+        && Objects.equals(this.profilingEnabled, other.profilingEnabled)
+        && Objects.equals(this.profilingThresholdMs, other.profilingThresholdMs)
+        && Objects.equals(this.oAuthPolicy, other.oAuthPolicy)
+        && Objects.equals(
+            this.subscriptionIdentityHeadersEnabled, other.subscriptionIdentityHeadersEnabled)
+        && Objects.equals(this.autoDeleteWithTopicEnabled, other.autoDeleteWithTopicEnabled);
+  }
+
+  @JsonIgnore
+  public SubscriptionName getQualifiedName() {
+    return subscriptionName;
+  }
+
+  public EndpointAddress getEndpoint() {
+    return endpoint;
+  }
+
+  @JsonProperty("topicName")
+  public String getQualifiedTopicName() {
+    return TopicName.toQualifiedName(topicName);
+  }
+
+  @JsonIgnore
+  public TopicName getTopicName() {
+    return topicName;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public State getState() {
+    return state;
+  }
+
+  public void setState(State state) {
+    this.state = state;
+  }
+
+  @JsonProperty("subscriptionPolicy")
+  public Object getSubscriptionPolicy() {
+    return isBatchSubscription() ? batchSubscriptionPolicy : serialSubscriptionPolicy;
+  }
+
+  public boolean isTrackingEnabled() {
+    return trackingMode != TrackingMode.TRACKING_OFF;
+  }
+
+  @JsonProperty("trackingMode")
+  public String getTrackingModeString() {
+    return trackingMode.getValue();
+  }
+
+  @JsonIgnore
+  public TrackingMode getTrackingMode() {
+    return trackingMode;
+  }
+
+  public OwnerId getOwner() {
+    return owner;
+  }
+
+  public MonitoringDetails getMonitoringDetails() {
+    return monitoringDetails;
+  }
+
+  public ContentType getContentType() {
+    return contentType;
+  }
+
+  public DeliveryType getDeliveryType() {
+    return deliveryType;
+  }
+
+  public List<MessageFilterSpecification> getFilters() {
+    return Collections.unmodifiableList(filters);
+  }
+
+  public List<Header> getHeaders() {
+    return Collections.unmodifiableList(headers);
+  }
+
+  public EndpointAddressResolverMetadata getEndpointAddressResolverMetadata() {
+    return endpointAddressResolverMetadata;
+  }
+
+  @JsonIgnore
+  public boolean isBatchSubscription() {
+    return this.deliveryType == DeliveryType.BATCH;
+  }
+
+  @JsonIgnore
+  public BatchSubscriptionPolicy getBatchSubscriptionPolicy() {
+    return batchSubscriptionPolicy;
+  }
+
+  @JsonIgnore
+  public SubscriptionPolicy getSerialSubscriptionPolicy() {
+    return serialSubscriptionPolicy;
+  }
+
+  public void setSerialSubscriptionPolicy(SubscriptionPolicy serialSubscriptionPolicy) {
+    this.serialSubscriptionPolicy = serialSubscriptionPolicy;
+  }
+
+  @JsonIgnore
+  public boolean isActive() {
+    return state == State.ACTIVE || state == State.PENDING;
+  }
+
+  public SubscriptionMode getMode() {
+    return mode;
+  }
+
+  @JsonProperty("oAuthPolicy")
+  public SubscriptionOAuthPolicy getOAuthPolicy() {
+    return oAuthPolicy;
+  }
+
+  @JsonIgnore
+  public boolean hasOAuthPolicy() {
+    return oAuthPolicy != null;
+  }
+
+  @JsonIgnore
+  public boolean isSeverityNotImportant() {
+    return getMonitoringDetails().getSeverity() == MonitoringDetails.Severity.NON_IMPORTANT;
+  }
+
+  public boolean isHttp2Enabled() {
+    return http2Enabled;
+  }
+
+  public boolean isProfilingEnabled() {
+    return profilingEnabled;
+  }
+
+  public long getProfilingThresholdMs() {
+    return profilingThresholdMs;
+  }
+
+  public boolean isSubscriptionIdentityHeadersEnabled() {
+    return subscriptionIdentityHeadersEnabled;
+  }
+
+  public Instant getCreatedAt() {
+    return createdAt;
+  }
+
+  public void setCreatedAt(Long createdAt) {
+    this.createdAt = Instant.ofEpochMilli(createdAt);
+  }
+
+  public Instant getModifiedAt() {
+    return modifiedAt;
+  }
+
+  public void setModifiedAt(Long modifiedAt) {
+    this.modifiedAt = Instant.ofEpochMilli(modifiedAt);
+  }
+
+  public boolean isAutoDeleteWithTopicEnabled() {
+    return autoDeleteWithTopicEnabled;
+  }
+
+  @Override
+  public Subscription anonymize() {
+    if (getEndpoint() != null && getEndpoint().containsCredentials() || hasOAuthPolicy()) {
+      return new Subscription(
+          topicName,
+          name,
+          endpoint.anonymize(),
+          state,
+          description,
+          deliveryType == DeliveryType.BATCH ? batchSubscriptionPolicy : serialSubscriptionPolicy,
+          trackingEnabled,
+          trackingMode,
+          owner,
+          monitoringDetails,
+          contentType,
+          deliveryType,
+          filters,
+          mode,
+          headers,
+          endpointAddressResolverMetadata,
+          oAuthPolicy != null ? oAuthPolicy.anonymize() : null,
+          http2Enabled,
+          profilingEnabled,
+          profilingThresholdMs,
+          subscriptionIdentityHeadersEnabled,
+          autoDeleteWithTopicEnabled);
+    }
+    return this;
+  }
+
+  @Override
+  public String toString() {
+    return "Subscription(" + getQualifiedName() + ")";
+  }
+
+  public enum State {
+    PENDING,
+    ACTIVE,
+    SUSPENDED
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionConstraints.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionConstraints.java
index 3ba492ec74..09254c5c8c 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionConstraints.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionConstraints.java
@@ -6,22 +6,22 @@
 
 public class SubscriptionConstraints {
 
-    private final SubscriptionName subscriptionName;
-    @Valid
-    private final Constraints constraints;
+  private final SubscriptionName subscriptionName;
+  @Valid private final Constraints constraints;
 
-    @JsonCreator
-    public SubscriptionConstraints(@JsonProperty("subscriptionName") String subscriptionName,
-                                   @JsonProperty("constraints") Constraints constraints) {
-        this.subscriptionName = SubscriptionName.fromString(subscriptionName);
-        this.constraints = constraints;
-    }
+  @JsonCreator
+  public SubscriptionConstraints(
+      @JsonProperty("subscriptionName") String subscriptionName,
+      @JsonProperty("constraints") Constraints constraints) {
+    this.subscriptionName = SubscriptionName.fromString(subscriptionName);
+    this.constraints = constraints;
+  }
 
-    public SubscriptionName getSubscriptionName() {
-        return subscriptionName;
-    }
+  public SubscriptionName getSubscriptionName() {
+    return subscriptionName;
+  }
 
-    public Constraints getConstraints() {
-        return constraints;
-    }
+  public Constraints getConstraints() {
+    return constraints;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionHealth.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionHealth.java
index 033d87ba0c..fca6976c83 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionHealth.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionHealth.java
@@ -1,73 +1,73 @@
 package pl.allegro.tech.hermes.api;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Collections.emptySet;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableSet;
-
 import java.util.Objects;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Collections.emptySet;
-
 public final class SubscriptionHealth {
-    public static final SubscriptionHealth HEALTHY = new SubscriptionHealth(Status.HEALTHY, emptySet());
-    public static final SubscriptionHealth NO_DATA = new SubscriptionHealth(Status.NO_DATA, emptySet());
+  public static final SubscriptionHealth HEALTHY =
+      new SubscriptionHealth(Status.HEALTHY, emptySet());
+  public static final SubscriptionHealth NO_DATA =
+      new SubscriptionHealth(Status.NO_DATA, emptySet());
 
-    private final Status status;
-    private final ImmutableSet<SubscriptionHealthProblem> problems;
+  private final Status status;
+  private final ImmutableSet<SubscriptionHealthProblem> problems;
 
-    @JsonCreator
-    private SubscriptionHealth(@JsonProperty("status") Status status,
-                               @JsonProperty("problems") Set<SubscriptionHealthProblem> problems) {
-        this.status = status;
-        this.problems = ImmutableSet.copyOf(problems);
-    }
+  @JsonCreator
+  private SubscriptionHealth(
+      @JsonProperty("status") Status status,
+      @JsonProperty("problems") Set<SubscriptionHealthProblem> problems) {
+    this.status = status;
+    this.problems = ImmutableSet.copyOf(problems);
+  }
 
-    public Status getStatus() {
-        return status;
-    }
+  public Status getStatus() {
+    return status;
+  }
 
-    public Set<SubscriptionHealthProblem> getProblems() {
-        return problems;
-    }
+  public Set<SubscriptionHealthProblem> getProblems() {
+    return problems;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof SubscriptionHealth)) {
-            return false;
-        }
-        SubscriptionHealth that = (SubscriptionHealth) o;
-        return status == that.status
-                && Objects.equals(problems, that.problems);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(status, problems);
+    if (!(o instanceof SubscriptionHealth)) {
+      return false;
     }
+    SubscriptionHealth that = (SubscriptionHealth) o;
+    return status == that.status && Objects.equals(problems, that.problems);
+  }
 
-    @Override
-    public String toString() {
-        return "SubscriptionHealth{"
-                + "status=" + status
-                + ", problems=" + problems
-                + '}';
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(status, problems);
+  }
 
-    public static SubscriptionHealth of(Set<SubscriptionHealthProblem> problems) {
-        checkNotNull(problems, "Set of health problems cannot be null");
-        if (problems.isEmpty()) {
-            return HEALTHY;
-        } else {
-            return new SubscriptionHealth(Status.UNHEALTHY, problems);
-        }
-    }
+  @Override
+  public String toString() {
+    return "SubscriptionHealth{" + "status=" + status + ", problems=" + problems + '}';
+  }
 
-    public enum Status {
-        HEALTHY, UNHEALTHY, NO_DATA
+  public static SubscriptionHealth of(Set<SubscriptionHealthProblem> problems) {
+    checkNotNull(problems, "Set of health problems cannot be null");
+    if (problems.isEmpty()) {
+      return HEALTHY;
+    } else {
+      return new SubscriptionHealth(Status.UNHEALTHY, problems);
     }
+  }
+
+  public enum Status {
+    HEALTHY,
+    UNHEALTHY,
+    NO_DATA
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionHealthProblem.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionHealthProblem.java
index 2740a909f5..2f928427af 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionHealthProblem.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionHealthProblem.java
@@ -1,10 +1,5 @@
 package pl.allegro.tech.hermes.api;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Objects;
-
 import static java.lang.String.format;
 import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.ProblemCode.LAGGING;
 import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.ProblemCode.MALFUNCTIONING;
@@ -12,93 +7,101 @@
 import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.ProblemCode.TIMING_OUT;
 import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.ProblemCode.UNREACHABLE;
 
-public class SubscriptionHealthProblem {
-
-    public enum ProblemCode {
-        LAGGING, UNREACHABLE, TIMING_OUT, MALFUNCTIONING, RECEIVING_MALFORMED_MESSAGES
-    }
-
-    private final ProblemCode code;
-    private final String description;
-
-    @JsonCreator
-    private SubscriptionHealthProblem(@JsonProperty("code") ProblemCode code,
-                                      @JsonProperty("description") String description) {
-        this.code = code;
-        this.description = description;
-    }
-
-    public static SubscriptionHealthProblem lagging(long subscriptionLag, String subscriptionName) {
-        return new SubscriptionHealthProblem(
-                LAGGING,
-                format("Lag is growing on subscription %s, current value is %d messages", subscriptionName, subscriptionLag)
-        );
-    }
-
-    public static SubscriptionHealthProblem malfunctioning(double code5xxErrorsRate, String subscriptionName) {
-        return new SubscriptionHealthProblem(
-                MALFUNCTIONING,
-                format("Consuming service returns a lot of 5xx codes for subscription %s, currently %.0f 5xx/s",
-                        subscriptionName,
-                        code5xxErrorsRate)
-        );
-    }
-
-    public static SubscriptionHealthProblem receivingMalformedMessages(double code4xxErrorsRate, String subscriptionName) {
-        return new SubscriptionHealthProblem(
-                RECEIVING_MALFORMED_MESSAGES,
-                format("Consuming service returns a lot of 4xx codes for subscription %s, currently %.0f 4xx/s",
-                        subscriptionName,
-                        code4xxErrorsRate)
-        );
-    }
-
-    public static SubscriptionHealthProblem timingOut(double timeoutsRate, String subscriptionName) {
-        return new SubscriptionHealthProblem(
-                TIMING_OUT,
-                format("Consuming service times out a lot for subscription %s, currently %.0f timeouts/s",
-                        subscriptionName,
-                        timeoutsRate)
-        );
-    }
-
-    public static SubscriptionHealthProblem unreachable(double otherErrorsRate, String subscriptionName) {
-        return new SubscriptionHealthProblem(
-                UNREACHABLE,
-                format("Unable to connect to consuming service instances for subscription %s, current rate is %.0f failures/s",
-                        subscriptionName,
-                        otherErrorsRate)
-        );
-    }
-
-    public ProblemCode getCode() {
-        return code;
-    }
-
-    public String getDescription() {
-        return description;
-    }
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
 
-    @Override
-    public String toString() {
-        return code.name();
-    }
+public class SubscriptionHealthProblem {
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(code, description);
+  public enum ProblemCode {
+    LAGGING,
+    UNREACHABLE,
+    TIMING_OUT,
+    MALFUNCTIONING,
+    RECEIVING_MALFORMED_MESSAGES
+  }
+
+  private final ProblemCode code;
+  private final String description;
+
+  @JsonCreator
+  private SubscriptionHealthProblem(
+      @JsonProperty("code") ProblemCode code, @JsonProperty("description") String description) {
+    this.code = code;
+    this.description = description;
+  }
+
+  public static SubscriptionHealthProblem lagging(long subscriptionLag, String subscriptionName) {
+    return new SubscriptionHealthProblem(
+        LAGGING,
+        format(
+            "Lag is growing on subscription %s, current value is %d messages",
+            subscriptionName, subscriptionLag));
+  }
+
+  public static SubscriptionHealthProblem malfunctioning(
+      double code5xxErrorsRate, String subscriptionName) {
+    return new SubscriptionHealthProblem(
+        MALFUNCTIONING,
+        format(
+            "Consuming service returns a lot of 5xx codes for subscription %s, currently %.0f 5xx/s",
+            subscriptionName, code5xxErrorsRate));
+  }
+
+  public static SubscriptionHealthProblem receivingMalformedMessages(
+      double code4xxErrorsRate, String subscriptionName) {
+    return new SubscriptionHealthProblem(
+        RECEIVING_MALFORMED_MESSAGES,
+        format(
+            "Consuming service returns a lot of 4xx codes for subscription %s, currently %.0f 4xx/s",
+            subscriptionName, code4xxErrorsRate));
+  }
+
+  public static SubscriptionHealthProblem timingOut(double timeoutsRate, String subscriptionName) {
+    return new SubscriptionHealthProblem(
+        TIMING_OUT,
+        format(
+            "Consuming service times out a lot for subscription %s, currently %.0f timeouts/s",
+            subscriptionName, timeoutsRate));
+  }
+
+  public static SubscriptionHealthProblem unreachable(
+      double otherErrorsRate, String subscriptionName) {
+    return new SubscriptionHealthProblem(
+        UNREACHABLE,
+        format(
+            "Unable to connect to consuming service instances for subscription %s, current rate is %.0f failures/s",
+            subscriptionName, otherErrorsRate));
+  }
+
+  public ProblemCode getCode() {
+    return code;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  @Override
+  public String toString() {
+    return code.name();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, description);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        SubscriptionHealthProblem other = (SubscriptionHealthProblem) obj;
-        return Objects.equals(this.code, other.code)
-                && Objects.equals(this.description, other.description);
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
+    SubscriptionHealthProblem other = (SubscriptionHealthProblem) obj;
+    return Objects.equals(this.code, other.code)
+        && Objects.equals(this.description, other.description);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionMetrics.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionMetrics.java
index a4a5aafe08..d621922e86 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionMetrics.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionMetrics.java
@@ -4,180 +4,192 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class SubscriptionMetrics {
-    private long delivered;
-    private long discarded;
-    private long volume;
-    private MetricDecimalValue timeouts;
-    private MetricDecimalValue otherErrors;
-    private MetricDecimalValue codes2xx;
-    private MetricDecimalValue codes4xx;
-    private MetricDecimalValue codes5xx;
-    private MetricLongValue lag;
-    private Subscription.State state;
-    private MetricDecimalValue rate;
-    private MetricDecimalValue throughput;
-    private MetricDecimalValue batchRate;
+  private long delivered;
+  private long discarded;
+  private long volume;
+  private MetricDecimalValue timeouts;
+  private MetricDecimalValue otherErrors;
+  private MetricDecimalValue codes2xx;
+  private MetricDecimalValue codes4xx;
+  private MetricDecimalValue codes5xx;
+  private MetricDecimalValue retries;
+  private MetricLongValue lag;
+  private Subscription.State state;
+  private MetricDecimalValue rate;
+  private MetricDecimalValue throughput;
+  private MetricDecimalValue batchRate;
+
+  private SubscriptionMetrics() {}
+
+  @JsonCreator
+  public SubscriptionMetrics(
+      @JsonProperty("delivered") long delivered,
+      @JsonProperty("discarded") long discarded,
+      @JsonProperty("volume") long volume,
+      @JsonProperty("timeouts") MetricDecimalValue timeouts,
+      @JsonProperty("otherErrors") MetricDecimalValue otherErrors,
+      @JsonProperty("codes2xx") MetricDecimalValue codes2xx,
+      @JsonProperty("codes4xx") MetricDecimalValue codes4xx,
+      @JsonProperty("codes5xx") MetricDecimalValue codes5xx,
+      @JsonProperty("retries") MetricDecimalValue retries,
+      @JsonProperty("Subscription") Subscription.State state,
+      @JsonProperty("rate") MetricDecimalValue rate,
+      @JsonProperty("throughput") MetricDecimalValue throughput,
+      @JsonProperty("batchRate") MetricDecimalValue batchRate) {
+    this.delivered = delivered;
+    this.discarded = discarded;
+    this.volume = volume;
+    this.timeouts = timeouts;
+    this.otherErrors = otherErrors;
+    this.codes2xx = codes2xx;
+    this.codes4xx = codes4xx;
+    this.codes5xx = codes5xx;
+    this.retries = retries;
+    this.state = state;
+    this.rate = rate;
+    this.throughput = throughput;
+    this.batchRate = batchRate;
+  }
+
+  public long getDelivered() {
+    return delivered;
+  }
+
+  public long getDiscarded() {
+    return discarded;
+  }
 
-    private SubscriptionMetrics() {
-    }
+  public MetricDecimalValue getTimeouts() {
+    return timeouts;
+  }
 
-    @JsonCreator
-    public SubscriptionMetrics(@JsonProperty("delivered") long delivered,
-                               @JsonProperty("discarded") long discarded,
-                               @JsonProperty("volume") long volume,
-                               @JsonProperty("timeouts") MetricDecimalValue timeouts,
-                               @JsonProperty("otherErrors") MetricDecimalValue otherErrors,
-                               @JsonProperty("codes2xx") MetricDecimalValue codes2xx,
-                               @JsonProperty("codes4xx") MetricDecimalValue codes4xx,
-                               @JsonProperty("codes5xx") MetricDecimalValue codes5xx,
-                               @JsonProperty("Subscription") Subscription.State state,
-                               @JsonProperty("rate") MetricDecimalValue rate,
-                               @JsonProperty("throughput") MetricDecimalValue throughput,
-                               @JsonProperty("batchRate") MetricDecimalValue batchRate) {
-        this.delivered = delivered;
-        this.discarded = discarded;
-        this.volume = volume;
-        this.timeouts = timeouts;
-        this.otherErrors = otherErrors;
-        this.codes2xx = codes2xx;
-        this.codes4xx = codes4xx;
-        this.codes5xx = codes5xx;
-        this.state = state;
-        this.rate = rate;
-        this.throughput = throughput;
-        this.batchRate = batchRate;
-    }
+  public MetricLongValue getLag() {
+    return lag;
+  }
 
-    public long getDelivered() {
-        return delivered;
-    }
+  public MetricDecimalValue getRate() {
+    return rate;
+  }
 
-    public long getDiscarded() {
-        return discarded;
-    }
+  public MetricDecimalValue getOtherErrors() {
+    return otherErrors;
+  }
 
-    public MetricDecimalValue getTimeouts() {
-        return timeouts;
-    }
+  public MetricDecimalValue getCodes2xx() {
+    return codes2xx;
+  }
 
-    public MetricLongValue getLag() {
-        return lag;
-    }
+  public MetricDecimalValue getCodes4xx() {
+    return codes4xx;
+  }
 
-    public MetricDecimalValue getRate() {
-        return rate;
-    }
-    
-    public MetricDecimalValue getOtherErrors() {
-        return otherErrors;
-    }
+  public MetricDecimalValue getCodes5xx() {
+    return codes5xx;
+  }
 
-    public MetricDecimalValue getCodes2xx() {
-        return codes2xx;
-    }
+  public MetricDecimalValue getRetries() {
+    return retries;
+  }
 
-    public MetricDecimalValue getCodes4xx() {
-        return codes4xx;
-    }
+  public Subscription.State getState() {
+    return state;
+  }
 
-    public MetricDecimalValue getCodes5xx() {
-        return codes5xx;
-    }
+  public MetricDecimalValue getThroughput() {
+    return throughput;
+  }
 
-    public Subscription.State getState() {
-        return state;
-    }
+  public MetricDecimalValue getBatchRate() {
+    return batchRate;
+  }
 
-    public MetricDecimalValue getThroughput() {
-        return throughput;
-    }
+  public long getVolume() {
+    return volume;
+  }
 
-    public MetricDecimalValue getBatchRate() {
-        return batchRate;
-    }
+  public static class Builder {
+    private SubscriptionMetrics subscriptionMetrics;
 
-    public long getVolume() {
-        return volume;
+    public Builder() {
+      subscriptionMetrics = new SubscriptionMetrics();
     }
 
-    public static class Builder {
-        private SubscriptionMetrics subscriptionMetrics;
-
-        public Builder() {
-            subscriptionMetrics = new SubscriptionMetrics();
-        }
+    public Builder withDelivered(long delivered) {
+      subscriptionMetrics.delivered = delivered;
+      return this;
+    }
 
-        public Builder withDelivered(long delivered) {
-            subscriptionMetrics.delivered = delivered;
-            return this;
-        }
+    public Builder withDiscarded(long discarded) {
+      subscriptionMetrics.discarded = discarded;
+      return this;
+    }
 
-        public Builder withDiscarded(long discarded) {
-            subscriptionMetrics.discarded = discarded;
-            return this;
-        }
+    public Builder withVolume(long volume) {
+      subscriptionMetrics.volume = volume;
+      return this;
+    }
 
-        public Builder withVolume(long volume) {
-            subscriptionMetrics.volume = volume;
-            return this;
-        }
+    public Builder withOtherErrors(MetricDecimalValue otherErrors) {
+      subscriptionMetrics.otherErrors = otherErrors;
+      return this;
+    }
 
-        public Builder withOtherErrors(MetricDecimalValue otherErrors) {
-            subscriptionMetrics.otherErrors = otherErrors;
-            return this;
-        }
+    public Builder withTimeouts(MetricDecimalValue timeouts) {
+      subscriptionMetrics.timeouts = timeouts;
+      return this;
+    }
 
-        public Builder withTimeouts(MetricDecimalValue timeouts) {
-            subscriptionMetrics.timeouts = timeouts;
-            return this;
-        }
+    public Builder withCodes2xx(MetricDecimalValue count) {
+      subscriptionMetrics.codes2xx = count;
+      return this;
+    }
 
-        public Builder withCodes2xx(MetricDecimalValue count) {
-            subscriptionMetrics.codes2xx = count;
-            return this;
-        }
+    public Builder withCodes4xx(MetricDecimalValue count) {
+      subscriptionMetrics.codes4xx = count;
+      return this;
+    }
 
-        public Builder withCodes4xx(MetricDecimalValue count) {
-            subscriptionMetrics.codes4xx = count;
-            return this;
-        }
+    public Builder withCodes5xx(MetricDecimalValue count) {
+      subscriptionMetrics.codes5xx = count;
+      return this;
+    }
 
-        public Builder withCodes5xx(MetricDecimalValue count) {
-            subscriptionMetrics.codes5xx = count;
-            return this;
-        }
+    public Builder withRetries(MetricDecimalValue retries) {
+      subscriptionMetrics.retries = retries;
+      return this;
+    }
 
-        public Builder withRate(MetricDecimalValue rate) {
-            subscriptionMetrics.rate = rate;
-            return this;
-        }
+    public Builder withRate(MetricDecimalValue rate) {
+      subscriptionMetrics.rate = rate;
+      return this;
+    }
 
-        public Builder withState(Subscription.State state) {
-            subscriptionMetrics.state = state;
-            return this;
-        }
+    public Builder withState(Subscription.State state) {
+      subscriptionMetrics.state = state;
+      return this;
+    }
 
-        public Builder withLag(MetricLongValue lag) {
-            subscriptionMetrics.lag = lag;
-            return this;
-        }
+    public Builder withLag(MetricLongValue lag) {
+      subscriptionMetrics.lag = lag;
+      return this;
+    }
 
-        public Builder withThroughput(MetricDecimalValue throughput) {
-            subscriptionMetrics.throughput = throughput;
-            return this;
-        }
+    public Builder withThroughput(MetricDecimalValue throughput) {
+      subscriptionMetrics.throughput = throughput;
+      return this;
+    }
 
-        public Builder withBatchRate(MetricDecimalValue batchRate) {
-            subscriptionMetrics.batchRate = batchRate;
-            return this;
-        }
+    public Builder withBatchRate(MetricDecimalValue batchRate) {
+      subscriptionMetrics.batchRate = batchRate;
+      return this;
+    }
 
-        public static Builder subscriptionMetrics() {
-            return new Builder();
-        }
+    public static Builder subscriptionMetrics() {
+      return new Builder();
+    }
 
-        public SubscriptionMetrics build() {
-            return subscriptionMetrics;
-        }
+    public SubscriptionMetrics build() {
+      return subscriptionMetrics;
     }
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionMode.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionMode.java
index 4d9332d508..743d51ee95 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionMode.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionMode.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.api;
 
 public enum SubscriptionMode {
-    ANYCAST, BROADCAST
+  ANYCAST,
+  BROADCAST
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionName.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionName.java
index 5ff2d69ef3..58a5685bce 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionName.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionName.java
@@ -1,63 +1,65 @@
 package pl.allegro.tech.hermes.api;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 public class SubscriptionName {
 
-    private final String name;
-    private final TopicName topicName;
+  private final String name;
+  private final TopicName topicName;
 
-    @JsonCreator
-    public SubscriptionName(@JsonProperty("name") String name, @JsonProperty("topicName") TopicName topicName) {
-        this.name = name;
-        this.topicName = topicName;
-    }
+  @JsonCreator
+  public SubscriptionName(
+      @JsonProperty("name") String name, @JsonProperty("topicName") TopicName topicName) {
+    this.name = name;
+    this.topicName = topicName;
+  }
 
-    @JsonIgnore
-    public String getQualifiedName() {
-        return toString();
-    }
+  @JsonIgnore
+  public String getQualifiedName() {
+    return toString();
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public TopicName getTopicName() {
-        return topicName;
-    }
+  public TopicName getTopicName() {
+    return topicName;
+  }
 
-    public static SubscriptionName fromString(String string) {
-        String[] tokens = string.split("\\$");
-        checkArgument(tokens.length > 1, "Incorrect string format. Expected 'topic$subscription'. Found:'%s'", string);
-        return new SubscriptionName(tokens[1], TopicName.fromQualifiedName(tokens[0]));
-    }
+  public static SubscriptionName fromString(String string) {
+    String[] tokens = string.split("\\$");
+    checkArgument(
+        tokens.length > 1,
+        "Incorrect string format. Expected 'topic$subscription'. Found:'%s'",
+        string);
+    return new SubscriptionName(tokens[1], TopicName.fromQualifiedName(tokens[0]));
+  }
 
-    @Override
-    public String toString() {
-        return topicName.qualifiedName() + "$" + name;
-    }
+  @Override
+  public String toString() {
+    return topicName.qualifiedName() + "$" + name;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionName that = (SubscriptionName) o;
-        return Objects.equals(name, that.name)
-                && Objects.equals(topicName, that.topicName);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, topicName);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SubscriptionName that = (SubscriptionName) o;
+    return Objects.equals(name, that.name) && Objects.equals(topicName, that.topicName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, topicName);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionNameWithMetrics.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionNameWithMetrics.java
index e06da8b8ab..a03d8f282a 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionNameWithMetrics.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionNameWithMetrics.java
@@ -2,110 +2,124 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public class SubscriptionNameWithMetrics {
-    private final String topicName;
-    private final String name;
-    private final long delivered;
-    private final long discarded;
-    private final long volume;
-    private final MetricDecimalValue timeouts;
-    private final MetricLongValue lag;
-    private final MetricDecimalValue rate;
-    private final MetricDecimalValue throughput;
-
-    @JsonCreator
-    public SubscriptionNameWithMetrics(
-            @JsonProperty("topicName") String topicName,
-            @JsonProperty("name") String name,
-            @JsonProperty("delivered") long delivered,
-            @JsonProperty("discarded") long discarded,
-            @JsonProperty("volume") long volume,
-            @JsonProperty("timeouts") MetricDecimalValue timeouts,
-            @JsonProperty("lag") MetricLongValue lag,
-            @JsonProperty("rate") MetricDecimalValue rate,
-            @JsonProperty("throughput") MetricDecimalValue throughput
-    ) {
-        this.topicName = topicName;
-        this.name = name;
-        this.delivered = delivered;
-        this.discarded = discarded;
-        this.volume = volume;
-        this.timeouts = timeouts;
-        this.lag = lag;
-        this.rate = rate;
-        this.throughput = throughput;
-    }
-
-    public static SubscriptionNameWithMetrics from(SubscriptionMetrics metrics, String name, String topicQualifiedName) {
-        return new SubscriptionNameWithMetrics(topicQualifiedName, name, metrics.getDelivered(),
-                metrics.getDiscarded(), metrics.getVolume(), metrics.getTimeouts(), metrics.getLag(),
-                metrics.getRate(), metrics.getThroughput());
-    }
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public long getDelivered() {
-        return delivered;
+  private final String topicName;
+  private final String name;
+  private final long delivered;
+  private final long discarded;
+  private final long volume;
+  private final MetricDecimalValue timeouts;
+  private final MetricLongValue lag;
+  private final MetricDecimalValue rate;
+  private final MetricDecimalValue throughput;
+
+  @JsonCreator
+  public SubscriptionNameWithMetrics(
+      @JsonProperty("topicName") String topicName,
+      @JsonProperty("name") String name,
+      @JsonProperty("delivered") long delivered,
+      @JsonProperty("discarded") long discarded,
+      @JsonProperty("volume") long volume,
+      @JsonProperty("timeouts") MetricDecimalValue timeouts,
+      @JsonProperty("lag") MetricLongValue lag,
+      @JsonProperty("rate") MetricDecimalValue rate,
+      @JsonProperty("throughput") MetricDecimalValue throughput) {
+    this.topicName = topicName;
+    this.name = name;
+    this.delivered = delivered;
+    this.discarded = discarded;
+    this.volume = volume;
+    this.timeouts = timeouts;
+    this.lag = lag;
+    this.rate = rate;
+    this.throughput = throughput;
+  }
+
+  public static SubscriptionNameWithMetrics from(
+      SubscriptionMetrics metrics, String name, String topicQualifiedName) {
+    return new SubscriptionNameWithMetrics(
+        topicQualifiedName,
+        name,
+        metrics.getDelivered(),
+        metrics.getDiscarded(),
+        metrics.getVolume(),
+        metrics.getTimeouts(),
+        metrics.getLag(),
+        metrics.getRate(),
+        metrics.getThroughput());
+  }
+
+  public String getTopicName() {
+    return topicName;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public long getDelivered() {
+    return delivered;
+  }
+
+  public long getDiscarded() {
+    return discarded;
+  }
+
+  public MetricDecimalValue getTimeouts() {
+    return timeouts;
+  }
+
+  public MetricLongValue getLag() {
+    return lag;
+  }
+
+  public MetricDecimalValue getRate() {
+    return rate;
+  }
+
+  public MetricDecimalValue getThroughput() {
+    return throughput;
+  }
+
+  public long getVolume() {
+    return volume;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    public long getDiscarded() {
-        return discarded;
-    }
-
-    public MetricDecimalValue getTimeouts() {
-        return timeouts;
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
 
-    public MetricLongValue getLag() {
-        return lag;
-    }
-
-    public MetricDecimalValue getRate() {
-        return rate;
-    }
-
-    public MetricDecimalValue getThroughput() {
-        return throughput;
-    }
-
-    public long getVolume() {
-        return volume;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        SubscriptionNameWithMetrics that = (SubscriptionNameWithMetrics) o;
-
-        return Objects.equals(this.topicName, that.topicName)
-                && Objects.equals(this.name, that.name)
-                && Objects.equals(this.delivered, that.delivered)
-                && Objects.equals(this.discarded, that.discarded)
-                && Objects.equals(this.timeouts, that.timeouts)
-                && Objects.equals(this.lag, that.lag)
-                && Objects.equals(this.rate, that.rate)
-                && Objects.equals(this.throughput, that.throughput)
-                && Objects.equals(this.volume, that.volume);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.topicName, this.name, this.delivered, this.discarded,
-                this.timeouts, this.lag, this.rate, this.throughput, this.volume);
-    }
+    SubscriptionNameWithMetrics that = (SubscriptionNameWithMetrics) o;
+
+    return Objects.equals(this.topicName, that.topicName)
+        && Objects.equals(this.name, that.name)
+        && Objects.equals(this.delivered, that.delivered)
+        && Objects.equals(this.discarded, that.discarded)
+        && Objects.equals(this.timeouts, that.timeouts)
+        && Objects.equals(this.lag, that.lag)
+        && Objects.equals(this.rate, that.rate)
+        && Objects.equals(this.throughput, that.throughput)
+        && Objects.equals(this.volume, that.volume);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        this.topicName,
+        this.name,
+        this.delivered,
+        this.discarded,
+        this.timeouts,
+        this.lag,
+        this.rate,
+        this.throughput,
+        this.volume);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionOAuthPolicy.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionOAuthPolicy.java
index 769f0d0ae0..a62945e9ae 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionOAuthPolicy.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionOAuthPolicy.java
@@ -4,136 +4,135 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 import jakarta.validation.constraints.NotNull;
-
 import java.util.Objects;
 
 public class SubscriptionOAuthPolicy {
 
-    private static final String ANONYMIZED_PASSWORD = "******";
-    @NotNull
-    private final GrantType grantType;
-    @NotNull
-    private final String providerName;
-    private final String scope;
-    private final String username;
-    private final String password;
-
-    @JsonCreator
-    public SubscriptionOAuthPolicy(
-            @JsonProperty("grantType") GrantType grantType,
-            @JsonProperty("providerName") String providerName,
-            @JsonProperty("scope") String scope,
-            @JsonProperty("username") String username,
-            @JsonProperty("password") String password) {
-
-        this.grantType = grantType;
-        this.providerName = providerName;
-        this.scope = scope;
-        this.username = username;
-        this.password = password;
+  private static final String ANONYMIZED_PASSWORD = "******";
+  @NotNull private final GrantType grantType;
+  @NotNull private final String providerName;
+  private final String scope;
+  private final String username;
+  private final String password;
+
+  @JsonCreator
+  public SubscriptionOAuthPolicy(
+      @JsonProperty("grantType") GrantType grantType,
+      @JsonProperty("providerName") String providerName,
+      @JsonProperty("scope") String scope,
+      @JsonProperty("username") String username,
+      @JsonProperty("password") String password) {
+
+    this.grantType = grantType;
+    this.providerName = providerName;
+    this.scope = scope;
+    this.username = username;
+    this.password = password;
+  }
+
+  public static Builder passwordGrantOAuthPolicy(String providerName) {
+    return new Builder(providerName, GrantType.USERNAME_PASSWORD);
+  }
+
+  public static Builder clientCredentialsGrantOAuthPolicy(String providerName) {
+    return new Builder(providerName, GrantType.CLIENT_CREDENTIALS);
+  }
+
+  public GrantType getGrantType() {
+    return grantType;
+  }
+
+  public String getProviderName() {
+    return providerName;
+  }
+
+  public String getScope() {
+    return scope;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public SubscriptionOAuthPolicy anonymize() {
+    if (GrantType.USERNAME_PASSWORD.equals(grantType)) {
+      return new SubscriptionOAuthPolicy(
+          grantType, providerName, scope, username, ANONYMIZED_PASSWORD);
     }
+    return this;
+  }
 
-    public static Builder passwordGrantOAuthPolicy(String providerName) {
-        return new Builder(providerName, GrantType.USERNAME_PASSWORD);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    public static Builder clientCredentialsGrantOAuthPolicy(String providerName) {
-        return new Builder(providerName, GrantType.CLIENT_CREDENTIALS);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
-
-    public GrantType getGrantType() {
-        return grantType;
-    }
-
-    public String getProviderName() {
-        return providerName;
+    SubscriptionOAuthPolicy that = (SubscriptionOAuthPolicy) o;
+    return grantType == that.grantType
+        && Objects.equals(providerName, that.providerName)
+        && Objects.equals(scope, that.scope)
+        && Objects.equals(username, that.username)
+        && Objects.equals(password, that.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(grantType, providerName, scope, username, password);
+  }
+
+  public enum GrantType {
+    CLIENT_CREDENTIALS("clientCredentials"),
+    USERNAME_PASSWORD("password");
+
+    private final String name;
+
+    GrantType(String name) {
+      this.name = name;
     }
 
-    public String getScope() {
-        return scope;
+    @JsonValue
+    public String getName() {
+      return name;
     }
+  }
 
-    public String getUsername() {
-        return username;
-    }
+  public static class Builder {
 
-    public String getPassword() {
-        return password;
-    }
+    private final String providerName;
+    private final GrantType grantType;
+    private String scope;
+    private String username;
+    private String password;
 
-    public SubscriptionOAuthPolicy anonymize() {
-        if (GrantType.USERNAME_PASSWORD.equals(grantType)) {
-            return new SubscriptionOAuthPolicy(grantType, providerName, scope, username, ANONYMIZED_PASSWORD);
-        }
-        return this;
+    public Builder(String providerName, GrantType grantType) {
+      this.providerName = providerName;
+      this.grantType = grantType;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionOAuthPolicy that = (SubscriptionOAuthPolicy) o;
-        return grantType == that.grantType
-                && Objects.equals(providerName, that.providerName)
-                && Objects.equals(scope, that.scope)
-                && Objects.equals(username, that.username)
-                && Objects.equals(password, that.password);
+    public Builder withScope(String scope) {
+      this.scope = scope;
+      return this;
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(grantType, providerName, scope, username, password);
+    public Builder withUsername(String username) {
+      this.username = username;
+      return this;
     }
 
-    public enum GrantType {
-        CLIENT_CREDENTIALS("clientCredentials"), USERNAME_PASSWORD("password");
-
-        private final String name;
-
-        GrantType(String name) {
-            this.name = name;
-        }
-
-        @JsonValue
-        public String getName() {
-            return name;
-        }
+    public Builder withPassword(String password) {
+      this.password = password;
+      return this;
     }
 
-    public static class Builder {
-
-        private final String providerName;
-        private final GrantType grantType;
-        private String scope;
-        private String username;
-        private String password;
-
-        public Builder(String providerName, GrantType grantType) {
-            this.providerName = providerName;
-            this.grantType = grantType;
-        }
-
-        public Builder withScope(String scope) {
-            this.scope = scope;
-            return this;
-        }
-
-        public Builder withUsername(String username) {
-            this.username = username;
-            return this;
-        }
-
-        public Builder withPassword(String password) {
-            this.password = password;
-            return this;
-        }
-
-        public SubscriptionOAuthPolicy build() {
-            return new SubscriptionOAuthPolicy(grantType, providerName, scope, username, password);
-        }
+    public SubscriptionOAuthPolicy build() {
+      return new SubscriptionOAuthPolicy(grantType, providerName, scope, username, password);
     }
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionPolicy.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionPolicy.java
index b1f33c0a78..2a2bc95e34 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionPolicy.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionPolicy.java
@@ -5,272 +5,276 @@
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.Null;
-import pl.allegro.tech.hermes.api.constraints.AdminPermitted;
-import pl.allegro.tech.hermes.api.helpers.Patch;
-
 import java.util.Map;
 import java.util.Objects;
+import pl.allegro.tech.hermes.api.helpers.Patch;
 
 public class SubscriptionPolicy {
 
-    private static final int DEFAULT_RATE = 400;
-    private static final int DEFAULT_MESSAGE_TTL = 3600;
-    private static final int DEFAULT_MESSAGE_BACKOFF = 100;
-    private static final int DEFAULT_REQUEST_TIMEOUT = 1000;
-    private static final int DEFAULT_SOCKET_TIMEOUT = 0;
-    private static final int DEFAULT_SENDING_DELAY = 0;
-    private static final double DEFAULT_BACKOFF_MULTIPLIER = 1;
-    private static final int DEFAULT_BACKOFF_MAX_INTERVAL = 600;
-
-    @Min(1)
-    private int rate = DEFAULT_RATE;
-
-    @Min(0)
-    @Max(7200)
-    private int messageTtl = DEFAULT_MESSAGE_TTL;
-
-    @Min(0)
-    private int messageBackoff = DEFAULT_MESSAGE_BACKOFF;
-
-    @Min(100)
-    @Max(300_000)
-    private int requestTimeout = DEFAULT_REQUEST_TIMEOUT;
-
-    @Min(0)
-    @Max(300_000)
-    private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
-
-    @Min(1)
-    @Null(groups = AdminPermitted.class)
-    private Integer inflightSize;
-
-    @Min(0)
-    @Max(5000)
-    private int sendingDelay = DEFAULT_SENDING_DELAY;
-
-    @Min(1)
-    @Max(10)
-    private double backoffMultiplier = DEFAULT_BACKOFF_MULTIPLIER;
-
-    @Min(1)
-    @Max(600)
-    private int backoffMaxIntervalInSec = DEFAULT_BACKOFF_MAX_INTERVAL;
-
-    private boolean retryClientErrors = false;
-
-    private SubscriptionPolicy() {
-    }
-
-    public SubscriptionPolicy(int rate,
-                              int messageTtl,
-                              int requestTimeout,
-                              int socketTimeout,
-                              boolean retryClientErrors,
-                              int messageBackoff,
-                              Integer inflightSize,
-                              int sendingDelay,
-                              double backoffMultiplier,
-                              int backoffMaxIntervalInSec) {
-        this.rate = rate;
-        this.messageTtl = messageTtl;
-        this.requestTimeout = requestTimeout;
-        this.socketTimeout = socketTimeout;
-        this.retryClientErrors = retryClientErrors;
-        this.messageBackoff = messageBackoff;
-        this.inflightSize = inflightSize;
-        this.sendingDelay = sendingDelay;
-        this.backoffMultiplier = backoffMultiplier;
-        this.backoffMaxIntervalInSec = backoffMaxIntervalInSec;
+  private static final int DEFAULT_RATE = 400;
+  private static final int DEFAULT_MESSAGE_TTL = 3600;
+  private static final int DEFAULT_MESSAGE_BACKOFF = 100;
+  private static final int DEFAULT_REQUEST_TIMEOUT = 1000;
+  private static final int DEFAULT_SOCKET_TIMEOUT = 0;
+  private static final int DEFAULT_SENDING_DELAY = 0;
+  private static final double DEFAULT_BACKOFF_MULTIPLIER = 1;
+  private static final int DEFAULT_BACKOFF_MAX_INTERVAL = 600;
+
+  @Min(1)
+  private int rate = DEFAULT_RATE;
+
+  @Min(0)
+  @Max(7200)
+  private int messageTtl = DEFAULT_MESSAGE_TTL;
+
+  @Min(0)
+  private int messageBackoff = DEFAULT_MESSAGE_BACKOFF;
+
+  @Min(100)
+  @Max(300_000)
+  private int requestTimeout = DEFAULT_REQUEST_TIMEOUT;
+
+  @Min(0)
+  @Max(300_000)
+  private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
+
+  @Min(1)
+  private Integer inflightSize;
+
+  @Min(0)
+  @Max(5000)
+  private int sendingDelay = DEFAULT_SENDING_DELAY;
+
+  @Min(1)
+  @Max(10)
+  private double backoffMultiplier = DEFAULT_BACKOFF_MULTIPLIER;
+
+  @Min(1)
+  @Max(600)
+  private int backoffMaxIntervalInSec = DEFAULT_BACKOFF_MAX_INTERVAL;
+
+  private boolean retryClientErrors = false;
+
+  private SubscriptionPolicy() {}
+
+  public SubscriptionPolicy(
+      int rate,
+      int messageTtl,
+      int requestTimeout,
+      int socketTimeout,
+      boolean retryClientErrors,
+      int messageBackoff,
+      Integer inflightSize,
+      int sendingDelay,
+      double backoffMultiplier,
+      int backoffMaxIntervalInSec) {
+    this.rate = rate;
+    this.messageTtl = messageTtl;
+    this.requestTimeout = requestTimeout;
+    this.socketTimeout = socketTimeout;
+    this.retryClientErrors = retryClientErrors;
+    this.messageBackoff = messageBackoff;
+    this.inflightSize = inflightSize;
+    this.sendingDelay = sendingDelay;
+    this.backoffMultiplier = backoffMultiplier;
+    this.backoffMaxIntervalInSec = backoffMaxIntervalInSec;
+  }
+
+  @JsonCreator
+  public static SubscriptionPolicy create(Map<String, Object> properties) {
+    return new SubscriptionPolicy(
+        (Integer) properties.getOrDefault("rate", DEFAULT_RATE),
+        (Integer) properties.getOrDefault("messageTtl", DEFAULT_MESSAGE_TTL),
+        (Integer) properties.getOrDefault("requestTimeout", DEFAULT_REQUEST_TIMEOUT),
+        (Integer) properties.getOrDefault("socketTimeout", DEFAULT_SOCKET_TIMEOUT),
+        (Boolean) properties.getOrDefault("retryClientErrors", false),
+        (Integer) properties.getOrDefault("messageBackoff", DEFAULT_MESSAGE_BACKOFF),
+        (Integer) properties.getOrDefault("inflightSize", null),
+        (Integer) properties.getOrDefault("sendingDelay", DEFAULT_SENDING_DELAY),
+        ((Number) properties.getOrDefault("backoffMultiplier", DEFAULT_BACKOFF_MULTIPLIER))
+            .doubleValue(),
+        (Integer) properties.getOrDefault("backoffMaxIntervalInSec", DEFAULT_BACKOFF_MAX_INTERVAL));
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        rate,
+        messageTtl,
+        messageBackoff,
+        retryClientErrors,
+        requestTimeout,
+        socketTimeout,
+        inflightSize,
+        sendingDelay,
+        backoffMultiplier,
+        backoffMaxIntervalInSec);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    @JsonCreator
-    public static SubscriptionPolicy create(Map<String, Object> properties) {
-        return new SubscriptionPolicy(
-                (Integer) properties.getOrDefault("rate", DEFAULT_RATE),
-                (Integer) properties.getOrDefault("messageTtl", DEFAULT_MESSAGE_TTL),
-                (Integer) properties.getOrDefault("requestTimeout", DEFAULT_REQUEST_TIMEOUT),
-                (Integer) properties.getOrDefault("socketTimeout", DEFAULT_SOCKET_TIMEOUT),
-                (Boolean) properties.getOrDefault("retryClientErrors", false),
-                (Integer) properties.getOrDefault("messageBackoff", DEFAULT_MESSAGE_BACKOFF),
-                (Integer) properties.getOrDefault("inflightSize", null),
-                (Integer) properties.getOrDefault("sendingDelay", DEFAULT_SENDING_DELAY),
-                ((Number) properties.getOrDefault("backoffMultiplier", DEFAULT_BACKOFF_MULTIPLIER)).doubleValue(),
-                (Integer) properties.getOrDefault("backoffMaxIntervalInSec", DEFAULT_BACKOFF_MAX_INTERVAL)
-        );
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(rate, messageTtl, messageBackoff, retryClientErrors,
-                requestTimeout, socketTimeout, inflightSize, sendingDelay, backoffMultiplier,
-                backoffMaxIntervalInSec);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final SubscriptionPolicy other = (SubscriptionPolicy) obj;
-        return Objects.equals(this.rate, other.rate)
-                && Objects.equals(this.messageTtl, other.messageTtl)
-                && Objects.equals(this.messageBackoff, other.messageBackoff)
-                && Objects.equals(this.retryClientErrors, other.retryClientErrors)
-                && Objects.equals(this.requestTimeout, other.requestTimeout)
-                && Objects.equals(this.socketTimeout, other.socketTimeout)
-                && Objects.equals(this.inflightSize, other.inflightSize)
-                && Objects.equals(this.sendingDelay, other.sendingDelay)
-                && Objects.equals(this.backoffMultiplier, other.backoffMultiplier)
-                && Objects.equals(this.backoffMaxIntervalInSec, other.backoffMaxIntervalInSec);
+    final SubscriptionPolicy other = (SubscriptionPolicy) obj;
+    return Objects.equals(this.rate, other.rate)
+        && Objects.equals(this.messageTtl, other.messageTtl)
+        && Objects.equals(this.messageBackoff, other.messageBackoff)
+        && Objects.equals(this.retryClientErrors, other.retryClientErrors)
+        && Objects.equals(this.requestTimeout, other.requestTimeout)
+        && Objects.equals(this.socketTimeout, other.socketTimeout)
+        && Objects.equals(this.inflightSize, other.inflightSize)
+        && Objects.equals(this.sendingDelay, other.sendingDelay)
+        && Objects.equals(this.backoffMultiplier, other.backoffMultiplier)
+        && Objects.equals(this.backoffMaxIntervalInSec, other.backoffMaxIntervalInSec);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("rate", rate)
+        .add("messageTtl", messageTtl)
+        .add("requestTimeout", requestTimeout)
+        .add("socketTimeout", socketTimeout)
+        .add("messageBackoff", messageBackoff)
+        .add("retryClientErrors", retryClientErrors)
+        .add("inflightSize", inflightSize)
+        .add("sendingDelay", sendingDelay)
+        .add("backoffMultiplier", backoffMultiplier)
+        .add("backoffMaxIntervalInSec", backoffMaxIntervalInSec)
+        .toString();
+  }
+
+  public Integer getRate() {
+    return rate;
+  }
+
+  public void setRate(int rate) {
+    this.rate = rate;
+  }
+
+  public Integer getMessageTtl() {
+    return messageTtl;
+  }
+
+  public Boolean isRetryClientErrors() {
+    return retryClientErrors;
+  }
+
+  public Integer getMessageBackoff() {
+    return messageBackoff;
+  }
+
+  public Integer getRequestTimeout() {
+    return requestTimeout;
+  }
+
+  public Integer getSocketTimeout() {
+    return socketTimeout;
+  }
+
+  @Nullable
+  public Integer getInflightSize() {
+    return inflightSize;
+  }
+
+  public Integer getSendingDelay() {
+    return sendingDelay;
+  }
+
+  public Double getBackoffMultiplier() {
+    return backoffMultiplier;
+  }
+
+  public Integer getBackoffMaxIntervalInSec() {
+    return backoffMaxIntervalInSec;
+  }
+
+  public Long getBackoffMaxIntervalMillis() {
+    return backoffMaxIntervalInSec * 1000L;
+  }
+
+  public static class Builder {
+
+    private SubscriptionPolicy subscriptionPolicy;
+
+    public Builder() {
+      subscriptionPolicy = new SubscriptionPolicy();
     }
 
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("rate", rate)
-                .add("messageTtl", messageTtl)
-                .add("requestTimeout", requestTimeout)
-                .add("socketTimeout", socketTimeout)
-                .add("messageBackoff", messageBackoff)
-                .add("retryClientErrors", retryClientErrors)
-                .add("inflightSize", inflightSize)
-                .add("sendingDelay", sendingDelay)
-                .add("backoffMultiplier", backoffMultiplier)
-                .add("backoffMaxIntervalInSec", backoffMaxIntervalInSec)
-                .toString();
+    public static Builder subscriptionPolicy() {
+      return new Builder();
     }
 
-    public Integer getRate() {
-        return rate;
+    public Builder applyDefaults() {
+      subscriptionPolicy.rate = DEFAULT_RATE;
+      subscriptionPolicy.messageTtl = DEFAULT_MESSAGE_TTL;
+      subscriptionPolicy.backoffMultiplier = DEFAULT_BACKOFF_MULTIPLIER;
+      return this;
     }
 
-    public void setRate(int rate) {
-        this.rate = rate;
+    public Builder withRate(int rate) {
+      subscriptionPolicy.rate = rate;
+      return this;
     }
 
-    public Integer getMessageTtl() {
-        return messageTtl;
+    public Builder withMessageTtl(int ttl) {
+      subscriptionPolicy.messageTtl = ttl;
+      return this;
     }
 
-    public Boolean isRetryClientErrors() {
-        return retryClientErrors;
+    public Builder withRequestTimeout(int timeout) {
+      subscriptionPolicy.requestTimeout = timeout;
+      return this;
     }
 
-    public Integer getMessageBackoff() {
-        return messageBackoff;
+    public Builder withSocketTimeout(int timeout) {
+      subscriptionPolicy.socketTimeout = timeout;
+      return this;
     }
 
-    public Integer getRequestTimeout() {
-        return requestTimeout;
+    public Builder withInflightSize(Integer inflightSize) {
+      subscriptionPolicy.inflightSize = inflightSize;
+      return this;
     }
 
-    public Integer getSocketTimeout() {
-        return socketTimeout;
+    public Builder withMessageBackoff(int backoff) {
+      subscriptionPolicy.messageBackoff = backoff;
+      return this;
     }
 
-    @Nullable
-    public Integer getInflightSize() {
-        return inflightSize;
+    public Builder withClientErrorRetry() {
+      subscriptionPolicy.retryClientErrors = true;
+      return this;
     }
 
-    public Integer getSendingDelay() {
-        return sendingDelay;
+    public Builder withSendingDelay(int sendingDelay) {
+      subscriptionPolicy.sendingDelay = sendingDelay;
+      return this;
     }
 
-    public Double getBackoffMultiplier() {
-        return backoffMultiplier;
+    public Builder withBackoffMultiplier(double backoffMultiplier) {
+      subscriptionPolicy.backoffMultiplier = backoffMultiplier;
+      return this;
     }
 
-    public Integer getBackoffMaxIntervalInSec() {
-        return backoffMaxIntervalInSec;
+    public Builder withBackoffMaxIntervalInSec(int backoffMaxIntervalInSec) {
+      subscriptionPolicy.backoffMaxIntervalInSec = backoffMaxIntervalInSec;
+      return this;
     }
 
-    public Long getBackoffMaxIntervalMillis() {
-        return backoffMaxIntervalInSec * 1000L;
+    public SubscriptionPolicy build() {
+      return subscriptionPolicy;
     }
 
-    public static class Builder {
-
-        private SubscriptionPolicy subscriptionPolicy;
-
-        public Builder() {
-            subscriptionPolicy = new SubscriptionPolicy();
-        }
-
-        public static Builder subscriptionPolicy() {
-            return new Builder();
-        }
-
-        public Builder applyDefaults() {
-            subscriptionPolicy.rate = DEFAULT_RATE;
-            subscriptionPolicy.messageTtl = DEFAULT_MESSAGE_TTL;
-            subscriptionPolicy.backoffMultiplier = DEFAULT_BACKOFF_MULTIPLIER;
-            return this;
-        }
-
-        public Builder withRate(int rate) {
-            subscriptionPolicy.rate = rate;
-            return this;
-        }
-
-        public Builder withMessageTtl(int ttl) {
-            subscriptionPolicy.messageTtl = ttl;
-            return this;
-        }
-
-        public Builder withRequestTimeout(int timeout) {
-            subscriptionPolicy.requestTimeout = timeout;
-            return this;
-        }
-
-        public Builder withSocketTimeout(int timeout) {
-            subscriptionPolicy.socketTimeout = timeout;
-            return this;
-        }
-
-        public Builder withInflightSize(Integer inflightSize) {
-            subscriptionPolicy.inflightSize = inflightSize;
-            return this;
-        }
-
-        public Builder withMessageBackoff(int backoff) {
-            subscriptionPolicy.messageBackoff = backoff;
-            return this;
-        }
-
-        public Builder withClientErrorRetry() {
-            subscriptionPolicy.retryClientErrors = true;
-            return this;
-        }
-
-        public Builder withSendingDelay(int sendingDelay) {
-            subscriptionPolicy.sendingDelay = sendingDelay;
-            return this;
-        }
-
-        public Builder withBackoffMultiplier(double backoffMultiplier) {
-            subscriptionPolicy.backoffMultiplier = backoffMultiplier;
-            return this;
-        }
-
-        public Builder withBackoffMaxIntervalInSec(int backoffMaxIntervalInSec) {
-            subscriptionPolicy.backoffMaxIntervalInSec = backoffMaxIntervalInSec;
-            return this;
-        }
-
-        public SubscriptionPolicy build() {
-            return subscriptionPolicy;
-        }
-
-        public <T> Builder applyPatch(PatchData update) {
-            if (update != null) {
-                subscriptionPolicy = Patch.apply(subscriptionPolicy, update);
-            }
-            return this;
-        }
+    public <T> Builder applyPatch(PatchData update) {
+      if (update != null) {
+        subscriptionPolicy = Patch.apply(subscriptionPolicy, update);
+      }
+      return this;
     }
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionStats.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionStats.java
index 743170e0a4..9dabd16d37 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionStats.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionStats.java
@@ -1,63 +1,64 @@
 package pl.allegro.tech.hermes.api;
 
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public class SubscriptionStats {
-    private final long subscriptionCount;
-    private final long trackingEnabledSubscriptionCount;
-    private final long avroSubscriptionCount;
-
-    @JsonCreator
-    public SubscriptionStats(
-            @JsonProperty("subscriptionCount") long  subscriptionCount,
-            @JsonProperty("trackingEnabledSubscriptionCount") long  trackingEnabledSubscriptionCount,
-            @JsonProperty("avroSubscriptionCount") long  avroSubscriptionCount) {
-        this.subscriptionCount = subscriptionCount;
-        this.trackingEnabledSubscriptionCount = trackingEnabledSubscriptionCount;
-        this.avroSubscriptionCount = avroSubscriptionCount;
-    }
+  private final long subscriptionCount;
+  private final long trackingEnabledSubscriptionCount;
+  private final long avroSubscriptionCount;
 
-    public long getSubscriptionCount() {
-        return subscriptionCount;
-    }
+  @JsonCreator
+  public SubscriptionStats(
+      @JsonProperty("subscriptionCount") long subscriptionCount,
+      @JsonProperty("trackingEnabledSubscriptionCount") long trackingEnabledSubscriptionCount,
+      @JsonProperty("avroSubscriptionCount") long avroSubscriptionCount) {
+    this.subscriptionCount = subscriptionCount;
+    this.trackingEnabledSubscriptionCount = trackingEnabledSubscriptionCount;
+    this.avroSubscriptionCount = avroSubscriptionCount;
+  }
 
-    public long getTrackingEnabledSubscriptionCount() {
-        return trackingEnabledSubscriptionCount;
-    }
+  public long getSubscriptionCount() {
+    return subscriptionCount;
+  }
 
-    public long getAvroSubscriptionCount() {
-        return avroSubscriptionCount;
-    }
+  public long getTrackingEnabledSubscriptionCount() {
+    return trackingEnabledSubscriptionCount;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionStats that = (SubscriptionStats) o;
-        return subscriptionCount == that.subscriptionCount
-                && trackingEnabledSubscriptionCount == that.trackingEnabledSubscriptionCount
-                && avroSubscriptionCount == that.avroSubscriptionCount;
-    }
+  public long getAvroSubscriptionCount() {
+    return avroSubscriptionCount;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(subscriptionCount, trackingEnabledSubscriptionCount, avroSubscriptionCount);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return "SubscriptionStats{"
-                + "subscriptionCount=" + subscriptionCount
-                + ", trackingEnabledSubscriptionCount=" + trackingEnabledSubscriptionCount
-                + ", avroSubscriptionCount=" + avroSubscriptionCount
-                + '}';
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SubscriptionStats that = (SubscriptionStats) o;
+    return subscriptionCount == that.subscriptionCount
+        && trackingEnabledSubscriptionCount == that.trackingEnabledSubscriptionCount
+        && avroSubscriptionCount == that.avroSubscriptionCount;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(subscriptionCount, trackingEnabledSubscriptionCount, avroSubscriptionCount);
+  }
+
+  @Override
+  public String toString() {
+    return "SubscriptionStats{"
+        + "subscriptionCount="
+        + subscriptionCount
+        + ", trackingEnabledSubscriptionCount="
+        + trackingEnabledSubscriptionCount
+        + ", avroSubscriptionCount="
+        + avroSubscriptionCount
+        + '}';
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java
index 069511a0f5..b6ae679118 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java
@@ -10,253 +10,316 @@
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
-
 import java.time.Instant;
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-@JsonIgnoreProperties(value = {"createdAt", "modifiedAt"}, allowGetters = true)
+@JsonIgnoreProperties(
+    value = {"createdAt", "modifiedAt"},
+    allowGetters = true)
 public class Topic {
 
-    public static final int MIN_MESSAGE_SIZE = 1024;
-    public static final int MAX_MESSAGE_SIZE = 2 * 1024 * 1024;
-    public static final String DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY = "defaultSchemaIdAwareSerializationEnabled";
-    private static final int DEFAULT_MAX_MESSAGE_SIZE = 50 * 1024;
-    private final boolean schemaIdAwareSerializationEnabled;
-    private final TopicDataOfflineStorage offlineStorage;
-    @Valid
-    @NotNull
-    private TopicName name;
-    @NotNull
-    private String description;
-    @Valid
-    @NotNull
-    private OwnerId owner;
-    private boolean jsonToAvroDryRunEnabled = false;
-    @NotNull
-    private Ack ack;
-    @NotNull
-    private ContentType contentType;
-    @Min(MIN_MESSAGE_SIZE)
-    @Max(MAX_MESSAGE_SIZE)
-    private int maxMessageSize;
-    @Valid
-    @NotNull
-    private RetentionTime retentionTime = RetentionTime.of(1, TimeUnit.DAYS);
-    private boolean trackingEnabled = false;
-    private boolean migratedFromJsonType = false;
-    private boolean subscribingRestricted = false;
-
-    private PublishingAuth publishingAuth;
-    @Valid
-    private Set<TopicLabel> labels;
-    private Instant createdAt;
-    private Instant modifiedAt;
-
-    public Topic(TopicName name, String description, OwnerId owner, RetentionTime retentionTime,
-                 boolean migratedFromJsonType, Ack ack, boolean trackingEnabled, ContentType contentType, boolean jsonToAvroDryRunEnabled,
-                 @JacksonInject(value = DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, useInput = OptBoolean.TRUE)
-                 Boolean schemaIdAwareSerializationEnabled,
-                 int maxMessageSize, PublishingAuth publishingAuth, boolean subscribingRestricted,
-                 TopicDataOfflineStorage offlineStorage, Set<TopicLabel> labels, Instant createdAt, Instant modifiedAt) {
-        this.name = name;
-        this.description = description;
-        this.owner = owner;
-        this.retentionTime = retentionTime;
-        this.ack = (ack == null ? Ack.LEADER : ack);
-        this.trackingEnabled = trackingEnabled;
-        this.migratedFromJsonType = migratedFromJsonType;
-        this.contentType = contentType;
-        this.jsonToAvroDryRunEnabled = jsonToAvroDryRunEnabled;
-        this.schemaIdAwareSerializationEnabled = schemaIdAwareSerializationEnabled;
-        this.maxMessageSize = maxMessageSize;
-        this.publishingAuth = publishingAuth;
-        this.subscribingRestricted = subscribingRestricted;
-        this.offlineStorage = offlineStorage;
-        this.labels = labels;
-        this.createdAt = createdAt;
-        this.modifiedAt = modifiedAt;
-    }
-
-    @JsonCreator
-    public Topic(
-            @JsonProperty("name") String qualifiedName,
-            @JsonProperty("description") String description,
-            @JsonProperty("owner") OwnerId owner,
-            @JsonProperty("retentionTime") RetentionTime retentionTime,
-            @JsonProperty("jsonToAvroDryRun") boolean jsonToAvroDryRunEnabled,
-            @JsonProperty("ack") Ack ack,
-            @JsonProperty("trackingEnabled") boolean trackingEnabled,
-            @JsonProperty("migratedFromJsonType") boolean migratedFromJsonType,
-            @JsonProperty("schemaIdAwareSerializationEnabled")
-            @JacksonInject(value = DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, useInput = OptBoolean.TRUE)
-            Boolean schemaIdAwareSerializationEnabled,
-            @JsonProperty("contentType") ContentType contentType,
-            @JsonProperty("maxMessageSize") Integer maxMessageSize,
-            @JsonProperty("auth") PublishingAuth publishingAuth,
-            @JsonProperty("subscribingRestricted") boolean subscribingRestricted,
-            @JsonProperty("offlineStorage") TopicDataOfflineStorage offlineStorage,
-            @JsonProperty("labels") Set<TopicLabel> labels,
-            @JsonProperty("createdAt") Instant createdAt,
-            @JsonProperty("modifiedAt") Instant modifiedAt
-    ) {
-        this(TopicName.fromQualifiedName(qualifiedName), description, owner, retentionTime, migratedFromJsonType, ack,
-                trackingEnabled, contentType, jsonToAvroDryRunEnabled, schemaIdAwareSerializationEnabled,
-                maxMessageSize == null ? DEFAULT_MAX_MESSAGE_SIZE : maxMessageSize,
-                publishingAuth == null ? PublishingAuth.disabled() : publishingAuth,
-                subscribingRestricted,
-                offlineStorage == null ? TopicDataOfflineStorage.defaultOfflineStorage() : offlineStorage,
-                labels == null ? Collections.emptySet() : labels,
-                createdAt, modifiedAt
-        );
-    }
-
-    public RetentionTime getRetentionTime() {
-        return retentionTime;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, description, owner, retentionTime, migratedFromJsonType, trackingEnabled, ack, contentType,
-                jsonToAvroDryRunEnabled, schemaIdAwareSerializationEnabled, maxMessageSize,
-                publishingAuth, subscribingRestricted, offlineStorage, labels);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final Topic other = (Topic) obj;
-
-        return Objects.equals(this.name, other.name)
-                && Objects.equals(this.description, other.description)
-                && Objects.equals(this.owner, other.owner)
-                && Objects.equals(this.retentionTime, other.retentionTime)
-                && Objects.equals(this.jsonToAvroDryRunEnabled, other.jsonToAvroDryRunEnabled)
-                && Objects.equals(this.trackingEnabled, other.trackingEnabled)
-                && Objects.equals(this.migratedFromJsonType, other.migratedFromJsonType)
-                && Objects.equals(this.schemaIdAwareSerializationEnabled, other.schemaIdAwareSerializationEnabled)
-                && Objects.equals(this.ack, other.ack)
-                && Objects.equals(this.contentType, other.contentType)
-                && Objects.equals(this.maxMessageSize, other.maxMessageSize)
-                && Objects.equals(this.subscribingRestricted, other.subscribingRestricted)
-                && Objects.equals(this.publishingAuth, other.publishingAuth)
-                && Objects.equals(this.offlineStorage, other.offlineStorage)
-                && Objects.equals(this.labels, other.labels);
-    }
-
-    @JsonProperty("name")
-    public String getQualifiedName() {
-        return TopicName.toQualifiedName(name);
-    }
-
-    @JsonIgnore
-    public TopicName getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public OwnerId getOwner() {
-        return owner;
-    }
-
-    @JsonProperty("jsonToAvroDryRun")
-    public boolean isJsonToAvroDryRunEnabled() {
-        return jsonToAvroDryRunEnabled;
-    }
-
-    public Ack getAck() {
-        return ack;
-    }
-
-    public ContentType getContentType() {
-        return contentType;
-    }
-
-    public boolean isTrackingEnabled() {
-        return trackingEnabled;
-    }
-
-    @JsonProperty("migratedFromJsonType")
-    public boolean wasMigratedFromJsonType() {
-        return migratedFromJsonType;
-    }
-
-    @JsonIgnore
-    public boolean isReplicationConfirmRequired() {
-        return getAck() == Ack.ALL;
+  public static final int MIN_MESSAGE_SIZE = 1024;
+  public static final int MAX_MESSAGE_SIZE = 2 * 1024 * 1024;
+  public static final String DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY =
+      "defaultSchemaIdAwareSerializationEnabled";
+  private static final int DEFAULT_MAX_MESSAGE_SIZE = 50 * 1024;
+  private final boolean schemaIdAwareSerializationEnabled;
+  private final TopicDataOfflineStorage offlineStorage;
+  @Valid @NotNull private TopicName name;
+  @NotNull private String description;
+  @Valid @NotNull private OwnerId owner;
+  private boolean jsonToAvroDryRunEnabled = false;
+  @NotNull private Ack ack;
+  public static final String DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY =
+      "defaultFallbackToRemoteDatacenterEnabled";
+  private final boolean fallbackToRemoteDatacenterEnabled;
+  private PublishingChaosPolicy chaos;
+  @NotNull private ContentType contentType;
+
+  @Min(MIN_MESSAGE_SIZE)
+  @Max(MAX_MESSAGE_SIZE)
+  private int maxMessageSize;
+
+  @Valid @NotNull private RetentionTime retentionTime = RetentionTime.of(1, TimeUnit.DAYS);
+  private boolean trackingEnabled = false;
+  private boolean migratedFromJsonType = false;
+  private boolean subscribingRestricted = false;
+
+  private PublishingAuth publishingAuth;
+  @Valid private Set<TopicLabel> labels;
+  private Instant createdAt;
+  private Instant modifiedAt;
+
+  public Topic(
+      TopicName name,
+      String description,
+      OwnerId owner,
+      RetentionTime retentionTime,
+      boolean migratedFromJsonType,
+      Ack ack,
+      @JacksonInject(value = DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, useInput = OptBoolean.TRUE)
+          Boolean fallbackToRemoteDatacenterEnabled,
+      PublishingChaosPolicy chaos,
+      boolean trackingEnabled,
+      ContentType contentType,
+      boolean jsonToAvroDryRunEnabled,
+      @JacksonInject(
+              value = DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY,
+              useInput = OptBoolean.TRUE)
+          Boolean schemaIdAwareSerializationEnabled,
+      int maxMessageSize,
+      PublishingAuth publishingAuth,
+      boolean subscribingRestricted,
+      TopicDataOfflineStorage offlineStorage,
+      Set<TopicLabel> labels,
+      Instant createdAt,
+      Instant modifiedAt) {
+    this.name = name;
+    this.description = description;
+    this.owner = owner;
+    this.retentionTime = retentionTime;
+    this.ack = (ack == null ? Ack.LEADER : ack);
+    this.fallbackToRemoteDatacenterEnabled = fallbackToRemoteDatacenterEnabled;
+    this.chaos = chaos;
+    this.trackingEnabled = trackingEnabled;
+    this.migratedFromJsonType = migratedFromJsonType;
+    this.contentType = contentType;
+    this.jsonToAvroDryRunEnabled = jsonToAvroDryRunEnabled;
+    this.schemaIdAwareSerializationEnabled = schemaIdAwareSerializationEnabled;
+    this.maxMessageSize = maxMessageSize;
+    this.publishingAuth = publishingAuth;
+    this.subscribingRestricted = subscribingRestricted;
+    this.offlineStorage = offlineStorage;
+    this.labels = labels;
+    this.createdAt = createdAt;
+    this.modifiedAt = modifiedAt;
+  }
+
+  @JsonCreator
+  public Topic(
+      @JsonProperty("name") String qualifiedName,
+      @JsonProperty("description") String description,
+      @JsonProperty("owner") OwnerId owner,
+      @JsonProperty("retentionTime") RetentionTime retentionTime,
+      @JsonProperty("jsonToAvroDryRun") boolean jsonToAvroDryRunEnabled,
+      @JsonProperty("ack") Ack ack,
+      @JacksonInject(value = DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, useInput = OptBoolean.TRUE)
+          @JsonProperty("fallbackToRemoteDatacenterEnabled")
+          Boolean fallbackToRemoteDatacenterEnabled,
+      @JsonProperty("chaos") PublishingChaosPolicy chaos,
+      @JsonProperty("trackingEnabled") boolean trackingEnabled,
+      @JsonProperty("migratedFromJsonType") boolean migratedFromJsonType,
+      @JsonProperty("schemaIdAwareSerializationEnabled")
+          @JacksonInject(
+              value = DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY,
+              useInput = OptBoolean.TRUE)
+          Boolean schemaIdAwareSerializationEnabled,
+      @JsonProperty("contentType") ContentType contentType,
+      @JsonProperty("maxMessageSize") Integer maxMessageSize,
+      @JsonProperty("auth") PublishingAuth publishingAuth,
+      @JsonProperty("subscribingRestricted") boolean subscribingRestricted,
+      @JsonProperty("offlineStorage") TopicDataOfflineStorage offlineStorage,
+      @JsonProperty("labels") Set<TopicLabel> labels,
+      @JsonProperty("createdAt") Instant createdAt,
+      @JsonProperty("modifiedAt") Instant modifiedAt) {
+    this(
+        TopicName.fromQualifiedName(qualifiedName),
+        description,
+        owner,
+        retentionTime,
+        migratedFromJsonType,
+        ack,
+        fallbackToRemoteDatacenterEnabled,
+        chaos == null ? PublishingChaosPolicy.disabled() : chaos,
+        trackingEnabled,
+        contentType,
+        jsonToAvroDryRunEnabled,
+        schemaIdAwareSerializationEnabled,
+        maxMessageSize == null ? DEFAULT_MAX_MESSAGE_SIZE : maxMessageSize,
+        publishingAuth == null ? PublishingAuth.disabled() : publishingAuth,
+        subscribingRestricted,
+        offlineStorage == null ? TopicDataOfflineStorage.defaultOfflineStorage() : offlineStorage,
+        labels == null ? Collections.emptySet() : labels,
+        createdAt,
+        modifiedAt);
+  }
+
+  public RetentionTime getRetentionTime() {
+    return retentionTime;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        name,
+        description,
+        owner,
+        retentionTime,
+        migratedFromJsonType,
+        trackingEnabled,
+        ack,
+        fallbackToRemoteDatacenterEnabled,
+        chaos,
+        contentType,
+        jsonToAvroDryRunEnabled,
+        schemaIdAwareSerializationEnabled,
+        maxMessageSize,
+        publishingAuth,
+        subscribingRestricted,
+        offlineStorage,
+        labels);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    public boolean isSchemaIdAwareSerializationEnabled() {
-        return schemaIdAwareSerializationEnabled;
-    }
-
-    public int getMaxMessageSize() {
-        return maxMessageSize;
-    }
-
-    @JsonProperty("auth")
-    public PublishingAuth getPublishingAuth() {
-        return publishingAuth;
-    }
-
-    @JsonIgnore
-    public boolean isAuthEnabled() {
-        return publishingAuth.isEnabled();
-    }
-
-    @JsonIgnore
-    public boolean isUnauthenticatedAccessEnabled() {
-        return publishingAuth.isUnauthenticatedAccessEnabled();
-    }
-
-    public boolean hasPermission(String publisher) {
-        return publishingAuth.hasPermission(publisher);
-    }
-
-    public boolean isSubscribingRestricted() {
-        return subscribingRestricted;
-    }
-
-    public TopicDataOfflineStorage getOfflineStorage() {
-        return offlineStorage;
-    }
-
-    public Set<TopicLabel> getLabels() {
-        return Collections.unmodifiableSet(labels);
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Long createdAt) {
-        this.createdAt = Instant.ofEpochMilli(createdAt);
-    }
-
-    public Instant getModifiedAt() {
-        return modifiedAt;
-    }
-
-    public void setModifiedAt(Long modifiedAt) {
-        this.modifiedAt = Instant.ofEpochMilli(modifiedAt);
-    }
-
-    @Override
-    public String toString() {
-        return "Topic(" + getQualifiedName() + ")";
-    }
-
-    public enum Ack {
-        NONE, LEADER, ALL
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
+    final Topic other = (Topic) obj;
+
+    return Objects.equals(this.name, other.name)
+        && Objects.equals(this.description, other.description)
+        && Objects.equals(this.owner, other.owner)
+        && Objects.equals(this.retentionTime, other.retentionTime)
+        && Objects.equals(this.jsonToAvroDryRunEnabled, other.jsonToAvroDryRunEnabled)
+        && Objects.equals(this.trackingEnabled, other.trackingEnabled)
+        && Objects.equals(this.migratedFromJsonType, other.migratedFromJsonType)
+        && Objects.equals(
+            this.schemaIdAwareSerializationEnabled, other.schemaIdAwareSerializationEnabled)
+        && Objects.equals(this.ack, other.ack)
+        && Objects.equals(
+            this.fallbackToRemoteDatacenterEnabled, other.fallbackToRemoteDatacenterEnabled)
+        && Objects.equals(this.chaos, other.chaos)
+        && Objects.equals(this.contentType, other.contentType)
+        && Objects.equals(this.maxMessageSize, other.maxMessageSize)
+        && Objects.equals(this.subscribingRestricted, other.subscribingRestricted)
+        && Objects.equals(this.publishingAuth, other.publishingAuth)
+        && Objects.equals(this.offlineStorage, other.offlineStorage)
+        && Objects.equals(this.labels, other.labels);
+  }
+
+  @JsonProperty("name")
+  public String getQualifiedName() {
+    return TopicName.toQualifiedName(name);
+  }
+
+  @JsonIgnore
+  public TopicName getName() {
+    return name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public OwnerId getOwner() {
+    return owner;
+  }
+
+  @JsonProperty("jsonToAvroDryRun")
+  public boolean isJsonToAvroDryRunEnabled() {
+    return jsonToAvroDryRunEnabled;
+  }
+
+  public Ack getAck() {
+    return ack;
+  }
+
+  public boolean isFallbackToRemoteDatacenterEnabled() {
+    return fallbackToRemoteDatacenterEnabled;
+  }
+
+  public PublishingChaosPolicy getChaos() {
+    return chaos;
+  }
+
+  public ContentType getContentType() {
+    return contentType;
+  }
+
+  public boolean isTrackingEnabled() {
+    return trackingEnabled;
+  }
+
+  @JsonProperty("migratedFromJsonType")
+  public boolean wasMigratedFromJsonType() {
+    return migratedFromJsonType;
+  }
+
+  @JsonIgnore
+  public boolean isReplicationConfirmRequired() {
+    return getAck() == Ack.ALL;
+  }
+
+  public boolean isSchemaIdAwareSerializationEnabled() {
+    return schemaIdAwareSerializationEnabled;
+  }
+
+  public int getMaxMessageSize() {
+    return maxMessageSize;
+  }
+
+  @JsonProperty("auth")
+  public PublishingAuth getPublishingAuth() {
+    return publishingAuth;
+  }
+
+  @JsonIgnore
+  public boolean isAuthEnabled() {
+    return publishingAuth.isEnabled();
+  }
+
+  @JsonIgnore
+  public boolean isUnauthenticatedAccessEnabled() {
+    return publishingAuth.isUnauthenticatedAccessEnabled();
+  }
+
+  public boolean hasPermission(String publisher) {
+    return publishingAuth.hasPermission(publisher);
+  }
+
+  public boolean isSubscribingRestricted() {
+    return subscribingRestricted;
+  }
+
+  public TopicDataOfflineStorage getOfflineStorage() {
+    return offlineStorage;
+  }
+
+  public Set<TopicLabel> getLabels() {
+    return Collections.unmodifiableSet(labels);
+  }
+
+  public Instant getCreatedAt() {
+    return createdAt;
+  }
+
+  public void setCreatedAt(Long createdAt) {
+    this.createdAt = Instant.ofEpochMilli(createdAt);
+  }
+
+  public Instant getModifiedAt() {
+    return modifiedAt;
+  }
+
+  public void setModifiedAt(Long modifiedAt) {
+    this.modifiedAt = Instant.ofEpochMilli(modifiedAt);
+  }
+
+  @Override
+  public String toString() {
+    return "Topic(" + getQualifiedName() + ")";
+  }
+
+  public enum Ack {
+    NONE,
+    LEADER,
+    ALL
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicConstraints.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicConstraints.java
index e507b9eb35..031fba4a04 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicConstraints.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicConstraints.java
@@ -6,22 +6,22 @@
 
 public class TopicConstraints {
 
-    private final TopicName topicName;
-    @Valid
-    private final Constraints constraints;
+  private final TopicName topicName;
+  @Valid private final Constraints constraints;
 
-    @JsonCreator
-    public TopicConstraints(@JsonProperty("topicName") String topicName,
-                            @JsonProperty("constraints") Constraints constraints) {
-        this.topicName = TopicName.fromQualifiedName(topicName);
-        this.constraints = constraints;
-    }
+  @JsonCreator
+  public TopicConstraints(
+      @JsonProperty("topicName") String topicName,
+      @JsonProperty("constraints") Constraints constraints) {
+    this.topicName = TopicName.fromQualifiedName(topicName);
+    this.constraints = constraints;
+  }
 
-    public TopicName getTopicName() {
-        return topicName;
-    }
+  public TopicName getTopicName() {
+    return topicName;
+  }
 
-    public Constraints getConstraints() {
-        return constraints;
-    }
+  public Constraints getConstraints() {
+    return constraints;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicDataOfflineStorage.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicDataOfflineStorage.java
index 2ac58c2ada..eb99107b8c 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicDataOfflineStorage.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicDataOfflineStorage.java
@@ -4,54 +4,52 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
-
 import java.util.Objects;
 
 /**
- * Topic offline storage metadata - not used in Hermes, but exposed as part of API for other systems to use.
+ * Topic offline storage metadata - not used in Hermes, but exposed as part of API for other systems
+ * to use.
  */
 public class TopicDataOfflineStorage {
 
-    private final boolean enabled;
+  private final boolean enabled;
 
-    @Valid
-    @NotNull
-    private final OfflineRetentionTime retentionTime;
+  @Valid @NotNull private final OfflineRetentionTime retentionTime;
 
-    @JsonCreator
-    public TopicDataOfflineStorage(@JsonProperty("enabled") boolean enabled,
-                                   @JsonProperty("retentionTime") OfflineRetentionTime retentionTime) {
-        this.enabled = enabled;
-        this.retentionTime = retentionTime;
-    }
+  @JsonCreator
+  public TopicDataOfflineStorage(
+      @JsonProperty("enabled") boolean enabled,
+      @JsonProperty("retentionTime") OfflineRetentionTime retentionTime) {
+    this.enabled = enabled;
+    this.retentionTime = retentionTime;
+  }
 
-    public static TopicDataOfflineStorage defaultOfflineStorage() {
-        return new TopicDataOfflineStorage(false, OfflineRetentionTime.of(0));
-    }
+  public static TopicDataOfflineStorage defaultOfflineStorage() {
+    return new TopicDataOfflineStorage(false, OfflineRetentionTime.of(0));
+  }
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public OfflineRetentionTime getRetentionTime() {
-        return retentionTime;
-    }
+  public OfflineRetentionTime getRetentionTime() {
+    return retentionTime;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof TopicDataOfflineStorage)) {
-            return false;
-        }
-        TopicDataOfflineStorage that = (TopicDataOfflineStorage) o;
-        return enabled == that.enabled
-                && Objects.equals(retentionTime, that.retentionTime);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(enabled, retentionTime);
+    if (!(o instanceof TopicDataOfflineStorage)) {
+      return false;
     }
+    TopicDataOfflineStorage that = (TopicDataOfflineStorage) o;
+    return enabled == that.enabled && Objects.equals(retentionTime, that.retentionTime);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(enabled, retentionTime);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicLabel.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicLabel.java
index 96528ce2e5..e02ef4bc4d 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicLabel.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicLabel.java
@@ -7,37 +7,36 @@
 
 public class TopicLabel {
 
-    @NotEmpty
-    private final String value;
+  @NotEmpty private final String value;
 
-    @JsonCreator
-    public TopicLabel(@JsonProperty("value") String value) {
-        this.value = value;
-    }
+  @JsonCreator
+  public TopicLabel(@JsonProperty("value") String value) {
+    this.value = value;
+  }
 
-    public String getValue() {
-        return value;
-    }
+  public String getValue() {
+    return value;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TopicLabel that = (TopicLabel) o;
-        return Objects.equal(value, that.value);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(value);
-    }
-
-    @Override
-    public String toString() {
-        return "TopicLabel(" + value + ")";
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    TopicLabel that = (TopicLabel) o;
+    return Objects.equal(value, that.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(value);
+  }
+
+  @Override
+  public String toString() {
+    return "TopicLabel(" + value + ")";
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicMetrics.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicMetrics.java
index ddc89bd6cc..564653a28f 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicMetrics.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicMetrics.java
@@ -1,116 +1,117 @@
 package pl.allegro.tech.hermes.api;
 
-import java.util.Objects;
-
 import static pl.allegro.tech.hermes.api.MetricDecimalValue.of;
 
+import java.util.Objects;
+
 public class TopicMetrics {
-    private long published;
-    private long volume;
-    private MetricDecimalValue rate = of("0.0");
-    private MetricDecimalValue deliveryRate = of("0.0");
-    private int subscriptions;
-    private MetricDecimalValue throughput = of("0.0");
-
-    public long getPublished() {
-        return published;
+  private long published;
+  private long volume;
+  private MetricDecimalValue rate = of("0.0");
+  private MetricDecimalValue deliveryRate = of("0.0");
+  private int subscriptions;
+  private MetricDecimalValue throughput = of("0.0");
+
+  public long getPublished() {
+    return published;
+  }
+
+  public long getVolume() {
+    return volume;
+  }
+
+  public MetricDecimalValue getRate() {
+    return rate;
+  }
+
+  public MetricDecimalValue getDeliveryRate() {
+    return deliveryRate;
+  }
+
+  public int getSubscriptions() {
+    return subscriptions;
+  }
+
+  public MetricDecimalValue getThroughput() {
+    return throughput;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(published, rate, deliveryRate, subscriptions, throughput, volume);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    public long getVolume() {
-        return volume;
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    final TopicMetrics other = (TopicMetrics) obj;
+    return Objects.equals(this.published, other.published)
+        && Objects.equals(this.rate, other.rate)
+        && Objects.equals(this.deliveryRate, other.deliveryRate)
+        && Objects.equals(this.subscriptions, other.subscriptions)
+        && Objects.equals(this.throughput, other.throughput)
+        && Objects.equals(this.volume, other.volume);
+  }
+
+  public static TopicMetrics unavailable() {
+    return Builder.topicMetrics()
+        .withRate(MetricDecimalValue.unavailable())
+        .withDeliveryRate(MetricDecimalValue.unavailable())
+        .withPublished(0)
+        .withVolume(0)
+        .withSubscriptions(0)
+        .withThroughput(MetricDecimalValue.unavailable())
+        .build();
+  }
+
+  public static class Builder {
+    private final TopicMetrics topicMetrics;
+
+    public Builder() {
+      topicMetrics = new TopicMetrics();
     }
 
-    public MetricDecimalValue getRate() {
-        return rate;
+    public Builder withPublished(long published) {
+      topicMetrics.published = published;
+      return this;
     }
 
-    public MetricDecimalValue getDeliveryRate() {
-        return deliveryRate;
+    public Builder withRate(MetricDecimalValue rate) {
+      topicMetrics.rate = rate;
+      return this;
     }
 
-    public int getSubscriptions() {
-        return subscriptions;
+    public Builder withDeliveryRate(MetricDecimalValue deliveryRate) {
+      topicMetrics.deliveryRate = deliveryRate;
+      return this;
     }
 
-    public MetricDecimalValue getThroughput() {
-        return throughput;
+    public Builder withSubscriptions(int subscriptions) {
+      topicMetrics.subscriptions = subscriptions;
+      return this;
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(published, rate, deliveryRate, subscriptions, throughput, volume);
+    public Builder withThroughput(MetricDecimalValue throughput) {
+      topicMetrics.throughput = throughput;
+      return this;
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final TopicMetrics other = (TopicMetrics) obj;
-        return Objects.equals(this.published, other.published)
-            && Objects.equals(this.rate, other.rate)
-            && Objects.equals(this.deliveryRate, other.deliveryRate)
-            && Objects.equals(this.subscriptions, other.subscriptions)
-            && Objects.equals(this.throughput, other.throughput)
-            && Objects.equals(this.volume, other.volume);
+    public static Builder topicMetrics() {
+      return new Builder();
     }
 
-    public static TopicMetrics unavailable() {
-        return Builder.topicMetrics().withRate(MetricDecimalValue.unavailable())
-                                     .withDeliveryRate(MetricDecimalValue.unavailable())
-                                     .withPublished(0)
-                                     .withVolume(0)
-                                     .withSubscriptions(0)
-                                     .withThroughput(MetricDecimalValue.unavailable())
-                                     .build();
+    public TopicMetrics build() {
+      return topicMetrics;
     }
 
-    public static class Builder {
-        private final TopicMetrics topicMetrics;
-
-        public Builder() {
-            topicMetrics = new TopicMetrics();
-        }
-
-        public Builder withPublished(long published) {
-            topicMetrics.published = published;
-            return this;
-        }
-
-        public Builder withRate(MetricDecimalValue rate) {
-            topicMetrics.rate = rate;
-            return this;
-        }
-
-        public Builder withDeliveryRate(MetricDecimalValue deliveryRate) {
-            topicMetrics.deliveryRate = deliveryRate;
-            return this;
-        }
-
-        public Builder withSubscriptions(int subscriptions) {
-            topicMetrics.subscriptions = subscriptions;
-            return this;
-        }
-
-        public Builder withThroughput(MetricDecimalValue throughput) {
-            topicMetrics.throughput = throughput;
-            return this;
-        }
-
-        public static Builder topicMetrics() {
-            return new Builder();
-        }
-
-        public TopicMetrics build() {
-            return topicMetrics;
-        }
-
-        public Builder withVolume(long volume) {
-            topicMetrics.volume = volume;
-            return this;
-        }
+    public Builder withVolume(long volume) {
+      topicMetrics.volume = volume;
+      return this;
     }
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicName.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicName.java
index 32c903fdb2..5e30d9d631 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicName.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicName.java
@@ -1,86 +1,84 @@
 package pl.allegro.tech.hermes.api;
 
+import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Strings;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Pattern;
-
 import java.util.Objects;
 
-import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX;
-
 public class TopicName {
 
-    public static final char GROUP_SEPARATOR = '.';
+  public static final char GROUP_SEPARATOR = '.';
+
+  @NotEmpty
+  @Pattern(regexp = ALLOWED_NAME_REGEX)
+  private final String groupName;
+
+  @NotEmpty
+  @Pattern(regexp = ALLOWED_NAME_REGEX)
+  private final String name;
 
-    @NotEmpty
-    @Pattern(regexp = ALLOWED_NAME_REGEX)
-    private final String groupName;
+  @JsonCreator
+  public TopicName(@JsonProperty("groupName") String groupName, @JsonProperty("name") String name) {
+    this.groupName = groupName;
+    this.name = name;
+  }
 
-    @NotEmpty
-    @Pattern(regexp = ALLOWED_NAME_REGEX)
-    private final String name;
+  public static String toQualifiedName(TopicName topicName) {
+    return topicName != null ? topicName.qualifiedName() : null;
+  }
 
-    @JsonCreator
-    public TopicName(@JsonProperty("groupName") String groupName, @JsonProperty("name") String name) {
-        this.groupName = groupName;
-        this.name = name;
+  public static TopicName fromQualifiedName(String qualifiedName) {
+    if (Strings.isNullOrEmpty(qualifiedName)) {
+      return null;
     }
 
-    public static String toQualifiedName(TopicName topicName) {
-        return topicName != null ? topicName.qualifiedName() : null;
+    int index = qualifiedName.lastIndexOf(GROUP_SEPARATOR);
+    if (index == -1) {
+      throw new IllegalArgumentException("Invalid qualified name " + qualifiedName);
     }
 
-    public static TopicName fromQualifiedName(String qualifiedName) {
-        if (Strings.isNullOrEmpty(qualifiedName)) {
-            return null;
-        }
+    String groupName = qualifiedName.substring(0, index);
+    String topicName = qualifiedName.substring(index + 1, qualifiedName.length());
+    return new TopicName(groupName, topicName);
+  }
 
-        int index = qualifiedName.lastIndexOf(GROUP_SEPARATOR);
-        if (index == -1) {
-            throw new IllegalArgumentException("Missing group");
-        }
+  public String getGroupName() {
+    return groupName;
+  }
 
-        String groupName = qualifiedName.substring(0, index);
-        String topicName = qualifiedName.substring(index + 1, qualifiedName.length());
-        return new TopicName(groupName, topicName);
-    }
+  public String getName() {
+    return name;
+  }
 
-    public String getGroupName() {
-        return groupName;
-    }
+  public String qualifiedName() {
+    return groupName + GROUP_SEPARATOR + name;
+  }
 
-    public String getName() {
-        return name;
-    }
+  @Override
+  public String toString() {
+    return qualifiedName();
+  }
 
-    public String qualifiedName() {
-        return groupName + GROUP_SEPARATOR + name;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return qualifiedName();
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
+    TopicName that = (TopicName) o;
 
-        TopicName that = (TopicName) o;
+    return Objects.equals(this.name, that.name) && Objects.equals(this.groupName, that.groupName);
+  }
 
-        return Objects.equals(this.name, that.name)
-                && Objects.equals(this.groupName, that.groupName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, groupName);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, groupName);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicNameWithMetrics.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicNameWithMetrics.java
index 3d4d2c9368..8f36fb7149 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicNameWithMetrics.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicNameWithMetrics.java
@@ -2,102 +2,100 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public class TopicNameWithMetrics {
 
-    private final long published;
-    private final MetricDecimalValue rate;
-    private final MetricDecimalValue deliveryRate;
-    private final int subscriptions;
-    private final MetricDecimalValue throughput;
-    private final long volume;
-
-    private final TopicName topicName;
-
-    @JsonCreator
-    public TopicNameWithMetrics(
-            @JsonProperty("published") long published,
-            @JsonProperty("rate") MetricDecimalValue rate,
-            @JsonProperty("deliveryRate") MetricDecimalValue deliveryRate,
-            @JsonProperty("subscriptions") int subscriptions,
-            @JsonProperty("throughput") MetricDecimalValue throughput,
-            @JsonProperty("volume") long volume,
-            @JsonProperty("name") String qualifiedName
-    ) {
-        this.published = published;
-        this.rate = rate;
-        this.deliveryRate = deliveryRate;
-        this.subscriptions = subscriptions;
-        this.throughput = throughput;
-        this.volume = volume;
-        this.topicName = TopicName.fromQualifiedName(qualifiedName);
-    }
-
-    public static TopicNameWithMetrics from(TopicMetrics metrics, String qualifiedName) {
-        return new TopicNameWithMetrics(
-                metrics.getPublished(),
-                metrics.getRate(),
-                metrics.getDeliveryRate(),
-                metrics.getSubscriptions(),
-                metrics.getThroughput(),
-                metrics.getVolume(),
-                qualifiedName
-        );
-    }
-
-    public long getPublished() {
-        return published;
+  private final long published;
+  private final MetricDecimalValue rate;
+  private final MetricDecimalValue deliveryRate;
+  private final int subscriptions;
+  private final MetricDecimalValue throughput;
+  private final long volume;
+
+  private final TopicName topicName;
+
+  @JsonCreator
+  public TopicNameWithMetrics(
+      @JsonProperty("published") long published,
+      @JsonProperty("rate") MetricDecimalValue rate,
+      @JsonProperty("deliveryRate") MetricDecimalValue deliveryRate,
+      @JsonProperty("subscriptions") int subscriptions,
+      @JsonProperty("throughput") MetricDecimalValue throughput,
+      @JsonProperty("volume") long volume,
+      @JsonProperty("name") String qualifiedName) {
+    this.published = published;
+    this.rate = rate;
+    this.deliveryRate = deliveryRate;
+    this.subscriptions = subscriptions;
+    this.throughput = throughput;
+    this.volume = volume;
+    this.topicName = TopicName.fromQualifiedName(qualifiedName);
+  }
+
+  public static TopicNameWithMetrics from(TopicMetrics metrics, String qualifiedName) {
+    return new TopicNameWithMetrics(
+        metrics.getPublished(),
+        metrics.getRate(),
+        metrics.getDeliveryRate(),
+        metrics.getSubscriptions(),
+        metrics.getThroughput(),
+        metrics.getVolume(),
+        qualifiedName);
+  }
+
+  public long getPublished() {
+    return published;
+  }
+
+  public long getVolume() {
+    return volume;
+  }
+
+  public MetricDecimalValue getRate() {
+    return rate;
+  }
+
+  public MetricDecimalValue getDeliveryRate() {
+    return deliveryRate;
+  }
+
+  public int getSubscriptions() {
+    return subscriptions;
+  }
+
+  public MetricDecimalValue getThroughput() {
+    return throughput;
+  }
+
+  @JsonProperty("name")
+  public String getName() {
+    return topicName.qualifiedName();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    public long getVolume() {
-        return volume;
-    }
-
-    public MetricDecimalValue getRate() {
-        return rate;
-    }
-
-    public MetricDecimalValue getDeliveryRate() {
-        return deliveryRate;
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
 
-    public int getSubscriptions() {
-        return subscriptions;
-    }
-
-    public MetricDecimalValue getThroughput() {
-        return throughput;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return topicName.qualifiedName();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        TopicNameWithMetrics that = (TopicNameWithMetrics) o;
-
-        return Objects.equals(this.published, that.published)
-                && Objects.equals(this.rate, that.rate)
-                && Objects.equals(this.deliveryRate, that.deliveryRate)
-                && Objects.equals(this.subscriptions, that.subscriptions)
-                && Objects.equals(this.throughput, that.throughput)
-                && Objects.equals(this.volume, that.volume)
-                && Objects.equals(this.topicName, that.topicName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(published, rate, deliveryRate, subscriptions, throughput, topicName, volume);
-    }
+    TopicNameWithMetrics that = (TopicNameWithMetrics) o;
+
+    return Objects.equals(this.published, that.published)
+        && Objects.equals(this.rate, that.rate)
+        && Objects.equals(this.deliveryRate, that.deliveryRate)
+        && Objects.equals(this.subscriptions, that.subscriptions)
+        && Objects.equals(this.throughput, that.throughput)
+        && Objects.equals(this.volume, that.volume)
+        && Objects.equals(this.topicName, that.topicName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        published, rate, deliveryRate, subscriptions, throughput, topicName, volume);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicPartition.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicPartition.java
index 760a935e1b..c664068e87 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicPartition.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicPartition.java
@@ -2,87 +2,88 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public class TopicPartition {
-    private final int partition;
-    private final String topic;
-    private final long currentOffset;
-    private final long logEndOffset;
-    private final long lag;
-    private final String offsetMetadata;
-    private final ContentType contentType;
+  private final int partition;
+  private final String topic;
+  private final long currentOffset;
+  private final long logEndOffset;
+  private final long lag;
+  private final String offsetMetadata;
+  private final ContentType contentType;
 
-    @JsonCreator
-    public TopicPartition(@JsonProperty("partition") int partition,
-                          @JsonProperty("topic") String topic,
-                          @JsonProperty("currentOffset") long currentOffset,
-                          @JsonProperty("logEndOffset") long logEndOffset,
-                          @JsonProperty("offsetMetadata") String offsetMetadata,
-                          @JsonProperty("contentType") ContentType contentType) {
-        this.partition = partition;
-        this.topic = topic;
-        this.currentOffset = currentOffset;
-        this.logEndOffset = logEndOffset;
-        this.offsetMetadata = offsetMetadata;
-        this.contentType = contentType;
+  @JsonCreator
+  public TopicPartition(
+      @JsonProperty("partition") int partition,
+      @JsonProperty("topic") String topic,
+      @JsonProperty("currentOffset") long currentOffset,
+      @JsonProperty("logEndOffset") long logEndOffset,
+      @JsonProperty("offsetMetadata") String offsetMetadata,
+      @JsonProperty("contentType") ContentType contentType) {
+    this.partition = partition;
+    this.topic = topic;
+    this.currentOffset = currentOffset;
+    this.logEndOffset = logEndOffset;
+    this.offsetMetadata = offsetMetadata;
+    this.contentType = contentType;
 
-        this.lag = calculateLag(currentOffset, logEndOffset);
-    }
+    this.lag = calculateLag(currentOffset, logEndOffset);
+  }
 
-    private long calculateLag(long currentOffset, long logEndOffset) {
-        return logEndOffset - currentOffset;
-    }
+  private long calculateLag(long currentOffset, long logEndOffset) {
+    return logEndOffset - currentOffset;
+  }
 
-    public int getPartition() {
-        return partition;
-    }
+  public int getPartition() {
+    return partition;
+  }
 
-    public String getTopic() {
-        return topic;
-    }
+  public String getTopic() {
+    return topic;
+  }
 
-    public long getCurrentOffset() {
-        return currentOffset;
-    }
+  public long getCurrentOffset() {
+    return currentOffset;
+  }
 
-    public String getOffsetMetadata() {
-        return offsetMetadata;
-    }
+  public String getOffsetMetadata() {
+    return offsetMetadata;
+  }
 
-    public long getLogEndOffset() {
-        return logEndOffset;
-    }
+  public long getLogEndOffset() {
+    return logEndOffset;
+  }
 
-    public long getLag() {
-        return lag;
-    }
+  public long getLag() {
+    return lag;
+  }
 
-    public ContentType getContentType() {
-        return contentType;
-    }
+  public ContentType getContentType() {
+    return contentType;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TopicPartition that = (TopicPartition) o;
-        return partition == that.partition
-                && currentOffset == that.currentOffset
-                && logEndOffset == that.logEndOffset
-                && contentType == that.contentType
-                && lag == that.lag
-                && Objects.equals(topic, that.topic)
-                && Objects.equals(offsetMetadata, that.offsetMetadata);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(partition, topic, currentOffset, logEndOffset, contentType, lag, offsetMetadata);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    TopicPartition that = (TopicPartition) o;
+    return partition == that.partition
+        && currentOffset == that.currentOffset
+        && logEndOffset == that.logEndOffset
+        && contentType == that.contentType
+        && lag == that.lag
+        && Objects.equals(topic, that.topic)
+        && Objects.equals(offsetMetadata, that.offsetMetadata);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        partition, topic, currentOffset, logEndOffset, contentType, lag, offsetMetadata);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicStats.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicStats.java
index 9571b8a214..741c07cb69 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicStats.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicStats.java
@@ -2,69 +2,73 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public class TopicStats {
-    private final long topicCount;
-    private final long ackAllTopicCount;
-    private final long trackingEnabledTopicCount;
-    private final long avroTopicCount;
+  private final long topicCount;
+  private final long ackAllTopicCount;
+  private final long trackingEnabledTopicCount;
+  private final long avroTopicCount;
 
-    @JsonCreator
-    public TopicStats(@JsonProperty("topicCount") long topicCount,
-                      @JsonProperty("ackAllTopicCount") long ackAllTopicCount,
-                      @JsonProperty("trackingEnabledTopicCount") long trackingEnabledTopicCount,
-                      @JsonProperty("avroTopicCount") long avroTopicCount) {
-        this.topicCount = topicCount;
-        this.ackAllTopicCount = ackAllTopicCount;
-        this.trackingEnabledTopicCount = trackingEnabledTopicCount;
-        this.avroTopicCount = avroTopicCount;
-    }
+  @JsonCreator
+  public TopicStats(
+      @JsonProperty("topicCount") long topicCount,
+      @JsonProperty("ackAllTopicCount") long ackAllTopicCount,
+      @JsonProperty("trackingEnabledTopicCount") long trackingEnabledTopicCount,
+      @JsonProperty("avroTopicCount") long avroTopicCount) {
+    this.topicCount = topicCount;
+    this.ackAllTopicCount = ackAllTopicCount;
+    this.trackingEnabledTopicCount = trackingEnabledTopicCount;
+    this.avroTopicCount = avroTopicCount;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        TopicStats that = (TopicStats) o;
-        return topicCount == that.topicCount
-                && ackAllTopicCount == that.ackAllTopicCount
-                && trackingEnabledTopicCount == that.trackingEnabledTopicCount
-                && avroTopicCount == that.avroTopicCount;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(topicCount, ackAllTopicCount, trackingEnabledTopicCount, avroTopicCount);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    TopicStats that = (TopicStats) o;
+    return topicCount == that.topicCount
+        && ackAllTopicCount == that.ackAllTopicCount
+        && trackingEnabledTopicCount == that.trackingEnabledTopicCount
+        && avroTopicCount == that.avroTopicCount;
+  }
 
-    @Override
-    public String toString() {
-        return "TopicStats{"
-                + "topicCount=" + topicCount
-                + ", ackAllTopicCount=" + ackAllTopicCount
-                + ", trackingEnabledTopicCount=" + trackingEnabledTopicCount
-                + ", avroTopicCount=" + avroTopicCount
-                + '}';
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(topicCount, ackAllTopicCount, trackingEnabledTopicCount, avroTopicCount);
+  }
 
-    public long getTopicCount() {
-        return topicCount;
-    }
+  @Override
+  public String toString() {
+    return "TopicStats{"
+        + "topicCount="
+        + topicCount
+        + ", ackAllTopicCount="
+        + ackAllTopicCount
+        + ", trackingEnabledTopicCount="
+        + trackingEnabledTopicCount
+        + ", avroTopicCount="
+        + avroTopicCount
+        + '}';
+  }
 
-    public long getAckAllTopicCount() {
-        return ackAllTopicCount;
-    }
+  public long getTopicCount() {
+    return topicCount;
+  }
 
-    public long getTrackingEnabledTopicCount() {
-        return trackingEnabledTopicCount;
-    }
+  public long getAckAllTopicCount() {
+    return ackAllTopicCount;
+  }
 
-    public long getAvroTopicCount() {
-        return avroTopicCount;
-    }
+  public long getTrackingEnabledTopicCount() {
+    return trackingEnabledTopicCount;
+  }
+
+  public long getAvroTopicCount() {
+    return avroTopicCount;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicWithSchema.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicWithSchema.java
index c3c1a75059..7294e4e049 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicWithSchema.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicWithSchema.java
@@ -5,96 +5,151 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.OptBoolean;
-
 import java.time.Instant;
 import java.util.Objects;
 import java.util.Set;
 
 public class TopicWithSchema extends Topic {
 
-    private final Topic topic;
+  private final Topic topic;
 
-    private String schema;
+  private String schema;
 
-    public TopicWithSchema(Topic topic, String schema) {
-        this(schema, topic.getQualifiedName(), topic.getDescription(), topic.getOwner(), topic.getRetentionTime(),
-                topic.isJsonToAvroDryRunEnabled(), topic.getAck(), topic.isTrackingEnabled(), topic.wasMigratedFromJsonType(),
-                topic.isSchemaIdAwareSerializationEnabled(), topic.getContentType(), topic.getMaxMessageSize(),
-                topic.getPublishingAuth(), topic.isSubscribingRestricted(), topic.getOfflineStorage(), topic.getLabels(),
-                topic.getCreatedAt(), topic.getModifiedAt());
-    }
+  public TopicWithSchema(Topic topic, String schema) {
+    this(
+        schema,
+        topic.getQualifiedName(),
+        topic.getDescription(),
+        topic.getOwner(),
+        topic.getRetentionTime(),
+        topic.isJsonToAvroDryRunEnabled(),
+        topic.getAck(),
+        topic.isFallbackToRemoteDatacenterEnabled(),
+        topic.getChaos(),
+        topic.isTrackingEnabled(),
+        topic.wasMigratedFromJsonType(),
+        topic.isSchemaIdAwareSerializationEnabled(),
+        topic.getContentType(),
+        topic.getMaxMessageSize(),
+        topic.getPublishingAuth(),
+        topic.isSubscribingRestricted(),
+        topic.getOfflineStorage(),
+        topic.getLabels(),
+        topic.getCreatedAt(),
+        topic.getModifiedAt());
+  }
 
-    @JsonCreator
-    public TopicWithSchema(@JsonProperty("schema") String schema,
-                           @JsonProperty("name") String qualifiedName,
-                           @JsonProperty("description") String description,
-                           @JsonProperty("owner") OwnerId owner,
-                           @JsonProperty("retentionTime") RetentionTime retentionTime,
-                           @JsonProperty("jsonToAvroDryRun") boolean jsonToAvroDryRunEnabled,
-                           @JsonProperty("ack") Ack ack,
-                           @JsonProperty("trackingEnabled") boolean trackingEnabled,
-                           @JsonProperty("migratedFromJsonType") boolean migratedFromJsonType,
-                           @JsonProperty("schemaIdAwareSerializationEnabled")
-                           @JacksonInject(value = Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, useInput = OptBoolean.TRUE)
-                           Boolean schemaIdAwareSerializationEnabled,
-                           @JsonProperty("contentType") ContentType contentType,
-                           @JsonProperty("maxMessageSize") Integer maxMessageSize,
-                           @JsonProperty("auth") PublishingAuth publishingAuth,
-                           @JsonProperty("subscribingRestricted") boolean subscribingRestricted,
-                           @JsonProperty("offlineStorage") TopicDataOfflineStorage offlineStorage,
-                           @JsonProperty("labels") Set<TopicLabel> labels,
-                           @JsonProperty("createdAt") Instant createdAt,
-                           @JsonProperty("modifiedAt") Instant modifiedAt) {
-        super(qualifiedName, description, owner, retentionTime, jsonToAvroDryRunEnabled, ack, trackingEnabled,
-                migratedFromJsonType, schemaIdAwareSerializationEnabled, contentType, maxMessageSize,
-                publishingAuth, subscribingRestricted, offlineStorage, labels, createdAt, modifiedAt);
-        this.topic = convertToTopic();
-        this.schema = schema;
-    }
+  @JsonCreator
+  public TopicWithSchema(
+      @JsonProperty("schema") String schema,
+      @JsonProperty("name") String qualifiedName,
+      @JsonProperty("description") String description,
+      @JsonProperty("owner") OwnerId owner,
+      @JsonProperty("retentionTime") RetentionTime retentionTime,
+      @JsonProperty("jsonToAvroDryRun") boolean jsonToAvroDryRunEnabled,
+      @JsonProperty("ack") Ack ack,
+      @JsonProperty("fallbackToRemoteDatacenterEnabled")
+          @JacksonInject(
+              value = DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY,
+              useInput = OptBoolean.TRUE)
+          boolean fallbackToRemoteDatacenterEnabled,
+      @JsonProperty("chaos") PublishingChaosPolicy chaos,
+      @JsonProperty("trackingEnabled") boolean trackingEnabled,
+      @JsonProperty("migratedFromJsonType") boolean migratedFromJsonType,
+      @JsonProperty("schemaIdAwareSerializationEnabled")
+          @JacksonInject(
+              value = Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY,
+              useInput = OptBoolean.TRUE)
+          Boolean schemaIdAwareSerializationEnabled,
+      @JsonProperty("contentType") ContentType contentType,
+      @JsonProperty("maxMessageSize") Integer maxMessageSize,
+      @JsonProperty("auth") PublishingAuth publishingAuth,
+      @JsonProperty("subscribingRestricted") boolean subscribingRestricted,
+      @JsonProperty("offlineStorage") TopicDataOfflineStorage offlineStorage,
+      @JsonProperty("labels") Set<TopicLabel> labels,
+      @JsonProperty("createdAt") Instant createdAt,
+      @JsonProperty("modifiedAt") Instant modifiedAt) {
+    super(
+        qualifiedName,
+        description,
+        owner,
+        retentionTime,
+        jsonToAvroDryRunEnabled,
+        ack,
+        fallbackToRemoteDatacenterEnabled,
+        chaos,
+        trackingEnabled,
+        migratedFromJsonType,
+        schemaIdAwareSerializationEnabled,
+        contentType,
+        maxMessageSize,
+        publishingAuth,
+        subscribingRestricted,
+        offlineStorage,
+        labels,
+        createdAt,
+        modifiedAt);
+    this.topic = convertToTopic();
+    this.schema = schema;
+  }
 
-    public static TopicWithSchema topicWithSchema(Topic topic, String schema) {
-        return new TopicWithSchema(topic, schema);
-    }
+  public static TopicWithSchema topicWithSchema(Topic topic, String schema) {
+    return new TopicWithSchema(topic, schema);
+  }
 
-    public static TopicWithSchema topicWithSchema(Topic topic) {
-        return new TopicWithSchema(topic, null);
-    }
+  public static TopicWithSchema topicWithSchema(Topic topic) {
+    return new TopicWithSchema(topic, null);
+  }
 
-    private Topic convertToTopic() {
-        return new Topic(this.getQualifiedName(), this.getDescription(), this.getOwner(), this.getRetentionTime(),
-                this.isJsonToAvroDryRunEnabled(), this.getAck(), this.isTrackingEnabled(), this.wasMigratedFromJsonType(),
-                this.isSchemaIdAwareSerializationEnabled(), this.getContentType(), this.getMaxMessageSize(),
-                this.getPublishingAuth(), this.isSubscribingRestricted(), this.getOfflineStorage(), this.getLabels(),
-                this.getCreatedAt(), this.getModifiedAt());
-    }
+  private Topic convertToTopic() {
+    return new Topic(
+        this.getQualifiedName(),
+        this.getDescription(),
+        this.getOwner(),
+        this.getRetentionTime(),
+        this.isJsonToAvroDryRunEnabled(),
+        this.getAck(),
+        this.isFallbackToRemoteDatacenterEnabled(),
+        this.getChaos(),
+        this.isTrackingEnabled(),
+        this.wasMigratedFromJsonType(),
+        this.isSchemaIdAwareSerializationEnabled(),
+        this.getContentType(),
+        this.getMaxMessageSize(),
+        this.getPublishingAuth(),
+        this.isSubscribingRestricted(),
+        this.getOfflineStorage(),
+        this.getLabels(),
+        this.getCreatedAt(),
+        this.getModifiedAt());
+  }
 
-    public String getSchema() {
-        return schema;
-    }
+  public String getSchema() {
+    return schema;
+  }
 
-    @JsonIgnore
-    public Topic getTopic() {
-        return topic;
-    }
+  @JsonIgnore
+  public Topic getTopic() {
+    return topic;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        if (!super.equals(o)) {
-            return false;
-        }
-        TopicWithSchema that = (TopicWithSchema) o;
-        return Objects.equals(topic, that.topic)
-                && Objects.equals(schema, that.schema);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), topic, schema);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    if (!super.equals(o)) {
+      return false;
+    }
+    TopicWithSchema that = (TopicWithSchema) o;
+    return Objects.equals(topic, that.topic) && Objects.equals(schema, that.schema);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), topic, schema);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TrackingMode.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TrackingMode.java
index d55d2041d3..650dd24540 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TrackingMode.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TrackingMode.java
@@ -3,40 +3,39 @@
 import java.util.Optional;
 
 public enum TrackingMode {
+  TRACK_ALL("trackingAll"),
+  TRACK_DISCARDED_ONLY("discardedOnly"),
+  TRACKING_OFF("trackingOff");
 
-    TRACK_ALL("trackingAll"),
-    TRACK_DISCARDED_ONLY("discardedOnly"),
-    TRACKING_OFF("trackingOff");
+  private String value;
 
-    private String value;
+  TrackingMode(String s) {
+    this.value = s;
+  }
 
-    TrackingMode(String s) {
-        this.value = s;
-    }
+  public static Optional<TrackingMode> fromString(String trackingMode) {
 
-    public static Optional<TrackingMode> fromString(String trackingMode) {
-
-        if (trackingMode == null) {
-            return Optional.empty();
-        }
-
-        switch (trackingMode) {
-            case "trackingAll":
-                return Optional.of(TRACK_ALL);
-            case "discardedOnly":
-                return Optional.of(TRACK_DISCARDED_ONLY);
-            case "trackingOff":
-            default:
-                return Optional.of(TRACKING_OFF);
-        }
+    if (trackingMode == null) {
+      return Optional.empty();
     }
 
-    public String getValue() {
-        return value;
+    switch (trackingMode) {
+      case "trackingAll":
+        return Optional.of(TRACK_ALL);
+      case "discardedOnly":
+        return Optional.of(TRACK_DISCARDED_ONLY);
+      case "trackingOff":
+      default:
+        return Optional.of(TRACKING_OFF);
     }
+  }
 
-    @Override
-    public String toString() {
-        return this.value;
-    }
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return this.value;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/UnhealthySubscription.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/UnhealthySubscription.java
index ce27767c37..a265585404 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/UnhealthySubscription.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/UnhealthySubscription.java
@@ -2,84 +2,90 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 import java.util.Set;
 
 public class UnhealthySubscription {
 
-    private final String name;
-    private final String qualifiedTopicName;
-    private final MonitoringDetails.Severity severity;
-    private final Set<SubscriptionHealthProblem> problems;
+  private final String name;
+  private final String qualifiedTopicName;
+  private final MonitoringDetails.Severity severity;
+  private final Set<SubscriptionHealthProblem> problems;
 
-    @JsonCreator
-    public UnhealthySubscription(
-            @JsonProperty("name") String name,
-            @JsonProperty("topicName") String qualifiedTopicName,
-            @JsonProperty("severity") MonitoringDetails.Severity severity,
-            @JsonProperty("problems") Set<SubscriptionHealthProblem> problems) {
-        this.name = name;
-        this.qualifiedTopicName = qualifiedTopicName;
-        this.severity = severity;
-        this.problems = problems;
-    }
+  @JsonCreator
+  public UnhealthySubscription(
+      @JsonProperty("name") String name,
+      @JsonProperty("topicName") String qualifiedTopicName,
+      @JsonProperty("severity") MonitoringDetails.Severity severity,
+      @JsonProperty("problems") Set<SubscriptionHealthProblem> problems) {
+    this.name = name;
+    this.qualifiedTopicName = qualifiedTopicName;
+    this.severity = severity;
+    this.problems = problems;
+  }
 
-    public static UnhealthySubscription from(Subscription subscription, SubscriptionHealth subscriptionHealth) {
-        return new UnhealthySubscription(
-                subscription.getName(),
-                subscription.getQualifiedTopicName(),
-                subscription.getMonitoringDetails().getSeverity(),
-                subscriptionHealth.getProblems());
-    }
+  public static UnhealthySubscription from(
+      Subscription subscription, SubscriptionHealth subscriptionHealth) {
+    return new UnhealthySubscription(
+        subscription.getName(),
+        subscription.getQualifiedTopicName(),
+        subscription.getMonitoringDetails().getSeverity(),
+        subscriptionHealth.getProblems());
+  }
 
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
 
-    @JsonProperty("topicName")
-    public String getQualifiedTopicName() {
-        return qualifiedTopicName;
-    }
+  @JsonProperty("topicName")
+  public String getQualifiedTopicName() {
+    return qualifiedTopicName;
+  }
 
-    @JsonProperty("severity")
-    public MonitoringDetails.Severity getSeverity() {
-        return severity;
-    }
+  @JsonProperty("severity")
+  public MonitoringDetails.Severity getSeverity() {
+    return severity;
+  }
 
-    @JsonProperty("problems")
-    public Set<SubscriptionHealthProblem> getProblems() {
-        return problems;
-    }
+  @JsonProperty("problems")
+  public Set<SubscriptionHealthProblem> getProblems() {
+    return problems;
+  }
 
-    @Override
-    public String toString() {
-        return "UnhealthySubscription{"
-                + "name='" + name + '\''
-                + ", qualifiedTopicName='" + qualifiedTopicName + '\''
-                + ", severity=" + severity
-                + ", problems=" + problems
-                + '}';
-    }
+  @Override
+  public String toString() {
+    return "UnhealthySubscription{"
+        + "name='"
+        + name
+        + '\''
+        + ", qualifiedTopicName='"
+        + qualifiedTopicName
+        + '\''
+        + ", severity="
+        + severity
+        + ", problems="
+        + problems
+        + '}';
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        UnhealthySubscription that = (UnhealthySubscription) o;
-        return Objects.equals(name, that.name)
-                && Objects.equals(qualifiedTopicName, that.qualifiedTopicName)
-                && severity == that.severity
-                && Objects.equals(problems, that.problems);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, qualifiedTopicName, severity, problems);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    UnhealthySubscription that = (UnhealthySubscription) o;
+    return Objects.equals(name, that.name)
+        && Objects.equals(qualifiedTopicName, that.qualifiedTopicName)
+        && severity == that.severity
+        && Objects.equals(problems, that.problems);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, qualifiedTopicName, severity, problems);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/AdminPermitted.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/AdminPermitted.java
index 9fe56ddffc..41e36084ee 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/AdminPermitted.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/AdminPermitted.java
@@ -1,4 +1,3 @@
 package pl.allegro.tech.hermes.api.constraints;
 
-public interface AdminPermitted {
-}
+public interface AdminPermitted {}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ContentTypeValidator.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ContentTypeValidator.java
index 1874fbff9c..3f90dfffad 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ContentTypeValidator.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ContentTypeValidator.java
@@ -8,13 +8,12 @@
 
 public class ContentTypeValidator implements ConstraintValidator<ValidContentType, Subscription> {
 
-    @Override
-    public void initialize(ValidContentType constraintAnnotation) {
+  @Override
+  public void initialize(ValidContentType constraintAnnotation) {}
 
-    }
-
-    @Override
-    public boolean isValid(Subscription subscription, ConstraintValidatorContext context) {
-        return !(subscription.getDeliveryType() == DeliveryType.BATCH && subscription.getContentType() == ContentType.AVRO);
-    }
+  @Override
+  public boolean isValid(Subscription subscription, ConstraintValidatorContext context) {
+    return !(subscription.getDeliveryType() == DeliveryType.BATCH
+        && subscription.getContentType() == ContentType.AVRO);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/Names.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/Names.java
index 5214757d71..582487d271 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/Names.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/Names.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.api.constraints;
 
 public final class Names {
-    public static final String ALLOWED_NAME_REGEX = "[a-zA-Z0-9_.-]+";
+  public static final String ALLOWED_NAME_REGEX = "[a-zA-Z0-9_.-]+";
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmission.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmission.java
new file mode 100644
index 0000000000..4c7fda0a5d
--- /dev/null
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmission.java
@@ -0,0 +1,22 @@
+package pl.allegro.tech.hermes.api.constraints;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+import jakarta.validation.Constraint;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({TYPE})
+@Constraint(validatedBy = OneSourceRetransmissionValidator.class)
+public @interface OneSourceRetransmission {
+  String message() default
+      "must contain one defined source of retransmission data - source topic or source view";
+
+  Class[] groups() default {};
+
+  Class[] payload() default {};
+}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmissionValidator.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmissionValidator.java
new file mode 100644
index 0000000000..f0a89a888c
--- /dev/null
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmissionValidator.java
@@ -0,0 +1,26 @@
+package pl.allegro.tech.hermes.api.constraints;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
+
+public class OneSourceRetransmissionValidator
+    implements ConstraintValidator<OneSourceRetransmission, OfflineRetransmissionRequest> {
+
+  public static final String EMPTY_STRING = "";
+
+  @Override
+  public boolean isValid(
+      OfflineRetransmissionRequest offlineRetransmissionRequest,
+      ConstraintValidatorContext context) {
+    var sourceViewPath = offlineRetransmissionRequest.getSourceViewPath();
+    var sourceTopic = offlineRetransmissionRequest.getSourceTopic();
+
+    return (nonBlank(sourceViewPath.orElse(EMPTY_STRING)) && sourceTopic.isEmpty())
+        || (nonBlank(sourceTopic.orElse(EMPTY_STRING)) && sourceViewPath.isEmpty());
+  }
+
+  private static boolean nonBlank(String value) {
+    return value != null && !value.isBlank();
+  }
+}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ValidContentType.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ValidContentType.java
index 7c4785c578..30344e8903 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ValidContentType.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ValidContentType.java
@@ -1,22 +1,21 @@
 package pl.allegro.tech.hermes.api.constraints;
 
-import jakarta.validation.Constraint;
+import static java.lang.annotation.ElementType.TYPE;
 
+import jakarta.validation.Constraint;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.TYPE;
-
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({TYPE})
 @Constraint(validatedBy = ContentTypeValidator.class)
 public @interface ValidContentType {
-    String message();
+  String message();
 
-    Class[] groups() default {};
+  Class[] groups() default {};
 
-    Class[] payload() default {};
+  Class[] payload() default {};
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/AllTopicClientsEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/AllTopicClientsEndpoint.java
deleted file mode 100644
index c206f43c37..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/AllTopicClientsEndpoint.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("topics/{topic}/clients")
-public interface AllTopicClientsEndpoint {
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    List<String> getTopicClients(@PathParam("topic") String topic);
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/BlacklistEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/BlacklistEndpoint.java
deleted file mode 100644
index 10bd4f4315..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/BlacklistEndpoint.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Response;
-import pl.allegro.tech.hermes.api.BlacklistStatus;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("blacklist")
-public interface BlacklistEndpoint {
-
-    @POST
-    @Produces(APPLICATION_JSON)
-    @Consumes(APPLICATION_JSON)
-    @Path("/topics")
-    Response blacklistTopics(List<String> qualifiedTopicNames);
-
-    @DELETE
-    @Produces(APPLICATION_JSON)
-    @Path("/topics/{topicName}")
-    Response unblacklistTopic(@PathParam("topicName") String qualifiedTopicName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/topics/{topicName}")
-    BlacklistStatus isTopicBlacklisted(@PathParam("topicName") String qualifiedTopicName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/topics")
-    List<String> topicsBlacklist();
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ConsistencyEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ConsistencyEndpoint.java
deleted file mode 100644
index 8e1c694e3f..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ConsistencyEndpoint.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Response;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("consistency")
-public interface ConsistencyEndpoint {
-
-    @GET
-    @Produces({APPLICATION_JSON})
-    @Path("/inconsistencies/groups")
-    Response listInconsistentGroups(@QueryParam("groupNames") List<String> groupNames);
-
-    @GET
-    @Produces({APPLICATION_JSON})
-    @Path("/groups")
-    Response listAllGroups();
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/FilterEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/FilterEndpoint.java
deleted file mode 100644
index b17d3f7df0..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/FilterEndpoint.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import pl.allegro.tech.hermes.api.MessageFiltersVerificationInput;
-import pl.allegro.tech.hermes.api.MessageFiltersVerificationResult;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("filters")
-public interface FilterEndpoint {
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    MessageFiltersVerificationResult verify(@PathParam("topicName") String qualifiedTopicName,
-                                            MessageFiltersVerificationInput input);
-
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/GroupEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/GroupEndpoint.java
deleted file mode 100644
index 3f52307b91..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/GroupEndpoint.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Response;
-import pl.allegro.tech.hermes.api.Group;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("groups")
-public interface GroupEndpoint {
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    List<String> list();
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{groupName}")
-    Group get(@PathParam("groupName") String groupName);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    Response create(Group group);
-
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{groupName}")
-    Response update(@PathParam("groupName") String groupName, Group group);
-
-    @DELETE
-    @Path("/{groupName}")
-    Response delete(@PathParam("groupName") String groupName);
-
-}
-
-
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ModeEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ModeEndpoint.java
deleted file mode 100644
index 62a125b88e..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ModeEndpoint.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Response;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-
-@Path("mode")
-public interface ModeEndpoint {
-
-    @GET
-    @Produces(TEXT_PLAIN)
-    String getMode();
-
-    @POST
-    @Produces(APPLICATION_JSON)
-    Response setMode(@QueryParam("mode") String mode);
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OAuthProviderEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OAuthProviderEndpoint.java
deleted file mode 100644
index 0eea82013d..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OAuthProviderEndpoint.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Response;
-import pl.allegro.tech.hermes.api.OAuthProvider;
-import pl.allegro.tech.hermes.api.PatchData;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("oauth/providers")
-public interface OAuthProviderEndpoint {
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    List<String> list();
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    Response create(OAuthProvider oAuthProvider);
-
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{oAuthProviderName}")
-    Response update(@PathParam("oAuthProviderName") String name, PatchData patch);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{oAuthProviderName}")
-    OAuthProvider get(@PathParam("oAuthProviderName") String oAuthProviderName);
-
-    @DELETE
-    @Produces(APPLICATION_JSON)
-    @Path("/{oAuthProviderName}")
-    Response remove(@PathParam("oAuthProviderName") String oAuthProviderName);
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OfflineRetransmissionEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OfflineRetransmissionEndpoint.java
deleted file mode 100644
index 0f09a7f1be..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OfflineRetransmissionEndpoint.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Response;
-import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
-import pl.allegro.tech.hermes.api.OfflineRetransmissionTask;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("offline-retransmission/tasks")
-public interface OfflineRetransmissionEndpoint {
-    @POST
-    @Consumes(APPLICATION_JSON)
-    Response createRetransmissionTask(OfflineRetransmissionRequest request);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    List<OfflineRetransmissionTask> getAllTasks();
-
-    @DELETE
-    @Path("/{taskId}")
-    Response deleteRetransmissionTask(@PathParam("taskId") String taskId);
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OwnerEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OwnerEndpoint.java
deleted file mode 100644
index aa8bd545fb..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OwnerEndpoint.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import pl.allegro.tech.hermes.api.Owner;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("owners")
-public interface OwnerEndpoint {
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/sources/{source}")
-    List<Owner> search(@PathParam("source") String source, @QueryParam("search") String searchString);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/sources/{source}/{id}")
-    Owner get(@PathParam("source") String source, @PathParam("id") String id);
-
-    @GET
-    @Path("/sources")
-    @Produces(APPLICATION_JSON)
-    List<String> listSources();
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/QueryEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/QueryEndpoint.java
deleted file mode 100644
index 87c9b7a817..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/QueryEndpoint.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import pl.allegro.tech.hermes.api.Group;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.SubscriptionNameWithMetrics;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicNameWithMetrics;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("query")
-public interface QueryEndpoint {
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/groups")
-    List<Group> queryGroups(String query);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/topics")
-    List<Topic> queryTopics(String query);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/subscriptions")
-    List<Subscription> querySubscriptions(String query);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/topics/metrics")
-    List<TopicNameWithMetrics> queryTopicsMetrics(String query);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/subscriptions/metrics")
-    List<SubscriptionNameWithMetrics> querySubscriptionsMetrics(String query);
-}
-
-
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ReadinessEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ReadinessEndpoint.java
deleted file mode 100644
index b89bb7a5d1..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ReadinessEndpoint.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Response;
-import pl.allegro.tech.hermes.api.DatacenterReadiness;
-import pl.allegro.tech.hermes.api.Readiness;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("readiness/datacenters")
-public interface ReadinessEndpoint {
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{datacenter}")
-    Response setReadiness(@PathParam("datacenter") String datacenter, Readiness readiness);
-
-    @GET
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    List<DatacenterReadiness> getReadiness();
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SchemaEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SchemaEndpoint.java
deleted file mode 100644
index 0c4e00e80a..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SchemaEndpoint.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Response;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("topics/{topicName}/schema")
-public interface SchemaEndpoint {
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    Response get(@PathParam("topicName") String qualifiedTopicName);
-
-    @GET
-    @Path("versions/{version}")
-    @Produces(APPLICATION_JSON)
-    Response getByVersion(@PathParam("topicName") String qualifiedTopicName, @PathParam("version") int version);
-
-    @GET
-    @Path("ids/{id}")
-    @Produces(APPLICATION_JSON)
-    Response getById(@PathParam("topicName") String qualifiedTopicName, @PathParam("id") int id);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    Response save(@PathParam("topicName") String qualifiedTopicName, String schema);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    Response save(@PathParam("topicName") String qualifiedTopicName, @QueryParam(value = "validate") boolean validate, String schema);
-
-    @DELETE
-    Response delete(@PathParam("topicName") String qualifiedTopicName);
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/StatsEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/StatsEndpoint.java
deleted file mode 100644
index 6d063c5ca2..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/StatsEndpoint.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import pl.allegro.tech.hermes.api.Stats;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("stats")
-public interface StatsEndpoint {
-    @GET
-    @Produces(APPLICATION_JSON)
-    Stats getStats();
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionEndpoint.java
deleted file mode 100644
index d7806bca7e..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionEndpoint.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Response;
-import pl.allegro.tech.hermes.api.ConsumerGroup;
-import pl.allegro.tech.hermes.api.OffsetRetransmissionDate;
-import pl.allegro.tech.hermes.api.PatchData;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.SubscriptionHealth;
-import pl.allegro.tech.hermes.api.SubscriptionMetrics;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("topics/{topicName}/subscriptions")
-public interface SubscriptionEndpoint {
-    @GET
-    @Produces(APPLICATION_JSON)
-    List<String> list(@PathParam("topicName") String qualifiedTopicName,
-                      @DefaultValue("false") @QueryParam("tracked") boolean tracked);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/query")
-    List<String> queryList(@PathParam("topicName") String qualifiedTopicName,
-                           String query);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    Response create(@PathParam("topicName") String qualifiedTopicName,
-                    Subscription subscription);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}")
-    Subscription get(@PathParam("topicName") String qualifiedTopicName,
-                     @PathParam("subscriptionName") String subscriptionName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/state")
-    Subscription.State getState(@PathParam("topicName") String qualifiedTopicName,
-                                @PathParam("subscriptionName") String subscriptionName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/undelivered/last")
-    Response getLatestUndeliveredMessage(@PathParam("topicName") String qualifiedTopicName,
-                                         @PathParam("subscriptionName") String subscriptionName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/undelivered")
-    Response getLatestUndeliveredMessages(@PathParam("topicName") String qualifiedTopicName,
-                                          @PathParam("subscriptionName") String subscriptionName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/metrics")
-    SubscriptionMetrics getMetrics(@PathParam("topicName") String qualifiedTopicName,
-                                   @PathParam("subscriptionName") String subscriptionName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/health")
-    SubscriptionHealth getHealth(@PathParam("topicName") String qualifiedTopicName,
-                                 @PathParam("subscriptionName") String subscriptionName);
-
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Path("/{subscriptionName}/state")
-    Response updateState(@PathParam("topicName") String qualifiedTopicName,
-                         @PathParam("subscriptionName") String subscriptionName,
-                         Subscription.State state);
-
-    @DELETE
-    @Path("/{subscriptionName}")
-    Response remove(@PathParam("topicName") String qualifiedTopicName,
-                    @PathParam("subscriptionName") String subscriptionName);
-
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Path("/{subscriptionName}")
-    Response update(@PathParam("topicName") String qualifiedTopicName,
-                    @PathParam("subscriptionName") String subscriptionName,
-                    PatchData patch);
-
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/retransmission")
-    Response retransmit(@PathParam("topicName") String qualifiedTopicName,
-                        @PathParam("subscriptionName") String subscriptionName,
-                        @DefaultValue("false") @QueryParam("dryRun") boolean dryRun,
-                        OffsetRetransmissionDate offsetRetransmissionDate);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/moveOffsetsToTheEnd")
-    Response moveOffsetsToTheEnd(@PathParam("topicName") String qualifiedTopicName,
-                        @PathParam("subscriptionName") String subscriptionName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/events/{messageId}/trace")
-    Response getMessageTrace(@PathParam("topicName") String qualifiedTopicName,
-                             @PathParam("subscriptionName") String subscriptionName,
-                             @PathParam("messageId") String messageId);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/consumer-groups")
-    List<ConsumerGroup> describeConsumerGroups(@PathParam("topicName") String qualifiedTopicName,
-                                               @PathParam("subscriptionName") String subscriptionName);
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionOwnershipEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionOwnershipEndpoint.java
deleted file mode 100644
index a610eac1b6..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionOwnershipEndpoint.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import pl.allegro.tech.hermes.api.Subscription;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Path("subscriptions/owner")
-public interface SubscriptionOwnershipEndpoint {
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{ownerSourceName}/{ownerId}")
-    List<Subscription> listForOwner(@PathParam("ownerSourceName") String ownerSourceName,
-                                    @PathParam("ownerId") String ownerId);
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/TopicEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/TopicEndpoint.java
deleted file mode 100644
index 23bc974c6d..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/TopicEndpoint.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Response;
-import pl.allegro.tech.hermes.api.MessageTextPreview;
-import pl.allegro.tech.hermes.api.PatchData;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicMetrics;
-import pl.allegro.tech.hermes.api.TopicWithSchema;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
-
-@Path("topics")
-public interface TopicEndpoint {
-    @GET
-    @Produces(APPLICATION_JSON)
-    List<String> list(
-            @DefaultValue("") @QueryParam("groupName") String groupName,
-            @DefaultValue("false") @QueryParam("tracked") boolean tracked);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/query")
-    List<String> queryList(
-            @DefaultValue("") @QueryParam("groupName") String groupName,
-            String query);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    Response create(TopicWithSchema topic);
-
-    @DELETE
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    Response remove(@PathParam("topicName") String qualifiedTopicName);
-
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    Response update(@PathParam("topicName") String qualifiedTopicName, PatchData patch);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    TopicWithSchema get(@PathParam("topicName") String qualifiedTopicName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}/metrics")
-    TopicMetrics getMetrics(@PathParam("topicName") String qualifiedTopicName);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}/preview")
-    List<MessageTextPreview> getPreview(@PathParam("topicName") String qualifiedTopicName);
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    Response publishMessage(@PathParam("topicName") String qualifiedTopicName, String message);
-
-    @POST
-    @Consumes(AVRO_BINARY)
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    Response publishMessage(@PathParam("topicName") String qualifiedTopicName, byte[] message);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}/preview/cluster/{brokersClusterName}/partition/{partition}/offset/{offset}")
-    String preview(@PathParam("topicName") String qualifiedTopicName,
-                   @PathParam("brokersClusterName") String brokersClusterName,
-                   @PathParam("partition") Integer partition,
-                   @PathParam("offset") Long offset);
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/owner/{ownerSourceName}/{ownerId}")
-    List<Topic> listForOwner(@PathParam("ownerSourceName") String ownerSourceName, @PathParam("ownerId") String ownerId);
-
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/UnhealthyEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/UnhealthyEndpoint.java
deleted file mode 100644
index 6c2178870e..0000000000
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/UnhealthyEndpoint.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package pl.allegro.tech.hermes.api.endpoints;
-
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Response;
-
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-
-@Path("unhealthy")
-public interface UnhealthyEndpoint {
-
-    @GET
-    @Produces({APPLICATION_JSON, TEXT_PLAIN})
-    @Path("/")
-    Response listUnhealthy(@QueryParam("ownerSourceName") String ownerSourceName,
-                           @QueryParam("ownerId") String id,
-                           @QueryParam("respectMonitoringSeverity") boolean respectMonitoringSeverity,
-                           @QueryParam("subscriptionNames") List<String> subscriptionNames,
-                           @QueryParam("qualifiedTopicNames") List<String> qualifiedTopicNames);
-}
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/helpers/Patch.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/helpers/Patch.java
index 92b9363cf5..91c57594e8 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/helpers/Patch.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/helpers/Patch.java
@@ -1,45 +1,44 @@
 package pl.allegro.tech.hermes.api.helpers;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import pl.allegro.tech.hermes.api.PatchData;
-
 import java.util.HashMap;
 import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import pl.allegro.tech.hermes.api.PatchData;
 
 public class Patch {
 
-    private static final ObjectMapper MAPPER = new ObjectMapper()
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-            .disable(SerializationFeature.WRITE_NULL_MAP_VALUES)
-            .registerModule(new JavaTimeModule());
-
-    @SuppressWarnings("unchecked")
-    public static <T> T apply(T object, PatchData patch) {
-        checkNotNull(object);
-        checkNotNull(patch);
-        Map objectMap = MAPPER.convertValue(object, Map.class);
-        return (T) MAPPER.convertValue(merge(objectMap, patch.getPatch()), object.getClass());
+  private static final ObjectMapper MAPPER =
+      new ObjectMapper()
+          .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+          .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+          .disable(SerializationFeature.WRITE_NULL_MAP_VALUES)
+          .registerModule(new JavaTimeModule());
+
+  @SuppressWarnings("unchecked")
+  public static <T> T apply(T object, PatchData patch) {
+    checkNotNull(object);
+    checkNotNull(patch);
+    Map objectMap = MAPPER.convertValue(object, Map.class);
+    return (T) MAPPER.convertValue(merge(objectMap, patch.getPatch()), object.getClass());
+  }
+
+  @SuppressWarnings("unchecked")
+  private static Map merge(Map<String, Object> left, Map<String, Object> right) {
+    Map<String, Object> merged = new HashMap<>(left);
+    for (Map.Entry<String, Object> entry : right.entrySet()) {
+      if (entry.getValue() instanceof Map && merged.containsKey(entry.getKey())) {
+        Map<String, Object> nested = (Map) merged.get(entry.getKey());
+        nested.putAll(merge(nested, (Map) entry.getValue()));
+      } else {
+        merged.put(entry.getKey(), entry.getValue());
+      }
     }
-
-    @SuppressWarnings("unchecked")
-    private static Map merge(Map<String, Object> left, Map<String, Object> right) {
-        Map<String, Object> merged = new HashMap<>(left);
-        for (Map.Entry<String, Object> entry : right.entrySet()) {
-            if (entry.getValue() instanceof Map && merged.containsKey(entry.getKey())) {
-                Map<String, Object> nested = (Map) merged.get(entry.getKey());
-                nested.putAll(merge(nested, (Map) entry.getValue()));
-            } else {
-                merged.put(entry.getKey(), entry.getValue());
-            }
-        }
-        return merged;
-    }
-
+    return merged;
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/helpers/Replacer.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/helpers/Replacer.java
index 099b0e1466..48365bdb07 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/helpers/Replacer.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/helpers/Replacer.java
@@ -6,7 +6,9 @@
 
 public final class Replacer {
 
-    public static List<String> replaceInAll(String regex, String replacement, String... strings) {
-        return Arrays.stream(strings).map(s -> s.replaceAll(regex, replacement)).collect(Collectors.toList());
-    }
+  public static List<String> replaceInAll(String regex, String replacement, String... strings) {
+    return Arrays.stream(strings)
+        .map(s -> s.replaceAll(regex, replacement))
+        .collect(Collectors.toList());
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/EndpointAddressDeserializer.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/EndpointAddressDeserializer.java
index 78e919cc2d..946c0ac6af 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/EndpointAddressDeserializer.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/EndpointAddressDeserializer.java
@@ -5,15 +5,15 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
-import pl.allegro.tech.hermes.api.EndpointAddress;
-
 import java.io.IOException;
+import pl.allegro.tech.hermes.api.EndpointAddress;
 
 public class EndpointAddressDeserializer extends JsonDeserializer<EndpointAddress> {
 
-    @Override
-    public EndpointAddress deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-        JsonNode node = jp.getCodec().readTree(jp);
-        return new EndpointAddress(node.asText());
-    }
+  @Override
+  public EndpointAddress deserialize(JsonParser jp, DeserializationContext ctxt)
+      throws IOException, JsonProcessingException {
+    JsonNode node = jp.getCodec().readTree(jp);
+    return new EndpointAddress(node.asText());
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/EndpointAddressSerializer.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/EndpointAddressSerializer.java
index dda407497e..ce8bf658cb 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/EndpointAddressSerializer.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/EndpointAddressSerializer.java
@@ -3,13 +3,13 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import pl.allegro.tech.hermes.api.EndpointAddress;
-
 import java.io.IOException;
+import pl.allegro.tech.hermes.api.EndpointAddress;
 
 public class EndpointAddressSerializer extends JsonSerializer<EndpointAddress> {
-    @Override
-    public void serialize(EndpointAddress value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
-       jgen.writeString(value.getRawEndpoint());
-    }
+  @Override
+  public void serialize(EndpointAddress value, JsonGenerator jgen, SerializerProvider provider)
+      throws IOException {
+    jgen.writeString(value.getRawEndpoint());
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/InstantIsoSerializer.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/InstantIsoSerializer.java
index 3b8cd3f2c1..20bf9bcdce 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/InstantIsoSerializer.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/InstantIsoSerializer.java
@@ -1,18 +1,18 @@
 package pl.allegro.tech.hermes.api.jackson;
 
+import static java.time.format.DateTimeFormatter.ISO_INSTANT;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-
 import java.io.IOException;
 import java.time.Instant;
 
-import static java.time.format.DateTimeFormatter.ISO_INSTANT;
-
 public class InstantIsoSerializer extends JsonSerializer<Instant> {
 
-    @Override
-    public void serialize(Instant value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
-        jgen.writeString(ISO_INSTANT.format(value));
-    }
+  @Override
+  public void serialize(Instant value, JsonGenerator jgen, SerializerProvider provider)
+      throws IOException {
+    jgen.writeString(ISO_INSTANT.format(value));
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/OffsetDateTimeSerializer.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/OffsetDateTimeSerializer.java
index dcabc9b10b..d82a36e324 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/OffsetDateTimeSerializer.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/OffsetDateTimeSerializer.java
@@ -1,18 +1,18 @@
 package pl.allegro.tech.hermes.api.jackson;
 
+import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-
 import java.io.IOException;
 import java.time.OffsetDateTime;
 
-import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
-
 public class OffsetDateTimeSerializer extends JsonSerializer<OffsetDateTime> {
 
-    @Override
-    public void serialize(OffsetDateTime value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
-       jgen.writeString(ISO_OFFSET_DATE_TIME.format(value));
-    }
+  @Override
+  public void serialize(OffsetDateTime value, JsonGenerator jgen, SerializerProvider provider)
+      throws IOException {
+    jgen.writeString(ISO_OFFSET_DATE_TIME.format(value));
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/PatchDataDeserializer.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/PatchDataDeserializer.java
index e1775303f9..305b3cd76e 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/PatchDataDeserializer.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/PatchDataDeserializer.java
@@ -4,16 +4,16 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
-import pl.allegro.tech.hermes.api.PatchData;
-
 import java.io.IOException;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.PatchData;
 
 public class PatchDataDeserializer extends JsonDeserializer<PatchData> {
 
-    @Override
-    public PatchData deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        Map<String, Object> patch = p.getCodec().readValue(p, new TypeReference<Map<String, Object>>() {});
-        return new PatchData(patch);
-    }
+  @Override
+  public PatchData deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+    Map<String, Object> patch =
+        p.getCodec().readValue(p, new TypeReference<Map<String, Object>>() {});
+    return new PatchData(patch);
+  }
 }
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/PatchDataSerializer.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/PatchDataSerializer.java
index 38ca0100f3..3580f35d55 100644
--- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/PatchDataSerializer.java
+++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/jackson/PatchDataSerializer.java
@@ -4,20 +4,20 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import pl.allegro.tech.hermes.api.PatchData;
-
 import java.io.IOException;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.PatchData;
 
 public class PatchDataSerializer extends JsonSerializer<PatchData> {
-    @Override
-    public void serialize(PatchData value, JsonGenerator gen, SerializerProvider serializers) throws IOException, JsonProcessingException {
-        gen.writeStartObject();
+  @Override
+  public void serialize(PatchData value, JsonGenerator gen, SerializerProvider serializers)
+      throws IOException, JsonProcessingException {
+    gen.writeStartObject();
 
-        for (Map.Entry<String, Object> entry : value.getPatch().entrySet()) {
-            gen.writeObjectField(entry.getKey(), entry.getValue());
-        }
-
-        gen.writeEndObject();
+    for (Map.Entry<String, Object> entry : value.getPatch().entrySet()) {
+      gen.writeObjectField(entry.getKey(), entry.getValue());
     }
+
+    gen.writeEndObject();
+  }
 }
diff --git a/hermes-api/src/test/groovy/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmissionValidatorTest.groovy b/hermes-api/src/test/groovy/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmissionValidatorTest.groovy
new file mode 100644
index 0000000000..e7aa7a42c3
--- /dev/null
+++ b/hermes-api/src/test/groovy/pl/allegro/tech/hermes/api/constraints/OneSourceRetransmissionValidatorTest.groovy
@@ -0,0 +1,37 @@
+package pl.allegro.tech.hermes.api.constraints
+
+
+import jakarta.validation.ConstraintValidatorContext
+import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest
+import spock.lang.Specification
+
+class OneSourceRetransmissionValidatorTest extends Specification {
+
+    OneSourceRetransmissionValidator validator = new OneSourceRetransmissionValidator()
+    ConstraintValidatorContext mockContext = Mock()
+
+    def "Validator should validate retransmission request when sourceViewPath is '#sourceViewPath' and sourceTopic is '#sourceTopic'"() {
+        given:
+        def request = new OfflineRetransmissionRequest(
+                sourceViewPath,
+                sourceTopic,
+                "someTargetTopic",
+                "2024-07-08T12:00:00",
+                "2024-07-08T13:00:00"
+        )
+        expect:
+        validator.isValid(request, mockContext) == isValid
+
+        where:
+        sourceViewPath | sourceTopic | isValid
+        null           | "testTopic" | true
+        "testView"     | null        | true
+        null           | null        | false
+        "testView"     | "testTopic" | false
+        ""             | ""          | false
+        "  "           | "  "        | false
+        ""             | "testTopic" | false
+        "testView"     | "  "        | false
+    }
+
+}
diff --git a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/SubscriptionTest.java b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/SubscriptionTest.java
index fc5030e018..a3392ace04 100644
--- a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/SubscriptionTest.java
+++ b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/SubscriptionTest.java
@@ -1,9 +1,5 @@
 package pl.allegro.tech.hermes.api;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
-import pl.allegro.tech.hermes.api.helpers.Patch;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static pl.allegro.tech.hermes.api.PatchData.patchData;
 import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.GrantType.CLIENT_CREDENTIALS;
@@ -11,109 +7,119 @@
 import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
 import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+import pl.allegro.tech.hermes.api.helpers.Patch;
+
 public class SubscriptionTest {
 
-    private final ObjectMapper mapper = new ObjectMapper();
+  private final ObjectMapper mapper = new ObjectMapper();
 
-    @Test
-    public void shouldDeserializeSubscription() throws Exception {
-        // given
-        String json = "{"
+  @Test
+  public void shouldDeserializeSubscription() throws Exception {
+    // given
+    String json =
+        "{"
             + "\"name\": \"test\", "
             + "\"topicName\": \"g1.t1\", "
             + "\"endpoint\": \"http://localhost:8888\""
             + "}";
 
-        // when
-        Subscription subscription = mapper.readValue(json, Subscription.class);
-
-        // then
-        assertThat(subscription.getName()).isEqualTo("test");
-        assertThat(subscription.getEndpoint().getEndpoint()).isEqualTo("http://localhost:8888");
-    }
-
-    @Test
-    public void shouldDeserializeSubscriptionWithoutTopicName() throws Exception {
-        // given
-        String json = "{\"name\": \"test\", \"endpoint\": \"http://localhost:8888\"}";
-
-        // when
-        Subscription subscription = mapper.readValue(json, Subscription.class);
-
-        // then
-        assertThat(subscription.getName()).isEqualTo("test");
-        assertThat(subscription.getEndpoint().getEndpoint()).isEqualTo("http://localhost:8888");
-    }
-
-    @Test
-    public void shouldDeserializeSubscriptionWithoutBackoff() throws Exception {
-        // given
-        String json = "{\"name\": \"test\", \"endpoint\": \"http://localhost:8888\", \"subscriptionPolicy\": {\"messageTtl\": 100}}";
-
-        // when
-        Subscription subscription = mapper.readValue(json, Subscription.class);
-
-        // then
-        assertThat(subscription.getSerialSubscriptionPolicy().getMessageBackoff()).isEqualTo(100);
-    }
-
-    @Test
-    public void shouldDeserializeSubscriptionWithDefaultTracking() throws Exception {
-        // given
-        String json = "{"
+    // when
+    Subscription subscription = mapper.readValue(json, Subscription.class);
+
+    // then
+    assertThat(subscription.getName()).isEqualTo("test");
+    assertThat(subscription.getEndpoint().getEndpoint()).isEqualTo("http://localhost:8888");
+  }
+
+  @Test
+  public void shouldDeserializeSubscriptionWithoutTopicName() throws Exception {
+    // given
+    String json = "{\"name\": \"test\", \"endpoint\": \"http://localhost:8888\"}";
+
+    // when
+    Subscription subscription = mapper.readValue(json, Subscription.class);
+
+    // then
+    assertThat(subscription.getName()).isEqualTo("test");
+    assertThat(subscription.getEndpoint().getEndpoint()).isEqualTo("http://localhost:8888");
+  }
+
+  @Test
+  public void shouldDeserializeSubscriptionWithoutBackoff() throws Exception {
+    // given
+    String json =
+        "{\"name\": \"test\", \"endpoint\": \"http://localhost:8888\", \"subscriptionPolicy\": {\"messageTtl\": 100}}";
+
+    // when
+    Subscription subscription = mapper.readValue(json, Subscription.class);
+
+    // then
+    assertThat(subscription.getSerialSubscriptionPolicy().getMessageBackoff()).isEqualTo(100);
+  }
+
+  @Test
+  public void shouldDeserializeSubscriptionWithDefaultTracking() throws Exception {
+    // given
+    String json =
+        "{"
             + "\"name\": \"test\", "
             + "\"topicName\": \"g1.t1\", "
             + "\"endpoint\": \"http://localhost:8888\""
             + "}";
 
-        // when
-        Subscription subscription = mapper.readValue(json, Subscription.class);
+    // when
+    Subscription subscription = mapper.readValue(json, Subscription.class);
 
-        // then
-        assertThat(subscription.isTrackingEnabled()).isFalse();
-        assertThat(subscription.getTrackingMode()).isEqualTo(TrackingMode.TRACKING_OFF);
-    }
+    // then
+    assertThat(subscription.isTrackingEnabled()).isFalse();
+    assertThat(subscription.getTrackingMode()).isEqualTo(TrackingMode.TRACKING_OFF);
+  }
 
-    @Test
-    public void shouldDeserializeSubscriptionWithTrackAllMode() throws Exception {
-        // given
-        String json = "{"
+  @Test
+  public void shouldDeserializeSubscriptionWithTrackAllMode() throws Exception {
+    // given
+    String json =
+        "{"
             + "\"name\": \"test\", "
             + "\"topicName\": \"g1.t1\", "
             + "\"endpoint\": \"http://localhost:8888\", "
             + "\"trackingMode\": \"trackingAll\""
             + "}";
 
-        // when
-        Subscription subscription = mapper.readValue(json, Subscription.class);
+    // when
+    Subscription subscription = mapper.readValue(json, Subscription.class);
 
-        // then
-        assertThat(subscription.isTrackingEnabled()).isTrue();
-        assertThat(subscription.getTrackingMode()).isEqualTo(TrackingMode.TRACK_ALL);
-    }
+    // then
+    assertThat(subscription.isTrackingEnabled()).isTrue();
+    assertThat(subscription.getTrackingMode()).isEqualTo(TrackingMode.TRACK_ALL);
+  }
 
-    @Test
-    public void shouldDeserializeSubscriptionWithTrackEnabled() throws Exception {
-        // given
-        String json = "{"
+  @Test
+  public void shouldDeserializeSubscriptionWithTrackEnabled() throws Exception {
+    // given
+    String json =
+        "{"
             + "\"name\": \"test\", "
             + "\"topicName\": \"g1.t1\", "
             + "\"endpoint\": \"http://localhost:8888\", "
             + "\"trackingEnabled\": \"true\""
             + "}";
 
-        // when
-        Subscription subscription = mapper.readValue(json, Subscription.class);
+    // when
+    Subscription subscription = mapper.readValue(json, Subscription.class);
 
-        // then
-        assertThat(subscription.isTrackingEnabled()).isTrue();
-        assertThat(subscription.getTrackingMode()).isEqualTo(TrackingMode.TRACK_ALL);
-    }
+    // then
+    assertThat(subscription.isTrackingEnabled()).isTrue();
+    assertThat(subscription.getTrackingMode()).isEqualTo(TrackingMode.TRACK_ALL);
+  }
 
-    @Test
-    public void shouldDeserializeSubscriptionWithTrackEnabledAndTrackMode() throws Exception {
-        // given
-        String json = "{"
+  @Test
+  public void shouldDeserializeSubscriptionWithTrackEnabledAndTrackMode() throws Exception {
+    // given
+    String json =
+        "{"
             + "\"name\": \"test\", "
             + "\"topicName\": \"g1.t1\", "
             + "\"endpoint\": \"http://localhost:8888\", "
@@ -121,70 +127,74 @@ public void shouldDeserializeSubscriptionWithTrackEnabledAndTrackMode() throws E
             + "\"trackingMode\": \"discardedOnly\""
             + "}";
 
-        // when
-        Subscription subscription = mapper.readValue(json, Subscription.class);
-
-        // then
-        assertThat(subscription.isTrackingEnabled()).isTrue();
-        assertThat(subscription.getTrackingMode()).isEqualTo(TrackingMode.TRACK_DISCARDED_ONLY);
-    }
-
-    @Test
-    public void shouldApplyPatchToSubscriptionPolicy() {
-        //given
-        PatchData patch = patchData().set("rate", 8).build();
-
-        //when
-        SubscriptionPolicy subscription = subscriptionPolicy()
-                .withRate(1)
-                .applyPatch(patch).build();
-
-        //then
-        assertThat(subscription.getRate()).isEqualTo(8);
-    }
-
-    @Test
-    public void shouldAnonymizePassword() {
-        // given
-        Subscription subscription = subscription("group.topic", "subscription").withEndpoint("http://user:password@service/path").build();
-
-        // when & then
-        assertThat(subscription.anonymize().getEndpoint()).isEqualTo(new EndpointAddress("http://user:*****@service/path"));
-    }
-
-    @Test
-    public void shouldApplyPatchChangingSubscriptionOAuthPolicyGrantType() {
-        // given
-        Subscription subscription = subscription("group.topic", "subscription")
-                .withOAuthPolicy(new SubscriptionOAuthPolicy(CLIENT_CREDENTIALS, "myProvider", "repo", null, null))
-                .build();
-        PatchData oAuthPolicyPatchData = patchData()
-                .set("grantType", SubscriptionOAuthPolicy.GrantType.USERNAME_PASSWORD.getName())
-                .set("username", "user1")
-                .set("password", "abc123")
-                .build();
-        PatchData patch = patchData()
-                .set("oAuthPolicy", oAuthPolicyPatchData)
-                .build();
-
-        // when
-        Subscription updated = Patch.apply(subscription, patch);
-
-        // then
-        SubscriptionOAuthPolicy updatedPolicy = updated.getOAuthPolicy();
-        assertThat(updatedPolicy.getGrantType()).isEqualTo(USERNAME_PASSWORD);
-        assertThat(updatedPolicy.getUsername()).isEqualTo("user1");
-    }
-
-    @Test
-    public void shouldReadIntBackoffMultiplier() throws Exception {
-        // given
-        String json = "{\"name\": \"test\", \"endpoint\": \"http://localhost:8888\", \"subscriptionPolicy\": {\"messageBackoff\": 1000, \"backoffMultiplier\": 3}}";
-
-        // when
-        Subscription subscription = mapper.readValue(json, Subscription.class);
-
-        // then
-        assertThat(subscription.getSerialSubscriptionPolicy().getBackoffMultiplier()).isEqualTo(3);
-    }
+    // when
+    Subscription subscription = mapper.readValue(json, Subscription.class);
+
+    // then
+    assertThat(subscription.isTrackingEnabled()).isTrue();
+    assertThat(subscription.getTrackingMode()).isEqualTo(TrackingMode.TRACK_DISCARDED_ONLY);
+  }
+
+  @Test
+  public void shouldApplyPatchToSubscriptionPolicy() {
+    // given
+    PatchData patch = patchData().set("rate", 8).build();
+
+    // when
+    SubscriptionPolicy subscription = subscriptionPolicy().withRate(1).applyPatch(patch).build();
+
+    // then
+    assertThat(subscription.getRate()).isEqualTo(8);
+  }
+
+  @Test
+  public void shouldAnonymizePassword() {
+    // given
+    Subscription subscription =
+        subscription("group.topic", "subscription")
+            .withEndpoint("http://user:password@service/path")
+            .build();
+
+    // when & then
+    assertThat(subscription.anonymize().getEndpoint())
+        .isEqualTo(new EndpointAddress("http://user:*****@service/path"));
+  }
+
+  @Test
+  public void shouldApplyPatchChangingSubscriptionOAuthPolicyGrantType() {
+    // given
+    Subscription subscription =
+        subscription("group.topic", "subscription")
+            .withOAuthPolicy(
+                new SubscriptionOAuthPolicy(CLIENT_CREDENTIALS, "myProvider", "repo", null, null))
+            .build();
+    PatchData oAuthPolicyPatchData =
+        patchData()
+            .set("grantType", SubscriptionOAuthPolicy.GrantType.USERNAME_PASSWORD.getName())
+            .set("username", "user1")
+            .set("password", "abc123")
+            .build();
+    PatchData patch = patchData().set("oAuthPolicy", oAuthPolicyPatchData).build();
+
+    // when
+    Subscription updated = Patch.apply(subscription, patch);
+
+    // then
+    SubscriptionOAuthPolicy updatedPolicy = updated.getOAuthPolicy();
+    assertThat(updatedPolicy.getGrantType()).isEqualTo(USERNAME_PASSWORD);
+    assertThat(updatedPolicy.getUsername()).isEqualTo("user1");
+  }
+
+  @Test
+  public void shouldReadIntBackoffMultiplier() throws Exception {
+    // given
+    String json =
+        "{\"name\": \"test\", \"endpoint\": \"http://localhost:8888\", \"subscriptionPolicy\": {\"messageBackoff\": 1000, \"backoffMultiplier\": 3}}";
+
+    // when
+    Subscription subscription = mapper.readValue(json, Subscription.class);
+
+    // then
+    assertThat(subscription.getSerialSubscriptionPolicy().getBackoffMultiplier()).isEqualTo(3);
+  }
 }
diff --git a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicNameTest.java b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicNameTest.java
index fcaaddb968..ddf6ddb833 100644
--- a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicNameTest.java
+++ b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicNameTest.java
@@ -1,40 +1,39 @@
 package pl.allegro.tech.hermes.api;
 
-import org.junit.Test;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TopicNameTest {
+import org.junit.Test;
 
-    @Test
-    public void shouldConvertQualifiedName() {
-        // given
-        TopicName topicName = new TopicName("group1", "topic1");
-        
-        // when & then
-        assertThat(TopicName.fromQualifiedName(topicName.qualifiedName())).isEqualTo(topicName);
-    }
-
-    @Test
-    public void shouldHandleDottedGroupName() {
-        // given
-        TopicName topicName = TopicName.fromQualifiedName("group.topic");
-        
-        // when & then
-        assertThat(topicName.getGroupName()).isEqualTo("group");
-        assertThat(topicName.getName()).isEqualTo("topic");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldThrowExceptionWhenInvalidQualifiedNameProvided() {
-        // when & then
-        TopicName.fromQualifiedName("invalidQualifiedName");
-    }
-
-    @Test
-    public void shouldBeNullSafe() {
-        // when & then
-        assertThat(TopicName.fromQualifiedName(null)).isNull();
-    }
+public class TopicNameTest {
 
+  @Test
+  public void shouldConvertQualifiedName() {
+    // given
+    TopicName topicName = new TopicName("group1", "topic1");
+
+    // when & then
+    assertThat(TopicName.fromQualifiedName(topicName.qualifiedName())).isEqualTo(topicName);
+  }
+
+  @Test
+  public void shouldHandleDottedGroupName() {
+    // given
+    TopicName topicName = TopicName.fromQualifiedName("group.topic");
+
+    // when & then
+    assertThat(topicName.getGroupName()).isEqualTo("group");
+    assertThat(topicName.getName()).isEqualTo("topic");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void shouldThrowExceptionWhenInvalidQualifiedNameProvided() {
+    // when & then
+    TopicName.fromQualifiedName("invalidQualifiedName");
+  }
+
+  @Test
+  public void shouldBeNullSafe() {
+    // when & then
+    assertThat(TopicName.fromQualifiedName(null)).isNull();
+  }
 }
diff --git a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicTest.java b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicTest.java
index 2c74da0365..b983210192 100644
--- a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicTest.java
+++ b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicTest.java
@@ -1,78 +1,114 @@
 package pl.allegro.tech.hermes.api;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class TopicTest {
 
-    private final ObjectMapper objectMapper = createObjectMapper();
-
-    @Test
-    public void shouldDeserializeTopicWithDefaults() throws Exception {
-        // given
-        String json = "{\"name\":\"foo.bar\", \"description\": \"description\"}";
-
-        // when
-        Topic topic = objectMapper.readValue(json, Topic.class);
-
-        // then
-        assertThat(topic.getName().getName()).isEqualTo("bar");
-        assertThat(topic.getName().getGroupName()).isEqualTo("foo");
-        assertThat(topic.getDescription()).isEqualTo("description");
-        assertThat(topic.isSchemaIdAwareSerializationEnabled()).isEqualTo(true);
-    }
-
-    @Test
-    public void shouldDeserializeTopic() throws Exception {
-        // given
-        String json = "{\"name\":\"foo.bar\", \"description\": \"description\", \"schemaIdAwareSerializationEnabled\": \"false\"}";
-
-        // when
-        Topic topic = objectMapper.readValue(json, Topic.class);
-
-        // then
-        assertThat(topic.getName().getName()).isEqualTo("bar");
-        assertThat(topic.getName().getGroupName()).isEqualTo("foo");
-        assertThat(topic.getDescription()).isEqualTo("description");
-        assertThat(topic.isSchemaIdAwareSerializationEnabled()).isEqualTo(false);
-    }
-
-    @Test
-    public void shouldSetDefaultAckIfNotPresentInJson() throws Exception {
-        // given
-        String json = "{\"name\":\"foo.bar\", \"description\": \"description\"}";
-
-        // when
-        Topic topic = objectMapper.readValue(json, Topic.class);
-
-        // then
-        assertThat(topic.isReplicationConfirmRequired()).isEqualTo(false);
-    }
-
-    @Test
-    public void shouldSkippedDeserializedOldSchemaVersionId() throws Exception {
-        // given
-        String json = "{\"name\":\"foo.bar\", \"description\": \"description\", \"schemaVersionAwareSerializationEnabled\": false}";
-
-        // when
-        Topic topic = objectMapper.readValue(json, Topic.class);
-
-        // then
-        assertThat(topic.getName().getName()).isEqualTo("bar");
-    }
-
-    private ObjectMapper createObjectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-
-        final InjectableValues defaultSchemaIdAwareSerializationEnabled = new InjectableValues
-            .Std().addValue(Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, true);
-
-        mapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
-        mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        return mapper;
-    }
+  private final ObjectMapper objectMapper = createObjectMapper(false);
+
+  @Test
+  public void shouldDeserializeTopicWithDefaults() throws Exception {
+    // given
+    String json = "{\"name\":\"foo.bar\", \"description\": \"description\"}";
+
+    // when
+    Topic topic = objectMapper.readValue(json, Topic.class);
+
+    // then
+    assertThat(topic.getName().getName()).isEqualTo("bar");
+    assertThat(topic.getName().getGroupName()).isEqualTo("foo");
+    assertThat(topic.getDescription()).isEqualTo("description");
+    assertThat(topic.isSchemaIdAwareSerializationEnabled()).isEqualTo(true);
+  }
+
+  @Test
+  public void shouldDeserializeTopic() throws Exception {
+    // given
+    String json =
+        "{\"name\":\"foo.bar\", \"description\": \"description\", \"schemaIdAwareSerializationEnabled\": \"false\"}";
+
+    // when
+    Topic topic = objectMapper.readValue(json, Topic.class);
+
+    // then
+    assertThat(topic.getName().getName()).isEqualTo("bar");
+    assertThat(topic.getName().getGroupName()).isEqualTo("foo");
+    assertThat(topic.getDescription()).isEqualTo("description");
+    assertThat(topic.isSchemaIdAwareSerializationEnabled()).isEqualTo(false);
+  }
+
+  @Test
+  public void shouldSetDefaultAckIfNotPresentInJson() throws Exception {
+    // given
+    String json = "{\"name\":\"foo.bar\", \"description\": \"description\"}";
+
+    // when
+    Topic topic = objectMapper.readValue(json, Topic.class);
+
+    // then
+    assertThat(topic.isReplicationConfirmRequired()).isEqualTo(false);
+  }
+
+  @Test
+  public void shouldSkippedDeserializedOldSchemaVersionId() throws Exception {
+    // given
+    String json =
+        "{\"name\":\"foo.bar\", \"description\": \"description\", \"schemaVersionAwareSerializationEnabled\": false}";
+
+    // when
+    Topic topic = objectMapper.readValue(json, Topic.class);
+
+    // then
+    assertThat(topic.getName().getName()).isEqualTo("bar");
+  }
+
+  @Test
+  public void shouldDeserializeFallbackToRemoteDatacenterWithDefaults() throws Exception {
+    // given
+    String json = "{\"name\":\"foo.bar\", \"description\": \"description\"}";
+
+    // when
+    Topic topic = objectMapper.readValue(json, Topic.class);
+
+    // then
+    assertThat(topic.isFallbackToRemoteDatacenterEnabled()).isEqualTo(false);
+
+    // and when
+    Topic topic2 = createObjectMapper(true).readValue(json, Topic.class);
+
+    // then
+    assertThat(topic2.isFallbackToRemoteDatacenterEnabled()).isEqualTo(true);
+  }
+
+  @Test
+  public void shouldDeserializeFallbackToRemoteDatacenter() throws Exception {
+    // given
+    String json =
+        "{\"name\":\"foo.bar\", \"description\": \"description\", \"fallbackToRemoteDatacenterEnabled\": true}";
+
+    // when
+    Topic topic = objectMapper.readValue(json, Topic.class);
+
+    // then
+    assertThat(topic.isFallbackToRemoteDatacenterEnabled()).isEqualTo(true);
+  }
+
+  private ObjectMapper createObjectMapper(boolean fallbackToRemoteDatacenterEnabled) {
+    ObjectMapper mapper = new ObjectMapper();
+
+    final InjectableValues defaultSchemaIdAwareSerializationEnabled =
+        new InjectableValues.Std()
+            .addValue(Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, true)
+            .addValue(
+                Topic.DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, fallbackToRemoteDatacenterEnabled);
+
+    mapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
+    mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    return mapper;
+  }
 }
diff --git a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/helper/PatchTest.java b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/helper/PatchTest.java
index 2e5315ba50..afb0ae8a8b 100644
--- a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/helper/PatchTest.java
+++ b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/helper/PatchTest.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.api.helper;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.PatchData.patchData;
+import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
+import java.util.HashMap;
 import org.junit.Test;
 import pl.allegro.tech.hermes.api.PatchData;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -7,79 +14,74 @@
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.helpers.Patch;
 
-import java.util.HashMap;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.PatchData.patchData;
-import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
 public class PatchTest {
 
-    @Test
-    public void shouldApplyPatch() {
-        // given
-        SubscriptionPolicy policy = SubscriptionPolicy.create(new HashMap<>());
-        PatchData patch = patchData().set("rate", 10).set("messageTtl", 30).build();
-
-        // when
-        SubscriptionPolicy patched = Patch.apply(policy, patch);
-
-        // when & then
-        assertThat(patched.getRate()).isEqualTo(10);
-        assertThat(patched.getMessageTtl()).isEqualTo(30);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void shouldThrowExceptionForNullValues() {
-        // when
-        Patch.apply(null, null);
-
-        // then
-        // exception is thrown
-    }
-
-    @Test
-    public void shouldIgnoreUnknownFields() {
-        //given
-        SubscriptionPolicy policy = subscriptionPolicy().withRate(10).build();
-        PatchData patch = patchData().set("unknown", 10).set("messageTtl", 30).build();
-
-        // when
-        SubscriptionPolicy patched = Patch.apply(policy, patch);
-
-        // then
-        assertThat(patched.getMessageTtl()).isEqualTo(30);
-    }
-
-    @Test
-    public void shouldPatchNestedObjects() {
-        // given
-        Subscription subscription = subscription("group.topic", "sub").build();
-        PatchData patch = patchData().set(
-                "subscriptionPolicy", patchData().set("rate", 200).set("messageTtl", 8).build().getPatch()
-        ).build();
-
-        // when
-        SubscriptionPolicy result = Patch.apply(subscription, patch).getSerialSubscriptionPolicy();
-
-        // then
-        assertThat(result.getMessageTtl()).isEqualTo(8);
-        assertThat(result.getRate()).isEqualTo(200);
-    }
-
-    @Test
-    public void shouldNotResetPrimitiveFields() {
-        // given
-        Topic topic = topic("group.topic").withTrackingEnabled(true).build();
-        PatchData patch = patchData().set("schemaIdAwareSerializationEnabled", true).build();
-
-        // when
-        Topic patched = Patch.apply(topic, patch);
-
-        // then
-        assertThat(patched.isTrackingEnabled()).isTrue();
-        assertThat(patched.isSchemaIdAwareSerializationEnabled()).isTrue();
-    }
+  @Test
+  public void shouldApplyPatch() {
+    // given
+    SubscriptionPolicy policy = SubscriptionPolicy.create(new HashMap<>());
+    PatchData patch = patchData().set("rate", 10).set("messageTtl", 30).build();
+
+    // when
+    SubscriptionPolicy patched = Patch.apply(policy, patch);
+
+    // when & then
+    assertThat(patched.getRate()).isEqualTo(10);
+    assertThat(patched.getMessageTtl()).isEqualTo(30);
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void shouldThrowExceptionForNullValues() {
+    // when
+    Patch.apply(null, null);
+
+    // then
+    // exception is thrown
+  }
+
+  @Test
+  public void shouldIgnoreUnknownFields() {
+    // given
+    SubscriptionPolicy policy = subscriptionPolicy().withRate(10).build();
+    PatchData patch = patchData().set("unknown", 10).set("messageTtl", 30).build();
+
+    // when
+    SubscriptionPolicy patched = Patch.apply(policy, patch);
+
+    // then
+    assertThat(patched.getMessageTtl()).isEqualTo(30);
+  }
+
+  @Test
+  public void shouldPatchNestedObjects() {
+    // given
+    Subscription subscription = subscription("group.topic", "sub").build();
+    PatchData patch =
+        patchData()
+            .set(
+                "subscriptionPolicy",
+                patchData().set("rate", 200).set("messageTtl", 8).build().getPatch())
+            .build();
+
+    // when
+    SubscriptionPolicy result = Patch.apply(subscription, patch).getSerialSubscriptionPolicy();
+
+    // then
+    assertThat(result.getMessageTtl()).isEqualTo(8);
+    assertThat(result.getRate()).isEqualTo(200);
+  }
+
+  @Test
+  public void shouldNotResetPrimitiveFields() {
+    // given
+    Topic topic = topic("group.topic").withTrackingEnabled(true).build();
+    PatchData patch = patchData().set("schemaIdAwareSerializationEnabled", true).build();
+
+    // when
+    Topic patched = Patch.apply(topic, patch);
+
+    // then
+    assertThat(patched.isTrackingEnabled()).isTrue();
+    assertThat(patched.isSchemaIdAwareSerializationEnabled()).isTrue();
+  }
 }
diff --git a/hermes-api/src/test/resources/allure.properties b/hermes-api/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-api/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-benchmark/build.gradle b/hermes-benchmark/build.gradle
index abd76e7967..6262b38a8a 100644
--- a/hermes-benchmark/build.gradle
+++ b/hermes-benchmark/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'me.champeau.jmh' version '0.6.8'
+    id 'me.champeau.jmh' version '0.7.2'
 }
 
 configurations {
@@ -26,10 +26,9 @@ jmh {
 }
 
 dependencies {
-    jmh group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.12'
-    jmh group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.12'
-    jmh group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.1'
-    jmh group: 'org.spf4j', name: 'spf4j-jmh', version: '8.0.3'
+    jmh group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.37'
+    jmh group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.37'
+    jmh group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.5'
     jmh project(':hermes-frontend')
     jmh project(':hermes-test-helper')
     jmh project(':hermes-common')
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/HermesServerBenchmark.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/HermesServerBenchmark.java
index 90bf020797..562e435ec3 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/HermesServerBenchmark.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/HermesServerBenchmark.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.benchmark;
 
+import java.util.concurrent.TimeUnit;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
@@ -13,40 +14,38 @@
 import org.openjdk.jmh.runner.options.TimeValue;
 import pl.allegro.tech.hermes.benchmark.environment.HermesServerEnvironment;
 
-import java.util.concurrent.TimeUnit;
-
 @State(Scope.Benchmark)
 public class HermesServerBenchmark {
 
-    @Benchmark
-    @BenchmarkMode(Mode.Throughput)
-    @OutputTimeUnit(TimeUnit.SECONDS)
-    public int benchmarkPublishingThroughput(HermesServerEnvironment hermesServerEnvironment) {
-        return hermesServerEnvironment.publisher().publish();
-    }
-
-    @Benchmark
-    @BenchmarkMode(Mode.SampleTime)
-    @OutputTimeUnit(TimeUnit.MILLISECONDS)
-    public int benchmarkPublishingLatency(HermesServerEnvironment hermesServerEnvironment) {
-        return hermesServerEnvironment.publisher().publish();
-    }
-
-    public static void main(String[] args) throws RunnerException {
-        Options opt = new OptionsBuilder()
-                .include(".*" + HermesServerBenchmark.class.getSimpleName() + ".*")
-                .warmupIterations(4)
-                .measurementIterations(4)
-                //.addProfiler(JmhFlightRecorderProfiler.class)
-                //.jvmArgs("-XX:+UnlockCommercialFeatures")
-                .measurementTime(TimeValue.seconds(60))
-                .warmupTime(TimeValue.seconds(40))
-                .forks(1)
-                .threads(2)
-                .syncIterations(false)
-                .build();
-
-        new Runner(opt).run();
-    }
-
+  @Benchmark
+  @BenchmarkMode(Mode.Throughput)
+  @OutputTimeUnit(TimeUnit.SECONDS)
+  public int benchmarkPublishingThroughput(HermesServerEnvironment hermesServerEnvironment) {
+    return hermesServerEnvironment.publisher().publish();
+  }
+
+  @Benchmark
+  @BenchmarkMode(Mode.SampleTime)
+  @OutputTimeUnit(TimeUnit.MILLISECONDS)
+  public int benchmarkPublishingLatency(HermesServerEnvironment hermesServerEnvironment) {
+    return hermesServerEnvironment.publisher().publish();
+  }
+
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder()
+            .include(".*" + HermesServerBenchmark.class.getSimpleName() + ".*")
+            .warmupIterations(4)
+            .measurementIterations(4)
+            // .addProfiler(JmhFlightRecorderProfiler.class)
+            // .jvmArgs("-XX:+UnlockCommercialFeatures")
+            .measurementTime(TimeValue.seconds(60))
+            .warmupTime(TimeValue.seconds(40))
+            .forks(1)
+            .threads(2)
+            .syncIterations(false)
+            .build();
+
+    new Runner(opt).run();
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/MessageRepositoryBenchmark.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/MessageRepositoryBenchmark.java
index eec1a2b04b..6c1e0900d0 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/MessageRepositoryBenchmark.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/MessageRepositoryBenchmark.java
@@ -1,5 +1,14 @@
 package pl.allegro.tech.hermes.benchmark;
 
+import static java.util.Collections.emptyMap;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.ChronicleMapBuilder;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -23,15 +32,6 @@
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageIdGenerator;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
 @Fork(1)
 @Warmup(iterations = 5)
 @Measurement(iterations = 5)
@@ -40,92 +40,98 @@
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 public class MessageRepositoryBenchmark {
 
-    @State(Scope.Benchmark)
-    public static class Repositories {
-        private static final int ENTRIES = 100;
-        private static final int AVERAGE_MESSAGE_SIZE = 600;
+  @State(Scope.Benchmark)
+  public static class Repositories {
+    private static final int ENTRIES = 100;
+    private static final int AVERAGE_MESSAGE_SIZE = 600;
 
-        MessageRepository hermesImplMessageRepository;
-        MessageRepository baselineMessageRepository;
+    MessageRepository hermesImplMessageRepository;
+    MessageRepository baselineMessageRepository;
 
-        Message message;
-        Topic topic;
+    Message message;
+    Topic topic;
 
-        @Setup
-        public void setup() throws IOException {
-            message = generateMessage();
-            topic = topic("groupName.topic").build();
+    @Setup
+    public void setup() throws IOException {
+      message = generateMessage();
+      topic = topic("groupName.topic").build();
 
-            hermesImplMessageRepository = new ChronicleMapMessageRepository(prepareFile(), ENTRIES, AVERAGE_MESSAGE_SIZE);
-            baselineMessageRepository = new BaselineChronicleMapMessageRepository(prepareFile(), ENTRIES, AVERAGE_MESSAGE_SIZE);
-        }
+      hermesImplMessageRepository =
+          new ChronicleMapMessageRepository(prepareFile(), ENTRIES, AVERAGE_MESSAGE_SIZE);
+      baselineMessageRepository =
+          new BaselineChronicleMapMessageRepository(prepareFile(), ENTRIES, AVERAGE_MESSAGE_SIZE);
+    }
+
+    private Message generateMessage() {
+      byte[] messageContent = UUID.randomUUID().toString().getBytes();
+      String id = MessageIdGenerator.generate();
+      return new JsonMessage(
+          id, messageContent, System.currentTimeMillis(), "partition-key", emptyMap());
+    }
 
-        private Message generateMessage() {
-            byte[] messageContent = UUID.randomUUID().toString().getBytes();
-            String id = MessageIdGenerator.generate();
-            return new JsonMessage(id, messageContent, System.currentTimeMillis(), "partition-key");
-        }
+    private File prepareFile() throws IOException {
 
-        private File prepareFile() throws IOException {
+      String baseDir = Files.createTempDirectory(null).toFile().getAbsolutePath();
+      return new File(baseDir, "messages.dat");
+    }
+  }
+
+  @Benchmark
+  public void hermesImplSave(Repositories repositories) {
+    repositories.hermesImplMessageRepository.save(repositories.message, repositories.topic);
+  }
+
+  @Benchmark
+  public void baselineSave(Repositories repositories) {
+    repositories.baselineMessageRepository.save(repositories.message, repositories.topic);
+  }
+
+  public static class BaselineChronicleMapMessageRepository implements MessageRepository {
+    private static final boolean SAME_BUILDER_CONFIG = false;
+
+    private final ChronicleMap<String, ChronicleMapEntryValue> map;
+
+    public BaselineChronicleMapMessageRepository(File file, int entries, int averageMessageSize) {
+      try {
+        map =
+            ChronicleMapBuilder.of(String.class, ChronicleMapEntryValue.class)
+                .constantKeySizeBySample(MessageIdGenerator.generate())
+                .averageValueSize(averageMessageSize)
+                .entries(entries)
+                .sparseFile(true)
+                .createOrRecoverPersistedTo(file, SAME_BUILDER_CONFIG);
+      } catch (IOException e) {
+        throw new ChronicleMapCreationException(e);
+      }
+    }
 
-            String baseDir = Files.createTempDirectory(null).toFile().getAbsolutePath();
-            return new File(baseDir, "messages.dat");
-        }
+    @Override
+    public void save(Message message, Topic topic) {
+      ChronicleMapEntryValue entryValue =
+          new ChronicleMapEntryValue(
+              message.getData(),
+              message.getTimestamp(),
+              topic.getQualifiedName(),
+              message.getPartitionKey(),
+              null,
+              null,
+              emptyMap());
+      map.put(message.getId(), entryValue);
     }
 
-    @Benchmark
-    public void hermesImplSave(Repositories repositories) {
-        repositories.hermesImplMessageRepository.save(repositories.message, repositories.topic);
+    @Override
+    public void delete(String messageId) {
+      throw new UnsupportedOperationException();
     }
 
-    @Benchmark
-    public void baselineSave(Repositories repositories) {
-        repositories.baselineMessageRepository.save(repositories.message, repositories.topic);
+    @Override
+    public List<BackupMessage> findAll() {
+      throw new UnsupportedOperationException();
     }
 
-    public static class BaselineChronicleMapMessageRepository implements MessageRepository {
-        private static final boolean SAME_BUILDER_CONFIG = false;
-
-        private final ChronicleMap<String, ChronicleMapEntryValue> map;
-
-        public BaselineChronicleMapMessageRepository(File file, int entries, int averageMessageSize) {
-            try {
-                map = ChronicleMapBuilder.of(String.class, ChronicleMapEntryValue.class)
-                        .constantKeySizeBySample(MessageIdGenerator.generate())
-                        .averageValueSize(averageMessageSize)
-                        .entries(entries)
-                        .sparseFile(true)
-                        .createOrRecoverPersistedTo(file, SAME_BUILDER_CONFIG);
-            } catch (IOException e) {
-                throw new ChronicleMapCreationException(e);
-            }
-        }
-
-        @Override
-        public void save(Message message, Topic topic) {
-            ChronicleMapEntryValue entryValue = new ChronicleMapEntryValue(
-                    message.getData(),
-                    message.getTimestamp(),
-                    topic.getQualifiedName(),
-                    message.getPartitionKey(),
-                    null,
-                    null);
-            map.put(message.getId(), entryValue);
-        }
-
-        @Override
-        public void delete(String messageId) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public List<BackupMessage> findAll() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void close() {
-            throw new UnsupportedOperationException();
-        }
+    @Override
+    public void close() {
+      throw new UnsupportedOperationException();
     }
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/BenchmarkMessageContentWrapper.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/BenchmarkMessageContentWrapper.java
index 39bf8afc61..81801e35c7 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/BenchmarkMessageContentWrapper.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/BenchmarkMessageContentWrapper.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.benchmark.environment;
 
+import java.util.Map;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.message.wrapper.AvroMessageContentWrapper;
@@ -8,35 +9,44 @@
 import pl.allegro.tech.hermes.common.message.wrapper.UnwrappedMessageContent;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.util.Map;
-
 public class BenchmarkMessageContentWrapper implements MessageContentWrapper {
 
-    private final AvroMessageContentWrapper avroMessageContentWrapper;
-
-    public BenchmarkMessageContentWrapper(AvroMessageContentWrapper avroMessageContentWrapper) {
-        this.avroMessageContentWrapper = avroMessageContentWrapper;
-    }
-
-    @Override
-    public UnwrappedMessageContent unwrapAvro(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public UnwrappedMessageContent unwrapJson(byte[] data) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public byte[] wrapAvro(byte[] data, String id, long timestamp, Topic topic, CompiledSchema<Schema> schema,
-        Map<String, String> externalMetadata) {
-        byte[] wrapped = avroMessageContentWrapper.wrapContent(data, id, timestamp, schema.getSchema(), externalMetadata);
-        return topic.isSchemaIdAwareSerializationEnabled() ? SchemaAwareSerDe.serialize(schema.getId(), wrapped) : wrapped;
-    }
-
-    @Override
-    public byte[] wrapJson(byte[] data, String id, long timestamp, Map<String, String> externalMetadata) {
-        throw new UnsupportedOperationException();
-    }
+  private final AvroMessageContentWrapper avroMessageContentWrapper;
+
+  public BenchmarkMessageContentWrapper(AvroMessageContentWrapper avroMessageContentWrapper) {
+    this.avroMessageContentWrapper = avroMessageContentWrapper;
+  }
+
+  @Override
+  public UnwrappedMessageContent unwrapAvro(
+      byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public UnwrappedMessageContent unwrapJson(byte[] data) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public byte[] wrapAvro(
+      byte[] data,
+      String id,
+      long timestamp,
+      Topic topic,
+      CompiledSchema<Schema> schema,
+      Map<String, String> externalMetadata) {
+    byte[] wrapped =
+        avroMessageContentWrapper.wrapContent(
+            data, id, timestamp, schema.getSchema(), externalMetadata);
+    return topic.isSchemaIdAwareSerializationEnabled()
+        ? SchemaAwareSerDe.serialize(schema.getId(), wrapped)
+        : wrapped;
+  }
+
+  @Override
+  public byte[] wrapJson(
+      byte[] data, String id, long timestamp, Map<String, String> externalMetadata) {
+    throw new UnsupportedOperationException();
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/DisabledReadinessChecker.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/DisabledReadinessChecker.java
index 4216c1cbe0..433cf53746 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/DisabledReadinessChecker.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/DisabledReadinessChecker.java
@@ -1,27 +1,27 @@
 package pl.allegro.tech.hermes.benchmark.environment;
 
-import pl.allegro.tech.hermes.frontend.server.ReadinessChecker;
+import pl.allegro.tech.hermes.frontend.readiness.ReadinessChecker;
 
 class DisabledReadinessChecker implements ReadinessChecker {
 
-    private boolean isReady;
+  private boolean isReady;
 
-    public DisabledReadinessChecker(boolean isReady) {
-        this.isReady = isReady;
-    }
+  public DisabledReadinessChecker(boolean isReady) {
+    this.isReady = isReady;
+  }
 
-    @Override
-    public boolean isReady() {
-        return this.isReady;
-    }
+  @Override
+  public boolean isReady() {
+    return this.isReady;
+  }
 
-    @Override
-    public void start() {
-        this.isReady = true;
-    }
+  @Override
+  public void start() {
+    this.isReady = true;
+  }
 
-    @Override
-    public void stop() {
-        this.isReady = false;
-    }
+  @Override
+  public void stop() {
+    this.isReady = false;
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesPublisher.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesPublisher.java
index 610eafea81..41633f4ff6 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesPublisher.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesPublisher.java
@@ -1,6 +1,10 @@
 package pl.allegro.tech.hermes.benchmark.environment;
 
-import com.codahale.metrics.MetricRegistry;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.CookieSpecs;
@@ -16,72 +20,65 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
 public class HermesPublisher {
-    private static final int CONNECT_TIMEOUT = 3000;
-    private static final int SOCKET_TIMEOUT = 3000;
-    private static final Logger logger = LoggerFactory.getLogger(HermesPublisher.class);
+  private static final int CONNECT_TIMEOUT = 3000;
+  private static final int SOCKET_TIMEOUT = 3000;
+  private static final Logger logger = LoggerFactory.getLogger(HermesPublisher.class);
 
-    private final CloseableHttpAsyncClient httpClient;
-    private final MetricRegistry metricRegistry;
-    private final URI targetUrl;
-    private final HttpEntity body;
+  private final CloseableHttpAsyncClient httpClient;
+  private final URI targetUrl;
+  private final HttpEntity body;
 
-    public HermesPublisher(int maxConnectionsPerRoute, String targetUrl, String body, MetricRegistry metricRegistry)
-            throws IOReactorException, UnsupportedEncodingException {
-        this.targetUrl = URI.create(targetUrl);
-        this.metricRegistry = metricRegistry;
+  public HermesPublisher(int maxConnectionsPerRoute, String targetUrl, String body)
+      throws IOReactorException, UnsupportedEncodingException {
+    this.targetUrl = URI.create(targetUrl);
 
-        RequestConfig requestConfig = RequestConfig.custom()
-                .setCookieSpec(CookieSpecs.IGNORE_COOKIES)
-                .setAuthenticationEnabled(false)
-                .build();
+    RequestConfig requestConfig =
+        RequestConfig.custom()
+            .setCookieSpec(CookieSpecs.IGNORE_COOKIES)
+            .setAuthenticationEnabled(false)
+            .build();
 
-        IOReactorConfig ioReactorConfig = IOReactorConfig.custom()
-                .setIoThreadCount(Runtime.getRuntime().availableProcessors())
-                .setConnectTimeout(CONNECT_TIMEOUT)
-                .setSoTimeout(SOCKET_TIMEOUT)
-                .build();
+    IOReactorConfig ioReactorConfig =
+        IOReactorConfig.custom()
+            .setIoThreadCount(Runtime.getRuntime().availableProcessors())
+            .setConnectTimeout(CONNECT_TIMEOUT)
+            .setSoTimeout(SOCKET_TIMEOUT)
+            .build();
 
-        PoolingNHttpClientConnectionManager connectionManager = new PoolingNHttpClientConnectionManager(
-                new DefaultConnectingIOReactor(ioReactorConfig));
-        connectionManager.setDefaultMaxPerRoute(maxConnectionsPerRoute);
+    PoolingNHttpClientConnectionManager connectionManager =
+        new PoolingNHttpClientConnectionManager(new DefaultConnectingIOReactor(ioReactorConfig));
+    connectionManager.setDefaultMaxPerRoute(maxConnectionsPerRoute);
 
-        httpClient = HttpAsyncClients.custom()
-                .setConnectionManager(connectionManager)
-                .setDefaultRequestConfig(requestConfig)
-                .build();
+    httpClient =
+        HttpAsyncClients.custom()
+            .setConnectionManager(connectionManager)
+            .setDefaultRequestConfig(requestConfig)
+            .build();
 
-        httpClient.start();
+    httpClient.start();
 
-        this.body = new StringEntity(body);
-    }
+    this.body = new StringEntity(body);
+  }
 
-    public int publish() {
-        int response = 0;
-        HttpPost httpPost = new HttpPost(targetUrl);
-        httpPost.setEntity(body);
-        httpPost.setHeader("Content-Type", "application/json");
+  public int publish() {
+    int response = 0;
+    HttpPost httpPost = new HttpPost(targetUrl);
+    httpPost.setEntity(body);
+    httpPost.setHeader("Content-Type", "application/json");
 
-        try {
-            Future<HttpResponse> future = httpClient.execute(httpPost, null);
-            response = future.get().getStatusLine().getStatusCode();
-            metricRegistry.counter("response." + response).inc();
-        } catch (RuntimeException | InterruptedException | ExecutionException exception) {
-            metricRegistry.counter("client.exceptions").inc();
-            logger.error("Client exception", exception);
-        }
-        return response;
+    try {
+      Future<HttpResponse> future = httpClient.execute(httpPost, null);
+      response = future.get().getStatusLine().getStatusCode();
+    } catch (RuntimeException | InterruptedException | ExecutionException exception) {
+      logger.error("Client exception", exception);
     }
+    return response;
+  }
 
-    public void stop() throws IOException {
-        if (httpClient.isRunning()) {
-            httpClient.close();
-        }
+  public void stop() throws IOException {
+    if (httpClient.isRunning()) {
+      httpClient.close();
     }
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesServerEnvironment.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesServerEnvironment.java
index 52aece4222..2862a8ddb9 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesServerEnvironment.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesServerEnvironment.java
@@ -1,6 +1,7 @@
 package pl.allegro.tech.hermes.benchmark.environment;
 
-import com.codahale.metrics.MetricRegistry;
+import java.io.IOException;
+import java.util.Objects;
 import org.apache.commons.io.IOUtils;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -11,61 +12,57 @@
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.frontend.server.HermesServer;
 
-import java.io.IOException;
-import java.util.Objects;
-
 @State(Scope.Benchmark)
 public class HermesServerEnvironment {
 
-    private static final Logger logger = LoggerFactory.getLogger(HermesServerEnvironment.class);
-    private static final int MAX_CONNECTIONS_PER_ROUTE = 200;
-    
-    public static final String BENCHMARK_TOPIC = "bench.topic";
+  private static final Logger logger = LoggerFactory.getLogger(HermesServerEnvironment.class);
+  private static final int MAX_CONNECTIONS_PER_ROUTE = 200;
 
-    private HermesPublisher publisher;
-    private MetricRegistry metricRegistry;
+  public static final String BENCHMARK_TOPIC = "bench.topic";
 
-    private HermesServer hermesServer;
+  private HermesPublisher publisher;
 
-    public static void main(String[] args) throws Exception {
-        new HermesServerEnvironment().setupEnvironment();
-    }
+  private HermesServer hermesServer;
 
-    @Setup(Level.Trial)
-    public void setupEnvironment() throws Exception {
-        hermesServer = HermesServerFactory.provideHermesServer();
-        hermesServer.start();
-    }
+  public static void main(String[] args) throws Exception {
+    new HermesServerEnvironment().setupEnvironment();
+  }
 
-    @Setup(Level.Trial)
-    public void setupPublisher() throws Exception {
-        metricRegistry = new MetricRegistry();
+  @Setup(Level.Trial)
+  public void setupEnvironment() throws Exception {
+    hermesServer = HermesServerFactory.provideHermesServer();
+    hermesServer.start();
+  }
 
-        String messageBody = loadMessageResource("completeMessage");
-        publisher = new HermesPublisher(MAX_CONNECTIONS_PER_ROUTE, "http://localhost:8080/topics/" + BENCHMARK_TOPIC, messageBody, metricRegistry);
-    }
+  @Setup(Level.Trial)
+  public void setupPublisher() throws Exception {
 
-    @TearDown(Level.Trial)
-    public void shutdownServers() throws Exception {
-        hermesServer.stop();
-    }
+    String messageBody = loadMessageResource("completeMessage");
+    publisher =
+        new HermesPublisher(
+            MAX_CONNECTIONS_PER_ROUTE,
+            "http://localhost:8080/topics/" + BENCHMARK_TOPIC,
+            messageBody);
+  }
 
-    @TearDown(Level.Trial)
-    public void shutdownPublisherAndReportMetrics() throws Exception {
-        reportMetrics();
-        publisher.stop();
-    }
+  @TearDown(Level.Trial)
+  public void shutdownServers() throws Exception {
+    hermesServer.stop();
+  }
 
-    public HermesPublisher publisher() {
-        return publisher;
-    }
+  @TearDown(Level.Trial)
+  public void shutdownPublisherAndReportMetrics() throws Exception {
+    publisher.stop();
+  }
 
-    public static String loadMessageResource(String name) throws IOException {
-        return IOUtils.toString(Objects.requireNonNull(HermesServerEnvironment.class
-            .getResourceAsStream(String.format("/message/%s.json", name))));
-    }
+  public HermesPublisher publisher() {
+    return publisher;
+  }
 
-    private void reportMetrics() {
-        metricRegistry.getCounters().forEach((key, value) -> logger.info(key + ": " + value.getCount()));
-    }
+  public static String loadMessageResource(String name) throws IOException {
+    return IOUtils.toString(
+        Objects.requireNonNull(
+            HermesServerEnvironment.class.getResourceAsStream(
+                String.format("/message/%s.json", name))));
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesServerFactory.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesServerFactory.java
index 356fe6afb1..4c76d4bafe 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesServerFactory.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/HermesServerFactory.java
@@ -1,16 +1,22 @@
 package pl.allegro.tech.hermes.benchmark.environment;
 
-import com.codahale.metrics.MetricRegistry;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.benchmark.environment.HermesServerEnvironment.loadMessageResource;
+import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaConfirmed;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.undertow.server.HttpHandler;
+import java.io.IOException;
+import java.time.Clock;
+import java.util.Collections;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.message.wrapper.AvroMessageContentWrapper;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
+import pl.allegro.tech.hermes.frontend.config.HTTPHeadersProperties;
 import pl.allegro.tech.hermes.frontend.config.HandlersChainProperties;
-import pl.allegro.tech.hermes.frontend.config.HeaderPropagationProperties;
 import pl.allegro.tech.hermes.frontend.config.HermesServerProperties;
 import pl.allegro.tech.hermes.frontend.config.SchemaProperties;
 import pl.allegro.tech.hermes.frontend.config.SslProperties;
@@ -25,9 +31,9 @@
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageContentTypeEnforcer;
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageFactory;
 import pl.allegro.tech.hermes.frontend.publishing.metadata.DefaultHeadersPropagator;
+import pl.allegro.tech.hermes.frontend.readiness.HealthCheckService;
 import pl.allegro.tech.hermes.frontend.server.HermesServer;
 import pl.allegro.tech.hermes.frontend.validator.MessageValidators;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.schema.DirectCompiledSchemaRepository;
 import pl.allegro.tech.hermes.schema.DirectSchemaVersionsRepository;
 import pl.allegro.tech.hermes.schema.RawSchemaClient;
@@ -35,79 +41,79 @@
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 import pl.allegro.tech.hermes.tracker.frontend.Trackers;
 
-import java.io.IOException;
-import java.time.Clock;
-import java.util.Collections;
-
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.benchmark.environment.HermesServerEnvironment.loadMessageResource;
-import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaConfirmed;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
 class HermesServerFactory {
 
-    private static final Topic topic = topic(HermesServerEnvironment.BENCHMARK_TOPIC).withContentType(AVRO).build();
-
+  private static final Topic topic =
+      topic(HermesServerEnvironment.BENCHMARK_TOPIC).withContentType(AVRO).build();
 
-    static HermesServer provideHermesServer() throws IOException {
-        ThroughputLimiter throughputLimiter = (exampleTopic, throughput) -> quotaConfirmed();
-        HermesMetrics hermesMetrics = new HermesMetrics(new MetricRegistry(), new PathsCompiler(""));
-        MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry(), hermesMetrics);
-        TopicsCache topicsCache = new InMemoryTopicsCache(metricsFacade, topic);
-        BrokerMessageProducer brokerMessageProducer = new InMemoryBrokerMessageProducer();
-        RawSchemaClient rawSchemaClient = new InMemorySchemaClient(topic.getName(), loadMessageResource("schema"), 1, 1);
-        Trackers trackers = new Trackers(Collections.emptyList());
-        AvroMessageContentWrapper avroMessageContentWrapper = new AvroMessageContentWrapper(Clock.systemDefaultZone());
-        HttpHandler httpHandler = provideHttpHandler(throughputLimiter, topicsCache,
-            brokerMessageProducer, rawSchemaClient, trackers, avroMessageContentWrapper);
-        SslProperties sslProperties = new SslProperties();
-        HermesServerProperties hermesServerProperties = new HermesServerProperties();
-        hermesServerProperties.setGracefulShutdownEnabled(false);
+  static HermesServer provideHermesServer() throws IOException {
+    ThroughputLimiter throughputLimiter = (exampleTopic, throughput) -> quotaConfirmed();
+    MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry());
+    TopicsCache topicsCache = new InMemoryTopicsCache(metricsFacade, topic);
+    BrokerMessageProducer brokerMessageProducer = new InMemoryBrokerMessageProducer();
+    RawSchemaClient rawSchemaClient =
+        new InMemorySchemaClient(topic.getName(), loadMessageResource("schema"), 1, 1);
+    Trackers trackers = new Trackers(Collections.emptyList());
+    AvroMessageContentWrapper avroMessageContentWrapper =
+        new AvroMessageContentWrapper(Clock.systemDefaultZone());
+    HttpHandler httpHandler =
+        provideHttpHandler(
+            throughputLimiter,
+            topicsCache,
+            brokerMessageProducer,
+            rawSchemaClient,
+            trackers,
+            avroMessageContentWrapper);
+    SslProperties sslProperties = new SslProperties();
+    HermesServerProperties hermesServerProperties = new HermesServerProperties();
+    hermesServerProperties.setGracefulShutdownEnabled(false);
 
-        return new HermesServer(
-                sslProperties,
-                hermesServerProperties,
-                metricsFacade,
-                httpHandler,
-                new DisabledReadinessChecker(false),
-                new NoOpMessagePreviewPersister(),
-                throughputLimiter,
-                null,
-                false,
-                null,
-                null);
-    }
+    return new HermesServer(
+        sslProperties,
+        hermesServerProperties,
+        metricsFacade,
+        httpHandler,
+        new HealthCheckService(),
+        new DisabledReadinessChecker(false),
+        new NoOpMessagePreviewPersister(),
+        throughputLimiter,
+        null,
+        null);
+  }
 
-    private static HttpHandler provideHttpHandler(ThroughputLimiter throughputLimiter,
-        TopicsCache topicsCache, BrokerMessageProducer brokerMessageProducer,
-        RawSchemaClient rawSchemaClient, Trackers trackers, AvroMessageContentWrapper avroMessageContentWrapper) {
-        HeaderPropagationProperties headerPropagationProperties = new HeaderPropagationProperties();
-        HandlersChainProperties handlersChainProperties = new HandlersChainProperties();
-        TrackingHeadersExtractor trackingHeadersExtractor = new DefaultTrackingHeaderExtractor();
-        SchemaProperties schemaProperties = new SchemaProperties();
+  private static HttpHandler provideHttpHandler(
+      ThroughputLimiter throughputLimiter,
+      TopicsCache topicsCache,
+      BrokerMessageProducer brokerMessageProducer,
+      RawSchemaClient rawSchemaClient,
+      Trackers trackers,
+      AvroMessageContentWrapper avroMessageContentWrapper) {
+    HTTPHeadersProperties httpHeadersProperties = new HTTPHeadersProperties();
+    HandlersChainProperties handlersChainProperties = new HandlersChainProperties();
+    TrackingHeadersExtractor trackingHeadersExtractor = new DefaultTrackingHeaderExtractor();
+    SchemaProperties schemaProperties = new SchemaProperties();
 
-        return new HandlersChainFactory(
-                topicsCache,
-                new MessageErrorProcessor(new ObjectMapper(), trackers, trackingHeadersExtractor),
-                new MessageEndProcessor(trackers, new BrokerListeners(), trackingHeadersExtractor),
-                new MessageFactory(
-                        new MessageValidators(Collections.emptyList()),
-                        new MessageContentTypeEnforcer(),
-                        new SchemaRepository(
-                                new DirectSchemaVersionsRepository(rawSchemaClient),
-                                new DirectCompiledSchemaRepository<>(rawSchemaClient, SchemaCompilersFactory.avroSchemaCompiler())
-                        ),
-                        new DefaultHeadersPropagator(headerPropagationProperties.isEnabled(), headerPropagationProperties.getAllowFilter()),
-                        new BenchmarkMessageContentWrapper(avroMessageContentWrapper),
-                        Clock.systemDefaultZone(),
-                        schemaProperties.isIdHeaderEnabled()
-                ),
-                brokerMessageProducer,
-                null,
-                throughputLimiter,
-                null,
-                false,
-                handlersChainProperties
-        ).provide();
-    }
+    return new HandlersChainFactory(
+            topicsCache,
+            new MessageErrorProcessor(new ObjectMapper(), trackers, trackingHeadersExtractor),
+            new MessageEndProcessor(trackers, new BrokerListeners(), trackingHeadersExtractor),
+            new MessageFactory(
+                new MessageValidators(Collections.emptyList()),
+                new MessageContentTypeEnforcer(),
+                new SchemaRepository(
+                    new DirectSchemaVersionsRepository(rawSchemaClient),
+                    new DirectCompiledSchemaRepository<>(
+                        rawSchemaClient, SchemaCompilersFactory.avroSchemaCompiler())),
+                new DefaultHeadersPropagator(httpHeadersProperties),
+                new BenchmarkMessageContentWrapper(avroMessageContentWrapper),
+                Clock.systemDefaultZone(),
+                schemaProperties.isIdHeaderEnabled()),
+            brokerMessageProducer,
+            null,
+            throughputLimiter,
+            null,
+            false,
+            handlersChainProperties)
+        .provide();
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemoryBrokerMessageProducer.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemoryBrokerMessageProducer.java
index a7f3a3d832..994b90777b 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemoryBrokerMessageProducer.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemoryBrokerMessageProducer.java
@@ -7,13 +7,18 @@
 
 public class InMemoryBrokerMessageProducer implements BrokerMessageProducer {
 
-    @Override
-    public void send(Message message, CachedTopic topic, PublishingCallback callback) {
-        callback.onPublished(message, topic.getTopic());
-    }
+  @Override
+  public void send(Message message, CachedTopic topic, PublishingCallback callback) {
+    callback.onPublished(message, topic.getTopic());
+  }
 
-    @Override
-    public boolean isTopicAvailable(CachedTopic topic) {
-        return true;
-    }
+  @Override
+  public boolean areAllTopicsAvailable() {
+    return true;
+  }
+
+  @Override
+  public boolean isTopicAvailable(CachedTopic cachedTopic) {
+    return true;
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemorySchemaClient.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemorySchemaClient.java
index 1c2ec6ec38..f25c6ed395 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemorySchemaClient.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemorySchemaClient.java
@@ -1,6 +1,9 @@
 package pl.allegro.tech.hermes.benchmark.environment;
 
 import com.google.common.collect.ImmutableList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.RawSchema;
 import pl.allegro.tech.hermes.api.RawSchemaWithMetadata;
 import pl.allegro.tech.hermes.api.TopicName;
@@ -8,54 +11,50 @@
 import pl.allegro.tech.hermes.schema.SchemaId;
 import pl.allegro.tech.hermes.schema.SchemaVersion;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 public class InMemorySchemaClient implements RawSchemaClient {
 
-    private final TopicName schemaTopicName;
-    private final RawSchemaWithMetadata rawSchemaWithMetadata;
-
-    public InMemorySchemaClient(TopicName schemaTopicName, String schemaSource, int id, int version) {
-        this.schemaTopicName = schemaTopicName;
-        rawSchemaWithMetadata = RawSchemaWithMetadata.of(schemaSource, id, version);
-    }
-
-    @Override
-    public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaVersion version) {
-        return schemaTopicName.equals(topic) && Objects.equals(rawSchemaWithMetadata.getVersion(), version.value())
-                   ? Optional.of(rawSchemaWithMetadata) : Optional.empty();
-    }
-
-    @Override
-    public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaId schemaId) {
-        return schemaTopicName.equals(topic) && Objects.equals(rawSchemaWithMetadata.getId(), schemaId.value())
-                   ? Optional.of(rawSchemaWithMetadata) : Optional.empty();
-    }
-
-    @Override
-    public Optional<RawSchemaWithMetadata> getLatestRawSchemaWithMetadata(TopicName topic) {
-        return schemaTopicName.equals(topic) ? Optional.of(rawSchemaWithMetadata) : Optional.empty();
-    }
-
-    @Override
-    public List<SchemaVersion> getVersions(TopicName topic) {
-        return ImmutableList.of(SchemaVersion.valueOf(rawSchemaWithMetadata.getVersion()));
-    }
-
-    @Override
-    public void registerSchema(TopicName topic, RawSchema rawSchema) {
-
-    }
-
-    @Override
-    public void deleteAllSchemaVersions(TopicName topic) {
-
-    }
-
-    @Override
-    public void validateSchema(TopicName topic, RawSchema rawSchema) {
-
-    }
+  private final TopicName schemaTopicName;
+  private final RawSchemaWithMetadata rawSchemaWithMetadata;
+
+  public InMemorySchemaClient(TopicName schemaTopicName, String schemaSource, int id, int version) {
+    this.schemaTopicName = schemaTopicName;
+    rawSchemaWithMetadata = RawSchemaWithMetadata.of(schemaSource, id, version);
+  }
+
+  @Override
+  public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(
+      TopicName topic, SchemaVersion version) {
+    return schemaTopicName.equals(topic)
+            && Objects.equals(rawSchemaWithMetadata.getVersion(), version.value())
+        ? Optional.of(rawSchemaWithMetadata)
+        : Optional.empty();
+  }
+
+  @Override
+  public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(
+      TopicName topic, SchemaId schemaId) {
+    return schemaTopicName.equals(topic)
+            && Objects.equals(rawSchemaWithMetadata.getId(), schemaId.value())
+        ? Optional.of(rawSchemaWithMetadata)
+        : Optional.empty();
+  }
+
+  @Override
+  public Optional<RawSchemaWithMetadata> getLatestRawSchemaWithMetadata(TopicName topic) {
+    return schemaTopicName.equals(topic) ? Optional.of(rawSchemaWithMetadata) : Optional.empty();
+  }
+
+  @Override
+  public List<SchemaVersion> getVersions(TopicName topic) {
+    return ImmutableList.of(SchemaVersion.valueOf(rawSchemaWithMetadata.getVersion()));
+  }
+
+  @Override
+  public void registerSchema(TopicName topic, RawSchema rawSchema) {}
+
+  @Override
+  public void deleteAllSchemaVersions(TopicName topic) {}
+
+  @Override
+  public void validateSchema(TopicName topic, RawSchema rawSchema) {}
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemoryTopicsCache.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemoryTopicsCache.java
index d673c51187..1c054ac63e 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemoryTopicsCache.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/InMemoryTopicsCache.java
@@ -1,51 +1,49 @@
 package pl.allegro.tech.hermes.benchmark.environment;
 
+import com.codahale.metrics.MetricRegistry;
+import java.util.List;
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopics;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
 import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
-
-import java.util.List;
-import java.util.Optional;
+import pl.allegro.tech.hermes.frontend.metric.ThroughputRegistry;
 
 class InMemoryTopicsCache implements TopicsCache {
 
-    private final MetricsFacade metricsFacade;
-    private final KafkaTopics kafkaTopics;
-    private final Topic topic;
-
-
-    InMemoryTopicsCache(MetricsFacade metricsFacade, Topic topic) {
-        this.metricsFacade = metricsFacade;
-        this.topic = topic;
-        this.kafkaTopics = new KafkaTopics(new KafkaTopic(KafkaTopicName.valueOf(topic.getQualifiedName()), topic.getContentType()));
-    }
-
-    @Override
-    public Optional<CachedTopic> getTopic(String qualifiedTopicName) {
-        if (qualifiedTopicName.equals(topic.getQualifiedName())) {
-            return Optional.of(
-                    new CachedTopic(
-                            topic,
-                            metricsFacade,
-                            kafkaTopics
-                    )
-            );
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public List<CachedTopic> getTopics() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void start() {
-        throw new UnsupportedOperationException();
+  private final MetricsFacade metricsFacade;
+  private final KafkaTopics kafkaTopics;
+  private final Topic topic;
+  private final ThroughputRegistry throughputRegistry;
+
+  InMemoryTopicsCache(MetricsFacade metricsFacade, Topic topic) {
+    this.metricsFacade = metricsFacade;
+    this.topic = topic;
+    this.kafkaTopics =
+        new KafkaTopics(
+            new KafkaTopic(
+                KafkaTopicName.valueOf(topic.getQualifiedName()), topic.getContentType()));
+    this.throughputRegistry = new ThroughputRegistry(metricsFacade, new MetricRegistry());
+  }
+
+  @Override
+  public Optional<CachedTopic> getTopic(String qualifiedTopicName) {
+    if (qualifiedTopicName.equals(topic.getQualifiedName())) {
+      return Optional.of(new CachedTopic(topic, metricsFacade, throughputRegistry, kafkaTopics));
     }
+    return Optional.empty();
+  }
+
+  @Override
+  public List<CachedTopic> getTopics() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void start() {
+    throw new UnsupportedOperationException();
+  }
 }
diff --git a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/NoOpMessagePreviewPersister.java b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/NoOpMessagePreviewPersister.java
index d491102a5e..1a47684d23 100644
--- a/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/NoOpMessagePreviewPersister.java
+++ b/hermes-benchmark/src/jmh/java/pl/allegro/tech/hermes/benchmark/environment/NoOpMessagePreviewPersister.java
@@ -4,11 +4,9 @@
 
 class NoOpMessagePreviewPersister implements MessagePreviewPersister {
 
-    @Override
-    public void start() {
-    }
+  @Override
+  public void start() {}
 
-    @Override
-    public void shutdown() {
-    }
+  @Override
+  public void shutdown() {}
 }
diff --git a/hermes-client/build.gradle b/hermes-client/build.gradle
index 4839a6e378..8e2fa2c039 100644
--- a/hermes-client/build.gradle
+++ b/hermes-client/build.gradle
@@ -3,7 +3,6 @@ plugins {
 }
 
 dependencies {
-    compileOnly group: 'io.dropwizard.metrics', name: 'metrics-core', version: versions.dropwizard_metrics
     compileOnly group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics
     compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-client', version: versions.jersey
     compileOnly group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: versions.jersey
@@ -12,22 +11,21 @@ dependencies {
     compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
 
     implementation group: 'net.jodah', name: 'failsafe', version: versions.failsafe
-    api group: 'io.projectreactor', name: 'reactor-core', version: '3.4.25'
+    api group: 'io.projectreactor', name: 'reactor-core', version: '3.6.5'
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock
     testImplementation group: 'org.wiremock', name: 'wiremock-standalone', version: versions.wiremock
-    testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
-    testImplementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.5.0'
+    testImplementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.0.0'
+    testImplementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.9.0'
 
-    testImplementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: versions.dropwizard_metrics
     testImplementation group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics
     testImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: versions.jersey
     testImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: versions.jersey
     testImplementation group: 'org.springframework', name: 'spring-web', version: versions.spring_web
+    testImplementation group: 'org.springframework', name: 'spring-context', version: versions.spring_web
     testImplementation group: 'org.springframework', name: 'spring-webflux', version: versions.spring_web
     testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
-    testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.0.25'
-    testImplementation group: 'io.projectreactor', name: 'reactor-test', version: '3.4.25'
-
+    testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.1.18'
+    testImplementation group: 'io.projectreactor', name: 'reactor-test', version: '3.6.5'
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClient.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClient.java
index 76e2b03978..0590e3bf83 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClient.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClient.java
@@ -1,11 +1,6 @@
 package pl.allegro.tech.hermes.client;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
-import net.jodah.failsafe.event.ExecutionAttemptedEvent;
-import net.jodah.failsafe.event.ExecutionCompletedEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static pl.allegro.tech.hermes.client.HermesMessage.hermesMessage;
 
 import java.net.URI;
 import java.time.temporal.ChronoUnit;
@@ -21,157 +16,182 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
-
-import static pl.allegro.tech.hermes.client.HermesMessage.hermesMessage;
+import net.jodah.failsafe.Failsafe;
+import net.jodah.failsafe.RetryPolicy;
+import net.jodah.failsafe.event.ExecutionAttemptedEvent;
+import net.jodah.failsafe.event.ExecutionCompletedEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HermesClient {
-    private static final Logger logger = LoggerFactory.getLogger(HermesClient.class);
-
-    private final HermesSender sender;
-    private final String uri;
-    private final Map<String, String> defaultHeaders;
-    private final AtomicInteger currentlySending = new AtomicInteger(0);
-    private final RetryPolicy<HermesResponse> retryPolicy;
-    private final ScheduledExecutorService scheduler;
-    private volatile boolean shutdown = false;
-    private final List<MessageDeliveryListener> messageDeliveryListeners = new ArrayList<>();
-
-    HermesClient(HermesSender sender,
-                 URI uri,
-                 Map<String, String> defaultHeaders,
-                 int retries,
-                 Predicate<HermesResponse> retryCondition,
-                 long retrySleepInMillis,
-                 long maxRetrySleepInMillis,
-                 ScheduledExecutorService scheduler) {
-        this.sender = sender;
-        this.uri = createUri(uri);
-        this.defaultHeaders = Collections.unmodifiableMap(new HashMap<>(defaultHeaders));
-        this.retryPolicy = createRetryPolicy(retries, retryCondition, retrySleepInMillis, maxRetrySleepInMillis);
-        this.scheduler = scheduler;
-    }
-
-    private RetryPolicy<HermesResponse> createRetryPolicy(int retries, Predicate<HermesResponse> retryCondition,
-                                                          long retrySleepInMillis, long maxRetrySleepInMillis) {
-        RetryPolicy<HermesResponse> retryPolicy = new RetryPolicy<HermesResponse>()
-                .withMaxRetries(retries)
-                .handleIf((resp, cause) -> retryCondition.test(resp))
-                .onRetriesExceeded((e) -> handleMaxRetriesExceeded(e))
-                .onRetry((e) -> handleFailedAttempt(e))
-                .onFailure((e) -> handleFailure(e))
-                .onSuccess((e) -> handleSuccessfulRetry(e));
-
-        if (retrySleepInMillis > 0) {
-            retryPolicy.withBackoff(retrySleepInMillis, maxRetrySleepInMillis, ChronoUnit.MILLIS);
-        }
-        return retryPolicy;
-    }
-
-    private String createUri(URI uri) {
-        String uriString = uri.toString();
-        return uriString + (uriString.endsWith("/") ? "" : "/") + "topics/";
-    }
-
-    public CompletableFuture<HermesResponse> publishJSON(String topic, byte[] message) {
-        return publish(hermesMessage(topic, message).json().build());
-    }
-
-    public CompletableFuture<HermesResponse> publishJSON(String topic, String message) {
-        return publish(hermesMessage(topic, message).json().build());
-    }
-
-    public CompletableFuture<HermesResponse> publishAvro(String topic, int schemaVersion, byte[] message) {
-        return publish(hermesMessage(topic, message).avro(schemaVersion).build());
-    }
-
-    public CompletableFuture<HermesResponse> publish(String topic, String message) {
-        return publish(hermesMessage(topic, message).build());
-    }
-
-    public CompletableFuture<HermesResponse> publish(String topic, String contentType, byte[] message) {
-        return publish(hermesMessage(topic, message).withContentType(contentType).build());
-    }
-
-    public CompletableFuture<HermesResponse> publish(String topic, String contentType, String message) {
-        return publish(hermesMessage(topic, message).withContentType(contentType).build());
-    }
-
-    public CompletableFuture<HermesResponse> publish(String topic, String contentType, int schemaVersion, byte[] message) {
-        return publish(hermesMessage(topic, message).withContentType(contentType).withSchemaVersion(schemaVersion).build());
-    }
-
-    public CompletableFuture<HermesResponse> publish(HermesMessage message) {
-        if (shutdown) {
-            return completedWithShutdownException();
-        }
-        HermesMessage.appendDefaults(message, defaultHeaders);
-        return publishWithRetries(message);
-    }
-
-    public boolean addMessageDeliveryListener(MessageDeliveryListener listener) {
-        return messageDeliveryListeners.add(listener);
-    }
-
-    private CompletableFuture<HermesResponse> publishWithRetries(HermesMessage message) {
-        currentlySending.incrementAndGet();
-        return Failsafe.with(retryPolicy)
-                .with(scheduler)
-                .onComplete((e) -> currentlySending.decrementAndGet())
-                .getStageAsync(() -> sendOnce(message));
-    }
-
-    private CompletableFuture<HermesResponse> sendOnce(HermesMessage message) {
-        long startTime = System.nanoTime();
-
-        return sender.send(URI.create(uri + message.getTopic()), message)
-                .exceptionally(e -> HermesResponseBuilder.hermesFailureResponse(e, message))
-                .whenComplete((resp, cause) -> {
-                    long latency = System.nanoTime() - startTime;
-                    messageDeliveryListeners.forEach(l -> l.onSend(resp, latency));
-                });
-    }
-
-    private CompletableFuture<HermesResponse> completedWithShutdownException() {
-        CompletableFuture<HermesResponse> alreadyShutdown = new CompletableFuture<>();
-        alreadyShutdown.completeExceptionally(new HermesClientShutdownException());
-        return alreadyShutdown;
-    }
-
-    public CompletableFuture<Void> closeAsync(long pollInterval) {
-        shutdown = true;
-        return new HermesClientTermination(pollInterval)
-                .observe(() -> currentlySending.get() == 0)
-                .whenComplete((response, ex) -> scheduler.shutdown());
-    }
-
-    public void close(long pollInterval, long timeout) throws InterruptedException, TimeoutException {
-        try {
-            closeAsync(pollInterval).get(timeout, TimeUnit.MILLISECONDS);
-        } catch (ExecutionException e) {
-            throw (InterruptedException) e.getCause();
-        }
-    }
-
-    private void handleMaxRetriesExceeded(ExecutionCompletedEvent<HermesResponse> event) {
-        if (event.getResult().isSuccess()) {
-            return;
-        }
-
-        HermesMessage message = event.getResult().getHermesMessage();
-        messageDeliveryListeners.forEach(l -> l.onMaxRetriesExceeded(event.getResult(), event.getAttemptCount()));
-        logger.error("Failed to send message to topic {} after {} attempts",
-                message.getTopic(), event.getAttemptCount());
-    }
-
-    private void handleFailedAttempt(ExecutionAttemptedEvent<HermesResponse> event) {
-        messageDeliveryListeners.forEach(l -> l.onFailedRetry(event.getLastResult(), event.getAttemptCount()));
-    }
-
-    private void handleFailure(ExecutionCompletedEvent<HermesResponse> event) {
-        messageDeliveryListeners.forEach(l -> l.onFailure(event.getResult(), event.getAttemptCount()));
-    }
-
-    private void handleSuccessfulRetry(ExecutionCompletedEvent<HermesResponse> event) {
-        messageDeliveryListeners.forEach(l -> l.onSuccessfulRetry(event.getResult(), event.getAttemptCount()));
-    }
+  private static final Logger logger = LoggerFactory.getLogger(HermesClient.class);
+
+  private final HermesSender sender;
+  private final String uri;
+  private final Map<String, String> defaultHeaders;
+  private final AtomicInteger currentlySending = new AtomicInteger(0);
+  private final RetryPolicy<HermesResponse> retryPolicy;
+  private final ScheduledExecutorService scheduler;
+  private volatile boolean shutdown = false;
+  private final List<MessageDeliveryListener> messageDeliveryListeners = new ArrayList<>();
+
+  HermesClient(
+      HermesSender sender,
+      URI uri,
+      Map<String, String> defaultHeaders,
+      int retries,
+      Predicate<HermesResponse> retryCondition,
+      long retrySleepInMillis,
+      long maxRetrySleepInMillis,
+      ScheduledExecutorService scheduler) {
+    this.sender = sender;
+    this.uri = createUri(uri);
+    this.defaultHeaders = Collections.unmodifiableMap(new HashMap<>(defaultHeaders));
+    this.retryPolicy =
+        createRetryPolicy(retries, retryCondition, retrySleepInMillis, maxRetrySleepInMillis);
+    this.scheduler = scheduler;
+  }
+
+  private RetryPolicy<HermesResponse> createRetryPolicy(
+      int retries,
+      Predicate<HermesResponse> retryCondition,
+      long retrySleepInMillis,
+      long maxRetrySleepInMillis) {
+    RetryPolicy<HermesResponse> retryPolicy =
+        new RetryPolicy<HermesResponse>()
+            .withMaxRetries(retries)
+            .handleIf((resp, cause) -> retryCondition.test(resp))
+            .onRetriesExceeded((e) -> handleMaxRetriesExceeded(e))
+            .onRetry((e) -> handleFailedAttempt(e))
+            .onFailure((e) -> handleFailure(e))
+            .onSuccess((e) -> handleSuccessfulRetry(e));
+
+    if (retrySleepInMillis > 0) {
+      retryPolicy.withBackoff(retrySleepInMillis, maxRetrySleepInMillis, ChronoUnit.MILLIS);
+    }
+    return retryPolicy;
+  }
+
+  private String createUri(URI uri) {
+    String uriString = uri.toString();
+    return uriString + (uriString.endsWith("/") ? "" : "/") + "topics/";
+  }
+
+  public CompletableFuture<HermesResponse> publishJSON(String topic, byte[] message) {
+    return publish(hermesMessage(topic, message).json().build());
+  }
+
+  public CompletableFuture<HermesResponse> publishJSON(String topic, String message) {
+    return publish(hermesMessage(topic, message).json().build());
+  }
+
+  public CompletableFuture<HermesResponse> publishAvro(
+      String topic, int schemaVersion, byte[] message) {
+    return publish(hermesMessage(topic, message).avro(schemaVersion).build());
+  }
+
+  public CompletableFuture<HermesResponse> publish(String topic, String message) {
+    return publish(hermesMessage(topic, message).build());
+  }
+
+  public CompletableFuture<HermesResponse> publish(
+      String topic, String contentType, byte[] message) {
+    return publish(hermesMessage(topic, message).withContentType(contentType).build());
+  }
+
+  public CompletableFuture<HermesResponse> publish(
+      String topic, String contentType, String message) {
+    return publish(hermesMessage(topic, message).withContentType(contentType).build());
+  }
+
+  public CompletableFuture<HermesResponse> publish(
+      String topic, String contentType, int schemaVersion, byte[] message) {
+    return publish(
+        hermesMessage(topic, message)
+            .withContentType(contentType)
+            .withSchemaVersion(schemaVersion)
+            .build());
+  }
+
+  public CompletableFuture<HermesResponse> publish(HermesMessage message) {
+    if (shutdown) {
+      return completedWithShutdownException();
+    }
+    HermesMessage.appendDefaults(message, defaultHeaders);
+    return publishWithRetries(message);
+  }
+
+  public boolean addMessageDeliveryListener(MessageDeliveryListener listener) {
+    return messageDeliveryListeners.add(listener);
+  }
+
+  private CompletableFuture<HermesResponse> publishWithRetries(HermesMessage message) {
+    currentlySending.incrementAndGet();
+    return Failsafe.with(retryPolicy)
+        .with(scheduler)
+        .onComplete((e) -> currentlySending.decrementAndGet())
+        .getStageAsync(() -> sendOnce(message));
+  }
+
+  private CompletableFuture<HermesResponse> sendOnce(HermesMessage message) {
+    long startTime = System.nanoTime();
+
+    return sender
+        .send(URI.create(uri + message.getTopic()), message)
+        .exceptionally(e -> HermesResponseBuilder.hermesFailureResponse(e, message))
+        .whenComplete(
+            (resp, cause) -> {
+              long latency = System.nanoTime() - startTime;
+              messageDeliveryListeners.forEach(l -> l.onSend(resp, latency));
+            });
+  }
+
+  private CompletableFuture<HermesResponse> completedWithShutdownException() {
+    CompletableFuture<HermesResponse> alreadyShutdown = new CompletableFuture<>();
+    alreadyShutdown.completeExceptionally(new HermesClientShutdownException());
+    return alreadyShutdown;
+  }
+
+  public CompletableFuture<Void> closeAsync(long pollInterval) {
+    shutdown = true;
+    return new HermesClientTermination(pollInterval)
+        .observe(() -> currentlySending.get() == 0)
+        .whenComplete((response, ex) -> scheduler.shutdown());
+  }
+
+  public void close(long pollInterval, long timeout) throws InterruptedException, TimeoutException {
+    try {
+      closeAsync(pollInterval).get(timeout, TimeUnit.MILLISECONDS);
+    } catch (ExecutionException e) {
+      throw (InterruptedException) e.getCause();
+    }
+  }
+
+  private void handleMaxRetriesExceeded(ExecutionCompletedEvent<HermesResponse> event) {
+    if (event.getResult().isSuccess()) {
+      return;
+    }
+
+    HermesMessage message = event.getResult().getHermesMessage();
+    messageDeliveryListeners.forEach(
+        l -> l.onMaxRetriesExceeded(event.getResult(), event.getAttemptCount()));
+    logger.error(
+        "Failed to send message to topic {} after {} attempts",
+        message.getTopic(),
+        event.getAttemptCount());
+  }
+
+  private void handleFailedAttempt(ExecutionAttemptedEvent<HermesResponse> event) {
+    messageDeliveryListeners.forEach(
+        l -> l.onFailedRetry(event.getLastResult(), event.getAttemptCount()));
+  }
+
+  private void handleFailure(ExecutionCompletedEvent<HermesResponse> event) {
+    messageDeliveryListeners.forEach(l -> l.onFailure(event.getResult(), event.getAttemptCount()));
+  }
+
+  private void handleSuccessfulRetry(ExecutionCompletedEvent<HermesResponse> event) {
+    messageDeliveryListeners.forEach(
+        l -> l.onSuccessfulRetry(event.getResult(), event.getAttemptCount()));
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientBasicRetryCondition.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientBasicRetryCondition.java
index e0cd051370..4e6957b7b2 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientBasicRetryCondition.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientBasicRetryCondition.java
@@ -1,20 +1,21 @@
 package pl.allegro.tech.hermes.client;
 
-import java.util.function.Predicate;
-
 import static java.net.HttpURLConnection.HTTP_CLIENT_TIMEOUT;
 
+import java.util.function.Predicate;
+
 public class HermesClientBasicRetryCondition implements Predicate<HermesResponse> {
-    @Override
-    public boolean test(HermesResponse response) {
-        return response == null || (isClientTimeoutOrServerError(response) || isFailedExceptionally(response));
-    }
+  @Override
+  public boolean test(HermesResponse response) {
+    return response == null
+        || (isClientTimeoutOrServerError(response) || isFailedExceptionally(response));
+  }
 
-    private boolean isClientTimeoutOrServerError(HermesResponse response) {
-        return response.getHttpStatus() == HTTP_CLIENT_TIMEOUT || response.getHttpStatus() / 100 == 5;
-    }
+  private boolean isClientTimeoutOrServerError(HermesResponse response) {
+    return response.getHttpStatus() == HTTP_CLIENT_TIMEOUT || response.getHttpStatus() / 100 == 5;
+  }
 
-    private boolean isFailedExceptionally(HermesResponse response) {
-        return response.isFailure() && response.getFailureCause().isPresent();
-    }
+  private boolean isFailedExceptionally(HermesResponse response) {
+    return response.isFailure() && response.getFailureCause().isPresent();
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientBuilder.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientBuilder.java
index c318b8e890..6041033150 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientBuilder.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientBuilder.java
@@ -1,8 +1,5 @@
 package pl.allegro.tech.hermes.client;
 
-import pl.allegro.tech.hermes.client.metrics.MetricsMessageDeliveryListener;
-import pl.allegro.tech.hermes.client.metrics.MetricsProvider;
-
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
@@ -11,82 +8,95 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import pl.allegro.tech.hermes.client.metrics.MetricsMessageDeliveryListener;
+import pl.allegro.tech.hermes.client.metrics.MetricsProvider;
 
 public class HermesClientBuilder {
 
-    private HermesSender sender;
-    private URI uri = URI.create("http://localhost:8080");
-    private final Map<String, String> defaultHeaders = new HashMap<>();
-    private int retries = 3;
-    private Predicate<HermesResponse> retryCondition = new HermesClientBasicRetryCondition();
-    private long retrySleepInMillis = 100;
-    private long maxRetrySleepInMillis = 300;
-    private Supplier<ScheduledExecutorService> schedulerFactory = Executors::newSingleThreadScheduledExecutor;
-    private Optional<MetricsProvider> metrics = Optional.empty();
-
-    public HermesClientBuilder(HermesSender sender) {
-        this.sender = sender;
-        this.defaultHeaders.put(HermesMessage.CONTENT_TYPE_HEADER, HermesMessage.APPLICATION_JSON);
-    }
-
-    public static HermesClientBuilder hermesClient(HermesSender sender) {
-        return new HermesClientBuilder(sender);
-    }
-
-    public HermesClient build() {
-        HermesClient hermesClient = new HermesClient(sender, uri, defaultHeaders, retries, retryCondition,
-                retrySleepInMillis, maxRetrySleepInMillis, schedulerFactory.get());
-
-        metrics.ifPresent((metricsProvider) -> {
-            hermesClient.addMessageDeliveryListener(new MetricsMessageDeliveryListener(metricsProvider));
+  private HermesSender sender;
+  private URI uri = URI.create("http://localhost:8080");
+  private final Map<String, String> defaultHeaders = new HashMap<>();
+  private int retries = 3;
+  private Predicate<HermesResponse> retryCondition = new HermesClientBasicRetryCondition();
+  private long retrySleepInMillis = 100;
+  private long maxRetrySleepInMillis = 300;
+  private Supplier<ScheduledExecutorService> schedulerFactory =
+      Executors::newSingleThreadScheduledExecutor;
+  private Optional<MetricsProvider> metrics = Optional.empty();
+
+  public HermesClientBuilder(HermesSender sender) {
+    this.sender = sender;
+    this.defaultHeaders.put(HermesMessage.CONTENT_TYPE_HEADER, HermesMessage.APPLICATION_JSON);
+  }
+
+  public static HermesClientBuilder hermesClient(HermesSender sender) {
+    return new HermesClientBuilder(sender);
+  }
+
+  public HermesClient build() {
+    HermesClient hermesClient =
+        new HermesClient(
+            sender,
+            uri,
+            defaultHeaders,
+            retries,
+            retryCondition,
+            retrySleepInMillis,
+            maxRetrySleepInMillis,
+            schedulerFactory.get());
+
+    metrics.ifPresent(
+        (metricsProvider) -> {
+          hermesClient.addMessageDeliveryListener(
+              new MetricsMessageDeliveryListener(metricsProvider));
         });
 
-        return hermesClient;
-    }
-
-    public HermesClientBuilder withURI(URI uri) {
-        this.uri = uri;
-        return this;
-    }
-
-    public HermesClientBuilder withMetrics(MetricsProvider metrics) {
-        this.metrics = Optional.of(metrics);
-        return this;
-    }
-
-    public HermesClientBuilder withDefaultContentType(String defaultContentType) {
-        defaultHeaders.put(HermesMessage.CONTENT_TYPE_HEADER, defaultContentType);
-        return this;
-    }
-
-    public HermesClientBuilder withDefaultHeaderValue(String header, String value) {
-        defaultHeaders.put(header, value);
-        return this;
-    }
-
-    public HermesClientBuilder withRetries(int retries) {
-        this.retries = retries;
-        return this;
-    }
-
-    public HermesClientBuilder withRetries(int retries, Predicate<HermesResponse> retryCondition) {
-        this.retryCondition = retryCondition;
-        return withRetries(retries);
-    }
-
-    public HermesClientBuilder withRetrySleep(long retrySleepInMillis) {
-        this.retrySleepInMillis = retrySleepInMillis;
-        return this;
-    }
-
-    public HermesClientBuilder withRetrySleep(long retrySleepInMillis, long maxRetrySleepInMillis) {
-        this.retrySleepInMillis = retrySleepInMillis;
-        this.maxRetrySleepInMillis = maxRetrySleepInMillis;
-        return this;
-    }
-
-    public HermesClientBuilder withScheduler(ScheduledExecutorService scheduler) {
-        this.schedulerFactory = () -> scheduler;
-        return this;
-    }
+    return hermesClient;
+  }
+
+  public HermesClientBuilder withURI(URI uri) {
+    this.uri = uri;
+    return this;
+  }
+
+  public HermesClientBuilder withMetrics(MetricsProvider metrics) {
+    this.metrics = Optional.of(metrics);
+    return this;
+  }
+
+  public HermesClientBuilder withDefaultContentType(String defaultContentType) {
+    defaultHeaders.put(HermesMessage.CONTENT_TYPE_HEADER, defaultContentType);
+    return this;
+  }
+
+  public HermesClientBuilder withDefaultHeaderValue(String header, String value) {
+    defaultHeaders.put(header, value);
+    return this;
+  }
+
+  public HermesClientBuilder withRetries(int retries) {
+    this.retries = retries;
+    return this;
+  }
+
+  public HermesClientBuilder withRetries(int retries, Predicate<HermesResponse> retryCondition) {
+    this.retryCondition = retryCondition;
+    return withRetries(retries);
+  }
+
+  public HermesClientBuilder withRetrySleep(long retrySleepInMillis) {
+    this.retrySleepInMillis = retrySleepInMillis;
+    return this;
+  }
+
+  public HermesClientBuilder withRetrySleep(long retrySleepInMillis, long maxRetrySleepInMillis) {
+    this.retrySleepInMillis = retrySleepInMillis;
+    this.maxRetrySleepInMillis = maxRetrySleepInMillis;
+    return this;
+  }
+
+  public HermesClientBuilder withScheduler(ScheduledExecutorService scheduler) {
+    this.schedulerFactory = () -> scheduler;
+    return this;
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientShutdownException.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientShutdownException.java
index 1b50292abd..12b4a0a23a 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientShutdownException.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientShutdownException.java
@@ -2,11 +2,11 @@
 
 public class HermesClientShutdownException extends RuntimeException {
 
-    public HermesClientShutdownException() {
-        this("Hermes client is already shutdown");
-    }
+  public HermesClientShutdownException() {
+    this("Hermes client is already shutdown");
+  }
 
-    public HermesClientShutdownException(String message) {
-        super(message);
-    }
+  public HermesClientShutdownException(String message) {
+    super(message);
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientTermination.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientTermination.java
index 897e21eb8a..f131f15081 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientTermination.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesClientTermination.java
@@ -7,30 +7,31 @@
 
 class HermesClientTermination {
 
-    private final ExecutorService executorService = Executors.newSingleThreadExecutor();
-    private final long pollInterval;
+  private final ExecutorService executorService = Executors.newSingleThreadExecutor();
+  private final long pollInterval;
 
-    HermesClientTermination(long pollInterval) {
-        this.pollInterval = pollInterval;
-    }
+  HermesClientTermination(long pollInterval) {
+    this.pollInterval = pollInterval;
+  }
 
-    CompletableFuture<Void> observe(BooleanSupplier condition) {
-        final CompletableFuture<Void> result = new CompletableFuture<>();
+  CompletableFuture<Void> observe(BooleanSupplier condition) {
+    final CompletableFuture<Void> result = new CompletableFuture<>();
 
-        executorService.submit(() -> {
-            try {
-                while (!condition.getAsBoolean()) {
-                    Thread.sleep(pollInterval);
-                }
-                result.complete(null);
-            } catch (InterruptedException e) {
-                result.completeExceptionally(e);
-                Thread.currentThread().interrupt();
-            } finally {
-                executorService.shutdown();
+    executorService.submit(
+        () -> {
+          try {
+            while (!condition.getAsBoolean()) {
+              Thread.sleep(pollInterval);
             }
+            result.complete(null);
+          } catch (InterruptedException e) {
+            result.completeExceptionally(e);
+            Thread.currentThread().interrupt();
+          } finally {
+            executorService.shutdown();
+          }
         });
 
-        return result;
-    }
-}
\ No newline at end of file
+    return result;
+  }
+}
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesMessage.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesMessage.java
index 7b7040e007..4bd2fe0fb0 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesMessage.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesMessage.java
@@ -6,171 +6,163 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
-/**
- * All information Hermes needs to send a message.
- */
+/** All information Hermes needs to send a message. */
 public class HermesMessage {
 
-    public static final String SCHEMA_VERSION_HEADER = "Schema-Version";
-
-    static final String APPLICATION_JSON = "application/json;charset=UTF-8";
-    static final String CONTENT_TYPE_HEADER = "Content-Type";
-    static final String AVRO_BINARY = "avro/binary";
+  public static final String SCHEMA_VERSION_HEADER = "Schema-Version";
+
+  static final String APPLICATION_JSON = "application/json;charset=UTF-8";
+  static final String CONTENT_TYPE_HEADER = "Content-Type";
+  static final String AVRO_BINARY = "avro/binary";
+
+  private final String topic;
+  private final byte[] body;
+  private final Map<String, String> headers;
+
+  private HermesMessage(String topic, Map<String, String> headers, byte[] body) {
+    this.topic = topic;
+    this.headers = headers;
+    this.body = body;
+  }
+
+  /** Use builder via: HermesMessage#hermesMessage instead. */
+  @Deprecated
+  public HermesMessage(String topic, String contentType, int schemaVersion, byte[] body) {
+    Map<String, String> headers = new HashMap<>();
+    headers.put(CONTENT_TYPE_HEADER, contentType);
+    headers.put(SCHEMA_VERSION_HEADER, Integer.toString(schemaVersion));
+
+    this.topic = topic;
+    this.headers = headers;
+    this.body = body;
+  }
+
+  /** Use builder via: HermesMessage#hermesMessage instead. */
+  @Deprecated
+  public HermesMessage(String topic, String contentType, byte[] body) {
+    this(topic, contentType, -1, body);
+  }
+
+  /**
+   * Message on given topic with given MIME Content Type.
+   *
+   * <p>Use builder via: HermesMessage#hermesMessage instead.
+   *
+   * @param topic topic name
+   * @param contentType MIME content type
+   * @param body body which will be translated to byte[] using UTF-8 charset
+   */
+  @Deprecated
+  public HermesMessage(String topic, String contentType, String body) {
+    this(topic, contentType, body.getBytes(StandardCharsets.UTF_8));
+  }
+
+  /** Use builder via: HermesMessage#hermesMessage instead. */
+  @Deprecated
+  public HermesMessage(String topic, String body) {
+    this(topic, null, body);
+  }
+
+  public static Builder hermesMessage(String topic, byte[] content) {
+    return new Builder(topic, content);
+  }
+
+  public static Builder hermesMessage(String topic, String content) {
+    return new Builder(topic, content);
+  }
+
+  /**
+   * This method modifies the state of HermesMessage in order to avoid additional allocation when
+   * appending default values. Using same HermesMessage in multiple HermesClient objects with
+   * different defaults is very unlikely, as is sending the same message in multiple threads (which
+   * could cause issues with concurrent modification of map).
+   */
+  static HermesMessage appendDefaults(HermesMessage message, Map<String, String> headers) {
+    for (Map.Entry<String, String> entry : headers.entrySet()) {
+      if (!message.headers.containsKey(entry.getKey())) {
+        message.headers.put(entry.getKey(), entry.getValue());
+      }
+    }
+    return message;
+  }
+
+  public String getTopic() {
+    return topic;
+  }
+
+  public byte[] getBody() {
+    return body;
+  }
+
+  public String getContentType() {
+    return headers.get(CONTENT_TYPE_HEADER);
+  }
+
+  public int getSchemaVersion() {
+    String schemaVersion = headers.get(SCHEMA_VERSION_HEADER);
+    return schemaVersion != null ? Integer.parseInt(schemaVersion) : -1;
+  }
+
+  public boolean schemaVersionDefined() {
+    return headers.containsKey(SCHEMA_VERSION_HEADER);
+  }
+
+  public Map<String, String> getHeaders() {
+    return Collections.unmodifiableMap(headers);
+  }
+
+  public void consumeHeaders(BiConsumer<String, String> consumer) {
+    headers.forEach(consumer);
+  }
+
+  @Override
+  public String toString() {
+    return new String(getBody(), StandardCharsets.UTF_8);
+  }
+
+  public static class Builder {
 
     private final String topic;
     private final byte[] body;
-    private final Map<String, String> headers;
-
-    private HermesMessage(String topic, Map<String, String> headers, byte[] body) {
-        this.topic = topic;
-        this.headers = headers;
-        this.body = body;
-    }
-
-    /**
-     * Use builder via: HermesMessage#hermesMessage instead.
-     */
-    @Deprecated
-    public HermesMessage(String topic, String contentType, int schemaVersion, byte[] body) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put(CONTENT_TYPE_HEADER, contentType);
-        headers.put(SCHEMA_VERSION_HEADER, Integer.toString(schemaVersion));
-
-        this.topic = topic;
-        this.headers = headers;
-        this.body = body;
-    }
-
-    /**
-     * Use builder via: HermesMessage#hermesMessage instead.
-     */
-    @Deprecated
-    public HermesMessage(String topic, String contentType, byte[] body) {
-        this(topic, contentType, -1, body);
-    }
-
-    /**
-     * <p>Message on given topic with given MIME Content Type.</p>
-     * <p>Use builder via: HermesMessage#hermesMessage instead.</p>
-     *
-     * @param topic       topic name
-     * @param contentType MIME content type
-     * @param body        body which will be translated to byte[] using UTF-8 charset
-     */
-    @Deprecated
-    public HermesMessage(String topic, String contentType, String body) {
-        this(topic, contentType, body.getBytes(StandardCharsets.UTF_8));
-    }
-
-    /**
-     * Use builder via: HermesMessage#hermesMessage instead.
-     */
-    @Deprecated
-    public HermesMessage(String topic, String body) {
-        this(topic, null, body);
-    }
-
-    public static Builder hermesMessage(String topic, byte[] content) {
-        return new Builder(topic, content);
-    }
-
-    public static Builder hermesMessage(String topic, String content) {
-        return new Builder(topic, content);
-    }
-
-    /**
-     * This method modifies the state of HermesMessage in order to avoid additional
-     * allocation when appending default values. Using same HermesMessage in multiple
-     * HermesClient objects with different defaults is very unlikely, as is sending the same
-     * message in multiple threads (which could cause issues with concurrent modification of
-     * map).
-     */
-    static HermesMessage appendDefaults(HermesMessage message, Map<String, String> headers) {
-        for (Map.Entry<String, String> entry : headers.entrySet()) {
-            if (!message.headers.containsKey(entry.getKey())) {
-                message.headers.put(entry.getKey(), entry.getValue());
-            }
-        }
-        return message;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
+    private final Map<String, String> headers = new HashMap<>();
 
-    public byte[] getBody() {
-        return body;
+    private Builder(String topic, byte[] body) {
+      this.topic = topic;
+      this.body = body;
     }
 
-    public String getContentType() {
-        return headers.get(CONTENT_TYPE_HEADER);
+    private Builder(String topic, String body) {
+      this(topic, body.getBytes(StandardCharsets.UTF_8));
     }
 
-    public int getSchemaVersion() {
-        String schemaVersion = headers.get(SCHEMA_VERSION_HEADER);
-        return schemaVersion != null ? Integer.parseInt(schemaVersion) : -1;
+    public HermesMessage build() {
+      return new HermesMessage(topic, headers, body);
     }
 
-    public boolean schemaVersionDefined() {
-        return headers.containsKey(SCHEMA_VERSION_HEADER);
+    public Builder json() {
+      this.withContentType(APPLICATION_JSON);
+      return this;
     }
 
-    public Map<String, String> getHeaders() {
-        return Collections.unmodifiableMap(headers);
+    public Builder avro(int schemaVersion) {
+      this.withContentType(AVRO_BINARY);
+      this.withSchemaVersion(schemaVersion);
+      return this;
     }
 
-    public void consumeHeaders(BiConsumer<String, String> consumer) {
-        headers.forEach(consumer);
+    public Builder withContentType(String contentType) {
+      this.headers.put(CONTENT_TYPE_HEADER, contentType);
+      return this;
     }
 
-    @Override
-    public String toString() {
-        return new String(getBody(), StandardCharsets.UTF_8);
+    public Builder withSchemaVersion(int schemaVersion) {
+      this.headers.put(SCHEMA_VERSION_HEADER, Integer.toString(schemaVersion));
+      return this;
     }
 
-    public static class Builder {
-
-        private final String topic;
-        private final byte[] body;
-        private final Map<String, String> headers = new HashMap<>();
-
-        private Builder(String topic, byte[] body) {
-            this.topic = topic;
-            this.body = body;
-        }
-
-        private Builder(String topic, String body) {
-            this(topic, body.getBytes(StandardCharsets.UTF_8));
-        }
-
-        public HermesMessage build() {
-            return new HermesMessage(topic, headers, body);
-        }
-
-        public Builder json() {
-            this.withContentType(APPLICATION_JSON);
-            return this;
-        }
-
-        public Builder avro(int schemaVersion) {
-            this.withContentType(AVRO_BINARY);
-            this.withSchemaVersion(schemaVersion);
-            return this;
-        }
-
-        public Builder withContentType(String contentType) {
-            this.headers.put(CONTENT_TYPE_HEADER, contentType);
-            return this;
-        }
-
-        public Builder withSchemaVersion(int schemaVersion) {
-            this.headers.put(SCHEMA_VERSION_HEADER, Integer.toString(schemaVersion));
-            return this;
-        }
-
-        public Builder withHeader(String header, String value) {
-            this.headers.put(header, value);
-            return this;
-        }
+    public Builder withHeader(String header, String value) {
+      this.headers.put(header, value);
+      return this;
     }
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesResponse.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesResponse.java
index 84c6e97c1b..54cdcf3a78 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesResponse.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesResponse.java
@@ -1,80 +1,78 @@
 package pl.allegro.tech.hermes.client;
 
-import java.util.Optional;
-
 import static java.net.HttpURLConnection.HTTP_ACCEPTED;
 import static java.net.HttpURLConnection.HTTP_CREATED;
 
+import java.util.Optional;
+
 public interface HermesResponse {
 
-    String MESSAGE_ID = "Hermes-Message-Id";
-    String HTTP_1_1 = "http/1.1";
-
-    int getHttpStatus();
-
-    HermesMessage getHermesMessage();
-
-    @Deprecated
-    default boolean wasPublished() {
-        return getHttpStatus() == HTTP_CREATED;
-    }
-
-    @Deprecated
-    default boolean wasAccepted() {
-        return wasPublished() || getHttpStatus() == HTTP_ACCEPTED;
-    }
-
-    default boolean isSuccess() {
-        return getHttpStatus() == HTTP_CREATED || getHttpStatus() == HTTP_ACCEPTED;
-    }
-
-    default boolean isFailure() {
-        return !isSuccess();
-    }
-
-    default Optional<Throwable> getFailureCause() {
-        return Optional.empty();
-    }
-
-    /**
-     * Retrieves failed HermesMessage.
-     *
-     * @deprecated as of Hermes 1.2.4, in favor of {@link #getHermesMessage()}
-     */
-    @Deprecated
-    default Optional<HermesMessage> getFailedMessage() {
-        return Optional.empty();
-    }
-
-    default String getBody() {
-        return "";
-    }
-
-    default String getHeader(String header) {
-        return "";
-    }
-
-    default String getMessageId() {
-        return getHeader(MESSAGE_ID);
-    }
-
-    default String getProtocol() {
-        return HTTP_1_1;
-    }
-
-    default String getDebugLog() {
-        StringBuilder builder = new StringBuilder("Sending message ")
-                .append(getMessageId())
-                .append(" to Hermes ")
-                .append(isSuccess() ? "succeeded" : "failed")
-                .append(", response code: ")
-                .append(getHttpStatus())
-                .append(", body: ")
-                .append(getBody());
-        getFailureCause().ifPresent(ex ->
-                builder.append(", exception: ")
-                       .append(ex.getMessage())
-        );
-        return builder.toString();
-    }
+  String MESSAGE_ID = "Hermes-Message-Id";
+  String HTTP_1_1 = "http/1.1";
+
+  int getHttpStatus();
+
+  HermesMessage getHermesMessage();
+
+  @Deprecated
+  default boolean wasPublished() {
+    return getHttpStatus() == HTTP_CREATED;
+  }
+
+  @Deprecated
+  default boolean wasAccepted() {
+    return wasPublished() || getHttpStatus() == HTTP_ACCEPTED;
+  }
+
+  default boolean isSuccess() {
+    return getHttpStatus() == HTTP_CREATED || getHttpStatus() == HTTP_ACCEPTED;
+  }
+
+  default boolean isFailure() {
+    return !isSuccess();
+  }
+
+  default Optional<Throwable> getFailureCause() {
+    return Optional.empty();
+  }
+
+  /**
+   * Retrieves failed HermesMessage.
+   *
+   * @deprecated as of Hermes 1.2.4, in favor of {@link #getHermesMessage()}
+   */
+  @Deprecated
+  default Optional<HermesMessage> getFailedMessage() {
+    return Optional.empty();
+  }
+
+  default String getBody() {
+    return "";
+  }
+
+  default String getHeader(String header) {
+    return "";
+  }
+
+  default String getMessageId() {
+    return getHeader(MESSAGE_ID);
+  }
+
+  default String getProtocol() {
+    return HTTP_1_1;
+  }
+
+  default String getDebugLog() {
+    StringBuilder builder =
+        new StringBuilder("Sending message ")
+            .append(getMessageId())
+            .append(" to Hermes ")
+            .append(isSuccess() ? "succeeded" : "failed")
+            .append(", response code: ")
+            .append(getHttpStatus())
+            .append(", body: ")
+            .append(getBody());
+    getFailureCause().ifPresent(ex -> builder.append(", exception: ").append(ex.getMessage()));
+    return builder.toString();
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesResponseBuilder.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesResponseBuilder.java
index 44a6752606..14b203eb66 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesResponseBuilder.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesResponseBuilder.java
@@ -5,90 +5,89 @@
 
 public class HermesResponseBuilder {
 
-    private int statusCode = -1;
-    private String body = "";
-    private String protocol = "http/1.1";
-    private Throwable failureCause;
-    private Function<String, String> headerSupplier = (header) -> null;
-    private HermesMessage hermesMessage;
-
-    public static HermesResponseBuilder hermesResponse(HermesMessage hermesMessage) {
-        return new HermesResponseBuilder().withHermesMessage(hermesMessage);
-    }
-
-    public static HermesResponse hermesFailureResponse(Throwable exception, HermesMessage hermesMessage) {
-        return hermesResponse(hermesMessage)
-                .withFailureCause(exception)
-                .build();
-    }
-
-    public HermesResponseBuilder withHttpStatus(int statusCode) {
-        this.statusCode = statusCode;
-        return this;
-    }
-
-    public HermesResponseBuilder withBody(String body) {
-        this.body = body;
-        return this;
-    }
-
-    private HermesResponseBuilder withFailureCause(Throwable exception) {
-        this.failureCause = exception;
-        return this;
-    }
-
-    private HermesResponseBuilder withHermesMessage(HermesMessage hermesMessage) {
-        this.hermesMessage = hermesMessage;
-        return this;
-    }
-
-    public HermesResponseBuilder withHeaderSupplier(Function<String, String> headerSupplier) {
-        this.headerSupplier = headerSupplier;
-        return this;
-    }
-
-    public HermesResponseBuilder withProtocol(String protocol) {
-        this.protocol = protocol;
-        return this;
-    }
-
-    public HermesResponse build() {
-        return new HermesResponse() {
-
-            @Override
-            public int getHttpStatus() {
-                return statusCode;
-            }
-
-            @Override
-            public HermesMessage getHermesMessage() {
-                return hermesMessage;
-            }
-
-            @Override
-            public Optional<Throwable> getFailureCause() {
-                return Optional.ofNullable(failureCause);
-            }
-
-            @Override
-            public Optional<HermesMessage> getFailedMessage() {
-                return Optional.ofNullable(hermesMessage);
-            }
-
-            @Override
-            public String getBody() {
-                return body;
-            }
-
-            @Override
-            public String getHeader(String header) {
-                return headerSupplier.apply(header);
-            }
-
-            @Override
-            public String getProtocol() {
-                return protocol;
-            }
-        };
-    }
+  private int statusCode = -1;
+  private String body = "";
+  private String protocol = "http/1.1";
+  private Throwable failureCause;
+  private Function<String, String> headerSupplier = (header) -> null;
+  private HermesMessage hermesMessage;
+
+  public static HermesResponseBuilder hermesResponse(HermesMessage hermesMessage) {
+    return new HermesResponseBuilder().withHermesMessage(hermesMessage);
+  }
+
+  public static HermesResponse hermesFailureResponse(
+      Throwable exception, HermesMessage hermesMessage) {
+    return hermesResponse(hermesMessage).withFailureCause(exception).build();
+  }
+
+  public HermesResponseBuilder withHttpStatus(int statusCode) {
+    this.statusCode = statusCode;
+    return this;
+  }
+
+  public HermesResponseBuilder withBody(String body) {
+    this.body = body;
+    return this;
+  }
+
+  private HermesResponseBuilder withFailureCause(Throwable exception) {
+    this.failureCause = exception;
+    return this;
+  }
+
+  private HermesResponseBuilder withHermesMessage(HermesMessage hermesMessage) {
+    this.hermesMessage = hermesMessage;
+    return this;
+  }
+
+  public HermesResponseBuilder withHeaderSupplier(Function<String, String> headerSupplier) {
+    this.headerSupplier = headerSupplier;
+    return this;
+  }
+
+  public HermesResponseBuilder withProtocol(String protocol) {
+    this.protocol = protocol;
+    return this;
+  }
+
+  public HermesResponse build() {
+    return new HermesResponse() {
+
+      @Override
+      public int getHttpStatus() {
+        return statusCode;
+      }
+
+      @Override
+      public HermesMessage getHermesMessage() {
+        return hermesMessage;
+      }
+
+      @Override
+      public Optional<Throwable> getFailureCause() {
+        return Optional.ofNullable(failureCause);
+      }
+
+      @Override
+      public Optional<HermesMessage> getFailedMessage() {
+        return Optional.ofNullable(hermesMessage);
+      }
+
+      @Override
+      public String getBody() {
+        return body;
+      }
+
+      @Override
+      public String getHeader(String header) {
+        return headerSupplier.apply(header);
+      }
+
+      @Override
+      public String getProtocol() {
+        return protocol;
+      }
+    };
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesSender.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesSender.java
index a6b096dbc2..fe7fc2710f 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesSender.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/HermesSender.java
@@ -6,5 +6,5 @@
 @FunctionalInterface
 public interface HermesSender {
 
-    CompletableFuture<HermesResponse> send(URI uri, HermesMessage message);
+  CompletableFuture<HermesResponse> send(URI uri, HermesMessage message);
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/MessageDeliveryListener.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/MessageDeliveryListener.java
index bd5a1dcb82..139b706134 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/MessageDeliveryListener.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/MessageDeliveryListener.java
@@ -2,13 +2,13 @@
 
 public interface MessageDeliveryListener {
 
-    void onSend(HermesResponse response, long latency);
+  void onSend(HermesResponse response, long latency);
 
-    void onFailure(HermesResponse message, int attemptCount);
+  void onFailure(HermesResponse message, int attemptCount);
 
-    void onFailedRetry(HermesResponse message, int attemptCount);
+  void onFailedRetry(HermesResponse message, int attemptCount);
 
-    void onSuccessfulRetry(HermesResponse message, int attemptCount);
+  void onSuccessfulRetry(HermesResponse message, int attemptCount);
 
-    void onMaxRetriesExceeded(HermesResponse message, int attemptCount);
+  void onMaxRetriesExceeded(HermesResponse message, int attemptCount);
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClient.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClient.java
index 0702ecc198..f6ea952c6f 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClient.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClient.java
@@ -1,10 +1,8 @@
 package pl.allegro.tech.hermes.client;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Scheduler;
-import reactor.util.retry.Retry;
+import static pl.allegro.tech.hermes.client.HermesMessage.hermesMessage;
+import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesFailureResponse;
+import static reactor.core.Exceptions.isRetryExhausted;
 
 import java.net.URI;
 import java.time.Duration;
@@ -16,313 +14,330 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
-
-import static pl.allegro.tech.hermes.client.HermesMessage.hermesMessage;
-import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesFailureResponse;
-import static reactor.core.Exceptions.isRetryExhausted;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+import reactor.util.retry.Retry;
 
 public class ReactiveHermesClient {
-    private static final Logger logger = LoggerFactory.getLogger(ReactiveHermesClient.class);
-    private static final String RETRY_CONTEXT_KEY = "hermes-retry-context-key";
-
-    private final ReactiveHermesSender sender;
-    private final String uri;
-    private final Map<String, String> defaultHeaders;
-    private final AtomicInteger currentlySending = new AtomicInteger(0);
-    private final int maxRetries;
-    private final Predicate<HermesResponse> retryCondition;
-    private final Duration retrySleep;
-    private final Duration maxRetrySleep;
-    private final Double jitterFactor;
-    private final Scheduler scheduler;
-    private volatile boolean shutdown = false;
-    private final List<MessageDeliveryListener> messageDeliveryListeners;
-
-    ReactiveHermesClient(ReactiveHermesSender sender,
-                         URI uri,
-                         Map<String, String> defaultHeaders,
-                         int maxRetries,
-                         Predicate<HermesResponse> retryCondition,
-                         long retrySleepInMillis,
-                         long maxRetrySleepInMillis,
-                         double jitterFactor,
-                         Scheduler scheduler) {
-        this.sender = sender;
-        this.uri = createUri(uri);
-        this.defaultHeaders = Collections.unmodifiableMap(new HashMap<>(defaultHeaders));
-        this.maxRetries = maxRetries;
-        this.retryCondition = retryCondition;
-        this.retrySleep = Duration.ofMillis(retrySleepInMillis);
-        this.maxRetrySleep = Duration.ofMillis(maxRetrySleepInMillis);
-        this.jitterFactor = jitterFactor;
-        this.scheduler = scheduler;
-        this.messageDeliveryListeners = new ArrayList<>();
-    }
-
-    private String createUri(URI uri) {
-        String uriString = uri.toString();
-        return uriString + (uriString.endsWith("/") ? "" : "/") + "topics/";
-    }
-
-    public Mono<HermesResponse> publishJSON(String topic, byte[] message) {
-        return publish(hermesMessage(topic, message).json().build());
-    }
-
-    public Mono<HermesResponse> publishJSON(String topic, String message) {
-        return publish(hermesMessage(topic, message).json().build());
-    }
-
-    public Mono<HermesResponse> publishAvro(String topic, int schemaVersion, byte[] message) {
-        return publish(hermesMessage(topic, message).avro(schemaVersion).build());
-    }
-
-    public Mono<HermesResponse> publish(String topic, String message) {
-        return publish(hermesMessage(topic, message).build());
-    }
-
-    public Mono<HermesResponse> publish(String topic, String contentType, byte[] message) {
-        return publish(hermesMessage(topic, message).withContentType(contentType).build());
-    }
-
-    public Mono<HermesResponse> publish(String topic, String contentType, String message) {
-        return publish(hermesMessage(topic, message).withContentType(contentType).build());
-    }
-
-    public Mono<HermesResponse> publish(String topic, String contentType, int schemaVersion, byte[] message) {
-        return publish(hermesMessage(topic, message).withContentType(contentType).withSchemaVersion(schemaVersion).build());
-    }
-
-    public Mono<HermesResponse> publish(HermesMessage message) {
-        if (shutdown) {
-            return completedWithShutdownException();
-        }
-        HermesMessage.appendDefaults(message, defaultHeaders);
-        return publishWithRetries(message);
-    }
+  private static final Logger logger = LoggerFactory.getLogger(ReactiveHermesClient.class);
+  private static final String RETRY_CONTEXT_KEY = "hermes-retry-context-key";
+
+  private final ReactiveHermesSender sender;
+  private final String uri;
+  private final Map<String, String> defaultHeaders;
+  private final AtomicInteger currentlySending = new AtomicInteger(0);
+  private final int maxRetries;
+  private final Predicate<HermesResponse> retryCondition;
+  private final Duration retrySleep;
+  private final Duration maxRetrySleep;
+  private final Double jitterFactor;
+  private final Scheduler scheduler;
+  private volatile boolean shutdown = false;
+  private final List<MessageDeliveryListener> messageDeliveryListeners;
+
+  ReactiveHermesClient(
+      ReactiveHermesSender sender,
+      URI uri,
+      Map<String, String> defaultHeaders,
+      int maxRetries,
+      Predicate<HermesResponse> retryCondition,
+      long retrySleepInMillis,
+      long maxRetrySleepInMillis,
+      double jitterFactor,
+      Scheduler scheduler) {
+    this.sender = sender;
+    this.uri = createUri(uri);
+    this.defaultHeaders = Collections.unmodifiableMap(new HashMap<>(defaultHeaders));
+    this.maxRetries = maxRetries;
+    this.retryCondition = retryCondition;
+    this.retrySleep = Duration.ofMillis(retrySleepInMillis);
+    this.maxRetrySleep = Duration.ofMillis(maxRetrySleepInMillis);
+    this.jitterFactor = jitterFactor;
+    this.scheduler = scheduler;
+    this.messageDeliveryListeners = new ArrayList<>();
+  }
+
+  private String createUri(URI uri) {
+    String uriString = uri.toString();
+    return uriString + (uriString.endsWith("/") ? "" : "/") + "topics/";
+  }
+
+  public Mono<HermesResponse> publishJSON(String topic, byte[] message) {
+    return publish(hermesMessage(topic, message).json().build());
+  }
+
+  public Mono<HermesResponse> publishJSON(String topic, String message) {
+    return publish(hermesMessage(topic, message).json().build());
+  }
+
+  public Mono<HermesResponse> publishAvro(String topic, int schemaVersion, byte[] message) {
+    return publish(hermesMessage(topic, message).avro(schemaVersion).build());
+  }
+
+  public Mono<HermesResponse> publish(String topic, String message) {
+    return publish(hermesMessage(topic, message).build());
+  }
+
+  public Mono<HermesResponse> publish(String topic, String contentType, byte[] message) {
+    return publish(hermesMessage(topic, message).withContentType(contentType).build());
+  }
+
+  public Mono<HermesResponse> publish(String topic, String contentType, String message) {
+    return publish(hermesMessage(topic, message).withContentType(contentType).build());
+  }
+
+  public Mono<HermesResponse> publish(
+      String topic, String contentType, int schemaVersion, byte[] message) {
+    return publish(
+        hermesMessage(topic, message)
+            .withContentType(contentType)
+            .withSchemaVersion(schemaVersion)
+            .build());
+  }
+
+  public Mono<HermesResponse> publish(HermesMessage message) {
+    if (shutdown) {
+      return completedWithShutdownException();
+    }
+    HermesMessage.appendDefaults(message, defaultHeaders);
+    return publishWithRetries(message);
+  }
+
+  public boolean addMessageDeliveryListener(MessageDeliveryListener listener) {
+    return messageDeliveryListeners.add(listener);
+  }
+
+  private Mono<HermesResponse> publishWithRetries(HermesMessage message) {
+    currentlySending.incrementAndGet();
+    Mono<Result> sendOnceResult =
+        sendOnce(message)
+            .flatMap(this::testRetryCondition)
+            .onErrorResume(exception -> mapExceptionToFailedAttempt(exception, message))
+            .subscribeOn(scheduler);
+
+    return retry(sendOnceResult)
+        .doOnSuccess(
+            hr -> {
+              if (hr.response.isSuccess() || !hr.matchesRetryPolicy) {
+                handleSuccessfulRetry(hr.response, hr.attempt);
+              } else {
+                handleFailure(hr.response, hr.attempt);
+              }
+            })
+        .map(result -> result.response)
+        .doFinally(s -> currentlySending.decrementAndGet());
+  }
+
+  private Mono<Attempt> retry(Mono<Result> sendOnceResult) {
+    Retry retrySpec = prepareRetrySpec();
+    return sendOnceResult
+        .flatMap(this::unwrapFailedAttemptAsException)
+        .retryWhen(retrySpec)
+        .contextWrite(ctx -> ctx.put(RETRY_CONTEXT_KEY, HermesRetryContext.emptyRetryContext()))
+        .onErrorResume(Exception.class, this::unwrapRetryExhaustedException);
+  }
+
+  private Mono<Attempt> unwrapRetryExhaustedException(Exception exception) {
+    if (isRetryExhausted(exception)) {
+      RetryFailedException rfe = (RetryFailedException) (exception.getCause());
+      Failed failedAttempt = rfe.failed;
+      HermesResponse hermesResponse = failedAttempt.hermesResponse;
+      handleMaxRetriesExceeded(hermesResponse, failedAttempt.attempt);
+      Throwable cause = rfe.getCause();
+      if (cause instanceof ShouldRetryException) {
+        ShouldRetryException sre = (ShouldRetryException) cause;
+        return Mono.just((Attempt) Result.attempt(sre.hermesResponse, failedAttempt.attempt, true));
+      }
+      if (hermesResponse.isFailure()) {
+        handleFailure(hermesResponse, failedAttempt.attempt);
+      }
+    }
+    return Mono.error(exception);
+  }
+
+  private Mono<Attempt> unwrapFailedAttemptAsException(Result result) {
+    if (result instanceof Failed) {
+      Failed failed = (Failed) result;
+      return Mono.error(new RetryFailedException(failed));
+    } else {
+      return Mono.just((Attempt) result);
+    }
+  }
+
+  private Mono<Result> mapExceptionToFailedAttempt(
+      Throwable throwable, HermesMessage hermesMessage) {
+    return getNextAttempt()
+        .map(attempt -> Result.failureByException(throwable, hermesMessage, attempt));
+  }
+
+  private Mono<Result> testRetryCondition(HermesResponse response) {
+    return getNextAttempt()
+        .map(
+            attempt -> {
+              if (retryCondition.test(response)) {
+                return Result.retryableFailure(response, attempt);
+              } else {
+                return Result.attempt(response, attempt, false);
+              }
+            });
+  }
+
+  private Retry prepareRetrySpec() {
+    if (retrySleep.isZero()) {
+      return Retry.max(maxRetries).doAfterRetry(this::handleRetryAttempt);
+    } else {
+      return Retry.backoff(maxRetries, retrySleep)
+          .maxBackoff(maxRetrySleep)
+          .jitter(jitterFactor)
+          .doAfterRetry(this::handleRetryAttempt);
+    }
+  }
+
+  private void handleRetryAttempt(Retry.RetrySignal retrySignal) {
+    RetryFailedException failedException = (RetryFailedException) retrySignal.failure();
+    handleFailedAttempt(failedException.failed.hermesResponse, retrySignal.totalRetries() + 1);
+  }
+
+  private Mono<Integer> getNextAttempt() {
+    return Mono.deferContextual(Mono::just)
+        .map(
+            ctx ->
+                ctx.getOrDefault(RETRY_CONTEXT_KEY, HermesRetryContext.emptyRetryContext())
+                    .getAndIncrementAttempt());
+  }
+
+  private Mono<HermesResponse> sendOnce(HermesMessage message) {
+    return Mono.defer(
+        () -> {
+          long startTime = System.nanoTime();
+          try {
+            return sender
+                .sendReactively(URI.create(uri + message.getTopic()), message)
+                .onErrorResume(e -> Mono.just(hermesFailureResponse(e, message)))
+                .doOnNext(
+                    resp -> {
+                      long latency = System.nanoTime() - startTime;
+                      messageDeliveryListeners.forEach(l -> l.onSend(resp, latency));
+                    });
+
+          } catch (Exception e) {
+            return Mono.error(e);
+          }
+        });
+  }
+
+  private Mono<HermesResponse> completedWithShutdownException() {
+    return Mono.error(new HermesClientShutdownException());
+  }
+
+  public Mono<Void> closeAsync(long pollInterval) {
+    shutdown = true;
+    CompletableFuture<Void> voidCompletableFuture =
+        new HermesClientTermination(pollInterval)
+            .observe(() -> currentlySending.get() == 0)
+            .whenComplete((response, ex) -> scheduler.dispose());
+    return Mono.fromFuture(voidCompletableFuture);
+  }
+
+  public void close(long pollInterval, long timeout) {
+    closeAsync(pollInterval).block(Duration.ofMillis(timeout));
+  }
+
+  private void handleMaxRetriesExceeded(HermesResponse response, int attemptCount) {
+    messageDeliveryListeners.forEach(l -> l.onMaxRetriesExceeded(response, attemptCount));
+    logger.error(
+        "Failed to send message to topic {} after {} attempts",
+        response.getHermesMessage().getTopic(),
+        attemptCount);
+  }
+
+  private void handleFailedAttempt(HermesResponse response, long attemptCount) {
+    messageDeliveryListeners.forEach(l -> l.onFailedRetry(response, (int) attemptCount));
+  }
+
+  private void handleFailure(HermesResponse response, long attemptCount) {
+    messageDeliveryListeners.forEach(l -> l.onFailure(response, (int) attemptCount));
+  }
+
+  private void handleSuccessfulRetry(HermesResponse response, long attemptCount) {
+    messageDeliveryListeners.forEach(l -> l.onSuccessfulRetry(response, (int) attemptCount));
+  }
+
+  private static class ShouldRetryException extends Exception {
+    private final HermesResponse hermesResponse;
+
+    public ShouldRetryException(HermesResponse hermesResponse) {
+      this.hermesResponse = hermesResponse;
+    }
+
+    public HermesResponse getHermesResponse() {
+      return hermesResponse;
+    }
+  }
+
+  private static class RetryFailedException extends Exception {
+    private final Failed failed;
 
-    public boolean addMessageDeliveryListener(MessageDeliveryListener listener) {
-        return messageDeliveryListeners.add(listener);
+    public RetryFailedException(Failed failed) {
+      super(failed.cause);
+      this.failed = failed;
     }
+  }
 
-    private Mono<HermesResponse> publishWithRetries(HermesMessage message) {
-        currentlySending.incrementAndGet();
-        Mono<Result> sendOnceResult = sendOnce(message)
-                .flatMap(this::testRetryCondition)
-                .onErrorResume(exception -> mapExceptionToFailedAttempt(exception, message))
-                .subscribeOn(scheduler);
-
-        return retry(sendOnceResult)
-                .doOnSuccess(hr -> {
-                    if (hr.response.isSuccess() || !hr.matchesRetryPolicy) {
-                        handleSuccessfulRetry(hr.response, hr.attempt);
-                    } else {
-                        handleFailure(hr.response, hr.attempt);
-                    }
-                })
-                .map(result -> result.response)
-                .doFinally(s -> currentlySending.decrementAndGet());
+  private interface Result {
+    static Result attempt(HermesResponse response, int attempt, boolean qualifiedForRetry) {
+      return new Attempt(response, attempt, qualifiedForRetry);
     }
 
-    private Mono<Attempt> retry(Mono<Result> sendOnceResult) {
-        Retry retrySpec = prepareRetrySpec();
-        return sendOnceResult
-                .flatMap(this::unwrapFailedAttemptAsException)
-                .retryWhen(retrySpec)
-                .contextWrite(ctx -> ctx.put(RETRY_CONTEXT_KEY, HermesRetryContext.emptyRetryContext()))
-                .onErrorResume(Exception.class, this::unwrapRetryExhaustedException);
+    static Result retryableFailure(HermesResponse response, int attempt) {
+      return new Failed(response, attempt, new ShouldRetryException(response));
     }
 
-    private Mono<Attempt> unwrapRetryExhaustedException(Exception exception) {
-        if (isRetryExhausted(exception)) {
-            RetryFailedException rfe = (RetryFailedException) (exception.getCause());
-            Failed failedAttempt = rfe.failed;
-            HermesResponse hermesResponse = failedAttempt.hermesResponse;
-            handleMaxRetriesExceeded(hermesResponse, failedAttempt.attempt);
-            Throwable cause = rfe.getCause();
-            if (cause instanceof ShouldRetryException) {
-                ShouldRetryException sre = (ShouldRetryException) cause;
-                return Mono.just((Attempt) Result.attempt(sre.hermesResponse, failedAttempt.attempt, true));
-            }
-            if (hermesResponse.isFailure()) {
-                handleFailure(hermesResponse, failedAttempt.attempt);
-            }
-        }
-        return Mono.error(exception);
+    static Result failureByException(
+        Throwable throwable, HermesMessage hermesMessage, int attempt) {
+      return new Failed(hermesFailureResponse(throwable, hermesMessage), attempt, throwable);
     }
+  }
 
-    private Mono<Attempt> unwrapFailedAttemptAsException(Result result) {
-        if (result instanceof Failed) {
-            Failed failed = (Failed) result;
-            return Mono.error(new RetryFailedException(failed));
-        } else {
-            return Mono.just((Attempt) result);
-        }
-    }
-
-    private Mono<Result> mapExceptionToFailedAttempt(Throwable throwable, HermesMessage hermesMessage) {
-        return getNextAttempt().map(attempt -> Result.failureByException(throwable, hermesMessage, attempt));
-    }
-
-    private Mono<Result> testRetryCondition(HermesResponse response) {
-        return getNextAttempt()
-                .map(attempt -> {
-                    if (retryCondition.test(response)) {
-                        return Result.retryableFailure(response, attempt);
-                    } else {
-                        return Result.attempt(response, attempt, false);
-                    }
-                });
-    }
+  private static class Attempt implements Result {
+    private final HermesResponse response;
+    private final int attempt;
+    private final boolean matchesRetryPolicy;
 
-    private Retry prepareRetrySpec() {
-        if (retrySleep.isZero()) {
-            return Retry.max(maxRetries)
-                    .doAfterRetry(this::handleRetryAttempt);
-        } else {
-            return Retry.backoff(maxRetries, retrySleep)
-                    .maxBackoff(maxRetrySleep)
-                    .jitter(jitterFactor)
-                    .doAfterRetry(this::handleRetryAttempt);
-        }
+    private Attempt(HermesResponse response, int attempt, boolean matchesRetryPolicy) {
+      this.response = response;
+      this.attempt = attempt;
+      this.matchesRetryPolicy = matchesRetryPolicy;
     }
+  }
 
-    private void handleRetryAttempt(Retry.RetrySignal retrySignal) {
-        RetryFailedException failedException = (RetryFailedException) retrySignal.failure();
-        handleFailedAttempt(failedException.failed.hermesResponse, retrySignal.totalRetries() + 1);
-    }
+  private static class Failed implements Result {
+    private final HermesResponse hermesResponse;
+    private final int attempt;
+    private final Throwable cause;
 
-    private Mono<Integer> getNextAttempt() {
-        return Mono.deferContextual(Mono::just)
-                .map(ctx -> ctx.getOrDefault(RETRY_CONTEXT_KEY, HermesRetryContext.emptyRetryContext())
-                        .getAndIncrementAttempt()
-                );
+    private Failed(HermesResponse hermesResponse, int attempt, Throwable cause) {
+      this.attempt = attempt;
+      this.cause = cause;
+      this.hermesResponse = hermesResponse;
     }
+  }
 
-    private Mono<HermesResponse> sendOnce(HermesMessage message) {
-        return Mono.defer(() -> {
-                    long startTime = System.nanoTime();
-                    try {
-                        return sender.sendReactively(URI.create(uri + message.getTopic()), message)
-                                .onErrorResume(e -> Mono.just(hermesFailureResponse(e, message)))
-                                .doOnNext(resp -> {
-                                    long latency = System.nanoTime() - startTime;
-                                    messageDeliveryListeners.forEach(l -> l.onSend(resp, latency));
-                                });
-
-                    } catch (Exception e) {
-                        return Mono.error(e);
-                    }
-                }
-        );
+  private static class HermesRetryContext {
+    static HermesRetryContext emptyRetryContext() {
+      return new HermesRetryContext();
     }
 
-    private Mono<HermesResponse> completedWithShutdownException() {
-        return Mono.error(new HermesClientShutdownException());
-    }
+    private int attempt;
 
-    public Mono<Void> closeAsync(long pollInterval) {
-        shutdown = true;
-        CompletableFuture<Void> voidCompletableFuture = new HermesClientTermination(pollInterval)
-                .observe(() -> currentlySending.get() == 0)
-                .whenComplete((response, ex) -> scheduler.dispose());
-        return Mono.fromFuture(voidCompletableFuture);
+    HermesRetryContext() {
+      attempt = 1;
     }
 
-    public void close(long pollInterval, long timeout) {
-        closeAsync(pollInterval).block(Duration.ofMillis(timeout));
-    }
-
-    private void handleMaxRetriesExceeded(HermesResponse response, int attemptCount) {
-        messageDeliveryListeners.forEach(l -> l.onMaxRetriesExceeded(response, attemptCount));
-        logger.error("Failed to send message to topic {} after {} attempts",
-                response.getHermesMessage().getTopic(), attemptCount);
-    }
-
-    private void handleFailedAttempt(HermesResponse response, long attemptCount) {
-        messageDeliveryListeners.forEach(l -> l.onFailedRetry(response, (int) attemptCount));
-    }
-
-    private void handleFailure(HermesResponse response, long attemptCount) {
-        messageDeliveryListeners.forEach(l -> l.onFailure(response, (int) attemptCount));
-    }
-
-    private void handleSuccessfulRetry(HermesResponse response, long attemptCount) {
-        messageDeliveryListeners.forEach(l -> l.onSuccessfulRetry(response, (int) attemptCount));
-    }
-
-    private static class ShouldRetryException extends Exception {
-        private final HermesResponse hermesResponse;
-
-        public ShouldRetryException(HermesResponse hermesResponse) {
-            this.hermesResponse = hermesResponse;
-        }
-
-        public HermesResponse getHermesResponse() {
-            return hermesResponse;
-        }
-    }
-
-    private static class RetryFailedException extends Exception {
-        private final Failed failed;
-
-        public RetryFailedException(Failed failed) {
-            super(failed.cause);
-            this.failed = failed;
-        }
-    }
-
-    private interface Result {
-        static Result attempt(HermesResponse response, int attempt, boolean qualifiedForRetry) {
-            return new Attempt(response, attempt, qualifiedForRetry);
-        }
-
-        static Result retryableFailure(HermesResponse response, int attempt) {
-            return new Failed(response, attempt, new ShouldRetryException(response));
-        }
-
-        static Result failureByException(Throwable throwable, HermesMessage hermesMessage, int attempt) {
-            return new Failed(hermesFailureResponse(throwable, hermesMessage), attempt, throwable);
-        }
-    }
-
-    private static class Attempt implements Result {
-        private final HermesResponse response;
-        private final int attempt;
-        private final boolean matchesRetryPolicy;
-
-        private Attempt(HermesResponse response, int attempt, boolean matchesRetryPolicy) {
-            this.response = response;
-            this.attempt = attempt;
-            this.matchesRetryPolicy = matchesRetryPolicy;
-        }
-    }
-
-    private static class Failed implements Result {
-        private final HermesResponse hermesResponse;
-        private final int attempt;
-        private final Throwable cause;
-
-        private Failed(HermesResponse hermesResponse, int attempt, Throwable cause) {
-            this.attempt = attempt;
-            this.cause = cause;
-            this.hermesResponse = hermesResponse;
-        }
-    }
-
-    private static class HermesRetryContext {
-        static HermesRetryContext emptyRetryContext() {
-            return new HermesRetryContext();
-        }
-
-        private int attempt;
-
-        HermesRetryContext() {
-            attempt = 1;
-        }
-
-        int getAndIncrementAttempt() {
-            return attempt++;
-        }
+    int getAndIncrementAttempt() {
+      return attempt++;
     }
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClientBuilder.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClientBuilder.java
index 1303acd49a..c25da59ab0 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClientBuilder.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClientBuilder.java
@@ -1,10 +1,5 @@
 package pl.allegro.tech.hermes.client;
 
-import pl.allegro.tech.hermes.client.metrics.MetricsMessageDeliveryListener;
-import pl.allegro.tech.hermes.client.metrics.MetricsProvider;
-import reactor.core.scheduler.Scheduler;
-import reactor.core.scheduler.Schedulers;
-
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
@@ -12,88 +7,106 @@
 import java.util.concurrent.Executors;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import pl.allegro.tech.hermes.client.metrics.MetricsMessageDeliveryListener;
+import pl.allegro.tech.hermes.client.metrics.MetricsProvider;
+import reactor.core.scheduler.Scheduler;
+import reactor.core.scheduler.Schedulers;
 
 public class ReactiveHermesClientBuilder {
 
-    private final ReactiveHermesSender sender;
-    private URI uri = URI.create("http://localhost:8080");
-    private final Map<String, String> defaultHeaders = new HashMap<>();
-    private int retries = 3;
-    private Predicate<HermesResponse> retryCondition = new HermesClientBasicRetryCondition();
-    private long retrySleepInMillis = 100;
-    private long maxRetrySleepInMillis = 300;
-    private double jitterFactor = 0.5d;
-    private Supplier<Scheduler> schedulerFactory = () -> Schedulers.fromExecutor(Executors.newSingleThreadScheduledExecutor());
-    private Optional<MetricsProvider> metrics = Optional.empty();
-
-    public ReactiveHermesClientBuilder(ReactiveHermesSender sender) {
-        this.sender = sender;
-        this.defaultHeaders.put(HermesMessage.CONTENT_TYPE_HEADER, HermesMessage.APPLICATION_JSON);
-    }
-
-    public static ReactiveHermesClientBuilder hermesClient(ReactiveHermesSender sender) {
-        return new ReactiveHermesClientBuilder(sender);
-    }
-
-    public ReactiveHermesClient build() {
-        ReactiveHermesClient hermesClient = new ReactiveHermesClient(sender, uri, defaultHeaders, retries, retryCondition,
-                retrySleepInMillis, maxRetrySleepInMillis, jitterFactor, schedulerFactory.get());
-
-        metrics.ifPresent((metricsProvider) -> {
-            hermesClient.addMessageDeliveryListener(new MetricsMessageDeliveryListener(metricsProvider));
+  private final ReactiveHermesSender sender;
+  private URI uri = URI.create("http://localhost:8080");
+  private final Map<String, String> defaultHeaders = new HashMap<>();
+  private int retries = 3;
+  private Predicate<HermesResponse> retryCondition = new HermesClientBasicRetryCondition();
+  private long retrySleepInMillis = 100;
+  private long maxRetrySleepInMillis = 300;
+  private double jitterFactor = 0.5d;
+  private Supplier<Scheduler> schedulerFactory =
+      () -> Schedulers.fromExecutor(Executors.newSingleThreadScheduledExecutor());
+  private Optional<MetricsProvider> metrics = Optional.empty();
+
+  public ReactiveHermesClientBuilder(ReactiveHermesSender sender) {
+    this.sender = sender;
+    this.defaultHeaders.put(HermesMessage.CONTENT_TYPE_HEADER, HermesMessage.APPLICATION_JSON);
+  }
+
+  public static ReactiveHermesClientBuilder hermesClient(ReactiveHermesSender sender) {
+    return new ReactiveHermesClientBuilder(sender);
+  }
+
+  public ReactiveHermesClient build() {
+    ReactiveHermesClient hermesClient =
+        new ReactiveHermesClient(
+            sender,
+            uri,
+            defaultHeaders,
+            retries,
+            retryCondition,
+            retrySleepInMillis,
+            maxRetrySleepInMillis,
+            jitterFactor,
+            schedulerFactory.get());
+
+    metrics.ifPresent(
+        (metricsProvider) -> {
+          hermesClient.addMessageDeliveryListener(
+              new MetricsMessageDeliveryListener(metricsProvider));
         });
 
-        return hermesClient;
-    }
-
-    public ReactiveHermesClientBuilder withURI(URI uri) {
-        this.uri = uri;
-        return this;
-    }
-
-    public ReactiveHermesClientBuilder withMetrics(MetricsProvider metrics) {
-        this.metrics = Optional.of(metrics);
-        return this;
-    }
-
-    public ReactiveHermesClientBuilder withDefaultContentType(String defaultContentType) {
-        defaultHeaders.put(HermesMessage.CONTENT_TYPE_HEADER, defaultContentType);
-        return this;
-    }
-
-    public ReactiveHermesClientBuilder withDefaultHeaderValue(String header, String value) {
-        defaultHeaders.put(header, value);
-        return this;
-    }
-
-    public ReactiveHermesClientBuilder withRetries(int retries) {
-        this.retries = retries;
-        return this;
-    }
-
-    public ReactiveHermesClientBuilder withRetries(int retries, Predicate<HermesResponse> retryCondition) {
-        this.retryCondition = retryCondition;
-        return withRetries(retries);
-    }
-
-    public ReactiveHermesClientBuilder withRetrySleep(long retrySleepInMillis) {
-        this.retrySleepInMillis = retrySleepInMillis;
-        return this;
-    }
-
-    public ReactiveHermesClientBuilder withRetrySleep(long retrySleepInMillis, long maxRetrySleepInMillis) {
-        this.retrySleepInMillis = retrySleepInMillis;
-        this.maxRetrySleepInMillis = maxRetrySleepInMillis;
-        return this;
-    }
-
-    public ReactiveHermesClientBuilder withScheduler(Scheduler scheduler) {
-        this.schedulerFactory = () -> scheduler;
-        return this;
-    }
-
-    public ReactiveHermesClientBuilder withJitter(Double jitterFactor) {
-        this.jitterFactor = jitterFactor;
-        return this;
-    }
+    return hermesClient;
+  }
+
+  public ReactiveHermesClientBuilder withURI(URI uri) {
+    this.uri = uri;
+    return this;
+  }
+
+  public ReactiveHermesClientBuilder withMetrics(MetricsProvider metrics) {
+    this.metrics = Optional.of(metrics);
+    return this;
+  }
+
+  public ReactiveHermesClientBuilder withDefaultContentType(String defaultContentType) {
+    defaultHeaders.put(HermesMessage.CONTENT_TYPE_HEADER, defaultContentType);
+    return this;
+  }
+
+  public ReactiveHermesClientBuilder withDefaultHeaderValue(String header, String value) {
+    defaultHeaders.put(header, value);
+    return this;
+  }
+
+  public ReactiveHermesClientBuilder withRetries(int retries) {
+    this.retries = retries;
+    return this;
+  }
+
+  public ReactiveHermesClientBuilder withRetries(
+      int retries, Predicate<HermesResponse> retryCondition) {
+    this.retryCondition = retryCondition;
+    return withRetries(retries);
+  }
+
+  public ReactiveHermesClientBuilder withRetrySleep(long retrySleepInMillis) {
+    this.retrySleepInMillis = retrySleepInMillis;
+    return this;
+  }
+
+  public ReactiveHermesClientBuilder withRetrySleep(
+      long retrySleepInMillis, long maxRetrySleepInMillis) {
+    this.retrySleepInMillis = retrySleepInMillis;
+    this.maxRetrySleepInMillis = maxRetrySleepInMillis;
+    return this;
+  }
+
+  public ReactiveHermesClientBuilder withScheduler(Scheduler scheduler) {
+    this.schedulerFactory = () -> scheduler;
+    return this;
+  }
+
+  public ReactiveHermesClientBuilder withJitter(Double jitterFactor) {
+    this.jitterFactor = jitterFactor;
+    return this;
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesSender.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesSender.java
index b500ed1257..e538458c87 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesSender.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesSender.java
@@ -1,11 +1,10 @@
 package pl.allegro.tech.hermes.client;
 
-import reactor.core.publisher.Mono;
-
 import java.net.URI;
+import reactor.core.publisher.Mono;
 
 @FunctionalInterface
 public interface ReactiveHermesSender {
 
-    Mono<HermesResponse> sendReactively(URI uri, HermesMessage message);
+  Mono<HermesResponse> sendReactively(URI uri, HermesMessage message);
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/jersey/JerseyHermesSender.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/jersey/JerseyHermesSender.java
index 3d59d58548..7b21121f57 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/jersey/JerseyHermesSender.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/jersey/JerseyHermesSender.java
@@ -1,52 +1,53 @@
 package pl.allegro.tech.hermes.client.jersey;
 
+import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesResponse;
+
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.client.Invocation;
 import jakarta.ws.rs.client.InvocationCallback;
 import jakarta.ws.rs.core.Response;
+import java.net.URI;
+import java.util.concurrent.CompletableFuture;
 import pl.allegro.tech.hermes.client.HermesMessage;
 import pl.allegro.tech.hermes.client.HermesResponse;
 import pl.allegro.tech.hermes.client.HermesSender;
 
-import java.net.URI;
-import java.util.concurrent.CompletableFuture;
-
-import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesResponse;
-
 public class JerseyHermesSender implements HermesSender {
-    private final Client client;
-
-    public JerseyHermesSender(Client client) {
-        this.client = client;
-    }
-
-    @Override
-    public CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
-        CompletableFuture<HermesResponse> future = new CompletableFuture<>();
-        Invocation.Builder builder = client.target(uri).request();
-        message.consumeHeaders(builder::header);
-        builder.async()
-                .post(Entity.entity(message.getBody(), message.getContentType()),
-                        new InvocationCallback<Response>() {
-                            @Override
-                            public void completed(Response response) {
-                                future.complete(fromJerseyResponse(message, response));
-                            }
-
-                            @Override
-                            public void failed(Throwable exception) {
-                                future.completeExceptionally(exception);
-                            }
-                        });
-        return future;
-    }
-
-    private HermesResponse fromJerseyResponse(HermesMessage message, Response response) {
-        return hermesResponse(message)
-                .withHttpStatus(response.getStatus())
-                .withBody(response.readEntity(String.class))
-                .withHeaderSupplier(response::getHeaderString)
-                .build();
-    }
+  private final Client client;
+
+  public JerseyHermesSender(Client client) {
+    this.client = client;
+  }
+
+  @Override
+  public CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
+    CompletableFuture<HermesResponse> future = new CompletableFuture<>();
+    Invocation.Builder builder = client.target(uri).request();
+    message.consumeHeaders(builder::header);
+    builder
+        .async()
+        .post(
+            Entity.entity(message.getBody(), message.getContentType()),
+            new InvocationCallback<Response>() {
+              @Override
+              public void completed(Response response) {
+                future.complete(fromJerseyResponse(message, response));
+              }
+
+              @Override
+              public void failed(Throwable exception) {
+                future.completeExceptionally(exception);
+              }
+            });
+    return future;
+  }
+
+  private HermesResponse fromJerseyResponse(HermesMessage message, Response response) {
+    return hermesResponse(message)
+        .withHttpStatus(response.getStatus())
+        .withBody(response.readEntity(String.class))
+        .withHeaderSupplier(response::getHeaderString)
+        .build();
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/DropwizardMetricsProvider.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/DropwizardMetricsProvider.java
deleted file mode 100644
index ded184d90e..0000000000
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/DropwizardMetricsProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package pl.allegro.tech.hermes.client.metrics;
-
-import com.codahale.metrics.MetricRegistry;
-
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-public class DropwizardMetricsProvider implements MetricsProvider {
-
-    private final MetricRegistry metrics;
-
-
-    public DropwizardMetricsProvider(MetricRegistry metrics) {
-        this.metrics = metrics;
-    }
-
-    @Override
-    public void counterIncrement(String topic, String key) {
-        metrics.counter(prefix + topic + "." + key).inc();
-    }
-
-    @Override
-    public void counterIncrement(String topic, String key, Map<String, String> tags) {
-        counterIncrement(topic, buildCounterName(key, tags));
-    }
-
-    @Override
-    public void timerRecord(String topic, String key, long duration, TimeUnit unit) {
-        metrics.timer(prefix + topic + "." + key).update(duration, unit);
-    }
-
-    @Override
-    public void histogramUpdate(String topic, String key, int value) {
-        metrics.histogram(prefix + topic + "." + key).update(value);
-    }
-
-    private String buildCounterName(String key, Map<String, String> tags) {
-        return key + "." + String.join(".", tags.values());
-    }
-}
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsMessageDeliveryListener.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsMessageDeliveryListener.java
index 7f72a5ce1f..5fedec10dd 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsMessageDeliveryListener.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsMessageDeliveryListener.java
@@ -1,77 +1,76 @@
 package pl.allegro.tech.hermes.client.metrics;
 
-import pl.allegro.tech.hermes.client.HermesMessage;
-import pl.allegro.tech.hermes.client.HermesResponse;
-import pl.allegro.tech.hermes.client.MessageDeliveryListener;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 import java.util.HashMap;
 import java.util.Map;
-
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import pl.allegro.tech.hermes.client.HermesMessage;
+import pl.allegro.tech.hermes.client.HermesResponse;
+import pl.allegro.tech.hermes.client.MessageDeliveryListener;
 
 public class MetricsMessageDeliveryListener implements MessageDeliveryListener {
-    private final MetricsProvider metrics;
-
-    public MetricsMessageDeliveryListener(MetricsProvider metrics) {
-        this.metrics = metrics;
-    }
-
-    @Override
-    public void onSend(HermesResponse response, long latency) {
-        HermesMessage message = response.getHermesMessage();
-        String topic = MetricsUtils.sanitizeTopic(message.getTopic());
-
-        metrics.timerRecord(topic, "latency", latency, NANOSECONDS);
-        Map<String, String> tags = new HashMap<>();
-        tags.put("code", String.valueOf(response.getHttpStatus()));
-        metrics.counterIncrement(topic, "status", tags);
-
-        counterIncrementIf(topic, "publish.failure", response.isFailure());
-    }
-
-    @Override
-    public void onFailure(HermesResponse response, int attemptCount) {
-        String topic = MetricsUtils.sanitizeTopic(response.getHermesMessage().getTopic());
-        metrics.counterIncrement(topic, "failure");
-    }
-
-    @Override
-    public void onFailedRetry(HermesResponse response, int attemptCount) {
-        String topic = MetricsUtils.sanitizeTopic(response.getHermesMessage().getTopic());
-        metrics.counterIncrement(topic, "retries.count");
-        metrics.counterIncrement(topic, "failure");
-
-        metrics.counterIncrement(topic, "publish.retry.failure");
-    }
-
-    @Override
-    public void onSuccessfulRetry(HermesResponse response, int attemptCount) {
-        String topic = MetricsUtils.sanitizeTopic(response.getHermesMessage().getTopic());
-        metrics.counterIncrement(topic,  "retries.success");
-        metrics.histogramUpdate(topic, "retries.attempts", attemptCount - 1);
-
-        boolean wasRetried = attemptCount > 1;
-
-        metrics.counterIncrement(topic, "publish.attempt");
-        counterIncrementIf(topic, "publish.retry.success", response.isSuccess() && wasRetried);
-        counterIncrementIf(topic, "publish.finally.success", response.isSuccess());
-        counterIncrementIf(topic, "publish.retry.failure", response.isFailure() && wasRetried);
-        counterIncrementIf(topic, "publish.finally.failure", response.isFailure());
-        counterIncrementIf(topic, "publish.retry.attempt", wasRetried);
-    }
-
-    @Override
-    public void onMaxRetriesExceeded(HermesResponse response, int attemptCount) {
-        String topic = MetricsUtils.sanitizeTopic(response.getHermesMessage().getTopic());
-        metrics.counterIncrement(topic, "retries.exhausted");
-        metrics.counterIncrement(topic, "publish.finally.failure");
-        metrics.counterIncrement(topic, "publish.attempt");
-        metrics.counterIncrement(topic, "publish.retry.attempt");
-    }
-
-    private void counterIncrementIf(String topic, String name, boolean condition) {
-        if (condition) {
-            metrics.counterIncrement(topic, name);
-        }
+  private final MetricsProvider metrics;
+
+  public MetricsMessageDeliveryListener(MetricsProvider metrics) {
+    this.metrics = metrics;
+  }
+
+  @Override
+  public void onSend(HermesResponse response, long latency) {
+    HermesMessage message = response.getHermesMessage();
+    String topic = MetricsUtils.sanitizeTopic(message.getTopic());
+
+    metrics.timerRecord(topic, "latency", latency, NANOSECONDS);
+    Map<String, String> tags = new HashMap<>();
+    tags.put("code", String.valueOf(response.getHttpStatus()));
+    metrics.counterIncrement(topic, "status", tags);
+
+    counterIncrementIf(topic, "publish.failure", response.isFailure());
+  }
+
+  @Override
+  public void onFailure(HermesResponse response, int attemptCount) {
+    String topic = MetricsUtils.sanitizeTopic(response.getHermesMessage().getTopic());
+    metrics.counterIncrement(topic, "failure");
+  }
+
+  @Override
+  public void onFailedRetry(HermesResponse response, int attemptCount) {
+    String topic = MetricsUtils.sanitizeTopic(response.getHermesMessage().getTopic());
+    metrics.counterIncrement(topic, "retries.count");
+    metrics.counterIncrement(topic, "failure");
+
+    metrics.counterIncrement(topic, "publish.retry.failure");
+  }
+
+  @Override
+  public void onSuccessfulRetry(HermesResponse response, int attemptCount) {
+    String topic = MetricsUtils.sanitizeTopic(response.getHermesMessage().getTopic());
+    metrics.counterIncrement(topic, "retries.success");
+    metrics.histogramUpdate(topic, "retries.attempts", attemptCount - 1);
+
+    boolean wasRetried = attemptCount > 1;
+
+    metrics.counterIncrement(topic, "publish.attempt");
+    counterIncrementIf(topic, "publish.retry.success", response.isSuccess() && wasRetried);
+    counterIncrementIf(topic, "publish.finally.success", response.isSuccess());
+    counterIncrementIf(topic, "publish.retry.failure", response.isFailure() && wasRetried);
+    counterIncrementIf(topic, "publish.finally.failure", response.isFailure());
+    counterIncrementIf(topic, "publish.retry.attempt", wasRetried);
+  }
+
+  @Override
+  public void onMaxRetriesExceeded(HermesResponse response, int attemptCount) {
+    String topic = MetricsUtils.sanitizeTopic(response.getHermesMessage().getTopic());
+    metrics.counterIncrement(topic, "retries.exhausted");
+    metrics.counterIncrement(topic, "publish.finally.failure");
+    metrics.counterIncrement(topic, "publish.attempt");
+    metrics.counterIncrement(topic, "publish.retry.attempt");
+  }
+
+  private void counterIncrementIf(String topic, String name, boolean condition) {
+    if (condition) {
+      metrics.counterIncrement(topic, name);
     }
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsProvider.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsProvider.java
index 4f077e66d7..52e997ece7 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsProvider.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsProvider.java
@@ -5,13 +5,13 @@
 
 public interface MetricsProvider {
 
-    String prefix = "hermes-client.";
+  String prefix = "hermes-client.";
 
-    void counterIncrement(String topic, String key);
+  void counterIncrement(String topic, String key);
 
-    void counterIncrement(String topic, String key, Map<String, String> tags);
+  void counterIncrement(String topic, String key, Map<String, String> tags);
 
-    void timerRecord(String topic, String key, long duration, TimeUnit unit);
+  void timerRecord(String topic, String key, long duration, TimeUnit unit);
 
-    void histogramUpdate(String topic, String key, int value);
+  void histogramUpdate(String topic, String key, int value);
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsUtils.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsUtils.java
index cfb1da88b9..cb2744d01b 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsUtils.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MetricsUtils.java
@@ -2,10 +2,10 @@
 
 class MetricsUtils {
 
-    static String sanitizeTopic(String topic) {
-        int lastDot = topic.lastIndexOf(".");
-        char[] sanitized = topic.replaceAll("\\.", "_").toCharArray();
-        sanitized[lastDot] = '.';
-        return String.valueOf(sanitized);
-    }
+  static String sanitizeTopic(String topic) {
+    int lastDot = topic.lastIndexOf(".");
+    char[] sanitized = topic.replaceAll("\\.", "_").toCharArray();
+    sanitized[lastDot] = '.';
+    return String.valueOf(sanitized);
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MicrometerTaggedMetricsProvider.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MicrometerTaggedMetricsProvider.java
index f25ddee79f..a3dfdc2d78 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MicrometerTaggedMetricsProvider.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/metrics/MicrometerTaggedMetricsProvider.java
@@ -3,7 +3,6 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -11,47 +10,59 @@
 
 public class MicrometerTaggedMetricsProvider implements MetricsProvider {
 
-    private final MeterRegistry metrics;
-
-    public MicrometerTaggedMetricsProvider(MeterRegistry metrics) {
-        this.metrics = metrics;
-    }
-
-    @Override
-    public void counterIncrement(String topic, String key) {
-        counterIncrement(topic, key, new HashMap<>());
-    }
-
-    @Override
-    public void counterIncrement(String topic, String key, Map<String, String> tags) {
-        tags.put("topic", topic);
-        metrics.counter(buildCounterName(key), Tags.of(tags.entrySet().stream()
-               .map(e -> Tag.of(e.getKey(), e.getValue()))
-               .collect(Collectors.toSet())))
-               .increment();
-    }
-
-    @Override
-    public void timerRecord(String topic, String key, long duration, TimeUnit unit) {
-        Map<String, String> tags = new HashMap<>();
-        tags.put("topic", topic);
-        metrics.timer(buildCounterName(key), Tags.of(tags.entrySet().stream()
-                .map(e -> Tag.of(e.getKey(), e.getValue()))
-                .collect(Collectors.toSet())))
-                .record(duration, unit);
-    }
-
-    @Override
-    public void histogramUpdate(String topic, String key, int value) {
-        Map<String, String> tags = new HashMap<>();
-        tags.put("topic", topic);
-        metrics.summary(buildCounterName(key), Tags.of(tags.entrySet().stream()
-                .map(e -> Tag.of(e.getKey(), e.getValue()))
-                .collect(Collectors.toSet())))
-                .record(value);
-    }
-
-    private String buildCounterName(String key) {
-        return prefix + key;
-    }
+  private final MeterRegistry metrics;
+
+  public MicrometerTaggedMetricsProvider(MeterRegistry metrics) {
+    this.metrics = metrics;
+  }
+
+  @Override
+  public void counterIncrement(String topic, String key) {
+    counterIncrement(topic, key, new HashMap<>());
+  }
+
+  @Override
+  public void counterIncrement(String topic, String key, Map<String, String> tags) {
+    tags.put("topic", topic);
+    metrics
+        .counter(
+            buildCounterName(key),
+            Tags.of(
+                tags.entrySet().stream()
+                    .map(e -> Tag.of(e.getKey(), e.getValue()))
+                    .collect(Collectors.toSet())))
+        .increment();
+  }
+
+  @Override
+  public void timerRecord(String topic, String key, long duration, TimeUnit unit) {
+    Map<String, String> tags = new HashMap<>();
+    tags.put("topic", topic);
+    metrics
+        .timer(
+            buildCounterName(key),
+            Tags.of(
+                tags.entrySet().stream()
+                    .map(e -> Tag.of(e.getKey(), e.getValue()))
+                    .collect(Collectors.toSet())))
+        .record(duration, unit);
+  }
+
+  @Override
+  public void histogramUpdate(String topic, String key, int value) {
+    Map<String, String> tags = new HashMap<>();
+    tags.put("topic", topic);
+    metrics
+        .summary(
+            buildCounterName(key),
+            Tags.of(
+                tags.entrySet().stream()
+                    .map(e -> Tag.of(e.getKey(), e.getValue()))
+                    .collect(Collectors.toSet())))
+        .record(value);
+  }
+
+  private String buildCounterName(String key) {
+    return prefix + key;
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/okhttp/OkHttpHermesSender.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/okhttp/OkHttpHermesSender.java
index aef4dc7272..c549bcba39 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/okhttp/OkHttpHermesSender.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/okhttp/OkHttpHermesSender.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.client.okhttp;
 
+import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesResponse;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.concurrent.CompletableFuture;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.MediaType;
@@ -11,53 +16,48 @@
 import pl.allegro.tech.hermes.client.HermesResponse;
 import pl.allegro.tech.hermes.client.HermesSender;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.concurrent.CompletableFuture;
-
-import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesResponse;
-
 public class OkHttpHermesSender implements HermesSender {
 
-    private final OkHttpClient client;
+  private final OkHttpClient client;
 
-    public OkHttpHermesSender(OkHttpClient client) {
-        this.client = client;
-    }
+  public OkHttpHermesSender(OkHttpClient client) {
+    this.client = client;
+  }
 
-    @Override
-    public CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
-        CompletableFuture<HermesResponse> future = new CompletableFuture<>();
+  @Override
+  public CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
+    CompletableFuture<HermesResponse> future = new CompletableFuture<>();
 
-        RequestBody body = RequestBody.create(MediaType.parse(message.getContentType()), message.getBody());
-        Request.Builder builder = new Request.Builder();
-        message.consumeHeaders(builder::addHeader);
-        Request request = builder
-                .post(body)
-                .url(uri.toString())
-                .build();
+    RequestBody body =
+        RequestBody.create(MediaType.parse(message.getContentType()), message.getBody());
+    Request.Builder builder = new Request.Builder();
+    message.consumeHeaders(builder::addHeader);
+    Request request = builder.post(body).url(uri.toString()).build();
 
-        client.newCall(request).enqueue(new Callback() {
-            @Override
-            public void onFailure(Call call, IOException e) {
+    client
+        .newCall(request)
+        .enqueue(
+            new Callback() {
+              @Override
+              public void onFailure(Call call, IOException e) {
                 future.completeExceptionally(e);
-            }
+              }
 
-            @Override
-            public void onResponse(Call call, Response response) throws IOException {
+              @Override
+              public void onResponse(Call call, Response response) throws IOException {
                 future.complete(fromOkHttpResponse(message, response));
-            }
-        });
-
-        return future;
-    }
-
-    HermesResponse fromOkHttpResponse(HermesMessage message, Response response) throws IOException {
-        return hermesResponse(message)
-                .withHeaderSupplier(response::header)
-                .withHttpStatus(response.code())
-                .withBody(response.body().string())
-                .withProtocol(response.protocol().toString())
-                .build();
-    }
+              }
+            });
+
+    return future;
+  }
+
+  HermesResponse fromOkHttpResponse(HermesMessage message, Response response) throws IOException {
+    return hermesResponse(message)
+        .withHeaderSupplier(response::header)
+        .withHttpStatus(response.code())
+        .withBody(response.body().string())
+        .withProtocol(response.protocol().toString())
+        .build();
+  }
 }
diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/webclient/WebClientHermesSender.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/webclient/WebClientHermesSender.java
index a258aec589..3998f90704 100644
--- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/webclient/WebClientHermesSender.java
+++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/webclient/WebClientHermesSender.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.client.webclient;
 
+import static java.util.stream.Collectors.toMap;
+import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesResponse;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
 import org.springframework.web.reactive.function.client.WebClient;
 import pl.allegro.tech.hermes.client.HermesMessage;
 import pl.allegro.tech.hermes.client.HermesResponse;
@@ -7,53 +14,56 @@
 import pl.allegro.tech.hermes.client.ReactiveHermesSender;
 import reactor.core.publisher.Mono;
 
-import java.net.URI;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.CompletableFuture;
+public class WebClientHermesSender implements HermesSender, ReactiveHermesSender {
 
-import static java.util.stream.Collectors.toMap;
-import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesResponse;
+  private static final Mono<String> NO_BODY = Mono.just("");
+  private final WebClient webClient;
 
-public class WebClientHermesSender implements HermesSender, ReactiveHermesSender {
+  public WebClientHermesSender(WebClient webClient) {
+    this.webClient = webClient;
+  }
 
-    private static final Mono<String> NO_BODY = Mono.just("");
-    private final WebClient webClient;
-
-    public WebClientHermesSender(WebClient webClient) {
-        this.webClient = webClient;
-    }
-
-    @Override
-    public Mono<HermesResponse> sendReactively(URI uri, HermesMessage message) {
-        return webClient.post()
-                .uri(uri)
-                .syncBody(message.getBody())
-                .headers(httpHeaders -> httpHeaders.setAll(message.getHeaders()))
-                .exchange()
-                .flatMap(response -> response
-                        .bodyToMono(String.class)
-                        .switchIfEmpty(NO_BODY)
-                        .map(body -> hermesResponse(message)
+  @Override
+  public Mono<HermesResponse> sendReactively(URI uri, HermesMessage message) {
+    return webClient
+        .post()
+        .uri(uri)
+        .syncBody(message.getBody())
+        .headers(httpHeaders -> httpHeaders.setAll(message.getHeaders()))
+        .exchange()
+        .flatMap(
+            response ->
+                response
+                    .bodyToMono(String.class)
+                    .switchIfEmpty(NO_BODY)
+                    .map(
+                        body ->
+                            hermesResponse(message)
                                 .withBody(body)
                                 .withHttpStatus(response.statusCode().value())
-                                .withHeaderSupplier(header ->
-                                        convertToCaseInsensitiveMap(response.headers().asHttpHeaders().toSingleValueMap()).get(header))
+                                .withHeaderSupplier(
+                                    header ->
+                                        convertToCaseInsensitiveMap(
+                                                response
+                                                    .headers()
+                                                    .asHttpHeaders()
+                                                    .toSingleValueMap())
+                                            .get(header))
                                 .build()));
-    }
-
-    @Override
-    public CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
-        return sendReactively(uri, message).toFuture();
-    }
-
-    private TreeMap<String, String> convertToCaseInsensitiveMap(Map<String, String> hashMap) {
-        return hashMap.entrySet().stream()
-                .collect(toMap(
-                        Map.Entry::getKey,
-                        Map.Entry::getValue,
-                        (oldVal, newVal) -> newVal,
-                        () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER)
-                ));
-    }
+  }
+
+  @Override
+  public CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
+    return sendReactively(uri, message).toFuture();
+  }
+
+  private TreeMap<String, String> convertToCaseInsensitiveMap(Map<String, String> hashMap) {
+    return hashMap.entrySet().stream()
+        .collect(
+            toMap(
+                Map.Entry::getKey,
+                Map.Entry::getValue,
+                (oldVal, newVal) -> newVal,
+                () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER)));
+  }
 }
diff --git a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesClientMetricsTest.groovy b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesClientMetricsTest.groovy
deleted file mode 100644
index c608c1c5cc..0000000000
--- a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesClientMetricsTest.groovy
+++ /dev/null
@@ -1,207 +0,0 @@
-package pl.allegro.tech.hermes.client
-
-import com.codahale.metrics.MetricRegistry
-import pl.allegro.tech.hermes.client.metrics.DropwizardMetricsProvider
-import pl.allegro.tech.hermes.client.metrics.MetricsProvider
-import spock.lang.Specification
-
-import java.time.Duration
-import java.time.temporal.ChronoUnit
-import java.util.concurrent.CompletableFuture
-
-import static java.util.concurrent.CompletableFuture.completedFuture
-import static pl.allegro.tech.hermes.client.HermesClientBuilder.hermesClient
-
-class HermesClientMetricsTest extends Specification {
-
-    private MetricRegistry metrics = new MetricRegistry()
-    private MetricsProvider metricsProvider = new DropwizardMetricsProvider(metrics)
-
-    def "should measure publish latency"() {
-        given:
-        HermesClient client = hermesClient(delayedHermesSender(Duration.ofMillis(100)))
-                .withRetrySleep(0)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        client.publish("com.group.topic", "123").join()
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.status.201").count == 1
-        metrics.timer("hermes-client.com_group.topic.latency").getSnapshot().getMax() >= Duration.ofMillis(100).get(ChronoUnit.NANOS)
-    }
-
-    def "should close timer on exceptional completion and log failure metric"() {
-        given:
-        HermesClient client = hermesClient({uri, msg ->  failingFuture(new RuntimeException())})
-                .withRetrySleep(0)
-                .withRetries(3)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        silence({ client.publish("com.group.topic", "123").join() })
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.failure").count == 4
-        metrics.timers.containsKey("hermes-client.com_group.topic.latency")
-
-        metrics.counter("hermes-client.com_group.topic.publish.failure").count == 4
-        metrics.counter("hermes-client.com_group.topic.publish.finally.failure").count == 1
-        metrics.counter("hermes-client.com_group.topic.publish.retry.failure").count == 3
-    }
-
-    def "should update max retries exceeded metric"() {
-        given:
-        HermesClient client = hermesClient({uri, msg ->  failingFuture(new RuntimeException())})
-                .withRetrySleep(0)
-                .withRetries(3)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        silence({ client.publish("com.group.topic", "123").join() })
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.failure").count == 4
-        metrics.counter("hermes-client.com_group.topic.retries.count").count == 3
-        metrics.counter("hermes-client.com_group.topic.retries.exhausted").count == 1
-        metrics.counter("hermes-client.com_group.topic.retries.success").count == 0
-        metrics.histogram("hermes-client.com_group.topic.retries.attempts").getSnapshot().size() == 0
-        metrics.timers.containsKey("hermes-client.com_group.topic.latency")
-
-        metrics.counter("hermes-client.com_group.topic.publish.finally.success").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.finally.failure").count == 1
-        metrics.counter("hermes-client.com_group.topic.publish.failure").count == 4
-        metrics.counter("hermes-client.com_group.topic.publish.attempt").count == 1
-        metrics.counter("hermes-client.com_group.topic.publish.retry.success").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.retry.failure").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.retry.attempt").count == 1
-    }
-
-    def "should update retries metrics"() {
-        given:
-        HermesClient client1 = hermesClient(failingHermesSender(2))
-                .withRetrySleep(0)
-                .withRetries(4)
-                .withMetrics(metricsProvider).build()
-
-        HermesClient client2 = hermesClient(failingHermesSender(5))
-                .withRetrySleep(0)
-                .withRetries(6)
-                .withMetrics(metricsProvider).build()
-
-        HermesClient client3 = hermesClient(failingHermesSender(3))
-                .withRetrySleep(0)
-                .withRetries(2)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        silence({ client1.publish("com.group.topic", "123").join() })
-        silence({ client2.publish("com.group.topic", "456").join() })
-        silence({ client3.publish("com.group.topic", "789").join() })
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.failure").count == 10
-        metrics.counter("hermes-client.com_group.topic.retries.exhausted").count == 1
-        metrics.counter("hermes-client.com_group.topic.retries.success").count == 2
-        metrics.counter("hermes-client.com_group.topic.retries.count").count == 9
-        metrics.histogram("hermes-client.com_group.topic.retries.attempts").getSnapshot().getMin() == 2
-        metrics.histogram("hermes-client.com_group.topic.retries.attempts").getSnapshot().getMax() == 5
-        metrics.timers.containsKey("hermes-client.com_group.topic.latency")
-
-        metrics.counter("hermes-client.com_group.topic.publish.finally.success").count == 2
-        metrics.counter("hermes-client.com_group.topic.publish.finally.failure").count == 1
-        metrics.counter("hermes-client.com_group.topic.publish.failure").count == 10
-        metrics.counter("hermes-client.com_group.topic.publish.attempt").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.retry.success").count == 2
-        metrics.counter("hermes-client.com_group.topic.publish.retry.failure").count == 9
-        metrics.counter("hermes-client.com_group.topic.publish.retry.attempt").count == 3
-    }
-
-    def "should update failure metrics when there is an application-level error"() {
-        given:
-        HermesClient client1 = hermesClient(badRequestHermesSender())
-                .withRetrySleep(0)
-                .withRetries(4)
-                .withMetrics(metricsProvider).build()
-
-        HermesClient client2 = hermesClient(badRequestHermesSender())
-                .withRetrySleep(0)
-                .withRetries(6)
-                .withMetrics(metricsProvider).build()
-
-        HermesClient client3 = hermesClient(badRequestHermesSender())
-                .withRetrySleep(0)
-                .withRetries(2)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        silence({ client1.publish("com.group.topic", "123").join() })
-        silence({ client2.publish("com.group.topic", "456").join() })
-        silence({ client3.publish("com.group.topic", "789").join() })
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.publish.finally.success").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.finally.failure").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.failure").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.attempt").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.retry.success").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.retry.failure").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.retry.attempt").count == 0
-    }
-
-    private CompletableFuture<HermesResponse> successFuture(HermesMessage message) {
-        return completedFuture(HermesResponseBuilder.hermesResponse(message).withHttpStatus(201).build())
-    }
-
-    private CompletableFuture<HermesResponse> badRequestFuture(HermesMessage message) {
-        return completedFuture(HermesResponseBuilder.hermesResponse(message).withHttpStatus(400).build())
-    }
-
-    private CompletableFuture<HermesResponse> failingFuture(Throwable throwable) {
-        CompletableFuture<HermesResponse> future = new CompletableFuture<>()
-        future.completeExceptionally(throwable)
-        return future
-    }
-
-    private HermesSender failingHermesSender(int errorNo) {
-        new HermesSender() {
-            int i = 0
-            @Override
-            CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
-                i++
-                if (i <= errorNo) {
-                    return failingFuture(new RuntimeException())
-                }
-                return successFuture(message)
-            }
-        }
-    }
-
-    private HermesSender delayedHermesSender(Duration sendLatencyMs) {
-        new HermesSender() {
-            @Override
-            CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
-                Thread.sleep(sendLatencyMs.toMillis())
-                return successFuture(message)
-            }
-        }
-    }
-
-    private HermesSender badRequestHermesSender() {
-        new HermesSender() {
-            @Override
-            CompletableFuture<HermesResponse> send(URI uri, HermesMessage message) {
-                return badRequestFuture(message)
-            }
-        }
-    }
-
-    private void silence(Runnable runnable) {
-        try {
-            runnable.run()
-        } catch (Exception ex) {
-            // do nothing
-        }
-    }
-
-}
diff --git a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesClientMicrometerTaggedMetricsTest.groovy b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesClientMicrometerTaggedMetricsTest.groovy
index d7175066ec..05b760eea9 100644
--- a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesClientMicrometerTaggedMetricsTest.groovy
+++ b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesClientMicrometerTaggedMetricsTest.groovy
@@ -7,7 +7,6 @@ import pl.allegro.tech.hermes.client.metrics.MicrometerTaggedMetricsProvider
 import spock.lang.Specification
 
 import java.time.Duration
-import java.time.temporal.ChronoUnit
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 
@@ -31,8 +30,8 @@ class HermesClientMicrometerTaggedMetricsTest extends Specification {
         then:
         metrics.counter("hermes-client.status", "code", String.valueOf(201), "topic", "com_group.topic").count() == 1
         def timer = metrics.timer("hermes-client.latency", "topic", "com_group.topic")
-        timer.totalTime(TimeUnit.NANOSECONDS) >= Duration.ofMillis(100).get(ChronoUnit.NANOS)
-        timer.totalTime(TimeUnit.NANOSECONDS) < Duration.ofMillis(300).get(ChronoUnit.NANOS)
+        timer.totalTime(TimeUnit.NANOSECONDS) >= Duration.ofMillis(100).toNanos()
+        timer.totalTime(TimeUnit.NANOSECONDS) < Duration.ofMillis(1000).toNanos()
     }
 
     def "should close timer on exceptional completion and log failure metric"() {
diff --git a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesClientMetricsTest.groovy b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesClientMetricsTest.groovy
deleted file mode 100644
index c1993857dd..0000000000
--- a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesClientMetricsTest.groovy
+++ /dev/null
@@ -1,205 +0,0 @@
-package pl.allegro.tech.hermes.client
-
-import com.codahale.metrics.MetricRegistry
-import pl.allegro.tech.hermes.client.metrics.DropwizardMetricsProvider
-import pl.allegro.tech.hermes.client.metrics.MetricsProvider
-import reactor.core.publisher.Mono
-import spock.lang.Specification
-
-import java.time.Duration
-import java.time.temporal.ChronoUnit
-
-import static pl.allegro.tech.hermes.client.ReactiveHermesClientBuilder.hermesClient
-
-class ReactiveHermesClientMetricsTest extends Specification {
-
-    private MetricRegistry metrics = new MetricRegistry()
-    private MetricsProvider metricsProvider = new DropwizardMetricsProvider(metrics)
-
-    def "should measure publish latency"() {
-        given:
-        ReactiveHermesClient client = hermesClient(delayedHermesSender(Duration.ofMillis(100)))
-                .withRetrySleep(0)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        client.publish("com.group.topic", "123").block()
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.status.201").count == 1
-        metrics.timer("hermes-client.com_group.topic.latency").getSnapshot().getMax() >= Duration.ofMillis(100).get(ChronoUnit.NANOS)
-        metrics.timer("hermes-client.com_group.topic.latency").getSnapshot().getMax() < Duration.ofMillis(300).get(ChronoUnit.NANOS)
-    }
-
-    def "should close timer on exceptional completion and log failure metric"() {
-        given:
-        ReactiveHermesClient client = hermesClient({uri, msg ->  failingMono(new RuntimeException())})
-                .withRetrySleep(0)
-                .withRetries(3)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        silence({ client.publish("com.group.topic", "123").block() })
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.failure").count == 4
-        metrics.timers.containsKey("hermes-client.com_group.topic.latency")
-
-        metrics.counter("hermes-client.com_group.topic.publish.failure").count == 4
-        metrics.counter("hermes-client.com_group.topic.publish.finally.failure").count == 1
-        metrics.counter("hermes-client.com_group.topic.publish.retry.failure").count == 3
-    }
-
-    def "should update max retries exceeded metric"() {
-        given:
-        ReactiveHermesClient client = hermesClient({uri, msg ->  failingMono(new RuntimeException())})
-                .withRetrySleep(0)
-                .withRetries(3)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        silence({ client.publish("com.group.topic", "123").block() })
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.failure").count == 4
-        metrics.counter("hermes-client.com_group.topic.retries.count").count == 3
-        metrics.counter("hermes-client.com_group.topic.retries.exhausted").count == 1
-        metrics.counter("hermes-client.com_group.topic.retries.success").count == 0
-        metrics.histogram("hermes-client.com_group.topic.retries.attempts").getSnapshot().size() == 0
-        metrics.timers.containsKey("hermes-client.com_group.topic.latency")
-
-        metrics.counter("hermes-client.com_group.topic.publish.finally.success").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.finally.failure").count == 1
-        metrics.counter("hermes-client.com_group.topic.publish.failure").count == 4
-        metrics.counter("hermes-client.com_group.topic.publish.attempt").count == 1
-        metrics.counter("hermes-client.com_group.topic.publish.retry.success").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.retry.failure").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.retry.attempt").count == 1
-    }
-
-    def "should update retries metrics"() {
-        given:
-        ReactiveHermesClient client1 = hermesClient(failingHermesSender(2))
-                .withRetrySleep(0)
-                .withRetries(4)
-                .withMetrics(metricsProvider).build()
-
-        ReactiveHermesClient client2 = hermesClient(failingHermesSender(5))
-                .withRetrySleep(0)
-                .withRetries(6)
-                .withMetrics(metricsProvider).build()
-
-        ReactiveHermesClient client3 = hermesClient(failingHermesSender(3))
-                .withRetrySleep(0)
-                .withRetries(2)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        silence({ client1.publish("com.group.topic", "123").block() })
-        silence({ client2.publish("com.group.topic", "456").block() })
-        silence({ client3.publish("com.group.topic", "789").block() })
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.failure").count == 10
-        metrics.counter("hermes-client.com_group.topic.retries.exhausted").count == 1
-        metrics.counter("hermes-client.com_group.topic.retries.success").count == 2
-        metrics.counter("hermes-client.com_group.topic.retries.count").count == 9
-        metrics.histogram("hermes-client.com_group.topic.retries.attempts").getSnapshot().getMin() == 2
-        metrics.histogram("hermes-client.com_group.topic.retries.attempts").getSnapshot().getMax() == 5
-        metrics.timers.containsKey("hermes-client.com_group.topic.latency")
-
-        metrics.counter("hermes-client.com_group.topic.publish.finally.success").count == 2
-        metrics.counter("hermes-client.com_group.topic.publish.finally.failure").count == 1
-        metrics.counter("hermes-client.com_group.topic.publish.failure").count == 10
-        metrics.counter("hermes-client.com_group.topic.publish.attempt").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.retry.success").count == 2
-        metrics.counter("hermes-client.com_group.topic.publish.retry.failure").count == 9
-        metrics.counter("hermes-client.com_group.topic.publish.retry.attempt").count == 3
-    }
-
-    def "should update failure metrics when there is an application-level error"() {
-        given:
-        ReactiveHermesClient client1 = hermesClient(badRequestHermesSender())
-                .withRetrySleep(0)
-                .withRetries(4)
-                .withMetrics(metricsProvider).build()
-
-        ReactiveHermesClient client2 = hermesClient(badRequestHermesSender())
-                .withRetrySleep(0)
-                .withRetries(6)
-                .withMetrics(metricsProvider).build()
-
-        ReactiveHermesClient client3 = hermesClient(badRequestHermesSender())
-                .withRetrySleep(0)
-                .withRetries(2)
-                .withMetrics(metricsProvider).build()
-
-        when:
-        silence({ client1.publish("com.group.topic", "123").block() })
-        silence({ client2.publish("com.group.topic", "456").block() })
-        silence({ client3.publish("com.group.topic", "789").block() })
-
-        then:
-        metrics.counter("hermes-client.com_group.topic.publish.finally.success").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.finally.failure").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.failure").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.attempt").count == 3
-        metrics.counter("hermes-client.com_group.topic.publish.retry.success").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.retry.failure").count == 0
-        metrics.counter("hermes-client.com_group.topic.publish.retry.attempt").count == 0
-    }
-
-    private Mono<HermesResponse> successMono(HermesMessage message) {
-        return Mono.just(HermesResponseBuilder.hermesResponse(message).withHttpStatus(201).build())
-    }
-
-    private Mono<HermesResponse> badRequestMono(HermesMessage message) {
-        return Mono.just(HermesResponseBuilder.hermesResponse(message).withHttpStatus(400).build())
-    }
-
-    private Mono<HermesResponse> failingMono(Throwable throwable) {
-        return Mono.error(throwable)
-    }
-
-    private ReactiveHermesSender failingHermesSender(int errorNo) {
-        new ReactiveHermesSender() {
-            int i = 0
-            @Override
-            Mono<HermesResponse> sendReactively(URI uri, HermesMessage message) {
-                i++
-                if (i <= errorNo) {
-                    return failingMono(new RuntimeException())
-                }
-                return successMono(message)
-            }
-        }
-    }
-
-    private ReactiveHermesSender delayedHermesSender(Duration sendLatencyMs) {
-        new ReactiveHermesSender() {
-            @Override
-            Mono<HermesResponse> sendReactively(URI uri, HermesMessage message) {
-                Thread.sleep(sendLatencyMs.toMillis())
-                return successMono(message)
-            }
-        }
-    }
-
-    private ReactiveHermesSender badRequestHermesSender() {
-        new ReactiveHermesSender() {
-            @Override
-            Mono<HermesResponse> sendReactively(URI uri, HermesMessage message) {
-                return badRequestMono(message)
-            }
-        }
-    }
-
-    private void silence(Runnable runnable) {
-        try {
-            runnable.run()
-        } catch (Exception ex) {
-            // do nothing
-        }
-    }
-
-}
diff --git a/hermes-client/src/test/resources/allure.properties b/hermes-client/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-client/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-common/build.gradle b/hermes-common/build.gradle
index ccf959276b..d1e850d4d6 100644
--- a/hermes-common/build.gradle
+++ b/hermes-common/build.gradle
@@ -25,23 +25,21 @@ dependencies {
     api group: 'tech.allegro.schema.json2avro', name: 'converter', version: versions.json2avro
 
     api group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
-    implementation group: 'commons-codec', name: 'commons-codec', version: '1.9'
+    implementation group: 'commons-codec', name: 'commons-codec', version: '1.16.1'
     implementation group: 'com.google.guava', name: 'guava', version: versions.guava
 
     api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: versions.jackson
     api group: 'org.apache.avro', name: 'avro', version: versions.avro
-    api group: 'com.jayway.jsonpath', name: 'json-path', version: '2.5.0'
+    api group: 'com.jayway.jsonpath', name: 'json-path', version: '2.9.0'
 
-    implementation group: 'io.dropwizard.metrics', name: 'metrics-graphite', version: versions.dropwizard_metrics
-    implementation group: 'io.dropwizard.metrics', name: 'metrics-jvm', version: versions.dropwizard_metrics
-    implementation group: 'org.mpierce.metrics.reservoir', name: 'hdrhistogram-metrics-reservoir', version: '1.1.0'
+    implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: versions.dropwizard_metrics
 
-    implementation group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.0'
+    implementation group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.1'
     api group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics
     api group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: versions.micrometer_metrics
 
-    implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '2.0.4'
-    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.7'
+    implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '2.0.13'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.14'
     api(group: 'org.apache.kafka', name: 'kafka-clients', version: versions.kafka) {
         exclude group: 'net.sf.jopt-simple'
     }
@@ -50,12 +48,10 @@ dependencies {
 
     testImplementation project(':hermes-test-helper')
 
-    testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
+    testImplementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.0.0'
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock
-    testImplementation (group: 'com.jayway.awaitility', name: 'awaitility-groovy', version: '1.7.0') {
-        exclude group: 'org.codehaus.groovy', module: 'groovy-all'
-    }
+    testImplementation group: 'org.awaitility', name: 'awaitility-groovy', version: '4.2.1'
     testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: versions.junit_jupiter
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminOperationsCallback.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminOperationsCallback.java
index 3a8c08760f..0f418e9c0c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminOperationsCallback.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminOperationsCallback.java
@@ -3,5 +3,5 @@
 import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public interface AdminOperationsCallback {
-    void onRetransmissionStarts(SubscriptionName subscription) throws Exception;
+  void onRetransmissionStarts(SubscriptionName subscription) throws Exception;
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminTool.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminTool.java
index 033e58ca3f..7120793822 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminTool.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminTool.java
@@ -4,9 +4,9 @@
 
 public interface AdminTool {
 
-    void retransmit(SubscriptionName subscriptionName);
+  void retransmit(SubscriptionName subscriptionName);
 
-    enum Operations {
-        RETRANSMIT
-    }
+  enum Operations {
+    RETRANSMIT
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminToolStartupException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminToolStartupException.java
index 4a053eb2b4..d3b257cfc2 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminToolStartupException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/AdminToolStartupException.java
@@ -2,8 +2,7 @@
 
 public class AdminToolStartupException extends RuntimeException {
 
-    public AdminToolStartupException(Throwable cause) {
-        super(cause);
-    }
-
+  public AdminToolStartupException(Throwable cause) {
+    super(cause);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/zookeeper/ZookeeperAdminCache.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/zookeeper/ZookeeperAdminCache.java
index 0ea419fe50..9bab864f80 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/zookeeper/ZookeeperAdminCache.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/zookeeper/ZookeeperAdminCache.java
@@ -1,6 +1,11 @@
 package pl.allegro.tech.hermes.common.admin.zookeeper;
 
+import static pl.allegro.tech.hermes.common.admin.AdminTool.Operations.RETRANSMIT;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.time.Clock;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
@@ -9,56 +14,52 @@
 import pl.allegro.tech.hermes.common.admin.AdminOperationsCallback;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.time.Clock;
-import java.util.ArrayList;
-import java.util.List;
-
-import static pl.allegro.tech.hermes.common.admin.AdminTool.Operations.RETRANSMIT;
-
 public class ZookeeperAdminCache extends PathChildrenCache implements PathChildrenCacheListener {
 
-    private final ObjectMapper objectMapper;
-    private final List<AdminOperationsCallback> adminCallbacks = new ArrayList<>();
+  private final ObjectMapper objectMapper;
+  private final List<AdminOperationsCallback> adminCallbacks = new ArrayList<>();
 
-    private final long initializationTime;
+  private final long initializationTime;
 
-    public ZookeeperAdminCache(ZookeeperPaths zookeeperPaths,
-                               CuratorFramework client,
-                               ObjectMapper objectMapper,
-                               Clock clock) {
-        super(client, zookeeperPaths.adminPath(), true);
-        this.objectMapper = objectMapper;
-        this.initializationTime = clock.millis();
-        getListenable().addListener(this);
-    }
+  public ZookeeperAdminCache(
+      ZookeeperPaths zookeeperPaths,
+      CuratorFramework client,
+      ObjectMapper objectMapper,
+      Clock clock) {
+    super(client, zookeeperPaths.adminPath(), true);
+    this.objectMapper = objectMapper;
+    this.initializationTime = clock.millis();
+    getListenable().addListener(this);
+  }
 
-    @Override
-    public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
-        switch (event.getType()) {
-            case CHILD_UPDATED:
-            case CHILD_ADDED:
-                if (event.getData().getPath().contains(RETRANSMIT.name()) && isYoungerThanThisNode(event)) {
-                    retransmit(event);
-                }
-                break;
-            default:
-                break;
+  @Override
+  public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
+    switch (event.getType()) {
+      case CHILD_UPDATED:
+      case CHILD_ADDED:
+        if (event.getData().getPath().contains(RETRANSMIT.name()) && isYoungerThanThisNode(event)) {
+          retransmit(event);
         }
+        break;
+      default:
+        break;
     }
+  }
 
-    private boolean isYoungerThanThisNode(PathChildrenCacheEvent event) {
-        return event.getData().getStat().getMtime() > initializationTime;
-    }
+  private boolean isYoungerThanThisNode(PathChildrenCacheEvent event) {
+    return event.getData().getStat().getMtime() > initializationTime;
+  }
 
-    private void retransmit(PathChildrenCacheEvent event) throws Exception {
-        SubscriptionName subscriptionName = objectMapper.readValue(event.getData().getData(), SubscriptionName.class);
+  private void retransmit(PathChildrenCacheEvent event) throws Exception {
+    SubscriptionName subscriptionName =
+        objectMapper.readValue(event.getData().getData(), SubscriptionName.class);
 
-        for (AdminOperationsCallback adminCallback : adminCallbacks) {
-            adminCallback.onRetransmissionStarts(subscriptionName);
-        }
+    for (AdminOperationsCallback adminCallback : adminCallbacks) {
+      adminCallback.onRetransmissionStarts(subscriptionName);
     }
+  }
 
-    public void addCallback(AdminOperationsCallback callback) {
-        adminCallbacks.add(callback);
-    }
+  public void addCallback(AdminOperationsCallback callback) {
+    adminCallbacks.add(callback);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/zookeeper/ZookeeperAdminTool.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/zookeeper/ZookeeperAdminTool.java
index b387c5e2f6..aa2aca00a9 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/zookeeper/ZookeeperAdminTool.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/admin/zookeeper/ZookeeperAdminTool.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.common.admin.zookeeper;
 
+import static pl.allegro.tech.hermes.common.admin.AdminTool.Operations.RETRANSMIT;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.CreateMode;
@@ -8,35 +10,35 @@
 import pl.allegro.tech.hermes.common.exception.RetransmissionException;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import static pl.allegro.tech.hermes.common.admin.AdminTool.Operations.RETRANSMIT;
-
 public class ZookeeperAdminTool implements AdminTool {
 
-    private final ZookeeperPaths zookeeperPaths;
-    private final CuratorFramework curatorFramework;
-    private final ObjectMapper objectMapper;
-
-    public ZookeeperAdminTool(ZookeeperPaths zookeeperPaths, CuratorFramework curatorFramework,
-                              ObjectMapper objectMapper) {
-        this.zookeeperPaths = zookeeperPaths;
-        this.curatorFramework = curatorFramework;
-        this.objectMapper = objectMapper;
-    }
-
-    @Override
-    public void retransmit(SubscriptionName subscriptionName) {
-        try {
-            executeAdminOperation(subscriptionName, RETRANSMIT.name());
-        } catch (Exception e) {
-            throw new RetransmissionException(e);
-        }
+  private final ZookeeperPaths zookeeperPaths;
+  private final CuratorFramework curatorFramework;
+  private final ObjectMapper objectMapper;
+
+  public ZookeeperAdminTool(
+      ZookeeperPaths zookeeperPaths, CuratorFramework curatorFramework, ObjectMapper objectMapper) {
+    this.zookeeperPaths = zookeeperPaths;
+    this.curatorFramework = curatorFramework;
+    this.objectMapper = objectMapper;
+  }
+
+  @Override
+  public void retransmit(SubscriptionName subscriptionName) {
+    try {
+      executeAdminOperation(subscriptionName, RETRANSMIT.name());
+    } catch (Exception e) {
+      throw new RetransmissionException(e);
     }
+  }
 
-    private void executeAdminOperation(SubscriptionName subscriptionName, String name) throws Exception {
-        String path = zookeeperPaths.adminOperationPath(name);
+  private void executeAdminOperation(SubscriptionName subscriptionName, String name)
+      throws Exception {
+    String path = zookeeperPaths.adminOperationPath(name);
 
-        curatorFramework.create()
-                .withMode(CreateMode.EPHEMERAL_SEQUENTIAL)
-                .forPath(path, objectMapper.writeValueAsBytes(subscriptionName));
-    }
+    curatorFramework
+        .create()
+        .withMode(CreateMode.EPHEMERAL_SEQUENTIAL)
+        .forPath(path, objectMapper.writeValueAsBytes(subscriptionName));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/BrokerDetails.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/BrokerDetails.java
index 6a2444f78e..c1d393ee2f 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/BrokerDetails.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/BrokerDetails.java
@@ -2,19 +2,19 @@
 
 public class BrokerDetails {
 
-    private String host;
-    private int port;
+  private String host;
+  private int port;
 
-    public BrokerDetails(String host, int port) {
-        this.host = host;
-        this.port = port;
-    }
+  public BrokerDetails(String host, int port) {
+    this.host = host;
+    this.port = port;
+  }
 
-    public String getHost() {
-        return host;
-    }
+  public String getHost() {
+    return host;
+  }
 
-    public int getPort() {
-        return port;
-    }
+  public int getPort() {
+    return port;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/BrokerStorage.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/BrokerStorage.java
index fb636dd956..9051919ca4 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/BrokerStorage.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/BrokerStorage.java
@@ -1,12 +1,11 @@
 package pl.allegro.tech.hermes.common.broker;
 
-import org.apache.kafka.common.TopicPartition;
-
 import java.util.List;
+import org.apache.kafka.common.TopicPartition;
 
 public interface BrokerStorage {
 
-    int readLeaderForPartition(TopicPartition topicAndPartition);
+  int readLeaderForPartition(TopicPartition topicAndPartition);
 
-    List<Integer> readPartitionsIds(String topicName);
+  List<Integer> readPartitionsIds(String topicName);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/KafkaBrokerStorage.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/KafkaBrokerStorage.java
index e051d64ec6..e75a225593 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/KafkaBrokerStorage.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/broker/KafkaBrokerStorage.java
@@ -1,6 +1,9 @@
 package pl.allegro.tech.hermes.common.broker;
 
 import com.google.common.collect.Ordering;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.TopicDescription;
 import org.apache.kafka.common.KafkaFuture;
@@ -9,50 +12,50 @@
 import pl.allegro.tech.hermes.common.exception.BrokerNotFoundForPartitionException;
 import pl.allegro.tech.hermes.common.exception.PartitionsNotFoundForGivenTopicException;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class KafkaBrokerStorage implements BrokerStorage {
 
-    private final AdminClient kafkaAdminClient;
-
-    public KafkaBrokerStorage(AdminClient kafkaAdminClient) {
-        this.kafkaAdminClient = kafkaAdminClient;
-    }
-
-    @Override
-    public int readLeaderForPartition(TopicPartition topicAndPartition) {
-        try {
-            return describeTopic(topicAndPartition.topic())
-                    .thenApply(description -> description.partitions().get(topicAndPartition.partition()).leader().id())
-                    .get();
-        } catch (Exception exception) {
-            throw new BrokerNotFoundForPartitionException(topicAndPartition.topic(), topicAndPartition.partition(), exception);
-        }
+  private final AdminClient kafkaAdminClient;
+
+  public KafkaBrokerStorage(AdminClient kafkaAdminClient) {
+    this.kafkaAdminClient = kafkaAdminClient;
+  }
+
+  @Override
+  public int readLeaderForPartition(TopicPartition topicAndPartition) {
+    try {
+      return describeTopic(topicAndPartition.topic())
+          .thenApply(
+              description ->
+                  description.partitions().get(topicAndPartition.partition()).leader().id())
+          .get();
+    } catch (Exception exception) {
+      throw new BrokerNotFoundForPartitionException(
+          topicAndPartition.topic(), topicAndPartition.partition(), exception);
     }
+  }
 
-    @Override
-    public List<Integer> readPartitionsIds(String topicName) {
-        try {
-            List<Integer> partitions = describeTopic(topicName)
-                    .thenApply(this::resolvePartitionIds)
-                    .get();
-
-            return Ordering.natural().sortedCopy(partitions);
-        } catch (Exception exception) {
-            throw new PartitionsNotFoundForGivenTopicException(topicName, exception);
-        }
-    }
-
-    private KafkaFuture<TopicDescription> describeTopic(String topic) {
-        return kafkaAdminClient.describeTopics(Collections.singletonList(topic)).all()
-                .thenApply(topicsMap -> topicsMap.get(topic));
-    }
+  @Override
+  public List<Integer> readPartitionsIds(String topicName) {
+    try {
+      List<Integer> partitions =
+          describeTopic(topicName).thenApply(this::resolvePartitionIds).get();
 
-    private List<Integer> resolvePartitionIds(TopicDescription topicDescription) {
-        return topicDescription.partitions().stream()
-                .map(TopicPartitionInfo::partition)
-                .collect(Collectors.toList());
+      return Ordering.natural().sortedCopy(partitions);
+    } catch (Exception exception) {
+      throw new PartitionsNotFoundForGivenTopicException(topicName, exception);
     }
+  }
+
+  private KafkaFuture<TopicDescription> describeTopic(String topic) {
+    return kafkaAdminClient
+        .describeTopics(Collections.singletonList(topic))
+        .all()
+        .thenApply(topicsMap -> topicsMap.get(topic));
+  }
+
+  private List<Integer> resolvePartitionIds(TopicDescription topicDescription) {
+    return topicDescription.partitions().stream()
+        .map(TopicPartitionInfo::partition)
+        .collect(Collectors.toList());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/cache/queue/LinkedHashSetBlockingQueue.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/cache/queue/LinkedHashSetBlockingQueue.java
index b061eed052..eaa90f8d51 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/cache/queue/LinkedHashSetBlockingQueue.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/cache/queue/LinkedHashSetBlockingQueue.java
@@ -1,23 +1,19 @@
 package pl.allegro.tech.hermes.common.cache.queue;
 
 /**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import java.util.AbstractQueue;
 import java.util.Collection;
 import java.util.Iterator;
@@ -32,391 +28,357 @@
  * A blocking queue implementation backed by a linked hash set for predictable iteration order and
  * constant time addition, removal and contains operations.
  *
- * Author: Sebastian Schaffert
- * Project: apache.marmotta
+ * <p>Author: Sebastian Schaffert Project: apache.marmotta
  */
 public class LinkedHashSetBlockingQueue<E> extends AbstractQueue<E> implements BlockingQueue<E> {
 
-    private int capacity = Integer.MAX_VALUE;
-
-    /** Current number of elements */
-    private final AtomicInteger count = new AtomicInteger(0);
-
-    /** Lock held by take, poll, etc */
-    private final ReentrantLock takeLock = new ReentrantLock();
-
-    /** Wait queue for waiting takes */
-    private final Condition notEmpty = takeLock.newCondition();
-
-    /** Lock held by put, offer, etc */
-    private final ReentrantLock putLock = new ReentrantLock();
-
-    /** Wait queue for waiting puts */
-    private final Condition notFull = putLock.newCondition();
-
-    private final LinkedHashSet<E> delegate;
-
-    public LinkedHashSetBlockingQueue() {
-        delegate = new LinkedHashSet<E>();
+  private int capacity = Integer.MAX_VALUE;
+
+  /** Current number of elements */
+  private final AtomicInteger count = new AtomicInteger(0);
+
+  /** Lock held by take, poll, etc */
+  private final ReentrantLock takeLock = new ReentrantLock();
+
+  /** Wait queue for waiting takes */
+  private final Condition notEmpty = takeLock.newCondition();
+
+  /** Lock held by put, offer, etc */
+  private final ReentrantLock putLock = new ReentrantLock();
+
+  /** Wait queue for waiting puts */
+  private final Condition notFull = putLock.newCondition();
+
+  private final LinkedHashSet<E> delegate;
+
+  public LinkedHashSetBlockingQueue() {
+    delegate = new LinkedHashSet<E>();
+  }
+
+  public LinkedHashSetBlockingQueue(int capacity) {
+    this.delegate = new LinkedHashSet<E>(capacity);
+    this.capacity = capacity;
+  }
+
+  @Override
+  public boolean offer(E e) {
+    if (e == null) throw new NullPointerException();
+    final AtomicInteger count = this.count;
+    if (count.get() == capacity) return false;
+    int c = -1;
+    final ReentrantLock putLock = this.putLock;
+    putLock.lock();
+    try {
+      if (count.get() < capacity) {
+        final boolean wasAdded = enqueue(e);
+        c = wasAdded ? count.getAndIncrement() : count.get();
+        if (c + 1 < capacity) notFull.signal();
+      }
+    } finally {
+      putLock.unlock();
     }
-
-    public LinkedHashSetBlockingQueue(int capacity) {
-        this.delegate = new LinkedHashSet<E>(capacity);
-        this.capacity = capacity;
+    if (c == 0) signalNotEmpty();
+    return c >= 0;
+  }
+
+  @Override
+  public void put(E e) throws InterruptedException {
+    if (e == null) throw new NullPointerException();
+
+    int c = -1;
+    final ReentrantLock putLock = this.putLock;
+    final AtomicInteger count = this.count;
+    putLock.lockInterruptibly();
+    try {
+      while (count.get() == capacity) {
+        notFull.await();
+      }
+      final boolean wasAdded = enqueue(e);
+      c = wasAdded ? count.getAndIncrement() : count.get();
+      if (c + 1 < capacity) notFull.signal();
+    } finally {
+      putLock.unlock();
     }
-
-    @Override
-    public boolean offer(E e) {
-        if (e == null) throw new NullPointerException();
-        final AtomicInteger count = this.count;
-        if (count.get() == capacity)
-            return false;
-        int c = -1;
-        final ReentrantLock putLock = this.putLock;
-        putLock.lock();
-        try {
-            if (count.get() < capacity) {
-                final boolean wasAdded = enqueue(e);
-                c = wasAdded?count.getAndIncrement():count.get();
-                if (c + 1 < capacity)
-                    notFull.signal();
-            }
-        } finally {
-            putLock.unlock();
-        }
-        if (c == 0)
-            signalNotEmpty();
-        return c >= 0;
+    if (c == 0) signalNotEmpty();
+  }
+
+  @Override
+  public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException {
+    if (e == null) throw new NullPointerException();
+    long nanos = unit.toNanos(timeout);
+    int c = -1;
+    final ReentrantLock putLock = this.putLock;
+    final AtomicInteger count = this.count;
+    putLock.lockInterruptibly();
+    try {
+      while (count.get() == capacity) {
+
+        if (nanos <= 0) return false;
+        nanos = notFull.awaitNanos(nanos);
+      }
+      final boolean wasAdded = enqueue(e);
+      c = wasAdded ? count.getAndIncrement() : count.get();
+      if (c + 1 < capacity) notFull.signal();
+    } finally {
+      putLock.unlock();
     }
-
-    @Override
-    public void put(E e) throws InterruptedException {
-        if (e == null) throw new NullPointerException();
-
-        int c = -1;
-        final ReentrantLock putLock = this.putLock;
-        final AtomicInteger count = this.count;
-        putLock.lockInterruptibly();
-        try {
-            while (count.get() == capacity) {
-                notFull.await();
-            }
-            final boolean wasAdded = enqueue(e);
-            c = wasAdded?count.getAndIncrement():count.get();
-            if (c + 1 < capacity)
-                notFull.signal();
-        } finally {
-            putLock.unlock();
-        }
-        if (c == 0)
-            signalNotEmpty();
+    if (c == 0) signalNotEmpty();
+    return true;
+  }
+
+  @Override
+  public E take() throws InterruptedException {
+    E x;
+    int c = -1;
+    final AtomicInteger count = this.count;
+    final ReentrantLock takeLock = this.takeLock;
+    takeLock.lockInterruptibly();
+    try {
+      while (count.get() == 0) {
+        notEmpty.await();
+      }
+      x = dequeue();
+      c = count.getAndDecrement();
+      if (c > 1) notEmpty.signal();
+    } finally {
+      takeLock.unlock();
     }
-
-    @Override
-    public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException {
-        if (e == null) throw new NullPointerException();
-        long nanos = unit.toNanos(timeout);
-        int c = -1;
-        final ReentrantLock putLock = this.putLock;
-        final AtomicInteger count = this.count;
-        putLock.lockInterruptibly();
-        try {
-            while (count.get() == capacity) {
-
-                if (nanos <= 0)
-                    return false;
-                nanos = notFull.awaitNanos(nanos);
-            }
-            final boolean wasAdded = enqueue(e);
-            c = wasAdded?count.getAndIncrement():count.get();
-            if (c + 1 < capacity)
-                notFull.signal();
-        } finally {
-            putLock.unlock();
-        }
-        if (c == 0)
-            signalNotEmpty();
-        return true;
+    if (c == capacity) signalNotFull();
+    return x;
+  }
+
+  @Override
+  public E poll(long timeout, TimeUnit unit) throws InterruptedException {
+    E x = null;
+    int c = -1;
+    long nanos = unit.toNanos(timeout);
+    final AtomicInteger count = this.count;
+    final ReentrantLock takeLock = this.takeLock;
+    takeLock.lockInterruptibly();
+    try {
+      while (count.get() == 0) {
+        if (nanos <= 0) return null;
+        nanos = notEmpty.awaitNanos(nanos);
+      }
+      x = dequeue();
+      c = count.getAndDecrement();
+      if (c > 1) notEmpty.signal();
+    } finally {
+      takeLock.unlock();
     }
-
-    @Override
-    public E take() throws InterruptedException {
-        E x;
-        int c = -1;
-        final AtomicInteger count = this.count;
-        final ReentrantLock takeLock = this.takeLock;
-        takeLock.lockInterruptibly();
-        try {
-            while (count.get() == 0) {
-                notEmpty.await();
-            }
-            x = dequeue();
-            c = count.getAndDecrement();
-            if (c > 1)
-                notEmpty.signal();
-        } finally {
-            takeLock.unlock();
-        }
-        if (c == capacity)
-            signalNotFull();
-        return x;
+    if (c == capacity) signalNotFull();
+    return x;
+  }
+
+  @Override
+  public int remainingCapacity() {
+    return Integer.MAX_VALUE - size();
+  }
+
+  @Override
+  public int drainTo(Collection<? super E> c) {
+    return drainTo(c, Integer.MAX_VALUE);
+  }
+
+  @Override
+  public int drainTo(Collection<? super E> c, int maxElements) {
+    if (c == null) throw new NullPointerException();
+    if (c == this) throw new IllegalArgumentException();
+    boolean signalNotFull = false;
+    final ReentrantLock takeLock = this.takeLock;
+    takeLock.lock();
+    try {
+      int n = Math.min(maxElements, count.get());
+      Iterator<E> it = delegate.iterator();
+      for (int i = 0; i < n && it.hasNext(); i++) {
+        E x = it.next();
+        c.add(x);
+      }
+      count.getAndAdd(-n);
+      return n;
+    } finally {
+      takeLock.unlock();
+      if (signalNotFull) signalNotFull();
     }
-
-    @Override
-    public E poll(long timeout, TimeUnit unit) throws InterruptedException {
-        E x = null;
-        int c = -1;
-        long nanos = unit.toNanos(timeout);
-        final AtomicInteger count = this.count;
-        final ReentrantLock takeLock = this.takeLock;
-        takeLock.lockInterruptibly();
-        try {
-            while (count.get() == 0) {
-                if (nanos <= 0)
-                    return null;
-                nanos = notEmpty.awaitNanos(nanos);
-            }
-            x = dequeue();
-            c = count.getAndDecrement();
-            if (c > 1)
-                notEmpty.signal();
-        } finally {
-            takeLock.unlock();
-        }
-        if (c == capacity)
-            signalNotFull();
-        return x;
+  }
+
+  @Override
+  public E poll() {
+    final AtomicInteger count = this.count;
+    if (count.get() == 0) return null;
+    E x = null;
+    int c = -1;
+    final ReentrantLock takeLock = this.takeLock;
+    takeLock.lock();
+    try {
+      if (count.get() > 0) {
+        x = dequeue();
+        c = count.getAndDecrement();
+        if (c > 1) notEmpty.signal();
+      }
+    } finally {
+      takeLock.unlock();
     }
-
-    @Override
-    public int remainingCapacity() {
-        return Integer.MAX_VALUE - size();
+    if (c == capacity) signalNotFull();
+    return x;
+  }
+
+  @Override
+  public E peek() {
+    if (count.get() == 0) return null;
+    final ReentrantLock takeLock = this.takeLock;
+    takeLock.lock();
+    try {
+      Iterator<E> it = delegate.iterator();
+      if (it.hasNext()) {
+        return it.next();
+      } else {
+        return null;
+      }
+    } finally {
+      takeLock.unlock();
     }
-
-    @Override
-    public int drainTo(Collection<? super E> c) {
-        return drainTo(c,Integer.MAX_VALUE);
+  }
+
+  /**
+   * Creates a node and links it at end of queue.
+   *
+   * @param x the item
+   * @return <code>true</code> if this set did not already contain <code>x</code>
+   */
+  private boolean enqueue(E x) {
+    synchronized (delegate) {
+      return delegate.add(x);
     }
-
-    @Override
-    public int drainTo(Collection<? super E> c, int maxElements) {
-        if (c == null)
-            throw new NullPointerException();
-        if (c == this)
-            throw new IllegalArgumentException();
-        boolean signalNotFull = false;
-        final ReentrantLock takeLock = this.takeLock;
-        takeLock.lock();
-        try {
-            int n = Math.min(maxElements, count.get());
-            Iterator<E> it = delegate.iterator();
-            for(int i=0; i<n && it.hasNext(); i++) {
-                E x = it.next();
-                c.add(x);
-            }
-            count.getAndAdd(-n);
-            return n;
-        } finally {
-            takeLock.unlock();
-            if (signalNotFull)
-                signalNotFull();
-        }
+  }
+
+  /**
+   * Removes a node from head of queue.
+   *
+   * @return the node
+   */
+  private E dequeue() {
+    synchronized (delegate) {
+      Iterator<E> it = delegate.iterator();
+      E x = it.next();
+      it.remove();
+      return x;
     }
-
-    @Override
-    public E poll() {
-        final AtomicInteger count = this.count;
-        if (count.get() == 0)
-            return null;
-        E x = null;
-        int c = -1;
-        final ReentrantLock takeLock = this.takeLock;
-        takeLock.lock();
-        try {
-            if (count.get() > 0) {
-                x = dequeue();
-                c = count.getAndDecrement();
-                if (c > 1)
-                    notEmpty.signal();
-            }
-        } finally {
-            takeLock.unlock();
-        }
-        if (c == capacity)
-            signalNotFull();
-        return x;
+  }
+
+  /** Lock to prevent both puts and takes. */
+  void fullyLock() {
+    putLock.lock();
+    takeLock.lock();
+  }
+
+  /** Unlock to allow both puts and takes. */
+  void fullyUnlock() {
+    takeLock.unlock();
+    putLock.unlock();
+  }
+
+  /**
+   * Signals a waiting take. Called only from put/offer (which do not otherwise ordinarily lock
+   * takeLock.)
+   */
+  private void signalNotEmpty() {
+    final ReentrantLock takeLock = this.takeLock;
+    takeLock.lock();
+    try {
+      notEmpty.signal();
+    } finally {
+      takeLock.unlock();
     }
-
-
-    @Override
-    public E peek() {
-        if (count.get() == 0)
-            return null;
-        final ReentrantLock takeLock = this.takeLock;
-        takeLock.lock();
-        try {
-            Iterator<E> it = delegate.iterator();
-            if(it.hasNext()) {
-                return it.next();
-            } else {
-                return null;
-            }
-        } finally {
-            takeLock.unlock();
-        }
-    }
-
-
-    /**
-     * Creates a node and links it at end of queue.
-     * @param x the item
-     * @return <code>true</code> if this set did not already contain <code>x</code>
-     */
-    private boolean enqueue(E x) {
-        synchronized (delegate) {
-            return delegate.add(x);
-        }
-    }
-
-    /**
-     * Removes a node from head of queue.
-     * @return the node
-     */
-    private E dequeue() {
-        synchronized (delegate) {
-            Iterator<E> it = delegate.iterator();
-            E x = it.next();
-            it.remove();
-            return x;
-        }
-    }
-
-
-
-    /**
-     * Lock to prevent both puts and takes.
-     */
-    void fullyLock() {
-        putLock.lock();
-        takeLock.lock();
-    }
-
-    /**
-     * Unlock to allow both puts and takes.
-     */
-    void fullyUnlock() {
-        takeLock.unlock();
-        putLock.unlock();
-    }
-
-    /**
-     * Signals a waiting take. Called only from put/offer (which do not
-     * otherwise ordinarily lock takeLock.)
-     */
-    private void signalNotEmpty() {
-        final ReentrantLock takeLock = this.takeLock;
-        takeLock.lock();
-        try {
-            notEmpty.signal();
-        } finally {
-            takeLock.unlock();
-        }
+  }
+
+  /** Signals a waiting put. Called only from take/poll. */
+  private void signalNotFull() {
+    final ReentrantLock putLock = this.putLock;
+    putLock.lock();
+    try {
+      notFull.signal();
+    } finally {
+      putLock.unlock();
     }
-
-    /**
-     * Signals a waiting put. Called only from take/poll.
-     */
-    private void signalNotFull() {
-        final ReentrantLock putLock = this.putLock;
-        putLock.lock();
+  }
+
+  /** Tells whether both locks are held by current thread. */
+  boolean isFullyLocked() {
+    return (putLock.isHeldByCurrentThread() && takeLock.isHeldByCurrentThread());
+  }
+
+  @Override
+  public Iterator<E> iterator() {
+    final Iterator<E> it = delegate.iterator();
+    return new Iterator<E>() {
+      @Override
+      public boolean hasNext() {
+        fullyLock();
         try {
-            notFull.signal();
+          return it.hasNext();
         } finally {
-            putLock.unlock();
+          fullyUnlock();
         }
-    }
-
-    /**
-     * Tells whether both locks are held by current thread.
-     */
-    boolean isFullyLocked() {
-        return (putLock.isHeldByCurrentThread() &&
-                takeLock.isHeldByCurrentThread());
-    }
-
-    @Override
-    public Iterator<E> iterator() {
-        final Iterator<E> it = delegate.iterator();
-        return new Iterator<E>() {
-            @Override
-            public boolean hasNext() {
-                fullyLock();
-                try {
-                    return it.hasNext();
-                } finally {
-                    fullyUnlock();
-                }
-            }
-
-            @Override
-            public E next() {
-                fullyLock();
-                try {
-                    return it.next();
-                } finally {
-                    fullyUnlock();
-                }
-            }
-
-            @Override
-            public void remove() {
-                fullyLock();
-                try {
-                    it.remove();
-
-                    // remove counter
-                    count.getAndDecrement();
-                } finally {
-                    fullyUnlock();
-                }
-            }
-        };
-    }
-
-    @Override
-    public int size() {
-        return count.get();
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        if (o == null) return false;
+      }
 
+      @Override
+      public E next() {
         fullyLock();
         try {
-            if(delegate.remove(o)) {
-                if(count.getAndDecrement() == capacity) {
-                    notFull.signal();
-                }
-                return true;
-            }
+          return it.next();
         } finally {
-            fullyUnlock();
+          fullyUnlock();
         }
+      }
 
-        return false;
-    }
-
-    @Override
-    public void clear() {
+      @Override
+      public void remove() {
         fullyLock();
         try {
-            delegate.clear();
-            count.set(0);
+          it.remove();
+
+          // remove counter
+          count.getAndDecrement();
         } finally {
-            fullyUnlock();
+          fullyUnlock();
+        }
+      }
+    };
+  }
+
+  @Override
+  public int size() {
+    return count.get();
+  }
+
+  @Override
+  public boolean remove(Object o) {
+    if (o == null) return false;
+
+    fullyLock();
+    try {
+      if (delegate.remove(o)) {
+        if (count.getAndDecrement() == capacity) {
+          notFull.signal();
         }
+        return true;
+      }
+    } finally {
+      fullyUnlock();
     }
 
-
+    return false;
+  }
+
+  @Override
+  public void clear() {
+    fullyLock();
+    try {
+      delegate.clear();
+      count.set(0);
+    } finally {
+      fullyUnlock();
+    }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/clock/ClockFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/clock/ClockFactory.java
index 583717df37..15484df856 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/clock/ClockFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/clock/ClockFactory.java
@@ -4,7 +4,7 @@
 
 public class ClockFactory {
 
-    public Clock provide() {
-        return Clock.systemDefaultZone();
-    }
+  public Clock provide() {
+    return Clock.systemDefaultZone();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/concurrent/DefaultExecutorServiceFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/concurrent/DefaultExecutorServiceFactory.java
index cb490375ce..ff420dda03 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/concurrent/DefaultExecutorServiceFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/concurrent/DefaultExecutorServiceFactory.java
@@ -1,16 +1,14 @@
 package pl.allegro.tech.hermes.common.concurrent;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
 public class DefaultExecutorServiceFactory implements ExecutorServiceFactory {
 
-    @Override
-    public ScheduledExecutorService createSingleThreadScheduledExecutor(String nameFormat) {
-        return Executors.newSingleThreadScheduledExecutor(
-                new ThreadFactoryBuilder().setNameFormat(nameFormat).build()
-        );
-    }
+  @Override
+  public ScheduledExecutorService createSingleThreadScheduledExecutor(String nameFormat) {
+    return Executors.newSingleThreadScheduledExecutor(
+        new ThreadFactoryBuilder().setNameFormat(nameFormat).build());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/concurrent/ExecutorServiceFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/concurrent/ExecutorServiceFactory.java
index f9c8837ca8..62ffed8525 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/concurrent/ExecutorServiceFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/concurrent/ExecutorServiceFactory.java
@@ -4,5 +4,5 @@
 
 public interface ExecutorServiceFactory {
 
-    ScheduledExecutorService createSingleThreadScheduledExecutor(String nameFormat);
+  ScheduledExecutorService createSingleThreadScheduledExecutor(String nameFormat);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/KafkaAuthenticationProperties.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/KafkaAuthenticationProperties.java
new file mode 100644
index 0000000000..658db7741d
--- /dev/null
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/KafkaAuthenticationProperties.java
@@ -0,0 +1,78 @@
+package pl.allegro.tech.hermes.common.config;
+
+public class KafkaAuthenticationProperties {
+
+  private boolean enabled = false;
+  private String mechanism = "PLAIN";
+  private String protocol = "SASL_PLAINTEXT";
+  private String username = "username";
+  private String password = "password";
+  private String loginModule = "org.apache.kafka.common.security.plain.PlainLoginModule";
+  private String jaasConfig;
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public String getMechanism() {
+    return mechanism;
+  }
+
+  public void setMechanism(String mechanism) {
+    this.mechanism = mechanism;
+  }
+
+  public String getProtocol() {
+    return protocol;
+  }
+
+  public void setProtocol(String protocol) {
+    this.protocol = protocol;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public String getLoginModule() {
+    return loginModule;
+  }
+
+  public void setLoginModule(String loginModule) {
+    this.loginModule = loginModule;
+  }
+
+  public String getJaasConfig() {
+    if (jaasConfig != null) {
+      return jaasConfig;
+    }
+    return loginModule
+        + " required\n"
+        + "username=\""
+        + username
+        + "\"\n"
+        + "password=\""
+        + password
+        + "\";";
+  }
+
+  public void setJaasConfig(String jaasConfig) {
+    this.jaasConfig = jaasConfig;
+  }
+}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/KafkaAuthorizationProperties.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/KafkaAuthorizationProperties.java
deleted file mode 100644
index def9455d2c..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/KafkaAuthorizationProperties.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package pl.allegro.tech.hermes.common.config;
-
-public class KafkaAuthorizationProperties {
-
-    private boolean enabled = false;
-    private String mechanism = "PLAIN";
-    private String protocol = "SASL_PLAINTEXT";
-    private String username = "username";
-    private String password = "password";
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public String getMechanism() {
-        return mechanism;
-    }
-
-    public void setMechanism(String mechanism) {
-        this.mechanism = mechanism;
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/SchemaCacheProperties.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/SchemaCacheProperties.java
index 84181c41f9..35a7a51cbe 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/SchemaCacheProperties.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/SchemaCacheProperties.java
@@ -1,76 +1,75 @@
 package pl.allegro.tech.hermes.common.config;
 
-import pl.allegro.tech.hermes.common.schema.SchemaVersionRepositoryParameters;
-
 import java.time.Duration;
+import pl.allegro.tech.hermes.common.schema.SchemaVersionRepositoryParameters;
 
 public class SchemaCacheProperties implements SchemaVersionRepositoryParameters {
 
-    private Duration refreshAfterWrite = Duration.ofMinutes(10);
+  private Duration refreshAfterWrite = Duration.ofMinutes(10);
 
-    private Duration expireAfterWrite = Duration.ofHours(24);
+  private Duration expireAfterWrite = Duration.ofHours(24);
 
-    private Duration compiledExpireAfterAccess = Duration.ofHours(40);
+  private Duration compiledExpireAfterAccess = Duration.ofHours(40);
 
-    private int reloadThreadPoolSize = 2;
+  private int reloadThreadPoolSize = 2;
 
-    private boolean enabled = true;
+  private boolean enabled = true;
 
-    private int compiledMaximumSize = 2000;
+  private int compiledMaximumSize = 2000;
 
-    @Override
-    public boolean isCacheEnabled() {
-        return enabled;
-    }
+  @Override
+  public boolean isCacheEnabled() {
+    return enabled;
+  }
 
-    @Override
-    public Duration getRefreshAfterWrite() {
-        return refreshAfterWrite;
-    }
+  @Override
+  public Duration getRefreshAfterWrite() {
+    return refreshAfterWrite;
+  }
 
-    public void setRefreshAfterWrite(Duration refreshAfterWrite) {
-        this.refreshAfterWrite = refreshAfterWrite;
-    }
+  public void setRefreshAfterWrite(Duration refreshAfterWrite) {
+    this.refreshAfterWrite = refreshAfterWrite;
+  }
 
-    @Override
-    public Duration getExpireAfterWrite() {
-        return expireAfterWrite;
-    }
+  @Override
+  public Duration getExpireAfterWrite() {
+    return expireAfterWrite;
+  }
 
-    public void setExpireAfterWrite(Duration expireAfterWrite) {
-        this.expireAfterWrite = expireAfterWrite;
-    }
+  public void setExpireAfterWrite(Duration expireAfterWrite) {
+    this.expireAfterWrite = expireAfterWrite;
+  }
 
-    public Duration getCompiledExpireAfterAccess() {
-        return compiledExpireAfterAccess;
-    }
+  public Duration getCompiledExpireAfterAccess() {
+    return compiledExpireAfterAccess;
+  }
 
-    public void setCompiledExpireAfterAccess(Duration compiledExpireAfterAccess) {
-        this.compiledExpireAfterAccess = compiledExpireAfterAccess;
-    }
+  public void setCompiledExpireAfterAccess(Duration compiledExpireAfterAccess) {
+    this.compiledExpireAfterAccess = compiledExpireAfterAccess;
+  }
 
-    @Override
-    public int getReloadThreadPoolSize() {
-        return reloadThreadPoolSize;
-    }
+  @Override
+  public int getReloadThreadPoolSize() {
+    return reloadThreadPoolSize;
+  }
 
-    public void setReloadThreadPoolSize(int reloadThreadPoolSize) {
-        this.reloadThreadPoolSize = reloadThreadPoolSize;
-    }
+  public void setReloadThreadPoolSize(int reloadThreadPoolSize) {
+    this.reloadThreadPoolSize = reloadThreadPoolSize;
+  }
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
 
-    public int getCompiledMaximumSize() {
-        return compiledMaximumSize;
-    }
+  public int getCompiledMaximumSize() {
+    return compiledMaximumSize;
+  }
 
-    public void setCompiledMaximumSize(int compiledMaximumSize) {
-        this.compiledMaximumSize = compiledMaximumSize;
-    }
+  public void setCompiledMaximumSize(int compiledMaximumSize) {
+    this.compiledMaximumSize = compiledMaximumSize;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/SchemaRepositoryProperties.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/SchemaRepositoryProperties.java
index a9746a764f..544c5be382 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/SchemaRepositoryProperties.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/config/SchemaRepositoryProperties.java
@@ -4,73 +4,73 @@
 
 public class SchemaRepositoryProperties {
 
-    private String serverUrl = "http://localhost:8888/";
+  private String serverUrl = "http://localhost:8888/";
 
-    private Duration httpReadTimeout = Duration.ofSeconds(2);
+  private Duration httpReadTimeout = Duration.ofSeconds(2);
 
-    private Duration httpConnectTimeout = Duration.ofSeconds(2000);
+  private Duration httpConnectTimeout = Duration.ofSeconds(2000);
 
-    private double onlineCheckPermitsPerSecond = 100.0;
+  private double onlineCheckPermitsPerSecond = 100.0;
 
-    private Duration onlineCheckAcquireWait = Duration.ofMillis(500);
+  private Duration onlineCheckAcquireWait = Duration.ofMillis(500);
 
-    private boolean subjectSuffixEnabled = false;
+  private boolean subjectSuffixEnabled = false;
 
-    private boolean subjectNamespaceEnabled = false;
+  private boolean subjectNamespaceEnabled = false;
 
-    public String getServerUrl() {
-        return serverUrl;
-    }
+  public String getServerUrl() {
+    return serverUrl;
+  }
 
-    public void setServerUrl(String serverUrl) {
-        this.serverUrl = serverUrl;
-    }
+  public void setServerUrl(String serverUrl) {
+    this.serverUrl = serverUrl;
+  }
 
-    public Duration getHttpReadTimeout() {
-        return httpReadTimeout;
-    }
+  public Duration getHttpReadTimeout() {
+    return httpReadTimeout;
+  }
 
-    public void setHttpReadTimeout(Duration httpReadTimeout) {
-        this.httpReadTimeout = httpReadTimeout;
-    }
+  public void setHttpReadTimeout(Duration httpReadTimeout) {
+    this.httpReadTimeout = httpReadTimeout;
+  }
 
-    public Duration getHttpConnectTimeout() {
-        return httpConnectTimeout;
-    }
+  public Duration getHttpConnectTimeout() {
+    return httpConnectTimeout;
+  }
 
-    public void setHttpConnectTimeout(Duration httpConnectTimeout) {
-        this.httpConnectTimeout = httpConnectTimeout;
-    }
+  public void setHttpConnectTimeout(Duration httpConnectTimeout) {
+    this.httpConnectTimeout = httpConnectTimeout;
+  }
 
-    public double getOnlineCheckPermitsPerSecond() {
-        return onlineCheckPermitsPerSecond;
-    }
+  public double getOnlineCheckPermitsPerSecond() {
+    return onlineCheckPermitsPerSecond;
+  }
 
-    public void setOnlineCheckPermitsPerSecond(double onlineCheckPermitsPerSecond) {
-        this.onlineCheckPermitsPerSecond = onlineCheckPermitsPerSecond;
-    }
+  public void setOnlineCheckPermitsPerSecond(double onlineCheckPermitsPerSecond) {
+    this.onlineCheckPermitsPerSecond = onlineCheckPermitsPerSecond;
+  }
 
-    public Duration getOnlineCheckAcquireWait() {
-        return onlineCheckAcquireWait;
-    }
+  public Duration getOnlineCheckAcquireWait() {
+    return onlineCheckAcquireWait;
+  }
 
-    public void setOnlineCheckAcquireWait(Duration onlineCheckAcquireWait) {
-        this.onlineCheckAcquireWait = onlineCheckAcquireWait;
-    }
+  public void setOnlineCheckAcquireWait(Duration onlineCheckAcquireWait) {
+    this.onlineCheckAcquireWait = onlineCheckAcquireWait;
+  }
 
-    public boolean isSubjectSuffixEnabled() {
-        return subjectSuffixEnabled;
-    }
+  public boolean isSubjectSuffixEnabled() {
+    return subjectSuffixEnabled;
+  }
 
-    public void setSubjectSuffixEnabled(boolean subjectSuffixEnabled) {
-        this.subjectSuffixEnabled = subjectSuffixEnabled;
-    }
+  public void setSubjectSuffixEnabled(boolean subjectSuffixEnabled) {
+    this.subjectSuffixEnabled = subjectSuffixEnabled;
+  }
 
-    public boolean isSubjectNamespaceEnabled() {
-        return subjectNamespaceEnabled;
-    }
+  public boolean isSubjectNamespaceEnabled() {
+    return subjectNamespaceEnabled;
+  }
 
-    public void setSubjectNamespaceEnabled(boolean subjectNamespaceEnabled) {
-        this.subjectNamespaceEnabled = subjectNamespaceEnabled;
-    }
+  public void setSubjectNamespaceEnabled(boolean subjectNamespaceEnabled) {
+    this.subjectNamespaceEnabled = subjectNamespaceEnabled;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/CuratorClientFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/CuratorClientFactory.java
index 351fb66e87..59951d29ac 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/CuratorClientFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/CuratorClientFactory.java
@@ -1,6 +1,9 @@
 package pl.allegro.tech.hermes.common.di.factories;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ThreadFactory;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.api.ACLProvider;
@@ -11,88 +14,88 @@
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ThreadFactory;
-
 public class CuratorClientFactory {
 
-    public static class ZookeeperAuthorization {
-        private final String scheme;
-        private final String user;
-        private final String password;
+  public static class ZookeeperAuthorization {
+    private final String scheme;
+    private final String user;
+    private final String password;
 
-        public ZookeeperAuthorization(String scheme, String user, String password) {
-            this.scheme = scheme;
-            this.user = user;
-            this.password = password;
-        }
+    public ZookeeperAuthorization(String scheme, String user, String password) {
+      this.scheme = scheme;
+      this.user = user;
+      this.password = password;
+    }
 
-        byte[] getAuth() {
-            return String.join(":", user, password).getBytes();
-        }
+    byte[] getAuth() {
+      return String.join(":", user, password).getBytes();
     }
+  }
 
-    private static final Logger logger = LoggerFactory.getLogger(CuratorClientFactory.class);
-    private final ZookeeperParameters zookeeperParameters;
+  private static final Logger logger = LoggerFactory.getLogger(CuratorClientFactory.class);
+  private final ZookeeperParameters zookeeperParameters;
 
-    public CuratorClientFactory(ZookeeperParameters zookeeperParameters) {
-        this.zookeeperParameters = zookeeperParameters;
-    }
+  public CuratorClientFactory(ZookeeperParameters zookeeperParameters) {
+    this.zookeeperParameters = zookeeperParameters;
+  }
 
-    public CuratorFramework provide(String connectString) {
-        return provide(connectString, Optional.empty());
-    }
+  public CuratorFramework provide(String connectString) {
+    return provide(connectString, Optional.empty());
+  }
 
-    public CuratorFramework provide(String connectString, Optional<ZookeeperAuthorization> zookeeperAuthorization) {
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("hermes-curator-%d")
-                .setUncaughtExceptionHandler((t, e) ->
-                        logger.error("Exception from curator with name {}", t.getName(), e)).build();
-        CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
-                .threadFactory(threadFactory)
-                .connectString(connectString)
-                .sessionTimeoutMs((int) zookeeperParameters.getSessionTimeout().toMillis())
-                .connectionTimeoutMs((int) zookeeperParameters.getConnectionTimeout().toMillis())
-                .retryPolicy(
-                        new ExponentialBackoffRetry(
-                                (int) zookeeperParameters.getBaseSleepTime().toMillis(),
-                                zookeeperParameters.getMaxRetries(),
-                                (int) zookeeperParameters.getMaxSleepTime().toMillis()
-                        )
-                );
+  public CuratorFramework provide(
+      String connectString, Optional<ZookeeperAuthorization> zookeeperAuthorization) {
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder()
+            .setNameFormat("hermes-curator-%d")
+            .setUncaughtExceptionHandler(
+                (t, e) -> logger.error("Exception from curator with name {}", t.getName(), e))
+            .build();
+    CuratorFrameworkFactory.Builder builder =
+        CuratorFrameworkFactory.builder()
+            .threadFactory(threadFactory)
+            .connectString(connectString)
+            .sessionTimeoutMs((int) zookeeperParameters.getSessionTimeout().toMillis())
+            .connectionTimeoutMs((int) zookeeperParameters.getConnectionTimeout().toMillis())
+            .retryPolicy(
+                new ExponentialBackoffRetry(
+                    (int) zookeeperParameters.getBaseSleepTime().toMillis(),
+                    zookeeperParameters.getMaxRetries(),
+                    (int) zookeeperParameters.getMaxSleepTime().toMillis()));
 
-        zookeeperAuthorization.ifPresent(it -> {
-            builder.authorization(it.scheme, it.getAuth());
-            builder.aclProvider(
-                    new ACLProvider() {
-                        @Override
-                        public List<ACL> getDefaultAcl() {
-                            return ZooDefs.Ids.CREATOR_ALL_ACL;
-                        }
+    zookeeperAuthorization.ifPresent(
+        it -> {
+          builder.authorization(it.scheme, it.getAuth());
+          builder.aclProvider(
+              new ACLProvider() {
+                @Override
+                public List<ACL> getDefaultAcl() {
+                  return ZooDefs.Ids.CREATOR_ALL_ACL;
+                }
 
-                        @Override
-                        public List<ACL> getAclForPath(String path) {
-                            return ZooDefs.Ids.CREATOR_ALL_ACL;
-                        }
-                    }
-            );
+                @Override
+                public List<ACL> getAclForPath(String path) {
+                  return ZooDefs.Ids.CREATOR_ALL_ACL;
+                }
+              });
         });
 
-        CuratorFramework curatorClient = builder.build();
-        startAndWaitForConnection(curatorClient);
+    CuratorFramework curatorClient = builder.build();
+    startAndWaitForConnection(curatorClient);
 
-        return curatorClient;
-    }
+    return curatorClient;
+  }
 
-    private void startAndWaitForConnection(CuratorFramework curator) {
-        curator.start();
-        try {
-            curator.blockUntilConnected();
-        } catch (InterruptedException interruptedException) {
-            RuntimeException exception = new InternalProcessingException("Could not start Zookeeper Curator", interruptedException);
-            logger.error(exception.getMessage(), interruptedException);
-            throw exception;
-        }
+  private void startAndWaitForConnection(CuratorFramework curator) {
+    curator.start();
+    try {
+      curator.blockUntilConnected();
+    } catch (InterruptedException interruptedException) {
+      RuntimeException exception =
+          new InternalProcessingException(
+              "Could not start Zookeeper Curator", interruptedException);
+      logger.error(exception.getMessage(), interruptedException);
+      throw exception;
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/GraphiteParameters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/GraphiteParameters.java
deleted file mode 100644
index 84314096c4..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/GraphiteParameters.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.allegro.tech.hermes.common.di.factories;
-
-public interface GraphiteParameters {
-
-    String getPrefix();
-
-    String getHost();
-
-    int getPort();
-}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/HermesCuratorClientFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/HermesCuratorClientFactory.java
index 2817083d2b..6152c55f9c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/HermesCuratorClientFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/HermesCuratorClientFactory.java
@@ -1,32 +1,33 @@
 package pl.allegro.tech.hermes.common.di.factories;
 
-import org.apache.curator.framework.CuratorFramework;
-
 import java.util.Optional;
+import org.apache.curator.framework.CuratorFramework;
 
 public class HermesCuratorClientFactory {
 
-    private final ZookeeperParameters zookeeperParameters;
-    private final CuratorClientFactory curatorClientFactory;
+  private final ZookeeperParameters zookeeperParameters;
+  private final CuratorClientFactory curatorClientFactory;
 
-    public HermesCuratorClientFactory(ZookeeperParameters zookeeperParameters, CuratorClientFactory curatorClientFactory) {
-        this.zookeeperParameters = zookeeperParameters;
-        this.curatorClientFactory = curatorClientFactory;
-    }
-
-    public CuratorFramework provide() {
-        String connectString = zookeeperParameters.getConnectionString();
+  public HermesCuratorClientFactory(
+      ZookeeperParameters zookeeperParameters, CuratorClientFactory curatorClientFactory) {
+    this.zookeeperParameters = zookeeperParameters;
+    this.curatorClientFactory = curatorClientFactory;
+  }
 
-        Optional<CuratorClientFactory.ZookeeperAuthorization> authorization = Optional.empty();
+  public CuratorFramework provide() {
+    String connectString = zookeeperParameters.getConnectionString();
 
-        if (zookeeperParameters.isAuthorizationEnabled()) {
-            authorization = Optional.of(new CuratorClientFactory.ZookeeperAuthorization(
-                    zookeeperParameters.getScheme(),
-                    zookeeperParameters.getUser(),
-                    zookeeperParameters.getPassword())
-            );
-        }
+    Optional<CuratorClientFactory.ZookeeperAuthorization> authorization = Optional.empty();
 
-        return curatorClientFactory.provide(connectString, authorization);
+    if (zookeeperParameters.isAuthorizationEnabled()) {
+      authorization =
+          Optional.of(
+              new CuratorClientFactory.ZookeeperAuthorization(
+                  zookeeperParameters.getScheme(),
+                  zookeeperParameters.getUser(),
+                  zookeeperParameters.getPassword()));
     }
+
+    return curatorClientFactory.provide(connectString, authorization);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryFactory.java
deleted file mode 100644
index 1d1de61579..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryFactory.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package pl.allegro.tech.hermes.common.di.factories;
-
-import com.codahale.metrics.ConsoleReporter;
-import com.codahale.metrics.Metric;
-import com.codahale.metrics.MetricAttribute;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.MetricSet;
-import com.codahale.metrics.graphite.Graphite;
-import com.codahale.metrics.graphite.GraphiteReporter;
-import com.codahale.metrics.jvm.FileDescriptorRatioGauge;
-import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
-import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Sets;
-import jakarta.inject.Named;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
-import pl.allegro.tech.hermes.common.metric.MetricRegistryWithHdrHistogramReservoir;
-import pl.allegro.tech.hermes.common.util.InstanceIdResolver;
-
-import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-public class MetricRegistryFactory {
-
-    private static final Logger logger = LoggerFactory.getLogger(MetricRegistryFactory.class);
-    private final MetricRegistryParameters metricRegistryParameters;
-    private final GraphiteParameters graphiteParameters;
-    private final InstanceIdResolver instanceIdResolver;
-    private final String moduleName;
-
-    public MetricRegistryFactory(MetricRegistryParameters metricRegistryParameters,
-                                 GraphiteParameters graphiteParameters,
-                                 InstanceIdResolver instanceIdResolver,
-                                 @Named("moduleName") String moduleName) {
-        this.metricRegistryParameters = metricRegistryParameters;
-        this.graphiteParameters = graphiteParameters;
-        this.instanceIdResolver = instanceIdResolver;
-        this.moduleName = moduleName;
-    }
-
-    public MetricRegistry provide() {
-        MetricRegistry registry = new MetricRegistryWithHdrHistogramReservoir();
-
-        if (metricRegistryParameters.isGraphiteReporterEnabled()) {
-            String prefix = Joiner.on(".").join(
-                    graphiteParameters.getPrefix(),
-                    moduleName,
-                    instanceIdResolver.resolve().replaceAll("\\.", HermesMetrics.REPLACEMENT_CHAR));
-
-            GraphiteReporter
-                    .forRegistry(registry)
-                    .prefixedWith(prefix)
-                    .disabledMetricAttributes(getDisabledAttributesFromConfig())
-                    .build(new Graphite(new InetSocketAddress(
-                            graphiteParameters.getHost(),
-                            graphiteParameters.getPort()
-                    )))
-                    .start(metricRegistryParameters.getReportPeriod().toSeconds(), TimeUnit.SECONDS);
-        }
-        if (metricRegistryParameters.isConsoleReporterEnabled()) {
-            ConsoleReporter.forRegistry(registry).build().start(
-                    metricRegistryParameters.getReportPeriod().toSeconds(), TimeUnit.SECONDS
-            );
-        }
-        registerJvmMetrics(registry);
-
-        return registry;
-    }
-
-    private void registerJvmMetrics(MetricRegistry metricRegistry) {
-        registerAll("jvm.gc", new GarbageCollectorMetricSet(), metricRegistry);
-        registerAll("jvm.memory", new MemoryUsageGaugeSet(), metricRegistry);
-        metricRegistry.register("jvm.descriptors", new FileDescriptorRatioGauge());
-    }
-
-    private void registerAll(String prefix, MetricSet metricSet, MetricRegistry registry) {
-        for (Map.Entry<String, Metric> entry : metricSet.getMetrics().entrySet()) {
-            if (entry.getValue() instanceof MetricSet) {
-                registerAll(prefix + "." + entry.getKey(), (MetricSet) entry.getValue(), registry);
-            } else {
-                registry.register(prefix + "." + entry.getKey(), entry.getValue());
-            }
-        }
-    }
-
-    private Set<MetricAttribute> getDisabledAttributesFromConfig() {
-        Set<MetricAttribute> disabledAttributes = Sets.newHashSet();
-        String disabledAttributesFromConfig = metricRegistryParameters.getDisabledAttributes();
-        List<String> disabledAttributesList = Arrays.asList(disabledAttributesFromConfig.split("\\s*,\\s*"));
-
-        disabledAttributesList.forEach(singleAttribute -> {
-            try {
-                disabledAttributes.add(MetricAttribute.valueOf(singleAttribute));
-            } catch (IllegalArgumentException e) {
-                logger.warn("Failed to add disabled attribute from config: {}", e.getMessage());
-            }
-        });
-
-        return disabledAttributes;
-    }
-}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryParameters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryParameters.java
deleted file mode 100644
index d112cea526..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryParameters.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package pl.allegro.tech.hermes.common.di.factories;
-
-import java.time.Duration;
-
-public interface MetricRegistryParameters {
-
-    boolean isZookeeperReporterEnabled();
-
-    boolean isGraphiteReporterEnabled();
-
-    boolean isConsoleReporterEnabled();
-
-    String getDisabledAttributes();
-
-    Duration getReportPeriod();
-}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MicrometerRegistryParameters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MicrometerRegistryParameters.java
index 48a74a84ea..0c599b13b2 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MicrometerRegistryParameters.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MicrometerRegistryParameters.java
@@ -4,9 +4,9 @@
 import java.util.List;
 
 public interface MicrometerRegistryParameters {
-    List<Double> getPercentiles();
+  List<Double> getPercentiles();
 
-    boolean zookeeperReporterEnabled();
+  boolean zookeeperReporterEnabled();
 
-    Duration zookeeperReportPeriod();
+  Duration zookeeperReportPeriod();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ModelAwareZookeeperNotifyingCacheFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ModelAwareZookeeperNotifyingCacheFactory.java
index cbd1f1998e..2bc4d9bd3c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ModelAwareZookeeperNotifyingCacheFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ModelAwareZookeeperNotifyingCacheFactory.java
@@ -1,29 +1,58 @@
 package pl.allegro.tech.hermes.common.di.factories;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import org.apache.curator.framework.CuratorFramework;
+import pl.allegro.tech.hermes.common.cache.queue.LinkedHashSetBlockingQueue;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.cache.ModelAwareZookeeperNotifyingCache;
 
 public class ModelAwareZookeeperNotifyingCacheFactory {
 
-    private final CuratorFramework curator;
+  private final CuratorFramework curator;
 
-    private final ZookeeperParameters zookeeperParameters;
+  private final MetricsFacade metricsFacade;
 
-    public ModelAwareZookeeperNotifyingCacheFactory(CuratorFramework curator, ZookeeperParameters zookeeperParameters) {
-        this.curator = curator;
-        this.zookeeperParameters = zookeeperParameters;
-    }
+  private final ZookeeperParameters zookeeperParameters;
+
+  public ModelAwareZookeeperNotifyingCacheFactory(
+      CuratorFramework curator,
+      MetricsFacade metricaFacade,
+      ZookeeperParameters zookeeperParameters) {
+    this.curator = curator;
+    this.metricsFacade = metricaFacade;
+    this.zookeeperParameters = zookeeperParameters;
+  }
 
-    public ModelAwareZookeeperNotifyingCache provide() {
-        String rootPath = zookeeperParameters.getRoot();
-        ModelAwareZookeeperNotifyingCache cache = new ModelAwareZookeeperNotifyingCache(
-                curator, rootPath, zookeeperParameters.getProcessingThreadPoolSize()
-        );
-        try {
-            cache.start();
-        } catch (Exception e) {
-            throw new IllegalStateException("Unable to start Zookeeper cache for root path " + rootPath, e);
-        }
-        return cache;
+  public ModelAwareZookeeperNotifyingCache provide() {
+    String rootPath = zookeeperParameters.getRoot();
+    ExecutorService executor =
+        createExecutor(rootPath, zookeeperParameters.getProcessingThreadPoolSize());
+    ModelAwareZookeeperNotifyingCache cache =
+        new ModelAwareZookeeperNotifyingCache(curator, executor, rootPath);
+    try {
+      cache.start();
+    } catch (Exception e) {
+      throw new IllegalStateException(
+          "Unable to start Zookeeper cache for root path " + rootPath, e);
     }
+    return cache;
+  }
+
+  private ExecutorService createExecutor(String rootPath, int processingThreadPoolSize) {
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat(rootPath + "-zk-cache-%d").build();
+    ExecutorService executor =
+        new ThreadPoolExecutor(
+            1,
+            processingThreadPoolSize,
+            Integer.MAX_VALUE,
+            TimeUnit.SECONDS,
+            new LinkedHashSetBlockingQueue<>(),
+            threadFactory);
+    return metricsFacade.executor().monitor(executor, rootPath + "zk-cache");
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ObjectMapperFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ObjectMapperFactory.java
index 368e8cf0bd..8ac12fee47 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ObjectMapperFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ObjectMapperFactory.java
@@ -10,23 +10,30 @@
 
 public class ObjectMapperFactory {
 
-    private final boolean schemaIdSerializationEnabled;
+  private final boolean schemaIdSerializationEnabled;
+  private final boolean fallbackToRemoteDatacenterEnabled;
 
-    public ObjectMapperFactory(boolean schemaIdSerializationEnabled) {
-        this.schemaIdSerializationEnabled = schemaIdSerializationEnabled;
-    }
+  public ObjectMapperFactory(
+      boolean schemaIdSerializationEnabled, boolean fallbackToRemoteDatacenterEnabled) {
+    this.schemaIdSerializationEnabled = schemaIdSerializationEnabled;
+    this.fallbackToRemoteDatacenterEnabled = fallbackToRemoteDatacenterEnabled;
+  }
 
-    public ObjectMapper provide() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        objectMapper.disable(SerializationFeature.WRITE_NULL_MAP_VALUES);
-        objectMapper.registerModule(new JavaTimeModule());
+  public ObjectMapper provide() {
+    ObjectMapper objectMapper = new ObjectMapper();
+    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    objectMapper.disable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+    objectMapper.registerModule(new JavaTimeModule());
 
-        final InjectableValues defaultSchemaIdAwareSerializationEnabled = new InjectableValues
-                .Std().addValue(Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, schemaIdSerializationEnabled);
-        objectMapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
+    final InjectableValues defaultSchemaIdAwareSerializationEnabled =
+        new InjectableValues.Std()
+            .addValue(
+                Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, schemaIdSerializationEnabled)
+            .addValue(
+                Topic.DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, fallbackToRemoteDatacenterEnabled);
+    objectMapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
 
-        return objectMapper;
-    }
+    return objectMapper;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/PrometheusMeterRegistryFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/PrometheusMeterRegistryFactory.java
index d2849d9cb1..7d46f2bba2 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/PrometheusMeterRegistryFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/PrometheusMeterRegistryFactory.java
@@ -9,61 +9,69 @@
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
 import io.micrometer.prometheus.PrometheusConfig;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
+import java.util.concurrent.TimeUnit;
 import pl.allegro.tech.hermes.common.metric.counter.CounterStorage;
 import pl.allegro.tech.hermes.common.metric.counter.zookeeper.ZookeeperCounterReporter;
 
-import java.util.concurrent.TimeUnit;
-
 public class PrometheusMeterRegistryFactory {
-    private final MicrometerRegistryParameters parameters;
-    private final PrometheusConfig prometheusConfig;
-    private final CounterStorage counterStorage;
-    private final String prefix;
+  private final MicrometerRegistryParameters parameters;
+  private final PrometheusConfig prometheusConfig;
+  private final CounterStorage counterStorage;
+  private final String prefix;
 
-    public PrometheusMeterRegistryFactory(MicrometerRegistryParameters parameters,
-                                          PrometheusConfig prometheusConfig,
-                                          CounterStorage counterStorage, String prefix) {
-        this.parameters = parameters;
-        this.prometheusConfig = prometheusConfig;
-        this.counterStorage = counterStorage;
-        this.prefix = prefix + "_";
-    }
+  public PrometheusMeterRegistryFactory(
+      MicrometerRegistryParameters parameters,
+      PrometheusConfig prometheusConfig,
+      CounterStorage counterStorage,
+      String prefix) {
+    this.parameters = parameters;
+    this.prometheusConfig = prometheusConfig;
+    this.counterStorage = counterStorage;
+    this.prefix = prefix + "_";
+  }
 
-    public PrometheusMeterRegistry provide() {
-        PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(prometheusConfig);
-        applyFilters(meterRegistry);
-        if (parameters.zookeeperReporterEnabled()) {
-            registerZookeeperReporter(meterRegistry);
-        }
-        registerJvmMetrics(meterRegistry);
-        return meterRegistry;
+  public PrometheusMeterRegistry provide() {
+    PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(prometheusConfig);
+    applyFilters(meterRegistry);
+    if (parameters.zookeeperReporterEnabled()) {
+      registerZookeeperReporter(meterRegistry);
     }
+    registerJvmMetrics(meterRegistry);
+    return meterRegistry;
+  }
 
-    private void applyFilters(PrometheusMeterRegistry meterRegistry) {
-        meterRegistry.config().meterFilter(new MeterFilter() {
-            @Override
-            public Meter.Id map(Meter.Id id) {
+  private void applyFilters(PrometheusMeterRegistry meterRegistry) {
+    meterRegistry
+        .config()
+        .meterFilter(
+            new MeterFilter() {
+              @Override
+              public Meter.Id map(Meter.Id id) {
                 return id.withName(prefix + id.getName());
-            }
+              }
 
-            @Override
-            public DistributionStatisticConfig configure(Meter.Id id, DistributionStatisticConfig config) {
+              @Override
+              public DistributionStatisticConfig configure(
+                  Meter.Id id, DistributionStatisticConfig config) {
                 return DistributionStatisticConfig.builder()
-                        .percentiles(parameters.getPercentiles()
-                                .stream().mapToDouble(Double::doubleValue).toArray()
-                ).build().merge(config);
-            }
-        });
-    }
+                    .percentiles(
+                        parameters.getPercentiles().stream()
+                            .mapToDouble(Double::doubleValue)
+                            .toArray())
+                    .build()
+                    .merge(config);
+              }
+            });
+  }
 
-    private void registerZookeeperReporter(PrometheusMeterRegistry meterRegistry) {
-        new ZookeeperCounterReporter(meterRegistry, counterStorage, prefix)
-                .start(parameters.zookeeperReportPeriod().toSeconds(), TimeUnit.SECONDS);
-    }
+  private void registerZookeeperReporter(PrometheusMeterRegistry meterRegistry) {
+    new ZookeeperCounterReporter(meterRegistry, counterStorage, prefix)
+        .start(parameters.zookeeperReportPeriod().toSeconds(), TimeUnit.SECONDS);
+  }
 
-    private void registerJvmMetrics(MeterRegistry meterRegistry) {
-        new JvmMemoryMetrics().bindTo(meterRegistry);
-        new JvmGcMetrics().bindTo(meterRegistry);
-        new JvmThreadMetrics().bindTo(meterRegistry);
-    }
+  private void registerJvmMetrics(MeterRegistry meterRegistry) {
+    new JvmMemoryMetrics().bindTo(meterRegistry);
+    new JvmGcMetrics().bindTo(meterRegistry);
+    new JvmThreadMetrics().bindTo(meterRegistry);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ZookeeperParameters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ZookeeperParameters.java
index 7c8a7b36ee..6123d4926e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ZookeeperParameters.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ZookeeperParameters.java
@@ -4,27 +4,27 @@
 
 public interface ZookeeperParameters {
 
-    String getConnectionString();
+  String getConnectionString();
 
-    Duration getBaseSleepTime();
+  Duration getBaseSleepTime();
 
-    Duration getMaxSleepTime();
+  Duration getMaxSleepTime();
 
-    int getMaxRetries();
+  int getMaxRetries();
 
-    Duration getConnectionTimeout();
+  Duration getConnectionTimeout();
 
-    Duration getSessionTimeout();
+  Duration getSessionTimeout();
 
-    String getRoot();
+  String getRoot();
 
-    int getProcessingThreadPoolSize();
+  int getProcessingThreadPoolSize();
 
-    boolean isAuthorizationEnabled();
+  boolean isAuthorizationEnabled();
 
-    String getScheme();
+  String getScheme();
 
-    String getUser();
+  String getUser();
 
-    String getPassword();
+  String getPassword();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/BrokerInfoNotAvailableException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/BrokerInfoNotAvailableException.java
index 5b1d033b4a..9e99906700 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/BrokerInfoNotAvailableException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/BrokerInfoNotAvailableException.java
@@ -2,7 +2,7 @@
 
 public class BrokerInfoNotAvailableException extends InternalProcessingException {
 
-    public BrokerInfoNotAvailableException(Integer brokerId, Throwable cause) {
-        super("Could not find or read info about broker with id " + brokerId, cause);
-    }
+  public BrokerInfoNotAvailableException(Integer brokerId, Throwable cause) {
+    super("Could not find or read info about broker with id " + brokerId, cause);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/BrokerNotFoundForPartitionException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/BrokerNotFoundForPartitionException.java
index 8eff999a1d..15604905ee 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/BrokerNotFoundForPartitionException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/BrokerNotFoundForPartitionException.java
@@ -3,7 +3,7 @@
 @SuppressWarnings("serial")
 public class BrokerNotFoundForPartitionException extends InternalProcessingException {
 
-    public BrokerNotFoundForPartitionException(String topic, int partition, Throwable cause) {
-        super(String.format("Broker not found for topic %s and partition %d", topic, partition), cause);
-    }
+  public BrokerNotFoundForPartitionException(String topic, int partition, Throwable cause) {
+    super(String.format("Broker not found for topic %s and partition %d", topic, partition), cause);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/EndpointProtocolNotSupportedException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/EndpointProtocolNotSupportedException.java
index 5b8c150684..a6d00e08ef 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/EndpointProtocolNotSupportedException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/EndpointProtocolNotSupportedException.java
@@ -5,12 +5,15 @@
 
 public class EndpointProtocolNotSupportedException extends HermesException {
 
-    public EndpointProtocolNotSupportedException(EndpointAddress endpoint) {
-        super(String.format("Protocol %s not supported in endpoint %s", endpoint.getProtocol(), endpoint.toString()));
-    }
+  public EndpointProtocolNotSupportedException(EndpointAddress endpoint) {
+    super(
+        String.format(
+            "Protocol %s not supported in endpoint %s",
+            endpoint.getProtocol(), endpoint.toString()));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.VALIDATION_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.VALIDATION_ERROR;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/HermesException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/HermesException.java
index 7d21902938..f0153a52bb 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/HermesException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/HermesException.java
@@ -2,19 +2,18 @@
 
 import pl.allegro.tech.hermes.api.ErrorCode;
 
-
 public abstract class HermesException extends RuntimeException {
-    public HermesException(Throwable t) {
-        super(t);
-    }
+  public HermesException(Throwable t) {
+    super(t);
+  }
 
-    public HermesException(String message) {
-        super(message);
-    }
+  public HermesException(String message) {
+    super(message);
+  }
 
-    public HermesException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public HermesException(String message, Throwable cause) {
+    super(message, cause);
+  }
 
-    public abstract ErrorCode getCode();
+  public abstract ErrorCode getCode();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/InternalProcessingException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/InternalProcessingException.java
index 7983ae724d..5e3ec2d1b9 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/InternalProcessingException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/InternalProcessingException.java
@@ -1,15 +1,15 @@
 package pl.allegro.tech.hermes.common.exception;
 
 public class InternalProcessingException extends RuntimeException {
-    public InternalProcessingException(Throwable throwable) {
-        super(throwable);
-    }
+  public InternalProcessingException(Throwable throwable) {
+    super(throwable);
+  }
 
-    public InternalProcessingException(String message) {
-        super(message);
-    }
+  public InternalProcessingException(String message) {
+    super(message);
+  }
 
-    public InternalProcessingException(String message, Throwable throwable) {
-        super(message, throwable);
-    }
+  public InternalProcessingException(String message, Throwable throwable) {
+    super(message, throwable);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/PartitionsNotFoundForGivenTopicException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/PartitionsNotFoundForGivenTopicException.java
index 7e290ffb5a..b3481d2fdf 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/PartitionsNotFoundForGivenTopicException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/PartitionsNotFoundForGivenTopicException.java
@@ -5,12 +5,12 @@
 @SuppressWarnings("serial")
 public class PartitionsNotFoundForGivenTopicException extends HermesException {
 
-    public PartitionsNotFoundForGivenTopicException(String topicName, Throwable cause) {
-        super(String.format("Partitions not found for topic: %s", topicName), cause);
-    }
+  public PartitionsNotFoundForGivenTopicException(String topicName, Throwable cause) {
+    super(String.format("Partitions not found for topic: %s", topicName), cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.PARTITIONS_NOT_FOUND_FOR_TOPIC;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.PARTITIONS_NOT_FOUND_FOR_TOPIC;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/RepositoryNotAvailableException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/RepositoryNotAvailableException.java
index dd2a0bbaf0..fef3a94e5b 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/RepositoryNotAvailableException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/RepositoryNotAvailableException.java
@@ -2,8 +2,7 @@
 
 public class RepositoryNotAvailableException extends InternalProcessingException {
 
-    public RepositoryNotAvailableException(String message) {
-        super(message);
-    }
-
+  public RepositoryNotAvailableException(String message) {
+    super(message);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/RetransmissionException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/RetransmissionException.java
index 5d0b43be90..44d13ba790 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/RetransmissionException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/RetransmissionException.java
@@ -4,16 +4,16 @@
 
 public class RetransmissionException extends HermesException {
 
-    public RetransmissionException(String message) {
-        super(message);
-    }
+  public RetransmissionException(String message) {
+    super(message);
+  }
 
-    public RetransmissionException(Throwable cause) {
-        super("Error during retransmitting messages.", cause);
-    }
+  public RetransmissionException(Throwable cause) {
+    super("Error during retransmitting messages.", cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.RETRANSMISSION_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.RETRANSMISSION_EXCEPTION;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/SubscriptionEndpointAddressChangeException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/SubscriptionEndpointAddressChangeException.java
index a62d93e822..e2c6b7d421 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/SubscriptionEndpointAddressChangeException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/SubscriptionEndpointAddressChangeException.java
@@ -3,12 +3,12 @@
 import pl.allegro.tech.hermes.api.ErrorCode;
 
 public class SubscriptionEndpointAddressChangeException extends HermesException {
-    public SubscriptionEndpointAddressChangeException(Throwable cause) {
-        super("Error during change topic endpoint address.", cause);
-    }
+  public SubscriptionEndpointAddressChangeException(Throwable cause) {
+    super("Error during change topic endpoint address.", cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SUBSCRIPTION_ENDPOINT_ADDRESS_CHANGE_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SUBSCRIPTION_ENDPOINT_ADDRESS_CHANGE_EXCEPTION;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/UnavailableRateException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/UnavailableRateException.java
index 1c671f8415..4b5123b8b5 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/UnavailableRateException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/exception/UnavailableRateException.java
@@ -6,23 +6,24 @@
 @SuppressWarnings("serial")
 public class UnavailableRateException extends HermesException {
 
-    public UnavailableRateException(TopicName topicName, String subscriptionName, Throwable cause) {
-        super(String.format(
-                "Rate for %s subscription on %s topic in group %s is unavailable.",
-                subscriptionName, topicName.getName(), topicName.getGroupName()), cause
-            );
-    }
+  public UnavailableRateException(TopicName topicName, String subscriptionName, Throwable cause) {
+    super(
+        String.format(
+            "Rate for %s subscription on %s topic in group %s is unavailable.",
+            subscriptionName, topicName.getName(), topicName.getGroupName()),
+        cause);
+  }
 
-    public UnavailableRateException(TopicName topicName, Throwable cause) {
-        super(String.format(
-                "Rate for %s topic in group %s is unavailable",
-                topicName.getName(), topicName.getGroupName()),
-                cause
-            );
-    }
+  public UnavailableRateException(TopicName topicName, Throwable cause) {
+    super(
+        String.format(
+            "Rate for %s topic in group %s is unavailable",
+            topicName.getName(), topicName.getGroupName()),
+        cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.UNAVAILABLE_RATE;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.UNAVAILABLE_RATE;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/http/ExtraRequestHeadersCollector.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/http/ExtraRequestHeadersCollector.java
index d334c8b0e2..6f321ebbd8 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/http/ExtraRequestHeadersCollector.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/http/ExtraRequestHeadersCollector.java
@@ -9,46 +9,46 @@
 import java.util.function.Supplier;
 import java.util.stream.Collector;
 
-public class ExtraRequestHeadersCollector implements Collector<Map.Entry<String, String>, StringBuilder, String> {
-    private ExtraRequestHeadersCollector() {
-    }
-
-    public static ExtraRequestHeadersCollector extraRequestHeadersCollector() {
-        return new ExtraRequestHeadersCollector();
-    }
-
-    @Override
-    public Supplier<StringBuilder> supplier() {
-        return StringBuilder::new;
-    }
-
-    @Override
-    public BiConsumer<StringBuilder, Map.Entry<String, String>> accumulator() {
-        return (StringBuilder accumulator, Map.Entry<String, String> entry) -> {
-            accumulator.append(entry.getKey());
-            accumulator.append(": ");
-            accumulator.append(entry.getValue());
-            accumulator.append('\n');
-        };
-    }
-
-    @Override
-    public BinaryOperator<StringBuilder> combiner() {
-        return StringBuilder::append;
-    }
-
-    @Override
-    public Function<StringBuilder, String> finisher() {
-        return (StringBuilder acc) -> {
-            if (acc.length() > 0) {
-                acc.setLength(acc.length() - 1);
-            }
-            return acc.toString();
-        };
-    }
-
-    @Override
-    public Set<Characteristics> characteristics() {
-        return Collections.emptySet();
-    }
+public class ExtraRequestHeadersCollector
+    implements Collector<Map.Entry<String, String>, StringBuilder, String> {
+  private ExtraRequestHeadersCollector() {}
+
+  public static ExtraRequestHeadersCollector extraRequestHeadersCollector() {
+    return new ExtraRequestHeadersCollector();
+  }
+
+  @Override
+  public Supplier<StringBuilder> supplier() {
+    return StringBuilder::new;
+  }
+
+  @Override
+  public BiConsumer<StringBuilder, Map.Entry<String, String>> accumulator() {
+    return (StringBuilder accumulator, Map.Entry<String, String> entry) -> {
+      accumulator.append(entry.getKey());
+      accumulator.append(": ");
+      accumulator.append(entry.getValue());
+      accumulator.append('\n');
+    };
+  }
+
+  @Override
+  public BinaryOperator<StringBuilder> combiner() {
+    return StringBuilder::append;
+  }
+
+  @Override
+  public Function<StringBuilder, String> finisher() {
+    return (StringBuilder acc) -> {
+      if (acc.length() > 0) {
+        acc.setLength(acc.length() - 1);
+      }
+      return acc.toString();
+    };
+  }
+
+  @Override
+  public Set<Characteristics> characteristics() {
+    return Collections.emptySet();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/http/MessageMetadataHeaders.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/http/MessageMetadataHeaders.java
index d48f8002ce..943502748f 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/http/MessageMetadataHeaders.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/http/MessageMetadataHeaders.java
@@ -1,27 +1,26 @@
 package pl.allegro.tech.hermes.common.http;
 
 public enum MessageMetadataHeaders {
+  MESSAGE_ID("Hermes-Message-Id"),
+  BATCH_ID("Hermes-Batch-Id"),
+  TOPIC_NAME("Hermes-Topic-Name"),
+  SUBSCRIPTION_NAME("Hermes-Subscription-Name"),
+  RETRY_COUNT("Hermes-Retry-Count"),
+  SCHEMA_VERSION("Schema-Version"),
+  SCHEMA_ID("Schema-Id"),
+  PARTITION_KEY("Partition-Key");
 
-    MESSAGE_ID("Hermes-Message-Id"),
-    BATCH_ID("Hermes-Batch-Id"),
-    TOPIC_NAME("Hermes-Topic-Name"),
-    SUBSCRIPTION_NAME("Hermes-Subscription-Name"),
-    RETRY_COUNT("Hermes-Retry-Count"),
-    SCHEMA_VERSION("Schema-Version"),
-    SCHEMA_ID("Schema-Id"),
-    PARTITION_KEY("Partition-Key");
+  private final String headerName;
 
-    private final String headerName;
+  MessageMetadataHeaders(String headerName) {
+    this.headerName = headerName;
+  }
 
-    MessageMetadataHeaders(String headerName) {
-        this.headerName = headerName;
-    }
+  public String getName() {
+    return this.headerName;
+  }
 
-    public String getName() {
-        return this.headerName;
-    }
-
-    public String getCamelCaseName() {
-        return this.headerName.replace("-", "");
-    }
+  public String getCamelCaseName() {
+    return this.headerName.replace("-", "");
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/ConsumerGroupId.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/ConsumerGroupId.java
index aaff0c6110..b554fc6854 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/ConsumerGroupId.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/ConsumerGroupId.java
@@ -1,44 +1,44 @@
 package pl.allegro.tech.hermes.common.kafka;
 
-import java.util.Objects;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public class ConsumerGroupId {
+import java.util.Objects;
 
-    private final String value;
+public class ConsumerGroupId {
 
-    private ConsumerGroupId(String value) {
-        this.value = checkNotNull(value);
-    }
+  private final String value;
 
-    public static ConsumerGroupId valueOf(String value) {
-        return new ConsumerGroupId(value);
-    }
+  private ConsumerGroupId(String value) {
+    this.value = checkNotNull(value);
+  }
 
-    public String asString() {
-        return value;
-    }
+  public static ConsumerGroupId valueOf(String value) {
+    return new ConsumerGroupId(value);
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerGroupId that = (ConsumerGroupId) o;
-        return Objects.equals(value, that.value);
-    }
+  public String asString() {
+    return value;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(value);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return "ConsumerGroupId(" + value + ")";
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumerGroupId that = (ConsumerGroupId) o;
+    return Objects.equals(value, that.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
+
+  @Override
+  public String toString() {
+    return "ConsumerGroupId(" + value + ")";
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/HTTPHeadersPropagationAsKafkaHeadersProperties.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/HTTPHeadersPropagationAsKafkaHeadersProperties.java
new file mode 100644
index 0000000000..a28d0e951a
--- /dev/null
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/HTTPHeadersPropagationAsKafkaHeadersProperties.java
@@ -0,0 +1,7 @@
+package pl.allegro.tech.hermes.common.kafka;
+
+public interface HTTPHeadersPropagationAsKafkaHeadersProperties {
+  boolean isEnabled();
+
+  String getPrefix();
+}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/JsonToAvroMigrationKafkaNamesMapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/JsonToAvroMigrationKafkaNamesMapper.java
index 92ceaf4834..bfe177419c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/JsonToAvroMigrationKafkaNamesMapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/JsonToAvroMigrationKafkaNamesMapper.java
@@ -1,37 +1,45 @@
 package pl.allegro.tech.hermes.common.kafka;
 
+import java.util.function.Function;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.Topic;
 
-import java.util.function.Function;
-
 public class JsonToAvroMigrationKafkaNamesMapper extends NamespaceKafkaNamesMapper {
 
-    public JsonToAvroMigrationKafkaNamesMapper(String namespace, String namespaceSeparator) {
-        super(namespace, namespaceSeparator);
-    }
-
-    public KafkaTopics toKafkaTopics(Topic topic) {
-        KafkaTopic primary = mapToKafkaTopic.andThen(appendNamespace).andThen(appendContentTypeSuffix).apply(topic);
-
-        if (topic.wasMigratedFromJsonType()) {
-            KafkaTopic secondary = mapToJsonKafkaTopic.andThen(appendNamespace).andThen(appendContentTypeSuffix).apply(topic);
-            return new KafkaTopics(primary, secondary);
-        }
-        return new KafkaTopics(primary);
+  public JsonToAvroMigrationKafkaNamesMapper(String namespace, String namespaceSeparator) {
+    super(namespace, namespaceSeparator);
+  }
+
+  public KafkaTopics toKafkaTopics(Topic topic) {
+    KafkaTopic primary =
+        mapToKafkaTopic.andThen(appendNamespace).andThen(appendContentTypeSuffix).apply(topic);
+
+    if (topic.wasMigratedFromJsonType()) {
+      KafkaTopic secondary =
+          mapToJsonKafkaTopic
+              .andThen(appendNamespace)
+              .andThen(appendContentTypeSuffix)
+              .apply(topic);
+      return new KafkaTopics(primary, secondary);
     }
+    return new KafkaTopics(primary);
+  }
 
-    private final Function<Topic, KafkaTopic> mapToJsonKafkaTopic = it ->
-            new KafkaTopic(KafkaTopicName.valueOf(it.getQualifiedName()), ContentType.JSON);
+  private final Function<Topic, KafkaTopic> mapToJsonKafkaTopic =
+      it -> new KafkaTopic(KafkaTopicName.valueOf(it.getQualifiedName()), ContentType.JSON);
 
-    private final Function<KafkaTopic, KafkaTopic> appendContentTypeSuffix = kafkaTopic -> {
+  private final Function<KafkaTopic, KafkaTopic> appendContentTypeSuffix =
+      kafkaTopic -> {
         switch (kafkaTopic.contentType()) {
-            case JSON:
-                return kafkaTopic;
-            case AVRO:
-                return new KafkaTopic(KafkaTopicName.valueOf(kafkaTopic.name().asString() + "_avro"), kafkaTopic.contentType());
-            default:
-                throw new IllegalStateException(String.format("Unknown content type '%s'", kafkaTopic.contentType()));
+          case JSON:
+            return kafkaTopic;
+          case AVRO:
+            return new KafkaTopic(
+                KafkaTopicName.valueOf(kafkaTopic.name().asString() + "_avro"),
+                kafkaTopic.contentType());
+          default:
+            throw new IllegalStateException(
+                String.format("Unknown content type '%s'", kafkaTopic.contentType()));
         }
-    };
+      };
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPool.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPool.java
index 3014885869..f22fc0b05b 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPool.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPool.java
@@ -1,20 +1,5 @@
 package pl.allegro.tech.hermes.common.kafka;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.common.TopicPartition;
-import pl.allegro.tech.hermes.common.broker.BrokerStorage;
-import pl.allegro.tech.hermes.common.exception.BrokerNotFoundForPartitionException;
-
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
 import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
 import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG;
 import static org.apache.kafka.clients.consumer.ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG;
@@ -25,87 +10,111 @@
 import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
 import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.cache.RemovalListener;
+import com.google.common.cache.RemovalNotification;
+import com.google.common.util.concurrent.UncheckedExecutionException;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.TopicPartition;
+import pl.allegro.tech.hermes.common.broker.BrokerStorage;
+import pl.allegro.tech.hermes.common.exception.BrokerNotFoundForPartitionException;
 
 /**
- * This class help us to avoid unnecessarily creating new kafka consumers for the same broker instance, mainly in case of
- * retransmission and migrating topic from json to avro. We map topic and its partitions to specific kafka broker which
- * without caching would lead to creating exactly the same consumer multiple times in short period of time.
- * Additionaly consumers created here are rarely used, so we don't bother about concurrency and thread safety.
+ * This class help us to avoid unnecessarily creating new kafka consumers for the same broker
+ * instance, mainly in case of retransmission and migrating topic from json to avro. We map topic
+ * and its partitions to specific kafka broker which without caching would lead to creating exactly
+ * the same consumer multiple times in short period of time. Additionaly consumers created here are
+ * rarely used, so we don't bother about concurrency and thread safety.
  */
 public class KafkaConsumerPool {
 
-    private final LoadingCache<Integer, KafkaConsumer<byte[], byte[]>> kafkaConsumers;
-    private final BrokerStorage brokerStorage;
-
-    public KafkaConsumerPool(KafkaConsumerPoolConfig poolConfig, BrokerStorage brokerStorage, String configuredBootstrapServers) {
-        this.brokerStorage = brokerStorage;
-        this.kafkaConsumers = CacheBuilder.newBuilder()
-                .expireAfterAccess(poolConfig.getCacheExpirationSeconds(), TimeUnit.SECONDS)
-                .removalListener(new KafkaConsumerRemoveListener())
-                .build(new KafkaConsumerSupplier(poolConfig, configuredBootstrapServers));
+  private final LoadingCache<Integer, KafkaConsumer<byte[], byte[]>> kafkaConsumers;
+  private final BrokerStorage brokerStorage;
+
+  public KafkaConsumerPool(
+      KafkaConsumerPoolConfig poolConfig,
+      BrokerStorage brokerStorage,
+      String configuredBootstrapServers) {
+    this.brokerStorage = brokerStorage;
+    this.kafkaConsumers =
+        CacheBuilder.newBuilder()
+            .expireAfterAccess(poolConfig.getCacheExpirationSeconds(), TimeUnit.SECONDS)
+            .removalListener(new KafkaConsumerRemoveListener())
+            .build(new KafkaConsumerSupplier(poolConfig, configuredBootstrapServers));
+  }
+
+  public KafkaConsumer<byte[], byte[]> get(KafkaTopic topic, int partition) {
+    return get(topic.name().asString(), partition);
+  }
+
+  public KafkaConsumer<byte[], byte[]> get(String topicName, int partition) {
+    try {
+      int leaderId = brokerStorage.readLeaderForPartition(new TopicPartition(topicName, partition));
+      return kafkaConsumers.get(leaderId);
+
+    } catch (ExecutionException e) {
+      String message =
+          String.format(
+              "Cannot get KafkaConsumer for topic %s and partition %d", topicName, partition);
+      throw new KafkaConsumerPoolException(message, e);
+    } catch (UncheckedExecutionException e) {
+      if (e.getCause() instanceof BrokerNotFoundForPartitionException) {
+        throw (BrokerNotFoundForPartitionException) e.getCause();
+      }
+      throw e;
     }
+  }
 
-    public KafkaConsumer<byte[], byte[]> get(KafkaTopic topic, int partition) {
-        return get(topic.name().asString(), partition);
-    }
+  private static class KafkaConsumerSupplier
+      extends CacheLoader<Integer, KafkaConsumer<byte[], byte[]>> {
+
+    private final KafkaConsumerPoolConfig poolConfig;
+    private final String configuredBootstrapServers;
 
-    public KafkaConsumer<byte[], byte[]> get(String topicName, int partition) {
-        try {
-            int leaderId = brokerStorage.readLeaderForPartition(new TopicPartition(topicName, partition));
-            return kafkaConsumers.get(leaderId);
-
-        } catch (ExecutionException e) {
-            String message = String.format("Cannot get KafkaConsumer for topic %s and partition %d", topicName, partition);
-            throw new KafkaConsumerPoolException(message, e);
-        } catch (UncheckedExecutionException e) {
-            if (e.getCause() instanceof BrokerNotFoundForPartitionException) {
-                throw (BrokerNotFoundForPartitionException) e.getCause();
-            }
-            throw e;
-        }
+    KafkaConsumerSupplier(KafkaConsumerPoolConfig poolConfig, String configuredBootstrapServers) {
+      this.poolConfig = poolConfig;
+      this.configuredBootstrapServers = configuredBootstrapServers;
     }
 
-    private static class KafkaConsumerSupplier extends CacheLoader<Integer, KafkaConsumer<byte[], byte[]>> {
-
-        private final KafkaConsumerPoolConfig poolConfig;
-        private final String configuredBootstrapServers;
-
-        KafkaConsumerSupplier(KafkaConsumerPoolConfig poolConfig, String configuredBootstrapServers) {
-            this.poolConfig = poolConfig;
-            this.configuredBootstrapServers = configuredBootstrapServers;
-        }
-
-        @Override
-        public KafkaConsumer<byte[], byte[]> load(Integer leaderId) throws Exception {
-            return createKafkaConsumer();
-        }
-
-        private KafkaConsumer<byte[], byte[]> createKafkaConsumer() {
-
-            Properties props = new Properties();
-            props.put(BOOTSTRAP_SERVERS_CONFIG, configuredBootstrapServers);
-            props.put(GROUP_ID_CONFIG, poolConfig.getIdPrefix() + "_" + poolConfig.getConsumerGroupName());
-            props.put(RECEIVE_BUFFER_CONFIG, poolConfig.getBufferSizeBytes());
-            props.put(ENABLE_AUTO_COMMIT_CONFIG, false);
-            props.put(FETCH_MAX_WAIT_MS_CONFIG, poolConfig.getFetchMaxWaitMillis());
-            props.put(FETCH_MIN_BYTES_CONFIG, poolConfig.getFetchMinBytes());
-            props.put("key.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
-            props.put("value.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
-
-            if (poolConfig.isSaslEnabled()) {
-                props.put(SASL_MECHANISM, poolConfig.getSecurityMechanism());
-                props.put(SECURITY_PROTOCOL_CONFIG, poolConfig.getSecurityProtocol());
-                props.put(SASL_JAAS_CONFIG, poolConfig.getSaslJaasConfig());
-            }
-            return new KafkaConsumer<>(props);
-        }
+    @Override
+    public KafkaConsumer<byte[], byte[]> load(Integer leaderId) throws Exception {
+      return createKafkaConsumer();
     }
 
-    private static class KafkaConsumerRemoveListener implements RemovalListener<Integer, KafkaConsumer<byte[], byte[]>> {
-        @Override
-        public void onRemoval(RemovalNotification<Integer, KafkaConsumer<byte[], byte[]>> notification) {
-            notification.getValue().close();
-        }
+    private KafkaConsumer<byte[], byte[]> createKafkaConsumer() {
+
+      Properties props = new Properties();
+      props.put(BOOTSTRAP_SERVERS_CONFIG, configuredBootstrapServers);
+      props.put(
+          GROUP_ID_CONFIG, poolConfig.getIdPrefix() + "_" + poolConfig.getConsumerGroupName());
+      props.put(RECEIVE_BUFFER_CONFIG, poolConfig.getBufferSizeBytes());
+      props.put(ENABLE_AUTO_COMMIT_CONFIG, false);
+      props.put(FETCH_MAX_WAIT_MS_CONFIG, poolConfig.getFetchMaxWaitMillis());
+      props.put(FETCH_MIN_BYTES_CONFIG, poolConfig.getFetchMinBytes());
+      props.put("key.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
+      props.put(
+          "value.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
+
+      if (poolConfig.isSaslEnabled()) {
+        props.put(SASL_MECHANISM, poolConfig.getSecurityMechanism());
+        props.put(SECURITY_PROTOCOL_CONFIG, poolConfig.getSecurityProtocol());
+        props.put(SASL_JAAS_CONFIG, poolConfig.getSaslJaasConfig());
+      }
+      return new KafkaConsumer<>(props);
     }
+  }
+
+  private static class KafkaConsumerRemoveListener
+      implements RemovalListener<Integer, KafkaConsumer<byte[], byte[]>> {
+    @Override
+    public void onRemoval(
+        RemovalNotification<Integer, KafkaConsumer<byte[], byte[]>> notification) {
+      notification.getValue().close();
+    }
+  }
 }
-
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPoolConfig.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPoolConfig.java
index 772306fffa..38212a9093 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPoolConfig.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPoolConfig.java
@@ -2,69 +2,77 @@
 
 public class KafkaConsumerPoolConfig {
 
-    private final int cacheExpirationSeconds;
-    private final int bufferSizeBytes;
-    private final int fetchMaxWaitMillis;
-    private final int fetchMinBytes;
-    private final String idPrefix;
-    private final String consumerGroupName;
-    private final boolean isSaslEnabled;
-    private final String securityMechanism;
-    private final String securityProtocol;
-    private final String saslJaasConfig;
+  private final int cacheExpirationSeconds;
+  private final int bufferSizeBytes;
+  private final int fetchMaxWaitMillis;
+  private final int fetchMinBytes;
+  private final String idPrefix;
+  private final String consumerGroupName;
+  private final boolean isSaslEnabled;
+  private final String securityMechanism;
+  private final String securityProtocol;
+  private final String saslJaasConfig;
 
-    public KafkaConsumerPoolConfig(int cacheExpirationSeconds, int bufferSize, int fetchMaxWaitMillis,
-                                   int fetchMinBytes, String idPrefix, String consumerGroupName,
-                                   boolean isSaslEnabled, String securityMechanism, String securityProtocol, String saslJaasConfig) {
-        this.cacheExpirationSeconds = cacheExpirationSeconds;
-        this.bufferSizeBytes = bufferSize;
-        this.fetchMaxWaitMillis = fetchMaxWaitMillis;
-        this.fetchMinBytes = fetchMinBytes;
-        this.idPrefix = idPrefix;
-        this.consumerGroupName = consumerGroupName;
-        this.isSaslEnabled = isSaslEnabled;
-        this.securityMechanism = securityMechanism;
-        this.securityProtocol = securityProtocol;
-        this.saslJaasConfig = saslJaasConfig;
-    }
+  public KafkaConsumerPoolConfig(
+      int cacheExpirationSeconds,
+      int bufferSize,
+      int fetchMaxWaitMillis,
+      int fetchMinBytes,
+      String idPrefix,
+      String consumerGroupName,
+      boolean isSaslEnabled,
+      String securityMechanism,
+      String securityProtocol,
+      String saslJaasConfig) {
+    this.cacheExpirationSeconds = cacheExpirationSeconds;
+    this.bufferSizeBytes = bufferSize;
+    this.fetchMaxWaitMillis = fetchMaxWaitMillis;
+    this.fetchMinBytes = fetchMinBytes;
+    this.idPrefix = idPrefix;
+    this.consumerGroupName = consumerGroupName;
+    this.isSaslEnabled = isSaslEnabled;
+    this.securityMechanism = securityMechanism;
+    this.securityProtocol = securityProtocol;
+    this.saslJaasConfig = saslJaasConfig;
+  }
 
-    public int getCacheExpirationSeconds() {
-        return cacheExpirationSeconds;
-    }
+  public int getCacheExpirationSeconds() {
+    return cacheExpirationSeconds;
+  }
 
-    public int getBufferSizeBytes() {
-        return bufferSizeBytes;
-    }
+  public int getBufferSizeBytes() {
+    return bufferSizeBytes;
+  }
 
-    public String getIdPrefix() {
-        return idPrefix;
-    }
+  public String getIdPrefix() {
+    return idPrefix;
+  }
 
-    public String getConsumerGroupName() {
-        return consumerGroupName;
-    }
+  public String getConsumerGroupName() {
+    return consumerGroupName;
+  }
 
-    public int getFetchMaxWaitMillis() {
-        return fetchMaxWaitMillis;
-    }
+  public int getFetchMaxWaitMillis() {
+    return fetchMaxWaitMillis;
+  }
 
-    public int getFetchMinBytes() {
-        return fetchMinBytes;
-    }
+  public int getFetchMinBytes() {
+    return fetchMinBytes;
+  }
 
-    public boolean isSaslEnabled() {
-        return isSaslEnabled;
-    }
+  public boolean isSaslEnabled() {
+    return isSaslEnabled;
+  }
 
-    public String getSecurityMechanism() {
-        return securityMechanism;
-    }
+  public String getSecurityMechanism() {
+    return securityMechanism;
+  }
 
-    public String getSecurityProtocol() {
-        return securityProtocol;
-    }
+  public String getSecurityProtocol() {
+    return securityProtocol;
+  }
 
-    public String getSaslJaasConfig() {
-        return saslJaasConfig;
-    }
+  public String getSaslJaasConfig() {
+    return saslJaasConfig;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPoolException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPoolException.java
index 150031e460..bc55b8cc6d 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPoolException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaConsumerPoolException.java
@@ -5,13 +5,12 @@
 
 public class KafkaConsumerPoolException extends HermesException {
 
-    public KafkaConsumerPoolException(String message, Throwable t) {
-        super(message, t);
-    }
-
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SIMPLE_CONSUMER_POOL_EXCEPTION;
-    }
+  public KafkaConsumerPoolException(String message, Throwable t) {
+    super(message, t);
+  }
 
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SIMPLE_CONSUMER_POOL_EXCEPTION;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaHeaderNameParameters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaHeaderNameParameters.java
index da9048b89b..bf6f0bbc57 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaHeaderNameParameters.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaHeaderNameParameters.java
@@ -2,12 +2,9 @@
 
 public interface KafkaHeaderNameParameters {
 
-    String getSchemaVersion();
+  String getSchemaVersion();
 
-    String getSchemaId();
-
-    String getMessageId();
-
-    String getTimestamp();
+  String getSchemaId();
 
+  String getMessageId();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaNamesMapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaNamesMapper.java
index d926d3f9aa..1613f222ed 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaNamesMapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaNamesMapper.java
@@ -5,7 +5,7 @@
 
 public interface KafkaNamesMapper {
 
-    ConsumerGroupId toConsumerGroupId(SubscriptionName subscription);
+  ConsumerGroupId toConsumerGroupId(SubscriptionName subscription);
 
-    KafkaTopics toKafkaTopics(Topic topic);
+  KafkaTopics toKafkaTopics(Topic topic);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaParameters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaParameters.java
index 3e50065dfd..113ad8b6d0 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaParameters.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaParameters.java
@@ -2,15 +2,15 @@
 
 public interface KafkaParameters {
 
-    boolean isEnabled();
+  String getDatacenter();
 
-    String getMechanism();
+  boolean isAuthenticationEnabled();
 
-    String getProtocol();
+  String getAuthenticationMechanism();
 
-    String getUsername();
+  String getAuthenticationProtocol();
 
-    String getPassword();
+  String getBrokerList();
 
-    String getBrokerList();
+  String getJaasConfig();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopic.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopic.java
index e6155a4273..63a786bb66 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopic.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopic.java
@@ -1,53 +1,51 @@
 package pl.allegro.tech.hermes.common.kafka;
 
-import com.google.common.base.MoreObjects;
-import pl.allegro.tech.hermes.api.ContentType;
+import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.MoreObjects;
 import java.util.Objects;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import pl.allegro.tech.hermes.api.ContentType;
 
 public class KafkaTopic {
 
-    private final KafkaTopicName name;
-    private final ContentType contentType;
+  private final KafkaTopicName name;
+  private final ContentType contentType;
 
-    public KafkaTopic(KafkaTopicName name, ContentType contentType) {
-        this.name = checkNotNull(name);
-        this.contentType = checkNotNull(contentType);
-    }
-
-    public KafkaTopicName name() {
-        return name;
-    }
+  public KafkaTopic(KafkaTopicName name, ContentType contentType) {
+    this.name = checkNotNull(name);
+    this.contentType = checkNotNull(contentType);
+  }
 
-    public ContentType contentType() {
-        return contentType;
-    }
+  public KafkaTopicName name() {
+    return name;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        KafkaTopic that = (KafkaTopic) o;
-        return Objects.equals(name, that.name)
-                && Objects.equals(contentType, that.contentType);
-    }
+  public ContentType contentType() {
+    return contentType;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, contentType);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("name", name)
-                .add("contentType", contentType)
-                .toString();
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    KafkaTopic that = (KafkaTopic) o;
+    return Objects.equals(name, that.name) && Objects.equals(contentType, that.contentType);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, contentType);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("name", name)
+        .add("contentType", contentType)
+        .toString();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopicName.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopicName.java
index 58f7f438ef..8c2ab7dea6 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopicName.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopicName.java
@@ -1,50 +1,49 @@
 package pl.allegro.tech.hermes.common.kafka;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class KafkaTopicName {
 
-    private final String value;
+  private final String value;
 
-    private KafkaTopicName(String value) {
-        this.value = checkNotNull(value);
-    }
+  private KafkaTopicName(String value) {
+    this.value = checkNotNull(value);
+  }
 
-    @JsonCreator
-    public static KafkaTopicName valueOf(@JsonProperty("value") String value) {
-        return new KafkaTopicName(value);
-    }
+  @JsonCreator
+  public static KafkaTopicName valueOf(@JsonProperty("value") String value) {
+    return new KafkaTopicName(value);
+  }
 
-    @JsonGetter(value = "value")
-    public String asString() {
-        return value;
-    }
+  @JsonGetter(value = "value")
+  public String asString() {
+    return value;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        KafkaTopicName that = (KafkaTopicName) o;
-        return Objects.equals(value, that.value);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(value);
-    }
-
-    @Override
-    public String toString() {
-        return "KafkaTopicName(" + value + ")";
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    KafkaTopicName that = (KafkaTopicName) o;
+    return Objects.equals(value, that.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
+
+  @Override
+  public String toString() {
+    return "KafkaTopicName(" + value + ")";
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopics.java
index dde42b8944..4093a28bd0 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/KafkaTopics.java
@@ -1,45 +1,45 @@
 package pl.allegro.tech.hermes.common.kafka;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class KafkaTopics {
 
-    private final KafkaTopic primary;
-    private final Optional<KafkaTopic> secondary;
+  private final KafkaTopic primary;
+  private final Optional<KafkaTopic> secondary;
 
-    public KafkaTopics(KafkaTopic primary) {
-        this.primary = checkNotNull(primary);
-        this.secondary = Optional.empty();
-    }
+  public KafkaTopics(KafkaTopic primary) {
+    this.primary = checkNotNull(primary);
+    this.secondary = Optional.empty();
+  }
 
-    public KafkaTopics(KafkaTopic primary, KafkaTopic secondary) {
-        this.primary = checkNotNull(primary);
-        this.secondary = Optional.of(secondary);
-    }
+  public KafkaTopics(KafkaTopic primary, KafkaTopic secondary) {
+    this.primary = checkNotNull(primary);
+    this.secondary = Optional.of(secondary);
+  }
 
-    public KafkaTopic getPrimary() {
-        return primary;
-    }
+  public KafkaTopic getPrimary() {
+    return primary;
+  }
 
-    public Optional<KafkaTopic> getSecondary() {
-        return secondary;
-    }
+  public Optional<KafkaTopic> getSecondary() {
+    return secondary;
+  }
 
-    public void forEach(Consumer<KafkaTopic> consumer) {
-        consumer.accept(primary);
-        secondary.ifPresent(consumer);
-    }
+  public void forEach(Consumer<KafkaTopic> consumer) {
+    consumer.accept(primary);
+    secondary.ifPresent(consumer);
+  }
 
-    public boolean allMatch(Function<KafkaTopic, Boolean> matcher) {
-        return matcher.apply(primary) && secondary.map(matcher).orElse(true);
-    }
+  public boolean allMatch(Function<KafkaTopic, Boolean> matcher) {
+    return matcher.apply(primary) && secondary.map(matcher).orElse(true);
+  }
 
-    public Stream<KafkaTopic> stream() {
-        return secondary.map(secondary -> Stream.of(primary, secondary)).orElse(Stream.of(primary));
-    }
+  public Stream<KafkaTopic> stream() {
+    return secondary.map(secondary -> Stream.of(primary, secondary)).orElse(Stream.of(primary));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/NamespaceKafkaNamesMapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/NamespaceKafkaNamesMapper.java
index d0577e3f46..18a1414f78 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/NamespaceKafkaNamesMapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/NamespaceKafkaNamesMapper.java
@@ -1,52 +1,54 @@
 package pl.allegro.tech.hermes.common.kafka;
 
+import static pl.allegro.tech.hermes.api.helpers.Replacer.replaceInAll;
+
 import com.google.common.base.Joiner;
+import java.util.function.Function;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.Topic;
 
-import java.util.function.Function;
-
-import static pl.allegro.tech.hermes.api.helpers.Replacer.replaceInAll;
-
 public class NamespaceKafkaNamesMapper implements KafkaNamesMapper {
 
-    private final String namespace;
-    private final String namespaceSeparator;
+  private final String namespace;
+  private final String namespaceSeparator;
 
-    public NamespaceKafkaNamesMapper(String namespace, String namespaceSeparator) {
-        this.namespace = namespace;
-        this.namespaceSeparator = namespaceSeparator;
-    }
+  public NamespaceKafkaNamesMapper(String namespace, String namespaceSeparator) {
+    this.namespace = namespace;
+    this.namespaceSeparator = namespaceSeparator;
+  }
 
-    @Override
-    public ConsumerGroupId toConsumerGroupId(SubscriptionName subscriptionName) {
-        return ConsumerGroupId.valueOf(
-                appendNamespace(subscriptionNameToConsumerId(subscriptionName))
-        );
-    }
+  @Override
+  public ConsumerGroupId toConsumerGroupId(SubscriptionName subscriptionName) {
+    return ConsumerGroupId.valueOf(appendNamespace(subscriptionNameToConsumerId(subscriptionName)));
+  }
 
-    @Override
-    public KafkaTopics toKafkaTopics(Topic topic) {
-        return mapToKafkaTopic.andThen(appendNamespace).andThen(mapToKafkaTopics).apply(topic);
-    }
+  @Override
+  public KafkaTopics toKafkaTopics(Topic topic) {
+    return mapToKafkaTopic.andThen(appendNamespace).andThen(mapToKafkaTopics).apply(topic);
+  }
 
-    protected Function<Topic, KafkaTopic> mapToKafkaTopic = it ->
-            new KafkaTopic(KafkaTopicName.valueOf(it.getQualifiedName()), it.getContentType());
+  protected Function<Topic, KafkaTopic> mapToKafkaTopic =
+      it -> new KafkaTopic(KafkaTopicName.valueOf(it.getQualifiedName()), it.getContentType());
 
-    protected Function<KafkaTopic, KafkaTopic> appendNamespace = it ->
-            new KafkaTopic(KafkaTopicName.valueOf(appendNamespace(it.name().asString())), it.contentType());
+  protected Function<KafkaTopic, KafkaTopic> appendNamespace =
+      it ->
+          new KafkaTopic(
+              KafkaTopicName.valueOf(appendNamespace(it.name().asString())), it.contentType());
 
-    protected Function<KafkaTopic, KafkaTopics> mapToKafkaTopics = KafkaTopics::new;
+  protected Function<KafkaTopic, KafkaTopics> mapToKafkaTopics = KafkaTopics::new;
 
-    private String subscriptionNameToConsumerId(SubscriptionName subscriptionName) {
-        return Joiner.on("_").join(replaceInAll("_", "__",
+  private String subscriptionNameToConsumerId(SubscriptionName subscriptionName) {
+    return Joiner.on("_")
+        .join(
+            replaceInAll(
+                "_",
+                "__",
                 subscriptionName.getTopicName().getGroupName(),
                 subscriptionName.getTopicName().getName(),
-                subscriptionName.getName())
-        );
-    }
+                subscriptionName.getName()));
+  }
 
-    private String appendNamespace(String name) {
-        return namespace.isEmpty() ? name : namespace + namespaceSeparator + name;
-    }
+  private String appendNamespace(String name) {
+    return namespace.isEmpty() ? name : namespace + namespaceSeparator + name;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/PartitionOffset.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/PartitionOffset.java
index cc390200ae..459770e508 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/PartitionOffset.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/PartitionOffset.java
@@ -2,55 +2,54 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
-
 import java.util.Objects;
+import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
 
 public class PartitionOffset {
 
-    private final KafkaTopicName topic;
-    private final int partition;
-    private final long offset;
-
-    @JsonCreator
-    public PartitionOffset(@JsonProperty("topic") KafkaTopicName topic,
-                           @JsonProperty("offset") long offset,
-                           @JsonProperty("partition") int partition) {
-        this.topic = topic;
-        this.offset = offset;
-        this.partition = partition;
+  private final KafkaTopicName topic;
+  private final int partition;
+  private final long offset;
+
+  @JsonCreator
+  public PartitionOffset(
+      @JsonProperty("topic") KafkaTopicName topic,
+      @JsonProperty("offset") long offset,
+      @JsonProperty("partition") int partition) {
+    this.topic = topic;
+    this.offset = offset;
+    this.partition = partition;
+  }
+
+  public KafkaTopicName getTopic() {
+    return topic;
+  }
+
+  public int getPartition() {
+    return partition;
+  }
+
+  public long getOffset() {
+    return offset;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    public KafkaTopicName getTopic() {
-        return topic;
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
-
-    public int getPartition() {
-        return partition;
-    }
-
-    public long getOffset() {
-        return offset;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final PartitionOffset that = (PartitionOffset) obj;
-
-        return Objects.equals(this.topic, that.topic)
-                && Objects.equals(this.partition, that.partition)
-                && Objects.equals(this.offset, that.offset);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(topic, partition, offset);
-    }
-
-}
\ No newline at end of file
+    final PartitionOffset that = (PartitionOffset) obj;
+
+    return Objects.equals(this.topic, that.topic)
+        && Objects.equals(this.partition, that.partition)
+        && Objects.equals(this.offset, that.offset);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(topic, partition, offset);
+  }
+}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/PartitionOffsets.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/PartitionOffsets.java
index a0f2023064..c0c5b1ef30 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/PartitionOffsets.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/PartitionOffsets.java
@@ -6,20 +6,20 @@
 
 public class PartitionOffsets implements Iterable<PartitionOffset> {
 
-    private final List<PartitionOffset> offsets = new ArrayList<>();
+  private final List<PartitionOffset> offsets = new ArrayList<>();
 
-    public PartitionOffsets add(PartitionOffset offset) {
-        offsets.add(offset);
-        return this;
-    }
+  public PartitionOffsets add(PartitionOffset offset) {
+    offsets.add(offset);
+    return this;
+  }
 
-    public PartitionOffsets addAll(PartitionOffsets offsets) {
-        offsets.forEach(this::add);
-        return this;
-    }
+  public PartitionOffsets addAll(PartitionOffsets offsets) {
+    offsets.forEach(this::add);
+    return this;
+  }
 
-    @Override
-    public Iterator<PartitionOffset> iterator() {
-        return offsets.iterator();
-    }
+  @Override
+  public Iterator<PartitionOffset> iterator() {
+    return offsets.iterator();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/SubscriptionOffsetChangeIndicator.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/SubscriptionOffsetChangeIndicator.java
index 095b3746a8..863c8a8801 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/SubscriptionOffsetChangeIndicator.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/kafka/offset/SubscriptionOffsetChangeIndicator.java
@@ -1,21 +1,32 @@
 package pl.allegro.tech.hermes.common.kafka.offset;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
 
-import java.util.List;
-
 public interface SubscriptionOffsetChangeIndicator {
 
-    void setSubscriptionOffset(TopicName topicName, String subscriptionName, String brokersClusterName, PartitionOffset partitionOffset);
-
-    PartitionOffsets getSubscriptionOffsets(TopicName topic, String subscriptionName, String brokersClusterName);
-
-    boolean areOffsetsMoved(TopicName topicName, String subscriptionName, String brokersClusterName,
-                            KafkaTopic kafkaTopic, List<Integer> partitionIds);
-
-
-    void removeOffset(TopicName topicName, String subscriptionName, String brokersClusterName,
-                      KafkaTopicName kafkaTopicName, int partitionId);
+  void setSubscriptionOffset(
+      TopicName topicName,
+      String subscriptionName,
+      String brokersClusterName,
+      PartitionOffset partitionOffset);
+
+  PartitionOffsets getSubscriptionOffsets(
+      TopicName topic, String subscriptionName, String brokersClusterName);
+
+  boolean areOffsetsMoved(
+      TopicName topicName,
+      String subscriptionName,
+      String brokersClusterName,
+      KafkaTopic kafkaTopic,
+      List<Integer> partitionIds);
+
+  void removeOffset(
+      TopicName topicName,
+      String subscriptionName,
+      String brokersClusterName,
+      KafkaTopicName kafkaTopicName,
+      int partitionId);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroBinaryDecoders.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroBinaryDecoders.java
index c77be92b29..4c7d397651 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroBinaryDecoders.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroBinaryDecoders.java
@@ -1,46 +1,51 @@
 package pl.allegro.tech.hermes.common.message.converter;
 
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.InputStream;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.io.BinaryDecoder;
 import org.apache.avro.io.DecoderFactory;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import tech.allegro.schema.json2avro.converter.AvroConversionException;
 
-import java.io.ByteArrayInputStream;
-import java.io.Closeable;
-import java.io.InputStream;
-
 public class AvroBinaryDecoders {
 
-    private static ThreadLocal<InputStream> threadLocalEmptyInputStream =
-            ThreadLocal.withInitial(() -> new ByteArrayInputStream(new byte[0]));
-
-    private static ThreadLocal<BinaryDecoder> threadLocalBinaryDecoder =
-            ThreadLocal.withInitial(() -> DecoderFactory.get().binaryDecoder(threadLocalEmptyInputStream.get(), null));
-
-    static GenericRecord decodeReusingThreadLocalBinaryDecoder(byte[] message, Schema schema) {
-        try (FlushableBinaryDecoderHolder holder = new FlushableBinaryDecoderHolder()) {
-            BinaryDecoder binaryDecoder = DecoderFactory.get().binaryDecoder(message, holder.getBinaryDecoder());
-            return new GenericDatumReader<GenericRecord>(schema).read(null, binaryDecoder);
-        } catch (Exception e) {
-            String reason = e.getMessage() == null ? ExceptionUtils.getRootCauseMessage(e) : e.getMessage();
-            throw new AvroConversionException(String.format("Could not deserialize Avro message with provided schema, reason: %s", reason));
-        }
+  private static ThreadLocal<InputStream> threadLocalEmptyInputStream =
+      ThreadLocal.withInitial(() -> new ByteArrayInputStream(new byte[0]));
+
+  private static ThreadLocal<BinaryDecoder> threadLocalBinaryDecoder =
+      ThreadLocal.withInitial(
+          () -> DecoderFactory.get().binaryDecoder(threadLocalEmptyInputStream.get(), null));
+
+  static GenericRecord decodeReusingThreadLocalBinaryDecoder(byte[] message, Schema schema) {
+    try (FlushableBinaryDecoderHolder holder = new FlushableBinaryDecoderHolder()) {
+      BinaryDecoder binaryDecoder =
+          DecoderFactory.get().binaryDecoder(message, holder.getBinaryDecoder());
+      return new GenericDatumReader<GenericRecord>(schema).read(null, binaryDecoder);
+    } catch (Exception e) {
+      String reason =
+          e.getMessage() == null ? ExceptionUtils.getRootCauseMessage(e) : e.getMessage();
+      throw new AvroConversionException(
+          String.format(
+              "Could not deserialize Avro message with provided schema, reason: %s", reason));
     }
+  }
 
-    static class FlushableBinaryDecoderHolder implements Closeable {
+  static class FlushableBinaryDecoderHolder implements Closeable {
 
-        final BinaryDecoder binaryDecoder = threadLocalBinaryDecoder.get();
+    final BinaryDecoder binaryDecoder = threadLocalBinaryDecoder.get();
 
-        BinaryDecoder getBinaryDecoder() {
-            return binaryDecoder;
-        }
+    BinaryDecoder getBinaryDecoder() {
+      return binaryDecoder;
+    }
 
-        @Override
-        public void close() {
-            DecoderFactory.get().binaryDecoder(threadLocalEmptyInputStream.get(), threadLocalBinaryDecoder.get());
-        }
+    @Override
+    public void close() {
+      DecoderFactory.get()
+          .binaryDecoder(threadLocalEmptyInputStream.get(), threadLocalBinaryDecoder.get());
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroRecordToBytesConverter.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroRecordToBytesConverter.java
index ea4f6fe347..64762fcccc 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroRecordToBytesConverter.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroRecordToBytesConverter.java
@@ -1,26 +1,25 @@
 package pl.allegro.tech.hermes.common.message.converter;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumWriter;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.EncoderFactory;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
 public interface AvroRecordToBytesConverter {
 
-    static GenericRecord bytesToRecord(byte[] data, Schema schema) {
-        return AvroBinaryDecoders.decodeReusingThreadLocalBinaryDecoder(data, schema);
-    }
+  static GenericRecord bytesToRecord(byte[] data, Schema schema) {
+    return AvroBinaryDecoders.decodeReusingThreadLocalBinaryDecoder(data, schema);
+  }
 
-    static byte [] recordToBytes(GenericRecord genericRecord, Schema schema) throws IOException {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        BinaryEncoder binaryEncoder = EncoderFactory.get().binaryEncoder(outputStream, null);
-        new GenericDatumWriter<>(schema).write(genericRecord, binaryEncoder);
-        binaryEncoder.flush();
+  static byte[] recordToBytes(GenericRecord genericRecord, Schema schema) throws IOException {
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    BinaryEncoder binaryEncoder = EncoderFactory.get().binaryEncoder(outputStream, null);
+    new GenericDatumWriter<>(schema).write(genericRecord, binaryEncoder);
+    binaryEncoder.flush();
 
-        return outputStream.toByteArray();
-    }
+    return outputStream.toByteArray();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/LastUndeliveredMessageReader.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/LastUndeliveredMessageReader.java
index 326060eefc..8cef6b8052 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/LastUndeliveredMessageReader.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/LastUndeliveredMessageReader.java
@@ -1,11 +1,10 @@
 package pl.allegro.tech.hermes.common.message.undelivered;
 
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 import pl.allegro.tech.hermes.api.TopicName;
 
-import java.util.Optional;
-
 public interface LastUndeliveredMessageReader {
 
-    Optional<SentMessageTrace> last(TopicName topicName, String subscriptionName);
+  Optional<SentMessageTrace> last(TopicName topicName, String subscriptionName);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/UndeliveredMessageLog.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/UndeliveredMessageLog.java
index 6897e76277..c76782e08a 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/UndeliveredMessageLog.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/UndeliveredMessageLog.java
@@ -1,11 +1,10 @@
 package pl.allegro.tech.hermes.common.message.undelivered;
 
-
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 
 public interface UndeliveredMessageLog {
 
-    void add(SentMessageTrace undeliveredMessage);
+  void add(SentMessageTrace undeliveredMessage);
 
-    void persist();
+  void persist();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/UndeliveredMessagePaths.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/UndeliveredMessagePaths.java
index 54912a787c..b6555312f0 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/UndeliveredMessagePaths.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/UndeliveredMessagePaths.java
@@ -5,15 +5,15 @@
 
 class UndeliveredMessagePaths {
 
-    private static final String NODE_NAME = "undelivered";
+  private static final String NODE_NAME = "undelivered";
 
-    private final ZookeeperPaths zookeeperPaths;
+  private final ZookeeperPaths zookeeperPaths;
 
-    UndeliveredMessagePaths(ZookeeperPaths zookeeperPaths) {
-        this.zookeeperPaths = zookeeperPaths;
-    }
+  UndeliveredMessagePaths(ZookeeperPaths zookeeperPaths) {
+    this.zookeeperPaths = zookeeperPaths;
+  }
 
-    String buildPath(TopicName topicName, String subscriptionName) {
-        return zookeeperPaths.subscriptionPath(topicName, subscriptionName, NODE_NAME);
-    }
+  String buildPath(TopicName topicName, String subscriptionName) {
+    return zookeeperPaths.subscriptionPath(topicName, subscriptionName, NODE_NAME);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperLastUndeliveredMessageReader.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperLastUndeliveredMessageReader.java
index f8c2a37ddd..c65cf2bc75 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperLastUndeliveredMessageReader.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperLastUndeliveredMessageReader.java
@@ -1,48 +1,48 @@
 package pl.allegro.tech.hermes.common.message.undelivered;
 
+import static java.lang.String.format;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Optional;
 import org.apache.curator.framework.CuratorFramework;
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.util.Optional;
-
-import static java.lang.String.format;
-
 public class ZookeeperLastUndeliveredMessageReader implements LastUndeliveredMessageReader {
 
-    private final CuratorFramework curator;
-    private final UndeliveredMessagePaths paths;
-    private final ObjectMapper mapper;
-
-    public ZookeeperLastUndeliveredMessageReader(CuratorFramework curator,
-                                                 ZookeeperPaths zookeeperPaths,
-                                                 ObjectMapper mapper) {
-        this.curator = curator;
-        this.paths = new UndeliveredMessagePaths(zookeeperPaths);
-        this.mapper = mapper;
+  private final CuratorFramework curator;
+  private final UndeliveredMessagePaths paths;
+  private final ObjectMapper mapper;
+
+  public ZookeeperLastUndeliveredMessageReader(
+      CuratorFramework curator, ZookeeperPaths zookeeperPaths, ObjectMapper mapper) {
+    this.curator = curator;
+    this.paths = new UndeliveredMessagePaths(zookeeperPaths);
+    this.mapper = mapper;
+  }
+
+  @Override
+  public Optional<SentMessageTrace> last(TopicName topicName, String subscriptionName) {
+    try {
+      String path = paths.buildPath(topicName, subscriptionName);
+      if (exists(path)) {
+        return Optional.of(
+            mapper.readValue(curator.getData().forPath(path), SentMessageTrace.class));
+      } else {
+        return Optional.empty();
+      }
+    } catch (Exception e) {
+      throw new InternalProcessingException(
+          format(
+              "Could not read latest undelivered message for topic: %s and subscription: %s .",
+              topicName.qualifiedName(), subscriptionName),
+          e);
     }
+  }
 
-    @Override
-    public Optional<SentMessageTrace> last(TopicName topicName, String subscriptionName) {
-        try {
-            String path = paths.buildPath(topicName, subscriptionName);
-            if (exists(path)) {
-                return Optional.of(mapper.readValue(curator.getData().forPath(path), SentMessageTrace.class));
-            } else {
-                return Optional.empty();
-            }
-        } catch (Exception e) {
-            throw new InternalProcessingException(
-                    format("Could not read latest undelivered message for topic: %s and subscription: %s .",
-                            topicName.qualifiedName(), subscriptionName),
-                    e);
-        }
-    }
-
-    private boolean exists(String path) throws Exception {
-        return curator.checkExists().forPath(path) != null;
-    }
+  private boolean exists(String path) throws Exception {
+    return curator.checkExists().forPath(path) != null;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperUndeliveredMessageLog.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperUndeliveredMessageLog.java
index 9baa14c3ea..9f781cd942 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperUndeliveredMessageLog.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperUndeliveredMessageLog.java
@@ -1,6 +1,10 @@
 package pl.allegro.tech.hermes.common.message.undelivered;
 
+import static java.lang.String.format;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.api.BackgroundPathAndBytesable;
 import org.slf4j.Logger;
@@ -12,66 +16,66 @@
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.HermesHistogram;
 
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import static java.lang.String.format;
-
 public class ZookeeperUndeliveredMessageLog implements UndeliveredMessageLog {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ZookeeperUndeliveredMessageLog.class);
+  private static final Logger LOGGER =
+      LoggerFactory.getLogger(ZookeeperUndeliveredMessageLog.class);
 
-    private final CuratorFramework curator;
-    private final UndeliveredMessagePaths paths;
-    private final ObjectMapper mapper;
-    private final HermesCounter persistedMessagesMeter;
-    private final HermesHistogram persistedMessageSizeHistogram;
+  private final CuratorFramework curator;
+  private final UndeliveredMessagePaths paths;
+  private final ObjectMapper mapper;
+  private final HermesCounter persistedMessagesMeter;
+  private final HermesHistogram persistedMessageSizeHistogram;
 
-    private final ConcurrentMap<SubscriptionName, SentMessageTrace> lastUndeliveredMessages = new ConcurrentHashMap<>();
+  private final ConcurrentMap<SubscriptionName, SentMessageTrace> lastUndeliveredMessages =
+      new ConcurrentHashMap<>();
 
-    public ZookeeperUndeliveredMessageLog(CuratorFramework curator,
-                                          ZookeeperPaths zookeeperPaths,
-                                          ObjectMapper mapper,
-                                          MetricsFacade metricsFacade) {
-        this.curator = curator;
-        this.paths = new UndeliveredMessagePaths(zookeeperPaths);
-        this.mapper = mapper;
-        persistedMessagesMeter = metricsFacade.undeliveredMessages().undeliveredMessagesCounter();
-        persistedMessageSizeHistogram = metricsFacade.undeliveredMessages().undeliveredMessagesSizeHistogram();
-    }
+  public ZookeeperUndeliveredMessageLog(
+      CuratorFramework curator,
+      ZookeeperPaths zookeeperPaths,
+      ObjectMapper mapper,
+      MetricsFacade metricsFacade) {
+    this.curator = curator;
+    this.paths = new UndeliveredMessagePaths(zookeeperPaths);
+    this.mapper = mapper;
+    persistedMessagesMeter = metricsFacade.undeliveredMessages().undeliveredMessagesCounter();
+    persistedMessageSizeHistogram =
+        metricsFacade.undeliveredMessages().undeliveredMessagesSizeHistogram();
+  }
 
-    @Override
-    public void add(SentMessageTrace message) {
-        lastUndeliveredMessages.put(new SubscriptionName(message.getSubscription(), message.getTopicName()), message);
-    }
+  @Override
+  public void add(SentMessageTrace message) {
+    lastUndeliveredMessages.put(
+        new SubscriptionName(message.getSubscription(), message.getTopicName()), message);
+  }
 
-    @Override
-    public void persist() {
-        for (SubscriptionName key : lastUndeliveredMessages.keySet()) {
-            log(lastUndeliveredMessages.remove(key));
-        }
+  @Override
+  public void persist() {
+    for (SubscriptionName key : lastUndeliveredMessages.keySet()) {
+      log(lastUndeliveredMessages.remove(key));
     }
+  }
 
-    private void log(SentMessageTrace messageTrace) {
-        try {
-            String undeliveredPath = paths.buildPath(messageTrace.getTopicName(), messageTrace.getSubscription());
-            BackgroundPathAndBytesable<?> builder = exists(undeliveredPath) ? curator.setData() : curator.create();
-            byte[] bytesToPersist = mapper.writeValueAsBytes(messageTrace);
-            builder.forPath(undeliveredPath, bytesToPersist);
-            persistedMessagesMeter.increment();
-            persistedMessageSizeHistogram.record(bytesToPersist.length);
-        } catch (Exception exception) {
-            LOGGER.warn(
-                    format("Could not log undelivered message for topic: %s and subscription: %s",
-                            messageTrace.getQualifiedTopicName(),
-                            messageTrace.getSubscription()
-                    ),
-                    exception
-            );
-        }
+  private void log(SentMessageTrace messageTrace) {
+    try {
+      String undeliveredPath =
+          paths.buildPath(messageTrace.getTopicName(), messageTrace.getSubscription());
+      BackgroundPathAndBytesable<?> builder =
+          exists(undeliveredPath) ? curator.setData() : curator.create();
+      byte[] bytesToPersist = mapper.writeValueAsBytes(messageTrace);
+      builder.forPath(undeliveredPath, bytesToPersist);
+      persistedMessagesMeter.increment();
+      persistedMessageSizeHistogram.record(bytesToPersist.length);
+    } catch (Exception exception) {
+      LOGGER.warn(
+          format(
+              "Could not log undelivered message for topic: %s and subscription: %s",
+              messageTrace.getQualifiedTopicName(), messageTrace.getSubscription()),
+          exception);
     }
+  }
 
-    private boolean exists(String path) throws Exception {
-        return curator.checkExists().forPath(path) != null;
-    }
+  private boolean exists(String path) throws Exception {
+    return curator.checkExists().forPath(path) != null;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroInvalidMetadataException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroInvalidMetadataException.java
index a6dd9d20fe..3e1f7c4d47 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroInvalidMetadataException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroInvalidMetadataException.java
@@ -3,7 +3,7 @@
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 public class AvroInvalidMetadataException extends InternalProcessingException {
-    public AvroInvalidMetadataException(String message, Exception cause) {
-        super(message, cause);
-    }
+  public AvroInvalidMetadataException(String message, Exception cause) {
+    super(message, cause);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapper.java
index 3f6d6ee30e..88549d34ae 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapper.java
@@ -5,7 +5,8 @@
 
 interface AvroMessageContentUnwrapper {
 
-    AvroMessageContentUnwrapperResult unwrap(byte[] data, Topic topic, @Nullable Integer headerId, @Nullable Integer headerVersion);
+  AvroMessageContentUnwrapperResult unwrap(
+      byte[] data, Topic topic, @Nullable Integer headerId, @Nullable Integer headerVersion);
 
-    boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion);
+  boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapperResult.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapperResult.java
index 2849a842b6..8e8eeb7791 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapperResult.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapperResult.java
@@ -2,32 +2,35 @@
 
 class AvroMessageContentUnwrapperResult {
 
-    private final UnwrappedMessageContent content;
-    private final AvroMessageContentUnwrapperResultStatus status;
-
-    private AvroMessageContentUnwrapperResult(UnwrappedMessageContent content,
-                                              AvroMessageContentUnwrapperResultStatus status) {
-        this.content = content;
-        this.status = status;
-    }
-
-    public static AvroMessageContentUnwrapperResult success(UnwrappedMessageContent content) {
-        return new AvroMessageContentUnwrapperResult(content, AvroMessageContentUnwrapperResultStatus.SUCCESS);
-    }
-
-    public static AvroMessageContentUnwrapperResult failure() {
-        return new AvroMessageContentUnwrapperResult(null, AvroMessageContentUnwrapperResultStatus.FAILURE);
-    }
-
-    public UnwrappedMessageContent getContent() {
-        return content;
-    }
-
-    public AvroMessageContentUnwrapperResultStatus getStatus() {
-        return status;
-    }
-
-    enum AvroMessageContentUnwrapperResultStatus {
-        SUCCESS, FAILURE
-    }
+  private final UnwrappedMessageContent content;
+  private final AvroMessageContentUnwrapperResultStatus status;
+
+  private AvroMessageContentUnwrapperResult(
+      UnwrappedMessageContent content, AvroMessageContentUnwrapperResultStatus status) {
+    this.content = content;
+    this.status = status;
+  }
+
+  public static AvroMessageContentUnwrapperResult success(UnwrappedMessageContent content) {
+    return new AvroMessageContentUnwrapperResult(
+        content, AvroMessageContentUnwrapperResultStatus.SUCCESS);
+  }
+
+  public static AvroMessageContentUnwrapperResult failure() {
+    return new AvroMessageContentUnwrapperResult(
+        null, AvroMessageContentUnwrapperResultStatus.FAILURE);
+  }
+
+  public UnwrappedMessageContent getContent() {
+    return content;
+  }
+
+  public AvroMessageContentUnwrapperResultStatus getStatus() {
+    return status;
+  }
+
+  enum AvroMessageContentUnwrapperResultStatus {
+    SUCCESS,
+    FAILURE
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentWrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentWrapper.java
index 9b34fe141e..e0244a4f2c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentWrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentWrapper.java
@@ -1,10 +1,10 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
-import org.apache.avro.AvroRuntimeException;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.util.Utf8;
-import pl.allegro.tech.hermes.schema.CompiledSchema;
+import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
+import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.recordToBytes;
+import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MARKER;
+import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MESSAGE_ID_KEY;
+import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_TIMESTAMP_KEY;
 
 import java.time.Clock;
 import java.util.Collections;
@@ -12,95 +12,102 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import org.apache.avro.AvroRuntimeException;
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.util.Utf8;
+import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
-import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.recordToBytes;
-import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MARKER;
-import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MESSAGE_ID_KEY;
-import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_TIMESTAMP_KEY;
-
-/** This class deals only with wrapping and unwrapping messages.
- *  It does not generate any Hermes ID for message in case it is missing.
- *  Missing Hermes ID will be left as empty.
+/**
+ * This class deals only with wrapping and unwrapping messages. It does not generate any Hermes ID
+ * for message in case it is missing. Missing Hermes ID will be left as empty.
  */
 public class AvroMessageContentWrapper {
 
-    private final Clock clock;
+  private final Clock clock;
 
-    public AvroMessageContentWrapper(Clock clock) {
-        this.clock = clock;
-    }
+  public AvroMessageContentWrapper(Clock clock) {
+    this.clock = clock;
+  }
 
-    @SuppressWarnings("unchecked")
-    UnwrappedMessageContent unwrapContent(byte[] data, CompiledSchema<Schema> schema) {
-        try {
-            Map<Utf8, Utf8> metadata = (Map<Utf8, Utf8>) bytesToRecord(data, schema.getSchema()).get(METADATA_MARKER);
-            MessageMetadata messageMetadata = getMetadata(metadata);
+  @SuppressWarnings("unchecked")
+  UnwrappedMessageContent unwrapContent(byte[] data, CompiledSchema<Schema> schema) {
+    try {
+      Map<Utf8, Utf8> metadata =
+          (Map<Utf8, Utf8>) bytesToRecord(data, schema.getSchema()).get(METADATA_MARKER);
+      MessageMetadata messageMetadata = getMetadata(metadata);
 
-            return new UnwrappedMessageContent(messageMetadata, data, schema);
-        } catch (Exception exception) {
-            throw new UnwrappingException("Could not read avro message", exception);
-        }
+      return new UnwrappedMessageContent(messageMetadata, data, schema);
+    } catch (Exception exception) {
+      throw new UnwrappingException("Could not read avro message", exception);
     }
-
-    @SuppressWarnings("unchecked")
-    private MessageMetadata getMetadata(Map<Utf8, Utf8> metadata) {
-        if (metadata == null) {
-            long timestamp = clock.millis();
-            return new MessageMetadata(timestamp, Collections.EMPTY_MAP);
-        } else {
-            long timestamp = metadata.containsKey(METADATA_TIMESTAMP_KEY) ? timestampFromMetadata(metadata) :
-                    clock.millis();
-            Map<String, String> extractedMetadata = extractMetadata(metadata);
-
-            return metadata.containsKey(METADATA_MESSAGE_ID_KEY)
-                    ? new MessageMetadata(timestamp, messageIdFromMetadata(metadata), extractedMetadata)
-                    : new MessageMetadata(timestamp, extractedMetadata);
-        }
+  }
+
+  @SuppressWarnings("unchecked")
+  private MessageMetadata getMetadata(Map<Utf8, Utf8> metadata) {
+    if (metadata == null) {
+      long timestamp = clock.millis();
+      return new MessageMetadata(timestamp, Collections.EMPTY_MAP);
+    } else {
+      long timestamp =
+          metadata.containsKey(METADATA_TIMESTAMP_KEY)
+              ? timestampFromMetadata(metadata)
+              : clock.millis();
+      Map<String, String> extractedMetadata = extractMetadata(metadata);
+
+      return metadata.containsKey(METADATA_MESSAGE_ID_KEY)
+          ? new MessageMetadata(timestamp, messageIdFromMetadata(metadata), extractedMetadata)
+          : new MessageMetadata(timestamp, extractedMetadata);
     }
-
-    public byte[] wrapContent(byte[] message, String id, long timestamp, Schema schema, Map<String, String> externalMetadata) {
-        if (schema.getField(METADATA_MARKER) != null) {
-            GenericRecord genericRecord = bytesToRecord(message, schema);
-            try {
-                genericRecord.put(METADATA_MARKER, metadataMap(id, timestamp, externalMetadata));
-                return recordToBytes(genericRecord, schema);
-            } catch (Exception e) {
-                if (e instanceof AvroRuntimeException && e.getMessage().equals("Not a valid schema field: __metadata")) {
-                    throw new AvroInvalidMetadataException(
-                            "Schema does not contain mandatory __metadata field for Hermes internal metadata. Please fix topic schema.", e);
-                }
-                throw new WrappingException("Could not wrap avro message", e);
-            }
-        } else {
-            return message;
+  }
+
+  public byte[] wrapContent(
+      byte[] message,
+      String id,
+      long timestamp,
+      Schema schema,
+      Map<String, String> externalMetadata) {
+    if (schema.getField(METADATA_MARKER) != null) {
+      GenericRecord genericRecord = bytesToRecord(message, schema);
+      try {
+        genericRecord.put(METADATA_MARKER, metadataMap(id, timestamp, externalMetadata));
+        return recordToBytes(genericRecord, schema);
+      } catch (Exception e) {
+        if (e instanceof AvroRuntimeException
+            && e.getMessage().equals("Not a valid schema field: __metadata")) {
+          throw new AvroInvalidMetadataException(
+              "Schema does not contain mandatory __metadata field for Hermes internal metadata. Please fix topic schema.",
+              e);
         }
+        throw new WrappingException("Could not wrap avro message", e);
+      }
+    } else {
+      return message;
     }
-
-    private Map<Utf8, Utf8> metadataMap(String id, long timestamp, Map<String, String> externalMetadata) {
-        Map<Utf8, Utf8> metadata = new HashMap<>();
-        metadata.put(METADATA_MESSAGE_ID_KEY, new Utf8(id));
-        metadata.put(METADATA_TIMESTAMP_KEY, new Utf8(Long.toString(timestamp)));
-
-        externalMetadata.forEach((key, value) -> metadata.put(new Utf8(key), new Utf8(value)));
-        return metadata;
-    }
-
-    private long timestampFromMetadata(Map<Utf8, Utf8> metadata) {
-        return Long.parseLong(metadata.remove(METADATA_TIMESTAMP_KEY).toString());
-    }
-
-    private String messageIdFromMetadata(Map<Utf8, Utf8> metadata) {
-        return metadata.remove(METADATA_MESSAGE_ID_KEY).toString();
-    }
-
-    private Map<String, String> extractMetadata(Map<Utf8, Utf8> metadata) {
-        return Optional.ofNullable(metadata).orElse(Collections.emptyMap())
-                .entrySet()
-                .stream()
-                .collect(Collectors.toMap(
-                        entry -> entry.getKey().toString(),
-                        entry -> entry.getValue().toString()
-                ));
-    }
+  }
+
+  private Map<Utf8, Utf8> metadataMap(
+      String id, long timestamp, Map<String, String> externalMetadata) {
+    Map<Utf8, Utf8> metadata = new HashMap<>();
+    metadata.put(METADATA_MESSAGE_ID_KEY, new Utf8(id));
+    metadata.put(METADATA_TIMESTAMP_KEY, new Utf8(Long.toString(timestamp)));
+
+    externalMetadata.forEach((key, value) -> metadata.put(new Utf8(key), new Utf8(value)));
+    return metadata;
+  }
+
+  private long timestampFromMetadata(Map<Utf8, Utf8> metadata) {
+    return Long.parseLong(metadata.remove(METADATA_TIMESTAMP_KEY).toString());
+  }
+
+  private String messageIdFromMetadata(Map<Utf8, Utf8> metadata) {
+    return metadata.remove(METADATA_MESSAGE_ID_KEY).toString();
+  }
+
+  private Map<String, String> extractMetadata(Map<Utf8, Utf8> metadata) {
+    return Optional.ofNullable(metadata).orElse(Collections.emptyMap()).entrySet().stream()
+        .collect(
+            Collectors.toMap(
+                entry -> entry.getKey().toString(), entry -> entry.getValue().toString()));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageHeaderSchemaIdContentWrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageHeaderSchemaIdContentWrapper.java
index 1a87be5b84..5299a5f3b6 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageHeaderSchemaIdContentWrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageHeaderSchemaIdContentWrapper.java
@@ -12,47 +12,55 @@
 
 public class AvroMessageHeaderSchemaIdContentWrapper implements AvroMessageContentUnwrapper {
 
-    private static final Logger logger = LoggerFactory.getLogger(AvroMessageHeaderSchemaIdContentWrapper.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(AvroMessageHeaderSchemaIdContentWrapper.class);
 
-    private final SchemaRepository schemaRepository;
-    private final AvroMessageContentWrapper avroMessageContentWrapper;
+  private final SchemaRepository schemaRepository;
+  private final AvroMessageContentWrapper avroMessageContentWrapper;
 
-    private final HermesCounter deserializationWithErrorsUsingHeaderSchemaId;
-    private final HermesCounter deserializationUsingHeaderSchemaId;
-    private final boolean schemaIdHeaderEnabled;
+  private final HermesCounter deserializationWithErrorsUsingHeaderSchemaId;
+  private final HermesCounter deserializationUsingHeaderSchemaId;
+  private final boolean schemaIdHeaderEnabled;
 
-    public AvroMessageHeaderSchemaIdContentWrapper(SchemaRepository schemaRepository,
-                                                   AvroMessageContentWrapper avroMessageContentWrapper,
-                                                   MetricsFacade metrics,
-                                                   boolean schemaIdHeaderEnabled) {
-        this.schemaRepository = schemaRepository;
-        this.avroMessageContentWrapper = avroMessageContentWrapper;
+  public AvroMessageHeaderSchemaIdContentWrapper(
+      SchemaRepository schemaRepository,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      MetricsFacade metrics,
+      boolean schemaIdHeaderEnabled) {
+    this.schemaRepository = schemaRepository;
+    this.avroMessageContentWrapper = avroMessageContentWrapper;
 
-        this.deserializationWithErrorsUsingHeaderSchemaId = metrics.deserialization().errorsForHeaderSchemaId();
-        this.deserializationUsingHeaderSchemaId = metrics.deserialization().usingHeaderSchemaId();
-        this.schemaIdHeaderEnabled = schemaIdHeaderEnabled;
-    }
+    this.deserializationWithErrorsUsingHeaderSchemaId =
+        metrics.deserialization().errorsForHeaderSchemaId();
+    this.deserializationUsingHeaderSchemaId = metrics.deserialization().usingHeaderSchemaId();
+    this.schemaIdHeaderEnabled = schemaIdHeaderEnabled;
+  }
 
-    @Override
-    public AvroMessageContentUnwrapperResult unwrap(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        try {
-            deserializationUsingHeaderSchemaId.increment();
-            CompiledSchema<Schema> avroSchema = schemaRepository.getAvroSchema(topic, SchemaId.valueOf(schemaId));
+  @Override
+  public AvroMessageContentUnwrapperResult unwrap(
+      byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    try {
+      deserializationUsingHeaderSchemaId.increment();
+      CompiledSchema<Schema> avroSchema =
+          schemaRepository.getAvroSchema(topic, SchemaId.valueOf(schemaId));
 
-            return AvroMessageContentUnwrapperResult.success(avroMessageContentWrapper.unwrapContent(data, avroSchema));
-        } catch (Exception ex) {
-            logger.warn(
-                    "Could not unwrap content for topic [{}] using schema id provided in header [{}] - falling back",
-                    topic.getQualifiedName(), schemaVersion, ex);
+      return AvroMessageContentUnwrapperResult.success(
+          avroMessageContentWrapper.unwrapContent(data, avroSchema));
+    } catch (Exception ex) {
+      logger.warn(
+          "Could not unwrap content for topic [{}] using schema id provided in header [{}] - falling back",
+          topic.getQualifiedName(),
+          schemaVersion,
+          ex);
 
-            deserializationWithErrorsUsingHeaderSchemaId.increment();
+      deserializationWithErrorsUsingHeaderSchemaId.increment();
 
-            return AvroMessageContentUnwrapperResult.failure();
-        }
+      return AvroMessageContentUnwrapperResult.failure();
     }
+  }
 
-    @Override
-    public boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        return schemaIdHeaderEnabled && schemaId != null;
-    }
+  @Override
+  public boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    return schemaIdHeaderEnabled && schemaId != null;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageHeaderSchemaVersionContentWrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageHeaderSchemaVersionContentWrapper.java
index 6d1d5b803a..4aa622a7b6 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageHeaderSchemaVersionContentWrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageHeaderSchemaVersionContentWrapper.java
@@ -12,44 +12,53 @@
 
 public class AvroMessageHeaderSchemaVersionContentWrapper implements AvroMessageContentUnwrapper {
 
-    private static final Logger logger = LoggerFactory.getLogger(AvroMessageHeaderSchemaVersionContentWrapper.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(AvroMessageHeaderSchemaVersionContentWrapper.class);
 
-    private final SchemaRepository schemaRepository;
-    private final AvroMessageContentWrapper avroMessageContentWrapper;
+  private final SchemaRepository schemaRepository;
+  private final AvroMessageContentWrapper avroMessageContentWrapper;
 
-    private final HermesCounter deserializationWithErrorsUsingHeaderSchemaVersion;
-    private final HermesCounter deserializationUsingHeaderSchemaVersion;
+  private final HermesCounter deserializationWithErrorsUsingHeaderSchemaVersion;
+  private final HermesCounter deserializationUsingHeaderSchemaVersion;
 
-    public AvroMessageHeaderSchemaVersionContentWrapper(SchemaRepository schemaRepository,
-                                                        AvroMessageContentWrapper avroMessageContentWrapper,
-                                                        MetricsFacade metrics) {
-        this.schemaRepository = schemaRepository;
-        this.avroMessageContentWrapper = avroMessageContentWrapper;
+  public AvroMessageHeaderSchemaVersionContentWrapper(
+      SchemaRepository schemaRepository,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      MetricsFacade metrics) {
+    this.schemaRepository = schemaRepository;
+    this.avroMessageContentWrapper = avroMessageContentWrapper;
 
-        this.deserializationWithErrorsUsingHeaderSchemaVersion = metrics.deserialization().errorsForHeaderSchemaVersion();
-        this.deserializationUsingHeaderSchemaVersion = metrics.deserialization().usingHeaderSchemaVersion();
-    }
+    this.deserializationWithErrorsUsingHeaderSchemaVersion =
+        metrics.deserialization().errorsForHeaderSchemaVersion();
+    this.deserializationUsingHeaderSchemaVersion =
+        metrics.deserialization().usingHeaderSchemaVersion();
+  }
 
-    @Override
-    public AvroMessageContentUnwrapperResult unwrap(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        try {
-            deserializationUsingHeaderSchemaVersion.increment();
-            CompiledSchema<Schema> avroSchema = schemaRepository.getAvroSchema(topic, SchemaVersion.valueOf(schemaVersion));
+  @Override
+  public AvroMessageContentUnwrapperResult unwrap(
+      byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    try {
+      deserializationUsingHeaderSchemaVersion.increment();
+      CompiledSchema<Schema> avroSchema =
+          schemaRepository.getAvroSchema(topic, SchemaVersion.valueOf(schemaVersion));
 
-            return AvroMessageContentUnwrapperResult.success(avroMessageContentWrapper.unwrapContent(data, avroSchema));
-        } catch (Exception ex) {
-            logger.warn(
-                    "Could not unwrap content for topic [{}] using schema version provided in header [{}] - falling back",
-                    topic.getQualifiedName(), schemaVersion, ex);
+      return AvroMessageContentUnwrapperResult.success(
+          avroMessageContentWrapper.unwrapContent(data, avroSchema));
+    } catch (Exception ex) {
+      logger.warn(
+          "Could not unwrap content for topic [{}] using schema version provided in header [{}] - falling back",
+          topic.getQualifiedName(),
+          schemaVersion,
+          ex);
 
-            deserializationWithErrorsUsingHeaderSchemaVersion.increment();
+      deserializationWithErrorsUsingHeaderSchemaVersion.increment();
 
-            return AvroMessageContentUnwrapperResult.failure();
-        }
+      return AvroMessageContentUnwrapperResult.failure();
     }
+  }
 
-    @Override
-    public boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        return schemaVersion != null;
-    }
+  @Override
+  public boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    return schemaVersion != null;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageSchemaIdAwareContentWrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageSchemaIdAwareContentWrapper.java
index 79e28d67a0..45719da8e6 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageSchemaIdAwareContentWrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageSchemaIdAwareContentWrapper.java
@@ -11,58 +11,68 @@
 
 public class AvroMessageSchemaIdAwareContentWrapper implements AvroMessageContentUnwrapper {
 
-    private static final Logger logger = LoggerFactory.getLogger(AvroMessageSchemaIdAwareContentWrapper.class);
-
-    private final SchemaRepository schemaRepository;
-    private final AvroMessageContentWrapper avroMessageContentWrapper;
-
-    private final HermesCounter deserializationUsingSchemaIdAware;
-    private final HermesCounter deserializationErrorsForSchemaIdAwarePayload;
-    private final HermesCounter deserializationWithMissingSchemaIdInPayload;
-
-    public AvroMessageSchemaIdAwareContentWrapper(SchemaRepository schemaRepository,
-                                                  AvroMessageContentWrapper avroMessageContentWrapper,
-                                                  MetricsFacade metrics) {
-        this.schemaRepository = schemaRepository;
-        this.avroMessageContentWrapper = avroMessageContentWrapper;
-
-        this.deserializationErrorsForSchemaIdAwarePayload = metrics.deserialization().errorsForSchemaIdAwarePayload();
-        this.deserializationWithMissingSchemaIdInPayload = metrics.deserialization().missingSchemaIdInPayload();
-        this.deserializationUsingSchemaIdAware = metrics.deserialization().usingSchemaIdAware();
+  private static final Logger logger =
+      LoggerFactory.getLogger(AvroMessageSchemaIdAwareContentWrapper.class);
+
+  private final SchemaRepository schemaRepository;
+  private final AvroMessageContentWrapper avroMessageContentWrapper;
+
+  private final HermesCounter deserializationUsingSchemaIdAware;
+  private final HermesCounter deserializationErrorsForSchemaIdAwarePayload;
+  private final HermesCounter deserializationWithMissingSchemaIdInPayload;
+
+  public AvroMessageSchemaIdAwareContentWrapper(
+      SchemaRepository schemaRepository,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      MetricsFacade metrics) {
+    this.schemaRepository = schemaRepository;
+    this.avroMessageContentWrapper = avroMessageContentWrapper;
+
+    this.deserializationErrorsForSchemaIdAwarePayload =
+        metrics.deserialization().errorsForSchemaIdAwarePayload();
+    this.deserializationWithMissingSchemaIdInPayload =
+        metrics.deserialization().missingSchemaIdInPayload();
+    this.deserializationUsingSchemaIdAware = metrics.deserialization().usingSchemaIdAware();
+  }
+
+  @Override
+  public AvroMessageContentUnwrapperResult unwrap(
+      byte[] data, Topic topic, Integer schemaIdFromHeader, Integer schemaVersionFromHeader) {
+    try {
+      deserializationUsingSchemaIdAware.increment();
+
+      SchemaAwarePayload payload = SchemaAwareSerDe.deserialize(data);
+      CompiledSchema<Schema> avroSchema =
+          schemaRepository.getAvroSchema(topic, payload.getSchemaId());
+
+      return AvroMessageContentUnwrapperResult.success(
+          avroMessageContentWrapper.unwrapContent(payload.getPayload(), avroSchema));
+    } catch (Exception ex) {
+      logger.warn(
+          "Could not deserialize schema id aware payload for topic [{}] - falling back",
+          topic.getQualifiedName(),
+          ex);
+
+      deserializationErrorsForSchemaIdAwarePayload.increment();
+
+      return AvroMessageContentUnwrapperResult.failure();
     }
+  }
 
-    @Override
-    public AvroMessageContentUnwrapperResult unwrap(byte[] data, Topic topic, Integer schemaIdFromHeader, Integer schemaVersionFromHeader) {
-        try {
-            deserializationUsingSchemaIdAware.increment();
-
-            SchemaAwarePayload payload = SchemaAwareSerDe.deserialize(data);
-            CompiledSchema<Schema> avroSchema = schemaRepository.getAvroSchema(topic, payload.getSchemaId());
-
-            return AvroMessageContentUnwrapperResult.success(avroMessageContentWrapper.unwrapContent(payload.getPayload(), avroSchema));
-        } catch (Exception ex) {
-            logger.warn("Could not deserialize schema id aware payload for topic [{}] - falling back", topic.getQualifiedName(), ex);
+  @Override
+  public boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    return isPayloadAwareOfSchemaId(data, topic);
+  }
 
-            deserializationErrorsForSchemaIdAwarePayload.increment();
+  private boolean isPayloadAwareOfSchemaId(byte[] data, Topic topic) {
+    if (topic.isSchemaIdAwareSerializationEnabled()) {
+      if (SchemaAwareSerDe.startsWithMagicByte(data)) {
+        return true;
+      }
 
-            return AvroMessageContentUnwrapperResult.failure();
-        }
+      deserializationWithMissingSchemaIdInPayload.increment();
     }
 
-    @Override
-    public boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        return isPayloadAwareOfSchemaId(data, topic);
-    }
-
-    private boolean isPayloadAwareOfSchemaId(byte[] data, Topic topic) {
-        if (topic.isSchemaIdAwareSerializationEnabled()) {
-            if (SchemaAwareSerDe.startsWithMagicByte(data)) {
-                return true;
-            }
-
-            deserializationWithMissingSchemaIdInPayload.increment();
-        }
-
-        return false;
-    }
+    return false;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageSchemaVersionTruncationContentWrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageSchemaVersionTruncationContentWrapper.java
index c4f39e6aa6..b84dcafdb7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageSchemaVersionTruncationContentWrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageSchemaVersionTruncationContentWrapper.java
@@ -10,57 +10,66 @@
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 import pl.allegro.tech.hermes.schema.SchemaVersion;
 
-public class AvroMessageSchemaVersionTruncationContentWrapper implements AvroMessageContentUnwrapper {
+public class AvroMessageSchemaVersionTruncationContentWrapper
+    implements AvroMessageContentUnwrapper {
 
-    private static final Logger logger = LoggerFactory.getLogger(AvroMessageSchemaVersionTruncationContentWrapper.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(AvroMessageSchemaVersionTruncationContentWrapper.class);
 
-    private final SchemaRepository schemaRepository;
-    private final AvroMessageContentWrapper avroMessageContentWrapper;
-    private final boolean magicByteTruncationEnabled;
+  private final SchemaRepository schemaRepository;
+  private final AvroMessageContentWrapper avroMessageContentWrapper;
+  private final boolean magicByteTruncationEnabled;
 
-    private final HermesCounter deserializationWithSchemaVersionTruncation;
-    private final HermesCounter deserializationErrorsWithSchemaVersionTruncation;
+  private final HermesCounter deserializationWithSchemaVersionTruncation;
+  private final HermesCounter deserializationErrorsWithSchemaVersionTruncation;
 
-    public AvroMessageSchemaVersionTruncationContentWrapper(SchemaRepository schemaRepository,
-                                                            AvroMessageContentWrapper avroMessageContentWrapper,
-                                                            MetricsFacade metrics,
-                                                            boolean schemaVersionTruncationEnabled) {
-        this.schemaRepository = schemaRepository;
-        this.avroMessageContentWrapper = avroMessageContentWrapper;
-        this.magicByteTruncationEnabled = schemaVersionTruncationEnabled;
-
-        this.deserializationErrorsWithSchemaVersionTruncation = metrics.deserialization().errorsForSchemaVersionTruncation();
-        this.deserializationWithSchemaVersionTruncation = metrics.deserialization().usingSchemaVersionTruncation();
-    }
+  public AvroMessageSchemaVersionTruncationContentWrapper(
+      SchemaRepository schemaRepository,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      MetricsFacade metrics,
+      boolean schemaVersionTruncationEnabled) {
+    this.schemaRepository = schemaRepository;
+    this.avroMessageContentWrapper = avroMessageContentWrapper;
+    this.magicByteTruncationEnabled = schemaVersionTruncationEnabled;
 
+    this.deserializationErrorsWithSchemaVersionTruncation =
+        metrics.deserialization().errorsForSchemaVersionTruncation();
+    this.deserializationWithSchemaVersionTruncation =
+        metrics.deserialization().usingSchemaVersionTruncation();
+  }
 
-    @Override
-    public AvroMessageContentUnwrapperResult unwrap(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        try {
-            deserializationWithSchemaVersionTruncation.increment();
+  @Override
+  public AvroMessageContentUnwrapperResult unwrap(
+      byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    try {
+      deserializationWithSchemaVersionTruncation.increment();
 
-            byte[] dataWithoutMagicByteAndSchemaId = SchemaAwareSerDe.trimMagicByteAndSchemaVersion(data);
-            CompiledSchema<Schema> avroSchema = schemaRepository.getAvroSchema(topic, SchemaVersion.valueOf(schemaVersion));
+      byte[] dataWithoutMagicByteAndSchemaId = SchemaAwareSerDe.trimMagicByteAndSchemaVersion(data);
+      CompiledSchema<Schema> avroSchema =
+          schemaRepository.getAvroSchema(topic, SchemaVersion.valueOf(schemaVersion));
 
-            return AvroMessageContentUnwrapperResult.success(
-                    avroMessageContentWrapper.unwrapContent(dataWithoutMagicByteAndSchemaId, avroSchema));
-        } catch (Exception e) {
-            logger.warn(
-                    "Could not unwrap content for topic [{}] using schema id provided in header [{}] - falling back",
-                    topic.getQualifiedName(), schemaVersion, e);
+      return AvroMessageContentUnwrapperResult.success(
+          avroMessageContentWrapper.unwrapContent(dataWithoutMagicByteAndSchemaId, avroSchema));
+    } catch (Exception e) {
+      logger.warn(
+          "Could not unwrap content for topic [{}] using schema id provided in header [{}] - falling back",
+          topic.getQualifiedName(),
+          schemaVersion,
+          e);
 
-            deserializationErrorsWithSchemaVersionTruncation.increment();
+      deserializationErrorsWithSchemaVersionTruncation.increment();
 
-            return AvroMessageContentUnwrapperResult.failure();
-        }
+      return AvroMessageContentUnwrapperResult.failure();
     }
+  }
 
-    @Override
-    public boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        return magicByteTruncationEnabled && containsSchemaVersionInMagicByteAndInHeader(data, schemaVersion);
-    }
+  @Override
+  public boolean isApplicable(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    return magicByteTruncationEnabled
+        && containsSchemaVersionInMagicByteAndInHeader(data, schemaVersion);
+  }
 
-    private boolean containsSchemaVersionInMagicByteAndInHeader(byte[] data, Integer schemaVersion) {
-        return SchemaAwareSerDe.startsWithMagicByte(data) && schemaVersion != null;
-    }
+  private boolean containsSchemaVersionInMagicByteAndInHeader(byte[] data, Integer schemaVersion) {
+    return SchemaAwareSerDe.startsWithMagicByte(data) && schemaVersion != null;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMetadataMarker.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMetadataMarker.java
index c860040606..c67291753b 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMetadataMarker.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMetadataMarker.java
@@ -3,7 +3,7 @@
 import org.apache.avro.util.Utf8;
 
 public interface AvroMetadataMarker {
-    String METADATA_MARKER = "__metadata";
-    Utf8 METADATA_TIMESTAMP_KEY = new Utf8("timestamp");
-    Utf8 METADATA_MESSAGE_ID_KEY = new Utf8("messageId");
+  String METADATA_MARKER = "__metadata";
+  Utf8 METADATA_TIMESTAMP_KEY = new Utf8("timestamp");
+  Utf8 METADATA_MESSAGE_ID_KEY = new Utf8("messageId");
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/CompositeMessageContentWrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/CompositeMessageContentWrapper.java
index 53de748f1b..69d424df4a 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/CompositeMessageContentWrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/CompositeMessageContentWrapper.java
@@ -1,72 +1,83 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
+import static java.util.Arrays.asList;
+import static pl.allegro.tech.hermes.common.message.wrapper.AvroMessageContentUnwrapperResult.AvroMessageContentUnwrapperResultStatus.SUCCESS;
+
+import java.util.Collection;
+import java.util.Map;
 import org.apache.avro.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.util.Collection;
-import java.util.Map;
-
-import static java.util.Arrays.asList;
-import static pl.allegro.tech.hermes.common.message.wrapper.AvroMessageContentUnwrapperResult.AvroMessageContentUnwrapperResultStatus.SUCCESS;
-
 public class CompositeMessageContentWrapper implements MessageContentWrapper {
 
-    private static final Logger logger = LoggerFactory.getLogger(CompositeMessageContentWrapper.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(CompositeMessageContentWrapper.class);
 
-    private final JsonMessageContentWrapper jsonMessageContentWrapper;
-    private final AvroMessageContentWrapper avroMessageContentWrapper;
-    private final Collection<AvroMessageContentUnwrapper> avroMessageContentUnwrappers;
+  private final JsonMessageContentWrapper jsonMessageContentWrapper;
+  private final AvroMessageContentWrapper avroMessageContentWrapper;
+  private final Collection<AvroMessageContentUnwrapper> avroMessageContentUnwrappers;
 
-    public CompositeMessageContentWrapper(JsonMessageContentWrapper jsonMessageContentWrapper,
-                                          AvroMessageContentWrapper avroMessageContentWrapper,
-                                          AvroMessageSchemaIdAwareContentWrapper schemaIdAwareContentWrapper,
-                                          AvroMessageHeaderSchemaVersionContentWrapper headerSchemaVersionContentWrapper,
-                                          AvroMessageHeaderSchemaIdContentWrapper headerSchemaIdContentWrapper,
-                                          AvroMessageSchemaVersionTruncationContentWrapper schemaVersionTruncationContentWrapper) {
+  public CompositeMessageContentWrapper(
+      JsonMessageContentWrapper jsonMessageContentWrapper,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      AvroMessageSchemaIdAwareContentWrapper schemaIdAwareContentWrapper,
+      AvroMessageHeaderSchemaVersionContentWrapper headerSchemaVersionContentWrapper,
+      AvroMessageHeaderSchemaIdContentWrapper headerSchemaIdContentWrapper,
+      AvroMessageSchemaVersionTruncationContentWrapper schemaVersionTruncationContentWrapper) {
 
-        this.jsonMessageContentWrapper = jsonMessageContentWrapper;
-        this.avroMessageContentWrapper = avroMessageContentWrapper;
-        this.avroMessageContentUnwrappers = asList(
-                schemaIdAwareContentWrapper,
-                schemaVersionTruncationContentWrapper,
-                headerSchemaVersionContentWrapper,
-                headerSchemaIdContentWrapper);
-    }
+    this.jsonMessageContentWrapper = jsonMessageContentWrapper;
+    this.avroMessageContentWrapper = avroMessageContentWrapper;
+    this.avroMessageContentUnwrappers =
+        asList(
+            schemaIdAwareContentWrapper,
+            schemaVersionTruncationContentWrapper,
+            headerSchemaVersionContentWrapper,
+            headerSchemaIdContentWrapper);
+  }
 
-    public UnwrappedMessageContent unwrapJson(byte[] data) {
-        return jsonMessageContentWrapper.unwrapContent(data);
-    }
+  public UnwrappedMessageContent unwrapJson(byte[] data) {
+    return jsonMessageContentWrapper.unwrapContent(data);
+  }
 
-    public UnwrappedMessageContent unwrapAvro(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
-        for (AvroMessageContentUnwrapper unwrapper : avroMessageContentUnwrappers) {
-            if (unwrapper.isApplicable(data, topic, schemaId, schemaVersion)) {
-                AvroMessageContentUnwrapperResult result = unwrapper.unwrap(data, topic, schemaId, schemaVersion);
-                if (result.getStatus() == SUCCESS) {
-                    return result.getContent();
-                }
-            }
+  public UnwrappedMessageContent unwrapAvro(
+      byte[] data, Topic topic, Integer schemaId, Integer schemaVersion) {
+    for (AvroMessageContentUnwrapper unwrapper : avroMessageContentUnwrappers) {
+      if (unwrapper.isApplicable(data, topic, schemaId, schemaVersion)) {
+        AvroMessageContentUnwrapperResult result =
+            unwrapper.unwrap(data, topic, schemaId, schemaVersion);
+        if (result.getStatus() == SUCCESS) {
+          return result.getContent();
         }
-
-        logger.error("All attempts to unwrap Avro message for topic {} with schema version {} failed",
-                topic.getQualifiedName(),
-                schemaVersion);
-        throw new SchemaMissingException(topic);
+      }
     }
 
-    public byte[] wrapAvro(byte[] data,
-                           String id,
-                           long timestamp,
-                           Topic topic,
-                           CompiledSchema<Schema> schema,
-                           Map<String, String> externalMetadata) {
-        byte[] wrapped = avroMessageContentWrapper.wrapContent(data, id, timestamp, schema.getSchema(), externalMetadata);
-        return topic.isSchemaIdAwareSerializationEnabled() ? SchemaAwareSerDe.serialize(schema.getId(), wrapped) : wrapped;
-    }
+    logger.error(
+        "All attempts to unwrap Avro message for topic {} with schema version {} failed",
+        topic.getQualifiedName(),
+        schemaVersion);
+    throw new SchemaMissingException(topic);
+  }
 
-    public byte[] wrapJson(byte[] data, String id, long timestamp, Map<String, String> externalMetadata) {
-        return jsonMessageContentWrapper.wrapContent(data, id, timestamp, externalMetadata);
-    }
+  public byte[] wrapAvro(
+      byte[] data,
+      String id,
+      long timestamp,
+      Topic topic,
+      CompiledSchema<Schema> schema,
+      Map<String, String> externalMetadata) {
+    byte[] wrapped =
+        avroMessageContentWrapper.wrapContent(
+            data, id, timestamp, schema.getSchema(), externalMetadata);
+    return topic.isSchemaIdAwareSerializationEnabled()
+        ? SchemaAwareSerDe.serialize(schema.getId(), wrapped)
+        : wrapped;
+  }
+
+  public byte[] wrapJson(
+      byte[] data, String id, long timestamp, Map<String, String> externalMetadata) {
+    return jsonMessageContentWrapper.wrapContent(data, id, timestamp, externalMetadata);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/DeserializationException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/DeserializationException.java
index 9cc62105f8..c6a167f83e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/DeserializationException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/DeserializationException.java
@@ -2,7 +2,7 @@
 
 public class DeserializationException extends RuntimeException {
 
-    DeserializationException(String message) {
-        super(message);
-    }
+  DeserializationException(String message) {
+    super(message);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/JsonMessageContentWrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/JsonMessageContentWrapper.java
index 3014f3073d..f46cb84ade 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/JsonMessageContentWrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/JsonMessageContentWrapper.java
@@ -1,98 +1,103 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
+import static com.google.common.base.Charsets.UTF_8;
+import static com.google.common.primitives.Bytes.indexOf;
+import static java.lang.String.format;
+import static java.util.Arrays.copyOfRange;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
 import java.util.UUID;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.primitives.Bytes.indexOf;
-import static java.lang.String.format;
-import static java.util.Arrays.copyOfRange;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JsonMessageContentWrapper {
-    private static final Logger LOGGER = LoggerFactory.getLogger(JsonMessageContentWrapper.class);
-
-    private static final byte[] SEPARATOR = ",".getBytes(UTF_8);
-    private static final byte[] WRAPPED_MARKER = "\"_w\":true".getBytes(UTF_8);
-    private static final byte JSON_OPEN = (byte) '{';
-    private static final byte JSON_CLOSE = (byte) '}';
-    private static final int BRACKET_LENGTH = 1;
-    private final ObjectMapper mapper;
-    private final byte[] contentRootField;
-    private final byte[] metadataRootField;
-
-    public JsonMessageContentWrapper(String contentRootName, String metadataRootName, ObjectMapper mapper) {
-        this.contentRootField = formatNodeKey(contentRootName);
-        this.metadataRootField = formatNodeKey(metadataRootName);
-        this.mapper = mapper;
+  private static final Logger LOGGER = LoggerFactory.getLogger(JsonMessageContentWrapper.class);
+
+  private static final byte[] SEPARATOR = ",".getBytes(UTF_8);
+  private static final byte[] WRAPPED_MARKER = "\"_w\":true".getBytes(UTF_8);
+  private static final byte JSON_OPEN = (byte) '{';
+  private static final byte JSON_CLOSE = (byte) '}';
+  private static final int BRACKET_LENGTH = 1;
+  private final ObjectMapper mapper;
+  private final byte[] contentRootField;
+  private final byte[] metadataRootField;
+
+  public JsonMessageContentWrapper(
+      String contentRootName, String metadataRootName, ObjectMapper mapper) {
+    this.contentRootField = formatNodeKey(contentRootName);
+    this.metadataRootField = formatNodeKey(metadataRootName);
+    this.mapper = mapper;
+  }
+
+  byte[] wrapContent(byte[] json, String id, long timestamp, Map<String, String> externalMetadata) {
+    try {
+      return wrapContent(
+          mapper.writeValueAsBytes(new MessageMetadata(timestamp, id, externalMetadata)), json);
+    } catch (IOException e) {
+      throw new WrappingException("Could not wrap json message", e);
     }
-
-    byte[] wrapContent(byte[] json, String id, long timestamp, Map<String, String> externalMetadata) {
-        try {
-            return wrapContent(mapper.writeValueAsBytes(new MessageMetadata(timestamp, id, externalMetadata)), json);
-        } catch (IOException e) {
-            throw new WrappingException("Could not wrap json message", e);
-        }
+  }
+
+  private byte[] wrapContent(byte[] attributes, byte[] message) throws IOException {
+    ByteArrayOutputStream stream = new ByteArrayOutputStream();
+    stream.write(JSON_OPEN);
+    stream.write(WRAPPED_MARKER);
+    stream.write(SEPARATOR);
+    stream.write(metadataRootField);
+    stream.write(attributes);
+    stream.write(SEPARATOR);
+    stream.write(contentRootField);
+    stream.write(message);
+    stream.write(JSON_CLOSE);
+    return stream.toByteArray();
+  }
+
+  public UnwrappedMessageContent unwrapContent(byte[] json) {
+    if (isWrapped(json)) {
+      return unwrapMessageContent(json);
+    } else {
+      UUID id = UUID.randomUUID();
+      LOGGER.warn("Unwrapped message read by consumer (size={}, id={}).", json.length, id);
+      return new UnwrappedMessageContent(
+          new MessageMetadata(1L, id.toString(), ImmutableMap.of()), json);
     }
-
-    private byte[] wrapContent(byte[] attributes, byte[] message) throws IOException {
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        stream.write(JSON_OPEN);
-        stream.write(WRAPPED_MARKER);
-        stream.write(SEPARATOR);
-        stream.write(metadataRootField);
-        stream.write(attributes);
-        stream.write(SEPARATOR);
-        stream.write(contentRootField);
-        stream.write(message);
-        stream.write(JSON_CLOSE);
-        return stream.toByteArray();
+  }
+
+  private byte[] unwrapContent(byte[] json, int rootIndex) {
+    return copyOfRange(json, rootIndex + contentRootField.length, json.length - BRACKET_LENGTH);
+  }
+
+  private UnwrappedMessageContent unwrapMessageContent(byte[] json) {
+    int rootIndex = indexOf(json, contentRootField);
+    int metadataIndex = indexOf(json, metadataRootField);
+    try {
+      return new UnwrappedMessageContent(
+          unwrapMesssageMetadata(json, metadataIndex, rootIndex), unwrapContent(json, rootIndex));
+    } catch (Exception exception) {
+      throw new UnwrappingException("Could not unwrap json message", exception);
     }
-
-    public UnwrappedMessageContent unwrapContent(byte[] json) {
-        if (isWrapped(json)) {
-            return unwrapMessageContent(json);
-        } else {
-            UUID id = UUID.randomUUID();
-            LOGGER.warn("Unwrapped message read by consumer (size={}, id={}).", json.length, id);
-            return new UnwrappedMessageContent(new MessageMetadata(1L, id.toString(), ImmutableMap.of()), json);
-        }
-    }
-
-    private byte[] unwrapContent(byte[] json, int rootIndex) {
-        return copyOfRange(json, rootIndex + contentRootField.length, json.length - BRACKET_LENGTH);
-    }
-
-    private UnwrappedMessageContent unwrapMessageContent(byte[] json) {
-        int rootIndex = indexOf(json, contentRootField);
-        int metadataIndex = indexOf(json, metadataRootField);
-        try {
-            return new UnwrappedMessageContent(unwrapMesssageMetadata(json, metadataIndex, rootIndex), unwrapContent(json, rootIndex));
-        } catch (Exception exception) {
-            throw new UnwrappingException("Could not unwrap json message", exception);
-        }
-    }
-
-    private MessageMetadata unwrapMesssageMetadata(byte[] json, int metadataIndexStart, int metadataIndexEnd) throws IOException {
-        return mapper.readValue(unwrapMetadataBytes(json, metadataIndexStart, metadataIndexEnd), MessageMetadata.class);
-    }
-
-    private byte[] unwrapMetadataBytes(byte[] json, int metadataIndexStart, int metadataIndexEnd) {
-        return copyOfRange(json, metadataIndexStart + metadataRootField.length, metadataIndexEnd + BRACKET_LENGTH);
-    }
-
-    private byte[] formatNodeKey(String keyName) {
-        return format("\"%s\":", keyName).getBytes(UTF_8);
-    }
-
-    private boolean isWrapped(byte[] json) {
-        return indexOf(json, WRAPPED_MARKER) > 0;
-    }
-
+  }
+
+  private MessageMetadata unwrapMesssageMetadata(
+      byte[] json, int metadataIndexStart, int metadataIndexEnd) throws IOException {
+    return mapper.readValue(
+        unwrapMetadataBytes(json, metadataIndexStart, metadataIndexEnd), MessageMetadata.class);
+  }
+
+  private byte[] unwrapMetadataBytes(byte[] json, int metadataIndexStart, int metadataIndexEnd) {
+    return copyOfRange(
+        json, metadataIndexStart + metadataRootField.length, metadataIndexEnd + BRACKET_LENGTH);
+  }
+
+  private byte[] formatNodeKey(String keyName) {
+    return format("\"%s\":", keyName).getBytes(UTF_8);
+  }
+
+  private boolean isWrapped(byte[] json) {
+    return indexOf(json, WRAPPED_MARKER) > 0;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/MessageContentWrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/MessageContentWrapper.java
index ac05f68065..2846279370 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/MessageContentWrapper.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/MessageContentWrapper.java
@@ -1,23 +1,24 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
+import java.util.Map;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.util.Map;
-
 public interface MessageContentWrapper {
 
-    UnwrappedMessageContent unwrapAvro(byte[] data, Topic topic, Integer schemaId, Integer schemaVersion);
+  UnwrappedMessageContent unwrapAvro(
+      byte[] data, Topic topic, Integer schemaId, Integer schemaVersion);
 
-    UnwrappedMessageContent unwrapJson(byte[] data);
+  UnwrappedMessageContent unwrapJson(byte[] data);
 
-    byte[] wrapAvro(byte[] data,
-                    String id,
-                    long timestamp,
-                    Topic topic,
-                    CompiledSchema<Schema> schema,
-                    Map<String, String> externalMetadata);
+  byte[] wrapAvro(
+      byte[] data,
+      String id,
+      long timestamp,
+      Topic topic,
+      CompiledSchema<Schema> schema,
+      Map<String, String> externalMetadata);
 
-    byte[] wrapJson(byte[] data, String id, long timestamp, Map<String, String> externalMetadata);
+  byte[] wrapJson(byte[] data, String id, long timestamp, Map<String, String> externalMetadata);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/MessageMetadata.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/MessageMetadata.java
index 493e9d09da..3b98829544 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/MessageMetadata.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/MessageMetadata.java
@@ -1,62 +1,62 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
+import static java.util.Optional.ofNullable;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
-
 import java.util.Map;
 import java.util.Objects;
 
-import static java.util.Optional.ofNullable;
-
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class MessageMetadata {
 
-    private final long timestamp;
-    private final String id;
-    private final Map<String, String> externalMetadata;
-
-    @JsonCreator
-    public MessageMetadata(@JsonProperty("timestamp") long timestamp,
-                           @JsonProperty("id") String id,
-                           @JsonProperty("externalMetadata") Map<String, String> externalMetadata) {
-        this.id = id;
-        this.timestamp = timestamp;
-        this.externalMetadata = ofNullable(externalMetadata).orElseGet(ImmutableMap::<String, String>of);
-    }
-
-    public MessageMetadata(long timestamp, Map<String, String> externalMetadata) {
-        this(timestamp, "", externalMetadata);
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public Map<String, String> getExternalMetadata() {
-        return ImmutableMap.copyOf(externalMetadata);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, timestamp);
+  private final long timestamp;
+  private final String id;
+  private final Map<String, String> externalMetadata;
+
+  @JsonCreator
+  public MessageMetadata(
+      @JsonProperty("timestamp") long timestamp,
+      @JsonProperty("id") String id,
+      @JsonProperty("externalMetadata") Map<String, String> externalMetadata) {
+    this.id = id;
+    this.timestamp = timestamp;
+    this.externalMetadata =
+        ofNullable(externalMetadata).orElseGet(ImmutableMap::<String, String>of);
+  }
+
+  public MessageMetadata(long timestamp, Map<String, String> externalMetadata) {
+    this(timestamp, "", externalMetadata);
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public long getTimestamp() {
+    return timestamp;
+  }
+
+  public Map<String, String> getExternalMetadata() {
+    return ImmutableMap.copyOf(externalMetadata);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, timestamp);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final MessageMetadata other = (MessageMetadata) obj;
-        return Objects.equals(this.id, other.id)
-                && Objects.equals(this.timestamp, other.timestamp);
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
     }
+    final MessageMetadata other = (MessageMetadata) obj;
+    return Objects.equals(this.id, other.id) && Objects.equals(this.timestamp, other.timestamp);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwarePayload.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwarePayload.java
index 0c8eab2352..f062b066b7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwarePayload.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwarePayload.java
@@ -3,19 +3,19 @@
 import pl.allegro.tech.hermes.schema.SchemaId;
 
 public class SchemaAwarePayload {
-    private final byte[] payload;
-    private final SchemaId schemaId;
+  private final byte[] payload;
+  private final SchemaId schemaId;
 
-    public SchemaAwarePayload(byte[] payload, SchemaId schemaId) {
-        this.payload = payload;
-        this.schemaId = schemaId;
-    }
+  public SchemaAwarePayload(byte[] payload, SchemaId schemaId) {
+    this.payload = payload;
+    this.schemaId = schemaId;
+  }
 
-    public byte[] getPayload() {
-        return payload;
-    }
+  public byte[] getPayload() {
+    return payload;
+  }
 
-    public SchemaId getSchemaId() {
-        return schemaId;
-    }
+  public SchemaId getSchemaId() {
+    return schemaId;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwareSerDe.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwareSerDe.java
index ad7830ca9a..9c4e307a1e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwareSerDe.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwareSerDe.java
@@ -1,50 +1,49 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
-import pl.allegro.tech.hermes.schema.SchemaId;
+import static java.lang.String.format;
 
 import java.nio.ByteBuffer;
-
-import static java.lang.String.format;
+import pl.allegro.tech.hermes.schema.SchemaId;
 
 public class SchemaAwareSerDe {
-    private static final byte MAGIC_BYTE_VALUE = 0;
-    private static final byte MAGIC_BYTE_INDEX = 0;
-    private static final int HEADER_SIZE = 5;
-
-    private SchemaAwareSerDe() {
-    }
-
-    public static byte[] serialize(SchemaId schemaId, byte[] binaryAvro) {
-        ByteBuffer buffer = ByteBuffer.allocate(HEADER_SIZE + binaryAvro.length);
-        buffer.put(MAGIC_BYTE_VALUE);
-        buffer.putInt(schemaId.value());
-        buffer.put(binaryAvro);
-        return buffer.array();
-    }
-
-    public static SchemaAwarePayload deserialize(byte[] payloadWithHeader) {
-        ByteBuffer buffer = ByteBuffer.wrap(payloadWithHeader);
-        assertMagicByte(buffer.get());
-        int schemaId = buffer.getInt();
-        byte[] payload = new byte[payloadWithHeader.length - HEADER_SIZE];
-        buffer.get(payload);
-        return new SchemaAwarePayload(payload, SchemaId.valueOf(schemaId));
-    }
-
-    public static boolean startsWithMagicByte(byte[] payload) {
-        return payload[MAGIC_BYTE_INDEX] == MAGIC_BYTE_VALUE;
-    }
-
-    private static void assertMagicByte(byte magicByte) {
-        if (magicByte != MAGIC_BYTE_VALUE) {
-            throw new DeserializationException(format("Could not deserialize payload, unknown magic byte: \'%s\'.", magicByte));
-        }
-    }
-
-    public  static byte[] trimMagicByteAndSchemaVersion(byte[] data) {
-        int length = data.length - HEADER_SIZE;
-        byte[] dataWithoutMagicByteAndSchemaVersion = new byte[length];
-        System.arraycopy(data, HEADER_SIZE, dataWithoutMagicByteAndSchemaVersion, 0, length);
-        return dataWithoutMagicByteAndSchemaVersion;
+  private static final byte MAGIC_BYTE_VALUE = 0;
+  private static final byte MAGIC_BYTE_INDEX = 0;
+  private static final int HEADER_SIZE = 5;
+
+  private SchemaAwareSerDe() {}
+
+  public static byte[] serialize(SchemaId schemaId, byte[] binaryAvro) {
+    ByteBuffer buffer = ByteBuffer.allocate(HEADER_SIZE + binaryAvro.length);
+    buffer.put(MAGIC_BYTE_VALUE);
+    buffer.putInt(schemaId.value());
+    buffer.put(binaryAvro);
+    return buffer.array();
+  }
+
+  public static SchemaAwarePayload deserialize(byte[] payloadWithHeader) {
+    ByteBuffer buffer = ByteBuffer.wrap(payloadWithHeader);
+    assertMagicByte(buffer.get());
+    int schemaId = buffer.getInt();
+    byte[] payload = new byte[payloadWithHeader.length - HEADER_SIZE];
+    buffer.get(payload);
+    return new SchemaAwarePayload(payload, SchemaId.valueOf(schemaId));
+  }
+
+  public static boolean startsWithMagicByte(byte[] payload) {
+    return payload[MAGIC_BYTE_INDEX] == MAGIC_BYTE_VALUE;
+  }
+
+  private static void assertMagicByte(byte magicByte) {
+    if (magicByte != MAGIC_BYTE_VALUE) {
+      throw new DeserializationException(
+          format("Could not deserialize payload, unknown magic byte: \'%s\'.", magicByte));
     }
+  }
+
+  public static byte[] trimMagicByteAndSchemaVersion(byte[] data) {
+    int length = data.length - HEADER_SIZE;
+    byte[] dataWithoutMagicByteAndSchemaVersion = new byte[length];
+    System.arraycopy(data, HEADER_SIZE, dataWithoutMagicByteAndSchemaVersion, 0, length);
+    return dataWithoutMagicByteAndSchemaVersion;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaMissingException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaMissingException.java
index 6df5563fe1..55677e4f09 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaMissingException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaMissingException.java
@@ -6,13 +6,12 @@
 
 public class SchemaMissingException extends HermesException {
 
-    SchemaMissingException(Topic topic) {
-        super("Schema for topic " + topic.getQualifiedName() + " was not available");
-    }
-
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
-    }
+  SchemaMissingException(Topic topic) {
+    super("Schema for topic " + topic.getQualifiedName() + " was not available");
+  }
 
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaOnlineChecksWaitingRateLimiter.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaOnlineChecksWaitingRateLimiter.java
index e69de29bb2..8b13789179 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaOnlineChecksWaitingRateLimiter.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaOnlineChecksWaitingRateLimiter.java
@@ -0,0 +1 @@
+
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnsupportedContentTypeException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnsupportedContentTypeException.java
index 29788ee711..31956447e5 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnsupportedContentTypeException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnsupportedContentTypeException.java
@@ -6,28 +6,24 @@
 
 public class UnsupportedContentTypeException extends InternalProcessingException {
 
-    public UnsupportedContentTypeException(Topic topic) {
-        super(String.format(
-                "Unsupported content type %s for topic %s",
-                topic.getContentType(),
-                topic.getQualifiedName()
-        ));
-    }
+  public UnsupportedContentTypeException(Topic topic) {
+    super(
+        String.format(
+            "Unsupported content type %s for topic %s",
+            topic.getContentType(), topic.getQualifiedName()));
+  }
 
-    public UnsupportedContentTypeException(Subscription subscription) {
-        super(String.format(
-                "Unsupported content type %s for subscription %s",
-                subscription.getContentType(),
-                subscription.getQualifiedName()
-        ));
-    }
-
-    public UnsupportedContentTypeException(String payloadContentType, Topic topic) {
-        super(String.format(
-                "Unsupported payload content type header %s for topic %s",
-                payloadContentType,
-                topic.getQualifiedName()
-        ));
-    }
+  public UnsupportedContentTypeException(Subscription subscription) {
+    super(
+        String.format(
+            "Unsupported content type %s for subscription %s",
+            subscription.getContentType(), subscription.getQualifiedName()));
+  }
 
+  public UnsupportedContentTypeException(String payloadContentType, Topic topic) {
+    super(
+        String.format(
+            "Unsupported payload content type header %s for topic %s",
+            payloadContentType, topic.getQualifiedName()));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnwrappedMessageContent.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnwrappedMessageContent.java
index 1a5185c785..32ffb3f5b8 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnwrappedMessageContent.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnwrappedMessageContent.java
@@ -1,39 +1,39 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.Optional;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.util.Optional;
-
 @SuppressFBWarnings("EI_EXPOSE_REP2")
 public class UnwrappedMessageContent {
 
-    private final MessageMetadata messageMetadata;
-    private final byte[] content;
-    private final Optional<CompiledSchema<Schema>> schema;
-
-    public UnwrappedMessageContent(MessageMetadata messageMetadata, byte[] content) {
-        this.messageMetadata = messageMetadata;
-        this.content = content;
-        this.schema = Optional.empty();
-    }
-
-    public UnwrappedMessageContent(MessageMetadata messageMetadata, byte[] content, CompiledSchema<Schema> schema) {
-        this.messageMetadata = messageMetadata;
-        this.content = content;
-        this.schema = Optional.of(schema);
-    }
-
-    public byte[] getContent() {
-        return content;
-    }
-
-    public MessageMetadata getMessageMetadata() {
-        return messageMetadata;
-    }
-
-    public Optional<CompiledSchema<Schema>> getSchema() {
-        return schema;
-    }
+  private final MessageMetadata messageMetadata;
+  private final byte[] content;
+  private final Optional<CompiledSchema<Schema>> schema;
+
+  public UnwrappedMessageContent(MessageMetadata messageMetadata, byte[] content) {
+    this.messageMetadata = messageMetadata;
+    this.content = content;
+    this.schema = Optional.empty();
+  }
+
+  public UnwrappedMessageContent(
+      MessageMetadata messageMetadata, byte[] content, CompiledSchema<Schema> schema) {
+    this.messageMetadata = messageMetadata;
+    this.content = content;
+    this.schema = Optional.of(schema);
+  }
+
+  public byte[] getContent() {
+    return content;
+  }
+
+  public MessageMetadata getMessageMetadata() {
+    return messageMetadata;
+  }
+
+  public Optional<CompiledSchema<Schema>> getSchema() {
+    return schema;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnwrappingException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnwrappingException.java
index 5ec37de19a..ade63a4d4a 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnwrappingException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/UnwrappingException.java
@@ -3,7 +3,7 @@
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 public class UnwrappingException extends InternalProcessingException {
-    public UnwrappingException(String message, Exception cause) {
-        super(message, cause);
-    }
+  public UnwrappingException(String message, Exception cause) {
+    super(message, cause);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/WrappingException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/WrappingException.java
index b335f02fb4..60e6e15ddc 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/WrappingException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/WrappingException.java
@@ -3,7 +3,7 @@
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 public class WrappingException extends InternalProcessingException {
-    public WrappingException(String message, Exception cause) {
-        super(message, cause);
-    }
+  public WrappingException(String message, Exception cause) {
+    super(message, cause);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/BrokerMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/BrokerMetrics.java
new file mode 100644
index 0000000000..5b9d7b3911
--- /dev/null
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/BrokerMetrics.java
@@ -0,0 +1,24 @@
+package pl.allegro.tech.hermes.common.metric;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+import java.time.Duration;
+import pl.allegro.tech.hermes.api.Topic;
+
+public class BrokerMetrics {
+  private final MeterRegistry meterRegistry;
+
+  public BrokerMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
+
+  public void recordBrokerLatency(String broker, Topic.Ack ack, Duration duration) {
+    Timer.builder("broker.latency")
+        .tag("broker", broker)
+        .tag("ack", ack.name())
+        .publishPercentileHistogram()
+        .maximumExpectedValue(Duration.ofSeconds(5))
+        .register(meterRegistry)
+        .record(duration);
+  }
+}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsistencyMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsistencyMetrics.java
new file mode 100644
index 0000000000..c9c3a06bdb
--- /dev/null
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsistencyMetrics.java
@@ -0,0 +1,17 @@
+package pl.allegro.tech.hermes.common.metric;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import java.util.function.ToDoubleFunction;
+
+public class ConsistencyMetrics {
+  private final MeterRegistry meterRegistry;
+
+  ConsistencyMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
+
+  public <T> void registerStorageConsistencyGauge(
+      T stateObject, ToDoubleFunction<T> valueFunction) {
+    meterRegistry.gauge("storage.consistency", stateObject, valueFunction);
+  }
+}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsumerMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsumerMetrics.java
index 8ef5a5d086..de757afbde 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsumerMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsumerMetrics.java
@@ -1,91 +1,71 @@
 package pl.allegro.tech.hermes.common.metric;
 
+import static pl.allegro.tech.hermes.common.metric.SubscriptionTagsFactory.subscriptionTags;
+
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
+import java.util.function.ToDoubleFunction;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.HermesTimer;
 import pl.allegro.tech.hermes.metrics.counters.HermesCounters;
 
-import java.util.function.ToDoubleFunction;
-
-import static pl.allegro.tech.hermes.common.metric.Gauges.BATCH_BUFFER_AVAILABLE_BYTES;
-import static pl.allegro.tech.hermes.common.metric.Gauges.BATCH_BUFFER_TOTAL_BYTES;
-import static pl.allegro.tech.hermes.common.metric.Gauges.THREADS;
-import static pl.allegro.tech.hermes.common.metric.SubscriptionTagsFactory.subscriptionTags;
-
 public class ConsumerMetrics {
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-    private final GaugeRegistrar gaugeRegistrar;
-
-    public ConsumerMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-        this.gaugeRegistrar = new GaugeRegistrar(meterRegistry, hermesMetrics);
-    }
-
-    public  <T> void registerQueueUtilizationGauge(T obj, String queueName, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge("queue." + queueName + ".utilization", obj, f);
-    }
-
-    public HermesCounter queueFailuresCounter(String name) {
-        return HermesCounters.from(
-                meterRegistry.counter("queue." + name + ".failures"),
-                hermesMetrics.counter("queue." + name + ".failures")
-        );
-    }
-
-    public <T> void registerConsumerProcessesThreadsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(THREADS, "consumer-processes.threads", obj, f);
-    }
-
-    public <T> void registerRunningConsumerProcessesGauge(T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerRunningConsumerProcessesCountGauge(() -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("consumer-processes.running", obj, f);
-    }
-
-    public <T> void registerDyingConsumerProcessesGauge(T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerDyingConsumerProcessesCountGauge(() -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("consumer-processes.dying", obj, f);
-    }
-
-    public <T> void registerBatchBufferTotalBytesGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(BATCH_BUFFER_TOTAL_BYTES, "batch-buffer.total-bytes", obj, f);
-    }
-
-    public <T> void registerBatchBufferAvailableBytesGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(BATCH_BUFFER_AVAILABLE_BYTES, "batch-buffer.available-bytes", obj, f);
-    }
-
-    public HermesCounter oAuthSubscriptionTokenRequestCounter(Subscription subscription, String providerName) {
-        return HermesCounters.from(
-                meterRegistry.counter("oauth.token-requests", Tags.concat(
-                        subscriptionTags(subscription.getQualifiedName()),
-                        "provider", providerName
-                )),
-                hermesMetrics.oAuthSubscriptionTokenRequestMeter(subscription, providerName)
-        );
-    }
-
-    public HermesTimer oAuthProviderLatencyTimer(String providerName) {
-        return HermesTimer.from(
-                meterRegistry.timer("oauth.token-request-latency", Tags.of("provider", providerName)),
-                hermesMetrics.oAuthProviderLatencyTimer(providerName)
-        );
-    }
-
-    public HermesCounter processedSignalsCounter(String name) {
-        return HermesCounters.from(
-                meterRegistry.counter("signals.processed", Tags.of("signal", name)),
-                hermesMetrics.counter("supervisor.signal." + name)
-        );
-    }
-
-    public HermesCounter droppedSignalsCounter(String name) {
-        return HermesCounters.from(
-                meterRegistry.counter("signals.dropped", Tags.of("signal", name)),
-                hermesMetrics.counter("supervisor.signal.dropped." + name)
-        );
-    }
+  private final MeterRegistry meterRegistry;
+  private final GaugeRegistrar gaugeRegistrar;
+
+  public ConsumerMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+    this.gaugeRegistrar = new GaugeRegistrar(meterRegistry);
+  }
+
+  public <T> void registerQueueUtilizationGauge(T obj, String queueName, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("queue." + queueName + ".utilization", obj, f);
+  }
+
+  public HermesCounter queueFailuresCounter(String name) {
+    return HermesCounters.from(meterRegistry.counter("queue." + name + ".failures"));
+  }
+
+  public <T> void registerConsumerProcessesThreadsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("consumer-processes.threads", obj, f);
+  }
+
+  public <T> void registerRunningConsumerProcessesGauge(T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("consumer-processes.running", obj, f);
+  }
+
+  public <T> void registerDyingConsumerProcessesGauge(T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("consumer-processes.dying", obj, f);
+  }
+
+  public <T> void registerBatchBufferTotalBytesGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("batch-buffer.total-bytes", obj, f);
+  }
+
+  public <T> void registerBatchBufferAvailableBytesGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("batch-buffer.available-bytes", obj, f);
+  }
+
+  public HermesCounter oAuthSubscriptionTokenRequestCounter(
+      Subscription subscription, String providerName) {
+    return HermesCounters.from(
+        meterRegistry.counter(
+            "oauth.token-requests",
+            Tags.concat(
+                subscriptionTags(subscription.getQualifiedName()), "provider", providerName)));
+  }
+
+  public HermesTimer oAuthProviderLatencyTimer(String providerName) {
+    return HermesTimer.from(
+        meterRegistry.timer("oauth.token-request-latency", Tags.of("provider", providerName)));
+  }
+
+  public HermesCounter processedSignalsCounter(String name) {
+    return HermesCounters.from(meterRegistry.counter("signals.processed", Tags.of("signal", name)));
+  }
+
+  public HermesCounter droppedSignalsCounter(String name) {
+    return HermesCounters.from(meterRegistry.counter("signals.dropped", Tags.of("signal", name)));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsumerSenderMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsumerSenderMetrics.java
index 76bba6dde7..7821e7af16 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsumerSenderMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ConsumerSenderMetrics.java
@@ -1,9 +1,5 @@
 package pl.allegro.tech.hermes.common.metric;
 
-import io.micrometer.core.instrument.MeterRegistry;
-
-import java.util.function.ToDoubleFunction;
-
 import static pl.allegro.tech.hermes.common.metric.Gauges.CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_ACTIVE_CONNECTIONS;
 import static pl.allegro.tech.hermes.common.metric.Gauges.CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_IDLE_CONNECTIONS;
 import static pl.allegro.tech.hermes.common.metric.Gauges.CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_ACTIVE_CONNECTIONS;
@@ -11,59 +7,56 @@
 import static pl.allegro.tech.hermes.common.metric.Gauges.CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_CONNECTIONS;
 import static pl.allegro.tech.hermes.common.metric.Gauges.CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_PENDING_CONNECTIONS;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import java.util.function.ToDoubleFunction;
+
 public class ConsumerSenderMetrics {
 
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-    private final GaugeRegistrar gaugeRegistrar;
+  private final MeterRegistry meterRegistry;
+  private final GaugeRegistrar gaugeRegistrar;
 
-    ConsumerSenderMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-        this.gaugeRegistrar = new GaugeRegistrar(meterRegistry, hermesMetrics);
-    }
+  ConsumerSenderMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+    this.gaugeRegistrar = new GaugeRegistrar(meterRegistry);
+  }
 
-    public <T> void registerRequestQueueSizeGauge(T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerConsumerSenderRequestQueueSize(() -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("http-clients.request-queue-size", obj, f);
-    }
+  public <T> void registerRequestQueueSizeGauge(T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("http-clients.request-queue-size", obj, f);
+  }
 
-    public <T> void registerHttp1SerialClientRequestQueueSizeGauge(T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerConsumerSenderHttp1SerialClientRequestQueueSize(() -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("http-clients.serial.http1.request-queue-size", obj, f);
-    }
+  public <T> void registerHttp1SerialClientRequestQueueSizeGauge(T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("http-clients.serial.http1.request-queue-size", obj, f);
+  }
 
-    public <T> void registerHttp1BatchClientRequestQueueSizeGauge(T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerConsumerSenderHttp1BatchClientRequestQueueSize(() -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("http-clients.batch.http1.request-queue-size", obj, f);
-    }
+  public <T> void registerHttp1BatchClientRequestQueueSizeGauge(T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("http-clients.batch.http1.request-queue-size", obj, f);
+  }
 
-    public <T> void registerHttp2RequestQueueSizeGauge(T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerConsumerSenderHttp2RequestQueueSize(() -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("http-clients.serial.http2.request-queue-size", obj, f);
-    }
+  public <T> void registerHttp2RequestQueueSizeGauge(T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("http-clients.serial.http2.request-queue-size", obj, f);
+  }
 
-    public <T> void registerHttp1SerialClientActiveConnectionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_ACTIVE_CONNECTIONS, obj, f);
-    }
+  public <T> void registerHttp1SerialClientActiveConnectionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_ACTIVE_CONNECTIONS, obj, f);
+  }
 
-    public <T> void registerHttp1SerialClientIdleConnectionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_IDLE_CONNECTIONS, obj, f);
-    }
+  public <T> void registerHttp1SerialClientIdleConnectionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_IDLE_CONNECTIONS, obj, f);
+  }
 
-    public <T> void registerHttp1BatchClientActiveConnectionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_ACTIVE_CONNECTIONS, obj, f);
-    }
+  public <T> void registerHttp1BatchClientActiveConnectionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_ACTIVE_CONNECTIONS, obj, f);
+  }
 
-    public <T> void registerHttp1BatchClientIdleConnectionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_IDLE_CONNECTIONS, obj, f);
-    }
+  public <T> void registerHttp1BatchClientIdleConnectionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_IDLE_CONNECTIONS, obj, f);
+  }
 
-    public <T> void registerHttp2SerialClientConnectionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_CONNECTIONS, obj, f);
-    }
+  public <T> void registerHttp2SerialClientConnectionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_CONNECTIONS, obj, f);
+  }
 
-    public <T> void registerHttp2SerialClientPendingConnectionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_PENDING_CONNECTIONS, obj, f);
-    }
+  public <T> void registerHttp2SerialClientPendingConnectionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_PENDING_CONNECTIONS, obj, f);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Counters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Counters.java
deleted file mode 100644
index 2b20ee366a..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Counters.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package pl.allegro.tech.hermes.common.metric;
-
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.GROUP;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.SUBSCRIPTION;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.TOPIC;
-
-public class Counters {
-
-    public static final String PUBLISHED = "published." + GROUP + "." + TOPIC;
-    public static final String DELIVERED = "delivered." + GROUP + "." + TOPIC + "." + SUBSCRIPTION;
-    public static final String DISCARDED = "discarded." + GROUP + "." + TOPIC + "." + SUBSCRIPTION;
-    public static final String MAXRATE_RATE_HISTORY_FAILURES =
-            "consumers-rate.max-rate.node." + GROUP + "." + TOPIC + "." + SUBSCRIPTION + ".history.failures";
-    public static final String MAXRATE_FETCH_FAILURES =
-            "consumers-rate.max-rate.node." + GROUP + "." + TOPIC + "." + SUBSCRIPTION + ".fetch.failures";
-}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/DeserializationMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/DeserializationMetrics.java
index e8628afbf8..27d6081d16 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/DeserializationMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/DeserializationMetrics.java
@@ -1,93 +1,62 @@
 package pl.allegro.tech.hermes.common.metric;
 
+import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.counters.HermesCounters;
 
-import static com.codahale.metrics.MetricRegistry.name;
-
 public class DeserializationMetrics {
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-
-    private static final String BASE_PATH = "content.avro.deserialization";
-    private static final String ERRORS_PATH = BASE_PATH + ".errors";
+  private final MeterRegistry meterRegistry;
 
-    public DeserializationMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-    }
+  private static final String BASE_PATH = "content.avro.deserialization";
+  private static final String ERRORS_PATH = BASE_PATH + ".errors";
 
-    public HermesCounter errorsForHeaderSchemaVersion() {
-        return HermesCounters.from(
-                deserializationErrorCounter("headerSchemaVersion"),
-                hermesMetrics.counter(name(ERRORS_PATH, "headerSchemaVersion"))
-        );
+  public DeserializationMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
 
-    }
+  public HermesCounter errorsForHeaderSchemaVersion() {
+    return HermesCounters.from(deserializationErrorCounter("headerSchemaVersion"));
+  }
 
-    public HermesCounter errorsForHeaderSchemaId() {
-        return HermesCounters.from(
-                deserializationErrorCounter("headerSchemaId"),
-                hermesMetrics.counter(name(ERRORS_PATH, "headerSchemaId"))
-        );
-    }
+  public HermesCounter errorsForHeaderSchemaId() {
+    return HermesCounters.from(deserializationErrorCounter("headerSchemaId"));
+  }
 
-    public HermesCounter errorsForSchemaIdAwarePayload() {
-        return HermesCounters.from(
-                deserializationErrorCounter("payloadWithSchemaId"),
-                hermesMetrics.counter(name(ERRORS_PATH, "payloadWithSchemaId"))
-        );
-    }
+  public HermesCounter errorsForSchemaIdAwarePayload() {
+    return HermesCounters.from(deserializationErrorCounter("payloadWithSchemaId"));
+  }
 
-    public HermesCounter errorsForSchemaVersionTruncation() {
-        return HermesCounters.from(
-                deserializationErrorCounter("schemaVersionTruncation"),
-                hermesMetrics.counter(name(ERRORS_PATH, "schemaVersionTruncation"))
-        );
-    }
+  public HermesCounter errorsForSchemaVersionTruncation() {
+    return HermesCounters.from(deserializationErrorCounter("schemaVersionTruncation"));
+  }
 
-    private io.micrometer.core.instrument.Counter deserializationErrorCounter(String schemaSource) {
-        return meterRegistry.counter(ERRORS_PATH, Tags.of("deserialization_type", schemaSource));
-    }
+  private io.micrometer.core.instrument.Counter deserializationErrorCounter(String schemaSource) {
+    return meterRegistry.counter(ERRORS_PATH, Tags.of("deserialization_type", schemaSource));
+  }
 
-    public HermesCounter missingSchemaIdInPayload() {
-        return HermesCounters.from(
-                meterRegistry.counter(name(BASE_PATH, "missing_schemaIdInPayload")),
-                hermesMetrics.counter(name(BASE_PATH, "missed", "schemaIdInPayload"))
-        );
-    }
+  public HermesCounter missingSchemaIdInPayload() {
+    return HermesCounters.from(meterRegistry.counter(BASE_PATH + ".missing_schemaIdInPayload"));
+  }
 
-    public HermesCounter usingHeaderSchemaVersion() {
-        return HermesCounters.from(
-                deserializationAttemptCounter("headerSchemaVersion"),
-                hermesMetrics.counter(name(BASE_PATH, "using", "headerSchemaVersion"))
-        );
-    }
+  public HermesCounter usingHeaderSchemaVersion() {
+    return HermesCounters.from(deserializationAttemptCounter("headerSchemaVersion"));
+  }
 
-    public HermesCounter usingHeaderSchemaId() {
-        return HermesCounters.from(
-                deserializationAttemptCounter("headerSchemaId"),
-                hermesMetrics.counter(name(BASE_PATH, "using", "headerSchemaId"))
-        );
-    }
+  public HermesCounter usingHeaderSchemaId() {
+    return HermesCounters.from(deserializationAttemptCounter("headerSchemaId"));
+  }
 
-    public HermesCounter usingSchemaIdAware() {
-        return HermesCounters.from(
-                deserializationAttemptCounter("payloadWithSchemaId"),
-                hermesMetrics.counter(name(BASE_PATH, "using", "schemaIdAware"))
-        );
-    }
+  public HermesCounter usingSchemaIdAware() {
+    return HermesCounters.from(deserializationAttemptCounter("payloadWithSchemaId"));
+  }
 
-    public HermesCounter usingSchemaVersionTruncation() {
-        return HermesCounters.from(
-                deserializationAttemptCounter("schemaVersionTruncation"),
-                hermesMetrics.counter(name(BASE_PATH, "using", "schemaVersionTruncation"))
-        );
-    }
+  public HermesCounter usingSchemaVersionTruncation() {
+    return HermesCounters.from(deserializationAttemptCounter("schemaVersionTruncation"));
+  }
 
-    private io.micrometer.core.instrument.Counter deserializationAttemptCounter(String deserializationType) {
-        return meterRegistry.counter(BASE_PATH, Tags.of("deserialization_type", deserializationType));
-    }
+  private Counter deserializationAttemptCounter(String deserializationType) {
+    return meterRegistry.counter(BASE_PATH, Tags.of("deserialization_type", deserializationType));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ExecutorMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ExecutorMetrics.java
index e51acfe8fc..cf59fc909b 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ExecutorMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ExecutorMetrics.java
@@ -1,56 +1,23 @@
 package pl.allegro.tech.hermes.common.metric;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Tags;
-
-import java.util.function.ToDoubleFunction;
+import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
 
 public class ExecutorMetrics {
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-
-    public ExecutorMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-    }
-
-    public <T> void registerThreadPoolCapacity(String executorName, T stateObj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerThreadPoolCapacity(executorName, () -> (int) f.applyAsDouble(stateObj));
-        registerMicrometerGauge("executors.capacity", executorName, stateObj, f);
-    }
-
-    public <T> void registerThreadPoolActiveThreads(String executorName, T stateObj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerThreadPoolActiveThreads(executorName, () -> (int) f.applyAsDouble(stateObj));
-        registerMicrometerGauge("executors.active-threads", executorName, stateObj, f);
-    }
-
-    public <T> void registerThreadPoolUtilization(String executorName, T stateObj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerThreadPoolUtilization(executorName, () -> f.applyAsDouble(stateObj));
-        registerMicrometerGauge("executors.utilization", executorName, stateObj, f);
-    }
-
-    public <T> void registerThreadPoolTaskQueueCapacity(String executorName, T stateObj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerThreadPoolTaskQueueCapacity(executorName, () -> (int) f.applyAsDouble(stateObj));
-        registerMicrometerGauge("executors.task-queue-capacity", executorName, stateObj, f);
-    }
-
-    public <T> void registerThreadPoolTaskQueued(String executorName, T stateObj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerThreadPoolTaskQueued(executorName, () -> (int) f.applyAsDouble(stateObj));
-        registerMicrometerGauge("executors.task-queue-size", executorName, stateObj, f);
-    }
-
-    public <T> void registerThreadPoolTaskQueueUtilization(String executorName, T stateObj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerThreadPoolTaskQueueUtilization(executorName, () -> f.applyAsDouble(stateObj));
-        registerMicrometerGauge("executors.task-queue-utilization", executorName, stateObj, f);
-    }
+  private final MeterRegistry meterRegistry;
 
-    public void incrementRequestRejectedCounter(String executorName) {
-        hermesMetrics.incrementThreadPoolTaskRejectedCount(executorName);
-        meterRegistry.counter("executors.task-rejected", Tags.of("executor_name", executorName)).increment();
-    }
+  public ExecutorMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
 
+  public ExecutorService monitor(ExecutorService executorService, String executorName) {
+    return ExecutorServiceMetrics.monitor(meterRegistry, executorService, executorName);
+  }
 
-    private <T> void registerMicrometerGauge(String name, String executorName, T stateObj, ToDoubleFunction<T> f) {
-        meterRegistry.gauge(name, Tags.of("executor_name", executorName), stateObj, f);
-    }
+  public ScheduledExecutorService monitor(
+      ScheduledExecutorService scheduledExecutorService, String executorName) {
+    return ExecutorServiceMetrics.monitor(meterRegistry, scheduledExecutorService, executorName);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/GaugeRegistrar.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/GaugeRegistrar.java
index 3b1acf0486..8e848ed77e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/GaugeRegistrar.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/GaugeRegistrar.java
@@ -3,38 +3,21 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
-
 import java.util.function.ToDoubleFunction;
 
 public class GaugeRegistrar {
-    private final MeterRegistry meterRegistry;
-    private final HermesMetrics hermesMetrics;
-
-    public GaugeRegistrar(MeterRegistry meterRegistry, HermesMetrics hermesMetrics) {
-        this.meterRegistry = meterRegistry;
-        this.hermesMetrics = hermesMetrics;
-    }
+  private final MeterRegistry meterRegistry;
 
-    public <T> void registerGauge(String graphiteName,
-                                  String prometheusName,
-                                  T stateObj,
-                                  ToDoubleFunction<T> f,
-                                  Iterable<Tag> tags) {
-        meterRegistry.gauge(prometheusName, tags, stateObj, f);
-        hermesMetrics.registerGauge(graphiteName, () -> f.applyAsDouble(stateObj));
-    }
+  public GaugeRegistrar(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
 
-    public <T> void registerGauge(String graphiteName,
-                                  String prometheusName,
-                                  T stateObj,
-                                  ToDoubleFunction<T> f) {
-        registerGauge(graphiteName, prometheusName, stateObj, f, Tags.empty());
-    }
+  public <T> void registerGauge(String name, T stateObj, ToDoubleFunction<T> f) {
+    registerGauge(name, stateObj, f, Tags.empty());
+  }
 
-    public <T> void registerGauge(String name,
-                                  T stateObj,
-                                  ToDoubleFunction<T> f) {
-        registerGauge(name, name, stateObj, f);
-    }
+  public <T> void registerGauge(
+      String name, T stateObj, ToDoubleFunction<T> f, Iterable<Tag> tags) {
+    meterRegistry.gauge(name, tags, stateObj, f);
+  }
 }
-
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Gauges.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Gauges.java
index e7f2f1fa8e..8b70e0b3ae 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Gauges.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Gauges.java
@@ -1,46 +1,22 @@
 package pl.allegro.tech.hermes.common.metric;
 
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.EXECUTOR_NAME;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.GROUP;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.SUBSCRIPTION;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.TOPIC;
-
 public class Gauges {
-    public static final String BATCH_BUFFER_TOTAL_BYTES = "batch-buffer-total-bytes";
-    public static final String BATCH_BUFFER_AVAILABLE_BYTES = "batch-buffer-available-bytes";
-
-    public static final String THREADS = "threads";
-    public static final String INFLIGHT_REQUESTS = "inflight-requests";
-    public static final String OUTPUT_RATE = "output-rate." + GROUP + "." + TOPIC + "." + SUBSCRIPTION;
-    public static final String BACKUP_STORAGE_SIZE = "backup-storage.size";
-    public static final String MAX_RATE_CALCULATION_DURATION = "consumers-rate.max-rate.coordinator.duration";
-    public static final String MAX_RATE_VALUE =
-                    "consumers-rate.max-rate.node." + GROUP + "." + TOPIC + "." + SUBSCRIPTION + ".max-rate";
-    public static final String MAX_RATE_ACTUAL_RATE_VALUE =
-                    "consumers-rate.max-rate.node." + GROUP + "." + TOPIC + "." + SUBSCRIPTION + ".rate";
-    public static final String RUNNING_CONSUMER_PROCESSES_COUNT = "consumer-processes.running-consumer-processes.count";
-    public static final String DYING_CONSUMER_PROCESSES_COUNT = "consumer-processes.dying-consumer-processes.count";
-    public static final String CONSUMER_SENDER_REQUEST_QUEUE_SIZE = "http-clients.request-queue-size";
 
-    public static final String CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_REQUEST_QUEUE_SIZE = "http-clients.serial.http1.request-queue-size";
-    public static final String CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_ACTIVE_CONNECTIONS = "http-clients.serial.http1.active-connections";
-    public static final String CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_IDLE_CONNECTIONS = "http-clients.serial.http1.idle-connections";
+  public static final String INFLIGHT_REQUESTS = "inflight-requests";
+  public static final String BACKUP_STORAGE_SIZE = "backup-storage.size";
 
-    public static final String CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_REQUEST_QUEUE_SIZE = "http-clients.batch.http1.request-queue-size";
-    public static final String CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_ACTIVE_CONNECTIONS = "http-clients.batch.http1.active-connections";
-    public static final String CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_IDLE_CONNECTIONS = "http-clients.batch.http1.idle-connections";
+  public static final String CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_ACTIVE_CONNECTIONS =
+      "http-clients.serial.http1.active-connections";
+  public static final String CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_IDLE_CONNECTIONS =
+      "http-clients.serial.http1.idle-connections";
 
-    public static final String CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_REQUEST_QUEUE_SIZE = "http-clients.serial.http2.request-queue-size";
-    public static final String CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_CONNECTIONS = "http-clients.serial.http2.connections";
-    public static final String CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_PENDING_CONNECTIONS = "http-clients.serial.http2.pending-connections";
+  public static final String CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_ACTIVE_CONNECTIONS =
+      "http-clients.batch.http1.active-connections";
+  public static final String CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_IDLE_CONNECTIONS =
+      "http-clients.batch.http1.idle-connections";
 
-    public static final String EXECUTORS = "executors.";
-    public static final String EXECUTOR_ACTIVE_THREADS = EXECUTORS + EXECUTOR_NAME +  ".active-threads";
-    public static final String EXECUTOR_CAPACITY =   EXECUTORS + EXECUTOR_NAME + ".capacity";
-    public static final String UTILIZATION = EXECUTORS + EXECUTOR_NAME + ".utilization";
-    public static final String TASK_QUEUE_CAPACITY = EXECUTORS + EXECUTOR_NAME + ".task-queue-capacity";
-    public static final String TASK_QUEUED = EXECUTORS + EXECUTOR_NAME + ".task-queue-size";
-    public static final String TASKS_QUEUE_UTILIZATION = EXECUTORS + EXECUTOR_NAME + ".task-queue-utilization";
-    public static final String TASKS_REJECTED_COUNT = EXECUTORS + EXECUTOR_NAME + "task-rejected";
-    public static final String INFLIGHT = "inflight." + GROUP + "." + TOPIC + "." + SUBSCRIPTION + ".count";
+  public static final String CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_CONNECTIONS =
+      "http-clients.serial.http2.connections";
+  public static final String CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_PENDING_CONNECTIONS =
+      "http-clients.serial.http2.pending-connections";
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/HermesMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/HermesMetrics.java
deleted file mode 100644
index cb341c0253..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/HermesMetrics.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package pl.allegro.tech.hermes.common.metric;
-
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.metrics.PathContext;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
-
-import static pl.allegro.tech.hermes.common.metric.Histograms.INFLIGHT_TIME;
-import static pl.allegro.tech.hermes.common.metric.Meters.ERRORS_HTTP_BY_CODE;
-import static pl.allegro.tech.hermes.common.metric.Meters.ERRORS_HTTP_BY_FAMILY;
-import static pl.allegro.tech.hermes.common.metric.Meters.ERRORS_OTHER;
-import static pl.allegro.tech.hermes.common.metric.Meters.ERRORS_TIMEOUTS;
-import static pl.allegro.tech.hermes.common.metric.Meters.SUBSCRIPTION_STATUS;
-import static pl.allegro.tech.hermes.metrics.PathContext.pathContext;
-
-public class HermesMetrics {
-
-    public static final String REPLACEMENT_CHAR = "_";
-
-    private final MetricRegistry metricRegistry;
-    private final PathsCompiler pathCompiler;
-
-    public HermesMetrics(
-            MetricRegistry metricRegistry,
-            PathsCompiler pathCompiler) {
-        this.metricRegistry = metricRegistry;
-        this.pathCompiler = pathCompiler;
-    }
-
-    public static String escapeDots(String value) {
-        return value.replaceAll("\\.", REPLACEMENT_CHAR);
-    }
-
-    public Timer timer(String metric) {
-        return metricRegistry.timer(metricRegistryName(metric));
-    }
-
-    public Timer timer(String metric, TopicName topicName) {
-        return metricRegistry.timer(metricRegistryName(metric, topicName));
-    }
-
-    public Timer timer(String metric, TopicName topicName, String name) {
-        return metricRegistry.timer(metricRegistryName(metric, topicName, name));
-    }
-
-    public Meter meter(String metric) {
-        return metricRegistry.meter(metricRegistryName(metric));
-    }
-
-    public Meter meter(String metric, TopicName topicName, String name) {
-        return metricRegistry.meter(metricRegistryName(metric, topicName, name));
-    }
-
-    public Meter meter(String metric, TopicName topicName) {
-        return metricRegistry.meter(metricRegistryName(metric, topicName));
-    }
-
-    public Meter httpStatusCodeMeter(int statusCode) {
-        return metricRegistry.meter(pathCompiler.compile(Meters.STATUS_CODES, pathContext().withHttpCode(statusCode).build()));
-    }
-
-    public Meter httpStatusCodeMeter(int statusCode, TopicName topicName) {
-        return metricRegistry.meter(pathCompiler.compile(Meters.TOPIC_STATUS_CODES,
-                pathContext().withHttpCode(statusCode).withGroup(topicName.getGroupName()).withTopic(topicName.getName()).build()));
-    }
-
-    public Histogram histogram(String metric) {
-        return metricRegistry.histogram(metricRegistryName(metric));
-    }
-
-    public Counter counter(String metric) {
-        return metricRegistry.counter(metricRegistryName(metric));
-    }
-
-    public Counter counter(String metric, TopicName topicName) {
-        return metricRegistry.counter(metricRegistryName(metric, topicName));
-    }
-
-    public Counter counter(String metric, TopicName topicName, String name) {
-        return metricRegistry.counter(metricRegistryName(metric, topicName, name));
-    }
-
-    public void registerProducerInflightRequest(Gauge<Integer> gauge) {
-        metricRegistry.register(metricRegistryName(Gauges.INFLIGHT_REQUESTS), gauge);
-    }
-
-    public void registerMessageRepositorySizeGauge(Gauge<Integer> gauge) {
-        metricRegistry.register(metricRegistryName(Gauges.BACKUP_STORAGE_SIZE), gauge);
-    }
-
-    public void registerConsumerSenderRequestQueueSize(Gauge<Integer> gauge) {
-        metricRegistry.register(metricRegistryName(Gauges.CONSUMER_SENDER_REQUEST_QUEUE_SIZE), gauge);
-    }
-
-    public void registerConsumerSenderHttp1SerialClientRequestQueueSize(Gauge<Integer> gauge) {
-        metricRegistry.register(metricRegistryName(Gauges.CONSUMER_SENDER_HTTP_1_SERIAL_CLIENT_REQUEST_QUEUE_SIZE), gauge);
-    }
-
-    public void registerConsumerSenderHttp1BatchClientRequestQueueSize(Gauge<Integer> gauge) {
-        metricRegistry.register(metricRegistryName(Gauges.CONSUMER_SENDER_HTTP_1_BATCH_CLIENT_REQUEST_QUEUE_SIZE), gauge);
-    }
-
-    public void registerConsumerSenderHttp2RequestQueueSize(Gauge<Integer> gauge) {
-        metricRegistry.register(metricRegistryName(Gauges.CONSUMER_SENDER_HTTP_2_SERIAL_CLIENT_REQUEST_QUEUE_SIZE), gauge);
-    }
-
-    public void registerThreadPoolActiveThreads(String executorName, Gauge<Integer> gauge) {
-        registerExecutorGauge(Gauges.EXECUTOR_ACTIVE_THREADS, executorName, gauge);
-    }
-
-    public void registerThreadPoolCapacity(String executorName, Gauge<Integer> gauge) {
-        registerExecutorGauge(Gauges.EXECUTOR_CAPACITY, executorName, gauge);
-    }
-
-    public void registerThreadPoolUtilization(String executorName, Gauge<Double> gauge) {
-        registerExecutorGauge(Gauges.UTILIZATION, executorName, gauge);
-    }
-
-    public void registerThreadPoolTaskQueueCapacity(String executorName, Gauge<Integer> gauge) {
-        registerExecutorGauge(Gauges.TASK_QUEUE_CAPACITY, executorName, gauge);
-    }
-
-    public void registerThreadPoolTaskQueued(String executorName, Gauge<Integer> gauge) {
-        registerExecutorGauge(Gauges.TASK_QUEUED, executorName, gauge);
-    }
-
-    public void registerThreadPoolTaskQueueUtilization(String executorName, Gauge<Double> gauge) {
-        registerExecutorGauge(Gauges.TASKS_QUEUE_UTILIZATION, executorName, gauge);
-    }
-
-    public void incrementThreadPoolTaskRejectedCount(String executorName) {
-        executorCounter(Gauges.TASKS_REJECTED_COUNT, executorName).inc();
-    }
-
-    public void registerInflightGauge(SubscriptionName subscription, Gauge<?> gauge) {
-        registerGauge(metricRegistryName(Gauges.INFLIGHT, subscription.getTopicName(), subscription.getName()), gauge);
-    }
-
-    public void unregisterInflightGauge(SubscriptionName subscription) {
-        unregister(Gauges.INFLIGHT, subscription);
-    }
-
-    public static void close(Timer.Context... timers) {
-        for (Timer.Context timer : timers) {
-            if (timer != null) {
-                timer.close();
-            }
-        }
-    }
-
-    public void registerGauge(String name, Gauge<?> gauge) {
-        String path = pathCompiler.compile(name);
-        if (!metricRegistry.getGauges().containsKey(name)) {
-            metricRegistry.register(path, gauge);
-        }
-    }
-
-    public void registerGauge(String name, SubscriptionName subscription, Gauge<?> gauge) {
-        if (!metricRegistry.getGauges().containsKey(name)) {
-            metricRegistry.register(metricRegistryName(name, subscription.getTopicName(), subscription.getName()), gauge);
-        }
-    }
-
-    public void unregister(String metric, SubscriptionName subscription) {
-        metricRegistry.remove(metricRegistryName(metric, subscription.getTopicName(), subscription.getName()));
-    }
-
-    public void unregister(String name) {
-        String path = pathCompiler.compile(name);
-        metricRegistry.remove(path);
-    }
-
-    private String metricRegistryName(String metricDisplayName, TopicName topicName, String subscription) {
-        PathContext pathContext = PathContext.pathContext()
-                .withGroup(escapeDots(topicName.getGroupName()))
-                .withTopic(escapeDots(topicName.getName()))
-                .withSubscription(escapeDots(subscription))
-                .build();
-
-        return pathCompiler.compile(metricDisplayName, pathContext);
-    }
-
-    private String metricRegistryName(String metricDisplayName, TopicName topicName) {
-        PathContext pathContext = PathContext.pathContext()
-                .withGroup(escapeDots(topicName.getGroupName()))
-                .withTopic(escapeDots(topicName.getName())).build();
-
-        return pathCompiler.compile(metricDisplayName, pathContext);
-    }
-
-    private String metricRegistryName(String metricDisplayName) {
-        return pathCompiler.compile(metricDisplayName);
-    }
-
-    public Timer schemaTimer(String schemaMetric) {
-        return metricRegistry.timer(pathCompiler.compile(schemaMetric, pathContext().withSchemaRepoType("schema-registry").build()));
-    }
-
-    private <T> Gauge<T> registerExecutorGauge(String path, String executorName, Gauge<T> gauge) {
-        return metricRegistry.register(pathCompiler.compile(path, pathContext().withExecutorName(executorName).build()), gauge);
-    }
-
-    private <T> Counter executorCounter(String path, String executorName) {
-        return metricRegistry.counter(pathCompiler.compile(path, pathContext().withExecutorName(executorName).build()));
-    }
-
-
-    public Histogram messageContentSizeHistogram() {
-        return metricRegistry.histogram(pathCompiler.compile(Histograms.GLOBAL_MESSAGE_SIZE));
-    }
-
-    public Histogram messageContentSizeHistogram(TopicName topic) {
-        return metricRegistry.histogram(pathCompiler.compile(Histograms.MESSAGE_SIZE, pathContext()
-                .withGroup(escapeDots(topic.getGroupName()))
-                .withTopic(escapeDots(topic.getName()))
-                .build()));
-    }
-
-    public Histogram inflightTimeHistogram(SubscriptionName subscription) {
-        return metricRegistry.histogram(metricRegistryName(INFLIGHT_TIME, subscription.getTopicName(), subscription.getName()));
-    }
-
-    public void unregisterInflightTimeHistogram(SubscriptionName subscription) {
-        unregister(INFLIGHT_TIME, subscription);
-    }
-
-    public void registerConsumerHttpAnswer(SubscriptionName subscription, int statusCode, long count) {
-        PathContext pathContext = pathContext()
-                .withGroup(escapeDots(subscription.getTopicName().getGroupName()))
-                .withTopic(escapeDots(subscription.getTopicName().getName()))
-                .withSubscription(escapeDots(subscription.getName()))
-                .withHttpCode(statusCode)
-                .withHttpCodeFamily(httpStatusFamily(statusCode))
-                .build();
-        metricRegistry.meter(pathCompiler.compile(ERRORS_HTTP_BY_FAMILY, pathContext)).mark(count);
-        metricRegistry.meter(pathCompiler.compile(ERRORS_HTTP_BY_CODE, pathContext)).mark(count);
-    }
-
-    public void unregisterStatusMeters(SubscriptionName subscription) {
-        String prefix = metricRegistryName(SUBSCRIPTION_STATUS, subscription.getTopicName(), subscription.getName());
-        metricRegistry.removeMatching(MetricFilter.startsWith(prefix));
-    }
-
-    private String httpStatusFamily(int statusCode) {
-        return String.format("%dxx", statusCode / 100);
-    }
-
-    public Meter consumerErrorsTimeoutMeter(SubscriptionName subscription) {
-        return metricRegistry.meter(metricRegistryName(ERRORS_TIMEOUTS, subscription.getTopicName(), subscription.getName()));
-    }
-
-    public void unregisterConsumerErrorsTimeoutMeter(SubscriptionName subscription) {
-        unregister(ERRORS_TIMEOUTS, subscription);
-    }
-
-    public Meter consumerErrorsOtherMeter(SubscriptionName subscription) {
-        return metricRegistry.meter(metricRegistryName(ERRORS_OTHER, subscription.getTopicName(), subscription.getName()));
-    }
-
-    public void unregisterConsumerErrorsOtherMeter(SubscriptionName subscription) {
-        unregister(ERRORS_OTHER, subscription);
-    }
-
-    public Timer consumersWorkloadRebalanceDurationTimer(String kafkaCluster) {
-        PathContext pathContext = pathContext().withKafkaCluster(kafkaCluster).build();
-        return metricRegistry.timer(pathCompiler.compile(Timers.CONSUMER_WORKLOAD_REBALANCE_DURATION, pathContext));
-    }
-
-    public Timer oAuthProviderLatencyTimer(String oAuthProviderName) {
-        PathContext pathContext = pathContext()
-                .withOAuthProvider(escapeDots(oAuthProviderName))
-                .build();
-        return metricRegistry.timer(pathCompiler.compile(Timers.OAUTH_PROVIDER_TOKEN_REQUEST_LATENCY, pathContext));
-    }
-
-    public Meter oAuthSubscriptionTokenRequestMeter(Subscription subscription, String oAuthProviderName) {
-        PathContext pathContext = pathContext()
-                .withGroup(escapeDots(subscription.getTopicName().getGroupName()))
-                .withTopic(escapeDots(subscription.getTopicName().getName()))
-                .withSubscription(escapeDots(subscription.getName()))
-                .withOAuthProvider(escapeDots(oAuthProviderName))
-                .build();
-        return metricRegistry.meter(pathCompiler.compile(Meters.OAUTH_SUBSCRIPTION_TOKEN_REQUEST, pathContext));
-    }
-
-    public void registerRunningConsumerProcessesCountGauge(Gauge<Integer> gauge) {
-        metricRegistry.register(metricRegistryName(Gauges.RUNNING_CONSUMER_PROCESSES_COUNT), gauge);
-    }
-
-    public void registerDyingConsumerProcessesCountGauge(Gauge<Integer> gauge) {
-        metricRegistry.register(metricRegistryName(Gauges.DYING_CONSUMER_PROCESSES_COUNT), gauge);
-    }
-}
-
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Histograms.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Histograms.java
index a12b6f58b5..67a8bad658 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Histograms.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Histograms.java
@@ -1,12 +1,6 @@
 package pl.allegro.tech.hermes.common.metric;
 
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.GROUP;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.SUBSCRIPTION;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.TOPIC;
-
 public class Histograms {
-    public static final String MESSAGE_SIZE = "message-size." + GROUP + "." + TOPIC;
-    public static final String GLOBAL_MESSAGE_SIZE = "message-size";
-    public static final String INFLIGHT_TIME = "inflight." + GROUP + "." + TOPIC + "." + SUBSCRIPTION + ".time";
-    public static final String PERSISTED_UNDELIVERED_MESSAGE_SIZE = "undelivered-messages.persisted.message-size";
+  public static final String PERSISTED_UNDELIVERED_MESSAGE_SIZE =
+      "undelivered-messages.persisted.message-size";
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MaxRateMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MaxRateMetrics.java
index f1a759308d..5f608a6072 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MaxRateMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MaxRateMetrics.java
@@ -1,63 +1,51 @@
 package pl.allegro.tech.hermes.common.metric;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static pl.allegro.tech.hermes.common.metric.SubscriptionTagsFactory.subscriptionTags;
+
 import io.micrometer.core.instrument.MeterRegistry;
+import java.util.List;
+import java.util.function.ToDoubleFunction;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.counters.HermesCounters;
 
-import java.util.List;
-import java.util.function.ToDoubleFunction;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static pl.allegro.tech.hermes.common.metric.Counters.MAXRATE_FETCH_FAILURES;
-import static pl.allegro.tech.hermes.common.metric.Counters.MAXRATE_RATE_HISTORY_FAILURES;
-import static pl.allegro.tech.hermes.common.metric.Gauges.MAX_RATE_ACTUAL_RATE_VALUE;
-import static pl.allegro.tech.hermes.common.metric.Gauges.MAX_RATE_CALCULATION_DURATION;
-import static pl.allegro.tech.hermes.common.metric.Gauges.MAX_RATE_VALUE;
-import static pl.allegro.tech.hermes.common.metric.Gauges.OUTPUT_RATE;
-import static pl.allegro.tech.hermes.common.metric.SubscriptionTagsFactory.subscriptionTags;
-
 public class MaxRateMetrics {
 
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-
-    MaxRateMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-    }
-
-    public <T> void registerCalculationDurationInMillisGauge(T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerGauge(MAX_RATE_CALCULATION_DURATION, () -> (int) f.applyAsDouble(obj));
-        meterRegistry.more().timeGauge("max-rate.calculation.duration", List.of(), obj, MILLISECONDS, f);
-    }
-
-    public HermesCounter historyUpdateFailuresCounter(SubscriptionName subscription) {
-        return HermesCounters.from(
-                meterRegistry.counter("max-rate.history-update.failures", subscriptionTags(subscription)),
-                hermesMetrics.counter(MAXRATE_RATE_HISTORY_FAILURES, subscription.getTopicName(), subscription.getName())
-        );
-    }
-
-    public HermesCounter fetchFailuresCounter(SubscriptionName subscription) {
-        return HermesCounters.from(
-                meterRegistry.counter("max-rate.fetch.failures", subscriptionTags(subscription)),
-                hermesMetrics.counter(MAXRATE_FETCH_FAILURES, subscription.getTopicName(), subscription.getName())
-        );
-    }
-
-    public <T> void registerCalculatedRateGauge(SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerGauge(MAX_RATE_VALUE, subscription, () -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("max-rate.calculated-rate", subscriptionTags(subscription), obj, f);
-    }
-
-    public <T> void registerActualRateGauge(SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerGauge(MAX_RATE_ACTUAL_RATE_VALUE, subscription, () -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("max-rate.actual-rate", subscriptionTags(subscription), obj, f);
-    }
-
-    public <T> void registerOutputRateGauge(SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerGauge(OUTPUT_RATE, subscription, () -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge("max-rate.output-rate", subscriptionTags(subscription), obj, f);
-    }
+  private final MeterRegistry meterRegistry;
+
+  MaxRateMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
+
+  public <T> void registerCalculationDurationInMillisGauge(T obj, ToDoubleFunction<T> f) {
+    meterRegistry
+        .more()
+        .timeGauge("max-rate.calculation.duration", List.of(), obj, MILLISECONDS, f);
+  }
+
+  public HermesCounter historyUpdateFailuresCounter(SubscriptionName subscription) {
+    return HermesCounters.from(
+        meterRegistry.counter("max-rate.history-update.failures", subscriptionTags(subscription)));
+  }
+
+  public HermesCounter fetchFailuresCounter(SubscriptionName subscription) {
+    return HermesCounters.from(
+        meterRegistry.counter("max-rate.fetch.failures", subscriptionTags(subscription)));
+  }
+
+  public <T> void registerCalculatedRateGauge(
+      SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("max-rate.calculated-rate", subscriptionTags(subscription), obj, f);
+  }
+
+  public <T> void registerActualRateGauge(
+      SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("max-rate.actual-rate", subscriptionTags(subscription), obj, f);
+  }
+
+  public <T> void registerOutputRateGauge(
+      SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge("max-rate.output-rate", subscriptionTags(subscription), obj, f);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Meters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Meters.java
index c30d031bba..b502e0eea1 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Meters.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Meters.java
@@ -1,41 +1,13 @@
 package pl.allegro.tech.hermes.common.metric;
 
 import static pl.allegro.tech.hermes.metrics.PathsCompiler.GROUP;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.HTTP_CODE;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.HTTP_CODE_FAMILY;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.OAUTH_PROVIDER_NAME;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.SUBSCRIPTION;
 import static pl.allegro.tech.hermes.metrics.PathsCompiler.TOPIC;
 
 public class Meters {
 
-    public static final String METER = "meter";
-    public static final String TOPIC_METER = METER + "." + GROUP + "." + TOPIC;
-    public static final String SUBSCRIPTION_METER = TOPIC_METER + "." + SUBSCRIPTION;
-    public static final String FILTERED_METER = SUBSCRIPTION_METER + ".filtered";
-    public static final String SUBSCRIPTION_BATCH_METER = TOPIC_METER + "." + SUBSCRIPTION + ".batch";
-    public static final String FAILED_METER = "failed-meter";
-    public static final String FAILED_TOPIC_METER = FAILED_METER + "." + GROUP + "." + TOPIC;
-    public static final String FAILED_METER_SUBSCRIPTION = FAILED_TOPIC_METER + "." + SUBSCRIPTION;
-    public static final String THROUGHPUT_BYTES = "throughput";
-    public static final String TOPIC_THROUGHPUT_BYTES = THROUGHPUT_BYTES + "." + GROUP + "." + TOPIC;
-    public static final String SUBSCRIPTION_THROUGHPUT_BYTES = TOPIC_THROUGHPUT_BYTES + "." + SUBSCRIPTION;
-    public static final String STATUS_CODES = "http-status-codes.code" + HTTP_CODE;
-    public static final String TOPIC_STATUS_CODES = "http-status-codes." + GROUP + "." + TOPIC + ".code" + HTTP_CODE;
-    public static final String SUBSCRIPTION_STATUS = "status." + GROUP + "." + TOPIC + "." + SUBSCRIPTION;
-    public static final String ERRORS_TIMEOUTS = SUBSCRIPTION_STATUS + ".errors.timeout";
-    public static final String ERRORS_OTHER = SUBSCRIPTION_STATUS + ".errors.other";
-    public static final String ERRORS_HTTP_BY_FAMILY = SUBSCRIPTION_STATUS + "." + HTTP_CODE_FAMILY;
-    public static final String ERRORS_HTTP_BY_CODE = ERRORS_HTTP_BY_FAMILY + "." + HTTP_CODE;
-    public static final String DISCARDED_METER = "discarded-meter";
-    public static final String DISCARDED_TOPIC_METER = DISCARDED_METER + "." + GROUP + "." + TOPIC;
-    public static final String DISCARDED_SUBSCRIPTION_METER = DISCARDED_TOPIC_METER + "." + SUBSCRIPTION;
+  public static final String THROUGHPUT_BYTES = "throughput";
+  public static final String TOPIC_THROUGHPUT_BYTES = THROUGHPUT_BYTES + "." + GROUP + "." + TOPIC;
 
-    public static final String DELAYED_PROCESSING = "delayed-processing";
-    public static final String TOPIC_DELAYED_PROCESSING = DELAYED_PROCESSING + "." + GROUP + "." + TOPIC;
-
-    public static final String OAUTH_SUBSCRIPTION_TOKEN_REQUEST = "oauth.subscription." + GROUP + "." + TOPIC + "." + SUBSCRIPTION
-            + ".token-request." + OAUTH_PROVIDER_NAME;
-
-    public static final String PERSISTED_UNDELIVERED_MESSAGES_METER = "undelivered-messages.persisted";
+  public static final String PERSISTED_UNDELIVERED_MESSAGES_METER =
+      "undelivered-messages.persisted";
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MetricRegistryWithHdrHistogramReservoir.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MetricRegistryWithHdrHistogramReservoir.java
deleted file mode 100644
index a8c931742d..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MetricRegistryWithHdrHistogramReservoir.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package pl.allegro.tech.hermes.common.metric;
-
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
-import org.mpierce.metrics.reservoir.hdrhistogram.HdrHistogramResetOnSnapshotReservoir;
-
-public class MetricRegistryWithHdrHistogramReservoir extends MetricRegistry {
-
-    @Override
-    public Histogram histogram(String name) {
-        return histogram(name, () -> new Histogram(new HdrHistogramResetOnSnapshotReservoir()));
-    }
-
-    @Override
-    public Timer timer(String name) {
-        return timer(name, () -> new Timer(new HdrHistogramResetOnSnapshotReservoir()));
-    }
-}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MetricsFacade.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MetricsFacade.java
index 43ace4994b..2f1bb31897 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MetricsFacade.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/MetricsFacade.java
@@ -1,149 +1,122 @@
 package pl.allegro.tech.hermes.common.metric;
 
+import static pl.allegro.tech.hermes.common.metric.SubscriptionTagsFactory.subscriptionTags;
+
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.search.Search;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Collection;
-
-import static pl.allegro.tech.hermes.common.metric.Counters.DELIVERED;
-import static pl.allegro.tech.hermes.common.metric.Counters.DISCARDED;
-import static pl.allegro.tech.hermes.common.metric.Counters.MAXRATE_FETCH_FAILURES;
-import static pl.allegro.tech.hermes.common.metric.Counters.MAXRATE_RATE_HISTORY_FAILURES;
-import static pl.allegro.tech.hermes.common.metric.Gauges.MAX_RATE_ACTUAL_RATE_VALUE;
-import static pl.allegro.tech.hermes.common.metric.Gauges.MAX_RATE_VALUE;
-import static pl.allegro.tech.hermes.common.metric.Gauges.OUTPUT_RATE;
-import static pl.allegro.tech.hermes.common.metric.Meters.DISCARDED_SUBSCRIPTION_METER;
-import static pl.allegro.tech.hermes.common.metric.Meters.FAILED_METER_SUBSCRIPTION;
-import static pl.allegro.tech.hermes.common.metric.Meters.FILTERED_METER;
-import static pl.allegro.tech.hermes.common.metric.Meters.SUBSCRIPTION_BATCH_METER;
-import static pl.allegro.tech.hermes.common.metric.Meters.SUBSCRIPTION_METER;
-import static pl.allegro.tech.hermes.common.metric.Meters.SUBSCRIPTION_THROUGHPUT_BYTES;
-import static pl.allegro.tech.hermes.common.metric.SubscriptionTagsFactory.subscriptionTags;
-import static pl.allegro.tech.hermes.common.metric.Timers.CONSUMER_IDLE_TIME;
-import static pl.allegro.tech.hermes.common.metric.Timers.SUBSCRIPTION_LATENCY;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class MetricsFacade {
 
-    private final MeterRegistry meterRegistry;
-    private final HermesMetrics hermesMetrics;
-    private final TopicMetrics topicMetrics;
-    private final SubscriptionMetrics subscriptionMetrics;
-    private final ConsumerMetrics consumerMetrics;
-    private final TrackerElasticSearchMetrics trackerElasticSearchMetrics;
-    private final PersistentBufferMetrics persistentBufferMetrics;
-    private final ProducerMetrics producerMetrics;
-    private final ExecutorMetrics executorMetrics;
-    private final SchemaClientMetrics schemaClientMetrics;
-    private final UndeliveredMessagesMetrics undeliveredMessagesMetrics;
-    private final DeserializationMetrics deserializationMetrics;
-    private final WorkloadMetrics workloadMetrics;
-    private final ConsumerSenderMetrics consumerSenderMetrics;
-    private final OffsetCommitsMetrics offsetCommitsMetrics;
-    private final MaxRateMetrics maxRateMetrics;
-
-    public MetricsFacade(MeterRegistry meterRegistry, HermesMetrics hermesMetrics) {
-        this.meterRegistry = meterRegistry;
-        this.hermesMetrics = hermesMetrics;
-        this.topicMetrics = new TopicMetrics(hermesMetrics, meterRegistry);
-        this.subscriptionMetrics = new SubscriptionMetrics(hermesMetrics, meterRegistry);
-        this.consumerMetrics = new ConsumerMetrics(hermesMetrics, meterRegistry);
-        this.trackerElasticSearchMetrics = new TrackerElasticSearchMetrics(hermesMetrics, meterRegistry);
-        this.persistentBufferMetrics = new PersistentBufferMetrics(hermesMetrics, meterRegistry);
-        this.producerMetrics = new ProducerMetrics(hermesMetrics, meterRegistry);
-        this.executorMetrics = new ExecutorMetrics(hermesMetrics, meterRegistry);
-        this.schemaClientMetrics = new SchemaClientMetrics(hermesMetrics, meterRegistry);
-        this.undeliveredMessagesMetrics = new UndeliveredMessagesMetrics(hermesMetrics, meterRegistry);
-        this.deserializationMetrics = new DeserializationMetrics(hermesMetrics, meterRegistry);
-        this.workloadMetrics = new WorkloadMetrics(hermesMetrics, meterRegistry);
-        this.consumerSenderMetrics = new ConsumerSenderMetrics(hermesMetrics, meterRegistry);
-        this.offsetCommitsMetrics = new OffsetCommitsMetrics(hermesMetrics, meterRegistry);
-        this.maxRateMetrics = new MaxRateMetrics(hermesMetrics, meterRegistry);
-    }
-
-    public TopicMetrics topics() {
-        return topicMetrics;
-    }
-
-    public SubscriptionMetrics subscriptions() {
-        return subscriptionMetrics;
-    }
-
-    public ConsumerMetrics consumer() {
-        return consumerMetrics;
-    }
-
-    public TrackerElasticSearchMetrics trackerElasticSearch() {
-        return trackerElasticSearchMetrics;
-    }
-
-    public PersistentBufferMetrics persistentBuffer() {
-        return persistentBufferMetrics;
-    }
-
-    public ProducerMetrics producer() {
-        return producerMetrics;
-    }
-
-    public ExecutorMetrics executor() {
-        return executorMetrics;
-    }
-
-    public SchemaClientMetrics schemaClient() {
-        return schemaClientMetrics;
-    }
-
-    public UndeliveredMessagesMetrics undeliveredMessages() {
-        return undeliveredMessagesMetrics;
-    }
-
-    public DeserializationMetrics deserialization() {
-        return deserializationMetrics;
-    }
-
-    public WorkloadMetrics workload() {
-        return workloadMetrics;
-    }
-
-    public ConsumerSenderMetrics consumerSender() {
-        return consumerSenderMetrics;
-    }
-
-    public OffsetCommitsMetrics offsetCommits() {
-        return offsetCommitsMetrics;
-    }
-
-    public MaxRateMetrics maxRate() {
-        return maxRateMetrics;
-    }
-
-    public void unregisterAllMetricsRelatedTo(SubscriptionName subscription) {
-        Collection<Meter> meters = Search.in(meterRegistry)
-                .tags(subscriptionTags(subscription))
-                .meters();
-        for (Meter meter : meters) {
-            meterRegistry.remove(meter);
-        }
-        hermesMetrics.unregister(DISCARDED_SUBSCRIPTION_METER, subscription);
-        hermesMetrics.unregister(FAILED_METER_SUBSCRIPTION, subscription);
-        hermesMetrics.unregister(SUBSCRIPTION_BATCH_METER, subscription);
-        hermesMetrics.unregister(SUBSCRIPTION_METER, subscription);
-        hermesMetrics.unregister(DELIVERED, subscription);
-        hermesMetrics.unregister(DISCARDED, subscription);
-        hermesMetrics.unregisterInflightGauge(subscription);
-        hermesMetrics.unregisterInflightTimeHistogram(subscription);
-        hermesMetrics.unregisterConsumerErrorsTimeoutMeter(subscription);
-        hermesMetrics.unregisterConsumerErrorsOtherMeter(subscription);
-        hermesMetrics.unregisterStatusMeters(subscription);
-        hermesMetrics.unregister(OUTPUT_RATE, subscription);
-        hermesMetrics.unregister(MAX_RATE_ACTUAL_RATE_VALUE, subscription);
-        hermesMetrics.unregister(MAX_RATE_VALUE, subscription);
-        hermesMetrics.unregister(MAXRATE_FETCH_FAILURES, subscription);
-        hermesMetrics.unregister(MAXRATE_RATE_HISTORY_FAILURES, subscription);
-        hermesMetrics.unregister(CONSUMER_IDLE_TIME, subscription);
-        hermesMetrics.unregister(FILTERED_METER, subscription);
-        hermesMetrics.unregister(SUBSCRIPTION_LATENCY, subscription);
-        hermesMetrics.unregister(SUBSCRIPTION_THROUGHPUT_BYTES, subscription);
-    }
+  private final MeterRegistry meterRegistry;
+  private final TopicMetrics topicMetrics;
+  private final SubscriptionMetrics subscriptionMetrics;
+  private final ConsumerMetrics consumerMetrics;
+  private final TrackerElasticSearchMetrics trackerElasticSearchMetrics;
+  private final PersistentBufferMetrics persistentBufferMetrics;
+  private final ProducerMetrics producerMetrics;
+  private final ExecutorMetrics executorMetrics;
+  private final SchemaClientMetrics schemaClientMetrics;
+  private final UndeliveredMessagesMetrics undeliveredMessagesMetrics;
+  private final DeserializationMetrics deserializationMetrics;
+  private final WorkloadMetrics workloadMetrics;
+  private final ConsumerSenderMetrics consumerSenderMetrics;
+  private final OffsetCommitsMetrics offsetCommitsMetrics;
+  private final MaxRateMetrics maxRateMetrics;
+  private final BrokerMetrics brokerMetrics;
+  private final ConsistencyMetrics consistencyMetrics;
+
+  public MetricsFacade(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+    this.topicMetrics = new TopicMetrics(meterRegistry);
+    this.subscriptionMetrics = new SubscriptionMetrics(meterRegistry);
+    this.consumerMetrics = new ConsumerMetrics(meterRegistry);
+    this.trackerElasticSearchMetrics = new TrackerElasticSearchMetrics(meterRegistry);
+    this.persistentBufferMetrics = new PersistentBufferMetrics(meterRegistry);
+    this.producerMetrics = new ProducerMetrics(meterRegistry);
+    this.executorMetrics = new ExecutorMetrics(meterRegistry);
+    this.schemaClientMetrics = new SchemaClientMetrics(meterRegistry);
+    this.undeliveredMessagesMetrics = new UndeliveredMessagesMetrics(meterRegistry);
+    this.deserializationMetrics = new DeserializationMetrics(meterRegistry);
+    this.workloadMetrics = new WorkloadMetrics(meterRegistry);
+    this.consumerSenderMetrics = new ConsumerSenderMetrics(meterRegistry);
+    this.offsetCommitsMetrics = new OffsetCommitsMetrics(meterRegistry);
+    this.maxRateMetrics = new MaxRateMetrics(meterRegistry);
+    this.brokerMetrics = new BrokerMetrics(meterRegistry);
+    this.consistencyMetrics = new ConsistencyMetrics(meterRegistry);
+  }
+
+  public TopicMetrics topics() {
+    return topicMetrics;
+  }
+
+  public SubscriptionMetrics subscriptions() {
+    return subscriptionMetrics;
+  }
+
+  public ConsumerMetrics consumer() {
+    return consumerMetrics;
+  }
+
+  public TrackerElasticSearchMetrics trackerElasticSearch() {
+    return trackerElasticSearchMetrics;
+  }
+
+  public PersistentBufferMetrics persistentBuffer() {
+    return persistentBufferMetrics;
+  }
+
+  public ProducerMetrics producer() {
+    return producerMetrics;
+  }
+
+  public ExecutorMetrics executor() {
+    return executorMetrics;
+  }
+
+  public SchemaClientMetrics schemaClient() {
+    return schemaClientMetrics;
+  }
+
+  public UndeliveredMessagesMetrics undeliveredMessages() {
+    return undeliveredMessagesMetrics;
+  }
+
+  public DeserializationMetrics deserialization() {
+    return deserializationMetrics;
+  }
+
+  public WorkloadMetrics workload() {
+    return workloadMetrics;
+  }
+
+  public ConsumerSenderMetrics consumerSender() {
+    return consumerSenderMetrics;
+  }
+
+  public OffsetCommitsMetrics offsetCommits() {
+    return offsetCommitsMetrics;
+  }
+
+  public MaxRateMetrics maxRate() {
+    return maxRateMetrics;
+  }
+
+  public BrokerMetrics broker() {
+    return brokerMetrics;
+  }
+
+  public ConsistencyMetrics consistency() {
+    return consistencyMetrics;
+  }
+
+  public void unregisterAllMetricsRelatedTo(SubscriptionName subscription) {
+    Collection<Meter> meters =
+        Search.in(meterRegistry).tags(subscriptionTags(subscription)).meters();
+    for (Meter meter : meters) {
+      meterRegistry.remove(meter);
+    }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/OffsetCommitsMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/OffsetCommitsMetrics.java
index 84527282a4..bb310aca1f 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/OffsetCommitsMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/OffsetCommitsMetrics.java
@@ -7,46 +7,29 @@
 
 public class OffsetCommitsMetrics {
 
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-
-    OffsetCommitsMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-    }
-
-    public HermesCounter skippedCounter() {
-        return HermesCounters.from(
-                meterRegistry.counter("offset-commits.skipped"),
-                hermesMetrics.counter("offset-committer.skipped")
-        );
-    }
-
-    public HermesCounter obsoleteCounter() {
-        return HermesCounters.from(
-                meterRegistry.counter("offset-commits.obsolete"),
-                hermesMetrics.counter("offset-committer.obsolete")
-        );
-    }
-
-    public HermesCounter committedCounter() {
-        return HermesCounters.from(
-                meterRegistry.counter("offset-commits.committed"),
-                hermesMetrics.counter("offset-committer.committed")
-        );
-    }
-
-    public HermesTimer duration() {
-        return HermesTimer.from(
-                meterRegistry.timer("offset-commits.duration"),
-                hermesMetrics.timer("offset-committer.duration")
-        );
-    }
-
-    public HermesCounter failuresCounter() {
-        return HermesCounters.from(
-                meterRegistry.counter("offset-commits.failures"),
-                hermesMetrics.counter("offset-committer.failed")
-        );
-    }
+  private final MeterRegistry meterRegistry;
+
+  OffsetCommitsMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
+
+  public HermesCounter skippedCounter() {
+    return HermesCounters.from(meterRegistry.counter("offset-commits.skipped"));
+  }
+
+  public HermesCounter obsoleteCounter() {
+    return HermesCounters.from(meterRegistry.counter("offset-commits.obsolete"));
+  }
+
+  public HermesCounter committedCounter() {
+    return HermesCounters.from(meterRegistry.counter("offset-commits.committed"));
+  }
+
+  public HermesTimer duration() {
+    return HermesTimer.from(meterRegistry.timer("offset-commits.duration"));
+  }
+
+  public HermesCounter failuresCounter() {
+    return HermesCounters.from(meterRegistry.counter("offset-commits.failures"));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/PersistentBufferMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/PersistentBufferMetrics.java
index b67c522807..086f44bbd1 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/PersistentBufferMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/PersistentBufferMetrics.java
@@ -1,22 +1,18 @@
 package pl.allegro.tech.hermes.common.metric;
 
-import io.micrometer.core.instrument.MeterRegistry;
+import static pl.allegro.tech.hermes.common.metric.Gauges.BACKUP_STORAGE_SIZE;
 
+import io.micrometer.core.instrument.MeterRegistry;
 import java.util.function.ToDoubleFunction;
 
-import static pl.allegro.tech.hermes.common.metric.Gauges.BACKUP_STORAGE_SIZE;
-
 public class PersistentBufferMetrics {
-    private final MeterRegistry meterRegistry;
-    private final HermesMetrics hermesMetrics;
+  private final MeterRegistry meterRegistry;
 
-    public PersistentBufferMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-        this.hermesMetrics = hermesMetrics;
-    }
+  public PersistentBufferMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
 
-    public <T> void registerBackupStorageSizeGauge(T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerMessageRepositorySizeGauge(() -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge(BACKUP_STORAGE_SIZE, obj, f);
-    }
+  public <T> void registerBackupStorageSizeGauge(T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge(BACKUP_STORAGE_SIZE, obj, f);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ProducerMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ProducerMetrics.java
index 14b5edd14f..3817ab294e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ProducerMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/ProducerMetrics.java
@@ -1,141 +1,165 @@
 package pl.allegro.tech.hermes.common.metric;
 
+import static pl.allegro.tech.hermes.common.metric.Gauges.INFLIGHT_REQUESTS;
+
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
-
 import java.util.concurrent.TimeUnit;
 import java.util.function.ToDoubleFunction;
 
-import static pl.allegro.tech.hermes.common.metric.Gauges.INFLIGHT_REQUESTS;
-import static pl.allegro.tech.hermes.common.metric.HermesMetrics.escapeDots;
-
 public class ProducerMetrics {
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-    private final GaugeRegistrar gaugeRegistrar;
-
-    public ProducerMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-        this.gaugeRegistrar = new GaugeRegistrar(meterRegistry, hermesMetrics);
-    }
-
-    public <T> void registerAckAllTotalBytesGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(ACK_ALL_BUFFER_TOTAL_BYTES, stateObj, f);
-    }
-
-    public <T> void registerAckLeaderTotalBytesGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(ACK_LEADER_BUFFER_TOTAL_BYTES, stateObj, f);
-    }
-
-    public <T> void registerAckAllAvailableBytesGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(ACK_ALL_BUFFER_AVAILABLE_BYTES, stateObj, f);
-    }
-
-    public <T> void registerAckLeaderAvailableBytesGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(ACK_LEADER_BUFFER_AVAILABLE_BYTES, stateObj, f);
-    }
-
-    public <T> void registerAckAllCompressionRateGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(ACK_ALL_COMPRESSION_RATE, stateObj, f);
-    }
-
-    public <T> void registerAckLeaderCompressionRateGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(ACK_LEADER_COMPRESSION_RATE, stateObj, f);
-    }
-
-    public <T> void registerAckAllFailedBatchesGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(ACK_ALL_FAILED_BATCHES_TOTAL, stateObj, f);
-    }
-
-    public <T> void registerAckLeaderFailedBatchesGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(ACK_LEADER_FAILED_BATCHES_TOTAL, stateObj, f);
-    }
-
-    public <T> void registerAckAllMetadataAgeGauge(T stateObj, ToDoubleFunction<T> f) {
-        registerTimeGauge(stateObj, f, ACK_ALL_METADATA_AGE, ACK_ALL_METADATA_AGE, Tags.empty(), TimeUnit.SECONDS);
-    }
-
-    public <T> void registerAckLeaderMetadataAgeGauge(T stateObj, ToDoubleFunction<T> f) {
-        registerTimeGauge(stateObj, f, ACK_LEADER_METADATA_AGE, ACK_LEADER_METADATA_AGE, Tags.empty(), TimeUnit.SECONDS);
-    }
-
-    public <T> void registerAckAllRecordQueueTimeMaxGauge(T stateObj, ToDoubleFunction<T> f) {
-        registerTimeGauge(stateObj, f, ACK_ALL_RECORD_QUEUE_TIME_MAX, ACK_ALL_RECORD_QUEUE_TIME_MAX, Tags.empty(), TimeUnit.MILLISECONDS);
-    }
-
-    public <T> void registerAckLeaderRecordQueueTimeMaxGauge(T stateObj, ToDoubleFunction<T> f) {
-        registerTimeGauge(stateObj, f, ACK_LEADER_RECORD_QUEUE_TIME_MAX,
-                ACK_LEADER_RECORD_QUEUE_TIME_MAX, Tags.empty(), TimeUnit.MILLISECONDS);
-    }
-
-    public double getBufferTotalBytes() {
-        return meterRegistry.get(ACK_ALL_BUFFER_TOTAL_BYTES).gauge().value()
-                + meterRegistry.get(ACK_LEADER_BUFFER_TOTAL_BYTES).gauge().value();
-    }
-
-    public double getBufferAvailableBytes() {
-        return meterRegistry.get(ACK_ALL_BUFFER_AVAILABLE_BYTES).gauge().value()
-                + meterRegistry.get(ACK_LEADER_BUFFER_AVAILABLE_BYTES).gauge().value();
-    }
-
-    public <T> void registerProducerInflightRequestGauge(T stateObj, ToDoubleFunction<T> f) {
-        meterRegistry.gauge(INFLIGHT_REQUESTS, stateObj, f);
-        hermesMetrics.registerProducerInflightRequest(() -> (int) f.applyAsDouble(stateObj));
-    }
-
-    public <T> void registerAckAllMaxLatencyBrokerGauge(T stateObj, ToDoubleFunction<T> f, String brokerNodeId) {
-        registerLatencyPerBrokerGauge(stateObj, f, "request-latency-max", ACK_ALL, brokerNodeId);
-    }
-
-    public <T> void registerAckLeaderMaxLatencyPerBrokerGauge(T stateObj, ToDoubleFunction<T> f, String brokerNodeId) {
-        registerLatencyPerBrokerGauge(stateObj, f, "request-latency-max", ACK_LEADER, brokerNodeId);
-    }
-
-    public <T> void registerAckAllAvgLatencyPerBrokerGauge(T stateObj, ToDoubleFunction<T> f, String brokerNodeId) {
-        registerLatencyPerBrokerGauge(stateObj, f, "request-latency-avg", ACK_ALL, brokerNodeId);
-    }
-
-    public <T> void registerAckLeaderAvgLatencyPerBrokerGauge(T stateObj, ToDoubleFunction<T> f, String brokerNodeId) {
-        registerLatencyPerBrokerGauge(stateObj, f, "request-latency-avg", ACK_LEADER, brokerNodeId);
-    }
-
-    private <T> void registerLatencyPerBrokerGauge(T stateObj,
-                                                   ToDoubleFunction<T> f,
-                                                   String metricName,
-                                                   String producerName,
-                                                   String brokerNodeId) {
-        String baseMetricName = KAFKA_PRODUCER + producerName +  metricName;
-        String graphiteMetricName = baseMetricName + "." + escapeDots(brokerNodeId);
-
-        registerTimeGauge(stateObj, f, graphiteMetricName, baseMetricName, Tags.of("broker", brokerNodeId), TimeUnit.MILLISECONDS);
-    }
-
-    private <T> void registerTimeGauge(T stateObj,
-                                       ToDoubleFunction<T> f,
-                                       String graphiteName,
-                                       String prometheusName,
-                                       Tags tags,
-                                       TimeUnit timeUnit) {
-        hermesMetrics.registerGauge(graphiteName, () -> f.applyAsDouble(stateObj));
-        meterRegistry.more().timeGauge(prometheusName, tags, stateObj, timeUnit, f);
-    }
-
-    private static final String KAFKA_PRODUCER = "kafka-producer.";
-    private static final String ACK_LEADER = "ack-leader.";
-    private static final String ACK_ALL = "ack-all.";
-
-    private static final String ACK_ALL_BUFFER_TOTAL_BYTES = KAFKA_PRODUCER + ACK_ALL + "buffer-total-bytes";
-    private static final String ACK_ALL_BUFFER_AVAILABLE_BYTES = KAFKA_PRODUCER + ACK_ALL + "buffer-available-bytes";
-    private static final String ACK_ALL_METADATA_AGE = KAFKA_PRODUCER + ACK_ALL + "metadata-age";
-    private static final String ACK_ALL_RECORD_QUEUE_TIME_MAX = KAFKA_PRODUCER + ACK_ALL + "record-queue-time-max";
-    private static final String ACK_ALL_COMPRESSION_RATE = KAFKA_PRODUCER + ACK_ALL + "compression-rate-avg";
-    private static final String ACK_ALL_FAILED_BATCHES_TOTAL = KAFKA_PRODUCER + ACK_ALL + "failed-batches-total";
-
-    private static final String ACK_LEADER_FAILED_BATCHES_TOTAL = KAFKA_PRODUCER + ACK_LEADER + "failed-batches-total";
-    private static final String ACK_LEADER_BUFFER_TOTAL_BYTES = KAFKA_PRODUCER + ACK_LEADER + "buffer-total-bytes";
-    private static final String ACK_LEADER_METADATA_AGE = KAFKA_PRODUCER + ACK_LEADER + "metadata-age";
-    private static final String ACK_LEADER_RECORD_QUEUE_TIME_MAX = KAFKA_PRODUCER + ACK_LEADER + "record-queue-time-max";
-    private static final String ACK_LEADER_BUFFER_AVAILABLE_BYTES = KAFKA_PRODUCER + ACK_LEADER + "buffer-available-bytes";
-    private static final String ACK_LEADER_COMPRESSION_RATE = KAFKA_PRODUCER + ACK_LEADER + "compression-rate-avg";
+  private final MeterRegistry meterRegistry;
+  private final GaugeRegistrar gaugeRegistrar;
+
+  public ProducerMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+    this.gaugeRegistrar = new GaugeRegistrar(meterRegistry);
+  }
+
+  public <T> void registerAckAllTotalBytesGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    gaugeRegistrar.registerGauge(ACK_ALL_BUFFER_TOTAL_BYTES, stateObj, f, tags(sender, datacenter));
+  }
+
+  public <T> void registerAckLeaderTotalBytesGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    gaugeRegistrar.registerGauge(
+        ACK_LEADER_BUFFER_TOTAL_BYTES, stateObj, f, tags(sender, datacenter));
+  }
+
+  public <T> void registerAckAllAvailableBytesGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    gaugeRegistrar.registerGauge(
+        ACK_ALL_BUFFER_AVAILABLE_BYTES, stateObj, f, tags(sender, datacenter));
+  }
+
+  public <T> void registerAckLeaderAvailableBytesGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    gaugeRegistrar.registerGauge(
+        ACK_LEADER_BUFFER_AVAILABLE_BYTES, stateObj, f, tags(sender, datacenter));
+  }
+
+  public <T> void registerAckAllCompressionRateGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    gaugeRegistrar.registerGauge(ACK_ALL_COMPRESSION_RATE, stateObj, f, tags(sender, datacenter));
+  }
+
+  public <T> void registerAckLeaderCompressionRateGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    gaugeRegistrar.registerGauge(
+        ACK_LEADER_COMPRESSION_RATE, stateObj, f, tags(sender, datacenter));
+  }
+
+  public <T> void registerAckAllFailedBatchesGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    gaugeRegistrar.registerGauge(
+        ACK_ALL_FAILED_BATCHES_TOTAL, stateObj, f, tags(sender, datacenter));
+  }
+
+  public <T> void registerAckLeaderFailedBatchesGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    gaugeRegistrar.registerGauge(
+        ACK_LEADER_FAILED_BATCHES_TOTAL, stateObj, f, tags(sender, datacenter));
+  }
+
+  public <T> void registerAckAllMetadataAgeGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    registerTimeGauge(
+        stateObj, f, ACK_ALL_METADATA_AGE, tags(sender, datacenter), TimeUnit.SECONDS);
+  }
+
+  public <T> void registerAckLeaderMetadataAgeGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    registerTimeGauge(
+        stateObj, f, ACK_LEADER_METADATA_AGE, tags(sender, datacenter), TimeUnit.SECONDS);
+  }
+
+  public <T> void registerAckAllRecordQueueTimeMaxGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    registerTimeGauge(
+        stateObj,
+        f,
+        ACK_ALL_RECORD_QUEUE_TIME_MAX,
+        tags(sender, datacenter),
+        TimeUnit.MILLISECONDS);
+  }
+
+  public <T> void registerAckLeaderRecordQueueTimeMaxGauge(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    registerTimeGauge(
+        stateObj,
+        f,
+        ACK_LEADER_RECORD_QUEUE_TIME_MAX,
+        tags(sender, datacenter),
+        TimeUnit.MILLISECONDS);
+  }
+
+  public double getBufferTotalBytes() {
+    return meterRegistry.get(ACK_ALL_BUFFER_TOTAL_BYTES).gauge().value()
+        + meterRegistry.get(ACK_LEADER_BUFFER_TOTAL_BYTES).gauge().value();
+  }
+
+  public double getBufferAvailableBytes() {
+    return meterRegistry.get(ACK_ALL_BUFFER_AVAILABLE_BYTES).gauge().value()
+        + meterRegistry.get(ACK_LEADER_BUFFER_AVAILABLE_BYTES).gauge().value();
+  }
+
+  public <T> void registerAckLeaderRecordSendCounter(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    registerCounter(ACK_LEADER_RECORD_SEND_TOTAL, tags(sender, datacenter), stateObj, f);
+  }
+
+  public <T> void registerAckAllRecordSendCounter(
+      T stateObj, ToDoubleFunction<T> f, String sender, String datacenter) {
+    registerCounter(ACK_ALL_RECORD_SEND_TOTAL, tags(sender, datacenter), stateObj, f);
+  }
+
+  public <T> void registerProducerInflightRequestGauge(T stateObj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge(INFLIGHT_REQUESTS, stateObj, f);
+  }
+
+  private static Tags tags(String sender, String datacenter) {
+    return Tags.of("storageDc", datacenter, "sender", sender);
+  }
+
+  private <T> void registerTimeGauge(
+      T stateObj, ToDoubleFunction<T> f, String name, Tags tags, TimeUnit timeUnit) {
+    meterRegistry.more().timeGauge(name, tags, stateObj, timeUnit, f);
+  }
+
+  private <T> void registerCounter(String name, Tags tags, T stateObj, ToDoubleFunction<T> f) {
+    meterRegistry.more().counter(name, tags, stateObj, f);
+  }
+
+  private static final String KAFKA_PRODUCER = "kafka-producer.";
+  private static final String ACK_LEADER = "ack-leader.";
+  private static final String ACK_ALL = "ack-all.";
+
+  private static final String ACK_ALL_BUFFER_TOTAL_BYTES =
+      KAFKA_PRODUCER + ACK_ALL + "buffer-total-bytes";
+  private static final String ACK_ALL_BUFFER_AVAILABLE_BYTES =
+      KAFKA_PRODUCER + ACK_ALL + "buffer-available-bytes";
+  private static final String ACK_ALL_METADATA_AGE = KAFKA_PRODUCER + ACK_ALL + "metadata-age";
+  private static final String ACK_ALL_RECORD_QUEUE_TIME_MAX =
+      KAFKA_PRODUCER + ACK_ALL + "record-queue-time-max";
+  private static final String ACK_ALL_COMPRESSION_RATE =
+      KAFKA_PRODUCER + ACK_ALL + "compression-rate-avg";
+  private static final String ACK_ALL_FAILED_BATCHES_TOTAL =
+      KAFKA_PRODUCER + ACK_ALL + "failed-batches-total";
+  private static final String ACK_ALL_RECORD_SEND_TOTAL = KAFKA_PRODUCER + ACK_ALL + "record-send";
+
+  private static final String ACK_LEADER_FAILED_BATCHES_TOTAL =
+      KAFKA_PRODUCER + ACK_LEADER + "failed-batches-total";
+  private static final String ACK_LEADER_BUFFER_TOTAL_BYTES =
+      KAFKA_PRODUCER + ACK_LEADER + "buffer-total-bytes";
+  private static final String ACK_LEADER_METADATA_AGE =
+      KAFKA_PRODUCER + ACK_LEADER + "metadata-age";
+  private static final String ACK_LEADER_RECORD_QUEUE_TIME_MAX =
+      KAFKA_PRODUCER + ACK_LEADER + "record-queue-time-max";
+  private static final String ACK_LEADER_BUFFER_AVAILABLE_BYTES =
+      KAFKA_PRODUCER + ACK_LEADER + "buffer-available-bytes";
+  private static final String ACK_LEADER_COMPRESSION_RATE =
+      KAFKA_PRODUCER + ACK_LEADER + "compression-rate-avg";
+  private static final String ACK_LEADER_RECORD_SEND_TOTAL =
+      KAFKA_PRODUCER + ACK_LEADER + "record-send";
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SchemaClientMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SchemaClientMetrics.java
index a32f1d6910..40faff467c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SchemaClientMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SchemaClientMetrics.java
@@ -5,34 +5,22 @@
 import io.micrometer.core.instrument.Timer;
 import pl.allegro.tech.hermes.metrics.HermesTimer;
 
-import static pl.allegro.tech.hermes.common.metric.Timers.GET_SCHEMA_LATENCY;
-import static pl.allegro.tech.hermes.common.metric.Timers.GET_SCHEMA_VERSIONS_LATENCY;
-
 public class SchemaClientMetrics {
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-
-    public SchemaClientMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-    }
+  private final MeterRegistry meterRegistry;
 
-    public HermesTimer schemaTimer() {
-        return HermesTimer.from(
-                timer("schema.get-schema"),
-                hermesMetrics.schemaTimer(GET_SCHEMA_LATENCY)
-        );
-    }
+  public SchemaClientMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
 
-    public HermesTimer versionsTimer() {
-        return HermesTimer.from(
-                timer("schema.get-versions"),
-                hermesMetrics.schemaTimer(GET_SCHEMA_VERSIONS_LATENCY)
-        );
-    }
+  public HermesTimer schemaTimer() {
+    return HermesTimer.from(timer("schema.get-schema"));
+  }
 
-    private Timer timer(String name) {
-        return meterRegistry.timer(name, Tags.of("schema_repo_type", "schema-registry"));
-    }
+  public HermesTimer versionsTimer() {
+    return HermesTimer.from(timer("schema.get-versions"));
+  }
 
+  private Timer timer(String name) {
+    return meterRegistry.timer(name, Tags.of("schema_repo_type", "schema-registry"));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionHermesCounter.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionHermesCounter.java
index 73da4f18f1..beae420143 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionHermesCounter.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionHermesCounter.java
@@ -1,37 +1,28 @@
 package pl.allegro.tech.hermes.common.metric;
 
-import com.codahale.metrics.Meter;
 import io.micrometer.core.instrument.Counter;
 import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.metrics.counters.MeterBackedHermesCounter;
+import pl.allegro.tech.hermes.metrics.counters.DefaultHermesCounter;
 
-public class SubscriptionHermesCounter extends MeterBackedHermesCounter {
+public class SubscriptionHermesCounter extends DefaultHermesCounter {
 
-    private final String graphiteName;
-    private final SubscriptionName subscription;
+  private final SubscriptionName subscription;
 
-    private SubscriptionHermesCounter(Counter micrometerCounter,
-                                      Meter graphiteMeter,
-                                      String graphiteName, SubscriptionName subscription) {
-        super(micrometerCounter, graphiteMeter);
-        this.graphiteName = graphiteName;
-        this.subscription = subscription;
-    }
+  private SubscriptionHermesCounter(Counter micrometerCounter, SubscriptionName subscription) {
+    super(micrometerCounter);
+    this.subscription = subscription;
+  }
 
-    public static SubscriptionHermesCounter from(Counter micrometerCounter, Meter graphiteMeter,
-                                                 String graphiteName, SubscriptionName subscription) {
-        return new SubscriptionHermesCounter(micrometerCounter, graphiteMeter, graphiteName, subscription);
-    }
+  public static SubscriptionHermesCounter from(
+      Counter micrometerCounter, SubscriptionName subscription) {
+    return new SubscriptionHermesCounter(micrometerCounter, subscription);
+  }
 
-    String getGraphiteName() {
-        return graphiteName;
-    }
+  SubscriptionName getSubscription() {
+    return subscription;
+  }
 
-    SubscriptionName getSubscription() {
-        return subscription;
-    }
-
-    Counter getMicrometerCounter() {
-        return micrometerCounter;
-    }
+  Counter getMicrometerCounter() {
+    return micrometerCounter;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionMetrics.java
index ea41df5b58..dbb04dda39 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionMetrics.java
@@ -1,147 +1,147 @@
 package pl.allegro.tech.hermes.common.metric;
 
+import static pl.allegro.tech.hermes.common.metric.SubscriptionTagsFactory.subscriptionTags;
+
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
+import java.util.function.ToDoubleFunction;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.HermesHistogram;
 import pl.allegro.tech.hermes.metrics.HermesTimer;
 import pl.allegro.tech.hermes.metrics.counters.HermesCounters;
 
-import java.util.function.ToDoubleFunction;
-
-import static pl.allegro.tech.hermes.common.metric.SubscriptionTagsFactory.subscriptionTags;
-
 public class SubscriptionMetrics {
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-
-    public SubscriptionMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-    }
-
-    public SubscriptionHermesCounter throughputInBytes(SubscriptionName subscription) {
-        return SubscriptionHermesCounter.from(
-                micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_THROUGHPUT, subscription),
-                hermesMetrics.meter(Meters.SUBSCRIPTION_THROUGHPUT_BYTES, subscription.getTopicName(), subscription.getName()),
-                Meters.SUBSCRIPTION_THROUGHPUT_BYTES, subscription);
-    }
-
-    public HermesCounter successes(SubscriptionName subscription) {
-        return size -> {
-            hermesMetrics.meter(Meters.METER).mark(size);
-            hermesMetrics.meter(Meters.TOPIC_METER, subscription.getTopicName()).mark(size);
-            hermesMetrics.meter(Meters.SUBSCRIPTION_METER, subscription.getTopicName(), subscription.getName()).mark(size);
-            hermesMetrics.counter(Counters.DELIVERED, subscription.getTopicName(), subscription.getName()).inc(size);
-            micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_DELIVERED, subscription).increment(size);
-        };
-    }
-
-    public HermesCounter batchSuccesses(SubscriptionName subscription) {
-        return HermesCounters.from(
-                micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_BATCHES, subscription),
-                hermesMetrics.meter(Meters.SUBSCRIPTION_BATCH_METER, subscription.getTopicName(), subscription.getName())
-        );
-    }
-
-    public HermesCounter discarded(SubscriptionName subscription) {
-        return size -> {
-            hermesMetrics.meter(Meters.DISCARDED_METER).mark(size);
-            hermesMetrics.meter(Meters.DISCARDED_TOPIC_METER, subscription.getTopicName()).mark(size);
-            hermesMetrics.meter(Meters.DISCARDED_SUBSCRIPTION_METER, subscription.getTopicName(), subscription.getName()).mark(size);
-            hermesMetrics.counter(Counters.DISCARDED, subscription.getTopicName(), subscription.getName()).inc(size);
-            micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_DISCARDED, subscription).increment(size);
-        };
-    }
-
-    public HermesTimer latency(SubscriptionName subscription) {
-        return HermesTimer.from(
-                meterRegistry.timer(SubscriptionMetricsNames.SUBSCRIPTION_LATENCY, subscriptionTags(subscription)),
-                hermesMetrics.timer(Timers.SUBSCRIPTION_LATENCY, subscription.getTopicName(), subscription.getName())
-        );
-    }
-
-    public <T> void registerInflightGauge(SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
-        hermesMetrics.registerInflightGauge(subscription, () -> (int) f.applyAsDouble(obj));
-        meterRegistry.gauge(SubscriptionMetricsNames.SUBSCRIPTION_INFLIGHT, subscriptionTags(subscription), obj, f);
-    }
-
-    public HermesTimer consumerIdleTimer(SubscriptionName subscription) {
-        return HermesTimer.from(
-                meterRegistry.timer(SubscriptionMetricsNames.SUBSCRIPTION_IDLE_DURATION, subscriptionTags(subscription)),
-                hermesMetrics.timer(Timers.CONSUMER_IDLE_TIME, subscription.getTopicName(), subscription.getName())
-        );
-    }
-
-    public HermesCounter filteredOutCounter(SubscriptionName subscription) {
-        return HermesCounters.from(
-                micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_FILTERED_OUT, subscription),
-                hermesMetrics.meter(Meters.FILTERED_METER, subscription.getTopicName(), subscription.getName())
-        );
-    }
-
-    public HermesCounter httpAnswerCounter(SubscriptionName subscription, int statusCode) {
-        return size -> {
-            meterRegistry.counter(
-                    SubscriptionMetricsNames.SUBSCRIPTION_HTTP_STATUS_CODES,
-                    Tags.concat(subscriptionTags(subscription), "status_code", String.valueOf(statusCode))
-            ).increment(size);
-            hermesMetrics.registerConsumerHttpAnswer(subscription, statusCode, size);
-        };
-    }
-
-    public HermesCounter timeoutsCounter(SubscriptionName subscription) {
-        return HermesCounters.from(
-                micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_TIMEOUTS, subscription),
-                hermesMetrics.consumerErrorsTimeoutMeter(subscription)
-        );
-    }
-
-    public HermesCounter otherErrorsCounter(SubscriptionName subscription) {
-        return HermesCounters.from(
-                micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_OTHER_ERRORS, subscription),
-                hermesMetrics.consumerErrorsOtherMeter(subscription)
-        );
-    }
-
-    public HermesCounter failuresCounter(SubscriptionName subscription) {
-        return HermesCounters.from(
-                micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_FAILURES, subscription),
-                hermesMetrics.meter(Meters.FAILED_METER_SUBSCRIPTION, subscription.getTopicName(), subscription.getName())
-        );
-    }
-
-    public HermesHistogram inflightTimeInMillisHistogram(SubscriptionName subscriptionName) {
-        return value -> {
-            DistributionSummary.builder(SubscriptionMetricsNames.SUBSCRIPTION_INFLIGHT_TIME)
-                    .tags(subscriptionTags(subscriptionName))
-                    .register(meterRegistry)
-                    .record(value / 1000d);
-            hermesMetrics.inflightTimeHistogram(subscriptionName).update(value);
-        };
-    }
-
-    private Counter micrometerCounter(String metricName, SubscriptionName subscription) {
-        return meterRegistry.counter(metricName, subscriptionTags(subscription));
-    }
-
-    public static class SubscriptionMetricsNames {
-        public static final String SUBSCRIPTION_DELIVERED = "subscription.delivered";
-        public static final String SUBSCRIPTION_THROUGHPUT = "subscription.throughput-bytes";
-        public static final String SUBSCRIPTION_BATCHES = "subscription.batches";
-        public static final String SUBSCRIPTION_DISCARDED = "subscription.discarded";
-        public static final String SUBSCRIPTION_LATENCY = "subscription.latency";
-        public static final String SUBSCRIPTION_INFLIGHT = "subscription.inflight";
-        public static final String SUBSCRIPTION_IDLE_DURATION = "subscription.idle-duration";
-        public static final String SUBSCRIPTION_FILTERED_OUT = "subscription.filtered-out";
-        public static final String SUBSCRIPTION_HTTP_STATUS_CODES = "subscription.http-status-codes";
-        public static final String SUBSCRIPTION_TIMEOUTS = "subscription.timeouts";
-        public static final String SUBSCRIPTION_OTHER_ERRORS = "subscription.other-errors";
-        public static final String SUBSCRIPTION_FAILURES = "subscription.failures";
-        public static final String SUBSCRIPTION_INFLIGHT_TIME = "subscription.inflight-time-seconds";
-    }
-
+  private final MeterRegistry meterRegistry;
+
+  public SubscriptionMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
+
+  public SubscriptionHermesCounter throughputInBytes(SubscriptionName subscription) {
+    return SubscriptionHermesCounter.from(
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_THROUGHPUT, subscription),
+        subscription);
+  }
+
+  public HermesCounter successes(SubscriptionName subscription) {
+    return size ->
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_DELIVERED, subscription)
+            .increment(size);
+  }
+
+  public HermesCounter batchSuccesses(SubscriptionName subscription) {
+    return HermesCounters.from(
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_BATCHES, subscription));
+  }
+
+  public HermesCounter discarded(SubscriptionName subscription) {
+    return size ->
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_DISCARDED, subscription)
+            .increment(size);
+  }
+
+  public HermesCounter retries(SubscriptionName subscription) {
+    return size ->
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_RETRIES, subscription)
+            .increment(size);
+  }
+
+  public HermesTimer latency(SubscriptionName subscription) {
+    return HermesTimer.from(
+        meterRegistry.timer(
+            SubscriptionMetricsNames.SUBSCRIPTION_LATENCY, subscriptionTags(subscription)));
+  }
+
+  public HermesTimer rateLimiterAcquire(SubscriptionName subscription) {
+    return HermesTimer.from(
+        meterRegistry.timer(
+            SubscriptionMetricsNames.SUBSCRIPTION_RATE_LIMITER_ACQUIRE,
+            subscriptionTags(subscription)));
+  }
+
+  public <T> void registerInflightGauge(
+      SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge(
+        SubscriptionMetricsNames.SUBSCRIPTION_INFLIGHT, subscriptionTags(subscription), obj, f);
+  }
+
+  public <T> void registerPendingOffsetsGauge(
+      SubscriptionName subscription, T obj, ToDoubleFunction<T> f) {
+    meterRegistry.gauge(
+        SubscriptionMetricsNames.SUBSCRIPTION_PENDING_OFFSETS,
+        subscriptionTags(subscription),
+        obj,
+        f);
+  }
+
+  public HermesTimer consumerIdleTimer(SubscriptionName subscription) {
+    return HermesTimer.from(
+        meterRegistry.timer(
+            SubscriptionMetricsNames.SUBSCRIPTION_IDLE_DURATION, subscriptionTags(subscription)));
+  }
+
+  public HermesCounter filteredOutCounter(SubscriptionName subscription) {
+    return HermesCounters.from(
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_FILTERED_OUT, subscription));
+  }
+
+  public HermesCounter httpAnswerCounter(SubscriptionName subscription, int statusCode) {
+    return size ->
+        meterRegistry
+            .counter(
+                SubscriptionMetricsNames.SUBSCRIPTION_HTTP_STATUS_CODES,
+                Tags.concat(
+                    subscriptionTags(subscription), "status_code", String.valueOf(statusCode)))
+            .increment(size);
+  }
+
+  public HermesCounter timeoutsCounter(SubscriptionName subscription) {
+    return HermesCounters.from(
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_TIMEOUTS, subscription));
+  }
+
+  public HermesCounter otherErrorsCounter(SubscriptionName subscription) {
+    return HermesCounters.from(
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_OTHER_ERRORS, subscription));
+  }
+
+  public HermesCounter failuresCounter(SubscriptionName subscription) {
+    return HermesCounters.from(
+        micrometerCounter(SubscriptionMetricsNames.SUBSCRIPTION_FAILURES, subscription));
+  }
+
+  public HermesHistogram inflightTimeInMillisHistogram(SubscriptionName subscriptionName) {
+    return value ->
+        DistributionSummary.builder(SubscriptionMetricsNames.SUBSCRIPTION_INFLIGHT_TIME)
+            .tags(subscriptionTags(subscriptionName))
+            .register(meterRegistry)
+            .record(value / 1000d);
+  }
+
+  private Counter micrometerCounter(String metricName, SubscriptionName subscription) {
+    return meterRegistry.counter(metricName, subscriptionTags(subscription));
+  }
+
+  public static class SubscriptionMetricsNames {
+    public static final String SUBSCRIPTION_DELIVERED = "subscription.delivered";
+    public static final String SUBSCRIPTION_THROUGHPUT = "subscription.throughput-bytes";
+    public static final String SUBSCRIPTION_BATCHES = "subscription.batches";
+    public static final String SUBSCRIPTION_DISCARDED = "subscription.discarded";
+    public static final String SUBSCRIPTION_RETRIES = "subscription.retries";
+    public static final String SUBSCRIPTION_LATENCY = "subscription.latency";
+    public static final String SUBSCRIPTION_RATE_LIMITER_ACQUIRE =
+        "subscription.rate-limiter-acquire";
+    public static final String SUBSCRIPTION_INFLIGHT = "subscription.inflight";
+    public static final String SUBSCRIPTION_PENDING_OFFSETS = "subscription.pending-offsets";
+    public static final String SUBSCRIPTION_IDLE_DURATION = "subscription.idle-duration";
+    public static final String SUBSCRIPTION_FILTERED_OUT = "subscription.filtered-out";
+    public static final String SUBSCRIPTION_HTTP_STATUS_CODES = "subscription.http-status-codes";
+    public static final String SUBSCRIPTION_TIMEOUTS = "subscription.timeouts";
+    public static final String SUBSCRIPTION_OTHER_ERRORS = "subscription.other-errors";
+    public static final String SUBSCRIPTION_FAILURES = "subscription.failures";
+    public static final String SUBSCRIPTION_INFLIGHT_TIME = "subscription.inflight-time-seconds";
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionTagsFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionTagsFactory.java
index 931e21dc5f..47c8766f0e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionTagsFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/SubscriptionTagsFactory.java
@@ -1,17 +1,15 @@
 package pl.allegro.tech.hermes.common.metric;
 
 import io.micrometer.core.instrument.Tag;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Set;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 class SubscriptionTagsFactory {
 
-    static Set<Tag> subscriptionTags(SubscriptionName subscriptionName) {
-        return Set.of(
-                Tag.of("group", subscriptionName.getTopicName().getGroupName()),
-                Tag.of("topic", subscriptionName.getTopicName().getName()),
-                Tag.of("subscription", subscriptionName.getName())
-        );
-    }
+  static Set<Tag> subscriptionTags(SubscriptionName subscriptionName) {
+    return Set.of(
+        Tag.of("group", subscriptionName.getTopicName().getGroupName()),
+        Tag.of("topic", subscriptionName.getTopicName().getName()),
+        Tag.of("subscription", subscriptionName.getName()));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Timers.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Timers.java
deleted file mode 100644
index 17d3572570..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/Timers.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package pl.allegro.tech.hermes.common.metric;
-
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.GROUP;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.KAFKA_CLUSTER;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.OAUTH_PROVIDER_NAME;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.SCHEMA_REPO_TYPE;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.SUBSCRIPTION;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.TOPIC;
-
-public class Timers {
-
-    public static final String ACK_ALL_BROKER_LATENCY = "ack-all.broker-latency";
-    public static final String ACK_LEADER_BROKER_LATENCY = "ack-leader.broker-latency";
-
-    public static final String ACK_ALL_LATENCY = "ack-all.latency";
-    public static final String ACK_ALL_TOPIC_LATENCY = ACK_ALL_LATENCY + "." + GROUP + "." + TOPIC;
-
-    public static final String ACK_LEADER_LATENCY = "ack-leader.latency";
-    public static final String ACK_LEADER_TOPIC_LATENCY = ACK_LEADER_LATENCY + "." + GROUP + "." + TOPIC;
-
-    public static final String LATENCY = "latency";
-    public static final String SUBSCRIPTION_LATENCY = LATENCY + "." + GROUP + "." + TOPIC + "." + SUBSCRIPTION;
-
-    public static final String SCHEMA = "schema." + SCHEMA_REPO_TYPE;
-    public static final String GET_SCHEMA_LATENCY = SCHEMA + ".get-schema";
-    public static final String GET_SCHEMA_VERSIONS_LATENCY = SCHEMA + ".get-schema-versions";
-
-    public static final String CONSUMER_WORKLOAD_REBALANCE_DURATION = "consumers-workload." + KAFKA_CLUSTER + ".rebalance-duration";
-    public static final String CONSUMER_IDLE_TIME = "idle-time." + GROUP + "." + TOPIC + "." + SUBSCRIPTION;
-
-    public static final String OAUTH_PROVIDER_TOKEN_REQUEST_LATENCY = "oauth.provider." + OAUTH_PROVIDER_NAME + ".token-request-latency";
-}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/TopicMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/TopicMetrics.java
index 1d840e3b5d..f359ff7799 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/TopicMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/TopicMetrics.java
@@ -12,169 +12,132 @@
 import pl.allegro.tech.hermes.metrics.HermesHistogram;
 import pl.allegro.tech.hermes.metrics.HermesTimer;
 import pl.allegro.tech.hermes.metrics.counters.HermesCounters;
-import pl.allegro.tech.hermes.metrics.counters.MeterBackedHermesCounter;
-
-import static pl.allegro.tech.hermes.common.metric.Meters.DELAYED_PROCESSING;
 
 public class TopicMetrics {
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-
-    public TopicMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-    }
-
-    public HermesTimer ackAllGlobalLatency() {
-        return HermesTimer.from(
-                meterRegistry.timer(TopicMetricsNames.TOPIC_ACK_ALL_GLOBAL_LATENCY),
-                hermesMetrics.timer(Timers.ACK_ALL_LATENCY)
-        );
-    }
-
-    public HermesTimer ackAllTopicLatency(TopicName topic) {
-        return HermesTimer.from(
-                micrometerTimer(TopicMetricsNames.TOPIC_ACK_ALL_LATENCY, topic),
-                hermesMetrics.timer(Timers.ACK_ALL_TOPIC_LATENCY, topic));
-    }
-
-    public HermesTimer ackAllBrokerLatency() {
-        return HermesTimer.from(
-                meterRegistry.timer(TopicMetricsNames.TOPIC_ACK_ALL_BROKER_LATENCY),
-                hermesMetrics.timer(Timers.ACK_ALL_BROKER_LATENCY));
-    }
-
-    public HermesTimer ackLeaderGlobalLatency() {
-        return HermesTimer.from(
-                meterRegistry.timer(TopicMetricsNames.TOPIC_ACK_LEADER_GLOBAL_LATENCY),
-                hermesMetrics.timer(Timers.ACK_LEADER_LATENCY));
-    }
-
-    public HermesTimer ackLeaderTopicLatency(TopicName topic) {
-        return HermesTimer.from(
-                micrometerTimer(TopicMetricsNames.TOPIC_ACK_LEADER_LATENCY, topic),
-                hermesMetrics.timer(Timers.ACK_LEADER_TOPIC_LATENCY, topic));
-    }
-
-    public HermesTimer ackLeaderBrokerLatency() {
-        return HermesTimer.from(
-                meterRegistry.timer(TopicMetricsNames.TOPIC_ACK_LEADER_BROKER_LATENCY),
-                hermesMetrics.timer(Timers.ACK_LEADER_BROKER_LATENCY));
-    }
-
-    public MeterBackedHermesCounter topicThroughputBytes(TopicName topicName) {
-        return HermesCounters.from(
-                micrometerCounter(TopicMetricsNames.TOPIC_THROUGHPUT, topicName),
-                hermesMetrics.meter(Meters.TOPIC_THROUGHPUT_BYTES, topicName)
-        );
-    }
-
-    public MeterBackedHermesCounter topicGlobalThroughputBytes() {
-        return HermesCounters.from(
-                meterRegistry.counter(TopicMetricsNames.TOPIC_GLOBAL_THROUGHPUT),
-                hermesMetrics.meter(Meters.THROUGHPUT_BYTES)
-        );
-    }
-
-    public HermesCounter topicPublished(TopicName topicName) {
-        return HermesCounters.from(
-                micrometerCounter(TopicMetricsNames.TOPIC_PUBLISHED, topicName),
-                hermesMetrics.counter(Counters.PUBLISHED, topicName)
-        );
-    }
-
-    public HermesCounter topicGlobalRequestCounter() {
-        return HermesCounters.from(
-                meterRegistry.counter(TopicMetricsNames.TOPIC_GLOBAL_REQUESTS),
-                hermesMetrics.meter(Meters.METER)
-        );
-    }
-
-    public HermesCounter topicRequestCounter(TopicName topicName) {
-        return HermesCounters.from(
-                micrometerCounter(TopicMetricsNames.TOPIC_REQUESTS, topicName),
-                hermesMetrics.meter(Meters.TOPIC_METER, topicName)
-        );
-    }
-
-    public HermesCounter topicGlobalDelayedProcessingCounter() {
-        return HermesCounters.from(
-                meterRegistry.counter(TopicMetricsNames.TOPIC_GLOBAL_DELAYED_PROCESSING),
-                hermesMetrics.meter(DELAYED_PROCESSING)
-        );
-    }
-
-    public HermesCounter topicDelayedProcessingCounter(TopicName topicName) {
-        return HermesCounters.from(
-                micrometerCounter(TopicMetricsNames.TOPIC_DELAYED_PROCESSING, topicName),
-                hermesMetrics.meter(Meters.TOPIC_DELAYED_PROCESSING, topicName)
-        );
-    }
-
-    public HermesCounter topicGlobalHttpStatusCodeCounter(int statusCode) {
-        return HermesCounters.from(
-                meterRegistry.counter(TopicMetricsNames.TOPIC_GLOBAL_HTTP_STATUS_CODES, Tags.of("status_code", String.valueOf(statusCode))),
-                hermesMetrics.httpStatusCodeMeter(statusCode)
-        );
-    }
-
-    public HermesCounter topicHttpStatusCodeCounter(TopicName topicName, int statusCode) {
-        return HermesCounters.from(
-                meterRegistry.counter(TopicMetricsNames.TOPIC_HTTP_STATUS_CODES, topicTags(topicName)
-                        .and("status_code", String.valueOf(statusCode))),
-                hermesMetrics.httpStatusCodeMeter(statusCode, topicName)
-        );
-    }
-
-    public HermesHistogram topicGlobalMessageContentSizeHistogram() {
-        return DefaultHermesHistogram.of(
-                DistributionSummary.builder(TopicMetricsNames.TOPIC_GLOBAL_MESSAGE_SIZE_BYTES)
-                        .register(meterRegistry),
-                hermesMetrics.messageContentSizeHistogram()
-        );
-    }
-
-    public HermesHistogram topicMessageContentSizeHistogram(TopicName topicName) {
-        return DefaultHermesHistogram.of(
-                DistributionSummary.builder(TopicMetricsNames.TOPIC_MESSAGE_SIZE_BYTES)
-                        .tags(topicTags(topicName))
-                        .register(meterRegistry),
-                hermesMetrics.messageContentSizeHistogram(topicName)
-        );
-    }
-
-    private Timer micrometerTimer(String metricName, TopicName topicName) {
-        return meterRegistry.timer(metricName, topicTags(topicName));
-    }
-
-    private Counter micrometerCounter(String metricName, TopicName topicName) {
-        return meterRegistry.counter(metricName, topicTags(topicName));
-    }
-
-    private Tags topicTags(TopicName topicName) {
-        return Tags.of(
-                Tag.of("group", topicName.getGroupName()),
-                Tag.of("topic", topicName.getName())
-        );
-    }
-
-    public static class TopicMetricsNames {
-        public static final String TOPIC_ACK_ALL_GLOBAL_LATENCY = "topic.ack-all.global-latency";
-        public static final String TOPIC_ACK_ALL_LATENCY = "topic.ack-all.latency";
-        public static final String TOPIC_ACK_ALL_BROKER_LATENCY = "topic.ack-all.broker-latency";
-        public static final String TOPIC_ACK_LEADER_GLOBAL_LATENCY = "topic.ack-leader.global-latency";
-        public static final String TOPIC_ACK_LEADER_LATENCY = "topic.ack-leader.latency";
-        public static final String TOPIC_ACK_LEADER_BROKER_LATENCY = "topic.ack-leader.broker-latency";
-        public static final String TOPIC_THROUGHPUT = "topic.throughput-bytes";
-        public static final String TOPIC_GLOBAL_THROUGHPUT = "topic.global-throughput-bytes";
-        public static final String TOPIC_PUBLISHED = "topic.published";
-        public static final String TOPIC_GLOBAL_REQUESTS = "topic.global-requests";
-        public static final String TOPIC_REQUESTS = "topic.requests";
-        public static final String TOPIC_GLOBAL_DELAYED_PROCESSING = "topic-global-delayed-processing";
-        public static final String TOPIC_DELAYED_PROCESSING = "topic-delayed-processing";
-        public static final String TOPIC_GLOBAL_HTTP_STATUS_CODES = "topic-global-http-status-codes";
-        public static final String TOPIC_HTTP_STATUS_CODES = "topic-http-status-codes";
-        public static final String TOPIC_GLOBAL_MESSAGE_SIZE_BYTES = "topic-global-message-size-bytes";
-        public static final String TOPIC_MESSAGE_SIZE_BYTES = "topic-message-size-bytes";
-    }
+  private final MeterRegistry meterRegistry;
+
+  public TopicMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
+
+  public HermesTimer ackAllGlobalLatency() {
+    return HermesTimer.from(meterRegistry.timer(TopicMetricsNames.TOPIC_ACK_ALL_GLOBAL_LATENCY));
+  }
+
+  public HermesTimer ackAllTopicLatency(TopicName topic) {
+    return HermesTimer.from(micrometerTimer(TopicMetricsNames.TOPIC_ACK_ALL_LATENCY, topic));
+  }
+
+  public HermesTimer ackAllBrokerLatency() {
+    return HermesTimer.from(meterRegistry.timer(TopicMetricsNames.TOPIC_ACK_ALL_BROKER_LATENCY));
+  }
+
+  public HermesTimer ackLeaderGlobalLatency() {
+    return HermesTimer.from(meterRegistry.timer(TopicMetricsNames.TOPIC_ACK_LEADER_GLOBAL_LATENCY));
+  }
+
+  public HermesTimer ackLeaderTopicLatency(TopicName topic) {
+    return HermesTimer.from(micrometerTimer(TopicMetricsNames.TOPIC_ACK_LEADER_LATENCY, topic));
+  }
+
+  public HermesTimer ackLeaderBrokerLatency() {
+    return HermesTimer.from(meterRegistry.timer(TopicMetricsNames.TOPIC_ACK_LEADER_BROKER_LATENCY));
+  }
+
+  public HermesCounter topicThroughputBytes(TopicName topicName) {
+    return HermesCounters.from(micrometerCounter(TopicMetricsNames.TOPIC_THROUGHPUT, topicName));
+  }
+
+  public HermesCounter topicGlobalThroughputBytes() {
+    return HermesCounters.from(meterRegistry.counter(TopicMetricsNames.TOPIC_GLOBAL_THROUGHPUT));
+  }
+
+  public HermesCounter topicPublished(TopicName topicName, String datacenter) {
+    return HermesCounters.from(
+        micrometerCounter(
+            TopicMetricsNames.TOPIC_PUBLISHED, topicName, Tag.of("storageDc", datacenter)));
+  }
+
+  public HermesCounter topicGlobalRequestCounter() {
+    return HermesCounters.from(meterRegistry.counter(TopicMetricsNames.TOPIC_GLOBAL_REQUESTS));
+  }
+
+  public HermesCounter topicRequestCounter(TopicName topicName) {
+    return HermesCounters.from(micrometerCounter(TopicMetricsNames.TOPIC_REQUESTS, topicName));
+  }
+
+  public HermesCounter topicGlobalDelayedProcessingCounter() {
+    return HermesCounters.from(
+        meterRegistry.counter(TopicMetricsNames.TOPIC_GLOBAL_DELAYED_PROCESSING));
+  }
+
+  public HermesCounter topicDelayedProcessingCounter(TopicName topicName) {
+    return HermesCounters.from(
+        micrometerCounter(TopicMetricsNames.TOPIC_DELAYED_PROCESSING, topicName));
+  }
+
+  public HermesCounter topicGlobalHttpStatusCodeCounter(int statusCode) {
+    return HermesCounters.from(
+        meterRegistry.counter(
+            TopicMetricsNames.TOPIC_GLOBAL_HTTP_STATUS_CODES,
+            Tags.of("status_code", String.valueOf(statusCode))));
+  }
+
+  public HermesCounter topicHttpStatusCodeCounter(TopicName topicName, int statusCode) {
+    return HermesCounters.from(
+        meterRegistry.counter(
+            TopicMetricsNames.TOPIC_HTTP_STATUS_CODES,
+            topicTags(topicName).and("status_code", String.valueOf(statusCode))));
+  }
+
+  public HermesCounter topicDuplicatedMessageCounter(TopicName topicName) {
+    return HermesCounters.from(
+        micrometerCounter(TopicMetricsNames.TOPIC_DUPLICATED_MESSAGE, topicName));
+  }
+
+  public HermesHistogram topicGlobalMessageContentSizeHistogram() {
+    return DefaultHermesHistogram.of(
+        DistributionSummary.builder(TopicMetricsNames.TOPIC_GLOBAL_MESSAGE_SIZE_BYTES)
+            .register(meterRegistry));
+  }
+
+  public HermesHistogram topicMessageContentSizeHistogram(TopicName topicName) {
+    return DefaultHermesHistogram.of(
+        DistributionSummary.builder(TopicMetricsNames.TOPIC_MESSAGE_SIZE_BYTES)
+            .tags(topicTags(topicName))
+            .register(meterRegistry));
+  }
+
+  private Timer micrometerTimer(String metricName, TopicName topicName) {
+    return meterRegistry.timer(metricName, topicTags(topicName));
+  }
+
+  private Counter micrometerCounter(String metricName, TopicName topicName, Tag... tags) {
+    return meterRegistry.counter(metricName, topicTags(topicName).and(tags));
+  }
+
+  private Tags topicTags(TopicName topicName) {
+    return Tags.of(Tag.of("group", topicName.getGroupName()), Tag.of("topic", topicName.getName()));
+  }
+
+  public static class TopicMetricsNames {
+    public static final String TOPIC_ACK_ALL_GLOBAL_LATENCY = "topic.ack-all.global-latency";
+    public static final String TOPIC_ACK_ALL_LATENCY = "topic.ack-all.latency";
+    public static final String TOPIC_ACK_ALL_BROKER_LATENCY = "topic.ack-all.broker-latency";
+    public static final String TOPIC_ACK_LEADER_GLOBAL_LATENCY = "topic.ack-leader.global-latency";
+    public static final String TOPIC_ACK_LEADER_LATENCY = "topic.ack-leader.latency";
+    public static final String TOPIC_ACK_LEADER_BROKER_LATENCY = "topic.ack-leader.broker-latency";
+    public static final String TOPIC_THROUGHPUT = "topic.throughput-bytes";
+    public static final String TOPIC_GLOBAL_THROUGHPUT = "topic.global-throughput-bytes";
+    public static final String TOPIC_PUBLISHED = "topic.published";
+    public static final String TOPIC_GLOBAL_REQUESTS = "topic.global-requests";
+    public static final String TOPIC_REQUESTS = "topic.requests";
+    public static final String TOPIC_GLOBAL_DELAYED_PROCESSING = "topic-global-delayed-processing";
+    public static final String TOPIC_DELAYED_PROCESSING = "topic-delayed-processing";
+    public static final String TOPIC_GLOBAL_HTTP_STATUS_CODES = "topic-global-http-status-codes";
+    public static final String TOPIC_HTTP_STATUS_CODES = "topic-http-status-codes";
+    public static final String TOPIC_GLOBAL_MESSAGE_SIZE_BYTES = "topic-global-message-size-bytes";
+    public static final String TOPIC_MESSAGE_SIZE_BYTES = "topic-message-size-bytes";
+    public static final String TOPIC_DUPLICATED_MESSAGE = "topic-duplicated-message";
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/TrackerElasticSearchMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/TrackerElasticSearchMetrics.java
index b9643f5a30..139700391a 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/TrackerElasticSearchMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/TrackerElasticSearchMetrics.java
@@ -1,82 +1,51 @@
 package pl.allegro.tech.hermes.common.metric;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import pl.allegro.tech.hermes.metrics.HermesTimer;
-
 import java.util.function.ToDoubleFunction;
-
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.HOSTNAME;
+import pl.allegro.tech.hermes.metrics.HermesTimer;
 
 public class TrackerElasticSearchMetrics {
-    private final MeterRegistry meterRegistry;
-    private final HermesMetrics hermesMetrics;
-    private final GaugeRegistrar gaugeRegistrar;
-
-    public TrackerElasticSearchMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-        this.hermesMetrics = hermesMetrics;
-        this.gaugeRegistrar = new GaugeRegistrar(meterRegistry, hermesMetrics);
-    }
-
-    public <T> void registerProducerTrackerElasticSearchQueueSizeGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                Gauges.Graphite.PRODUCER_TRACKER_ELASTICSEARCH_QUEUE_SIZE,
-                Gauges.Prometheus.TRACKER_ELASTICSEARCH_QUEUE_SIZE,
-                stateObj, f
-        );
-    }
-
-    public <T> void registerProducerTrackerElasticSearchRemainingCapacity(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                Gauges.Graphite.PRODUCER_TRACKER_ELASTICSEARCH_REMAINING_CAPACITY,
-                Gauges.Prometheus.TRACKER_ELASTICSEARCH_REMAINING_CAPACITY,
-                stateObj, f
-        );
-    }
-
-    public <T> void registerConsumerTrackerElasticSearchQueueSizeGauge(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                Gauges.Graphite.CONSUMER_TRACKER_ELASTICSEARCH_QUEUE_SIZE,
-                Gauges.Prometheus.TRACKER_ELASTICSEARCH_QUEUE_SIZE,
-                stateObj, f
-        );
-    }
-
-    public <T> void registerConsumerTrackerElasticSearchRemainingCapacity(T stateObj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                Gauges.Graphite.CONSUMER_TRACKER_ELASTICSEARCH_REMAINING_CAPACITY,
-                Gauges.Prometheus.TRACKER_ELASTICSEARCH_REMAINING_CAPACITY,
-                stateObj, f
-        );
-    }
-
-    public HermesTimer trackerElasticSearchCommitLatencyTimer() {
-        return HermesTimer.from(
-                meterRegistry.timer(Timers.ELASTICSEARCH_COMMIT_LATENCY),
-                hermesMetrics.timer(Timers.ELASTICSEARCH_COMMIT_LATENCY)
-        );
-    }
-
-    private static class Gauges {
-        private static class Graphite {
-            public static final String PRODUCER_TRACKER_ELASTICSEARCH_QUEUE_SIZE =
-                    "producer." + HOSTNAME + ".tracker.elasticsearch.queue-size";
-            public static final String PRODUCER_TRACKER_ELASTICSEARCH_REMAINING_CAPACITY =
-                    "producer." + HOSTNAME + ".tracker.elasticsearch.remaining-capacity";
-
-            public static final String CONSUMER_TRACKER_ELASTICSEARCH_QUEUE_SIZE =
-                    "consumer." + HOSTNAME + ".tracker.elasticsearch.queue-size";
-            public static final String CONSUMER_TRACKER_ELASTICSEARCH_REMAINING_CAPACITY =
-                    "consumer." + HOSTNAME + ".tracker.elasticsearch.remaining-capacity";
-        }
-
-        private static class Prometheus {
-            public static final String TRACKER_ELASTICSEARCH_QUEUE_SIZE = "tracker.elasticsearch.queue-size";
-            public static final String TRACKER_ELASTICSEARCH_REMAINING_CAPACITY = "tracker.elasticsearch.remaining-capacity";
-        }
-    }
-
-    private static class Timers {
-        public static final String ELASTICSEARCH_COMMIT_LATENCY = "tracker.elasticsearch.commit-latency";
-    }
+  private final MeterRegistry meterRegistry;
+  private final GaugeRegistrar gaugeRegistrar;
+
+  public TrackerElasticSearchMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+    this.gaugeRegistrar = new GaugeRegistrar(meterRegistry);
+  }
+
+  public <T> void registerProducerTrackerElasticSearchQueueSizeGauge(
+      T stateObj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(Gauges.TRACKER_ELASTICSEARCH_QUEUE_SIZE, stateObj, f);
+  }
+
+  public <T> void registerProducerTrackerElasticSearchRemainingCapacity(
+      T stateObj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(Gauges.TRACKER_ELASTICSEARCH_REMAINING_CAPACITY, stateObj, f);
+  }
+
+  public <T> void registerConsumerTrackerElasticSearchQueueSizeGauge(
+      T stateObj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(Gauges.TRACKER_ELASTICSEARCH_QUEUE_SIZE, stateObj, f);
+  }
+
+  public <T> void registerConsumerTrackerElasticSearchRemainingCapacity(
+      T stateObj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(Gauges.TRACKER_ELASTICSEARCH_REMAINING_CAPACITY, stateObj, f);
+  }
+
+  public HermesTimer trackerElasticSearchCommitLatencyTimer() {
+    return HermesTimer.from(meterRegistry.timer(Timers.ELASTICSEARCH_COMMIT_LATENCY));
+  }
+
+  private static class Gauges {
+    public static final String TRACKER_ELASTICSEARCH_QUEUE_SIZE =
+        "tracker.elasticsearch.queue-size";
+    public static final String TRACKER_ELASTICSEARCH_REMAINING_CAPACITY =
+        "tracker.elasticsearch.remaining-capacity";
+  }
+
+  private static class Timers {
+    public static final String ELASTICSEARCH_COMMIT_LATENCY =
+        "tracker.elasticsearch.commit-latency";
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/UndeliveredMessagesMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/UndeliveredMessagesMetrics.java
index ca4edaa24e..0148d9ef57 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/UndeliveredMessagesMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/UndeliveredMessagesMetrics.java
@@ -7,30 +7,20 @@
 import pl.allegro.tech.hermes.metrics.HermesHistogram;
 import pl.allegro.tech.hermes.metrics.counters.HermesCounters;
 
-import static pl.allegro.tech.hermes.common.metric.Histograms.PERSISTED_UNDELIVERED_MESSAGE_SIZE;
-import static pl.allegro.tech.hermes.common.metric.Meters.PERSISTED_UNDELIVERED_MESSAGES_METER;
-
 public class UndeliveredMessagesMetrics {
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
+  private final MeterRegistry meterRegistry;
 
-    public UndeliveredMessagesMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-    }
+  public UndeliveredMessagesMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
 
-    public HermesCounter undeliveredMessagesCounter() {
-        return HermesCounters.from(
-                meterRegistry.counter("undelivered-messages.persisted"),
-                hermesMetrics.meter(PERSISTED_UNDELIVERED_MESSAGES_METER)
-        );
-    }
+  public HermesCounter undeliveredMessagesCounter() {
+    return HermesCounters.from(meterRegistry.counter("undelivered-messages.persisted"));
+  }
 
-    public HermesHistogram undeliveredMessagesSizeHistogram() {
-        return DefaultHermesHistogram.of(
-                DistributionSummary.builder("undelivered-messages.persisted.message-size.bytes")
-                        .register(meterRegistry),
-                hermesMetrics.histogram(PERSISTED_UNDELIVERED_MESSAGE_SIZE)
-        );
-    }
+  public HermesHistogram undeliveredMessagesSizeHistogram() {
+    return DefaultHermesHistogram.of(
+        DistributionSummary.builder("undelivered-messages.persisted.message-size.bytes")
+            .register(meterRegistry));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/WorkloadMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/WorkloadMetrics.java
index 7c2e840d0f..fd14858968 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/WorkloadMetrics.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/WorkloadMetrics.java
@@ -4,173 +4,109 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.search.Search;
-import pl.allegro.tech.hermes.metrics.HermesTimer;
-
 import java.util.Collection;
 import java.util.Set;
 import java.util.function.ToDoubleFunction;
+import pl.allegro.tech.hermes.metrics.HermesTimer;
 
 public class WorkloadMetrics {
 
-    private static final String CONSUMER_ID_TAG = "consumer-id";
-    private static final String KAFKA_CLUSTER_TAG = "kafka-cluster";
-    private static final String METRICS_PREFIX = "consumer-workload.weighted.";
-    private static final String CONSUMER_ID_PLACEHOLDER = "$consumerId";
-    private static final String CURRENT_SCORE = METRICS_PREFIX + CONSUMER_ID_PLACEHOLDER + ".current-score";
-    private static final String PROPOSED_SCORE = METRICS_PREFIX + CONSUMER_ID_PLACEHOLDER + ".proposed-score";
-    private static final String SCORING_ERROR = METRICS_PREFIX + CONSUMER_ID_PLACEHOLDER + ".error";
-    private static final String CURRENT_WEIGHT_OPS = METRICS_PREFIX + CONSUMER_ID_PLACEHOLDER + ".current-weight.ops";
-    private static final String PROPOSED_WEIGHT_OPS = METRICS_PREFIX + CONSUMER_ID_PLACEHOLDER + ".proposed-weight.ops";
-
-    private final HermesMetrics hermesMetrics;
-    private final MeterRegistry meterRegistry;
-    private final GaugeRegistrar gaugeRegistrar;
-
-    WorkloadMetrics(HermesMetrics hermesMetrics, MeterRegistry meterRegistry) {
-        this.hermesMetrics = hermesMetrics;
-        this.meterRegistry = meterRegistry;
-        this.gaugeRegistrar = new GaugeRegistrar(meterRegistry, hermesMetrics);
-    }
-
-    public <T> void registerAllAssignmentsGauge(T obj, String kafkaCluster, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                "consumers-workload." + kafkaCluster + ".all-assignments",
-                "workload.all-assignments",
-                obj,
-                f,
-                Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster)
-        );
-    }
-
-    public <T> void registerMissingResourcesGauge(T obj, String kafkaCluster, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                "consumers-workload." + kafkaCluster + ".missing-resources",
-                "workload.missing-resources",
-                obj,
-                f,
-                Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster)
-        );
-    }
-
-    public <T> void registerDeletedAssignmentsGauge(T obj, String kafkaCluster, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                "consumers-workload." + kafkaCluster + ".deleted-assignments",
-                "workload.deleted-assignments",
-                obj,
-                f,
-                Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster)
-        );
-    }
-
-    public <T> void registerCreatedAssignmentsGauge(T obj, String kafkaCluster, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                "consumers-workload." + kafkaCluster + ".created-assignments",
-                "workload.created-assignments",
-                obj,
-                f,
-                Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster)
-        );
-    }
-
-    public HermesTimer rebalanceDurationTimer(String kafkaCluster) {
-        return HermesTimer.from(
-                meterRegistry.timer("workload.rebalance-duration", Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster)),
-                hermesMetrics.consumersWorkloadRebalanceDurationTimer(kafkaCluster)
-        );
-    }
-
-    public <T> void registerRunningSubscriptionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge("consumers-workload.monitor.running", "workload.subscriptions.running", obj, f);
-    }
-
-    public <T> void registerAssignedSubscriptionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge("consumers-workload.monitor.assigned", "workload.subscriptions.assigned", obj, f);
-    }
-
-    public <T> void registerMissingSubscriptionsGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge("consumers-workload.monitor.missing", "workload.subscriptions.missing", obj, f);
-    }
-
-    public <T> void registerOversubscribedGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge("consumers-workload.monitor.oversubscribed", "workload.subscriptions.oversubscribed", obj, f);
-    }
-
-    public <T> void registerOperationsPerSecondGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge("consumer-workload.weighted.load.ops", "workload.weighted.ops", obj, f);
-    }
-
-    public <T> void registerCpuUtilizationGauge(T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge("consumer-workload.weighted.load.cpu-utilization", "workload.weighted.cpu-utilization", obj, f);
-    }
-
-    public <T> void registerCurrentScoreGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                buildFullGraphiteMetricPath(CURRENT_SCORE, consumerId),
-                "workload.weighted.current-score",
-                obj,
-                f,
-                Tags.of(CONSUMER_ID_TAG, consumerId)
-        );
-    }
-
-    public <T> void registerProposedErrorGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                buildFullGraphiteMetricPath(PROPOSED_SCORE, consumerId),
-                "workload.weighted.proposed-error",
-                obj,
-                f,
-                Tags.of(CONSUMER_ID_TAG, consumerId)
-        );
-    }
-
-    public <T> void registerScoringErrorGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                buildFullGraphiteMetricPath(SCORING_ERROR, consumerId),
-                "workload.weighted.scoring-error",
-                obj,
-                f,
-                Tags.of(CONSUMER_ID_TAG, consumerId)
-        );
-    }
-
-    public <T> void registerCurrentWeightGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                buildFullGraphiteMetricPath(CURRENT_WEIGHT_OPS, consumerId),
-                "workload.weighted.current-weight.ops",
-                obj,
-                f,
-                Tags.of(CONSUMER_ID_TAG, consumerId)
-        );
-    }
-
-    public <T> void registerProposedWeightGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
-        gaugeRegistrar.registerGauge(
-                buildFullGraphiteMetricPath(PROPOSED_WEIGHT_OPS, consumerId),
-                "workload.weighted.proposed-weight.ops",
-                obj,
-                f,
-                Tags.of(CONSUMER_ID_TAG, consumerId)
-        );
-    }
-
-    public void unregisterAllWorkloadWeightedGaugesForConsumerIds(Set<String> consumerIds) {
-        Collection<Gauge> gauges = Search.in(meterRegistry)
-                .tag(CONSUMER_ID_TAG, consumerIds::contains)
-                .name(s -> s.startsWith("workload.weighted"))
-                .gauges();
-        for (Gauge gauge : gauges) {
-            meterRegistry.remove(gauge);
-        }
-        for (String consumerId : consumerIds) {
-            hermesMetrics.unregister(buildFullGraphiteMetricPath(CURRENT_SCORE, consumerId));
-            hermesMetrics.unregister(buildFullGraphiteMetricPath(PROPOSED_SCORE, consumerId));
-            hermesMetrics.unregister(buildFullGraphiteMetricPath(SCORING_ERROR, consumerId));
-            hermesMetrics.unregister(buildFullGraphiteMetricPath(CURRENT_WEIGHT_OPS, consumerId));
-            hermesMetrics.unregister(buildFullGraphiteMetricPath(PROPOSED_WEIGHT_OPS, consumerId));
-        }
-    }
-
-    private String buildFullGraphiteMetricPath(String metric, String consumerId) {
-        return metric.replace(CONSUMER_ID_PLACEHOLDER, HermesMetrics.escapeDots(consumerId));
-    }
+  private static final String CONSUMER_ID_TAG = "consumer-id";
+  private static final String KAFKA_CLUSTER_TAG = "kafka-cluster";
+
+  private final MeterRegistry meterRegistry;
+  private final GaugeRegistrar gaugeRegistrar;
+
+  WorkloadMetrics(MeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+    this.gaugeRegistrar = new GaugeRegistrar(meterRegistry);
+  }
+
+  public <T> void registerAllAssignmentsGauge(T obj, String kafkaCluster, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.all-assignments", obj, f, Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster));
+  }
+
+  public <T> void registerMissingResourcesGauge(T obj, String kafkaCluster, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.missing-resources", obj, f, Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster));
+  }
+
+  public <T> void registerDeletedAssignmentsGauge(
+      T obj, String kafkaCluster, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.deleted-assignments", obj, f, Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster));
+  }
+
+  public <T> void registerCreatedAssignmentsGauge(
+      T obj, String kafkaCluster, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.created-assignments", obj, f, Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster));
+  }
+
+  public HermesTimer rebalanceDurationTimer(String kafkaCluster) {
+    return HermesTimer.from(
+        meterRegistry.timer(
+            "workload.rebalance-duration", Tags.of(KAFKA_CLUSTER_TAG, kafkaCluster)));
+  }
+
+  public <T> void registerRunningSubscriptionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("workload.subscriptions.running", obj, f);
+  }
+
+  public <T> void registerAssignedSubscriptionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("workload.subscriptions.assigned", obj, f);
+  }
+
+  public <T> void registerMissingSubscriptionsGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("workload.subscriptions.missing", obj, f);
+  }
+
+  public <T> void registerOversubscribedGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("workload.subscriptions.oversubscribed", obj, f);
+  }
+
+  public <T> void registerOperationsPerSecondGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("workload.weighted.ops", obj, f);
+  }
+
+  public <T> void registerCpuUtilizationGauge(T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge("workload.weighted.cpu-utilization", obj, f);
+  }
+
+  public <T> void registerCurrentScoreGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.weighted.current-score", obj, f, Tags.of(CONSUMER_ID_TAG, consumerId));
+  }
+
+  public <T> void registerProposedErrorGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.weighted.proposed-error", obj, f, Tags.of(CONSUMER_ID_TAG, consumerId));
+  }
+
+  public <T> void registerScoringErrorGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.weighted.scoring-error", obj, f, Tags.of(CONSUMER_ID_TAG, consumerId));
+  }
+
+  public <T> void registerCurrentWeightGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.weighted.current-weight.ops", obj, f, Tags.of(CONSUMER_ID_TAG, consumerId));
+  }
+
+  public <T> void registerProposedWeightGauge(String consumerId, T obj, ToDoubleFunction<T> f) {
+    gaugeRegistrar.registerGauge(
+        "workload.weighted.proposed-weight.ops", obj, f, Tags.of(CONSUMER_ID_TAG, consumerId));
+  }
+
+  public void unregisterAllWorkloadWeightedGaugesForConsumerIds(Set<String> consumerIds) {
+    Collection<Gauge> gauges =
+        Search.in(meterRegistry)
+            .tag(CONSUMER_ID_TAG, consumerIds::contains)
+            .name(s -> s.startsWith("workload.weighted"))
+            .gauges();
+    for (Gauge gauge : gauges) {
+      meterRegistry.remove(gauge);
+    }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/CounterStorage.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/CounterStorage.java
index 5ab6c4a078..59da3018e7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/CounterStorage.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/CounterStorage.java
@@ -4,17 +4,17 @@
 
 public interface CounterStorage {
 
-    void setTopicPublishedCounter(TopicName topicName, long count);
+  void setTopicPublishedCounter(TopicName topicName, long count);
 
-    void setSubscriptionDeliveredCounter(TopicName topicName, String subscriptionName, long count);
+  void setSubscriptionDeliveredCounter(TopicName topicName, String subscriptionName, long count);
 
-    long getTopicPublishedCounter(TopicName topicName);
+  long getTopicPublishedCounter(TopicName topicName);
 
-    long getSubscriptionDeliveredCounter(TopicName topicName, String subscriptionName);
+  long getSubscriptionDeliveredCounter(TopicName topicName, String subscriptionName);
 
-    void setSubscriptionDiscardedCounter(TopicName topicName, String subscription, long value);
+  void setSubscriptionDiscardedCounter(TopicName topicName, String subscription, long value);
 
-    void incrementVolumeCounter(TopicName topicName, String subscriptionName, long value);
+  void incrementVolumeCounter(TopicName topicName, String subscriptionName, long value);
 
-    void incrementVolumeCounter(TopicName topicName, long value);
+  void incrementVolumeCounter(TopicName topicName, long value);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/MetricsDeltaCalculator.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/MetricsDeltaCalculator.java
index ddaa73ed36..073ba0e2a9 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/MetricsDeltaCalculator.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/MetricsDeltaCalculator.java
@@ -4,31 +4,32 @@
 import java.util.concurrent.ConcurrentMap;
 
 /**
- * Small util to calculate delta between previous and current state of metric. It helps in developing incremental metric storage, as Metrics
- * always wants to push current state of Metric, not increment.
+ * Small util to calculate delta between previous and current state of metric. It helps in
+ * developing incremental metric storage, as Metrics always wants to push current state of Metric,
+ * not increment.
  */
 public class MetricsDeltaCalculator {
 
-    private final ConcurrentMap<String, Long> previousValues = new ConcurrentHashMap<>();
+  private final ConcurrentMap<String, Long> previousValues = new ConcurrentHashMap<>();
 
-    public long calculateDelta(String metricName, Long currentValue) {
-        Long previousValue = previousValues.put(metricName, currentValue);
+  public long calculateDelta(String metricName, Long currentValue) {
+    Long previousValue = previousValues.put(metricName, currentValue);
 
-        long delta = currentValue;
-        if (previousValue != null) {
-            delta = currentValue - previousValue;
-        }
-        return delta;
+    long delta = currentValue;
+    if (previousValue != null) {
+      delta = currentValue - previousValue;
     }
+    return delta;
+  }
 
-    public void revertDelta(String metricName, Long delta) {
-        Long previousValue = previousValues.get(metricName);
-        if (previousValue != null) {
-            previousValues.put(metricName, previousValue - delta);
-        }
+  public void revertDelta(String metricName, Long delta) {
+    Long previousValue = previousValues.get(metricName);
+    if (previousValue != null) {
+      previousValues.put(metricName, previousValue - delta);
     }
+  }
 
-    public void clear() {
-        previousValues.clear();
-    }
+  public void clear() {
+    previousValues.clear();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/CounterMatcher.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/CounterMatcher.java
index 7e52b5186b..cc096a488c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/CounterMatcher.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/CounterMatcher.java
@@ -1,92 +1,94 @@
 package pl.allegro.tech.hermes.common.metric.counter.zookeeper;
 
-import io.micrometer.core.instrument.Counter;
-import pl.allegro.tech.hermes.api.TopicName;
-
-import java.util.Optional;
-
 import static pl.allegro.tech.hermes.common.metric.SubscriptionMetrics.SubscriptionMetricsNames;
 import static pl.allegro.tech.hermes.common.metric.TopicMetrics.TopicMetricsNames;
 
-class CounterMatcher {
-
-    private static final String GROUP_TAG_NAME = "group";
-    private static final String TOPIC_TAG_NAME = "topic";
-    private static final String SUBSCRIPTION_TAG_NAME = "subscription";
+import io.micrometer.core.instrument.Counter;
+import java.util.Optional;
+import pl.allegro.tech.hermes.api.TopicName;
 
-    private final Counter counter;
-    private final String metricSearchPrefix;
-    private TopicName topicName;
-    private long value;
-    private Optional<String> subscription;
+class CounterMatcher {
 
-    public CounterMatcher(Counter counter, String metricSearchPrefix) {
-        this.counter = counter;
-        this.metricSearchPrefix = metricSearchPrefix;
-        parseCounter(this.counter);
+  private static final String GROUP_TAG_NAME = "group";
+  private static final String TOPIC_TAG_NAME = "topic";
+  private static final String SUBSCRIPTION_TAG_NAME = "subscription";
+
+  private final Counter counter;
+  private final String metricSearchPrefix;
+  private TopicName topicName;
+  private long value;
+  private Optional<String> subscription;
+
+  public CounterMatcher(Counter counter, String metricSearchPrefix) {
+    this.counter = counter;
+    this.metricSearchPrefix = metricSearchPrefix;
+    parseCounter(this.counter);
+  }
+
+  private void parseCounter(Counter counter) {
+    if (isTopicPublished() || isTopicThroughput()) {
+      topicName =
+          new TopicName(
+              counter.getId().getTag(GROUP_TAG_NAME), counter.getId().getTag(TOPIC_TAG_NAME));
+      subscription = Optional.empty();
+    } else if (isSubscriptionDelivered()
+        || isSubscriptionThroughput()
+        || isSubscriptionDiscarded()
+        || isSubscriptionFiltered()) {
+      topicName =
+          new TopicName(
+              counter.getId().getTag(GROUP_TAG_NAME), counter.getId().getTag(TOPIC_TAG_NAME));
+      subscription = Optional.of(counter.getId().getTag(SUBSCRIPTION_TAG_NAME));
     }
+    value = (long) counter.count();
+  }
 
-    private void parseCounter(Counter counter) {
-        if (isTopicPublished() || isTopicThroughput()) {
-            topicName = new TopicName(counter.getId().getTag(GROUP_TAG_NAME), counter.getId().getTag(TOPIC_TAG_NAME));
-            subscription = Optional.empty();
-        } else if (
-                isSubscriptionDelivered()
-                        || isSubscriptionThroughput()
-                        || isSubscriptionDiscarded()
-                        || isSubscriptionFiltered()
-        ) {
-            topicName = new TopicName(counter.getId().getTag(GROUP_TAG_NAME), counter.getId().getTag(TOPIC_TAG_NAME));
-            subscription = Optional.of(counter.getId().getTag(SUBSCRIPTION_TAG_NAME));
-        }
-        value = (long) counter.count();
-    }
+  public boolean isTopicPublished() {
+    return isTopicCounter() && nameEquals(TopicMetricsNames.TOPIC_PUBLISHED);
+  }
 
-    public boolean isTopicPublished() {
-        return isTopicCounter() && nameEquals(TopicMetricsNames.TOPIC_PUBLISHED);
-    }
+  public boolean isTopicThroughput() {
+    return isTopicCounter() && nameEquals(TopicMetricsNames.TOPIC_THROUGHPUT);
+  }
 
-    public boolean isTopicThroughput() {
-        return isTopicCounter() && nameEquals(TopicMetricsNames.TOPIC_THROUGHPUT);
-    }
-
-    public boolean isSubscriptionThroughput() {
-        return isSubscriptionCounter() && nameEquals(SubscriptionMetricsNames.SUBSCRIPTION_THROUGHPUT);
-    }
+  public boolean isSubscriptionThroughput() {
+    return isSubscriptionCounter() && nameEquals(SubscriptionMetricsNames.SUBSCRIPTION_THROUGHPUT);
+  }
 
-    public boolean isSubscriptionDelivered() {
-        return isSubscriptionCounter() && nameEquals(SubscriptionMetricsNames.SUBSCRIPTION_DELIVERED);
-    }
+  public boolean isSubscriptionDelivered() {
+    return isSubscriptionCounter() && nameEquals(SubscriptionMetricsNames.SUBSCRIPTION_DELIVERED);
+  }
 
-    public boolean isSubscriptionDiscarded() {
-        return isSubscriptionCounter() && nameEquals(SubscriptionMetricsNames.SUBSCRIPTION_DISCARDED);
-    }
+  public boolean isSubscriptionDiscarded() {
+    return isSubscriptionCounter() && nameEquals(SubscriptionMetricsNames.SUBSCRIPTION_DISCARDED);
+  }
 
-    public boolean isSubscriptionFiltered() {
-        return isSubscriptionCounter() && nameEquals(SubscriptionMetricsNames.SUBSCRIPTION_FILTERED_OUT);
-    }
+  public boolean isSubscriptionFiltered() {
+    return isSubscriptionCounter()
+        && nameEquals(SubscriptionMetricsNames.SUBSCRIPTION_FILTERED_OUT);
+  }
 
-    public TopicName getTopicName() {
-        return topicName;
-    }
+  public TopicName getTopicName() {
+    return topicName;
+  }
 
-    public String getSubscriptionName() {
-        return subscription.orElse("");
-    }
+  public String getSubscriptionName() {
+    return subscription.orElse("");
+  }
 
-    public long getValue() {
-        return value;
-    }
+  public long getValue() {
+    return value;
+  }
 
-    private boolean isTopicCounter() {
-        return counter.getId().getTag(TOPIC_TAG_NAME) != null;
-    }
+  private boolean isTopicCounter() {
+    return counter.getId().getTag(TOPIC_TAG_NAME) != null;
+  }
 
-    private boolean isSubscriptionCounter() {
-        return counter.getId().getTag(SUBSCRIPTION_TAG_NAME) != null;
-    }
+  private boolean isSubscriptionCounter() {
+    return counter.getId().getTag(SUBSCRIPTION_TAG_NAME) != null;
+  }
 
-    private boolean nameEquals(String name) {
-        return counter.getId().getName().equals(metricSearchPrefix + name);
-    }
+  private boolean nameEquals(String name) {
+    return counter.getId().getName().equals(metricSearchPrefix + name);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterReporter.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterReporter.java
index c66efdc640..5d31f60e7c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterReporter.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterReporter.java
@@ -4,103 +4,94 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.search.Search;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
-import pl.allegro.tech.hermes.common.metric.counter.CounterStorage;
-
 import java.util.Collection;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.common.metric.counter.CounterStorage;
+import pl.allegro.tech.hermes.metrics.PathsCompiler;
 
 public class ZookeeperCounterReporter {
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperCounterReporter.class);
+  private static final Logger logger = LoggerFactory.getLogger(ZookeeperCounterReporter.class);
 
-    private final CounterStorage counterStorage;
-    private final String metricsSearchPrefix;
-    private final MeterRegistry meterRegistry;
+  private final CounterStorage counterStorage;
+  private final String metricsSearchPrefix;
+  private final MeterRegistry meterRegistry;
 
-    private final ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(
-            new ThreadFactoryBuilder()
-                    .setNameFormat("zookeeper-reporter-scheduled-executor-%d")
-                    .setDaemon(true)
-                    .build());
+  private final ScheduledExecutorService scheduledExecutorService =
+      Executors.newSingleThreadScheduledExecutor(
+          new ThreadFactoryBuilder()
+              .setNameFormat("zookeeper-reporter-scheduled-executor-%d")
+              .setDaemon(true)
+              .build());
 
-    public ZookeeperCounterReporter(MeterRegistry registry,
-                                    CounterStorage counterStorage,
-                                    String metricsSearchPrefix) {
-        this.meterRegistry = registry;
-        this.counterStorage = counterStorage;
-        this.metricsSearchPrefix = metricsSearchPrefix;
-    }
+  public ZookeeperCounterReporter(
+      MeterRegistry registry, CounterStorage counterStorage, String metricsSearchPrefix) {
+    this.meterRegistry = registry;
+    this.counterStorage = counterStorage;
+    this.metricsSearchPrefix = metricsSearchPrefix;
+  }
 
-    public void start(long period, TimeUnit unit) {
-        scheduledExecutorService.scheduleWithFixedDelay(this::report, 0, period, unit);
-    }
+  public void start(long period, TimeUnit unit) {
+    scheduledExecutorService.scheduleWithFixedDelay(this::report, 0, period, unit);
+  }
 
-    public void report() {
-        try {
-            Collection<Counter> counters = Search.in(meterRegistry).counters();
-            counters.forEach(counter -> {
-                CounterMatcher matcher = new CounterMatcher(counter, metricsSearchPrefix);
-                reportCounter(matcher);
-                reportVolumeCounter(matcher);
-            });
-        } catch (RuntimeException ex) {
-            logger.error("Error during reporting metrics to Zookeeper...", ex);
-        }
+  public void report() {
+    try {
+      Collection<Counter> counters = Search.in(meterRegistry).counters();
+      counters.forEach(
+          counter -> {
+            CounterMatcher matcher = new CounterMatcher(counter, metricsSearchPrefix);
+            reportCounter(matcher);
+            reportVolumeCounter(matcher);
+          });
+    } catch (RuntimeException ex) {
+      logger.error("Error during reporting metrics to Zookeeper...", ex);
     }
+  }
 
-    private void reportVolumeCounter(CounterMatcher matcher) {
-        if (matcher.isTopicThroughput()) {
-            counterStorage.incrementVolumeCounter(
-                    escapedTopicName(matcher.getTopicName()),
-                    matcher.getValue()
-            );
-        } else if (matcher.isSubscriptionThroughput()) {
-            counterStorage.incrementVolumeCounter(
-                    escapedTopicName(matcher.getTopicName()),
-                    escapeMetricsReplacementChar(matcher.getSubscriptionName()),
-                    matcher.getValue()
-            );
-        }
+  private void reportVolumeCounter(CounterMatcher matcher) {
+    if (matcher.isTopicThroughput()) {
+      counterStorage.incrementVolumeCounter(
+          escapedTopicName(matcher.getTopicName()), matcher.getValue());
+    } else if (matcher.isSubscriptionThroughput()) {
+      counterStorage.incrementVolumeCounter(
+          escapedTopicName(matcher.getTopicName()),
+          escapeMetricsReplacementChar(matcher.getSubscriptionName()),
+          matcher.getValue());
     }
+  }
 
-    private void reportCounter(CounterMatcher matcher) {
-        if (matcher.getValue() == 0) {
-            return;
-        }
-
-        if (matcher.isTopicPublished()) {
-            counterStorage.setTopicPublishedCounter(
-                    escapedTopicName(matcher.getTopicName()),
-                    matcher.getValue()
-            );
-        } else if (matcher.isSubscriptionDelivered()) {
-            counterStorage.setSubscriptionDeliveredCounter(
-                    escapedTopicName(matcher.getTopicName()),
-                    escapeMetricsReplacementChar(matcher.getSubscriptionName()),
-                    matcher.getValue()
-            );
-        } else if (matcher.isSubscriptionDiscarded()) {
-            counterStorage.setSubscriptionDiscardedCounter(
-                    escapedTopicName(matcher.getTopicName()),
-                    escapeMetricsReplacementChar(matcher.getSubscriptionName()),
-                    matcher.getValue()
-            );
-        }
+  private void reportCounter(CounterMatcher matcher) {
+    if (matcher.getValue() == 0) {
+      return;
     }
 
-    private static TopicName escapedTopicName(TopicName topicName) {
-        return new TopicName(
-                escapeMetricsReplacementChar(topicName.getGroupName()),
-                topicName.getName()
-        );
+    if (matcher.isTopicPublished()) {
+      counterStorage.setTopicPublishedCounter(
+          escapedTopicName(matcher.getTopicName()), matcher.getValue());
+    } else if (matcher.isSubscriptionDelivered()) {
+      counterStorage.setSubscriptionDeliveredCounter(
+          escapedTopicName(matcher.getTopicName()),
+          escapeMetricsReplacementChar(matcher.getSubscriptionName()),
+          matcher.getValue());
+    } else if (matcher.isSubscriptionDiscarded()) {
+      counterStorage.setSubscriptionDiscardedCounter(
+          escapedTopicName(matcher.getTopicName()),
+          escapeMetricsReplacementChar(matcher.getSubscriptionName()),
+          matcher.getValue());
     }
+  }
 
-    private static String escapeMetricsReplacementChar(String value) {
-        return value.replaceAll(HermesMetrics.REPLACEMENT_CHAR, "\\.");
-    }
+  private static TopicName escapedTopicName(TopicName topicName) {
+    return new TopicName(
+        escapeMetricsReplacementChar(topicName.getGroupName()), topicName.getName());
+  }
+
+  private static String escapeMetricsReplacementChar(String value) {
+    return value.replaceAll(PathsCompiler.REPLACEMENT_CHAR, "\\.");
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterStorage.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterStorage.java
index aae7619a1a..c5624c7624 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterStorage.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterStorage.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.common.metric.counter.zookeeper;
 
+import static pl.allegro.tech.hermes.metrics.PathContext.pathContext;
+import static pl.allegro.tech.hermes.metrics.PathsCompiler.GROUP;
+import static pl.allegro.tech.hermes.metrics.PathsCompiler.SUBSCRIPTION;
+import static pl.allegro.tech.hermes.metrics.PathsCompiler.TOPIC;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.TopicName;
@@ -11,131 +16,163 @@
 import pl.allegro.tech.hermes.metrics.PathContext;
 import pl.allegro.tech.hermes.metrics.PathsCompiler;
 
-import static pl.allegro.tech.hermes.metrics.PathContext.pathContext;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.GROUP;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.SUBSCRIPTION;
-import static pl.allegro.tech.hermes.metrics.PathsCompiler.TOPIC;
-
 public class ZookeeperCounterStorage implements CounterStorage {
 
-    static final String TOPIC_PUBLISHED = "/groups/" + GROUP + "/topics/" + TOPIC + "/metrics/published";
-    static final String TOPIC_VOLUME_COUNTER = "/groups/" + GROUP + "/topics/" + TOPIC + "/metrics/volume";
-    static final String SUBSCRIPTION_DELIVERED =
-            "/groups/" + GROUP + "/topics/" + TOPIC + "/subscriptions/" + SUBSCRIPTION + "/metrics/delivered";
-    static final String SUBSCRIPTION_DISCARDED =
-            "/groups/" + GROUP + "/topics/" + TOPIC + "/subscriptions/" + SUBSCRIPTION + "/metrics/discarded";
-    static final String SUBSCRIPTION_VOLUME_COUNTER =
-            "/groups/" + GROUP + "/topics/" + TOPIC + "/subscriptions/" + SUBSCRIPTION + "/metrics/volume";
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ZookeeperCounterStorage.class);
-
-    private final MetricsDeltaCalculator deltaCalculator = new MetricsDeltaCalculator();
-    private final SharedCounter sharedCounter;
-
-    private final SubscriptionRepository subscriptionRepository;
-    private final PathsCompiler pathsCompiler;
-    private final String zookeeperRoot;
-
-    public ZookeeperCounterStorage(SharedCounter sharedCounter,
-                                   SubscriptionRepository subscriptionRepository,
-                                   PathsCompiler pathsCompiler,
-                                   String zookeeperRoot) {
-        this.sharedCounter = sharedCounter;
-        this.subscriptionRepository = subscriptionRepository;
-        this.pathsCompiler = pathsCompiler;
-        this.zookeeperRoot = zookeeperRoot;
-
-    }
-
-    @Override
-    public void setTopicPublishedCounter(TopicName topicName, long count) {
-        String topicPublishedCounter = topicPublishedCounter(topicName);
-        incrementSharedCounter(topicPublishedCounter, count);
-    }
-
-    @Override
-    public long getTopicPublishedCounter(TopicName topicName) {
-        return sharedCounter.getValue(topicPublishedCounter(topicName));
-    }
-
-    @Override
-    public long getSubscriptionDeliveredCounter(TopicName topicName, String subscriptionName) {
-        return sharedCounter.getValue(subscriptionDeliveredCounter(topicName, subscriptionName));
-    }
-
-    @Override
-    public void setSubscriptionDeliveredCounter(TopicName topicName, String subscriptionName, long count) {
-        try {
-            subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
-            incrementSharedCounter(subscriptionDeliveredCounter(topicName, subscriptionName), count);
-        } catch (SubscriptionNotExistsException e) {
-            LOGGER.debug("Trying to report metric on not existing subscription {} {}", topicName, subscriptionName);
-        }
-    }
-
-    @Override
-    public void setSubscriptionDiscardedCounter(TopicName topicName, String subscriptionName, long count) {
-        try {
-            subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
-            incrementSharedCounter(subscriptionDiscardedCounter(topicName, subscriptionName), count);
-        } catch (SubscriptionNotExistsException e) {
-            LOGGER.debug("Trying to report metric on not existing subscription {} {}", topicName, subscriptionName);
-        }
-    }
-
-    @Override
-    public void incrementVolumeCounter(TopicName topicName, String subscriptionName, long value) {
-        try {
-            subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
-            incrementSharedCounter(volumeCounterPath(topicName, subscriptionName), value);
-        } catch (SubscriptionNotExistsException e) {
-            LOGGER.debug("Trying to report metric on not existing subscription {} {}", topicName, subscriptionName);
-        }
-    }
-
-    @Override
-    public void incrementVolumeCounter(TopicName topicName, long value) {
-        incrementSharedCounter(topicVolumeCounter(topicName), value);
-    }
-
-    private void incrementSharedCounter(String metricPath, long count) {
-        long delta = deltaCalculator.calculateDelta(metricPath, count);
-
-        if (delta != 0 && !sharedCounter.increment(metricPath, delta)) {
-            deltaCalculator.revertDelta(metricPath, delta);
-        }
-    }
-
-    private String topicPublishedCounter(TopicName topicName) {
-        PathContext pathContext = pathContext().withGroup(topicName.getGroupName()).withTopic(topicName.getName()).build();
-        return pathsCompiler.compile(appendRootPath(TOPIC_PUBLISHED), pathContext);
-    }
-
-    private String subscriptionDeliveredCounter(TopicName topicName, String subscriptionName) {
-        PathContext pathContext = subscriptionPathContext(topicName, subscriptionName);
-        return pathsCompiler.compile(appendRootPath(SUBSCRIPTION_DELIVERED), pathContext);
-    }
-
-    private String subscriptionDiscardedCounter(TopicName topicName, String subscriptionName) {
-        PathContext pathContext = subscriptionPathContext(topicName, subscriptionName);
-        return pathsCompiler.compile(appendRootPath(SUBSCRIPTION_DISCARDED), pathContext);
-    }
-
-    private String volumeCounterPath(TopicName topicName, String subscriptionName) {
-        PathContext pathContext = subscriptionPathContext(topicName, subscriptionName);
-        return pathsCompiler.compile(appendRootPath(SUBSCRIPTION_VOLUME_COUNTER), pathContext);
-    }
-
-    private String topicVolumeCounter(TopicName topicName) {
-        PathContext pathContext = pathContext().withGroup(topicName.getGroupName()).withTopic(topicName.getName()).build();
-        return pathsCompiler.compile(appendRootPath(TOPIC_VOLUME_COUNTER), pathContext);
-    }
-
-    private PathContext subscriptionPathContext(TopicName topicName, String subscriptionName) {
-        return pathContext().withGroup(topicName.getGroupName()).withTopic(topicName.getName()).withSubscription(subscriptionName).build();
-    }
-
-    private String appendRootPath(String path) {
-        return zookeeperRoot + path;
-    }
+  static final String TOPIC_PUBLISHED =
+      "/groups/" + GROUP + "/topics/" + TOPIC + "/metrics/published";
+  static final String TOPIC_VOLUME_COUNTER =
+      "/groups/" + GROUP + "/topics/" + TOPIC + "/metrics/volume";
+  static final String SUBSCRIPTION_DELIVERED =
+      "/groups/"
+          + GROUP
+          + "/topics/"
+          + TOPIC
+          + "/subscriptions/"
+          + SUBSCRIPTION
+          + "/metrics/delivered";
+  static final String SUBSCRIPTION_DISCARDED =
+      "/groups/"
+          + GROUP
+          + "/topics/"
+          + TOPIC
+          + "/subscriptions/"
+          + SUBSCRIPTION
+          + "/metrics/discarded";
+  static final String SUBSCRIPTION_VOLUME_COUNTER =
+      "/groups/"
+          + GROUP
+          + "/topics/"
+          + TOPIC
+          + "/subscriptions/"
+          + SUBSCRIPTION
+          + "/metrics/volume";
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(ZookeeperCounterStorage.class);
+
+  private final MetricsDeltaCalculator deltaCalculator = new MetricsDeltaCalculator();
+  private final SharedCounter sharedCounter;
+
+  private final SubscriptionRepository subscriptionRepository;
+  private final PathsCompiler pathsCompiler;
+  private final String zookeeperRoot;
+
+  public ZookeeperCounterStorage(
+      SharedCounter sharedCounter,
+      SubscriptionRepository subscriptionRepository,
+      PathsCompiler pathsCompiler,
+      String zookeeperRoot) {
+    this.sharedCounter = sharedCounter;
+    this.subscriptionRepository = subscriptionRepository;
+    this.pathsCompiler = pathsCompiler;
+    this.zookeeperRoot = zookeeperRoot;
+  }
+
+  @Override
+  public void setTopicPublishedCounter(TopicName topicName, long count) {
+    String topicPublishedCounter = topicPublishedCounter(topicName);
+    incrementSharedCounter(topicPublishedCounter, count);
+  }
+
+  @Override
+  public long getTopicPublishedCounter(TopicName topicName) {
+    return sharedCounter.getValue(topicPublishedCounter(topicName));
+  }
+
+  @Override
+  public long getSubscriptionDeliveredCounter(TopicName topicName, String subscriptionName) {
+    return sharedCounter.getValue(subscriptionDeliveredCounter(topicName, subscriptionName));
+  }
+
+  @Override
+  public void setSubscriptionDeliveredCounter(
+      TopicName topicName, String subscriptionName, long count) {
+    try {
+      subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
+      incrementSharedCounter(subscriptionDeliveredCounter(topicName, subscriptionName), count);
+    } catch (SubscriptionNotExistsException e) {
+      LOGGER.debug(
+          "Trying to report metric on not existing subscription {} {}",
+          topicName,
+          subscriptionName);
+    }
+  }
+
+  @Override
+  public void setSubscriptionDiscardedCounter(
+      TopicName topicName, String subscriptionName, long count) {
+    try {
+      subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
+      incrementSharedCounter(subscriptionDiscardedCounter(topicName, subscriptionName), count);
+    } catch (SubscriptionNotExistsException e) {
+      LOGGER.debug(
+          "Trying to report metric on not existing subscription {} {}",
+          topicName,
+          subscriptionName);
+    }
+  }
+
+  @Override
+  public void incrementVolumeCounter(TopicName topicName, String subscriptionName, long value) {
+    try {
+      subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
+      incrementSharedCounter(volumeCounterPath(topicName, subscriptionName), value);
+    } catch (SubscriptionNotExistsException e) {
+      LOGGER.debug(
+          "Trying to report metric on not existing subscription {} {}",
+          topicName,
+          subscriptionName);
+    }
+  }
+
+  @Override
+  public void incrementVolumeCounter(TopicName topicName, long value) {
+    incrementSharedCounter(topicVolumeCounter(topicName), value);
+  }
+
+  private void incrementSharedCounter(String metricPath, long count) {
+    long delta = deltaCalculator.calculateDelta(metricPath, count);
+
+    if (delta != 0 && !sharedCounter.increment(metricPath, delta)) {
+      deltaCalculator.revertDelta(metricPath, delta);
+    }
+  }
+
+  private String topicPublishedCounter(TopicName topicName) {
+    PathContext pathContext =
+        pathContext().withGroup(topicName.getGroupName()).withTopic(topicName.getName()).build();
+    return pathsCompiler.compile(appendRootPath(TOPIC_PUBLISHED), pathContext);
+  }
+
+  private String subscriptionDeliveredCounter(TopicName topicName, String subscriptionName) {
+    PathContext pathContext = subscriptionPathContext(topicName, subscriptionName);
+    return pathsCompiler.compile(appendRootPath(SUBSCRIPTION_DELIVERED), pathContext);
+  }
+
+  private String subscriptionDiscardedCounter(TopicName topicName, String subscriptionName) {
+    PathContext pathContext = subscriptionPathContext(topicName, subscriptionName);
+    return pathsCompiler.compile(appendRootPath(SUBSCRIPTION_DISCARDED), pathContext);
+  }
+
+  private String volumeCounterPath(TopicName topicName, String subscriptionName) {
+    PathContext pathContext = subscriptionPathContext(topicName, subscriptionName);
+    return pathsCompiler.compile(appendRootPath(SUBSCRIPTION_VOLUME_COUNTER), pathContext);
+  }
+
+  private String topicVolumeCounter(TopicName topicName) {
+    PathContext pathContext =
+        pathContext().withGroup(topicName.getGroupName()).withTopic(topicName.getName()).build();
+    return pathsCompiler.compile(appendRootPath(TOPIC_VOLUME_COUNTER), pathContext);
+  }
+
+  private PathContext subscriptionPathContext(TopicName topicName, String subscriptionName) {
+    return pathContext()
+        .withGroup(topicName.getGroupName())
+        .withTopic(topicName.getName())
+        .withSubscription(subscriptionName)
+        .build();
+  }
+
+  private String appendRootPath(String path) {
+    return zookeeperRoot + path;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/executor/InstrumentedExecutorServiceFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/executor/InstrumentedExecutorServiceFactory.java
index a9b03796b3..91a83c82e1 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/executor/InstrumentedExecutorServiceFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/executor/InstrumentedExecutorServiceFactory.java
@@ -1,7 +1,6 @@
 package pl.allegro.tech.hermes.common.metric.executor;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;
@@ -10,71 +9,90 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 
 public class InstrumentedExecutorServiceFactory {
 
-    private final ThreadPoolMetrics threadPoolMetrics;
-    private final RejectedExecutionHandler rejectedExecutionHandler = new ThreadPoolExecutor.AbortPolicy();
-
-    public InstrumentedExecutorServiceFactory(ThreadPoolMetrics threadPoolMetrics) {
-        this.threadPoolMetrics = threadPoolMetrics;
+  private final MetricsFacade metricsFacade;
+  private final RejectedExecutionHandler rejectedExecutionHandler =
+      new ThreadPoolExecutor.AbortPolicy();
+
+  public InstrumentedExecutorServiceFactory(MetricsFacade metricsFacade) {
+    this.metricsFacade = metricsFacade;
+  }
+
+  public ExecutorService getExecutorService(String name, int size, boolean monitoringEnabled) {
+    return getExecutorService(name, size, monitoringEnabled, Integer.MAX_VALUE);
+  }
+
+  public ExecutorService getExecutorService(
+      String name, int size, boolean monitoringEnabled, int queueCapacity) {
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat(name + "-executor-%d").build();
+    ThreadPoolExecutor executor = newFixedThreadPool(name, size, threadFactory, queueCapacity);
+    executor.prestartAllCoreThreads();
+
+    return monitoringEnabled ? monitor(name, executor) : executor;
+  }
+
+  public class ScheduledExecutorServiceBuilder {
+    final String name;
+    final int size;
+    boolean monitoringEnabled = false;
+    boolean removeOnCancel = false;
+
+    public ScheduledExecutorServiceBuilder(String name, int size) {
+      this.name = name;
+      this.size = size;
     }
 
-    public ExecutorService getExecutorService(String name, int size, boolean monitoringEnabled) {
-        ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat(name + "-executor-%d").build();
-        ThreadPoolExecutor executor = newFixedThreadPool(name, size, threadFactory);
-        executor.prestartAllCoreThreads();
-
-        if (monitoringEnabled) {
-            monitor(name, executor);
-        }
-
-        return executor;
-    }
-
-    public ScheduledExecutorService getScheduledExecutorService(
-            String name, int size, boolean monitoringEnabled
-    ) {
-
-        ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat(name + "-scheduled-executor-%d").build();
-
-        ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(size, threadFactory);
-
-        if (monitoringEnabled) {
-            monitor(name, executor);
-        }
-
-        return executor;
+    public ScheduledExecutorServiceBuilder withMonitoringEnabled(boolean monitoringEnabled) {
+      this.monitoringEnabled = monitoringEnabled;
+      return this;
     }
 
-    private void monitor(String threadPoolName, ThreadPoolExecutor executor) {
-        threadPoolMetrics.createGauges(threadPoolName, executor);
+    public ScheduledExecutorServiceBuilder withRemoveOnCancel(boolean removeOnCancel) {
+      this.removeOnCancel = removeOnCancel;
+      return this;
     }
 
-
-    /**
-     * Copy of {@link java.util.concurrent.Executors#newFixedThreadPool(int, java.util.concurrent.ThreadFactory)}.
-     */
-    private ThreadPoolExecutor newFixedThreadPool(String executorName, int size, ThreadFactory threadFactory) {
-        ThreadPoolExecutor executor = new ThreadPoolExecutor(
-                size,
-                size,
-                0L,
-                TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<>(),
-                threadFactory,
-                getMeteredRejectedExecutionHandler(executorName)
-        );
-
-        return executor;
-
+    public ScheduledExecutorService create() {
+      ThreadFactory threadFactory =
+          new ThreadFactoryBuilder().setNameFormat(name + "-scheduled-executor-%d").build();
+      ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(size, threadFactory);
+      executor.setRemoveOnCancelPolicy(removeOnCancel);
+      return monitoringEnabled ? monitor(name, executor) : executor;
     }
 
-    RejectedExecutionHandler getMeteredRejectedExecutionHandler(String executorName) {
-        return (r, executor) -> {
-            threadPoolMetrics.markRequestRejected(executorName);
-            rejectedExecutionHandler.rejectedExecution(r, executor);
-        };
+    private ScheduledExecutorService monitor(
+        String threadPoolName, ScheduledExecutorService executor) {
+      return metricsFacade.executor().monitor(executor, threadPoolName);
     }
-
+  }
+
+  public ScheduledExecutorServiceBuilder scheduledExecutorBuilder(String name, int size) {
+    return new ScheduledExecutorServiceBuilder(name, size);
+  }
+
+  private ExecutorService monitor(String threadPoolName, ExecutorService executor) {
+    return metricsFacade.executor().monitor(executor, threadPoolName);
+  }
+
+  /**
+   * Copy of {@link java.util.concurrent.Executors#newFixedThreadPool(int,
+   * java.util.concurrent.ThreadFactory)} with configurable queue capacity.
+   */
+  private ThreadPoolExecutor newFixedThreadPool(
+      String executorName, int size, ThreadFactory threadFactory, int queueCapacity) {
+    ThreadPoolExecutor executor =
+        new ThreadPoolExecutor(
+            size,
+            size,
+            0L,
+            TimeUnit.MILLISECONDS,
+            new LinkedBlockingQueue<>(queueCapacity),
+            threadFactory,
+            rejectedExecutionHandler);
+    return executor;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/executor/ThreadPoolMetrics.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/executor/ThreadPoolMetrics.java
deleted file mode 100644
index 200d0d8fcb..0000000000
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/executor/ThreadPoolMetrics.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package pl.allegro.tech.hermes.common.metric.executor;
-
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-
-import java.util.concurrent.ThreadPoolExecutor;
-
-public class ThreadPoolMetrics {
-
-    private final MetricsFacade metricsFacade;
-
-    public ThreadPoolMetrics(MetricsFacade metricsFacade) {
-        this.metricsFacade = metricsFacade;
-    }
-
-    public void createGauges(
-            String executorName,
-            ThreadPoolExecutor executor) {
-
-        metricsFacade.executor().registerThreadPoolCapacity(executorName, executor, ThreadPoolExecutor::getPoolSize);
-        metricsFacade.executor().registerThreadPoolActiveThreads(executorName, executor, ThreadPoolExecutor::getActiveCount);
-        metricsFacade.executor().registerThreadPoolUtilization(executorName, executor,
-                e -> (double) e.getActiveCount() / (double) e.getPoolSize()
-        );
-        metricsFacade.executor().registerThreadPoolTaskQueueCapacity(executorName, executor,
-                e -> {
-                    int qCapacity = e.getQueue().size() + e.getQueue().remainingCapacity();
-                    // overflow in case of unbounded queue, set queueCapacity to Integer.MAX_VALUE
-                    return qCapacity < 0 ? Integer.MAX_VALUE : qCapacity;
-                });
-        metricsFacade.executor().registerThreadPoolTaskQueued(executorName, executor, e -> e.getQueue().size());
-        metricsFacade.executor().registerThreadPoolTaskQueueUtilization(executorName, executor,
-                e -> {
-                    int calculatedCapacity = e.getQueue().size() + e.getQueue().remainingCapacity();
-                    int queueCapacity = calculatedCapacity < 0 ? Integer.MAX_VALUE : calculatedCapacity;
-                    return (double) e.getQueue().size() / (double) queueCapacity;
-                });
-    }
-
-    public void markRequestRejected(String executorName) {
-        metricsFacade.executor().incrementRequestRejectedCounter(executorName);
-    }
-
-}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/timer/StartedTimersPair.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/timer/StartedTimersPair.java
index aa26a97bc1..44f7ac7505 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/timer/StartedTimersPair.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/metric/timer/StartedTimersPair.java
@@ -1,22 +1,21 @@
 package pl.allegro.tech.hermes.common.metric.timer;
 
-import pl.allegro.tech.hermes.metrics.HermesTimerContext;
-
 import java.io.Closeable;
+import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 
 public class StartedTimersPair implements Closeable {
 
-    private final HermesTimerContext time1;
-    private final HermesTimerContext time2;
+  private final HermesTimerContext time1;
+  private final HermesTimerContext time2;
 
-    public StartedTimersPair(HermesTimerContext timer1, HermesTimerContext timer2) {
-        time1 = timer1;
-        time2 = timer2;
-    }
+  public StartedTimersPair(HermesTimerContext timer1, HermesTimerContext timer2) {
+    time1 = timer1;
+    time2 = timer2;
+  }
 
-    @Override
-    public void close() {
-        time1.close();
-        time2.close();
-    }
+  @Override
+  public void close() {
+    time1.close();
+    time2.close();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/AvroCompiledSchemaRepositoryFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/AvroCompiledSchemaRepositoryFactory.java
index a3e8a49fe7..abccb0da34 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/AvroCompiledSchemaRepositoryFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/AvroCompiledSchemaRepositoryFactory.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.common.schema;
 
+import java.time.Duration;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.schema.CachedCompiledSchemaRepository;
 import pl.allegro.tech.hermes.schema.CompiledSchemaRepository;
@@ -7,35 +8,33 @@
 import pl.allegro.tech.hermes.schema.RawSchemaClient;
 import pl.allegro.tech.hermes.schema.SchemaCompilersFactory;
 
-import java.time.Duration;
-
 public class AvroCompiledSchemaRepositoryFactory {
 
-    private final RawSchemaClient rawSchemaClient;
-    private final int maximumSize;
-    private final Duration expireAfterAccess;
-    private final boolean cacheEnabled;
+  private final RawSchemaClient rawSchemaClient;
+  private final int maximumSize;
+  private final Duration expireAfterAccess;
+  private final boolean cacheEnabled;
 
-    public AvroCompiledSchemaRepositoryFactory(RawSchemaClient rawSchemaClient,
-                                               int maximumSize,
-                                               Duration expireAfterAccess,
-                                               boolean cacheEnabled) {
-        this.rawSchemaClient = rawSchemaClient;
-        this.maximumSize = maximumSize;
-        this.expireAfterAccess = expireAfterAccess;
-        this.cacheEnabled = cacheEnabled;
-    }
+  public AvroCompiledSchemaRepositoryFactory(
+      RawSchemaClient rawSchemaClient,
+      int maximumSize,
+      Duration expireAfterAccess,
+      boolean cacheEnabled) {
+    this.rawSchemaClient = rawSchemaClient;
+    this.maximumSize = maximumSize;
+    this.expireAfterAccess = expireAfterAccess;
+    this.cacheEnabled = cacheEnabled;
+  }
 
-    public CompiledSchemaRepository<Schema> provide() {
-        CompiledSchemaRepository<Schema> repository = new DirectCompiledSchemaRepository<>(rawSchemaClient,
-                SchemaCompilersFactory.avroSchemaCompiler());
+  public CompiledSchemaRepository<Schema> provide() {
+    CompiledSchemaRepository<Schema> repository =
+        new DirectCompiledSchemaRepository<>(
+            rawSchemaClient, SchemaCompilersFactory.avroSchemaCompiler());
 
-        if (cacheEnabled) {
-            return new CachedCompiledSchemaRepository<>(repository,
-                    maximumSize,
-                    expireAfterAccess);
-        } else {
-            return repository;
-        }
+    if (cacheEnabled) {
+      return new CachedCompiledSchemaRepository<>(repository, maximumSize, expireAfterAccess);
+    } else {
+      return repository;
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/RawSchemaClientFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/RawSchemaClientFactory.java
index e4bf8933cc..a6fd3b015d 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/RawSchemaClientFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/RawSchemaClientFactory.java
@@ -1,7 +1,6 @@
 package pl.allegro.tech.hermes.common.schema;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.schema.RawSchemaClient;
 import pl.allegro.tech.hermes.schema.SubjectNamingStrategy;
@@ -10,46 +9,43 @@
 
 public class RawSchemaClientFactory {
 
-    private final String kafkaNamespace;
-    private final String kafkaNamespaceSeparator;
-    private final MetricsFacade metricsFacade;
-    private final ObjectMapper objectMapper;
-    private final SchemaRepositoryInstanceResolver resolver;
-    private final boolean subjectSuffixEnabled;
-    private final boolean subjectNamespaceEnabled;
+  private final String kafkaNamespace;
+  private final String kafkaNamespaceSeparator;
+  private final MetricsFacade metricsFacade;
+  private final ObjectMapper objectMapper;
+  private final SchemaRepositoryInstanceResolver resolver;
+  private final boolean subjectSuffixEnabled;
+  private final boolean subjectNamespaceEnabled;
 
-    public RawSchemaClientFactory(String kafkaNamespace,
-                                  String kafkaNamespaceSeparator,
-                                  MetricsFacade metricsFacade,
-                                  ObjectMapper objectMapper,
-                                  SchemaRepositoryInstanceResolver resolver,
-                                  boolean subjectSuffixEnabled,
-                                  boolean subjectNamespaceEnabled) {
-        this.kafkaNamespace = kafkaNamespace;
-        this.kafkaNamespaceSeparator = kafkaNamespaceSeparator;
-        this.metricsFacade = metricsFacade;
-        this.objectMapper = objectMapper;
-        this.resolver = resolver;
-        this.subjectSuffixEnabled = subjectSuffixEnabled;
-        this.subjectNamespaceEnabled = subjectNamespaceEnabled;
-    }
+  public RawSchemaClientFactory(
+      String kafkaNamespace,
+      String kafkaNamespaceSeparator,
+      MetricsFacade metricsFacade,
+      ObjectMapper objectMapper,
+      SchemaRepositoryInstanceResolver resolver,
+      boolean subjectSuffixEnabled,
+      boolean subjectNamespaceEnabled) {
+    this.kafkaNamespace = kafkaNamespace;
+    this.kafkaNamespaceSeparator = kafkaNamespaceSeparator;
+    this.metricsFacade = metricsFacade;
+    this.objectMapper = objectMapper;
+    this.resolver = resolver;
+    this.subjectSuffixEnabled = subjectSuffixEnabled;
+    this.subjectNamespaceEnabled = subjectNamespaceEnabled;
+  }
 
-    public RawSchemaClient provide() {
-        SubjectNamingStrategy subjectNamingStrategy = SubjectNamingStrategy.qualifiedName
-                .withValueSuffixIf(subjectSuffixEnabled)
-                .withNamespacePrefixIf(
-                        subjectNamespaceEnabled,
-                        new SubjectNamingStrategy.Namespace(
-                                kafkaNamespace,
-                                kafkaNamespaceSeparator
-                        )
-                );
-        return createMetricsTrackingClient(
-                new SchemaRegistryRawSchemaClient(resolver, objectMapper, subjectNamingStrategy)
-        );
-    }
+  public RawSchemaClient provide() {
+    SubjectNamingStrategy subjectNamingStrategy =
+        SubjectNamingStrategy.qualifiedName
+            .withValueSuffixIf(subjectSuffixEnabled)
+            .withNamespacePrefixIf(
+                subjectNamespaceEnabled,
+                new SubjectNamingStrategy.Namespace(kafkaNamespace, kafkaNamespaceSeparator));
+    return createMetricsTrackingClient(
+        new SchemaRegistryRawSchemaClient(resolver, objectMapper, subjectNamingStrategy));
+  }
 
-    private RawSchemaClient createMetricsTrackingClient(RawSchemaClient rawSchemaClient) {
-        return new ReadMetricsTrackingRawSchemaClient(rawSchemaClient, metricsFacade);
-    }
+  private RawSchemaClient createMetricsTrackingClient(RawSchemaClient rawSchemaClient) {
+    return new ReadMetricsTrackingRawSchemaClient(rawSchemaClient, metricsFacade);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/ReadMetricsTrackingRawSchemaClient.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/ReadMetricsTrackingRawSchemaClient.java
index 10b792c9c7..0b699d4654 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/ReadMetricsTrackingRawSchemaClient.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/ReadMetricsTrackingRawSchemaClient.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.common.schema;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
 import pl.allegro.tech.hermes.api.RawSchema;
 import pl.allegro.tech.hermes.api.RawSchemaWithMetadata;
 import pl.allegro.tech.hermes.api.TopicName;
@@ -10,67 +13,64 @@
 import pl.allegro.tech.hermes.schema.SchemaId;
 import pl.allegro.tech.hermes.schema.SchemaVersion;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Supplier;
-
 public class ReadMetricsTrackingRawSchemaClient implements RawSchemaClient {
-    private final RawSchemaClient rawSchemaClient;
-    private final MetricsFacade metricsFacade;
+  private final RawSchemaClient rawSchemaClient;
+  private final MetricsFacade metricsFacade;
 
-    public ReadMetricsTrackingRawSchemaClient(
-            RawSchemaClient rawSchemaClient,
-            MetricsFacade metricsFacade) {
-        this.rawSchemaClient = rawSchemaClient;
-        this.metricsFacade = metricsFacade;
-    }
+  public ReadMetricsTrackingRawSchemaClient(
+      RawSchemaClient rawSchemaClient, MetricsFacade metricsFacade) {
+    this.rawSchemaClient = rawSchemaClient;
+    this.metricsFacade = metricsFacade;
+  }
 
-    @Override
-    public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaVersion version) {
-        return timedSchema(() -> rawSchemaClient.getRawSchemaWithMetadata(topic, version));
-    }
+  @Override
+  public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(
+      TopicName topic, SchemaVersion version) {
+    return timedSchema(() -> rawSchemaClient.getRawSchemaWithMetadata(topic, version));
+  }
 
-    @Override
-    public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaId schemaId) {
-        return timedSchema(() -> rawSchemaClient.getRawSchemaWithMetadata(topic, schemaId));
-    }
+  @Override
+  public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(
+      TopicName topic, SchemaId schemaId) {
+    return timedSchema(() -> rawSchemaClient.getRawSchemaWithMetadata(topic, schemaId));
+  }
 
-    @Override
-    public Optional<RawSchemaWithMetadata> getLatestRawSchemaWithMetadata(TopicName topic) {
-        return timedSchema(() -> rawSchemaClient.getLatestRawSchemaWithMetadata(topic));
-    }
+  @Override
+  public Optional<RawSchemaWithMetadata> getLatestRawSchemaWithMetadata(TopicName topic) {
+    return timedSchema(() -> rawSchemaClient.getLatestRawSchemaWithMetadata(topic));
+  }
 
-    @Override
-    public List<SchemaVersion> getVersions(TopicName topic) {
-        return timedVersions(() -> rawSchemaClient.getVersions(topic));
-    }
+  @Override
+  public List<SchemaVersion> getVersions(TopicName topic) {
+    return timedVersions(() -> rawSchemaClient.getVersions(topic));
+  }
 
-    @Override
-    public void registerSchema(TopicName topic, RawSchema rawSchema) {
-        rawSchemaClient.registerSchema(topic, rawSchema);
-    }
+  @Override
+  public void registerSchema(TopicName topic, RawSchema rawSchema) {
+    rawSchemaClient.registerSchema(topic, rawSchema);
+  }
 
-    @Override
-    public void deleteAllSchemaVersions(TopicName topic) {
-        rawSchemaClient.deleteAllSchemaVersions(topic);
-    }
+  @Override
+  public void deleteAllSchemaVersions(TopicName topic) {
+    rawSchemaClient.deleteAllSchemaVersions(topic);
+  }
 
-    @Override
-    public void validateSchema(TopicName topic, RawSchema rawSchema) {
-        rawSchemaClient.validateSchema(topic, rawSchema);
-    }
+  @Override
+  public void validateSchema(TopicName topic, RawSchema rawSchema) {
+    rawSchemaClient.validateSchema(topic, rawSchema);
+  }
 
-    private <T> T timedSchema(Supplier<? extends T> callable) {
-        return timed(callable, metricsFacade.schemaClient().schemaTimer());
-    }
+  private <T> T timedSchema(Supplier<? extends T> callable) {
+    return timed(callable, metricsFacade.schemaClient().schemaTimer());
+  }
 
-    private <T> T timedVersions(Supplier<? extends T> callable) {
-        return timed(callable, metricsFacade.schemaClient().versionsTimer());
-    }
+  private <T> T timedVersions(Supplier<? extends T> callable) {
+    return timed(callable, metricsFacade.schemaClient().versionsTimer());
+  }
 
-    private <T> T timed(Supplier<? extends T> callable, HermesTimer timer) {
-        try (HermesTimerContext time = timer.time()) {
-            return callable.get();
-        }
+  private <T> T timed(Supplier<? extends T> callable, HermesTimer timer) {
+    try (HermesTimerContext time = timer.time()) {
+      return callable.get();
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaCacheRefresherCallback.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaCacheRefresherCallback.java
index b59baf0c0c..f44d109ac7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaCacheRefresherCallback.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaCacheRefresherCallback.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.common.schema;
 
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.ContentType;
@@ -11,57 +12,61 @@
 import pl.allegro.tech.hermes.schema.SchemaVersion;
 import pl.allegro.tech.hermes.schema.SchemaVersionsResult;
 
-import java.util.List;
-
 class SchemaCacheRefresherCallback<T> implements TopicCallback {
 
-    private static final Logger logger = LoggerFactory.getLogger(SchemaVersionsRepositoryFactory.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(SchemaVersionsRepositoryFactory.class);
 
-    public static final boolean REFRESH_ONLINE = true;
+  public static final boolean REFRESH_ONLINE = true;
 
-    private final CachedSchemaVersionsRepository schemaVersionsRepository;
-    private final CachedCompiledSchemaRepository<T> compiledSchemaRepository;
+  private final CachedSchemaVersionsRepository schemaVersionsRepository;
+  private final CachedCompiledSchemaRepository<T> compiledSchemaRepository;
 
-    public SchemaCacheRefresherCallback(CachedSchemaVersionsRepository schemaVersionsRepository,
-                                        CachedCompiledSchemaRepository<T> compiledSchemaRepository) {
-        this.schemaVersionsRepository = schemaVersionsRepository;
-        this.compiledSchemaRepository = compiledSchemaRepository;
-    }
+  public SchemaCacheRefresherCallback(
+      CachedSchemaVersionsRepository schemaVersionsRepository,
+      CachedCompiledSchemaRepository<T> compiledSchemaRepository) {
+    this.schemaVersionsRepository = schemaVersionsRepository;
+    this.compiledSchemaRepository = compiledSchemaRepository;
+  }
 
-    @Override
-    public void onTopicRemoved(Topic topic) {
-        schemaVersionsRepository.removeFromCache(topic);
-        compiledSchemaRepository.removeFromCache(topic);
-    }
+  @Override
+  public void onTopicRemoved(Topic topic) {
+    schemaVersionsRepository.removeFromCache(topic);
+    compiledSchemaRepository.removeFromCache(topic);
+  }
 
-    @Override
-    public void onTopicCreated(Topic topic) {
-        refreshSchemas(topic);
-    }
+  @Override
+  public void onTopicCreated(Topic topic) {
+    refreshSchemas(topic);
+  }
 
-    @Override
-    public void onTopicChanged(Topic topic) {
-        refreshSchemas(topic);
-    }
+  @Override
+  public void onTopicChanged(Topic topic) {
+    refreshSchemas(topic);
+  }
 
-    private void refreshSchemas(Topic topic) {
-        if (topic.getContentType() == ContentType.AVRO) {
-            logger.info("Refreshing all schemas for {} topic.", topic.getQualifiedName());
-            SchemaVersionsResult versions = schemaVersionsRepository.versions(topic, REFRESH_ONLINE);
-            if (versions.isSuccess()) {
-                refreshCompiledSchemas(topic, versions.get());
-            }
-        }
+  private void refreshSchemas(Topic topic) {
+    if (topic.getContentType() == ContentType.AVRO) {
+      logger.info("Refreshing all schemas for {} topic.", topic.getQualifiedName());
+      SchemaVersionsResult versions = schemaVersionsRepository.versions(topic, REFRESH_ONLINE);
+      if (versions.isSuccess()) {
+        refreshCompiledSchemas(topic, versions.get());
+      }
     }
+  }
 
-    private void refreshCompiledSchemas(Topic topic, List<SchemaVersion> schemaVersions) {
-        schemaVersions.forEach(schemaVersion -> {
-            try {
-                compiledSchemaRepository.getSchema(topic, schemaVersion, REFRESH_ONLINE);
-            } catch (CouldNotLoadSchemaException e) {
-                logger.warn("Schema for topic {} at version {} could not be loaded",
-                        topic.getQualifiedName(), schemaVersion.value(), e);
-            }
+  private void refreshCompiledSchemas(Topic topic, List<SchemaVersion> schemaVersions) {
+    schemaVersions.forEach(
+        schemaVersion -> {
+          try {
+            compiledSchemaRepository.getSchema(topic, schemaVersion, REFRESH_ONLINE);
+          } catch (CouldNotLoadSchemaException e) {
+            logger.warn(
+                "Schema for topic {} at version {} could not be loaded",
+                topic.getQualifiedName(),
+                schemaVersion.value(),
+                e);
+          }
         });
-    }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaRepositoryFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaRepositoryFactory.java
index 4943073ea9..918273b82d 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaRepositoryFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaRepositoryFactory.java
@@ -7,17 +7,18 @@
 
 public class SchemaRepositoryFactory {
 
-    private final SchemaVersionsRepository schemaVersionsRepository;
+  private final SchemaVersionsRepository schemaVersionsRepository;
 
-    private final CompiledSchemaRepository<Schema> compiledAvroSchemaRepository;
+  private final CompiledSchemaRepository<Schema> compiledAvroSchemaRepository;
 
-    public SchemaRepositoryFactory(SchemaVersionsRepository schemaVersionsRepository,
-                                   CompiledSchemaRepository<Schema> compiledAvroSchemaRepository) {
-        this.schemaVersionsRepository = schemaVersionsRepository;
-        this.compiledAvroSchemaRepository = compiledAvroSchemaRepository;
-    }
+  public SchemaRepositoryFactory(
+      SchemaVersionsRepository schemaVersionsRepository,
+      CompiledSchemaRepository<Schema> compiledAvroSchemaRepository) {
+    this.schemaVersionsRepository = schemaVersionsRepository;
+    this.compiledAvroSchemaRepository = compiledAvroSchemaRepository;
+  }
 
-    public SchemaRepository provide() {
-        return new SchemaRepository(schemaVersionsRepository, compiledAvroSchemaRepository);
-    }
+  public SchemaRepository provide() {
+    return new SchemaRepository(schemaVersionsRepository, compiledAvroSchemaRepository);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaVersionRepositoryParameters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaVersionRepositoryParameters.java
index 4b04ccc34c..555f70907e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaVersionRepositoryParameters.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaVersionRepositoryParameters.java
@@ -4,11 +4,11 @@
 
 public interface SchemaVersionRepositoryParameters {
 
-    boolean isCacheEnabled();
+  boolean isCacheEnabled();
 
-    Duration getRefreshAfterWrite();
+  Duration getRefreshAfterWrite();
 
-    Duration getExpireAfterWrite();
+  Duration getExpireAfterWrite();
 
-    int getReloadThreadPoolSize();
+  int getReloadThreadPoolSize();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaVersionsRepositoryFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaVersionsRepositoryFactory.java
index 90eaf20685..211b38a2a7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaVersionsRepositoryFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/schema/SchemaVersionsRepositoryFactory.java
@@ -1,6 +1,8 @@
 package pl.allegro.tech.hermes.common.schema;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import pl.allegro.tech.hermes.domain.notifications.InternalNotificationsBus;
 import pl.allegro.tech.hermes.schema.CachedCompiledSchemaRepository;
 import pl.allegro.tech.hermes.schema.CachedSchemaVersionsRepository;
@@ -9,47 +11,46 @@
 import pl.allegro.tech.hermes.schema.RawSchemaClient;
 import pl.allegro.tech.hermes.schema.SchemaVersionsRepository;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 public class SchemaVersionsRepositoryFactory {
 
-    private final RawSchemaClient rawSchemaClient;
-    private final SchemaVersionRepositoryParameters schemaVersionsRepositoryParameters;
-    private final InternalNotificationsBus notificationsBus;
-    private final CompiledSchemaRepository<?> compiledSchemaRepository;
-
-    public SchemaVersionsRepositoryFactory(RawSchemaClient rawSchemaClient,
-                                           SchemaVersionRepositoryParameters schemaVersionsRepositoryParameters,
-                                           InternalNotificationsBus notificationsBus,
-                                           CompiledSchemaRepository<?> compiledSchemaRepository) {
-        this.rawSchemaClient = rawSchemaClient;
-        this.schemaVersionsRepositoryParameters = schemaVersionsRepositoryParameters;
-        this.notificationsBus = notificationsBus;
-        this.compiledSchemaRepository = compiledSchemaRepository;
-    }
-
-    public SchemaVersionsRepository provide() {
-        if (schemaVersionsRepositoryParameters.isCacheEnabled()) {
-            CachedSchemaVersionsRepository cachedSchemaVersionsRepository = new CachedSchemaVersionsRepository(
-                    rawSchemaClient,
-                    getVersionsReloader(),
-                    schemaVersionsRepositoryParameters.getRefreshAfterWrite(),
-                    schemaVersionsRepositoryParameters.getExpireAfterWrite());
-
-            notificationsBus.registerTopicCallback(
-                    new SchemaCacheRefresherCallback<>(
-                            cachedSchemaVersionsRepository,
-                            (CachedCompiledSchemaRepository<?>) compiledSchemaRepository));
-
-            return cachedSchemaVersionsRepository;
-        }
-        return new DirectSchemaVersionsRepository(rawSchemaClient);
-    }
-
-    private ExecutorService getVersionsReloader() {
-        return Executors.newFixedThreadPool(
-                schemaVersionsRepositoryParameters.getReloadThreadPoolSize(),
-                new ThreadFactoryBuilder().setNameFormat("schema-source-reloader-%d").build());
+  private final RawSchemaClient rawSchemaClient;
+  private final SchemaVersionRepositoryParameters schemaVersionsRepositoryParameters;
+  private final InternalNotificationsBus notificationsBus;
+  private final CompiledSchemaRepository<?> compiledSchemaRepository;
+
+  public SchemaVersionsRepositoryFactory(
+      RawSchemaClient rawSchemaClient,
+      SchemaVersionRepositoryParameters schemaVersionsRepositoryParameters,
+      InternalNotificationsBus notificationsBus,
+      CompiledSchemaRepository<?> compiledSchemaRepository) {
+    this.rawSchemaClient = rawSchemaClient;
+    this.schemaVersionsRepositoryParameters = schemaVersionsRepositoryParameters;
+    this.notificationsBus = notificationsBus;
+    this.compiledSchemaRepository = compiledSchemaRepository;
+  }
+
+  public SchemaVersionsRepository provide() {
+    if (schemaVersionsRepositoryParameters.isCacheEnabled()) {
+      CachedSchemaVersionsRepository cachedSchemaVersionsRepository =
+          new CachedSchemaVersionsRepository(
+              rawSchemaClient,
+              getVersionsReloader(),
+              schemaVersionsRepositoryParameters.getRefreshAfterWrite(),
+              schemaVersionsRepositoryParameters.getExpireAfterWrite());
+
+      notificationsBus.registerTopicCallback(
+          new SchemaCacheRefresherCallback<>(
+              cachedSchemaVersionsRepository,
+              (CachedCompiledSchemaRepository<?>) compiledSchemaRepository));
+
+      return cachedSchemaVersionsRepository;
     }
+    return new DirectSchemaVersionsRepository(rawSchemaClient);
+  }
+
+  private ExecutorService getVersionsReloader() {
+    return Executors.newFixedThreadPool(
+        schemaVersionsRepositoryParameters.getReloadThreadPoolSize(),
+        new ThreadFactoryBuilder().setNameFormat("schema-source-reloader-%d").build());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/DefaultSslContextFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/DefaultSslContextFactory.java
index f7c1b97914..3425aa0f7e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/DefaultSslContextFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/DefaultSslContextFactory.java
@@ -4,24 +4,28 @@
 
 public class DefaultSslContextFactory implements SslContextFactory {
 
-    private final String protocol;
-    private final KeyManagersProvider keyManagersProvider;
-    private final TrustManagersProvider trustManagersProvider;
+  private final String protocol;
+  private final KeyManagersProvider keyManagersProvider;
+  private final TrustManagersProvider trustManagersProvider;
 
-    public DefaultSslContextFactory(String protocol, KeyManagersProvider keyManagersProvider, TrustManagersProvider trustManagersProvider) {
-        this.protocol = protocol;
-        this.keyManagersProvider = keyManagersProvider;
-        this.trustManagersProvider = trustManagersProvider;
-    }
+  public DefaultSslContextFactory(
+      String protocol,
+      KeyManagersProvider keyManagersProvider,
+      TrustManagersProvider trustManagersProvider) {
+    this.protocol = protocol;
+    this.keyManagersProvider = keyManagersProvider;
+    this.trustManagersProvider = trustManagersProvider;
+  }
 
-    @Override
-    public SSLContextHolder create() {
-        try {
-            SSLContext sslContext = SSLContext.getInstance(protocol);
-            sslContext.init(keyManagersProvider.getKeyManagers(), trustManagersProvider.getTrustManagers(), null);
-            return new SSLContextHolder(sslContext, trustManagersProvider.getTrustManagers());
-        } catch (Exception e) {
-            throw new SslContextCreationException(e);
-        }
+  @Override
+  public SSLContextHolder create() {
+    try {
+      SSLContext sslContext = SSLContext.getInstance(protocol);
+      sslContext.init(
+          keyManagersProvider.getKeyManagers(), trustManagersProvider.getTrustManagers(), null);
+      return new SSLContextHolder(sslContext, trustManagersProvider.getTrustManagers());
+    } catch (Exception e) {
+      throw new SslContextCreationException(e);
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeyManagersProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeyManagersProvider.java
index 305e3e3194..6136684e6a 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeyManagersProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeyManagersProvider.java
@@ -3,5 +3,5 @@
 import javax.net.ssl.KeyManager;
 
 public interface KeyManagersProvider {
-    KeyManager[] getKeyManagers() throws Exception;
+  KeyManager[] getKeyManagers() throws Exception;
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreConfigurationException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreConfigurationException.java
index de4d3b8fca..65e9abba69 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreConfigurationException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreConfigurationException.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.common.ssl;
 
 public class KeystoreConfigurationException extends RuntimeException {
-    public KeystoreConfigurationException(String keystoreSource) {
-        super(String.format("Unknown key store source: %s", keystoreSource));
-    }
+  public KeystoreConfigurationException(String keystoreSource) {
+    super(String.format("Unknown key store source: %s", keystoreSource));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreProperties.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreProperties.java
index 796e570acc..4cee1c9e78 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreProperties.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreProperties.java
@@ -1,32 +1,31 @@
 package pl.allegro.tech.hermes.common.ssl;
 
-
 import java.net.URI;
 
 public class KeystoreProperties {
-    private final String location;
-    private final String format;
-    private final String password;
-
-    public KeystoreProperties(String location, String format, String password) {
-        this.location = location;
-        this.format = format;
-        this.password = password;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public String getFormat() {
-        return format;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public URI getLocationAsURI() {
-        return URI.create(getLocation());
-    }
+  private final String location;
+  private final String format;
+  private final String password;
+
+  public KeystoreProperties(String location, String format, String password) {
+    this.location = location;
+    this.format = format;
+    this.password = password;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getFormat() {
+    return format;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public URI getLocationAsURI() {
+    return URI.create(getLocation());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreSource.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreSource.java
index e6b5963a58..ecab7f9927 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreSource.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/KeystoreSource.java
@@ -1,16 +1,16 @@
 package pl.allegro.tech.hermes.common.ssl;
 
 public enum KeystoreSource {
-    JRE("jre"),
-    PROVIDED("provided");
+  JRE("jre"),
+  PROVIDED("provided");
 
-    KeystoreSource(String value) {
-        this.value = value;
-    }
+  KeystoreSource(String value) {
+    this.value = value;
+  }
 
-    private final String value;
+  private final String value;
 
-    public final String getValue() {
-        return value;
-    }
+  public final String getValue() {
+    return value;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SSLContextHolder.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SSLContextHolder.java
index 010fe816fb..c5a9499004 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SSLContextHolder.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SSLContextHolder.java
@@ -5,19 +5,19 @@
 
 public final class SSLContextHolder {
 
-    private final SSLContext sslContext;
-    private final TrustManager[] trustManagers;
+  private final SSLContext sslContext;
+  private final TrustManager[] trustManagers;
 
-    public SSLContextHolder(SSLContext sslContext, TrustManager[] trustManagers) {
-        this.sslContext = sslContext;
-        this.trustManagers = trustManagers;
-    }
+  public SSLContextHolder(SSLContext sslContext, TrustManager[] trustManagers) {
+    this.sslContext = sslContext;
+    this.trustManagers = trustManagers;
+  }
 
-    public SSLContext getSslContext() {
-        return sslContext;
-    }
+  public SSLContext getSslContext() {
+    return sslContext;
+  }
 
-    public TrustManager[] getTrustManagers() {
-        return trustManagers;
-    }
+  public TrustManager[] getTrustManagers() {
+    return trustManagers;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SslContextCreationException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SslContextCreationException.java
index fd4c44709d..11d173bc99 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SslContextCreationException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SslContextCreationException.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.common.ssl;
 
 class SslContextCreationException extends RuntimeException {
-    SslContextCreationException(Exception e) {
-        super(e);
-    }
+  SslContextCreationException(Exception e) {
+    super(e);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SslContextFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SslContextFactory.java
index c380098827..aaa64129fc 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SslContextFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/SslContextFactory.java
@@ -2,5 +2,5 @@
 
 public interface SslContextFactory {
 
-    SSLContextHolder create();
+  SSLContextHolder create();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/TrustManagersProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/TrustManagersProvider.java
index 0be68ca256..edb8a15a95 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/TrustManagersProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/TrustManagersProvider.java
@@ -3,5 +3,5 @@
 import javax.net.ssl.TrustManager;
 
 public interface TrustManagersProvider {
-    TrustManager[] getTrustManagers() throws Exception;
+  TrustManager[] getTrustManagers() throws Exception;
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/TruststoreConfigurationException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/TruststoreConfigurationException.java
index 89461be73b..8a77790465 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/TruststoreConfigurationException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/TruststoreConfigurationException.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.common.ssl;
 
 public class TruststoreConfigurationException extends RuntimeException {
-    public TruststoreConfigurationException(String truststoreSource) {
-        super(String.format("Unknown trust store source: %s", truststoreSource));
-    }
+  public TruststoreConfigurationException(String truststoreSource) {
+    super(String.format("Unknown trust store source: %s", truststoreSource));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/jvm/JvmKeyManagersProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/jvm/JvmKeyManagersProvider.java
index c4432bff3f..ae8a3aa88e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/jvm/JvmKeyManagersProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/jvm/JvmKeyManagersProvider.java
@@ -1,16 +1,16 @@
 package pl.allegro.tech.hermes.common.ssl.jvm;
 
-import pl.allegro.tech.hermes.common.ssl.KeyManagersProvider;
-
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
+import pl.allegro.tech.hermes.common.ssl.KeyManagersProvider;
 
 public class JvmKeyManagersProvider implements KeyManagersProvider {
 
-    @Override
-    public KeyManager[] getKeyManagers() throws Exception {
-        KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-        keyManagerFactory.init(null, null);
-        return keyManagerFactory.getKeyManagers();
-    }
+  @Override
+  public KeyManager[] getKeyManagers() throws Exception {
+    KeyManagerFactory keyManagerFactory =
+        KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+    keyManagerFactory.init(null, null);
+    return keyManagerFactory.getKeyManagers();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/jvm/JvmTrustManagerProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/jvm/JvmTrustManagerProvider.java
index 18c31d14d1..aa99072471 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/jvm/JvmTrustManagerProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/jvm/JvmTrustManagerProvider.java
@@ -1,6 +1,6 @@
 package pl.allegro.tech.hermes.common.ssl.jvm;
 
-import pl.allegro.tech.hermes.common.ssl.TrustManagersProvider;
+import static java.lang.String.format;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -9,50 +9,52 @@
 import java.security.KeyStore;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
-
-import static java.lang.String.format;
+import pl.allegro.tech.hermes.common.ssl.TrustManagersProvider;
 
 public class JvmTrustManagerProvider implements TrustManagersProvider {
 
-    @Override
-    public TrustManager[] getTrustManagers() throws Exception {
-        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        trustManagerFactory.init(loadJvmKeyStore());
-        return trustManagerFactory.getTrustManagers();
+  @Override
+  public TrustManager[] getTrustManagers() throws Exception {
+    TrustManagerFactory trustManagerFactory =
+        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+    trustManagerFactory.init(loadJvmKeyStore());
+    return trustManagerFactory.getTrustManagers();
+  }
+
+  private KeyStore loadJvmKeyStore() throws Exception {
+    String trustStore = System.getProperty("javax.net.ssl.trustStore", "");
+    String trustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");
+    String trustStoreType =
+        System.getProperty("javax.net.ssl.trustStoreType", KeyStore.getDefaultType());
+    String trustStoreProvider = System.getProperty("javax.net.ssl.trustStoreProvider", "");
+
+    KeyStore keyStore =
+        trustStoreProvider.isEmpty()
+            ? KeyStore.getInstance(trustStoreType)
+            : KeyStore.getInstance(trustStoreType, trustStoreProvider);
+    char[] password = trustStorePassword == null ? null : trustStorePassword.toCharArray();
+    keyStore.load(trustStoreInputStream(trustStore), password);
+
+    return keyStore;
+  }
+
+  private InputStream trustStoreInputStream(String trustStore) throws FileNotFoundException {
+    return new FileInputStream(trustStore.isEmpty() ? defaultTrustStore() : new File(trustStore));
+  }
+
+  private File defaultTrustStore() throws FileNotFoundException {
+    String javaHome = System.getProperty("java.home");
+
+    File jssecacerts = new File(format("%s/lib/security/jssecacerts", javaHome));
+    if (jssecacerts.exists()) {
+      return jssecacerts;
     }
 
-    private KeyStore loadJvmKeyStore() throws Exception {
-        String trustStore = System.getProperty("javax.net.ssl.trustStore", "");
-        String trustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");
-        String trustStoreType = System.getProperty("javax.net.ssl.trustStoreType", KeyStore.getDefaultType());
-        String trustStoreProvider = System.getProperty("javax.net.ssl.trustStoreProvider", "");
-
-        KeyStore keyStore = trustStoreProvider.isEmpty()
-                ? KeyStore.getInstance(trustStoreType)
-                : KeyStore.getInstance(trustStoreType, trustStoreProvider);
-        char[] password = trustStorePassword == null ? null : trustStorePassword.toCharArray();
-        keyStore.load(trustStoreInputStream(trustStore), password);
-
-        return keyStore;
+    File cacerts = new File(format("%s/lib/security/cacerts", javaHome));
+    if (cacerts.exists()) {
+      return cacerts;
     }
 
-    private InputStream trustStoreInputStream(String trustStore) throws FileNotFoundException {
-        return new FileInputStream(trustStore.isEmpty() ? defaultTrustStore() : new File(trustStore));
-    }
-
-    private File defaultTrustStore() throws FileNotFoundException {
-        String javaHome = System.getProperty("java.home");
-
-        File jssecacerts = new File(format("%s/lib/security/jssecacerts", javaHome));
-        if (jssecacerts.exists()) {
-            return jssecacerts;
-        }
-
-        File cacerts = new File(format("%s/lib/security/cacerts", javaHome));
-        if (cacerts.exists()) {
-            return cacerts;
-        }
-
-        throw new FileNotFoundException("Default trust store not found.");
-    }
+    throw new FileNotFoundException("Default trust store not found.");
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ProvidedKeyManagersProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ProvidedKeyManagersProvider.java
index 99d4d0627d..b2933d11af 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ProvidedKeyManagersProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ProvidedKeyManagersProvider.java
@@ -1,29 +1,29 @@
 package pl.allegro.tech.hermes.common.ssl.provided;
 
-import pl.allegro.tech.hermes.common.ssl.KeyManagersProvider;
-import pl.allegro.tech.hermes.common.ssl.KeystoreProperties;
-
 import java.io.InputStream;
 import java.security.KeyStore;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
+import pl.allegro.tech.hermes.common.ssl.KeyManagersProvider;
+import pl.allegro.tech.hermes.common.ssl.KeystoreProperties;
 
 public class ProvidedKeyManagersProvider implements KeyManagersProvider, ResourceLoader {
 
-    private final KeystoreProperties keystoreProperties;
+  private final KeystoreProperties keystoreProperties;
 
-    public ProvidedKeyManagersProvider(KeystoreProperties keystoreProperties) {
-        this.keystoreProperties = keystoreProperties;
-    }
+  public ProvidedKeyManagersProvider(KeystoreProperties keystoreProperties) {
+    this.keystoreProperties = keystoreProperties;
+  }
 
-    @Override
-    public KeyManager[] getKeyManagers() throws Exception {
-        KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-        KeyStore keyStore = KeyStore.getInstance(keystoreProperties.getFormat());
-        try (InputStream stream = getResourceAsInputStream(keystoreProperties.getLocationAsURI())) {
-            keyStore.load(stream, keystoreProperties.getPassword().toCharArray());
-            keyManagerFactory.init(keyStore, keystoreProperties.getPassword().toCharArray());
-        }
-        return keyManagerFactory.getKeyManagers();
+  @Override
+  public KeyManager[] getKeyManagers() throws Exception {
+    KeyManagerFactory keyManagerFactory =
+        KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+    KeyStore keyStore = KeyStore.getInstance(keystoreProperties.getFormat());
+    try (InputStream stream = getResourceAsInputStream(keystoreProperties.getLocationAsURI())) {
+      keyStore.load(stream, keystoreProperties.getPassword().toCharArray());
+      keyManagerFactory.init(keyStore, keystoreProperties.getPassword().toCharArray());
     }
+    return keyManagerFactory.getKeyManagers();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ProvidedTrustManagersProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ProvidedTrustManagersProvider.java
index e8d2532d56..b93037a69d 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ProvidedTrustManagersProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ProvidedTrustManagersProvider.java
@@ -1,29 +1,29 @@
 package pl.allegro.tech.hermes.common.ssl.provided;
 
-import pl.allegro.tech.hermes.common.ssl.KeystoreProperties;
-import pl.allegro.tech.hermes.common.ssl.TrustManagersProvider;
-
 import java.io.InputStream;
 import java.security.KeyStore;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
+import pl.allegro.tech.hermes.common.ssl.KeystoreProperties;
+import pl.allegro.tech.hermes.common.ssl.TrustManagersProvider;
 
 public class ProvidedTrustManagersProvider implements TrustManagersProvider, ResourceLoader {
 
-    private final KeystoreProperties keystoreProperties;
+  private final KeystoreProperties keystoreProperties;
 
-    public ProvidedTrustManagersProvider(KeystoreProperties keystoreProperties) {
-        this.keystoreProperties = keystoreProperties;
-    }
+  public ProvidedTrustManagersProvider(KeystoreProperties keystoreProperties) {
+    this.keystoreProperties = keystoreProperties;
+  }
 
-    @Override
-    public TrustManager[] getTrustManagers() throws Exception {
-        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        KeyStore keyStore = KeyStore.getInstance(keystoreProperties.getFormat());
-        try (InputStream stream = getResourceAsInputStream(keystoreProperties.getLocationAsURI())) {
-            keyStore.load(stream, keystoreProperties.getPassword().toCharArray());
-            trustManagerFactory.init(keyStore);
-        }
-        return trustManagerFactory.getTrustManagers();
+  @Override
+  public TrustManager[] getTrustManagers() throws Exception {
+    TrustManagerFactory trustManagerFactory =
+        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+    KeyStore keyStore = KeyStore.getInstance(keystoreProperties.getFormat());
+    try (InputStream stream = getResourceAsInputStream(keystoreProperties.getLocationAsURI())) {
+      keyStore.load(stream, keystoreProperties.getPassword().toCharArray());
+      trustManagerFactory.init(keyStore);
     }
+    return trustManagerFactory.getTrustManagers();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ResourceLoader.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ResourceLoader.java
index 42047351eb..b7177fcaac 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ResourceLoader.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/ssl/provided/ResourceLoader.java
@@ -1,17 +1,18 @@
 package pl.allegro.tech.hermes.common.ssl.provided;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.net.URI;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 interface ResourceLoader {
-    default InputStream getResourceAsInputStream(URI location) throws FileNotFoundException {
-        if ("classpath".equalsIgnoreCase(location.getScheme())) {
-            return getClass().getClassLoader().getResourceAsStream(location.getSchemeSpecificPart());
-        }
-        return new FileInputStream(isNullOrEmpty(location.getPath()) ? location.getSchemeSpecificPart() : location.getPath());
+  default InputStream getResourceAsInputStream(URI location) throws FileNotFoundException {
+    if ("classpath".equalsIgnoreCase(location.getScheme())) {
+      return getClass().getClassLoader().getResourceAsStream(location.getSchemeSpecificPart());
     }
+    return new FileInputStream(
+        isNullOrEmpty(location.getPath()) ? location.getSchemeSpecificPart() : location.getPath());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/util/InetAddressInstanceIdResolver.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/util/InetAddressInstanceIdResolver.java
index ef98c2c8bc..29c3c84023 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/util/InetAddressInstanceIdResolver.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/util/InetAddressInstanceIdResolver.java
@@ -1,25 +1,23 @@
 package pl.allegro.tech.hermes.common.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class InetAddressInstanceIdResolver implements InstanceIdResolver {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(InetAddressInstanceIdResolver.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(InetAddressInstanceIdResolver.class);
 
-    public InetAddressInstanceIdResolver() { }
+  public InetAddressInstanceIdResolver() {}
 
-    public String resolve() {
-        String hostname = "hostname-could-not-be-detected";
-        try {
-            hostname = InetAddress.getLocalHost().getCanonicalHostName();
-        } catch (UnknownHostException e) {
-            LOGGER.warn("Could not determine hostname");
-        }
-        return hostname;
+  public String resolve() {
+    String hostname = "hostname-could-not-be-detected";
+    try {
+      hostname = InetAddress.getLocalHost().getCanonicalHostName();
+    } catch (UnknownHostException e) {
+      LOGGER.warn("Could not determine hostname");
     }
-
+    return hostname;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/util/InstanceIdResolver.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/util/InstanceIdResolver.java
index 0373cec8fa..2171a491f2 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/util/InstanceIdResolver.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/util/InstanceIdResolver.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.common.util;
 
 public interface InstanceIdResolver {
-    String resolve();
+  String resolve();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/CredentialsRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/CredentialsRepository.java
index 7b21bf1475..7e9eb78100 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/CredentialsRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/CredentialsRepository.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.domain;
 
 public interface CredentialsRepository {
-    NodePassword readAdminPassword();
+  NodePassword readAdminPassword();
 
-    void overwriteAdminPassword(String password);
+  void overwriteAdminPassword(String password);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/NodePassword.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/NodePassword.java
index 1211ef8f59..b9a7a39504 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/NodePassword.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/NodePassword.java
@@ -2,61 +2,60 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.codec.digest.DigestUtils;
-
 import java.util.Arrays;
+import org.apache.commons.codec.digest.DigestUtils;
 
 public class NodePassword {
-    private static final int DEFAULT_STRING_LENGTH = 12;
+  private static final int DEFAULT_STRING_LENGTH = 12;
 
-    private final byte[] hashedPassword;
+  private final byte[] hashedPassword;
 
-    @JsonCreator
-    public NodePassword(@JsonProperty("hashedPassword") byte[] hashedPassword) {
-        this.hashedPassword = Arrays.copyOf(hashedPassword, hashedPassword.length);
-    }
+  @JsonCreator
+  public NodePassword(@JsonProperty("hashedPassword") byte[] hashedPassword) {
+    this.hashedPassword = Arrays.copyOf(hashedPassword, hashedPassword.length);
+  }
 
-    public NodePassword(String password) {
-        this.hashedPassword = NodePassword.hashString(password);
-    }
+  public NodePassword(String password) {
+    this.hashedPassword = NodePassword.hashString(password);
+  }
 
-    public byte[] getHashedPassword() {
-        return Arrays.copyOf(hashedPassword, hashedPassword.length);
-    }
+  public byte[] getHashedPassword() {
+    return Arrays.copyOf(hashedPassword, hashedPassword.length);
+  }
 
-    private static byte[] hashString(String string) {
-        return DigestUtils.sha256(string);
-    }
+  private static byte[] hashString(String string) {
+    return DigestUtils.sha256(string);
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
 
-        if (o == null) {
-            return false;
-        }
+    if (o == null) {
+      return false;
+    }
 
-        if (o instanceof String) {
-            return this.equals(NodePassword.fromString((String) o));
-        }
+    if (o instanceof String) {
+      return this.equals(NodePassword.fromString((String) o));
+    }
 
-        if (getClass() != o.getClass()) {
-            return false;
-        }
+    if (getClass() != o.getClass()) {
+      return false;
+    }
 
-        NodePassword that = (NodePassword) o;
+    NodePassword that = (NodePassword) o;
 
-        return Arrays.equals(hashedPassword, that.hashedPassword);
-    }
+    return Arrays.equals(hashedPassword, that.hashedPassword);
+  }
 
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(hashedPassword);
-    }
+  @Override
+  public int hashCode() {
+    return Arrays.hashCode(hashedPassword);
+  }
 
-    public static NodePassword fromString(String string) {
-        return new NodePassword(string);
-    }
+  public static NodePassword fromString(String string) {
+    return new NodePassword(string);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/FilterableMessage.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/FilterableMessage.java
index d4e8f901f2..9c769e10a8 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/FilterableMessage.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/FilterableMessage.java
@@ -1,19 +1,18 @@
 package pl.allegro.tech.hermes.domain.filtering;
 
+import java.util.Map;
+import java.util.Optional;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.util.Map;
-import java.util.Optional;
-
 public interface FilterableMessage {
 
-    ContentType getContentType();
+  ContentType getContentType();
 
-    Map<String, String> getExternalMetadata();
+  Map<String, String> getExternalMetadata();
 
-    byte[] getData();
+  byte[] getData();
 
-    Optional<CompiledSchema<Schema>> getSchema();
+  Optional<CompiledSchema<Schema>> getSchema();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/FilteringException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/FilteringException.java
index 8b6340da05..62f7da8c82 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/FilteringException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/FilteringException.java
@@ -3,21 +3,21 @@
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 public class FilteringException extends InternalProcessingException {
-    public FilteringException(Throwable throwable) {
-        super(throwable);
-    }
+  public FilteringException(Throwable throwable) {
+    super(throwable);
+  }
 
-    public FilteringException(String message) {
-        super(message);
-    }
+  public FilteringException(String message) {
+    super(message);
+  }
 
-    public FilteringException(String message, Throwable throwable) {
-        super(message, throwable);
-    }
+  public FilteringException(String message, Throwable throwable) {
+    super(message, throwable);
+  }
 
-    public static void check(boolean condition, String message) {
-        if (!condition) {
-            throw new FilteringException(message);
-        }
+  public static void check(boolean condition, String message) {
+    if (!condition) {
+      throw new FilteringException(message);
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MatchingStrategy.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MatchingStrategy.java
index b3b55ad50c..177b73a320 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MatchingStrategy.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MatchingStrategy.java
@@ -3,17 +3,17 @@
 import java.util.Optional;
 
 public enum MatchingStrategy {
-    ALL,
-    ANY;
+  ALL,
+  ANY;
 
-    public static MatchingStrategy fromString(String value, MatchingStrategy defaultValue) {
-        try {
-            return Optional.ofNullable(value)
-                .map(String::toUpperCase)
-                .map(MatchingStrategy::valueOf)
-                .orElse(defaultValue);
-        } catch (IllegalArgumentException ex) {
-            return defaultValue;
-        }
+  public static MatchingStrategy fromString(String value, MatchingStrategy defaultValue) {
+    try {
+      return Optional.ofNullable(value)
+          .map(String::toUpperCase)
+          .map(MatchingStrategy::valueOf)
+          .orElse(defaultValue);
+    } catch (IllegalArgumentException ex) {
+      return defaultValue;
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilter.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilter.java
index 8a03f435b0..5ce32efdcc 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilter.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilter.java
@@ -3,20 +3,20 @@
 import java.util.function.Predicate;
 
 public class MessageFilter implements Predicate<FilterableMessage> {
-    private final String type;
-    private final Predicate<FilterableMessage> predicate;
+  private final String type;
+  private final Predicate<FilterableMessage> predicate;
 
-    public MessageFilter(String type, Predicate<FilterableMessage> predicate) {
-        this.type = type;
-        this.predicate = predicate;
-    }
+  public MessageFilter(String type, Predicate<FilterableMessage> predicate) {
+    this.type = type;
+    this.predicate = predicate;
+  }
 
-    @Override
-    public boolean test(FilterableMessage message) {
-        return predicate.test(message);
-    }
+  @Override
+  public boolean test(FilterableMessage message) {
+    return predicate.test(message);
+  }
 
-    public String getType() {
-        return type;
-    }
+  public String getType() {
+    return type;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilterSource.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilterSource.java
index a946227e17..6c67564592 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilterSource.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilterSource.java
@@ -1,11 +1,10 @@
 package pl.allegro.tech.hermes.domain.filtering;
 
-import pl.allegro.tech.hermes.api.MessageFilterSpecification;
-
 import java.util.List;
+import pl.allegro.tech.hermes.api.MessageFilterSpecification;
 
 public interface MessageFilterSource {
-    MessageFilter compile(MessageFilterSpecification specification);
+  MessageFilter compile(MessageFilterSpecification specification);
 
-    List<MessageFilter> getGlobalFilters();
+  List<MessageFilter> getGlobalFilters();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilters.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilters.java
index c8b3f4cfae..00ed213719 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilters.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/MessageFilters.java
@@ -1,33 +1,35 @@
 package pl.allegro.tech.hermes.domain.filtering;
 
-import pl.allegro.tech.hermes.api.MessageFilterSpecification;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
 
 import java.util.List;
 import java.util.Map;
-
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
+import pl.allegro.tech.hermes.api.MessageFilterSpecification;
 
 public class MessageFilters implements MessageFilterSource {
-    private final Map<String, SubscriptionMessageFilterCompiler> filters;
-    private final List<MessageFilter> globalFilters;
+  private final Map<String, SubscriptionMessageFilterCompiler> filters;
+  private final List<MessageFilter> globalFilters;
 
-    public MessageFilters(List<MessageFilter> globalFilters,
-                          List<SubscriptionMessageFilterCompiler> subscriptionFilterCompilers) {
-        this.globalFilters = globalFilters;
-        this.filters = subscriptionFilterCompilers.stream().collect(toMap(SubscriptionMessageFilterCompiler::getType, identity()));
-    }
+  public MessageFilters(
+      List<MessageFilter> globalFilters,
+      List<SubscriptionMessageFilterCompiler> subscriptionFilterCompilers) {
+    this.globalFilters = globalFilters;
+    this.filters =
+        subscriptionFilterCompilers.stream()
+            .collect(toMap(SubscriptionMessageFilterCompiler::getType, identity()));
+  }
 
-    @Override
-    public MessageFilter compile(MessageFilterSpecification specification) {
-        if (!filters.containsKey(specification.getType())) {
-            throw new NoSuchFilterException(specification.getType());
-        }
-        return filters.get(specification.getType()).getMessageFilter(specification);
+  @Override
+  public MessageFilter compile(MessageFilterSpecification specification) {
+    if (!filters.containsKey(specification.getType())) {
+      throw new NoSuchFilterException(specification.getType());
     }
+    return filters.get(specification.getType()).getMessageFilter(specification);
+  }
 
-    @Override
-    public List<MessageFilter> getGlobalFilters() {
-        return globalFilters;
-    }
+  @Override
+  public List<MessageFilter> getGlobalFilters() {
+    return globalFilters;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/NoSuchFilterException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/NoSuchFilterException.java
index bcc9f1cdf3..d5557d9680 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/NoSuchFilterException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/NoSuchFilterException.java
@@ -1,15 +1,15 @@
 package pl.allegro.tech.hermes.domain.filtering;
 
 public class NoSuchFilterException extends FilteringException {
-    public NoSuchFilterException(Throwable throwable) {
-        super(throwable);
-    }
+  public NoSuchFilterException(Throwable throwable) {
+    super(throwable);
+  }
 
-    public NoSuchFilterException(String filterType) {
-        super("Filter of type '" + filterType + "' not found.");
-    }
+  public NoSuchFilterException(String filterType) {
+    super("Filter of type '" + filterType + "' not found.");
+  }
 
-    public NoSuchFilterException(String message, Throwable throwable) {
-        super(message, throwable);
-    }
+  public NoSuchFilterException(String message, Throwable throwable) {
+    super(message, throwable);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/SubscriptionMessageFilterCompiler.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/SubscriptionMessageFilterCompiler.java
index c4a83f2d2c..bf337662f8 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/SubscriptionMessageFilterCompiler.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/SubscriptionMessageFilterCompiler.java
@@ -1,15 +1,14 @@
 package pl.allegro.tech.hermes.domain.filtering;
 
-import pl.allegro.tech.hermes.api.MessageFilterSpecification;
-
 import java.util.function.Predicate;
+import pl.allegro.tech.hermes.api.MessageFilterSpecification;
 
 public interface SubscriptionMessageFilterCompiler {
-    String getType();
+  String getType();
 
-    Predicate<FilterableMessage> compile(MessageFilterSpecification specification);
+  Predicate<FilterableMessage> compile(MessageFilterSpecification specification);
 
-    default MessageFilter getMessageFilter(MessageFilterSpecification specification) {
-        return new MessageFilter(getType(), compile(specification));
-    }
+  default MessageFilter getMessageFilter(MessageFilterSpecification specification) {
+    return new MessageFilter(getType(), compile(specification));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/UnsupportedMatchingStrategyException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/UnsupportedMatchingStrategyException.java
index 9e62421ca4..5526c57920 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/UnsupportedMatchingStrategyException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/UnsupportedMatchingStrategyException.java
@@ -1,7 +1,12 @@
 package pl.allegro.tech.hermes.domain.filtering;
 
 public class UnsupportedMatchingStrategyException extends FilteringException {
-    public UnsupportedMatchingStrategyException(String filterType, MatchingStrategy strategy) {
-        super("Matching strategy '" + strategy + "' is not supported in filters of type '" + filterType + "'.");
-    }
+  public UnsupportedMatchingStrategyException(String filterType, MatchingStrategy strategy) {
+    super(
+        "Matching strategy '"
+            + strategy
+            + "' is not supported in filters of type '"
+            + filterType
+            + "'.");
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathPredicate.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathPredicate.java
index f49a22d7ba..cfee70ac7c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathPredicate.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathPredicate.java
@@ -1,16 +1,13 @@
 package pl.allegro.tech.hermes.domain.filtering.avro;
 
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericArray;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.util.Utf8;
-import pl.allegro.tech.hermes.api.ContentType;
-import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
-import pl.allegro.tech.hermes.domain.filtering.FilteringException;
-import pl.allegro.tech.hermes.domain.filtering.MatchingStrategy;
-import pl.allegro.tech.hermes.domain.filtering.UnsupportedMatchingStrategyException;
-import pl.allegro.tech.hermes.schema.CompiledSchema;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyListIterator;
+import static java.util.Collections.singletonList;
+import static org.apache.commons.lang3.StringUtils.strip;
+import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
+import static pl.allegro.tech.hermes.domain.filtering.FilteringException.check;
 
+import jakarta.annotation.Nullable;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -22,124 +19,145 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyListIterator;
-import static java.util.Collections.singletonList;
-import static org.apache.commons.lang.StringUtils.strip;
-import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
-import static pl.allegro.tech.hermes.domain.filtering.FilteringException.check;
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericArray;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.util.Utf8;
+import pl.allegro.tech.hermes.api.ContentType;
+import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
+import pl.allegro.tech.hermes.domain.filtering.FilteringException;
+import pl.allegro.tech.hermes.domain.filtering.MatchingStrategy;
+import pl.allegro.tech.hermes.domain.filtering.UnsupportedMatchingStrategyException;
+import pl.allegro.tech.hermes.schema.CompiledSchema;
 
 class AvroPathPredicate implements Predicate<FilterableMessage> {
-    private static final String WILDCARD_IDX = "*";
-    private static final String GROUP_SELECTOR = "selector";
-    private static final String GROUP_IDX = "index";
-    private static final String ARRAY_PATTERN_SELECTOR_PART = "(?<" + GROUP_SELECTOR + ">..*)";
-    private static final String ARRAY_PATTERN_IDX_PART = "\\[(?<" + GROUP_IDX + ">\\" + WILDCARD_IDX + "|\\d+)]";
-    private static final Pattern ARRAY_PATTERN = Pattern.compile(ARRAY_PATTERN_SELECTOR_PART + ARRAY_PATTERN_IDX_PART);
-    private static final String NULL_AS_STRING = "null";
-    private final List<String> path;
-    private final Pattern pattern;
-    private final MatchingStrategy matchingStrategy;
-
-    AvroPathPredicate(String path, Pattern pattern, MatchingStrategy matchingStrategy) {
-        this.path = Arrays.asList(strip(path, ".").split("\\."));
-        this.pattern = pattern;
-        this.matchingStrategy = matchingStrategy;
+  private static final String WILDCARD_IDX = "*";
+  private static final String GROUP_SELECTOR = "selector";
+  private static final String GROUP_IDX = "index";
+  private static final String ARRAY_PATTERN_SELECTOR_PART = "(?<" + GROUP_SELECTOR + ">..*)";
+  private static final String ARRAY_PATTERN_IDX_PART =
+      "\\[(?<" + GROUP_IDX + ">\\" + WILDCARD_IDX + "|\\d+)]";
+  private static final Pattern ARRAY_PATTERN =
+      Pattern.compile(ARRAY_PATTERN_SELECTOR_PART + ARRAY_PATTERN_IDX_PART);
+  private static final String NULL_AS_STRING = "null";
+  private final List<String> path;
+  private final Pattern pattern;
+  private final MatchingStrategy matchingStrategy;
+
+  AvroPathPredicate(String path, Pattern pattern, MatchingStrategy matchingStrategy) {
+    this.path = Arrays.asList(strip(path, ".").split("\\."));
+    this.pattern = pattern;
+    this.matchingStrategy = matchingStrategy;
+  }
+
+  @Override
+  public boolean test(final FilterableMessage message) {
+    check(
+        message.getContentType() == ContentType.AVRO,
+        "This filter supports only AVRO contentType.");
+    try {
+      List<Object> result = select(message);
+      Stream<String> resultStream = result.stream().map(Object::toString);
+
+      return !result.isEmpty() && matchResultsStream(resultStream);
+    } catch (Exception exception) {
+      throw new FilteringException(exception);
     }
-
-    @Override
-    public boolean test(final FilterableMessage message) {
-        check(message.getContentType() == ContentType.AVRO, "This filter supports only AVRO contentType.");
-        try {
-            List<Object> result = select(message);
-            Stream<String> resultStream = result.stream().map(Object::toString);
-
-            return !result.isEmpty() && matchResultsStream(resultStream);
-        } catch (Exception exception) {
-            throw new FilteringException(exception);
+  }
+
+  private List<Object> select(final FilterableMessage message) throws IOException {
+    CompiledSchema<Schema> compiledSchema = message.getSchema().get();
+    return select(bytesToRecord(message.getData(), compiledSchema.getSchema()));
+  }
+
+  private List<Object> select(GenericRecord record) {
+    ListIterator<String> iter = path.listIterator();
+    return select(record, iter);
+  }
+
+  private List<Object> select(Object record, ListIterator<String> iter) {
+    Object current = record;
+    while (iter.hasNext() && isSupportedType(current)) {
+      if (current instanceof GenericRecord) {
+        GenericRecord currentRecord = (GenericRecord) current;
+        String selector = iter.next();
+        Matcher arrayMatcher = ARRAY_PATTERN.matcher(selector);
+
+        if (arrayMatcher.matches()) {
+          selector = arrayMatcher.group(GROUP_SELECTOR);
+
+          current = recordFieldValueOrNull(selector, currentRecord);
+          if (!(current instanceof GenericArray)) {
+            return emptyList();
+          }
+
+          GenericArray<Object> currentArray = (GenericArray) current;
+          String idx = arrayMatcher.group(GROUP_IDX);
+
+          if (idx.equals(WILDCARD_IDX)) {
+            return selectMultipleArrayItems(iter, currentArray);
+          } else {
+            current = selectSingleArrayItem(Integer.valueOf(idx), currentArray);
+          }
+
+        } else {
+          current = recordFieldValueOrNull(selector, currentRecord);
         }
+      } else if (current instanceof HashMap) {
+        Map<Utf8, Object> currentRecord = (HashMap<Utf8, Object>) current;
+        Utf8 selector = new Utf8(iter.next());
+        current = currentRecord.get(selector);
+      }
     }
 
-    private List<Object> select(final FilterableMessage message) throws IOException {
-        CompiledSchema<Schema> compiledSchema = message.<Schema>getSchema().get();
-        return select(bytesToRecord(message.getData(), compiledSchema.getSchema()));
+    return iter.hasNext() ? emptyList() : singletonList(current == null ? NULL_AS_STRING : current);
+  }
+
+  private boolean isSupportedType(Object record) {
+    return record instanceof GenericRecord || record instanceof HashMap;
+  }
+
+  private List<Object> selectMultipleArrayItems(
+      ListIterator<String> iter, GenericArray<Object> currentArray) {
+    return currentArray.stream()
+        .map(
+            item ->
+                select(
+                    item,
+                    iter.hasNext() ? path.listIterator(iter.nextIndex()) : emptyListIterator()))
+        .flatMap(List::stream)
+        .collect(Collectors.toList());
+  }
+
+  private Object selectSingleArrayItem(int idx, GenericArray<Object> currentArray) {
+    if (currentArray.size() <= idx) {
+      return null;
     }
 
-    private List<Object> select(GenericRecord record) {
-        ListIterator<String> iter = path.listIterator();
-        return select(record, iter);
+    return currentArray.get(idx);
+  }
+
+  private boolean matchResultsStream(Stream<String> results) {
+    switch (matchingStrategy) {
+      case ALL:
+        return results.allMatch(this::matches);
+      case ANY:
+        return results.anyMatch(this::matches);
+      default:
+        throw new UnsupportedMatchingStrategyException("avropath", matchingStrategy);
     }
+  }
 
-    private List<Object> select(Object record, ListIterator<String> iter) {
-        Object current = record;
-        while (iter.hasNext() && isSupportedType(current)) {
-            if (current instanceof GenericRecord) {
-                GenericRecord currentRecord = (GenericRecord) current;
-                String selector = iter.next();
-                Matcher arrayMatcher = ARRAY_PATTERN.matcher(selector);
-
-                if (arrayMatcher.matches()) {
-                    selector = arrayMatcher.group(GROUP_SELECTOR);
-
-                    current = currentRecord.get(selector);
-                    if (!(current instanceof GenericArray)) {
-                        return emptyList();
-                    }
-
-                    GenericArray<Object> currentArray = (GenericArray) current;
-                    String idx = arrayMatcher.group(GROUP_IDX);
-
-                    if (idx.equals(WILDCARD_IDX)) {
-                        return selectMultipleArrayItems(iter, currentArray);
-                    } else {
-                        current = selectSingleArrayItem(Integer.valueOf(idx), currentArray);
-                    }
-
-                } else {
-                    current = currentRecord.get(selector);
-                }
-            } else if (current instanceof HashMap) {
-                Map<Utf8, Object> currentRecord = (HashMap<Utf8, Object>) current;
-                Utf8 selector = new Utf8(iter.next());
-                current = currentRecord.get(selector);
-            }
-        }
-
-        return iter.hasNext() ? emptyList() : singletonList(current == null ? NULL_AS_STRING : current);
+  @Nullable
+  private Object recordFieldValueOrNull(String selector, GenericRecord record) {
+    Schema.Field field = record.getSchema().getField(selector);
+    if (field == null) {
+      return null;
     }
+    return record.get(field.pos());
+  }
 
-    private boolean isSupportedType(Object record) {
-        return record instanceof GenericRecord || record instanceof HashMap;
-    }
-
-    private List<Object> selectMultipleArrayItems(ListIterator<String> iter, GenericArray<Object> currentArray) {
-        return currentArray.stream()
-            .map(item -> select(item, iter.hasNext() ? path.listIterator(iter.nextIndex()) : emptyListIterator()))
-            .flatMap(List::stream)
-            .collect(Collectors.toList());
-    }
-
-    private Object selectSingleArrayItem(int idx, GenericArray<Object> currentArray) {
-        if (currentArray.size() <= idx) {
-            return null;
-        }
-
-        return currentArray.get(idx);
-    }
-
-    private boolean matchResultsStream(Stream<String> results) {
-        switch (matchingStrategy) {
-            case ALL:
-                return results.allMatch(this::matches);
-            case ANY:
-                return results.anyMatch(this::matches);
-            default:
-                throw new UnsupportedMatchingStrategyException("avropath", matchingStrategy);
-        }
-    }
-
-    private boolean matches(String value) {
-        return pattern.matcher(value).matches();
-    }
+  private boolean matches(String value) {
+    return pattern.matcher(value).matches();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathSubscriptionMessageFilterCompiler.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathSubscriptionMessageFilterCompiler.java
index a3072bc66d..1579be965c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathSubscriptionMessageFilterCompiler.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathSubscriptionMessageFilterCompiler.java
@@ -1,26 +1,25 @@
 package pl.allegro.tech.hermes.domain.filtering.avro;
 
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import pl.allegro.tech.hermes.api.MessageFilterSpecification;
 import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
 import pl.allegro.tech.hermes.domain.filtering.MatchingStrategy;
 import pl.allegro.tech.hermes.domain.filtering.SubscriptionMessageFilterCompiler;
 
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
-public class AvroPathSubscriptionMessageFilterCompiler implements SubscriptionMessageFilterCompiler {
+public class AvroPathSubscriptionMessageFilterCompiler
+    implements SubscriptionMessageFilterCompiler {
 
-    @Override
-    public String getType() {
-        return "avropath";
-    }
+  @Override
+  public String getType() {
+    return "avropath";
+  }
 
-    @Override
-    public Predicate<FilterableMessage> compile(MessageFilterSpecification specification) {
-        return new AvroPathPredicate(
-            specification.getPath(),
-            Pattern.compile(specification.getMatcher()),
-            MatchingStrategy.fromString(specification.getMatchingStrategy(), MatchingStrategy.ALL)
-        );
-    }
+  @Override
+  public Predicate<FilterableMessage> compile(MessageFilterSpecification specification) {
+    return new AvroPathPredicate(
+        specification.getPath(),
+        Pattern.compile(specification.getMatcher()),
+        MatchingStrategy.fromString(specification.getMatchingStrategy(), MatchingStrategy.ALL));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterChain.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterChain.java
index 815a12b9b4..15ff95c5e6 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterChain.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterChain.java
@@ -1,28 +1,27 @@
 package pl.allegro.tech.hermes.domain.filtering.chain;
 
-import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
-import pl.allegro.tech.hermes.domain.filtering.MessageFilter;
-
 import java.util.ArrayList;
 import java.util.List;
+import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
+import pl.allegro.tech.hermes.domain.filtering.MessageFilter;
 
 public final class FilterChain {
-    private final List<MessageFilter> messageFilters;
+  private final List<MessageFilter> messageFilters;
 
-    FilterChain(final List<MessageFilter> messageFilters) {
-        this.messageFilters = new ArrayList<>(messageFilters);
-    }
+  FilterChain(final List<MessageFilter> messageFilters) {
+    this.messageFilters = new ArrayList<>(messageFilters);
+  }
 
-    public FilterResult apply(final FilterableMessage message) {
-        for (MessageFilter filter : messageFilters) {
-            try {
-                if (!filter.test(message)) {
-                    return FilterResult.failed(filter.getType(), "logical");
-                }
-            } catch (Exception ex) {
-                return FilterResult.failed(filter.getType(), ex);
-            }
+  public FilterResult apply(final FilterableMessage message) {
+    for (MessageFilter filter : messageFilters) {
+      try {
+        if (!filter.test(message)) {
+          return FilterResult.failed(filter.getType(), "logical");
         }
-        return FilterResult.PASS;
+      } catch (Exception ex) {
+        return FilterResult.failed(filter.getType(), ex);
+      }
     }
+    return FilterResult.PASS;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterChainFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterChainFactory.java
index b418abd259..99f9f3fd43 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterChainFactory.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterChainFactory.java
@@ -1,26 +1,24 @@
 package pl.allegro.tech.hermes.domain.filtering.chain;
 
-import pl.allegro.tech.hermes.api.MessageFilterSpecification;
-import pl.allegro.tech.hermes.domain.filtering.MessageFilter;
-import pl.allegro.tech.hermes.domain.filtering.MessageFilterSource;
+import static java.util.stream.Stream.concat;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import static java.util.stream.Stream.concat;
+import pl.allegro.tech.hermes.api.MessageFilterSpecification;
+import pl.allegro.tech.hermes.domain.filtering.MessageFilter;
+import pl.allegro.tech.hermes.domain.filtering.MessageFilterSource;
 
 public class FilterChainFactory {
-    private final MessageFilterSource availableFilters;
+  private final MessageFilterSource availableFilters;
 
-    public FilterChainFactory(MessageFilterSource filters) {
-        this.availableFilters = filters;
-    }
+  public FilterChainFactory(MessageFilterSource filters) {
+    this.availableFilters = filters;
+  }
 
-    public FilterChain create(final List<MessageFilterSpecification> filters) {
-        Stream<MessageFilter> globalFilters = availableFilters.getGlobalFilters().stream();
-        Stream<MessageFilter> subscriptionFilters = filters.stream()
-                .map(availableFilters::compile);
-        return new FilterChain(concat(globalFilters, subscriptionFilters).collect(Collectors.toList()));
-    }
+  public FilterChain create(final List<MessageFilterSpecification> filters) {
+    Stream<MessageFilter> globalFilters = availableFilters.getGlobalFilters().stream();
+    Stream<MessageFilter> subscriptionFilters = filters.stream().map(availableFilters::compile);
+    return new FilterChain(concat(globalFilters, subscriptionFilters).collect(Collectors.toList()));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterResult.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterResult.java
index 5a7fd4ceb2..6342456dd7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterResult.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/chain/FilterResult.java
@@ -1,64 +1,68 @@
 package pl.allegro.tech.hermes.domain.filtering.chain;
 
-import com.google.common.base.Joiner;
-
-import java.util.Optional;
-
 import static java.lang.String.format;
 import static java.util.Optional.empty;
 
+import com.google.common.base.Joiner;
+import java.util.Optional;
+
 public final class FilterResult {
-    private final boolean filtered;
-    private final Optional<String> filterType;
-    private final Optional<String> message;
-    private final Optional<Exception> cause;
+  private final boolean filtered;
+  private final Optional<String> filterType;
+  private final Optional<String> message;
+  private final Optional<Exception> cause;
 
-    public static final FilterResult PASS = new FilterResult(false, empty(), empty(), empty());
+  public static final FilterResult PASS = new FilterResult(false, empty(), empty(), empty());
 
-    public static FilterResult failed(String filterType, String message) {
-        return new FilterResult(true, Optional.of(filterType), Optional.ofNullable(message), empty());
-    }
+  public static FilterResult failed(String filterType, String message) {
+    return new FilterResult(true, Optional.of(filterType), Optional.ofNullable(message), empty());
+  }
 
-    public static FilterResult failed(String filterType, Exception exception) {
-        return new FilterResult(true, Optional.of(filterType), empty(), Optional.ofNullable(exception));
-    }
+  public static FilterResult failed(String filterType, Exception exception) {
+    return new FilterResult(true, Optional.of(filterType), empty(), Optional.ofNullable(exception));
+  }
 
-    private FilterResult(boolean filtered,
-                         Optional<String> filterType,
-                         Optional<String> message,
-                         Optional<Exception> cause) {
-        this.filtered = filtered;
-        this.filterType = filterType;
-        this.message = message;
-        this.cause = cause;
-    }
+  private FilterResult(
+      boolean filtered,
+      Optional<String> filterType,
+      Optional<String> message,
+      Optional<Exception> cause) {
+    this.filtered = filtered;
+    this.filterType = filterType;
+    this.message = message;
+    this.cause = cause;
+  }
 
-    public boolean isFiltered() {
-        return filtered;
-    }
+  public boolean isFiltered() {
+    return filtered;
+  }
 
-    public Optional<String> getFilterType() {
-        return filterType;
-    }
+  public Optional<String> getFilterType() {
+    return filterType;
+  }
 
-    public Optional<String> getMessage() {
-        return message;
-    }
+  public Optional<String> getMessage() {
+    return message;
+  }
 
-    public Optional<Exception> getCause() {
-        return cause;
-    }
+  public Optional<Exception> getCause() {
+    return cause;
+  }
 
-    @Override
-    public String toString() {
-        return "[" + Joiner.on(",").skipNulls()
-                .join(format("%s={%s}", "filtered", filtered),
-                        toString("filterType", filterType),
-                        toString("message", message),
-                        toString("cause", cause)) + "]";
-    }
+  @Override
+  public String toString() {
+    return "["
+        + Joiner.on(",")
+            .skipNulls()
+            .join(
+                format("%s={%s}", "filtered", filtered),
+                toString("filterType", filterType),
+                toString("message", message),
+                toString("cause", cause))
+        + "]";
+  }
 
-    private String toString(String fieldName, Optional<?> value) {
-        return value.map(v -> format("%s={%s}", fieldName, v)).orElse(null);
-    }
+  private String toString(String fieldName, Optional<?> value) {
+    return value.map(v -> format("%s={%s}", fieldName, v)).orElse(null);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/header/HeaderPredicate.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/header/HeaderPredicate.java
index 33bd8819e2..e8e9102adc 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/header/HeaderPredicate.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/header/HeaderPredicate.java
@@ -1,27 +1,25 @@
 package pl.allegro.tech.hermes.domain.filtering.header;
 
-import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
-
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
+import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
 
 class HeaderPredicate implements Predicate<FilterableMessage> {
 
-    private final String name;
-    private final Pattern valuePattern;
+  private final String name;
+  private final Pattern valuePattern;
 
-    HeaderPredicate(String name, Pattern valuePattern) {
-        this.name = name;
-        this.valuePattern = valuePattern;
-    }
+  HeaderPredicate(String name, Pattern valuePattern) {
+    this.name = name;
+    this.valuePattern = valuePattern;
+  }
 
-    @Override
-    public boolean test(FilterableMessage message) {
-        return message.getExternalMetadata()
-                .entrySet().stream()
-                .filter(h -> h.getKey().equals(name))
-                .findFirst()
-                .filter(h -> valuePattern.matcher(h.getValue()).matches())
-                .isPresent();
-    }
+  @Override
+  public boolean test(FilterableMessage message) {
+    return message.getExternalMetadata().entrySet().stream()
+        .filter(h -> h.getKey().equals(name))
+        .findFirst()
+        .filter(h -> valuePattern.matcher(h.getValue()).matches())
+        .isPresent();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/header/HeaderSubscriptionMessageFilterCompiler.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/header/HeaderSubscriptionMessageFilterCompiler.java
index 4a1249a097..5b8d82ae1c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/header/HeaderSubscriptionMessageFilterCompiler.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/header/HeaderSubscriptionMessageFilterCompiler.java
@@ -1,22 +1,21 @@
 package pl.allegro.tech.hermes.domain.filtering.header;
 
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import pl.allegro.tech.hermes.api.MessageFilterSpecification;
 import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
 import pl.allegro.tech.hermes.domain.filtering.SubscriptionMessageFilterCompiler;
 
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
 public class HeaderSubscriptionMessageFilterCompiler implements SubscriptionMessageFilterCompiler {
 
-    @Override
-    public String getType() {
-        return "header";
-    }
-
-    @Override
-    public Predicate<FilterableMessage> compile(MessageFilterSpecification specification) {
-        return new HeaderPredicate(specification.getHeader(), Pattern.compile(specification.getMatcher()));
+  @Override
+  public String getType() {
+    return "header";
+  }
 
-    }
+  @Override
+  public Predicate<FilterableMessage> compile(MessageFilterSpecification specification) {
+    return new HeaderPredicate(
+        specification.getHeader(), Pattern.compile(specification.getMatcher()));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/json/JsonPathPredicate.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/json/JsonPathPredicate.java
index 2e90cc13c0..11793392d3 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/json/JsonPathPredicate.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/json/JsonPathPredicate.java
@@ -1,59 +1,65 @@
 package pl.allegro.tech.hermes.domain.filtering.json;
 
+import static pl.allegro.tech.hermes.domain.filtering.FilteringException.check;
+
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
+import java.io.ByteArrayInputStream;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
 import pl.allegro.tech.hermes.domain.filtering.FilteringException;
 import pl.allegro.tech.hermes.domain.filtering.MatchingStrategy;
 import pl.allegro.tech.hermes.domain.filtering.UnsupportedMatchingStrategyException;
 
-import java.io.ByteArrayInputStream;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
+class JsonPathPredicate implements Predicate<FilterableMessage> {
+  private final Configuration configuration;
+  private final String path;
+  private final Pattern matcher;
+  private final MatchingStrategy matchingStrategy;
 
-import static pl.allegro.tech.hermes.domain.filtering.FilteringException.check;
+  JsonPathPredicate(
+      String path,
+      Pattern matcher,
+      Configuration configuration,
+      MatchingStrategy matchingStrategy) {
+    this.path = path;
+    this.matcher = matcher;
+    this.configuration = configuration;
+    this.matchingStrategy = matchingStrategy;
+  }
 
-class JsonPathPredicate implements Predicate<FilterableMessage> {
-    private final Configuration configuration;
-    private final String path;
-    private final Pattern matcher;
-    private final MatchingStrategy matchingStrategy;
-
-    JsonPathPredicate(String path, Pattern matcher, Configuration configuration, MatchingStrategy matchingStrategy) {
-        this.path = path;
-        this.matcher = matcher;
-        this.configuration = configuration;
-        this.matchingStrategy = matchingStrategy;
-    }
+  @Override
+  public boolean test(FilterableMessage message) {
+    check(
+        message.getContentType() == ContentType.JSON,
+        "This filter supports only JSON contentType.");
+    try {
+      List<Object> result =
+          JsonPath.parse(new ByteArrayInputStream(message.getData()), configuration).read(path);
+      Stream<String> resultStream = result.stream().map(Object::toString);
 
-    @Override
-    public boolean test(FilterableMessage message) {
-        check(message.getContentType() == ContentType.JSON, "This filter supports only JSON contentType.");
-        try {
-            List<Object> result = JsonPath.parse(new ByteArrayInputStream(message.getData()), configuration).read(path);
-            Stream<String> resultStream = result.stream().map(Object::toString);
-
-            return !result.isEmpty() && matchResultsStream(resultStream);
-        } catch (Exception ex) {
-            throw new FilteringException(ex);
-        }
+      return !result.isEmpty() && matchResultsStream(resultStream);
+    } catch (Exception ex) {
+      throw new FilteringException(ex);
     }
+  }
 
-    private boolean matchResultsStream(Stream<String> results) {
-        switch (matchingStrategy) {
-            case ALL:
-                return results.allMatch(this::matches);
-            case ANY:
-                return results.anyMatch(this::matches);
-            default:
-                throw new UnsupportedMatchingStrategyException("avropath", matchingStrategy);
-        }
+  private boolean matchResultsStream(Stream<String> results) {
+    switch (matchingStrategy) {
+      case ALL:
+        return results.allMatch(this::matches);
+      case ANY:
+        return results.anyMatch(this::matches);
+      default:
+        throw new UnsupportedMatchingStrategyException("avropath", matchingStrategy);
     }
+  }
 
-    private boolean matches(String value) {
-        return matcher.matcher(value).matches();
-    }
+  private boolean matches(String value) {
+    return matcher.matcher(value).matches();
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/json/JsonPathSubscriptionMessageFilterCompiler.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/json/JsonPathSubscriptionMessageFilterCompiler.java
index c5fec7ca53..347b91621b 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/json/JsonPathSubscriptionMessageFilterCompiler.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/json/JsonPathSubscriptionMessageFilterCompiler.java
@@ -1,32 +1,32 @@
 package pl.allegro.tech.hermes.domain.filtering.json;
 
+import static com.jayway.jsonpath.Configuration.defaultConfiguration;
+
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.Option;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import pl.allegro.tech.hermes.api.MessageFilterSpecification;
 import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
 import pl.allegro.tech.hermes.domain.filtering.MatchingStrategy;
 import pl.allegro.tech.hermes.domain.filtering.SubscriptionMessageFilterCompiler;
 
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
-import static com.jayway.jsonpath.Configuration.defaultConfiguration;
-
-public class JsonPathSubscriptionMessageFilterCompiler implements SubscriptionMessageFilterCompiler {
-    private final Configuration configuration = defaultConfiguration().addOptions(Option.ALWAYS_RETURN_LIST, Option.SUPPRESS_EXCEPTIONS);
+public class JsonPathSubscriptionMessageFilterCompiler
+    implements SubscriptionMessageFilterCompiler {
+  private final Configuration configuration =
+      defaultConfiguration().addOptions(Option.ALWAYS_RETURN_LIST, Option.SUPPRESS_EXCEPTIONS);
 
-    @Override
-    public String getType() {
-        return "jsonpath";
-    }
+  @Override
+  public String getType() {
+    return "jsonpath";
+  }
 
-    @Override
-    public Predicate<FilterableMessage> compile(MessageFilterSpecification specification) {
-        return new JsonPathPredicate(
-            specification.getPath(),
-            Pattern.compile(specification.getMatcher()),
-            configuration,
-            MatchingStrategy.fromString(specification.getMatchingStrategy(), MatchingStrategy.ALL)
-        );
-    }
+  @Override
+  public Predicate<FilterableMessage> compile(MessageFilterSpecification specification) {
+    return new JsonPathPredicate(
+        specification.getPath(),
+        Pattern.compile(specification.getMatcher()),
+        configuration,
+        MatchingStrategy.fromString(specification.getMatchingStrategy(), MatchingStrategy.ALL));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupAlreadyExistsException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupAlreadyExistsException.java
index 4945b8be1a..a24359d4a7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupAlreadyExistsException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupAlreadyExistsException.java
@@ -5,17 +5,16 @@
 
 public class GroupAlreadyExistsException extends HermesException {
 
-    public GroupAlreadyExistsException(String groupName) {
-        super(String.format("Group %s already exists", groupName));
-    }
+  public GroupAlreadyExistsException(String groupName) {
+    super(String.format("Group %s already exists", groupName));
+  }
 
-    public GroupAlreadyExistsException(String groupName, Throwable cause) {
-        super(String.format("Group %s already exists", groupName), cause);
-    }
-
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.GROUP_ALREADY_EXISTS;
-    }
+  public GroupAlreadyExistsException(String groupName, Throwable cause) {
+    super(String.format("Group %s already exists", groupName), cause);
+  }
 
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.GROUP_ALREADY_EXISTS;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupNotEmptyException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupNotEmptyException.java
index 929f847f6d..74ad8f8530 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupNotEmptyException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupNotEmptyException.java
@@ -5,12 +5,12 @@
 
 public class GroupNotEmptyException extends HermesException {
 
-    public GroupNotEmptyException(String groupName) {
-        super(String.format("Group %s is not empty", groupName));
-    }
+  public GroupNotEmptyException(String groupName) {
+    super(String.format("Group %s is not empty", groupName));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.GROUP_NOT_EMPTY;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.GROUP_NOT_EMPTY;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupNotExistsException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupNotExistsException.java
index 35a5e03da0..0c6d589586 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupNotExistsException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupNotExistsException.java
@@ -5,16 +5,16 @@
 
 public class GroupNotExistsException extends HermesException {
 
-    public GroupNotExistsException(String groupName, Exception exception) {
-        super(String.format("Group %s does not exist", groupName), exception);
-    }
+  public GroupNotExistsException(String groupName, Exception exception) {
+    super(String.format("Group %s does not exist", groupName), exception);
+  }
 
-    public GroupNotExistsException(String groupName) {
-        this(groupName, null);
-    }
+  public GroupNotExistsException(String groupName) {
+    this(groupName, null);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.GROUP_NOT_EXISTS;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.GROUP_NOT_EXISTS;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupRepository.java
index 9dc3c65fb6..8def903fac 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/group/GroupRepository.java
@@ -1,25 +1,23 @@
 package pl.allegro.tech.hermes.domain.group;
 
-import pl.allegro.tech.hermes.api.Group;
-
 import java.util.List;
+import pl.allegro.tech.hermes.api.Group;
 
 public interface GroupRepository {
 
-    boolean groupExists(String groupName);
-
-    void ensureGroupExists(String groupName);
+  boolean groupExists(String groupName);
 
-    void createGroup(Group group);
+  void ensureGroupExists(String groupName);
 
-    void updateGroup(Group group);
+  void createGroup(Group group);
 
-    void removeGroup(String groupName);
+  void updateGroup(Group group);
 
-    List<String> listGroupNames();
+  void removeGroup(String groupName);
 
-    List<Group> listGroups();
+  List<String> listGroupNames();
 
-    Group getGroupDetails(String groupName);
+  List<Group> listGroups();
 
+  Group getGroupDetails(String groupName);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/AdminCallback.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/AdminCallback.java
index 3fff93f658..ae9057f5d5 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/AdminCallback.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/AdminCallback.java
@@ -2,6 +2,5 @@
 
 public interface AdminCallback {
 
-    void onAdminOperationCreated(String type, String content);
-
+  void onAdminOperationCreated(String type, String content);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/InternalNotificationsBus.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/InternalNotificationsBus.java
index 1aae720cd8..a6bf890919 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/InternalNotificationsBus.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/InternalNotificationsBus.java
@@ -1,13 +1,11 @@
 package pl.allegro.tech.hermes.domain.notifications;
 
-/**
- * All callbacks must be nonblocking.
- */
+/** All callbacks must be nonblocking. */
 public interface InternalNotificationsBus {
 
-    void registerSubscriptionCallback(SubscriptionCallback callback);
+  void registerSubscriptionCallback(SubscriptionCallback callback);
 
-    void registerTopicCallback(TopicCallback callback);
+  void registerTopicCallback(TopicCallback callback);
 
-    void registerAdminCallback(AdminCallback callback);
+  void registerAdminCallback(AdminCallback callback);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/SubscriptionCallback.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/SubscriptionCallback.java
index f6098e4851..5e5eeeec6f 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/SubscriptionCallback.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/SubscriptionCallback.java
@@ -4,13 +4,9 @@
 
 public interface SubscriptionCallback {
 
-    default void onSubscriptionCreated(Subscription subscription) {
-    }
+  default void onSubscriptionCreated(Subscription subscription) {}
 
-    default void onSubscriptionRemoved(Subscription subscription) {
-    }
-
-    default void onSubscriptionChanged(Subscription subscription) {
-    }
+  default void onSubscriptionRemoved(Subscription subscription) {}
 
+  default void onSubscriptionChanged(Subscription subscription) {}
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/TopicCallback.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/TopicCallback.java
index ce8f7e140d..a8a74df733 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/TopicCallback.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/notifications/TopicCallback.java
@@ -4,12 +4,9 @@
 
 public interface TopicCallback {
 
-    default void onTopicCreated(Topic topic) {
-    }
+  default void onTopicCreated(Topic topic) {}
 
-    default void onTopicRemoved(Topic topic) {
-    }
+  default void onTopicRemoved(Topic topic) {}
 
-    default void onTopicChanged(Topic topic) {
-    }
+  default void onTopicChanged(Topic topic) {}
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderAlreadyExistsException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderAlreadyExistsException.java
index 3657510235..ef11b4e71e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderAlreadyExistsException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderAlreadyExistsException.java
@@ -6,12 +6,12 @@
 
 public class OAuthProviderAlreadyExistsException extends HermesException {
 
-    public OAuthProviderAlreadyExistsException(OAuthProvider oAuthProvider, Throwable cause) {
-        super(String.format("OAuth Provider %s already exists", oAuthProvider.getName()), cause);
-    }
+  public OAuthProviderAlreadyExistsException(OAuthProvider oAuthProvider, Throwable cause) {
+    super(String.format("OAuth Provider %s already exists", oAuthProvider.getName()), cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OAUTH_PROVIDER_ALREADY_EXISTS;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OAUTH_PROVIDER_ALREADY_EXISTS;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderNotExistsException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderNotExistsException.java
index 2b1359cb90..b209534f54 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderNotExistsException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderNotExistsException.java
@@ -5,12 +5,12 @@
 
 public class OAuthProviderNotExistsException extends HermesException {
 
-    public OAuthProviderNotExistsException(String oAuthProviderName) {
-        super(String.format("OAuth provider %s does not exist", oAuthProviderName));
-    }
+  public OAuthProviderNotExistsException(String oAuthProviderName) {
+    super(String.format("OAuth provider %s does not exist", oAuthProviderName));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OAUTH_PROVIDER_NOT_EXISTS;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OAUTH_PROVIDER_NOT_EXISTS;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderRepository.java
index 3d443dac9d..2fea65ef59 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/oauth/OAuthProviderRepository.java
@@ -1,24 +1,23 @@
 package pl.allegro.tech.hermes.domain.oauth;
 
-import pl.allegro.tech.hermes.api.OAuthProvider;
-
 import java.util.List;
+import pl.allegro.tech.hermes.api.OAuthProvider;
 
 public interface OAuthProviderRepository {
 
-    boolean oAuthProviderExists(String oAuthProviderName);
+  boolean oAuthProviderExists(String oAuthProviderName);
 
-    void ensureOAuthProviderExists(String oAuthProviderName);
+  void ensureOAuthProviderExists(String oAuthProviderName);
 
-    List<String> listOAuthProviderNames();
+  List<String> listOAuthProviderNames();
 
-    List<OAuthProvider> listOAuthProviders();
+  List<OAuthProvider> listOAuthProviders();
 
-    OAuthProvider getOAuthProviderDetails(String oAuthProviderName);
+  OAuthProvider getOAuthProviderDetails(String oAuthProviderName);
 
-    void createOAuthProvider(OAuthProvider oAuthProvider);
+  void createOAuthProvider(OAuthProvider oAuthProvider);
 
-    void updateOAuthProvider(OAuthProvider oAuthprovider);
+  void updateOAuthProvider(OAuthProvider oAuthprovider);
 
-    void removeOAuthProvider(String oAuthProviderName);
+  void removeOAuthProvider(String oAuthProviderName);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/readiness/DatacenterReadinessList.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/readiness/DatacenterReadinessList.java
new file mode 100644
index 0000000000..72736874b7
--- /dev/null
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/readiness/DatacenterReadinessList.java
@@ -0,0 +1,14 @@
+package pl.allegro.tech.hermes.domain.readiness;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import pl.allegro.tech.hermes.api.DatacenterReadiness;
+
+public record DatacenterReadinessList(List<DatacenterReadiness> datacenters) {
+  @JsonCreator
+  public DatacenterReadinessList(
+      @JsonProperty("datacenters") List<DatacenterReadiness> datacenters) {
+    this.datacenters = datacenters;
+  }
+}
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionAlreadyExistsException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionAlreadyExistsException.java
index 17a23bfd20..7a1da173a8 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionAlreadyExistsException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionAlreadyExistsException.java
@@ -6,21 +6,22 @@
 
 public class SubscriptionAlreadyExistsException extends HermesException {
 
-    public SubscriptionAlreadyExistsException(Subscription subscription, Throwable cause) {
-        super(message(subscription), cause);
-    }
+  public SubscriptionAlreadyExistsException(Subscription subscription, Throwable cause) {
+    super(message(subscription), cause);
+  }
 
-    public SubscriptionAlreadyExistsException(Subscription subscription) {
-        super(message(subscription));
-    }
+  public SubscriptionAlreadyExistsException(Subscription subscription) {
+    super(message(subscription));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SUBSCRIPTION_ALREADY_EXISTS;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SUBSCRIPTION_ALREADY_EXISTS;
+  }
 
-    private static String message(Subscription subscription) {
-        return String.format("Subscription %s for topic %s already exists.",
-                subscription.getName(), subscription.getQualifiedTopicName());
-    }
+  private static String message(Subscription subscription) {
+    return String.format(
+        "Subscription %s for topic %s already exists.",
+        subscription.getName(), subscription.getQualifiedTopicName());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionNotExistsException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionNotExistsException.java
index 6d1b8d5827..034c8ac5b7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionNotExistsException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionNotExistsException.java
@@ -6,12 +6,14 @@
 
 public class SubscriptionNotExistsException extends HermesException {
 
-    public SubscriptionNotExistsException(TopicName topic, String subscription) {
-        super(String.format("Subscription %s for topic %s does not exist.", subscription, topic.qualifiedName()));
-    }
+  public SubscriptionNotExistsException(TopicName topic, String subscription) {
+    super(
+        String.format(
+            "Subscription %s for topic %s does not exist.", subscription, topic.qualifiedName()));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SUBSCRIPTION_NOT_EXISTS;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SUBSCRIPTION_NOT_EXISTS;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionRepository.java
index 7aabc431a0..3c6c690d6e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/subscription/SubscriptionRepository.java
@@ -1,35 +1,35 @@
 package pl.allegro.tech.hermes.domain.subscription;
 
+import java.util.Collection;
+import java.util.List;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.TopicName;
 
-import java.util.Collection;
-import java.util.List;
-
 public interface SubscriptionRepository {
 
-    boolean subscriptionExists(TopicName topicName, String subscriptionName);
+  boolean subscriptionExists(TopicName topicName, String subscriptionName);
 
-    void ensureSubscriptionExists(TopicName topicName, String subscriptionName);
+  void ensureSubscriptionExists(TopicName topicName, String subscriptionName);
 
-    void createSubscription(Subscription subscription);
+  void createSubscription(Subscription subscription);
 
-    void removeSubscription(TopicName topicName, String subscriptionName);
+  void removeSubscription(TopicName topicName, String subscriptionName);
 
-    void updateSubscription(Subscription modifiedSubscription);
+  void updateSubscription(Subscription modifiedSubscription);
 
-    void updateSubscriptionState(TopicName topicName, String subscriptionName, Subscription.State state);
+  void updateSubscriptionState(
+      TopicName topicName, String subscriptionName, Subscription.State state);
 
-    Subscription getSubscriptionDetails(TopicName topicName, String subscriptionName);
+  Subscription getSubscriptionDetails(TopicName topicName, String subscriptionName);
 
-    Subscription getSubscriptionDetails(SubscriptionName subscriptionNames);
+  Subscription getSubscriptionDetails(SubscriptionName subscriptionNames);
 
-    List<Subscription> getSubscriptionDetails(Collection<SubscriptionName> subscriptionNames);
+  List<Subscription> getSubscriptionDetails(Collection<SubscriptionName> subscriptionNames);
 
-    List<String> listSubscriptionNames(TopicName topicName);
+  List<String> listSubscriptionNames(TopicName topicName);
 
-    List<Subscription> listSubscriptions(TopicName topicName);
+  List<Subscription> listSubscriptions(TopicName topicName);
 
-    List<Subscription> listAllSubscriptions();
+  List<Subscription> listAllSubscriptions();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicAlreadyExistsException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicAlreadyExistsException.java
index 0bb0530150..6aca9b0222 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicAlreadyExistsException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicAlreadyExistsException.java
@@ -6,16 +6,16 @@
 
 public class TopicAlreadyExistsException extends HermesException {
 
-    public TopicAlreadyExistsException(TopicName topicName, Throwable cause) {
-        super(String.format("Topic %s already exists", topicName.qualifiedName()), cause);
-    }
+  public TopicAlreadyExistsException(TopicName topicName, Throwable cause) {
+    super(String.format("Topic %s already exists", topicName.qualifiedName()), cause);
+  }
 
-    public TopicAlreadyExistsException(TopicName topicName) {
-        super(String.format("Topic %s already exists", topicName.qualifiedName()));
-    }
+  public TopicAlreadyExistsException(TopicName topicName) {
+    super(String.format("Topic %s already exists", topicName.qualifiedName()));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.TOPIC_ALREADY_EXISTS;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.TOPIC_ALREADY_EXISTS;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicNotEmptyException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicNotEmptyException.java
index 4c00fd8888..23e26e7334 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicNotEmptyException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicNotEmptyException.java
@@ -6,12 +6,12 @@
 
 public class TopicNotEmptyException extends HermesException {
 
-    public TopicNotEmptyException(TopicName topicName) {
-        super(String.format("Topic %s is not empty", topicName.qualifiedName()));
-    }
+  public TopicNotEmptyException(TopicName topicName) {
+    super(String.format("Topic %s is not empty", topicName.qualifiedName()));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.TOPIC_NOT_EMPTY;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.TOPIC_NOT_EMPTY;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicNotExistsException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicNotExistsException.java
index dc36d258aa..da889f6baf 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicNotExistsException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicNotExistsException.java
@@ -6,16 +6,16 @@
 
 public class TopicNotExistsException extends HermesException {
 
-    public TopicNotExistsException(TopicName topicName, Exception exception) {
-        super(String.format("Topic %s does not exist", topicName.qualifiedName()), exception);
-    }
+  public TopicNotExistsException(TopicName topicName, Exception exception) {
+    super(String.format("Topic %s does not exist", topicName.qualifiedName()), exception);
+  }
 
-    public TopicNotExistsException(TopicName topicName) {
-        this(topicName, null);
-    }
+  public TopicNotExistsException(TopicName topicName) {
+    this(topicName, null);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.TOPIC_NOT_EXISTS;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.TOPIC_NOT_EXISTS;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicRepository.java
index 9c43d87fe9..889e3e6754 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/TopicRepository.java
@@ -1,33 +1,31 @@
 package pl.allegro.tech.hermes.domain.topic;
 
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicName;
-
 import java.util.Collection;
 import java.util.List;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public interface TopicRepository {
 
-    boolean topicExists(TopicName topicName);
-
-    void ensureTopicExists(TopicName topicName);
+  boolean topicExists(TopicName topicName);
 
-    List<String> listTopicNames(String groupName);
+  void ensureTopicExists(TopicName topicName);
 
-    List<Topic> listTopics(String groupName);
+  List<String> listTopicNames(String groupName);
 
-    void createTopic(Topic topic);
+  List<Topic> listTopics(String groupName);
 
-    void removeTopic(TopicName topicName);
+  void createTopic(Topic topic);
 
-    void updateTopic(Topic topic);
+  void removeTopic(TopicName topicName);
 
-    void touchTopic(TopicName topicName);
+  void updateTopic(Topic topic);
 
-    Topic getTopicDetails(TopicName topicName);
+  void touchTopic(TopicName topicName);
 
-    List<Topic> getTopicsDetails(Collection<TopicName> topicNames);
+  Topic getTopicDetails(TopicName topicName);
 
-    List<Topic> listAllTopics();
+  List<Topic> getTopicsDetails(Collection<TopicName> topicNames);
 
+  List<Topic> listAllTopics();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/MessagePreview.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/MessagePreview.java
index 9f9d3ce5d9..a0a7dd7649 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/MessagePreview.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/MessagePreview.java
@@ -5,25 +5,26 @@
 
 public class MessagePreview {
 
-    private final byte[] content;
+  private final byte[] content;
 
-    private final boolean truncated;
+  private final boolean truncated;
 
-    @JsonCreator
-    public MessagePreview(@JsonProperty("content") byte[] content, @JsonProperty("truncated") boolean truncated) {
-        this.content = content;
-        this.truncated = truncated;
-    }
+  @JsonCreator
+  public MessagePreview(
+      @JsonProperty("content") byte[] content, @JsonProperty("truncated") boolean truncated) {
+    this.content = content;
+    this.truncated = truncated;
+  }
 
-    public MessagePreview(byte[] content) {
-        this(content, false);
-    }
+  public MessagePreview(byte[] content) {
+    this(content, false);
+  }
 
-    public byte[] getContent() {
-        return content;
-    }
+  public byte[] getContent() {
+    return content;
+  }
 
-    public boolean isTruncated() {
-        return truncated;
-    }
+  public boolean isTruncated() {
+    return truncated;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/MessagePreviewRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/MessagePreviewRepository.java
index 8f06e044aa..fe8024d798 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/MessagePreviewRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/MessagePreviewRepository.java
@@ -1,13 +1,11 @@
 package pl.allegro.tech.hermes.domain.topic.preview;
 
-import pl.allegro.tech.hermes.api.TopicName;
-
 import java.util.List;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public interface MessagePreviewRepository {
 
-    List<MessagePreview> loadPreview(TopicName topicName);
-
-    void persist(TopicsMessagesPreview topicsMessagesPreview);
+  List<MessagePreview> loadPreview(TopicName topicName);
 
+  void persist(TopicsMessagesPreview topicsMessagesPreview);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/TopicsMessagesPreview.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/TopicsMessagesPreview.java
index e15431b058..6ab775bf8c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/TopicsMessagesPreview.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/topic/preview/TopicsMessagesPreview.java
@@ -1,27 +1,26 @@
 package pl.allegro.tech.hermes.domain.topic.preview;
 
-import pl.allegro.tech.hermes.api.TopicName;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public class TopicsMessagesPreview {
 
-    private final Map<TopicName, List<MessagePreview>> messages = new HashMap<>();
+  private final Map<TopicName, List<MessagePreview>> messages = new HashMap<>();
 
-    public void add(TopicName topicName, MessagePreview message) {
-        List<MessagePreview> messageList = messages.computeIfAbsent(topicName, k -> new ArrayList<>());
-        messageList.add(message);
-    }
+  public void add(TopicName topicName, MessagePreview message) {
+    List<MessagePreview> messageList = messages.computeIfAbsent(topicName, k -> new ArrayList<>());
+    messageList.add(message);
+  }
 
-    public Collection<TopicName> topics() {
-        return messages.keySet();
-    }
+  public Collection<TopicName> topics() {
+    return messages.keySet();
+  }
 
-    public List<MessagePreview> previewOf(TopicName topic) {
-        return messages.getOrDefault(topic, new ArrayList<>());
-    }
+  public List<MessagePreview> previewOf(TopicName topic) {
+    return messages.getOrDefault(topic, new ArrayList<>());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/ConsumersWorkloadConstraints.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/ConsumersWorkloadConstraints.java
index 436a2c0722..4efc1ac8e9 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/ConsumersWorkloadConstraints.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/ConsumersWorkloadConstraints.java
@@ -1,47 +1,47 @@
 package pl.allegro.tech.hermes.domain.workload.constraints;
 
 import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import java.util.Objects;
 import pl.allegro.tech.hermes.api.Constraints;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.TopicName;
 
-import java.util.Map;
-import java.util.Objects;
-
 public class ConsumersWorkloadConstraints {
 
-    private final Map<TopicName, Constraints> topicConstraints;
-    private final Map<SubscriptionName, Constraints> subscriptionConstraints;
+  private final Map<TopicName, Constraints> topicConstraints;
+  private final Map<SubscriptionName, Constraints> subscriptionConstraints;
 
-    public ConsumersWorkloadConstraints(Map<TopicName, Constraints> topicConstraints,
-                                 Map<SubscriptionName, Constraints> subscriptionConstraints) {
-        this.topicConstraints = ImmutableMap.copyOf(topicConstraints);
-        this.subscriptionConstraints = ImmutableMap.copyOf(subscriptionConstraints);
-    }
+  public ConsumersWorkloadConstraints(
+      Map<TopicName, Constraints> topicConstraints,
+      Map<SubscriptionName, Constraints> subscriptionConstraints) {
+    this.topicConstraints = ImmutableMap.copyOf(topicConstraints);
+    this.subscriptionConstraints = ImmutableMap.copyOf(subscriptionConstraints);
+  }
 
-    public Map<TopicName, Constraints> getTopicConstraints() {
-        return topicConstraints;
-    }
+  public Map<TopicName, Constraints> getTopicConstraints() {
+    return topicConstraints;
+  }
 
-    public Map<SubscriptionName, Constraints> getSubscriptionConstraints() {
-        return subscriptionConstraints;
-    }
+  public Map<SubscriptionName, Constraints> getSubscriptionConstraints() {
+    return subscriptionConstraints;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumersWorkloadConstraints that = (ConsumersWorkloadConstraints) o;
-        return Objects.equals(topicConstraints, that.topicConstraints)
-                && Objects.equals(subscriptionConstraints, that.subscriptionConstraints);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(topicConstraints, subscriptionConstraints);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumersWorkloadConstraints that = (ConsumersWorkloadConstraints) o;
+    return Objects.equals(topicConstraints, that.topicConstraints)
+        && Objects.equals(subscriptionConstraints, that.subscriptionConstraints);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(topicConstraints, subscriptionConstraints);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/SubscriptionConstraintsAlreadyExistException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/SubscriptionConstraintsAlreadyExistException.java
index 9deab17e7e..501a81681a 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/SubscriptionConstraintsAlreadyExistException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/SubscriptionConstraintsAlreadyExistException.java
@@ -1,19 +1,23 @@
 package pl.allegro.tech.hermes.domain.workload.constraints;
 
+import static pl.allegro.tech.hermes.api.ErrorCode.SUBSCRIPTION_CONSTRAINTS_ALREADY_EXIST;
+
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.exception.HermesException;
 
-import static pl.allegro.tech.hermes.api.ErrorCode.SUBSCRIPTION_CONSTRAINTS_ALREADY_EXIST;
-
 public class SubscriptionConstraintsAlreadyExistException extends HermesException {
 
-    public SubscriptionConstraintsAlreadyExistException(SubscriptionName subscriptionName, Throwable cause) {
-        super(String.format("Constraints for subscription %s already exist.", subscriptionName.getQualifiedName()), cause);
-    }
+  public SubscriptionConstraintsAlreadyExistException(
+      SubscriptionName subscriptionName, Throwable cause) {
+    super(
+        String.format(
+            "Constraints for subscription %s already exist.", subscriptionName.getQualifiedName()),
+        cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return SUBSCRIPTION_CONSTRAINTS_ALREADY_EXIST;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return SUBSCRIPTION_CONSTRAINTS_ALREADY_EXIST;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/SubscriptionConstraintsDoNotExistException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/SubscriptionConstraintsDoNotExistException.java
index b1f7ca258d..133e60ff57 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/SubscriptionConstraintsDoNotExistException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/SubscriptionConstraintsDoNotExistException.java
@@ -1,19 +1,23 @@
 package pl.allegro.tech.hermes.domain.workload.constraints;
 
+import static pl.allegro.tech.hermes.api.ErrorCode.SUBSCRIPTION_CONSTRAINTS_DO_NOT_EXIST;
+
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.exception.HermesException;
 
-import static pl.allegro.tech.hermes.api.ErrorCode.SUBSCRIPTION_CONSTRAINTS_DO_NOT_EXIST;
-
 public class SubscriptionConstraintsDoNotExistException extends HermesException {
 
-    public SubscriptionConstraintsDoNotExistException(SubscriptionName subscriptionName, Throwable cause) {
-        super(String.format("Constraints for subscription %s do not exist.", subscriptionName.getQualifiedName()), cause);
-    }
+  public SubscriptionConstraintsDoNotExistException(
+      SubscriptionName subscriptionName, Throwable cause) {
+    super(
+        String.format(
+            "Constraints for subscription %s do not exist.", subscriptionName.getQualifiedName()),
+        cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return SUBSCRIPTION_CONSTRAINTS_DO_NOT_EXIST;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return SUBSCRIPTION_CONSTRAINTS_DO_NOT_EXIST;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/TopicConstraintsAlreadyExistException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/TopicConstraintsAlreadyExistException.java
index 485eda8cfa..12196494b2 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/TopicConstraintsAlreadyExistException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/TopicConstraintsAlreadyExistException.java
@@ -5,12 +5,13 @@
 import pl.allegro.tech.hermes.common.exception.HermesException;
 
 public class TopicConstraintsAlreadyExistException extends HermesException {
-    public TopicConstraintsAlreadyExistException(TopicName topicName, Throwable cause) {
-        super(String.format("Constraints for topic %s already exist.", topicName.qualifiedName()), cause);
-    }
+  public TopicConstraintsAlreadyExistException(TopicName topicName, Throwable cause) {
+    super(
+        String.format("Constraints for topic %s already exist.", topicName.qualifiedName()), cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.TOPIC_CONSTRAINTS_ALREADY_EXIST;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.TOPIC_CONSTRAINTS_ALREADY_EXIST;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/TopicConstraintsDoNotExistException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/TopicConstraintsDoNotExistException.java
index e34385ed0a..bbd7899e8a 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/TopicConstraintsDoNotExistException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/TopicConstraintsDoNotExistException.java
@@ -1,19 +1,20 @@
 package pl.allegro.tech.hermes.domain.workload.constraints;
 
+import static pl.allegro.tech.hermes.api.ErrorCode.TOPIC_CONSTRAINTS_DO_NOT_EXIST;
+
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.common.exception.HermesException;
 
-import static pl.allegro.tech.hermes.api.ErrorCode.TOPIC_CONSTRAINTS_DO_NOT_EXIST;
-
 public class TopicConstraintsDoNotExistException extends HermesException {
 
-    public TopicConstraintsDoNotExistException(TopicName topicName, Throwable cause) {
-        super(String.format("Constraints for topic %s do not exist.", topicName.qualifiedName()), cause);
-    }
+  public TopicConstraintsDoNotExistException(TopicName topicName, Throwable cause) {
+    super(
+        String.format("Constraints for topic %s do not exist.", topicName.qualifiedName()), cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return TOPIC_CONSTRAINTS_DO_NOT_EXIST;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return TOPIC_CONSTRAINTS_DO_NOT_EXIST;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/WorkloadConstraintsRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/WorkloadConstraintsRepository.java
index e5b153ee8a..ce1bf4aa5c 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/WorkloadConstraintsRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/domain/workload/constraints/WorkloadConstraintsRepository.java
@@ -6,21 +6,21 @@
 
 public interface WorkloadConstraintsRepository {
 
-    ConsumersWorkloadConstraints getConsumersWorkloadConstraints();
+  ConsumersWorkloadConstraints getConsumersWorkloadConstraints();
 
-    void createConstraints(TopicName topicName, Constraints constraints);
+  void createConstraints(TopicName topicName, Constraints constraints);
 
-    void createConstraints(SubscriptionName subscriptionName, Constraints constraints);
+  void createConstraints(SubscriptionName subscriptionName, Constraints constraints);
 
-    void updateConstraints(TopicName topicName, Constraints constraints);
+  void updateConstraints(TopicName topicName, Constraints constraints);
 
-    void updateConstraints(SubscriptionName subscriptionName, Constraints constraints);
+  void updateConstraints(SubscriptionName subscriptionName, Constraints constraints);
 
-    void deleteConstraints(TopicName topicName);
+  void deleteConstraints(TopicName topicName);
 
-    void deleteConstraints(SubscriptionName subscriptionName);
+  void deleteConstraints(SubscriptionName subscriptionName);
 
-    boolean constraintsExist(TopicName topicName);
+  boolean constraintsExist(TopicName topicName);
 
-    boolean constraintsExist(SubscriptionName subscriptionName);
+  boolean constraintsExist(SubscriptionName subscriptionName);
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/MalformedDataException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/MalformedDataException.java
index 62495f9acf..137bdfe42e 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/MalformedDataException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/MalformedDataException.java
@@ -2,8 +2,7 @@
 
 public class MalformedDataException extends RuntimeException {
 
-    public MalformedDataException(String path, Throwable throwable) {
-        super(String.format("Unable to read data from path %s", path), throwable);
-    }
-
+  public MalformedDataException(String path, Throwable throwable) {
+    super(String.format("Unable to read data from path %s", path), throwable);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DatacenterNameProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DatacenterNameProvider.java
index e0ad86da8b..ede547f611 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DatacenterNameProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DatacenterNameProvider.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.infrastructure.dc;
 
 public interface DatacenterNameProvider {
-    String getDatacenterName();
+  String getDatacenterName();
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DcNameProvisionException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DcNameProvisionException.java
index ed7f41ccca..0a4967b028 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DcNameProvisionException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DcNameProvisionException.java
@@ -2,7 +2,7 @@
 
 public class DcNameProvisionException extends RuntimeException {
 
-    public DcNameProvisionException(String message) {
-        super(message);
-    }
+  public DcNameProvisionException(String message) {
+    super(message);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DcNameSource.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DcNameSource.java
index adc1a28b66..864b838a47 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DcNameSource.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DcNameSource.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.infrastructure.dc;
 
 public enum DcNameSource {
-    ENV
+  ENV
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DefaultDatacenterNameProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DefaultDatacenterNameProvider.java
index 9da8bd9872..aa8f65af26 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DefaultDatacenterNameProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/DefaultDatacenterNameProvider.java
@@ -5,13 +5,13 @@
 
 public class DefaultDatacenterNameProvider implements DatacenterNameProvider {
 
-    private static final Logger logger = LoggerFactory.getLogger(DefaultDatacenterNameProvider.class);
+  private static final Logger logger = LoggerFactory.getLogger(DefaultDatacenterNameProvider.class);
 
-    public static final String DEFAULT_DC_NAME = "dc";
+  public static final String DEFAULT_DC_NAME = "dc";
 
-    @Override
-    public String getDatacenterName() {
-        logger.info("Providing default datacenter name: {}", DEFAULT_DC_NAME);
-        return DEFAULT_DC_NAME;
-    }
+  @Override
+  public String getDatacenterName() {
+    logger.info("Providing default datacenter name: {}", DEFAULT_DC_NAME);
+    return DEFAULT_DC_NAME;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/EnvironmentVariableDatacenterNameProvider.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/EnvironmentVariableDatacenterNameProvider.java
index 5588b4a3f9..7f31348041 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/EnvironmentVariableDatacenterNameProvider.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/dc/EnvironmentVariableDatacenterNameProvider.java
@@ -4,22 +4,23 @@
 import org.slf4j.LoggerFactory;
 
 public class EnvironmentVariableDatacenterNameProvider implements DatacenterNameProvider {
-    private static final Logger logger = LoggerFactory.getLogger(EnvironmentVariableDatacenterNameProvider.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(EnvironmentVariableDatacenterNameProvider.class);
 
-    private final String variableName;
+  private final String variableName;
 
-    public EnvironmentVariableDatacenterNameProvider(String variableName) {
-        this.variableName = variableName;
-    }
+  public EnvironmentVariableDatacenterNameProvider(String variableName) {
+    this.variableName = variableName;
+  }
 
-    @Override
-    public String getDatacenterName() {
-        String dcName = System.getenv(variableName);
-        if (dcName == null) {
-            logger.info("Undefined environment variable: " + variableName);
-            throw new DcNameProvisionException("Undefined environment variable: " + variableName);
-        }
-        logger.info("Providing DC name from environment variable: {}={}", variableName, dcName);
-        return dcName;
+  @Override
+  public String getDatacenterName() {
+    String dcName = System.getenv(variableName);
+    if (dcName == null) {
+      logger.info("Undefined environment variable: " + variableName);
+      throw new DcNameProvisionException("Undefined environment variable: " + variableName);
     }
+    logger.info("Providing DC name from environment variable: {}={}", variableName, dcName);
+    return dcName;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/logback/AggregatingTurboFilter.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/logback/AggregatingTurboFilter.java
index 45507bb45e..6ac82a8920 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/logback/AggregatingTurboFilter.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/logback/AggregatingTurboFilter.java
@@ -5,9 +5,6 @@
 import ch.qos.logback.classic.turbo.TurboFilter;
 import ch.qos.logback.core.spi.FilterReply;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -20,22 +17,25 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.LongAdder;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 
 /**
- * <p>This class is an implementation of {@link TurboFilter} interface that allows messages of configured loggers
- * to be aggregated and logged only once with specified time interval.</p>
+ * This class is an implementation of {@link TurboFilter} interface that allows messages of
+ * configured loggers to be aggregated and logged only once with specified time interval.
  *
- * <p>Logged message contains a suffix "[occurrences=N]" with a number of logged events.
- * The logging part is a little bit tricky, as the <code>TurboFilter</code> interface does not support a way of logging out of the box,
- * it just tells whether a logged message should be passed further or not.
- * In order to logging be possible from the <code>TurboFilter</code> a small trick has to be applied, the logged message is enriched
- * with a custom {@link Marker} which is checked by the filter itself, so it won't filter it's own messages
- * and we manage to avoid recursion.</p>
+ * <p>Logged message contains a suffix "[occurrences=N]" with a number of logged events. The logging
+ * part is a little bit tricky, as the <code>TurboFilter</code> interface does not support a way of
+ * logging out of the box, it just tells whether a logged message should be passed further or not.
+ * In order to logging be possible from the <code>TurboFilter</code> a small trick has to be
+ * applied, the logged message is enriched with a custom {@link Marker} which is checked by the
+ * filter itself, so it won't filter it's own messages and we manage to avoid recursion.
  *
- * <p>An instance of <code>AggregatingTurboFilter</code> starts it's own scheduled executor service with a single thread
- * that logs the messages asynchronously.</p>
+ * <p>An instance of <code>AggregatingTurboFilter</code> starts it's own scheduled executor service
+ * with a single thread that logs the messages asynchronously.
  *
  * <p>Example logback configuration:
+ *
  * <pre>{@code
  *  <configuration>
  *      ...
@@ -51,167 +51,189 @@
  */
 public class AggregatingTurboFilter extends TurboFilter {
 
-    static final Marker MARKER = MarkerFactory.getMarker("AggregatingTurboFilterMarker");
-
-    private ScheduledExecutorService executorService;
-    private final List<String> aggregatedLogger = new ArrayList<>();
-    private long reportingIntervalMillis = 10_000;
+  static final Marker MARKER = MarkerFactory.getMarker("AggregatingTurboFilterMarker");
 
-    private final Map<Logger, LoggerAggregates> logAggregates = new ConcurrentHashMap<>();
+  private ScheduledExecutorService executorService;
+  private final List<String> aggregatedLogger = new ArrayList<>();
+  private long reportingIntervalMillis = 10_000;
 
-    private static final LongAdder filterClassCounter = new LongAdder();
+  private final Map<Logger, LoggerAggregates> logAggregates = new ConcurrentHashMap<>();
 
-    @Override
-    public void start() {
-        super.start();
-        if (!aggregatedLogger.isEmpty()) {
-            ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                    .setNameFormat("aggregating-filter-" + filterClassCounter.longValue() + "-thread-%d")
-                    .build();
-            filterClassCounter.increment();
-            executorService = Executors.newSingleThreadScheduledExecutor(threadFactory);
-            executorService.scheduleAtFixedRate(this::report, 0L, getReportingIntervalMillis(), TimeUnit.MILLISECONDS);
-        }
-    }
+  private static final LongAdder filterClassCounter = new LongAdder();
 
-    @Override
-    public void stop() {
-        executorService.shutdownNow();
-        super.stop();
+  @Override
+  public void start() {
+    super.start();
+    if (!aggregatedLogger.isEmpty()) {
+      ThreadFactory threadFactory =
+          new ThreadFactoryBuilder()
+              .setNameFormat("aggregating-filter-" + filterClassCounter.longValue() + "-thread-%d")
+              .build();
+      filterClassCounter.increment();
+      executorService = Executors.newSingleThreadScheduledExecutor(threadFactory);
+      executorService.scheduleAtFixedRate(
+          this::report, 0L, getReportingIntervalMillis(), TimeUnit.MILLISECONDS);
     }
-
-    void report() {
-        logAggregates.forEach((logger, loggerAggregates) ->
-                loggerAggregates.aggregates.keySet().forEach(entry -> {
-                    loggerAggregates.aggregates.computeIfPresent(entry, (key, summary) -> {
-                        logger.log(key.marker, Logger.FQCN, key.level,
+  }
+
+  @Override
+  public void stop() {
+    executorService.shutdownNow();
+    super.stop();
+  }
+
+  void report() {
+    logAggregates.forEach(
+        (logger, loggerAggregates) ->
+            loggerAggregates
+                .aggregates
+                .keySet()
+                .forEach(
+                    entry -> {
+                      loggerAggregates.aggregates.computeIfPresent(
+                          entry,
+                          (key, summary) -> {
+                            logger.log(
+                                key.marker,
+                                Logger.FQCN,
+                                key.level,
                                 key.message + " [occurrences=" + summary.logsCount + "]",
-                                key.params, summary.lastException);
-                        return null;
-                    });
-                }));
+                                key.params,
+                                summary.lastException);
+                            return null;
+                          });
+                    }));
+  }
+
+  @Override
+  public FilterReply decide(
+      Marker marker, Logger logger, Level level, String message, Object[] params, Throwable ex) {
+    if (isAggregatedLog(marker)) { // prevent recursion for aggregated logger events
+      return FilterReply.NEUTRAL;
     }
-
-    @Override
-    public FilterReply decide(Marker marker, Logger logger, Level level, String message, Object[] params, Throwable ex) {
-        if (isAggregatedLog(marker)) { // prevent recursion for aggregated logger events
-            return FilterReply.NEUTRAL;
-        }
-        if (!aggregatedLogger.contains(logger.getName())) {
-            return FilterReply.NEUTRAL;
-        }
-
-        if (ex == null) {
-            Optional<Throwable> throwable = extractLastParamThrowable(params);
-            if (throwable.isPresent()) {
-                ex = throwable.get();
-                params = Arrays.copyOfRange(params, 0, params.length - 1);
-            }
-        }
-        Throwable exception = ex;
-
-        LoggingEventKey loggingEventKey = new LoggingEventKey(message, params, level, getEnrichedMarker(marker));
-        logAggregates.computeIfAbsent(logger, l -> new LoggerAggregates())
-                .aggregates.merge(loggingEventKey, new AggregateSummary(ex),
-                (currentAggregate, emptyAggregate) -> AggregateSummary.incrementCount(currentAggregate, exception));
-
-        return FilterReply.DENY;
+    if (!aggregatedLogger.contains(logger.getName())) {
+      return FilterReply.NEUTRAL;
     }
 
-    private boolean isAggregatedLog(Marker marker) {
-        return marker != null && (marker.equals(MARKER) || marker.contains(MARKER));
+    if (ex == null) {
+      Optional<Throwable> throwable = extractLastParamThrowable(params);
+      if (throwable.isPresent()) {
+        ex = throwable.get();
+        params = Arrays.copyOfRange(params, 0, params.length - 1);
+      }
     }
-
-    private Optional<Throwable> extractLastParamThrowable(Object[] params) {
-        return Optional.ofNullable(params)
-                .map(Arrays::stream)
-                .flatMap(a -> a.skip(params.length - 1)
-                        .findFirst()
-                        .filter(o -> o instanceof Throwable)
-                        .map(Throwable.class::cast));
+    Throwable exception = ex;
+
+    LoggingEventKey loggingEventKey =
+        new LoggingEventKey(message, params, level, getEnrichedMarker(marker));
+    logAggregates
+        .computeIfAbsent(logger, l -> new LoggerAggregates())
+        .aggregates
+        .merge(
+            loggingEventKey,
+            new AggregateSummary(ex),
+            (currentAggregate, emptyAggregate) ->
+                AggregateSummary.incrementCount(currentAggregate, exception));
+
+    return FilterReply.DENY;
+  }
+
+  private boolean isAggregatedLog(Marker marker) {
+    return marker != null && (marker.equals(MARKER) || marker.contains(MARKER));
+  }
+
+  private Optional<Throwable> extractLastParamThrowable(Object[] params) {
+    return Optional.ofNullable(params)
+        .map(Arrays::stream)
+        .flatMap(
+            a ->
+                a.skip(params.length - 1)
+                    .findFirst()
+                    .filter(o -> o instanceof Throwable)
+                    .map(Throwable.class::cast));
+  }
+
+  private Marker getEnrichedMarker(Marker marker) {
+    if (marker == null) {
+      return MARKER;
     }
+    marker.add(MARKER);
+    return marker;
+  }
 
-    private Marker getEnrichedMarker(Marker marker) {
-        if (marker == null) {
-            return MARKER;
-        }
-        marker.add(MARKER);
-        return marker;
-    }
+  public void addAggregatedLogger(String logger) {
+    this.aggregatedLogger.add(logger);
+  }
 
-    public void addAggregatedLogger(String logger) {
-        this.aggregatedLogger.add(logger);
-    }
+  public long getReportingIntervalMillis() {
+    return reportingIntervalMillis;
+  }
 
-    public long getReportingIntervalMillis() {
-        return reportingIntervalMillis;
-    }
+  public void setReportingIntervalMillis(long reportingIntervalMillis) {
+    this.reportingIntervalMillis = reportingIntervalMillis;
+  }
 
-    public void setReportingIntervalMillis(long reportingIntervalMillis) {
-        this.reportingIntervalMillis = reportingIntervalMillis;
-    }
+  private static class LoggerAggregates {
+
+    private final Map<LoggingEventKey, AggregateSummary> aggregates = new ConcurrentHashMap<>();
+  }
+
+  private static class AggregateSummary {
+
+    private final int logsCount;
+    private final Throwable lastException;
 
-    private static class LoggerAggregates {
+    private AggregateSummary(Throwable lastException) {
+      this(1, lastException);
+    }
 
-        private final Map<LoggingEventKey, AggregateSummary> aggregates = new ConcurrentHashMap<>();
+    private AggregateSummary(int logsCount, Throwable lastException) {
+      this.logsCount = logsCount;
+      this.lastException = lastException;
     }
 
-    private static class AggregateSummary {
+    private static AggregateSummary incrementCount(
+        AggregateSummary currentAggregate, Throwable lastException) {
+      return new AggregateSummary(
+          currentAggregate.logsCount + 1,
+          Optional.ofNullable(lastException).orElse(currentAggregate.lastException));
+    }
+  }
 
-        private final int logsCount;
-        private final Throwable lastException;
+  private static class LoggingEventKey {
 
-        private AggregateSummary(Throwable lastException) {
-            this(1, lastException);
-        }
+    private final String message;
+    private final int level;
+    private final Marker marker;
+    private final Object[] params;
 
-        private AggregateSummary(int logsCount, Throwable lastException) {
-            this.logsCount = logsCount;
-            this.lastException = lastException;
-        }
+    LoggingEventKey(String message, Object[] params, Level level, Marker marker) {
+      this.message = message;
+      this.params = params;
+      this.level = Level.toLocationAwareLoggerInteger(level);
+      this.marker = marker;
+    }
 
-        private static AggregateSummary incrementCount(AggregateSummary currentAggregate, Throwable lastException) {
-            return new AggregateSummary(currentAggregate.logsCount + 1,
-                    Optional.ofNullable(lastException).orElse(currentAggregate.lastException));
-        }
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      LoggingEventKey that = (LoggingEventKey) o;
+      return level == that.level
+          && Objects.equals(message, that.message)
+          && Objects.equals(marker, that.marker)
+          && Arrays.equals(params, that.params);
     }
 
-    private static class LoggingEventKey {
-
-        private final String message;
-        private final int level;
-        private final Marker marker;
-        private final Object[] params;
-
-        LoggingEventKey(String message, Object[] params, Level level, Marker marker) {
-            this.message = message;
-            this.params = params;
-            this.level = Level.toLocationAwareLoggerInteger(level);
-            this.marker = marker;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            LoggingEventKey that = (LoggingEventKey) o;
-            return level == that.level
-                    && Objects.equals(message, that.message)
-                    && Objects.equals(marker, that.marker)
-                    && Arrays.equals(params, that.params);
-        }
-
-        @Override
-        public int hashCode() {
-            int result = Objects.hash(message, level, marker);
-            result = 31 * result + Arrays.hashCode(params);
-            return result;
-        }
+    @Override
+    public int hashCode() {
+      int result = Objects.hash(message, level, marker);
+      result = 31 * result + Arrays.hashCode(params);
+      return result;
     }
+  }
 }
-
-
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperBasedRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperBasedRepository.java
index b688aa314d..85827afb21 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperBasedRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperBasedRepository.java
@@ -3,8 +3,17 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.ArrayUtils;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.api.transaction.CuratorTransactionFinal;
+import org.apache.curator.utils.ZKPaths;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,172 +21,194 @@
 import pl.allegro.tech.hermes.common.exception.RepositoryNotAvailableException;
 import pl.allegro.tech.hermes.infrastructure.MalformedDataException;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.BiConsumer;
-
 public abstract class ZookeeperBasedRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperBasedRepository.class);
-
-    private final CuratorFramework zookeeper;
-
-    private final ObjectMapper mapper;
-
-    protected final ZookeeperPaths paths;
-
-    protected ZookeeperBasedRepository(CuratorFramework zookeeper,
-                                       ObjectMapper mapper,
-                                       ZookeeperPaths paths) {
-        this.zookeeper = zookeeper;
-        this.mapper = mapper;
-        this.paths = paths;
-    }
-
-    private void ensureConnected() {
-        if (!zookeeper.getZookeeperClient().isConnected()) {
-            throw new RepositoryNotAvailableException("Could not establish connection to a Zookeeper instance");
-        }
-    }
-
-    protected void ensurePathExists(String path) {
-        ensureConnected();
-        if (!pathExists(path)) {
-            try {
-                zookeeper.create().creatingParentsIfNeeded().forPath(path);
-            } catch (Exception e) {
-                throw new InternalProcessingException(e);
-            }
-        }
-    }
-
-    protected boolean pathExists(String path) {
-        ensureConnected();
-        try {
-            Optional<Stat> optionalStat = Optional.ofNullable(zookeeper.checkExists().forPath(path));
-            return optionalStat.isPresent();
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    protected List<String> childrenOf(String path) {
-        ensureConnected();
-        try {
-            List<String> retrievedNodes = new ArrayList<>(zookeeper.getChildren().forPath(path));
-            Collections.sort(retrievedNodes);
-            return retrievedNodes;
-        } catch (Exception ex) {
-            throw new InternalProcessingException(ex);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    protected byte[] readFrom(String path) {
-        return readWithStatFrom(path, bytes -> bytes, (t, stat) -> {}, false).get();
-    }
-
-    @SuppressWarnings("unchecked")
-    protected <T> T readFrom(String path, Class<T> clazz) {
-        return readFrom(path, clazz, false).get();
-    }
-
-    @SuppressWarnings("unchecked")
-    protected <T> Optional<T> readFrom(String path, Class<T> clazz, boolean quiet) {
-        return readWithStatFrom(path, b -> (T) mapper.readValue(b, clazz), (t, stat) -> {}, quiet);
-    }
-
-    @SuppressWarnings("unchecked")
-    protected <T> Optional<T> readFrom(String path, TypeReference<T> type, boolean quiet) {
-        return readWithStatFrom(path, b -> (T) mapper.readValue(b, type), (t, stat) -> {}, quiet);
-    }
-
-    protected <T> Optional<T> readWithStatFrom(String path, Class<T> clazz, BiConsumer<T, Stat> statDecorator, boolean quiet) {
-        return readWithStatFrom(path, b -> mapper.readValue(b, clazz), statDecorator, quiet);
-    }
-
-    private <T> Optional<T> readWithStatFrom(String path, ThrowingReader<T> supplier, BiConsumer<T, Stat> statDecorator, boolean quiet) {
-        ensureConnected();
-        try {
-            Stat stat = new Stat();
-            byte[] data = zookeeper.getData().storingStatIn(stat).forPath(path);
-            if (ArrayUtils.isNotEmpty(data)) {
-                T t = supplier.read(data);
-                statDecorator.accept(t, stat);
-                return Optional.of(t);
-            }
-        } catch (JsonMappingException malformedException) {
-            logWarnOrThrowException("Unable to read data from path " + path,
-                    new MalformedDataException(path, malformedException), quiet);
-        } catch (InternalProcessingException e) {
-            throw e;
-        } catch (Exception exception) {
-            logWarnOrThrowException("Unable to read data from path " + path, new InternalProcessingException(exception),
-                    quiet);
-        }
-        return Optional.empty();
-    }
-
-    private void logWarnOrThrowException(String message, RuntimeException e, Boolean quiet) {
-        if (quiet) {
-            logger.warn(message, e);
-        } else {
-            throw e;
-        }
-    }
-
-    protected void overwrite(String path, Object value) throws Exception {
-        ensureConnected();
-        zookeeper.setData().forPath(path, mapper.writeValueAsBytes(value));
-    }
-
-    protected void overwrite(String path, byte[] value) throws Exception {
-        ensureConnected();
-        zookeeper.setData().forPath(path, value);
-    }
-
-    protected void createRecursively(String path, Object value) throws Exception {
-        ensureConnected();
-        zookeeper.create()
-                .creatingParentsIfNeeded()
-                .forPath(path, mapper.writeValueAsBytes(value));
-    }
-
-    protected void createInTransaction(String path, Object value, String childPath) throws Exception {
-        ensureConnected();
-        zookeeper.inTransaction()
-                .create().forPath(path, mapper.writeValueAsBytes(value))
-                .and()
-                .create().forPath(childPath)
-                .and()
-                .commit();
-    }
-
-    protected void create(String path, Object value) throws Exception {
-        ensureConnected();
-        zookeeper.create().forPath(path, mapper.writeValueAsBytes(value));
-    }
-
-    protected void create(String path, byte[] value) throws Exception {
-        ensureConnected();
-        zookeeper.create().forPath(path, value);
-    }
-
-    protected void touch(String path) throws Exception {
-        ensureConnected();
-        byte[] oldData = zookeeper.getData().forPath(path);
-        zookeeper.setData().forPath(path, oldData);
-    }
-
-    protected void remove(String path) throws Exception {
-        ensureConnected();
-        zookeeper.delete().guaranteed().deletingChildrenIfNeeded().forPath(path);
-    }
-
-    private interface ThrowingReader<T> {
-        T read(byte[] data) throws IOException;
-    }
+  private static final Logger logger = LoggerFactory.getLogger(ZookeeperBasedRepository.class);
+
+  private final CuratorFramework zookeeper;
+
+  private final ObjectMapper mapper;
+
+  protected final ZookeeperPaths paths;
+
+  protected ZookeeperBasedRepository(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    this.zookeeper = zookeeper;
+    this.mapper = mapper;
+    this.paths = paths;
+  }
+
+  private void ensureConnected() {
+    if (!zookeeper.getZookeeperClient().isConnected()) {
+      throw new RepositoryNotAvailableException(
+          "Could not establish connection to a Zookeeper instance");
+    }
+  }
+
+  protected void ensurePathExists(String path) {
+    ensureConnected();
+    if (!pathExists(path)) {
+      try {
+        zookeeper.create().creatingParentsIfNeeded().forPath(path);
+      } catch (Exception e) {
+        throw new InternalProcessingException(e);
+      }
+    }
+  }
+
+  protected boolean pathExists(String path) {
+    ensureConnected();
+    try {
+      Optional<Stat> optionalStat = Optional.ofNullable(zookeeper.checkExists().forPath(path));
+      return optionalStat.isPresent();
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
+    }
+  }
+
+  protected List<String> childrenOf(String path) {
+    ensureConnected();
+    try {
+      List<String> retrievedNodes = new ArrayList<>(zookeeper.getChildren().forPath(path));
+      Collections.sort(retrievedNodes);
+      return retrievedNodes;
+    } catch (Exception ex) {
+      throw new InternalProcessingException(ex);
+    }
+  }
+
+  protected List<String> childrenPathsOf(String path) {
+    List<String> childNodes = childrenOf(path);
+    return childNodes.stream()
+        .map(child -> ZKPaths.makePath(path, child))
+        .collect(Collectors.toList());
+  }
+
+  @SuppressWarnings("unchecked")
+  protected byte[] readFrom(String path) {
+    return readWithStatFrom(path, bytes -> bytes, (t, stat) -> {}, false).get();
+  }
+
+  @SuppressWarnings("unchecked")
+  protected <T> T readFrom(String path, Class<T> clazz) {
+    return readFrom(path, clazz, false).get();
+  }
+
+  @SuppressWarnings("unchecked")
+  protected <T> Optional<T> readFrom(String path, Class<T> clazz, boolean quiet) {
+    return readWithStatFrom(path, b -> (T) mapper.readValue(b, clazz), (t, stat) -> {}, quiet);
+  }
+
+  @SuppressWarnings("unchecked")
+  protected <T> Optional<T> readFrom(String path, TypeReference<T> type, boolean quiet) {
+    return readWithStatFrom(path, b -> (T) mapper.readValue(b, type), (t, stat) -> {}, quiet);
+  }
+
+  protected <T> Optional<T> readWithStatFrom(
+      String path, Class<T> clazz, BiConsumer<T, Stat> statDecorator, boolean quiet) {
+    return readWithStatFrom(path, b -> mapper.readValue(b, clazz), statDecorator, quiet);
+  }
+
+  private <T> Optional<T> readWithStatFrom(
+      String path, ThrowingReader<T> supplier, BiConsumer<T, Stat> statDecorator, boolean quiet) {
+    ensureConnected();
+    try {
+      Stat stat = new Stat();
+      byte[] data = zookeeper.getData().storingStatIn(stat).forPath(path);
+      if (ArrayUtils.isNotEmpty(data)) {
+        T t = supplier.read(data);
+        statDecorator.accept(t, stat);
+        return Optional.of(t);
+      }
+    } catch (JsonMappingException malformedException) {
+      logWarnOrThrowException(
+          "Unable to read data from path " + path,
+          new MalformedDataException(path, malformedException),
+          quiet);
+    } catch (InternalProcessingException e) {
+      throw e;
+    } catch (Exception exception) {
+      logWarnOrThrowException(
+          "Unable to read data from path " + path,
+          new InternalProcessingException(exception),
+          quiet);
+    }
+    return Optional.empty();
+  }
+
+  private void logWarnOrThrowException(String message, RuntimeException e, Boolean quiet) {
+    if (quiet) {
+      logger.warn(message, e);
+    } else {
+      throw e;
+    }
+  }
+
+  protected void overwrite(String path, Object value) throws Exception {
+    ensureConnected();
+    zookeeper.setData().forPath(path, mapper.writeValueAsBytes(value));
+  }
+
+  protected void overwrite(String path, byte[] value) throws Exception {
+    ensureConnected();
+    zookeeper.setData().forPath(path, value);
+  }
+
+  protected void createRecursively(String path, Object value) throws Exception {
+    ensureConnected();
+    zookeeper.create().creatingParentsIfNeeded().forPath(path, mapper.writeValueAsBytes(value));
+  }
+
+  protected void createInTransaction(String path, Object value, String childPath) throws Exception {
+    ensureConnected();
+    zookeeper
+        .inTransaction()
+        .create()
+        .forPath(path, mapper.writeValueAsBytes(value))
+        .and()
+        .create()
+        .forPath(childPath)
+        .and()
+        .commit();
+  }
+
+  protected void deleteInTransaction(List<String> paths) throws Exception {
+    if (paths.isEmpty()) {
+      throw new InternalProcessingException("Attempting to remove empty set of paths from ZK");
+    }
+    ensureConnected();
+    CuratorTransactionFinal transaction =
+        zookeeper.inTransaction().delete().forPath(paths.get(0)).and();
+
+    for (int i = 1; i < paths.size(); i++) {
+      transaction = transaction.delete().forPath(paths.get(i)).and();
+    }
+
+    transaction.commit();
+  }
+
+  protected void create(String path, Object value) throws Exception {
+    ensureConnected();
+    zookeeper.create().forPath(path, mapper.writeValueAsBytes(value));
+  }
+
+  protected void create(String path, byte[] value) throws Exception {
+    ensureConnected();
+    zookeeper.create().forPath(path, value);
+  }
+
+  protected void touch(String path) throws Exception {
+    ensureConnected();
+    byte[] oldData = zookeeper.getData().forPath(path);
+    zookeeper.setData().forPath(path, oldData);
+  }
+
+  protected void remove(String path) throws Exception {
+    ensureConnected();
+    zookeeper.delete().guaranteed().deletingChildrenIfNeeded().forPath(path);
+  }
+
+  private interface ThrowingReader<T> {
+    T read(byte[] data) throws IOException;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperCredentialsRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperCredentialsRepository.java
index bf29c41a08..a0390f5267 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperCredentialsRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperCredentialsRepository.java
@@ -6,23 +6,25 @@
 import pl.allegro.tech.hermes.domain.CredentialsRepository;
 import pl.allegro.tech.hermes.domain.NodePassword;
 
-public class ZookeeperCredentialsRepository extends ZookeeperBasedRepository implements CredentialsRepository {
+public class ZookeeperCredentialsRepository extends ZookeeperBasedRepository
+    implements CredentialsRepository {
 
-    public ZookeeperCredentialsRepository(CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
-        super(zookeeper, mapper, paths);
-    }
+  public ZookeeperCredentialsRepository(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    super(zookeeper, mapper, paths);
+  }
 
-    @Override
-    public NodePassword readAdminPassword() {
-        return readFrom(paths.groupsPath(), NodePassword.class);
-    }
+  @Override
+  public NodePassword readAdminPassword() {
+    return readFrom(paths.groupsPath(), NodePassword.class);
+  }
 
-    @Override
-    public void overwriteAdminPassword(String password) {
-        try {
-            overwrite(paths.groupsPath(), new NodePassword(password));
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  @Override
+  public void overwriteAdminPassword(String password) {
+    try {
+      overwrite(paths.groupsPath(), new NodePassword(password));
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperGroupRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperGroupRepository.java
index d546ba6044..67cece9fa9 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperGroupRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperGroupRepository.java
@@ -2,119 +2,123 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.PostConstruct;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Group;
+import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 import pl.allegro.tech.hermes.domain.group.GroupAlreadyExistsException;
 import pl.allegro.tech.hermes.domain.group.GroupNotEmptyException;
 import pl.allegro.tech.hermes.domain.group.GroupNotExistsException;
 import pl.allegro.tech.hermes.domain.group.GroupRepository;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 public class ZookeeperGroupRepository extends ZookeeperBasedRepository implements GroupRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperGroupRepository.class);
-
-    public ZookeeperGroupRepository(CuratorFramework zookeeper,
-                                    ObjectMapper mapper,
-                                    ZookeeperPaths paths) {
-        super(zookeeper, mapper, paths);
-    }
-
-    @Override
-    public boolean groupExists(String groupName) {
-        return pathExists(paths.groupPath(groupName));
-    }
-
-    @Override
-    public void ensureGroupExists(String groupName) {
-        if (!groupExists(groupName)) {
-            throw new GroupNotExistsException(groupName);
-        }
-    }
+  private static final Logger logger = LoggerFactory.getLogger(ZookeeperGroupRepository.class);
 
-    @Override
-    public void createGroup(Group group) {
-        String groupPath = paths.groupPath(group.getGroupName());
-        logger.info("Creating group {} for path {}", group.getGroupName(), groupPath);
-
-        try {
-            createInTransaction(groupPath, group, paths.topicsPath(group.getGroupName()));
-        } catch (KeeperException.NodeExistsException ex) {
-            throw new GroupAlreadyExistsException(group.getGroupName(), ex);
-        } catch (Exception ex) {
-            throw new InternalProcessingException(ex);
-        }
-    }
+  public ZookeeperGroupRepository(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    super(zookeeper, mapper, paths);
+  }
 
-    @Override
-    public void updateGroup(Group group) {
-        ensureGroupExists(group.getGroupName());
+  @Override
+  public boolean groupExists(String groupName) {
+    return pathExists(paths.groupPath(groupName));
+  }
 
-        logger.info("Updating group {}", group.getGroupName());
-        try {
-            overwrite(paths.groupPath(group.getGroupName()), group);
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  @Override
+  public void ensureGroupExists(String groupName) {
+    if (!groupExists(groupName)) {
+      throw new GroupNotExistsException(groupName);
     }
-
-    @Override
-    public void removeGroup(String groupName) {
-        ensureGroupExists(groupName);
-        ensureGroupIsEmpty(groupName);
-
-        logger.info("Removing group: {}", groupName);
-        try {
-            remove(paths.groupPath(groupName));
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  }
+
+  @Override
+  public void createGroup(Group group) {
+    String groupPath = paths.groupPath(group.getGroupName());
+    logger.info("Creating group {} for path {}", group.getGroupName(), groupPath);
+
+    try {
+      createInTransaction(groupPath, group, paths.topicsPath(group.getGroupName()));
+    } catch (KeeperException.NodeExistsException ex) {
+      throw new GroupAlreadyExistsException(group.getGroupName(), ex);
+    } catch (Exception ex) {
+      throw new InternalProcessingException(ex);
     }
+  }
 
-    private void ensureGroupIsEmpty(String groupName) {
-        if (!childrenOf(paths.topicsPath(groupName)).isEmpty()) {
-            throw new GroupNotEmptyException(groupName);
-        }
-    }
+  @Override
+  public void updateGroup(Group group) {
+    ensureGroupExists(group.getGroupName());
 
-    @Override
-    public List<String> listGroupNames() {
-        return childrenOf(paths.groupsPath());
+    logger.info("Updating group {}", group.getGroupName());
+    try {
+      overwrite(paths.groupPath(group.getGroupName()), group);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    @Override
-    public List<Group> listGroups() {
-        return listGroupNames()
-                .stream()
-                .map(n -> getGroupDetails(n, true))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public Group getGroupDetails(String groupName) {
-        return getGroupDetails(groupName, false).get();
-    }
-
-    private Optional<Group> getGroupDetails(String groupName, boolean quiet) {
-        ensureGroupExists(groupName);
-
-        String path = paths.groupPath(groupName);
-        return readFrom(path, Group.class, quiet);
+  }
+
+  /**
+   * Atomic removal of <code>group</code> and <code>group/topics</code> nodes is required to prevent
+   * lengthy loop during removal, see: {@link
+   * pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperTopicRepository#removeTopic(TopicName)}.
+   */
+  @Override
+  public void removeGroup(String groupName) {
+    ensureGroupExists(groupName);
+    ensureGroupIsEmpty(groupName);
+
+    logger.info("Removing group: {}", groupName);
+    List<String> pathsToDelete = List.of(paths.topicsPath(groupName), paths.groupPath(groupName));
+    try {
+      deleteInTransaction(pathsToDelete);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    @PostConstruct
-    public void init() {
-        logger.info("Before ensuring init path exists");
-        ensurePathExists(paths.groupsPath());
-        logger.info("After ensuring init path exists");
+  private void ensureGroupIsEmpty(String groupName) {
+    if (!childrenOf(paths.topicsPath(groupName)).isEmpty()) {
+      throw new GroupNotEmptyException(groupName);
     }
+  }
+
+  @Override
+  public List<String> listGroupNames() {
+    return childrenOf(paths.groupsPath());
+  }
+
+  @Override
+  public List<Group> listGroups() {
+    return listGroupNames().stream()
+        .map(n -> getGroupDetails(n, true))
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public Group getGroupDetails(String groupName) {
+    return getGroupDetails(groupName, false).get();
+  }
+
+  private Optional<Group> getGroupDetails(String groupName, boolean quiet) {
+    ensureGroupExists(groupName);
+
+    String path = paths.groupPath(groupName);
+    return readFrom(path, Group.class, quiet);
+  }
+
+  @PostConstruct
+  public void init() {
+    logger.info("Before ensuring init path exists");
+    ensurePathExists(paths.groupsPath());
+    logger.info("After ensuring init path exists");
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperMessagePreviewRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperMessagePreviewRepository.java
index 0fd938b668..d343c0b531 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperMessagePreviewRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperMessagePreviewRepository.java
@@ -1,7 +1,12 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper;
 
+import static java.lang.String.format;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import org.apache.curator.framework.CuratorFramework;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,54 +16,50 @@
 import pl.allegro.tech.hermes.domain.topic.preview.MessagePreviewRepository;
 import pl.allegro.tech.hermes.domain.topic.preview.TopicsMessagesPreview;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import static java.lang.String.format;
+public class ZookeeperMessagePreviewRepository extends ZookeeperBasedRepository
+    implements MessagePreviewRepository {
 
-public class ZookeeperMessagePreviewRepository extends ZookeeperBasedRepository implements MessagePreviewRepository {
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperMessagePreviewRepository.class);
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperMessagePreviewRepository.class);
+  public ZookeeperMessagePreviewRepository(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    super(zookeeper, mapper, paths);
+  }
 
-    public ZookeeperMessagePreviewRepository(CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
-        super(zookeeper, mapper, paths);
+  @Override
+  public List<MessagePreview> loadPreview(TopicName topicName) {
+    try {
+      return Optional.of(paths.topicPreviewPath(topicName))
+          .filter(this::pathExists)
+          .flatMap(p -> readFrom(p, new TypeReference<List<MessagePreview>>() {}, true))
+          .orElseGet(ArrayList::new);
+    } catch (Exception e) {
+      throw new InternalProcessingException(
+          format("Could not read latest preview message for topic: %s.", topicName.qualifiedName()),
+          e);
     }
+  }
 
-    @Override
-    public List<MessagePreview> loadPreview(TopicName topicName) {
-        try {
-            return Optional.of(paths.topicPath(topicName, ZookeeperPaths.PREVIEW_PATH))
-                    .filter(this::pathExists)
-                    .flatMap(p -> readFrom(p, new TypeReference<List<MessagePreview>>() {}, true))
-                    .orElseGet(ArrayList::new);
-        } catch (Exception e) {
-            throw new InternalProcessingException(
-                    format("Could not read latest preview message for topic: %s.", topicName.qualifiedName()), e);
-        }
-    }
-
-
-    @Override
-    public void persist(TopicsMessagesPreview topicsMessagesPreview) {
-        for (TopicName topic : topicsMessagesPreview.topics()) {
-            persistMessage(topic, topicsMessagesPreview.previewOf(topic));
-        }
+  @Override
+  public void persist(TopicsMessagesPreview topicsMessagesPreview) {
+    for (TopicName topic : topicsMessagesPreview.topics()) {
+      persistMessage(topic, topicsMessagesPreview.previewOf(topic));
     }
+  }
 
-    private void persistMessage(TopicName topic, List<MessagePreview> messages) {
-        logger.debug("Persisting {} messages for preview of topic: {}", messages.size(), topic.qualifiedName());
-        try {
-            if (pathExists(paths.topicPath(topic))) {
-                String previewPath = paths.topicPath(topic, ZookeeperPaths.PREVIEW_PATH);
-                ensurePathExists(previewPath);
-                overwrite(previewPath, messages);
-            }
-        } catch (Exception exception) {
-            logger.warn(
-                    format("Could not log preview messages for topic: %s", topic.qualifiedName()),
-                    exception
-            );
-        }
+  private void persistMessage(TopicName topic, List<MessagePreview> messages) {
+    logger.debug(
+        "Persisting {} messages for preview of topic: {}", messages.size(), topic.qualifiedName());
+    try {
+      if (pathExists(paths.topicPath(topic))) {
+        String previewPath = paths.topicPreviewPath(topic);
+        ensurePathExists(previewPath);
+        overwrite(previewPath, messages);
+      }
+    } catch (Exception exception) {
+      logger.warn(
+          format("Could not log preview messages for topic: %s", topic.qualifiedName()), exception);
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperOAuthProviderRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperOAuthProviderRepository.java
index 4673888b4e..c84a3f6c51 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperOAuthProviderRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperOAuthProviderRepository.java
@@ -1,6 +1,9 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper;
 
+import static java.util.stream.Collectors.toList;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
@@ -11,85 +14,82 @@
 import pl.allegro.tech.hermes.domain.oauth.OAuthProviderNotExistsException;
 import pl.allegro.tech.hermes.domain.oauth.OAuthProviderRepository;
 
-import java.util.List;
-
-import static java.util.stream.Collectors.toList;
-
-public class ZookeeperOAuthProviderRepository extends ZookeeperBasedRepository implements OAuthProviderRepository {
-
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperOAuthProviderRepository.class);
-
-    public ZookeeperOAuthProviderRepository(CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
-        super(zookeeper, mapper, paths);
+public class ZookeeperOAuthProviderRepository extends ZookeeperBasedRepository
+    implements OAuthProviderRepository {
+
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperOAuthProviderRepository.class);
+
+  public ZookeeperOAuthProviderRepository(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    super(zookeeper, mapper, paths);
+  }
+
+  @Override
+  public List<String> listOAuthProviderNames() {
+    ensurePathExists(paths.oAuthProvidersPath());
+    return childrenOf(paths.oAuthProvidersPath());
+  }
+
+  @Override
+  public List<OAuthProvider> listOAuthProviders() {
+    ensurePathExists(paths.oAuthProvidersPath());
+    return listOAuthProviderNames().stream().map(this::getOAuthProviderDetails).collect(toList());
+  }
+
+  @Override
+  public OAuthProvider getOAuthProviderDetails(String oAuthProviderName) {
+    ensureOAuthProviderExists(oAuthProviderName);
+    return readFrom(paths.oAuthProviderPath(oAuthProviderName), OAuthProvider.class);
+  }
+
+  @Override
+  public void createOAuthProvider(OAuthProvider oAuthProvider) {
+    String oAuthProviderPath = paths.oAuthProviderPath(oAuthProvider.getName());
+    logger.info("Creating OAuthProvider for path {}", oAuthProviderPath);
+
+    try {
+      createRecursively(oAuthProviderPath, oAuthProvider);
+    } catch (KeeperException.NodeExistsException ex) {
+      throw new OAuthProviderAlreadyExistsException(oAuthProvider, ex);
+    } catch (Exception ex) {
+      throw new InternalProcessingException(ex);
     }
+  }
 
-    @Override
-    public List<String> listOAuthProviderNames() {
-        ensurePathExists(paths.oAuthProvidersPath());
-        return childrenOf(paths.oAuthProvidersPath());
-    }
+  @Override
+  public void updateOAuthProvider(OAuthProvider oAuthprovider) {
+    ensureOAuthProviderExists(oAuthprovider.getName());
 
-    @Override
-    public List<OAuthProvider> listOAuthProviders() {
-        ensurePathExists(paths.oAuthProvidersPath());
-        return listOAuthProviderNames().stream()
-                .map(this::getOAuthProviderDetails)
-                .collect(toList());
+    logger.info("Updating OAuthProvider {}", oAuthprovider.getName());
+    try {
+      overwrite(paths.oAuthProviderPath(oAuthprovider.getName()), oAuthprovider);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    @Override
-    public OAuthProvider getOAuthProviderDetails(String oAuthProviderName) {
-        ensureOAuthProviderExists(oAuthProviderName);
-        return readFrom(paths.oAuthProviderPath(oAuthProviderName), OAuthProvider.class);
-    }
+  @Override
+  public void removeOAuthProvider(String oAuthProviderName) {
+    ensureOAuthProviderExists(oAuthProviderName);
 
-    @Override
-    public void createOAuthProvider(OAuthProvider oAuthProvider) {
-        String oAuthProviderPath = paths.oAuthProviderPath(oAuthProvider.getName());
-        logger.info("Creating OAuthProvider for path {}", oAuthProviderPath);
-
-        try {
-            createRecursively(oAuthProviderPath, oAuthProvider);
-        } catch (KeeperException.NodeExistsException ex) {
-            throw new OAuthProviderAlreadyExistsException(oAuthProvider, ex);
-        } catch (Exception ex) {
-            throw new InternalProcessingException(ex);
-        }
+    logger.info("Removing OAuthProvider {}", oAuthProviderName);
+    try {
+      remove(paths.oAuthProviderPath(oAuthProviderName));
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    @Override
-    public void updateOAuthProvider(OAuthProvider oAuthprovider) {
-        ensureOAuthProviderExists(oAuthprovider.getName());
-
-        logger.info("Updating OAuthProvider {}", oAuthprovider.getName());
-        try {
-            overwrite(paths.oAuthProviderPath(oAuthprovider.getName()), oAuthprovider);
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  @Override
+  public void ensureOAuthProviderExists(String oAuthProviderName) {
+    if (!oAuthProviderExists(oAuthProviderName)) {
+      throw new OAuthProviderNotExistsException(oAuthProviderName);
     }
+  }
 
-    @Override
-    public void removeOAuthProvider(String oAuthProviderName) {
-        ensureOAuthProviderExists(oAuthProviderName);
-
-        logger.info("Removing OAuthProvider {}", oAuthProviderName);
-        try {
-            remove(paths.oAuthProviderPath(oAuthProviderName));
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    @Override
-    public void ensureOAuthProviderExists(String oAuthProviderName) {
-        if (!oAuthProviderExists(oAuthProviderName)) {
-            throw new OAuthProviderNotExistsException(oAuthProviderName);
-        }
-    }
-
-    @Override
-    public boolean oAuthProviderExists(String oAuthProviderName) {
-        return pathExists(paths.oAuthProviderPath(oAuthProviderName));
-    }
+  @Override
+  public boolean oAuthProviderExists(String oAuthProviderName) {
+    return pathExists(paths.oAuthProviderPath(oAuthProviderName));
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperPaths.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperPaths.java
index a5090a3061..e6d44c5830 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperPaths.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperPaths.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper;
 
 import com.google.common.base.Joiner;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.TopicName;
@@ -9,162 +9,180 @@
 
 public class ZookeeperPaths {
 
-    public static final String TOPICS_PATH = "topics";
-    public static final String GROUPS_PATH = "groups";
-    public static final String SUBSCRIPTIONS_PATH = "subscriptions";
-    public static final String KAFKA_TOPICS_PATH = "kafka_topics";
-    public static final String URL_SEPARATOR = "/";
-    public static final String CONSUMERS_WORKLOAD_PATH = "consumers-workload";
-    public static final String CONSUMER_LOAD_PATH = "consumer-load";
-    public static final String SUBSCRIPTION_PROFILES_PATH = "subscription-profiles";
-    public static final String CONSUMERS_WORKLOAD_CONSTRAINTS_PATH = "consumers-workload-constraints";
-    public static final String CONSUMERS_RATE_PATH = "consumers-rate";
-    public static final String METRICS_PATH = "metrics";
-    public static final String ADMIN_PATH = "admin";
-    public static final String PREVIEW_PATH = "preview";
-    public static final String OAUTH_PROVIDERS_PATH = "oauth-providers";
-    public static final String BLACKLIST_PATH = "blacklist";
-    public static final String MAX_RATE_PATH = "max-rate";
-    public static final String MAX_RATE_HISTORY_PATH = "history";
-    public static final String STORAGE_HEALTH_PATH = "storage-health";
-    public static final String FRONTEND_PATH = "frontend";
-    public static final String READINESS_PATH = "readiness";
-    public static final String OFFLINE_RETRANSMISSION_PATH = "offline-retransmission";
-    public static final String OFFLINE_RETRANSMISSION_TASKS_PATH = "tasks";
-
-    private final String basePath;
-
-    public ZookeeperPaths(String basePath) {
-        this.basePath = basePath;
-    }
-
-    public String basePath() {
-        return basePath;
-    }
-
-    public String extractChildNode(String fullChildPath, String prefixPath) {
-        return StringUtils.removeStart(fullChildPath, prefixPath + URL_SEPARATOR);
-    }
-
-    public String adminPath() {
-        return Joiner.on(URL_SEPARATOR).join(basePath, ADMIN_PATH);
-    }
-
-    public String adminOperationPath(String operation) {
-        return Joiner.on(URL_SEPARATOR).join(adminPath(), operation);
-    }
-
-    public String groupsPath() {
-        return Joiner.on(URL_SEPARATOR).join(basePath, GROUPS_PATH);
-    }
-
-    public String groupPath(String groupName) {
-        return Joiner.on(URL_SEPARATOR).join(groupsPath(), groupName);
-    }
-
-    public String topicsPath(String groupName) {
-        return Joiner.on(URL_SEPARATOR).join(groupPath(groupName), TOPICS_PATH);
-    }
-
-    public String topicMetricPath(TopicName topicName, String metricName) {
-        return topicPath(topicName, "metrics", metricName);
-    }
-
-    public String subscriptionsPath(TopicName topicName) {
-        return Joiner.on(URL_SEPARATOR).join(topicPath(topicName), SUBSCRIPTIONS_PATH);
-    }
-
-    public String topicPath(TopicName topicName, String... tail) {
-        return Joiner.on(URL_SEPARATOR).join(topicsPath(topicName.getGroupName()), topicName.getName(), (Object[]) tail);
-    }
-
-    public String subscriptionPath(TopicName topicName, String subscriptionName, String... tail) {
-        return Joiner.on(URL_SEPARATOR).join(subscriptionsPath(topicName), subscriptionName, (Object[]) tail);
-    }
-
-    public String subscriptionPath(Subscription subscription) {
-        return subscriptionPath(subscription.getTopicName(), subscription.getName());
-    }
-
-    public String subscriptionMetricsPath(TopicName topicName, String subscriptionName) {
-        return subscriptionPath(topicName, subscriptionName, METRICS_PATH);
-    }
-
-    public String subscriptionMetricPath(TopicName topicName, String subscriptionName, String metricName) {
-        return subscriptionPath(topicName, subscriptionName, METRICS_PATH, metricName);
-    }
-
-    public String subscriptionMetricPath(SubscriptionName subscriptionName, String metricName) {
-        return subscriptionPath(subscriptionName.getTopicName(), subscriptionName.getName(), METRICS_PATH, metricName);
-    }
-
-    public String offsetPath(TopicName topicName,
-                             String subscriptionName,
-                             KafkaTopicName kafkaTopicName,
-                             String brokersClusterName,
-                             int partitionId) {
-        return Joiner.on(URL_SEPARATOR).join(
-                offsetsPath(topicName, subscriptionName, kafkaTopicName, brokersClusterName),
-                partitionId);
-    }
-
-    public String offsetsPath(TopicName topicName,
-                              String subscriptionName,
-                              KafkaTopicName kafkaTopicName,
-                              String brokersClusterName) {
-        return Joiner.on(URL_SEPARATOR).join(
-                subscribedKafkaTopicsPath(topicName, subscriptionName),
-                kafkaTopicName.asString(),
-                "offset",
-                brokersClusterName);
-    }
-
-    public String subscribedKafkaTopicsPath(TopicName topicName, String subscriptionName) {
-        return Joiner.on(URL_SEPARATOR).join(subscriptionPath(topicName, subscriptionName), KAFKA_TOPICS_PATH);
-    }
-
-    public String consumersWorkloadConstraintsPath() {
-        return Joiner.on(URL_SEPARATOR).join(basePath, CONSUMERS_WORKLOAD_CONSTRAINTS_PATH);
-    }
-
-    public String consumersWorkloadConstraintsPath(String constraintsPath) {
-        return Joiner.on(URL_SEPARATOR).join(consumersWorkloadConstraintsPath(), constraintsPath);
-    }
-
-    public String topicsBlacklistPath() {
-        return Joiner.on(URL_SEPARATOR).join(basePath, BLACKLIST_PATH, TOPICS_PATH);
-    }
-
-    public String blacklistedTopicPath(String qualifiedTopicName) {
-        return Joiner.on(URL_SEPARATOR).join(topicsBlacklistPath(), qualifiedTopicName);
-    }
-
-    public String oAuthProvidersPath() {
-        return Joiner.on(URL_SEPARATOR).join(basePath, OAUTH_PROVIDERS_PATH);
-    }
-
-    public String oAuthProviderPath(String oAuthProviderName) {
-        return Joiner.on(URL_SEPARATOR).join(oAuthProvidersPath(), oAuthProviderName);
-    }
-
-    public String nodeHealthPathForManagementHost(String host, String port) {
-        return Joiner.on(URL_SEPARATOR).join(basePath, STORAGE_HEALTH_PATH, String.format("%s_%s", host, port));
-    }
-
-    public String frontendReadinessPath() {
-        return Joiner.on(URL_SEPARATOR).join(basePath, FRONTEND_PATH, READINESS_PATH);
-    }
-
-    public String offlineRetransmissionPath() {
-        return Joiner.on(URL_SEPARATOR).join(basePath, OFFLINE_RETRANSMISSION_PATH, OFFLINE_RETRANSMISSION_TASKS_PATH);
-    }
-
-    public String offlineRetransmissionPath(String taskId) {
-        return Joiner.on(URL_SEPARATOR)
-                .join(basePath, OFFLINE_RETRANSMISSION_PATH, OFFLINE_RETRANSMISSION_TASKS_PATH, taskId);
-    }
-
-    public String join(String... parts) {
-        return Joiner.on(URL_SEPARATOR).join(parts);
-    }
+  public static final String TOPICS_PATH = "topics";
+  public static final String GROUPS_PATH = "groups";
+  public static final String SUBSCRIPTIONS_PATH = "subscriptions";
+  public static final String KAFKA_TOPICS_PATH = "kafka_topics";
+  public static final String URL_SEPARATOR = "/";
+  public static final String CONSUMERS_WORKLOAD_PATH = "consumers-workload";
+  public static final String CONSUMER_LOAD_PATH = "consumer-load";
+  public static final String SUBSCRIPTION_PROFILES_PATH = "subscription-profiles";
+  public static final String CONSUMERS_WORKLOAD_CONSTRAINTS_PATH = "consumers-workload-constraints";
+  public static final String CONSUMERS_RATE_PATH = "consumers-rate";
+  public static final String METRICS_PATH = "metrics";
+  public static final String ADMIN_PATH = "admin";
+  public static final String PREVIEW_PATH = "preview";
+  public static final String OAUTH_PROVIDERS_PATH = "oauth-providers";
+  public static final String BLACKLIST_PATH = "blacklist";
+  public static final String MAX_RATE_PATH = "max-rate";
+  public static final String MAX_RATE_HISTORY_PATH = "history";
+  public static final String STORAGE_HEALTH_PATH = "storage-health";
+  public static final String DATACENTER_READINESS_PATH = "datacenter-readiness";
+  public static final String OFFLINE_RETRANSMISSION_PATH = "offline-retransmission";
+  public static final String OFFLINE_RETRANSMISSION_TASKS_PATH = "tasks";
+
+  private final String basePath;
+
+  public ZookeeperPaths(String basePath) {
+    this.basePath = basePath;
+  }
+
+  public String basePath() {
+    return basePath;
+  }
+
+  public String extractChildNode(String fullChildPath, String prefixPath) {
+    return StringUtils.removeStart(fullChildPath, prefixPath + URL_SEPARATOR);
+  }
+
+  public String adminPath() {
+    return Joiner.on(URL_SEPARATOR).join(basePath, ADMIN_PATH);
+  }
+
+  public String adminOperationPath(String operation) {
+    return Joiner.on(URL_SEPARATOR).join(adminPath(), operation);
+  }
+
+  public String groupsPath() {
+    return Joiner.on(URL_SEPARATOR).join(basePath, GROUPS_PATH);
+  }
+
+  public String groupPath(String groupName) {
+    return Joiner.on(URL_SEPARATOR).join(groupsPath(), groupName);
+  }
+
+  public String topicsPath(String groupName) {
+    return Joiner.on(URL_SEPARATOR).join(groupPath(groupName), TOPICS_PATH);
+  }
+
+  public String topicMetricPath(TopicName topicName, String metricName) {
+    return topicPath(topicName, "metrics", metricName);
+  }
+
+  public String subscriptionsPath(TopicName topicName) {
+    return Joiner.on(URL_SEPARATOR).join(topicPath(topicName), SUBSCRIPTIONS_PATH);
+  }
+
+  public String topicPath(TopicName topicName, String... tail) {
+    return Joiner.on(URL_SEPARATOR)
+        .join(topicsPath(topicName.getGroupName()), topicName.getName(), (Object[]) tail);
+  }
+
+  public String topicPreviewPath(TopicName topicName) {
+    return topicPath(topicName, ZookeeperPaths.PREVIEW_PATH);
+  }
+
+  public String topicMetricsPath(TopicName topicName) {
+    return topicPath(topicName, METRICS_PATH);
+  }
+
+  public String subscriptionPath(TopicName topicName, String subscriptionName, String... tail) {
+    return Joiner.on(URL_SEPARATOR)
+        .join(subscriptionsPath(topicName), subscriptionName, (Object[]) tail);
+  }
+
+  public String subscriptionPath(Subscription subscription) {
+    return subscriptionPath(subscription.getTopicName(), subscription.getName());
+  }
+
+  public String subscriptionMetricsPath(TopicName topicName, String subscriptionName) {
+    return subscriptionPath(topicName, subscriptionName, METRICS_PATH);
+  }
+
+  public String subscriptionMetricPath(
+      TopicName topicName, String subscriptionName, String metricName) {
+    return subscriptionPath(topicName, subscriptionName, METRICS_PATH, metricName);
+  }
+
+  public String subscriptionMetricPath(SubscriptionName subscriptionName, String metricName) {
+    return subscriptionPath(
+        subscriptionName.getTopicName(), subscriptionName.getName(), METRICS_PATH, metricName);
+  }
+
+  public String offsetPath(
+      TopicName topicName,
+      String subscriptionName,
+      KafkaTopicName kafkaTopicName,
+      String brokersClusterName,
+      int partitionId) {
+    return Joiner.on(URL_SEPARATOR)
+        .join(
+            offsetsPath(topicName, subscriptionName, kafkaTopicName, brokersClusterName),
+            partitionId);
+  }
+
+  public String offsetsPath(
+      TopicName topicName,
+      String subscriptionName,
+      KafkaTopicName kafkaTopicName,
+      String brokersClusterName) {
+    return Joiner.on(URL_SEPARATOR)
+        .join(
+            subscribedKafkaTopicsPath(topicName, subscriptionName),
+            kafkaTopicName.asString(),
+            "offset",
+            brokersClusterName);
+  }
+
+  public String subscribedKafkaTopicsPath(TopicName topicName, String subscriptionName) {
+    return Joiner.on(URL_SEPARATOR)
+        .join(subscriptionPath(topicName, subscriptionName), KAFKA_TOPICS_PATH);
+  }
+
+  public String consumersWorkloadConstraintsPath() {
+    return Joiner.on(URL_SEPARATOR).join(basePath, CONSUMERS_WORKLOAD_CONSTRAINTS_PATH);
+  }
+
+  public String consumersWorkloadConstraintsPath(String constraintsPath) {
+    return Joiner.on(URL_SEPARATOR).join(consumersWorkloadConstraintsPath(), constraintsPath);
+  }
+
+  public String topicsBlacklistPath() {
+    return Joiner.on(URL_SEPARATOR).join(basePath, BLACKLIST_PATH, TOPICS_PATH);
+  }
+
+  public String blacklistedTopicPath(String qualifiedTopicName) {
+    return Joiner.on(URL_SEPARATOR).join(topicsBlacklistPath(), qualifiedTopicName);
+  }
+
+  public String oAuthProvidersPath() {
+    return Joiner.on(URL_SEPARATOR).join(basePath, OAUTH_PROVIDERS_PATH);
+  }
+
+  public String oAuthProviderPath(String oAuthProviderName) {
+    return Joiner.on(URL_SEPARATOR).join(oAuthProvidersPath(), oAuthProviderName);
+  }
+
+  public String nodeHealthPathForManagementHost(String host, String port) {
+    return Joiner.on(URL_SEPARATOR)
+        .join(basePath, STORAGE_HEALTH_PATH, String.format("%s_%s", host, port));
+  }
+
+  public String datacenterReadinessPath() {
+    return Joiner.on(URL_SEPARATOR).join(basePath, DATACENTER_READINESS_PATH);
+  }
+
+  public String offlineRetransmissionPath() {
+    return Joiner.on(URL_SEPARATOR)
+        .join(basePath, OFFLINE_RETRANSMISSION_PATH, OFFLINE_RETRANSMISSION_TASKS_PATH);
+  }
+
+  public String offlineRetransmissionPath(String taskId) {
+    return Joiner.on(URL_SEPARATOR)
+        .join(basePath, OFFLINE_RETRANSMISSION_PATH, OFFLINE_RETRANSMISSION_TASKS_PATH, taskId);
+  }
+
+  public String join(String... parts) {
+    return Joiner.on(URL_SEPARATOR).join(parts);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperSubscriptionOffsetChangeIndicator.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperSubscriptionOffsetChangeIndicator.java
index 633992a8c1..0ea7cf0c18 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperSubscriptionOffsetChangeIndicator.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperSubscriptionOffsetChangeIndicator.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper;
 
+import java.nio.charset.StandardCharsets;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,149 +14,165 @@
 import pl.allegro.tech.hermes.common.kafka.offset.SubscriptionOffsetChangeIndicator;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-public class ZookeeperSubscriptionOffsetChangeIndicator implements SubscriptionOffsetChangeIndicator {
-
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperSubscriptionOffsetChangeIndicator.class);
-
-    private final CuratorFramework zookeeper;
-
-    private final ZookeeperPaths paths;
-
-    private final SubscriptionRepository subscriptionRepository;
-
-    public ZookeeperSubscriptionOffsetChangeIndicator(
-            CuratorFramework zookeeper, ZookeeperPaths paths, SubscriptionRepository repository) {
-
-        this.zookeeper = zookeeper;
-        this.paths = paths;
-        this.subscriptionRepository = repository;
-    }
-
-    @Override
-    public void setSubscriptionOffset(TopicName topicName,
-                                      String subscriptionName,
-                                      String brokersClusterName,
-                                      PartitionOffset partitionOffset) {
-        subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
-
-        String offsetPath = paths.offsetPath(
-                topicName,
-                subscriptionName,
-                partitionOffset.getTopic(),
-                brokersClusterName,
-                partitionOffset.getPartition());
-        try {
-            byte[] offset = String.valueOf(partitionOffset.getOffset()).getBytes(StandardCharsets.UTF_8);
-            if (zookeeper.checkExists().forPath(offsetPath) == null) {
-                zookeeper.create()
-                        .creatingParentsIfNeeded()
-                        .forPath(offsetPath, offset);
-            } else {
-                zookeeper.setData().forPath(offsetPath, offset);
-            }
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    @Override
-    public PartitionOffsets getSubscriptionOffsets(TopicName topic, String subscriptionName, String brokersClusterName) {
-        subscriptionRepository.ensureSubscriptionExists(topic, subscriptionName);
-        String kafkaTopicsPath = paths.subscribedKafkaTopicsPath(topic, subscriptionName);
-
-        PartitionOffsets allOffsets = new PartitionOffsets();
-        getZookeeperChildrenForPath(kafkaTopicsPath).stream().map(KafkaTopicName::valueOf).forEach(kafkaTopic ->
-                allOffsets.addAll(getOffsetsForKafkaTopic(topic, kafkaTopic, subscriptionName, brokersClusterName))
-        );
-        return allOffsets;
-    }
-
-    @Override
-    public boolean areOffsetsMoved(TopicName topicName,
-                                   String subscriptionName,
-                                   String brokersClusterName,
-                                   KafkaTopic kafkaTopic,
-                                   List<Integer> partitionIds) {
-        return partitionIds.stream()
-                .allMatch(partitionId -> offsetDoesNotExist(topicName, subscriptionName, brokersClusterName, partitionId, kafkaTopic));
+public class ZookeeperSubscriptionOffsetChangeIndicator
+    implements SubscriptionOffsetChangeIndicator {
+
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperSubscriptionOffsetChangeIndicator.class);
+
+  private final CuratorFramework zookeeper;
+
+  private final ZookeeperPaths paths;
+
+  private final SubscriptionRepository subscriptionRepository;
+
+  public ZookeeperSubscriptionOffsetChangeIndicator(
+      CuratorFramework zookeeper, ZookeeperPaths paths, SubscriptionRepository repository) {
+
+    this.zookeeper = zookeeper;
+    this.paths = paths;
+    this.subscriptionRepository = repository;
+  }
+
+  @Override
+  public void setSubscriptionOffset(
+      TopicName topicName,
+      String subscriptionName,
+      String brokersClusterName,
+      PartitionOffset partitionOffset) {
+    subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
+
+    String offsetPath =
+        paths.offsetPath(
+            topicName,
+            subscriptionName,
+            partitionOffset.getTopic(),
+            brokersClusterName,
+            partitionOffset.getPartition());
+    try {
+      byte[] offset = String.valueOf(partitionOffset.getOffset()).getBytes(StandardCharsets.UTF_8);
+      if (zookeeper.checkExists().forPath(offsetPath) == null) {
+        zookeeper.create().creatingParentsIfNeeded().forPath(offsetPath, offset);
+      } else {
+        zookeeper.setData().forPath(offsetPath, offset);
+      }
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    @Override
-    public void removeOffset(TopicName topicName,
-                             String subscriptionName,
-                             String brokersClusterName,
-                             KafkaTopicName kafkaTopicName,
-                             int partitionId) {
-        String offsetPath = paths.offsetPath(topicName, subscriptionName, kafkaTopicName, brokersClusterName, partitionId);
-
-        try {
-            zookeeper.delete().guaranteed().deletingChildrenIfNeeded().forPath(offsetPath);
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  }
+
+  @Override
+  public PartitionOffsets getSubscriptionOffsets(
+      TopicName topic, String subscriptionName, String brokersClusterName) {
+    subscriptionRepository.ensureSubscriptionExists(topic, subscriptionName);
+    String kafkaTopicsPath = paths.subscribedKafkaTopicsPath(topic, subscriptionName);
+
+    PartitionOffsets allOffsets = new PartitionOffsets();
+    getZookeeperChildrenForPath(kafkaTopicsPath).stream()
+        .map(KafkaTopicName::valueOf)
+        .forEach(
+            kafkaTopic ->
+                allOffsets.addAll(
+                    getOffsetsForKafkaTopic(
+                        topic, kafkaTopic, subscriptionName, brokersClusterName)));
+    return allOffsets;
+  }
+
+  @Override
+  public boolean areOffsetsMoved(
+      TopicName topicName,
+      String subscriptionName,
+      String brokersClusterName,
+      KafkaTopic kafkaTopic,
+      List<Integer> partitionIds) {
+    return partitionIds.stream()
+        .allMatch(
+            partitionId ->
+                offsetDoesNotExist(
+                    topicName, subscriptionName, brokersClusterName, partitionId, kafkaTopic));
+  }
+
+  @Override
+  public void removeOffset(
+      TopicName topicName,
+      String subscriptionName,
+      String brokersClusterName,
+      KafkaTopicName kafkaTopicName,
+      int partitionId) {
+    String offsetPath =
+        paths.offsetPath(
+            topicName, subscriptionName, kafkaTopicName, brokersClusterName, partitionId);
+
+    try {
+      zookeeper.delete().guaranteed().deletingChildrenIfNeeded().forPath(offsetPath);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    private boolean offsetDoesNotExist(TopicName topicName,
-                                       String subscriptionName,
-                                       String brokersClusterName,
-                                       Integer partitionId,
-                                       KafkaTopic kafkaTopic) {
-        String offsetPath = paths.offsetPath(topicName, subscriptionName, kafkaTopic.name(), brokersClusterName, partitionId);
-        try {
-            boolean result = zookeeper.checkExists().forPath(offsetPath) == null;
-            if (!result) {
-                logger.info("Leftover on path {}", offsetPath);
-            }
-            return result;
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  }
+
+  private boolean offsetDoesNotExist(
+      TopicName topicName,
+      String subscriptionName,
+      String brokersClusterName,
+      Integer partitionId,
+      KafkaTopic kafkaTopic) {
+    String offsetPath =
+        paths.offsetPath(
+            topicName, subscriptionName, kafkaTopic.name(), brokersClusterName, partitionId);
+    try {
+      boolean result = zookeeper.checkExists().forPath(offsetPath) == null;
+      if (!result) {
+        logger.info("Leftover on path {}", offsetPath);
+      }
+      return result;
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    private PartitionOffsets getOffsetsForKafkaTopic(TopicName topic,
-                                                     KafkaTopicName kafkaTopicName,
-                                                     String subscriptionName,
-                                                     String brokersClusterName) {
-        String offsetsPath = paths.offsetsPath(topic, subscriptionName, kafkaTopicName, brokersClusterName);
-
-        PartitionOffsets offsets = new PartitionOffsets();
-        for (String partitionAsString : getZookeeperChildrenForPath(offsetsPath)) {
-            Integer partition = Integer.valueOf(partitionAsString);
-            offsets.add(new PartitionOffset(
-                    kafkaTopicName,
-                    getOffsetForPartition(topic, kafkaTopicName, subscriptionName, brokersClusterName, partition),
-                    partition
-            ));
-        }
-        return offsets;
+  }
+
+  private PartitionOffsets getOffsetsForKafkaTopic(
+      TopicName topic,
+      KafkaTopicName kafkaTopicName,
+      String subscriptionName,
+      String brokersClusterName) {
+    String offsetsPath =
+        paths.offsetsPath(topic, subscriptionName, kafkaTopicName, brokersClusterName);
+
+    PartitionOffsets offsets = new PartitionOffsets();
+    for (String partitionAsString : getZookeeperChildrenForPath(offsetsPath)) {
+      Integer partition = Integer.valueOf(partitionAsString);
+      offsets.add(
+          new PartitionOffset(
+              kafkaTopicName,
+              getOffsetForPartition(
+                  topic, kafkaTopicName, subscriptionName, brokersClusterName, partition),
+              partition));
     }
-
-    private List<String> getZookeeperChildrenForPath(String path) {
-        try {
-            return zookeeper.getChildren().forPath(path);
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+    return offsets;
+  }
+
+  private List<String> getZookeeperChildrenForPath(String path) {
+    try {
+      return zookeeper.getChildren().forPath(path);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    private Long getOffsetForPartition(TopicName topic,
-                                       KafkaTopicName kafkaTopicName,
-                                       String subscriptionName,
-                                       String brokersClusterName,
-                                       int partitionId) {
-        try {
-            String offsetPath = paths.offsetPath(topic,
-                    subscriptionName,
-                    kafkaTopicName,
-                    brokersClusterName,
-                    partitionId);
-            return Long.valueOf(new String(zookeeper.getData().forPath(offsetPath), StandardCharsets.UTF_8));
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  }
+
+  private Long getOffsetForPartition(
+      TopicName topic,
+      KafkaTopicName kafkaTopicName,
+      String subscriptionName,
+      String brokersClusterName,
+      int partitionId) {
+    try {
+      String offsetPath =
+          paths.offsetPath(
+              topic, subscriptionName, kafkaTopicName, brokersClusterName, partitionId);
+      return Long.valueOf(
+          new String(zookeeper.getData().forPath(offsetPath), StandardCharsets.UTF_8));
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperSubscriptionRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperSubscriptionRepository.java
index 104fabb23d..59221b04e6 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperSubscriptionRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperSubscriptionRepository.java
@@ -1,6 +1,10 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
@@ -14,142 +18,146 @@
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 import pl.allegro.tech.hermes.domain.topic.TopicRepository;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-public class ZookeeperSubscriptionRepository extends ZookeeperBasedRepository implements SubscriptionRepository {
-
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperSubscriptionRepository.class);
-
-    private final TopicRepository topicRepository;
-
-    public ZookeeperSubscriptionRepository(CuratorFramework zookeeper,
-                                           ObjectMapper mapper,
-                                           ZookeeperPaths paths,
-                                           TopicRepository topicRepository) {
-        super(zookeeper, mapper, paths);
-        this.topicRepository = topicRepository;
-    }
-
-    @Override
-    public boolean subscriptionExists(TopicName topicName, String subscriptionName) {
-        return pathExists(paths.subscriptionPath(topicName, subscriptionName));
-    }
-
-    @Override
-    public void ensureSubscriptionExists(TopicName topicName, String subscriptionName) {
-        if (!subscriptionExists(topicName, subscriptionName)) {
-            throw new SubscriptionNotExistsException(topicName, subscriptionName);
-        }
-    }
-
-    @Override
-    public void createSubscription(Subscription subscription) {
-        topicRepository.ensureTopicExists(subscription.getTopicName());
-
-        String subscriptionPath = paths.subscriptionPath(subscription);
-        logger.info("Creating subscription {}", subscription.getQualifiedName());
-
-        try {
-            create(subscriptionPath, subscription);
-        } catch (KeeperException.NodeExistsException ex) {
-            throw new SubscriptionAlreadyExistsException(subscription, ex);
-        } catch (Exception ex) {
-            throw new InternalProcessingException(ex);
-        }
-    }
-
-    @Override
-    public void removeSubscription(TopicName topicName, String subscriptionName) {
-        ensureSubscriptionExists(topicName, subscriptionName);
-        logger.info("Removing subscription {}", new SubscriptionName(subscriptionName, topicName).getQualifiedName());
-
-        try {
-            remove(paths.subscriptionPath(topicName, subscriptionName));
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
+public class ZookeeperSubscriptionRepository extends ZookeeperBasedRepository
+    implements SubscriptionRepository {
 
-    @Override
-    public void updateSubscription(Subscription modifiedSubscription) {
-        ensureSubscriptionExists(modifiedSubscription.getTopicName(), modifiedSubscription.getName());
-        logger.info("Updating subscription {}", modifiedSubscription.getQualifiedName());
-        try {
-            overwrite(paths.subscriptionPath(modifiedSubscription), modifiedSubscription);
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperSubscriptionRepository.class);
 
-    @Override
-    public void updateSubscriptionState(TopicName topicName, String subscriptionName, Subscription.State state) {
-        ensureSubscriptionExists(topicName, subscriptionName);
+  private final TopicRepository topicRepository;
 
-        logger.info("Changing subscription {} state to {}",
-                new SubscriptionName(subscriptionName, topicName).getQualifiedName(), state.toString());
+  public ZookeeperSubscriptionRepository(
+      CuratorFramework zookeeper,
+      ObjectMapper mapper,
+      ZookeeperPaths paths,
+      TopicRepository topicRepository) {
+    super(zookeeper, mapper, paths);
+    this.topicRepository = topicRepository;
+  }
 
-        Subscription modifiedSubscription = getSubscriptionDetails(topicName, subscriptionName);
-        if (!modifiedSubscription.getState().equals(state)) {
-            modifiedSubscription.setState(state);
-            updateSubscription(modifiedSubscription);
-        }
-    }
+  @Override
+  public boolean subscriptionExists(TopicName topicName, String subscriptionName) {
+    return pathExists(paths.subscriptionPath(topicName, subscriptionName));
+  }
 
-    @Override
-    public Subscription getSubscriptionDetails(TopicName topicName, String subscriptionName) {
-        ensureSubscriptionExists(topicName, subscriptionName);
-        return readWithStatFrom(
-                paths.subscriptionPath(topicName, subscriptionName),
-                Subscription.class,
-                (sub, stat) -> {
-                    sub.setCreatedAt(stat.getCtime());
-                    sub.setModifiedAt(stat.getMtime());
-                },
-                false
-        ).get();
+  @Override
+  public void ensureSubscriptionExists(TopicName topicName, String subscriptionName) {
+    if (!subscriptionExists(topicName, subscriptionName)) {
+      throw new SubscriptionNotExistsException(topicName, subscriptionName);
     }
+  }
 
-    private Optional<Subscription> getSubscriptionDetails(TopicName topicName, String subscriptionName, boolean quiet) {
-        ensureSubscriptionExists(topicName, subscriptionName);
-        return readFrom(paths.subscriptionPath(topicName, subscriptionName), Subscription.class, quiet);
-    }
+  @Override
+  public void createSubscription(Subscription subscription) {
+    topicRepository.ensureTopicExists(subscription.getTopicName());
 
-    @Override
-    public Subscription getSubscriptionDetails(SubscriptionName name) {
-        return getSubscriptionDetails(name.getTopicName(), name.getName());
-    }
+    String subscriptionPath = paths.subscriptionPath(subscription);
+    logger.info("Creating subscription {}", subscription.getQualifiedName());
 
-    @Override
-    public List<Subscription> getSubscriptionDetails(Collection<SubscriptionName> subscriptionNames) {
-        return subscriptionNames.stream()
-                .map(n -> getSubscriptionDetails(n.getTopicName(), n.getName()))
-                .collect(Collectors.toList());
+    try {
+      create(subscriptionPath, subscription);
+    } catch (KeeperException.NodeExistsException ex) {
+      throw new SubscriptionAlreadyExistsException(subscription, ex);
+    } catch (Exception ex) {
+      throw new InternalProcessingException(ex);
     }
-
-    @Override
-    public List<String> listSubscriptionNames(TopicName topicName) {
-        topicRepository.ensureTopicExists(topicName);
-
-        return childrenOf(paths.subscriptionsPath(topicName));
+  }
+
+  @Override
+  public void removeSubscription(TopicName topicName, String subscriptionName) {
+    ensureSubscriptionExists(topicName, subscriptionName);
+    logger.info(
+        "Removing subscription {}",
+        new SubscriptionName(subscriptionName, topicName).getQualifiedName());
+
+    try {
+      remove(paths.subscriptionPath(topicName, subscriptionName));
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    @Override
-    public List<Subscription> listSubscriptions(TopicName topicName) {
-        return listSubscriptionNames(topicName).stream()
-                .map(subscription -> getSubscriptionDetails(topicName, subscription, true))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.toList());
+  }
+
+  @Override
+  public void updateSubscription(Subscription modifiedSubscription) {
+    ensureSubscriptionExists(modifiedSubscription.getTopicName(), modifiedSubscription.getName());
+    logger.info("Updating subscription {}", modifiedSubscription.getQualifiedName());
+    try {
+      overwrite(paths.subscriptionPath(modifiedSubscription), modifiedSubscription);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    @Override
-    public List<Subscription> listAllSubscriptions() {
-        return topicRepository.listAllTopics().stream()
-                .map(topic -> listSubscriptions(topic.getName()))
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
+  }
+
+  @Override
+  public void updateSubscriptionState(
+      TopicName topicName, String subscriptionName, Subscription.State state) {
+    ensureSubscriptionExists(topicName, subscriptionName);
+
+    logger.info(
+        "Changing subscription {} state to {}",
+        new SubscriptionName(subscriptionName, topicName).getQualifiedName(),
+        state.toString());
+
+    Subscription modifiedSubscription = getSubscriptionDetails(topicName, subscriptionName);
+    if (!modifiedSubscription.getState().equals(state)) {
+      modifiedSubscription.setState(state);
+      updateSubscription(modifiedSubscription);
     }
+  }
+
+  @Override
+  public Subscription getSubscriptionDetails(TopicName topicName, String subscriptionName) {
+    ensureSubscriptionExists(topicName, subscriptionName);
+    return readWithStatFrom(
+            paths.subscriptionPath(topicName, subscriptionName),
+            Subscription.class,
+            (sub, stat) -> {
+              sub.setCreatedAt(stat.getCtime());
+              sub.setModifiedAt(stat.getMtime());
+            },
+            false)
+        .get();
+  }
+
+  private Optional<Subscription> getSubscriptionDetails(
+      TopicName topicName, String subscriptionName, boolean quiet) {
+    ensureSubscriptionExists(topicName, subscriptionName);
+    return readFrom(paths.subscriptionPath(topicName, subscriptionName), Subscription.class, quiet);
+  }
+
+  @Override
+  public Subscription getSubscriptionDetails(SubscriptionName name) {
+    return getSubscriptionDetails(name.getTopicName(), name.getName());
+  }
+
+  @Override
+  public List<Subscription> getSubscriptionDetails(Collection<SubscriptionName> subscriptionNames) {
+    return subscriptionNames.stream()
+        .map(n -> getSubscriptionDetails(n.getTopicName(), n.getName()))
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public List<String> listSubscriptionNames(TopicName topicName) {
+    topicRepository.ensureTopicExists(topicName);
+
+    return childrenOf(paths.subscriptionsPath(topicName));
+  }
+
+  @Override
+  public List<Subscription> listSubscriptions(TopicName topicName) {
+    return listSubscriptionNames(topicName).stream()
+        .map(subscription -> getSubscriptionDetails(topicName, subscription, true))
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public List<Subscription> listAllSubscriptions() {
+    return topicRepository.listAllTopics().stream()
+        .map(topic -> listSubscriptions(topic.getName()))
+        .flatMap(Collection::stream)
+        .collect(Collectors.toList());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperTopicRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperTopicRepository.java
index 60dcb49bc5..7e840b4aed 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperTopicRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperTopicRepository.java
@@ -1,6 +1,11 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
@@ -13,138 +18,194 @@
 import pl.allegro.tech.hermes.domain.topic.TopicNotExistsException;
 import pl.allegro.tech.hermes.domain.topic.TopicRepository;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 public class ZookeeperTopicRepository extends ZookeeperBasedRepository implements TopicRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperTopicRepository.class);
-
-    private final GroupRepository groupRepository;
-
-    public ZookeeperTopicRepository(CuratorFramework zookeeper,
-                                    ObjectMapper mapper,
-                                    ZookeeperPaths paths,
-                                    GroupRepository groupRepository) {
-        super(zookeeper, mapper, paths);
-        this.groupRepository = groupRepository;
-    }
-
-
-    @Override
-    public boolean topicExists(TopicName topicName) {
-        return pathExists(paths.topicPath(topicName));
-    }
+  private static final Logger logger = LoggerFactory.getLogger(ZookeeperTopicRepository.class);
 
-    @Override
-    public void ensureTopicExists(TopicName topicName) {
-        if (!topicExists(topicName)) {
-            throw new TopicNotExistsException(topicName);
-        }
-    }
+  private final GroupRepository groupRepository;
 
-    @Override
-    public List<String> listTopicNames(String groupName) {
-        groupRepository.ensureGroupExists(groupName);
+  public ZookeeperTopicRepository(
+      CuratorFramework zookeeper,
+      ObjectMapper mapper,
+      ZookeeperPaths paths,
+      GroupRepository groupRepository) {
+    super(zookeeper, mapper, paths);
+    this.groupRepository = groupRepository;
+  }
 
-        return childrenOf(paths.topicsPath(groupName));
-    }
+  @Override
+  public boolean topicExists(TopicName topicName) {
+    return pathExists(paths.topicPath(topicName));
+  }
 
-    @Override
-    public List<Topic> listTopics(String groupName) {
-        return listTopicNames(groupName).stream()
-                .map(name -> getTopicDetails(new TopicName(groupName, name), true))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.toList());
+  @Override
+  public void ensureTopicExists(TopicName topicName) {
+    if (!topicExists(topicName)) {
+      throw new TopicNotExistsException(topicName);
     }
-
-    @Override
-    public void createTopic(Topic topic) {
-        groupRepository.ensureGroupExists(topic.getName().getGroupName());
-
-        String topicPath = paths.topicPath(topic.getName());
-        logger.info("Creating topic for path {}", topicPath);
-
-        try {
-            createInTransaction(topicPath, topic, paths.subscriptionsPath(topic.getName()));
-        } catch (KeeperException.NodeExistsException ex) {
-            throw new TopicAlreadyExistsException(topic.getName(), ex);
-        } catch (Exception ex) {
-            throw new InternalProcessingException(ex);
-        }
+  }
+
+  @Override
+  public List<String> listTopicNames(String groupName) {
+    groupRepository.ensureGroupExists(groupName);
+
+    return childrenOf(paths.topicsPath(groupName));
+  }
+
+  @Override
+  public List<Topic> listTopics(String groupName) {
+    return listTopicNames(groupName).stream()
+        .map(name -> getTopicDetails(new TopicName(groupName, name), true))
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public void createTopic(Topic topic) {
+    groupRepository.ensureGroupExists(topic.getName().getGroupName());
+
+    String topicPath = paths.topicPath(topic.getName());
+    logger.info("Creating topic for path {}", topicPath);
+
+    try {
+      createInTransaction(topicPath, topic, paths.subscriptionsPath(topic.getName()));
+    } catch (KeeperException.NodeExistsException ex) {
+      throw new TopicAlreadyExistsException(topic.getName(), ex);
+    } catch (Exception ex) {
+      throw new InternalProcessingException(ex);
     }
-
-    @Override
-    public void removeTopic(TopicName topicName) {
-        ensureTopicExists(topicName);
-        logger.info("Removing topic: " + topicName);
-        try {
-            remove(paths.topicPath(topicName));
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  }
+
+  /**
+   * To remove topic node, we must remove topic node and its children. The tree looks like this:
+   *
+   * <ul>
+   *   <li>- topic
+   *   <li>----- /subscriptions (required)
+   *   <li>----- /preview (optional)
+   *   <li>----- /metrics (optional)
+   *   <li>--------------- /volume
+   *   <li>--------------- /published
+   * </ul>
+   *
+   * <p>One way to remove the whole tree for topic that would be to use <code>
+   * deletingChildrenIfNeeded()</code>: e.g. <code>
+   * zookeeper.delete().deletingChildrenIfNeeded().forPath(topicPath)</code>. However, <code>
+   * deletingChildrenIfNeeded</code> is not atomic. It first tries to remove the node <code>topic
+   * </code> and upon receiving <code>KeeperException.NotEmptyException</code> it tries to remove
+   * children recursively and then retries the node removal. This means that there is a potentially
+   * large time gap between removal of <code>topic/subscriptions</code> node and <code>topic</code>
+   * node, especially when topic removal is being done in remote DC.
+   *
+   * <p>It turns out that <code>PathChildrenCache</code> used by <code>HierarchicalCacheLevel</code>
+   * in Consumers and Frontend listens for <code>topics/subscriptions</code> changes and recreates
+   * that node when deleted. If the recreation happens between the <code>topic/subscriptions</code>
+   * and <code>topic</code> node removal than the whole removal process must be repeated resulting
+   * in a lengthy loop that may even result in <code>StackOverflowException</code>. Example of that
+   * scenario would be
+   *
+   * <ol>
+   *   <li>DELETE <code>topic</code> - issued by management, fails with
+   *       KeeperException.NotEmptyException
+   *   <li>DELETE <code>topic/subscriptions</code> - issued by management, succeeds
+   *   <li>CREATE <code>topic/subscriptions</code> - issued by frontend, succeeds
+   *   <li>DELETE <code>topic</code> - issued by management, fails with
+   *       KeeperException.NotEmptyException
+   *   <li>[...]
+   * </ol>
+   *
+   * <p>To solve this we must remove <code>topic</code> and <code>topic/subscriptions</code>
+   * atomically. However, we must also remove other <code>topic</code> children. Transaction API
+   * does not allow for optional deletes so we:
+   *
+   * <ol>
+   *   <li>find all children paths
+   *   <li>delete all children in one transaction
+   * </ol>
+   */
+  @Override
+  public void removeTopic(TopicName topicName) {
+    ensureTopicExists(topicName);
+    logger.info("Removing topic: " + topicName);
+
+    List<String> pathsForRemoval = new ArrayList<>();
+    String topicMetricsPath = paths.topicMetricsPath(topicName);
+    if (pathExists(topicMetricsPath)) {
+      pathsForRemoval.addAll(childrenPathsOf(topicMetricsPath));
+      pathsForRemoval.add(topicMetricsPath);
     }
 
-    @Override
-    public void updateTopic(Topic topic) {
-        ensureTopicExists(topic.getName());
-
-        logger.info("Updating topic: " + topic.getName());
-        try {
-            overwrite(paths.topicPath(topic.getName()), topic);
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+    String topicPreviewPath = paths.topicPreviewPath(topicName);
+    if (pathExists(topicPreviewPath)) {
+      pathsForRemoval.add(topicPreviewPath);
     }
 
-    @Override
-    public void touchTopic(TopicName topicName) {
-        ensureTopicExists(topicName);
+    pathsForRemoval.add(paths.subscriptionsPath(topicName));
+    pathsForRemoval.add(paths.topicPath(topicName));
 
-        logger.info("Touching topic: " + topicName.qualifiedName());
-        try {
-            touch(paths.topicPath(topicName));
-        } catch (Exception ex) {
-            throw new InternalProcessingException(ex);
-        }
+    try {
+      deleteInTransaction(pathsForRemoval);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    @Override
-    public Topic getTopicDetails(TopicName topicName) {
-        return getTopicDetails(topicName, false).get();
-    }
+  @Override
+  public void updateTopic(Topic topic) {
+    ensureTopicExists(topic.getName());
 
-    private Optional<Topic> getTopicDetails(TopicName topicName, boolean quiet) {
-        ensureTopicExists(topicName);
-        return readWithStatFrom(
-                paths.topicPath(topicName),
-                Topic.class,
-                (topic, stat) -> {
-                    topic.setCreatedAt(stat.getCtime());
-                    topic.setModifiedAt(stat.getMtime());
-                },
-                quiet
-        );
+    logger.info("Updating topic: " + topic.getName());
+    try {
+      overwrite(paths.topicPath(topic.getName()), topic);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    @Override
-    public List<Topic> getTopicsDetails(Collection<TopicName> topicNames) {
-        return topicNames.stream()
-                .map(topicName -> getTopicDetails(topicName, true))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.toList());
-    }
+  @Override
+  public void touchTopic(TopicName topicName) {
+    ensureTopicExists(topicName);
 
-    @Override
-    public List<Topic> listAllTopics() {
-        return groupRepository.listGroupNames()
-                .stream()
-                .map(this::listTopics)
-                .flatMap(List::stream)
-                .collect(Collectors.toList());
+    logger.info("Touching topic: " + topicName.qualifiedName());
+    try {
+      touch(paths.topicPath(topicName));
+    } catch (Exception ex) {
+      throw new InternalProcessingException(ex);
     }
+  }
+
+  @Override
+  public Topic getTopicDetails(TopicName topicName) {
+    return getTopicDetails(topicName, false).get();
+  }
+
+  private Optional<Topic> getTopicDetails(TopicName topicName, boolean quiet) {
+    ensureTopicExists(topicName);
+    return readWithStatFrom(
+        paths.topicPath(topicName),
+        Topic.class,
+        (topic, stat) -> {
+          topic.setCreatedAt(stat.getCtime());
+          topic.setModifiedAt(stat.getMtime());
+        },
+        quiet);
+  }
+
+  @Override
+  public List<Topic> getTopicsDetails(Collection<TopicName> topicNames) {
+    return topicNames.stream()
+        .map(topicName -> getTopicDetails(topicName, true))
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public List<Topic> listAllTopics() {
+    return groupRepository.listGroupNames().stream()
+        .map(this::listTopics)
+        .flatMap(List::stream)
+        .collect(Collectors.toList());
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCache.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCache.java
index b3d7c6ce33..6f6a821981 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCache.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCache.java
@@ -1,6 +1,9 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
@@ -12,83 +15,87 @@
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.domain.workload.constraints.ConsumersWorkloadConstraints;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
+class ZookeeperWorkloadConstraintsCache extends PathChildrenCache
+    implements PathChildrenCacheListener {
 
-class ZookeeperWorkloadConstraintsCache extends PathChildrenCache implements PathChildrenCacheListener {
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperWorkloadConstraintsCache.class);
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperWorkloadConstraintsCache.class);
+  private final Map<TopicName, Constraints> topicConstraintsCache = new ConcurrentHashMap<>();
+  private final Map<SubscriptionName, Constraints> subscriptionConstraintsCache =
+      new ConcurrentHashMap<>();
+  private final ObjectMapper objectMapper;
+  private final ZookeeperPaths paths;
 
-    private final Map<TopicName, Constraints> topicConstraintsCache = new ConcurrentHashMap<>();
-    private final Map<SubscriptionName, Constraints> subscriptionConstraintsCache = new ConcurrentHashMap<>();
-    private final ObjectMapper objectMapper;
-    private final ZookeeperPaths paths;
+  ZookeeperWorkloadConstraintsCache(
+      CuratorFramework curatorFramework, ObjectMapper objectMapper, ZookeeperPaths paths) {
+    super(curatorFramework, paths.consumersWorkloadConstraintsPath(), true);
+    this.objectMapper = objectMapper;
+    this.paths = paths;
+    getListenable().addListener(this);
+  }
 
-    ZookeeperWorkloadConstraintsCache(CuratorFramework curatorFramework, ObjectMapper objectMapper, ZookeeperPaths paths) {
-        super(curatorFramework, paths.consumersWorkloadConstraintsPath(), true);
-        this.objectMapper = objectMapper;
-        this.paths = paths;
-        getListenable().addListener(this);
-    }
+  ConsumersWorkloadConstraints getConsumersWorkloadConstraints() {
+    return new ConsumersWorkloadConstraints(topicConstraintsCache, subscriptionConstraintsCache);
+  }
 
-    ConsumersWorkloadConstraints getConsumersWorkloadConstraints() {
-        return new ConsumersWorkloadConstraints(topicConstraintsCache, subscriptionConstraintsCache);
+  @Override
+  public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) {
+    switch (event.getType()) {
+      case CHILD_ADDED:
+        updateCache(event.getData().getPath(), event.getData().getData());
+        break;
+      case CHILD_REMOVED:
+        removeFromCache(event.getData().getPath());
+        break;
+      case CHILD_UPDATED:
+        updateCache(event.getData().getPath(), event.getData().getData());
+        break;
+      default:
+        break;
     }
+  }
 
-    @Override
-    public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) {
-        switch (event.getType()) {
-            case CHILD_ADDED:
-                updateCache(event.getData().getPath(), event.getData().getData());
-                break;
-            case CHILD_REMOVED:
-                removeFromCache(event.getData().getPath());
-                break;
-            case CHILD_UPDATED:
-                updateCache(event.getData().getPath(), event.getData().getData());
-                break;
-            default:
-                break;
-        }
+  private void updateCache(String path, byte[] bytes) {
+    Optional<Constraints> constraints = bytesToConstraints(bytes, path);
+    if (!constraints.isPresent()) {
+      return;
     }
-
-    private void updateCache(String path, byte[] bytes) {
-        Optional<Constraints> constraints = bytesToConstraints(bytes, path);
-        if (!constraints.isPresent()) {
-            return;
-        }
-        if (isSubscription(path)) {
-            subscriptionConstraintsCache.put(
-                    SubscriptionName.fromString(paths.extractChildNode(path, paths.consumersWorkloadConstraintsPath())),
-                    constraints.get());
-        } else {
-            topicConstraintsCache.put(
-                    TopicName.fromQualifiedName(paths.extractChildNode(path, paths.consumersWorkloadConstraintsPath())),
-                    constraints.get());
-        }
+    if (isSubscription(path)) {
+      subscriptionConstraintsCache.put(
+          SubscriptionName.fromString(
+              paths.extractChildNode(path, paths.consumersWorkloadConstraintsPath())),
+          constraints.get());
+    } else {
+      topicConstraintsCache.put(
+          TopicName.fromQualifiedName(
+              paths.extractChildNode(path, paths.consumersWorkloadConstraintsPath())),
+          constraints.get());
     }
+  }
 
-    private Optional<Constraints> bytesToConstraints(byte[] bytes, String path) {
-        try {
-            return Optional.ofNullable(objectMapper.readValue(bytes, Constraints.class));
-        } catch (Exception e) {
-            logger.error("Cannot read data from node: {}", path, e);
-            return Optional.empty();
-        }
+  private Optional<Constraints> bytesToConstraints(byte[] bytes, String path) {
+    try {
+      return Optional.ofNullable(objectMapper.readValue(bytes, Constraints.class));
+    } catch (Exception e) {
+      logger.error("Cannot read data from node: {}", path, e);
+      return Optional.empty();
     }
+  }
 
-    private void removeFromCache(String path) {
-        if (isSubscription(path)) {
-            subscriptionConstraintsCache.remove(
-                    SubscriptionName.fromString(paths.extractChildNode(path, paths.consumersWorkloadConstraintsPath())));
-        } else {
-            topicConstraintsCache.remove(
-                    TopicName.fromQualifiedName(paths.extractChildNode(path, paths.consumersWorkloadConstraintsPath())));
-        }
+  private void removeFromCache(String path) {
+    if (isSubscription(path)) {
+      subscriptionConstraintsCache.remove(
+          SubscriptionName.fromString(
+              paths.extractChildNode(path, paths.consumersWorkloadConstraintsPath())));
+    } else {
+      topicConstraintsCache.remove(
+          TopicName.fromQualifiedName(
+              paths.extractChildNode(path, paths.consumersWorkloadConstraintsPath())));
     }
+  }
 
-    private boolean isSubscription(String path) {
-        return path.contains("$");
-    }
+  private boolean isSubscription(String path) {
+    return path.contains("$");
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepository.java
index c1a0ad6f5f..6f1ba031e7 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepository.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepository.java
@@ -16,123 +16,130 @@
 import pl.allegro.tech.hermes.domain.workload.constraints.TopicConstraintsDoNotExistException;
 import pl.allegro.tech.hermes.domain.workload.constraints.WorkloadConstraintsRepository;
 
-public class ZookeeperWorkloadConstraintsRepository extends ZookeeperBasedRepository implements WorkloadConstraintsRepository {
-
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperWorkloadConstraintsRepository.class);
-
-    private final ZookeeperWorkloadConstraintsCache pathChildrenCache;
-
-    public ZookeeperWorkloadConstraintsRepository(CuratorFramework curator, ObjectMapper mapper, ZookeeperPaths paths) {
-        this(curator, mapper, paths, new ZookeeperWorkloadConstraintsCache(curator, mapper, paths));
+public class ZookeeperWorkloadConstraintsRepository extends ZookeeperBasedRepository
+    implements WorkloadConstraintsRepository {
+
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperWorkloadConstraintsRepository.class);
+
+  private final ZookeeperWorkloadConstraintsCache pathChildrenCache;
+
+  public ZookeeperWorkloadConstraintsRepository(
+      CuratorFramework curator, ObjectMapper mapper, ZookeeperPaths paths) {
+    this(curator, mapper, paths, new ZookeeperWorkloadConstraintsCache(curator, mapper, paths));
+  }
+
+  ZookeeperWorkloadConstraintsRepository(
+      CuratorFramework curator,
+      ObjectMapper mapper,
+      ZookeeperPaths paths,
+      ZookeeperWorkloadConstraintsCache pathChildrenCache) {
+    super(curator, mapper, paths);
+    this.pathChildrenCache = pathChildrenCache;
+    try {
+      this.pathChildrenCache.start();
+    } catch (Exception e) {
+      throw new InternalProcessingException("ZookeeperWorkloadConstraintsCache cannot start.", e);
     }
-
-    ZookeeperWorkloadConstraintsRepository(CuratorFramework curator, ObjectMapper mapper, ZookeeperPaths paths,
-                                           ZookeeperWorkloadConstraintsCache pathChildrenCache) {
-        super(curator, mapper, paths);
-        this.pathChildrenCache = pathChildrenCache;
-        try {
-            this.pathChildrenCache.start();
-        } catch (Exception e) {
-            throw new InternalProcessingException("ZookeeperWorkloadConstraintsCache cannot start.", e);
-        }
+  }
+
+  @Override
+  public ConsumersWorkloadConstraints getConsumersWorkloadConstraints() {
+    return pathChildrenCache.getConsumersWorkloadConstraints();
+  }
+
+  @Override
+  public void createConstraints(TopicName topicName, Constraints constraints) {
+    logger.info("Creating constraints for topic {}", topicName.qualifiedName());
+    String path = paths.consumersWorkloadConstraintsPath(topicName.qualifiedName());
+    try {
+      createConstraints(path, constraints);
+    } catch (KeeperException.NodeExistsException e) {
+      throw new TopicConstraintsAlreadyExistException(topicName, e);
     }
-
-    @Override
-    public ConsumersWorkloadConstraints getConsumersWorkloadConstraints() {
-        return pathChildrenCache.getConsumersWorkloadConstraints();
+  }
+
+  @Override
+  public void createConstraints(SubscriptionName subscriptionName, Constraints constraints) {
+    logger.info("Creating constraints for subscription {}", subscriptionName.getQualifiedName());
+    String path = paths.consumersWorkloadConstraintsPath(subscriptionName.getQualifiedName());
+    try {
+      createConstraints(path, constraints);
+    } catch (KeeperException.NodeExistsException e) {
+      throw new SubscriptionConstraintsAlreadyExistException(subscriptionName, e);
     }
-
-    @Override
-    public void createConstraints(TopicName topicName, Constraints constraints) {
-        logger.info("Creating constraints for topic {}", topicName.qualifiedName());
-        String path = paths.consumersWorkloadConstraintsPath(topicName.qualifiedName());
-        try {
-            createConstraints(path, constraints);
-        } catch (KeeperException.NodeExistsException e) {
-            throw new TopicConstraintsAlreadyExistException(topicName, e);
-        }
+  }
+
+  private void createConstraints(String path, Constraints constraints)
+      throws KeeperException.NodeExistsException {
+    try {
+      createRecursively(path, constraints);
+    } catch (KeeperException.NodeExistsException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    @Override
-    public void createConstraints(SubscriptionName subscriptionName, Constraints constraints) {
-        logger.info("Creating constraints for subscription {}", subscriptionName.getQualifiedName());
-        String path = paths.consumersWorkloadConstraintsPath(subscriptionName.getQualifiedName());
-        try {
-            createConstraints(path, constraints);
-        } catch (KeeperException.NodeExistsException e) {
-            throw new SubscriptionConstraintsAlreadyExistException(subscriptionName, e);
-        }
+  }
+
+  @Override
+  public void updateConstraints(TopicName topicName, Constraints constraints) {
+    logger.info("Updating constraints for topic {}", topicName.qualifiedName());
+    String path = paths.consumersWorkloadConstraintsPath(topicName.qualifiedName());
+    try {
+      overwrite(path, constraints);
+    } catch (KeeperException.NoNodeException e) {
+      throw new TopicConstraintsDoNotExistException(topicName, e);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    private void createConstraints(String path, Constraints constraints) throws KeeperException.NodeExistsException {
-        try {
-            createRecursively(path, constraints);
-        } catch (KeeperException.NodeExistsException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
+  }
+
+  @Override
+  public void updateConstraints(SubscriptionName subscriptionName, Constraints constraints) {
+    logger.info("Updating constraints for subscription {}", subscriptionName.getQualifiedName());
+    String path = paths.consumersWorkloadConstraintsPath(subscriptionName.getQualifiedName());
+    try {
+      overwrite(path, constraints);
+    } catch (KeeperException.NoNodeException e) {
+      throw new SubscriptionConstraintsDoNotExistException(subscriptionName, e);
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
-
-    @Override
-    public void updateConstraints(TopicName topicName, Constraints constraints) {
-        logger.info("Updating constraints for topic {}", topicName.qualifiedName());
-        String path = paths.consumersWorkloadConstraintsPath(topicName.qualifiedName());
-        try {
-            overwrite(path, constraints);
-        } catch (KeeperException.NoNodeException e) {
-            throw new TopicConstraintsDoNotExistException(topicName, e);
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    @Override
-    public void updateConstraints(SubscriptionName subscriptionName, Constraints constraints) {
-        logger.info("Updating constraints for subscription {}", subscriptionName.getQualifiedName());
-        String path = paths.consumersWorkloadConstraintsPath(subscriptionName.getQualifiedName());
-        try {
-            overwrite(path, constraints);
-        } catch (KeeperException.NoNodeException e) {
-            throw new SubscriptionConstraintsDoNotExistException(subscriptionName, e);
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    @Override
-    public void deleteConstraints(TopicName topicName) {
-        logger.info("Deleting constraints for topic {}", topicName.qualifiedName());
-        String path = paths.consumersWorkloadConstraintsPath(topicName.qualifiedName());
-        deleteConstraints(path);
-    }
-
-    @Override
-    public void deleteConstraints(SubscriptionName subscriptionName) {
-        logger.info("Deleting constraints for subscription {}", subscriptionName.getQualifiedName());
-        String path = paths.consumersWorkloadConstraintsPath(subscriptionName.getQualifiedName());
-        deleteConstraints(path);
-    }
-
-    private void deleteConstraints(String path) {
-        try {
-            remove(path);
-        } catch (KeeperException.NoNodeException e) {
-            // ignore - it's ok
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    @Override
-    public boolean constraintsExist(TopicName topicName) {
-        String path = paths.consumersWorkloadConstraintsPath(topicName.qualifiedName());
-        return pathExists(path);
-    }
-
-    @Override
-    public boolean constraintsExist(SubscriptionName subscriptionName) {
-        String path = paths.consumersWorkloadConstraintsPath(subscriptionName.getQualifiedName());
-        return pathExists(path);
+  }
+
+  @Override
+  public void deleteConstraints(TopicName topicName) {
+    logger.info("Deleting constraints for topic {}", topicName.qualifiedName());
+    String path = paths.consumersWorkloadConstraintsPath(topicName.qualifiedName());
+    deleteConstraints(path);
+  }
+
+  @Override
+  public void deleteConstraints(SubscriptionName subscriptionName) {
+    logger.info("Deleting constraints for subscription {}", subscriptionName.getQualifiedName());
+    String path = paths.consumersWorkloadConstraintsPath(subscriptionName.getQualifiedName());
+    deleteConstraints(path);
+  }
+
+  private void deleteConstraints(String path) {
+    try {
+      remove(path);
+    } catch (KeeperException.NoNodeException e) {
+      // ignore - it's ok
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
+
+  @Override
+  public boolean constraintsExist(TopicName topicName) {
+    String path = paths.consumersWorkloadConstraintsPath(topicName.qualifiedName());
+    return pathExists(path);
+  }
+
+  @Override
+  public boolean constraintsExist(SubscriptionName subscriptionName) {
+    String path = paths.consumersWorkloadConstraintsPath(subscriptionName.getQualifiedName());
+    return pathExists(path);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/CacheListeners.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/CacheListeners.java
index 69d0292b64..fc3c15bf33 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/CacheListeners.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/CacheListeners.java
@@ -1,31 +1,33 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.cache;
 
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.Consumer;
+import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class CacheListeners {
 
-    private static final Logger logger = LoggerFactory.getLogger(CacheListeners.class);
+  private static final Logger logger = LoggerFactory.getLogger(CacheListeners.class);
 
-    private final Queue<Consumer<PathChildrenCacheEvent>> callbacks = new ConcurrentLinkedQueue<>();
+  private final Queue<Consumer<PathChildrenCacheEvent>> callbacks = new ConcurrentLinkedQueue<>();
 
-    void addListener(Consumer<PathChildrenCacheEvent> callback) {
-        callbacks.add(callback);
-    }
+  void addListener(Consumer<PathChildrenCacheEvent> callback) {
+    callbacks.add(callback);
+  }
 
-    void call(PathChildrenCacheEvent event) {
-        for (Consumer<PathChildrenCacheEvent> callback : callbacks) {
-            try {
-                callback.accept(event);
-            } catch (Exception exception) {
-                logger.error("Failed to run callback action {} for event with data: {}",
-                        callback.getClass().getSimpleName(), event.getData(), exception);
-            }
-        }
+  void call(PathChildrenCacheEvent event) {
+    for (Consumer<PathChildrenCacheEvent> callback : callbacks) {
+      try {
+        callback.accept(event);
+      } catch (Exception exception) {
+        logger.error(
+            "Failed to run callback action {} for event with data: {}",
+            callback.getClass().getSimpleName(),
+            event.getData(),
+            exception);
+      }
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCache.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCache.java
index 23a7952f79..4f79d10549 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCache.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCache.java
@@ -1,102 +1,109 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.cache;
 
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-import org.apache.zookeeper.KeeperException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 public class HierarchicalCache {
 
-    private static final Logger logger = LoggerFactory.getLogger(HierarchicalCache.class);
+  private static final Logger logger = LoggerFactory.getLogger(HierarchicalCache.class);
 
-    private final CuratorFramework curatorFramework;
+  private final CuratorFramework curatorFramework;
 
-    private final ExecutorService executorService;
+  private final ExecutorService executorService;
 
-    private final String basePath;
-    private final boolean removeNodesWithNoData;
+  private final String basePath;
+  private final boolean removeNodesWithNoData;
 
-    private final List<String> levelPrefixes = new ArrayList<>();
+  private final List<String> levelPrefixes = new ArrayList<>();
 
-    private final int maxDepth;
+  private final int maxDepth;
 
-    private final List<CacheListeners> levelCallbacks = new ArrayList<>();
+  private final List<CacheListeners> levelCallbacks = new ArrayList<>();
 
-    private HierarchicalCacheLevel rootCache;
+  private HierarchicalCacheLevel rootCache;
 
-    public HierarchicalCache(CuratorFramework curatorFramework,
-                             ExecutorService executorService,
-                             String basePath,
-                             int maxDepth,
-                             List<String> levelPrefixes,
-                             boolean removeNodesWithNoData) {
-        this.curatorFramework = curatorFramework;
-        this.executorService = executorService;
-        this.basePath = basePath;
-        this.removeNodesWithNoData = removeNodesWithNoData;
-        this.levelPrefixes.addAll(levelPrefixes);
-        this.maxDepth = maxDepth;
+  public HierarchicalCache(
+      CuratorFramework curatorFramework,
+      ExecutorService executorService,
+      String basePath,
+      int maxDepth,
+      List<String> levelPrefixes,
+      boolean removeNodesWithNoData) {
+    this.curatorFramework = curatorFramework;
+    this.executorService = executorService;
+    this.basePath = basePath;
+    this.removeNodesWithNoData = removeNodesWithNoData;
+    this.levelPrefixes.addAll(levelPrefixes);
+    this.maxDepth = maxDepth;
 
-        for (int i = 0; i < maxDepth; ++i) {
-            levelCallbacks.add(new CacheListeners());
-        }
-    }
-
-    public void start() throws Exception {
-        ensureBasePath();
-        rootCache = createLevelCache(0, basePath);
-    }
-
-    public void stop() throws Exception {
-        rootCache.stop();
-    }
-
-    public void registerCallback(int depth, Consumer<PathChildrenCacheEvent> callback) {
-        levelCallbacks.get(depth).addListener(callback);
-    }
-
-    private HierarchicalCacheLevel createLevelCache(int depth, String path) {
-        BiFunction<Integer, String, HierarchicalCacheLevel> function = depth + 1 < maxDepth ? this::createLevelCache : null;
-        HierarchicalCacheLevel levelCache = new HierarchicalCacheLevel(curatorFramework,
-                executorService,
-                path(depth, path),
-                depth,
-                levelCallbacks.get(depth),
-                Optional.ofNullable(function),
-                removeNodesWithNoData);
-        try {
-            logger.debug("Starting hierarchical cache level for path  {} and depth {}", path, depth);
-            levelCache.start();
-        } catch (Exception e) {
-            logger.error("Failed to start hierarchical cache level for path {} and depth {}", path(depth, path), depth, e);
-        }
-        return levelCache;
+    for (int i = 0; i < maxDepth; ++i) {
+      levelCallbacks.add(new CacheListeners());
     }
-
-    private String path(int depth, String basePath) {
-        return basePath + (levelPrefixes.size() > depth ? "/" + levelPrefixes.get(depth) : "");
+  }
+
+  public void start() throws Exception {
+    ensureBasePath();
+    rootCache = createLevelCache(0, basePath);
+  }
+
+  public void stop() throws Exception {
+    rootCache.stop();
+  }
+
+  public void registerCallback(int depth, Consumer<PathChildrenCacheEvent> callback) {
+    levelCallbacks.get(depth).addListener(callback);
+  }
+
+  private HierarchicalCacheLevel createLevelCache(int depth, String path) {
+    BiFunction<Integer, String, HierarchicalCacheLevel> function =
+        depth + 1 < maxDepth ? this::createLevelCache : null;
+    HierarchicalCacheLevel levelCache =
+        new HierarchicalCacheLevel(
+            curatorFramework,
+            executorService,
+            path(depth, path),
+            depth,
+            levelCallbacks.get(depth),
+            Optional.ofNullable(function),
+            removeNodesWithNoData);
+    try {
+      logger.debug("Starting hierarchical cache level for path  {} and depth {}", path, depth);
+      levelCache.start();
+    } catch (Exception e) {
+      logger.error(
+          "Failed to start hierarchical cache level for path {} and depth {}",
+          path(depth, path),
+          depth,
+          e);
     }
-
-    private void ensureBasePath() {
-        try {
-            try {
-                if (curatorFramework.checkExists().forPath(basePath) == null) {
-                    curatorFramework.create().creatingParentsIfNeeded().forPath(basePath);
-                }
-            } catch (KeeperException.NodeExistsException e) {
-                // ignore
-            }
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
+    return levelCache;
+  }
+
+  private String path(int depth, String basePath) {
+    return basePath + (levelPrefixes.size() > depth ? "/" + levelPrefixes.get(depth) : "");
+  }
+
+  private void ensureBasePath() {
+    try {
+      try {
+        if (curatorFramework.checkExists().forPath(basePath) == null) {
+          curatorFramework.create().creatingParentsIfNeeded().forPath(basePath);
         }
+      } catch (KeeperException.NodeExistsException e) {
+        // ignore
+      }
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheLevel.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheLevel.java
index 320a60d0a1..51377f9e18 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheLevel.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheLevel.java
@@ -1,14 +1,5 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.cache;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.recipes.cache.PathChildrenCache;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
-import org.apache.zookeeper.KeeperException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -20,156 +11,183 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.recipes.cache.PathChildrenCache;
+import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
+import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class HierarchicalCacheLevel extends PathChildrenCache implements PathChildrenCacheListener {
 
-    private static Logger logger = LoggerFactory.getLogger(HierarchicalCacheLevel.class);
-
-    private final ReadWriteLock subcacheLock = new ReentrantReadWriteLock(true);
-
-    private final CacheListeners consumer;
-
-    private final CuratorFramework curatorClient;
-    private final int currentDepth;
-
-    private final Optional<BiFunction<Integer, String, HierarchicalCacheLevel>> nextLevelFactory;
-    private final boolean removeNodesWithNoData;
-
-    private final Map<String, HierarchicalCacheLevel> subcacheMap = new HashMap<>();
-
-    HierarchicalCacheLevel(CuratorFramework curatorClient,
-                           ExecutorService executorService,
-                           String path,
-                           int depth,
-                           CacheListeners eventConsumer,
-                           Optional<BiFunction<Integer, String, HierarchicalCacheLevel>> nextLevelFactory,
-                           boolean removeNodesWithNoData) {
-        super(curatorClient, path, true, false, executorService);
-        this.curatorClient = curatorClient;
-        this.currentDepth = depth;
-        this.consumer = eventConsumer;
-        this.nextLevelFactory = nextLevelFactory;
-        this.removeNodesWithNoData = removeNodesWithNoData;
-        getListenable().addListener(this);
+  private static Logger logger = LoggerFactory.getLogger(HierarchicalCacheLevel.class);
+
+  private final ReadWriteLock subcacheLock = new ReentrantReadWriteLock(true);
+
+  private final CacheListeners consumer;
+
+  private final CuratorFramework curatorClient;
+  private final int currentDepth;
+
+  private final Optional<BiFunction<Integer, String, HierarchicalCacheLevel>> nextLevelFactory;
+  private final boolean removeNodesWithNoData;
+
+  private final Map<String, HierarchicalCacheLevel> subcacheMap = new HashMap<>();
+
+  HierarchicalCacheLevel(
+      CuratorFramework curatorClient,
+      ExecutorService executorService,
+      String path,
+      int depth,
+      CacheListeners eventConsumer,
+      Optional<BiFunction<Integer, String, HierarchicalCacheLevel>> nextLevelFactory,
+      boolean removeNodesWithNoData) {
+    super(curatorClient, path, true, false, executorService);
+    this.curatorClient = curatorClient;
+    this.currentDepth = depth;
+    this.consumer = eventConsumer;
+    this.nextLevelFactory = nextLevelFactory;
+    this.removeNodesWithNoData = removeNodesWithNoData;
+    getListenable().addListener(this);
+  }
+
+  @Override
+  public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
+    if (event.getData() == null) {
+      return;
     }
 
-    @Override
-    public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
-        if (event.getData() == null) {
-            return;
-        }
-
-        String path = event.getData().getPath();
-        String cacheName = cacheNameFromPath(path);
-        logger.debug("Got {} event for path {}", event.getType(), path);
-
-        switch (event.getType()) {
-            case CHILD_ADDED:
-                addSubcache(path, cacheName, event.getData().getData());
-                break;
-            case CHILD_REMOVED:
-                removeSubcache(path, cacheName);
-                break;
-            default:
-                break;
-        }
-
-        consumer.call(event);
+    String path = event.getData().getPath();
+    String cacheName = cacheNameFromPath(path);
+    logger.debug("Got {} event for path {}", event.getType(), path);
+
+    switch (event.getType()) {
+      case CHILD_ADDED:
+        addSubcache(path, cacheName, event.getData().getData());
+        break;
+      case CHILD_REMOVED:
+        removeSubcache(path, cacheName);
+        break;
+      default:
+        break;
     }
 
-    void stop() throws IOException {
-        Lock writeLock = subcacheLock.writeLock();
-        writeLock.lock();
-        try {
-            for (HierarchicalCacheLevel subcache : subcacheMap.values()) {
-                subcache.stop();
-            }
-            subcacheMap.clear();
-            this.close();
-        } finally {
-            writeLock.unlock();
-        }
+    consumer.call(event);
+  }
+
+  void stop() throws IOException {
+    Lock writeLock = subcacheLock.writeLock();
+    writeLock.lock();
+    try {
+      for (HierarchicalCacheLevel subcache : subcacheMap.values()) {
+        subcache.stop();
+      }
+      subcacheMap.clear();
+      this.close();
+    } finally {
+      writeLock.unlock();
     }
-
-    private void addSubcache(String path, String cacheName, byte[] data) {
-        Lock writeLock = subcacheLock.writeLock();
-        writeLock.lock();
-        try {
-            logger.debug("Adding cache for path {}; Cache name: {}; Depth: {}; InstanceId: {}",
-                    path, cacheName, currentDepth, Integer.toHexString(hashCode()));
-
-            if (ArrayUtils.isEmpty(data) && removeNodesWithNoData) {
-                logger.warn("Removing path {} due to no data in the znode", path);
-                printOrphanedChildren(path);
-                removeNodeRecursively(path);
-                return;
-            }
-            if (subcacheMap.containsKey(cacheName)) {
-                logger.debug("Possible duplicate of new entry for {}, ignoring", cacheName);
-                return;
-            }
-            nextLevelFactory.ifPresent(f -> subcacheMap.put(cacheName, f.apply(currentDepth + 1, path)));
-        } finally {
-            writeLock.unlock();
-        }
+  }
+
+  private void addSubcache(String path, String cacheName, byte[] data) {
+    Lock writeLock = subcacheLock.writeLock();
+    writeLock.lock();
+    try {
+      logger.debug(
+          "Adding cache for path {}; Cache name: {}; Depth: {}; InstanceId: {}",
+          path,
+          cacheName,
+          currentDepth,
+          Integer.toHexString(hashCode()));
+
+      if (ArrayUtils.isEmpty(data) && removeNodesWithNoData) {
+        logger.warn("Removing path {} due to no data in the znode", path);
+        printOrphanedChildren(path);
+        removeNodeRecursively(path);
+        return;
+      }
+      if (subcacheMap.containsKey(cacheName)) {
+        logger.debug("Possible duplicate of new entry for {}, ignoring", cacheName);
+        return;
+      }
+      nextLevelFactory.ifPresent(f -> subcacheMap.put(cacheName, f.apply(currentDepth + 1, path)));
+    } finally {
+      writeLock.unlock();
     }
-
-    private void printOrphanedChildren(String path) {
-        try {
-            List<String> children = curatorClient.getChildren().forPath(path);
-            logger.warn("Nodes with empty parent {}: {}",
-                    path, children.stream().map(Object::toString).collect(Collectors.joining(",")));
-            printChildrenWithEmptyParentRecursively(path, children);
-        } catch (KeeperException.NoNodeException e) {
-            logger.info("Could not receive list of children for path {} as the path does not exist", path);
-        } catch (Exception e) {
-            logger.warn("Could not receive list of children for path {} due to error", path, e);
-        }
+  }
+
+  private void printOrphanedChildren(String path) {
+    try {
+      List<String> children = curatorClient.getChildren().forPath(path);
+      logger.warn(
+          "Nodes with empty parent {}: {}",
+          path,
+          children.stream().map(Object::toString).collect(Collectors.joining(",")));
+      printChildrenWithEmptyParentRecursively(path, children);
+    } catch (KeeperException.NoNodeException e) {
+      logger.info(
+          "Could not receive list of children for path {} as the path does not exist", path);
+    } catch (Exception e) {
+      logger.warn("Could not receive list of children for path {} due to error", path, e);
     }
-
-    private void printChildrenWithEmptyParentRecursively(String pathWithEmptyParent, List<String> children) {
-        children.forEach(c -> {
-            try {
-                String nextPath = pathWithEmptyParent + "/" + c;
-                logger.warn("Node with empty parent: {}", nextPath);
-                List<String> nextChildren = curatorClient.getChildren().forPath(nextPath);
-
-                printChildrenWithEmptyParentRecursively(nextPath, nextChildren);
-            } catch (KeeperException.NoNodeException e) {
-                logger.info("Could not receive list of children for path {} as the path does not exist", pathWithEmptyParent);
-            } catch (Exception e) {
-                logger.warn("Could not receive list of children for path {} due to error", pathWithEmptyParent, e);
-            }
+  }
+
+  private void printChildrenWithEmptyParentRecursively(
+      String pathWithEmptyParent, List<String> children) {
+    children.forEach(
+        c -> {
+          try {
+            String nextPath = pathWithEmptyParent + "/" + c;
+            logger.warn("Node with empty parent: {}", nextPath);
+            List<String> nextChildren = curatorClient.getChildren().forPath(nextPath);
+
+            printChildrenWithEmptyParentRecursively(nextPath, nextChildren);
+          } catch (KeeperException.NoNodeException e) {
+            logger.info(
+                "Could not receive list of children for path {} as the path does not exist",
+                pathWithEmptyParent);
+          } catch (Exception e) {
+            logger.warn(
+                "Could not receive list of children for path {} due to error",
+                pathWithEmptyParent,
+                e);
+          }
         });
+  }
+
+  private void removeNodeRecursively(String path) {
+    try {
+      curatorClient.delete().deletingChildrenIfNeeded().forPath(path);
+      logger.warn("Removed recursively path {}", path);
+    } catch (Exception e) {
+      logger.warn("Error while deleting recursively path {}", path, e);
     }
-
-    private void removeNodeRecursively(String path) {
-        try {
-            curatorClient.delete().deletingChildrenIfNeeded().forPath(path);
-            logger.warn("Removed recursively path {}", path);
-        } catch (Exception e) {
-            logger.warn("Error while deleting recursively path {}", path, e);
-        }
+  }
+
+  private void removeSubcache(String path, String cacheName) throws Exception {
+    Lock writeLock = subcacheLock.writeLock();
+    writeLock.lock();
+    logger.debug(
+        "Removing cache for path {}; Cache name: {}; Depth {}; InstanceId: {}",
+        path,
+        cacheName,
+        currentDepth,
+        Integer.toHexString(hashCode()));
+    try {
+      HierarchicalCacheLevel subcache = subcacheMap.remove(cacheName);
+      if (subcache == null) {
+        logger.debug("Possible duplicate of removed entry for {}, ignoring", cacheName);
+        return;
+      }
+      subcache.close();
+    } finally {
+      writeLock.unlock();
     }
+  }
 
-    private void removeSubcache(String path, String cacheName) throws Exception {
-        Lock writeLock = subcacheLock.writeLock();
-        writeLock.lock();
-        logger.debug("Removing cache for path {}; Cache name: {}; Depth {}; InstanceId: {}",
-                path, cacheName, currentDepth, Integer.toHexString(hashCode()));
-        try {
-            HierarchicalCacheLevel subcache = subcacheMap.remove(cacheName);
-            if (subcache == null) {
-                logger.debug("Possible duplicate of removed entry for {}, ignoring", cacheName);
-                return;
-            }
-            subcache.close();
-        } finally {
-            writeLock.unlock();
-        }
-    }
-
-    private String cacheNameFromPath(String path) {
-        return path.substring(path.lastIndexOf('/') + 1);
-    }
+  private String cacheNameFromPath(String path) {
+    return path.substring(path.lastIndexOf('/') + 1);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/ModelAwareZookeeperNotifyingCache.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/ModelAwareZookeeperNotifyingCache.java
index 6a544acd01..ea16b86317 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/ModelAwareZookeeperNotifyingCache.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/ModelAwareZookeeperNotifyingCache.java
@@ -1,73 +1,62 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.cache;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Consumer;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.common.cache.queue.LinkedHashSetBlockingQueue;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-
 public class ModelAwareZookeeperNotifyingCache {
 
-    private static final Logger logger = LoggerFactory.getLogger(ModelAwareZookeeperNotifyingCache.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(ModelAwareZookeeperNotifyingCache.class);
 
-    private static final int GROUP_LEVEL = 0;
+  private static final int GROUP_LEVEL = 0;
 
-    private static final int TOPIC_LEVEL = 1;
+  private static final int TOPIC_LEVEL = 1;
 
-    private static final int SUBSCRIPTION_LEVEL = 2;
+  private static final int SUBSCRIPTION_LEVEL = 2;
 
-    private final HierarchicalCache cache;
-    private final ThreadPoolExecutor executor;
+  private final HierarchicalCache cache;
+  private final ExecutorService executor;
 
-    public ModelAwareZookeeperNotifyingCache(CuratorFramework curator, String rootPath, int processingThreadPoolSize) {
-        List<String> levelPrefixes = Arrays.asList(
-                ZookeeperPaths.GROUPS_PATH, ZookeeperPaths.TOPICS_PATH, ZookeeperPaths.SUBSCRIPTIONS_PATH
-        );
-        ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat(rootPath + "-zk-cache-%d").build();
-        executor = new ThreadPoolExecutor(1, processingThreadPoolSize,
-                Integer.MAX_VALUE, TimeUnit.SECONDS, new LinkedHashSetBlockingQueue<>(), threadFactory);
-        this.cache = new HierarchicalCache(
-                curator,
-                executor,
-                rootPath,
-                3,
-                levelPrefixes,
-                true
-        );
-    }
-
-    public void start() throws Exception {
-        cache.start();
-    }
+  public ModelAwareZookeeperNotifyingCache(
+      CuratorFramework curator, ExecutorService executor, String rootPath) {
+    List<String> levelPrefixes =
+        Arrays.asList(
+            ZookeeperPaths.GROUPS_PATH,
+            ZookeeperPaths.TOPICS_PATH,
+            ZookeeperPaths.SUBSCRIPTIONS_PATH);
+    this.executor = executor;
+    this.cache = new HierarchicalCache(curator, executor, rootPath, 3, levelPrefixes, true);
+  }
 
-    public void stop() {
-        try {
-            cache.stop();
-            executor.shutdownNow();
-        } catch (Exception e) {
-            logger.warn("Failed to stop Zookeeper cache", e);
-        }
-    }
+  public void start() throws Exception {
+    cache.start();
+  }
 
-    public void registerGroupCallback(Consumer<PathChildrenCacheEvent> callback) {
-        cache.registerCallback(GROUP_LEVEL, callback);
+  public void stop() {
+    try {
+      cache.stop();
+      executor.shutdownNow();
+    } catch (Exception e) {
+      logger.warn("Failed to stop Zookeeper cache", e);
     }
+  }
 
+  public void registerGroupCallback(Consumer<PathChildrenCacheEvent> callback) {
+    cache.registerCallback(GROUP_LEVEL, callback);
+  }
 
-    public void registerTopicCallback(Consumer<PathChildrenCacheEvent> callback) {
-        cache.registerCallback(TOPIC_LEVEL, callback);
-    }
+  public void registerTopicCallback(Consumer<PathChildrenCacheEvent> callback) {
+    cache.registerCallback(TOPIC_LEVEL, callback);
+  }
 
-    public void registerSubscriptionCallback(Consumer<PathChildrenCacheEvent> callback) {
-        cache.registerCallback(SUBSCRIPTION_LEVEL, callback);
-    }
+  public void registerSubscriptionCallback(Consumer<PathChildrenCacheEvent> callback) {
+    cache.registerCallback(SUBSCRIPTION_LEVEL, callback);
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/SharedCounter.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/SharedCounter.java
index 4a051053ac..498389cde6 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/SharedCounter.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/SharedCounter.java
@@ -3,58 +3,63 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 import org.apache.curator.RetryPolicy;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.atomic.DistributedAtomicLong;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-
 public class SharedCounter {
 
-    private final LoadingCache<String, DistributedAtomicLong> distributedAtomicLongs;
+  private final LoadingCache<String, DistributedAtomicLong> distributedAtomicLongs;
 
-    public SharedCounter(CuratorFramework curatorClient, Duration expireAfter,
-                         Duration distributedLoaderBackoff, int distributedLoaderRetries) {
-        distributedAtomicLongs = CacheBuilder.newBuilder()
-                .expireAfterAccess(expireAfter.toHours(), TimeUnit.HOURS)
-                .build(new DistributedAtomicLongLoader(
-                                curatorClient,
-                                new ExponentialBackoffRetry((int) distributedLoaderBackoff.toMillis(), distributedLoaderRetries))
-                );
-    }
+  public SharedCounter(
+      CuratorFramework curatorClient,
+      Duration expireAfter,
+      Duration distributedLoaderBackoff,
+      int distributedLoaderRetries) {
+    distributedAtomicLongs =
+        CacheBuilder.newBuilder()
+            .expireAfterAccess(expireAfter.toHours(), TimeUnit.HOURS)
+            .build(
+                new DistributedAtomicLongLoader(
+                    curatorClient,
+                    new ExponentialBackoffRetry(
+                        (int) distributedLoaderBackoff.toMillis(), distributedLoaderRetries)));
+  }
 
-    public boolean increment(String path, long count) {
-        try {
-            return distributedAtomicLongs.get(path).add(count).succeeded();
-        } catch (Exception e) {
-            throw new ZookeeperCounterException(path, e);
-        }
+  public boolean increment(String path, long count) {
+    try {
+      return distributedAtomicLongs.get(path).add(count).succeeded();
+    } catch (Exception e) {
+      throw new ZookeeperCounterException(path, e);
     }
+  }
 
-    public long getValue(String path) {
-        try {
-            return distributedAtomicLongs.get(path).get().preValue();
-        } catch (Exception e) {
-            throw new ZookeeperCounterException(path, e);
-        }
+  public long getValue(String path) {
+    try {
+      return distributedAtomicLongs.get(path).get().preValue();
+    } catch (Exception e) {
+      throw new ZookeeperCounterException(path, e);
     }
+  }
 
-    private static final class DistributedAtomicLongLoader extends CacheLoader<String, DistributedAtomicLong> {
+  private static final class DistributedAtomicLongLoader
+      extends CacheLoader<String, DistributedAtomicLong> {
 
-        private final CuratorFramework client;
+    private final CuratorFramework client;
 
-        private final RetryPolicy retryPolicy;
+    private final RetryPolicy retryPolicy;
 
-        DistributedAtomicLongLoader(CuratorFramework client, RetryPolicy retryPolicy) {
-            this.client = client;
-            this.retryPolicy = retryPolicy;
-        }
+    DistributedAtomicLongLoader(CuratorFramework client, RetryPolicy retryPolicy) {
+      this.client = client;
+      this.retryPolicy = retryPolicy;
+    }
 
-        @Override
-        public DistributedAtomicLong load(String key) throws Exception {
-            return new DistributedAtomicLong(client, key, retryPolicy);
-        }
+    @Override
+    public DistributedAtomicLong load(String key) throws Exception {
+      return new DistributedAtomicLong(client, key, retryPolicy);
     }
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/ZookeeperCounterException.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/ZookeeperCounterException.java
index 8d0fdfa0b8..06b792be86 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/ZookeeperCounterException.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/ZookeeperCounterException.java
@@ -6,16 +6,16 @@
 @SuppressWarnings("serial")
 public class ZookeeperCounterException extends HermesException {
 
-    public ZookeeperCounterException(String key, String message) {
-        super("Exception while trying to access counter " + key + " via Zookeeper. " + message);
-    }
+  public ZookeeperCounterException(String key, String message) {
+    super("Exception while trying to access counter " + key + " via Zookeeper. " + message);
+  }
 
-    public ZookeeperCounterException(String key, Throwable cause) {
-        super("Exception while trying to access counter " + key + " via Zookeeper.", cause);
-    }
+  public ZookeeperCounterException(String key, Throwable cause) {
+    super("Exception while trying to access counter " + key + " via Zookeeper.", cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.INTERNAL_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.INTERNAL_ERROR;
+  }
 }
diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/notifications/ZookeeperInternalNotificationBus.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/notifications/ZookeeperInternalNotificationBus.java
index d7989ba7d0..0ba00581db 100644
--- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/notifications/ZookeeperInternalNotificationBus.java
+++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/notifications/ZookeeperInternalNotificationBus.java
@@ -1,7 +1,12 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.notifications;
 
+import static java.util.Optional.empty;
+import static java.util.Optional.of;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.ArrayUtils;
+import java.io.IOException;
+import java.util.Optional;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.curator.framework.recipes.cache.ChildData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,78 +18,79 @@
 import pl.allegro.tech.hermes.domain.notifications.TopicCallback;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.cache.ModelAwareZookeeperNotifyingCache;
 
-import java.io.IOException;
-import java.util.Optional;
-
-import static java.util.Optional.empty;
-import static java.util.Optional.of;
-
 public class ZookeeperInternalNotificationBus implements InternalNotificationsBus {
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperInternalNotificationBus.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperInternalNotificationBus.class);
 
-    private final ObjectMapper objectMapper;
+  private final ObjectMapper objectMapper;
 
-    private final ModelAwareZookeeperNotifyingCache modelNotifyingCache;
+  private final ModelAwareZookeeperNotifyingCache modelNotifyingCache;
 
-    public ZookeeperInternalNotificationBus(ObjectMapper objectMapper, ModelAwareZookeeperNotifyingCache modelNotifyingCache) {
-        this.objectMapper = objectMapper;
-        this.modelNotifyingCache = modelNotifyingCache;
-    }
+  public ZookeeperInternalNotificationBus(
+      ObjectMapper objectMapper, ModelAwareZookeeperNotifyingCache modelNotifyingCache) {
+    this.objectMapper = objectMapper;
+    this.modelNotifyingCache = modelNotifyingCache;
+  }
 
-    @Override
-    public void registerSubscriptionCallback(SubscriptionCallback callback) {
-        modelNotifyingCache.registerSubscriptionCallback((e) -> {
-            switch (e.getType()) {
-                case CHILD_ADDED:
-                    readSilently(e.getData(), Subscription.class).ifPresent(callback::onSubscriptionCreated);
-                    break;
-                case CHILD_UPDATED:
-                    readSilently(e.getData(), Subscription.class).ifPresent(callback::onSubscriptionChanged);
-                    break;
-                case CHILD_REMOVED:
-                    readSilently(e.getData(), Subscription.class).ifPresent(callback::onSubscriptionRemoved);
-                    break;
-                default:
-                    break;
-            }
+  @Override
+  public void registerSubscriptionCallback(SubscriptionCallback callback) {
+    modelNotifyingCache.registerSubscriptionCallback(
+        (e) -> {
+          switch (e.getType()) {
+            case CHILD_ADDED:
+              readSilently(e.getData(), Subscription.class)
+                  .ifPresent(callback::onSubscriptionCreated);
+              break;
+            case CHILD_UPDATED:
+              readSilently(e.getData(), Subscription.class)
+                  .ifPresent(callback::onSubscriptionChanged);
+              break;
+            case CHILD_REMOVED:
+              readSilently(e.getData(), Subscription.class)
+                  .ifPresent(callback::onSubscriptionRemoved);
+              break;
+            default:
+              break;
+          }
         });
-    }
+  }
 
-    @Override
-    public void registerTopicCallback(TopicCallback callback) {
-        modelNotifyingCache.registerTopicCallback((e) -> {
-            switch (e.getType()) {
-                case CHILD_ADDED:
-                    readSilently(e.getData(), Topic.class).ifPresent(callback::onTopicCreated);
-                    break;
-                case CHILD_UPDATED:
-                    readSilently(e.getData(), Topic.class).ifPresent(callback::onTopicChanged);
-                    break;
-                case CHILD_REMOVED:
-                    readSilently(e.getData(), Topic.class).ifPresent(callback::onTopicRemoved);
-                    break;
-                default:
-                    break;
-            }
+  @Override
+  public void registerTopicCallback(TopicCallback callback) {
+    modelNotifyingCache.registerTopicCallback(
+        (e) -> {
+          switch (e.getType()) {
+            case CHILD_ADDED:
+              readSilently(e.getData(), Topic.class).ifPresent(callback::onTopicCreated);
+              break;
+            case CHILD_UPDATED:
+              readSilently(e.getData(), Topic.class).ifPresent(callback::onTopicChanged);
+              break;
+            case CHILD_REMOVED:
+              readSilently(e.getData(), Topic.class).ifPresent(callback::onTopicRemoved);
+              break;
+            default:
+              break;
+          }
         });
-    }
+  }
 
-    @Override
-    public void registerAdminCallback(AdminCallback callback) {
-        // TODO we should move admin callbacks here in favor of AdminTool
-    }
+  @Override
+  public void registerAdminCallback(AdminCallback callback) {
+    // TODO we should move admin callbacks here in favor of AdminTool
+  }
 
-    private <T> Optional<T> readSilently(ChildData data, Class<T> clazz) {
-        if (ArrayUtils.isEmpty(data.getData())) {
-            logger.warn("No data at path {}", data.getPath());
-            return empty();
-        }
-        try {
-            return of(objectMapper.readValue(data.getData(), clazz));
-        } catch (IOException exception) {
-            logger.warn("Failed to parse object at path {}", data.getPath(), exception);
-            return empty();
-        }
+  private <T> Optional<T> readSilently(ChildData data, Class<T> clazz) {
+    if (ArrayUtils.isEmpty(data.getData())) {
+      logger.warn("No data at path {}", data.getPath());
+      return empty();
+    }
+    try {
+      return of(objectMapper.readValue(data.getData(), clazz));
+    } catch (IOException exception) {
+      logger.warn("Failed to parse object at path {}", data.getPath(), exception);
+      return empty();
     }
+  }
 }
diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/common/metric/executor/InstrumentedExecutorServiceFactoryMetricsTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/common/metric/executor/InstrumentedExecutorServiceFactoryMetricsTest.groovy
new file mode 100644
index 0000000000..7ad8cee715
--- /dev/null
+++ b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/common/metric/executor/InstrumentedExecutorServiceFactoryMetricsTest.groovy
@@ -0,0 +1,67 @@
+package pl.allegro.tech.hermes.common.metric.executor
+
+import io.micrometer.core.instrument.MeterRegistry
+import io.micrometer.core.instrument.search.Search
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry
+import pl.allegro.tech.hermes.common.metric.MetricsFacade
+import spock.lang.Specification
+import spock.lang.Subject
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Future
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.ScheduledFuture
+
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class InstrumentedExecutorServiceFactoryMetricsTest extends Specification {
+
+    private final MeterRegistry meterRegistry = new SimpleMeterRegistry()
+
+    @Subject
+    private final InstrumentedExecutorServiceFactory factory =
+            new InstrumentedExecutorServiceFactory(
+                    new MetricsFacade(
+                            meterRegistry
+                    )
+            )
+
+    def "should record metrics for executor service (monitoring enabled: #monitoringEnabled)"() {
+        given:
+        ExecutorService executor = factory.getExecutorService("test-executor", 10, monitoringEnabled)
+
+        when:
+        Future<?> task = executor.submit { println("task executed") }
+        task.get()
+
+        then:
+        metric("executor.completed", "test-executor").functionCounter()?.count() == expectedCompletedCount
+
+        where:
+        monitoringEnabled || expectedCompletedCount
+        true              || 1.0d
+        false             || null
+    }
+
+    def "should record metrics for scheduled executor service (monitoring enabled: #monitoringEnabled)"() {
+        given:
+        ScheduledExecutorService executor = factory.scheduledExecutorBuilder("test-scheduled-executor", 10)
+                .withMonitoringEnabled(monitoringEnabled).create()
+
+        when:
+        ScheduledFuture<?> task = executor.schedule({ println("scheduled task executed") }, 1, SECONDS)
+        task.get()
+
+        then:
+        metric("executor.completed", "test-scheduled-executor").functionCounter()?.count() == expectedCompletedCount
+
+        where:
+        monitoringEnabled || expectedCompletedCount
+        true              || 1.0d
+        false             || null
+    }
+
+    private Search metric(String name, String executorName) {
+        return meterRegistry.find(name).tag("name", executorName)
+    }
+}
diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/common/schema/ReadMetricsTrackingRawSchemaClientTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/common/schema/ReadMetricsTrackingRawSchemaClientTest.groovy
index 8e8d3d4e8a..f6e128fc8a 100644
--- a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/common/schema/ReadMetricsTrackingRawSchemaClientTest.groovy
+++ b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/common/schema/ReadMetricsTrackingRawSchemaClientTest.groovy
@@ -1,16 +1,12 @@
 package pl.allegro.tech.hermes.common.schema
 
-import com.codahale.metrics.MetricRegistry
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.Timer
 import io.micrometer.core.instrument.search.Search
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import pl.allegro.tech.hermes.api.RawSchema
 import pl.allegro.tech.hermes.api.TopicName
-import pl.allegro.tech.hermes.common.metric.HermesMetrics
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
-import pl.allegro.tech.hermes.common.metric.Timers
-import pl.allegro.tech.hermes.metrics.PathsCompiler
 import pl.allegro.tech.hermes.schema.RawSchemaClient
 import pl.allegro.tech.hermes.schema.SchemaVersion
 import pl.allegro.tech.hermes.test.helper.metrics.MicrometerUtils
@@ -29,9 +25,8 @@ class ReadMetricsTrackingRawSchemaClientTest extends Specification {
     RawSchema schema = RawSchema.valueOf("some_schema")
 
     MeterRegistry meterRegistry = new SimpleMeterRegistry()
-    HermesMetrics hermesMetrics = new HermesMetrics(new MetricRegistry(), new PathsCompiler(""))
 
-    MetricsFacade metricsFacade = new MetricsFacade(meterRegistry, hermesMetrics)
+    MetricsFacade metricsFacade = new MetricsFacade(meterRegistry)
 
     RawSchemaClient rawSchemaClient = Mock()
 
@@ -91,17 +86,15 @@ class ReadMetricsTrackingRawSchemaClientTest extends Specification {
     }
 
     private long getSchemaCounterValue() {
-        return getCounterValue("schema.get-schema", Timers.GET_SCHEMA_LATENCY)
+        return getCounterValue("schema.get-schema")
     }
 
     private long getVersionsCounterValue() {
-        return getCounterValue("schema.get-versions", Timers.GET_SCHEMA_VERSIONS_LATENCY)
+        return getCounterValue("schema.get-versions")
     }
 
-    private long getCounterValue(String meterRegistryName, String hermesMetricsName) {
+    private long getCounterValue(String meterRegistryName) {
         def meterRegistryCount = MicrometerUtils.metricValue(meterRegistry, meterRegistryName, Search.&timer, Timer.&count).orElse(0L);
-        def hermesMetricsCount = hermesMetrics.schemaTimer(hermesMetricsName).count
-        assert meterRegistryCount == hermesMetricsCount
         return meterRegistryCount
     }
 }
diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperTopicRepositoryTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperTopicRepositoryTest.groovy
index 71bcd15bb4..7ac1377790 100644
--- a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperTopicRepositoryTest.groovy
+++ b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperTopicRepositoryTest.groovy
@@ -185,17 +185,16 @@ class ZookeeperTopicRepositoryTest extends IntegrationTest {
         !repository.topicExists(new TopicName(GROUP, 'remove'))
     }
 
-    def "should remove topic with metrics but without subscriptions"() {
+    def "should remove topic with metrics and without preview"() {
         given:
         def topicName = "topicWithMetrics"
 
         repository.createTopic(topic(GROUP, topicName).build())
         wait.untilTopicCreated(GROUP, topicName)
 
-        def path = pathsCompiler.compile(BASE_ZOOKEEPER_PATH + ZookeeperCounterStorage.SUBSCRIPTION_DELIVERED, pathContext()
+        def path = pathsCompiler.compile(BASE_ZOOKEEPER_PATH + ZookeeperCounterStorage.TOPIC_VOLUME_COUNTER, pathContext()
                 .withGroup(GROUP)
                 .withTopic(topicName)
-                .withSubscription("sample")
                 .build())
         zookeeper().create().creatingParentsIfNeeded().forPath(path, '1'.bytes)
         wait.untilZookeeperPathIsCreated(path)
@@ -207,6 +206,29 @@ class ZookeeperTopicRepositoryTest extends IntegrationTest {
         !repository.topicExists(new TopicName(GROUP, topicName))
     }
 
+    def "should remove topic with metrics and preview"() {
+        given: "a topic"
+        Topic topic = topic(GROUP, "topicWithMetricsAndPreview").build()
+        repository.createTopic(topic)
+        wait.untilTopicCreated(GROUP, topic.getName().getName())
+
+        and: "volume metric in zk for that topic"
+        String metricPath = paths.topicMetricPath(topic.getName(), "volume")
+        zookeeper().create().creatingParentsIfNeeded().forPath(metricPath, '1'.bytes)
+        wait.untilZookeeperPathIsCreated(metricPath)
+
+        and: "preview in zk for that topic"
+        String previewPath = paths.topicPreviewPath(topic.getName())
+        zookeeper().create().creatingParentsIfNeeded().forPath(previewPath , '1'.bytes)
+        wait.untilZookeeperPathIsCreated(previewPath)
+
+        when:
+        repository.removeTopic(topic.getName())
+
+        then:
+        !repository.topicExists(topic.getName())
+    }
+
     def "should not throw exception on malformed topic when reading list of all topics"() {
         given:
         zookeeper().create().forPath(paths.topicPath(new TopicName(GROUP, 'malformed')), ''.bytes)
diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCacheTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCacheTest.groovy
index 07cb8e1a60..e42121af43 100644
--- a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCacheTest.groovy
+++ b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCacheTest.groovy
@@ -5,6 +5,7 @@ import ch.qos.logback.classic.Logger
 import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.core.read.ListAppender
 import com.fasterxml.jackson.databind.ObjectMapper
+import org.awaitility.Awaitility
 import org.slf4j.LoggerFactory
 import pl.allegro.tech.hermes.api.Constraints
 import pl.allegro.tech.hermes.api.SubscriptionName
@@ -14,8 +15,8 @@ import pl.allegro.tech.hermes.test.IntegrationTest
 
 import java.util.concurrent.TimeUnit
 
-import static com.jayway.awaitility.Awaitility.await
 import static java.util.Collections.emptyMap
+import static org.awaitility.Awaitility.await
 
 class ZookeeperWorkloadConstraintsCacheTest extends IntegrationTest {
 
diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepositoryTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepositoryTest.groovy
index 485def9354..98f069b7a3 100644
--- a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepositoryTest.groovy
+++ b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepositoryTest.groovy
@@ -2,6 +2,7 @@ package pl.allegro.tech.hermes.infrastructure.zookeeper
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.apache.zookeeper.KeeperException
+import org.awaitility.Awaitility
 import pl.allegro.tech.hermes.api.SubscriptionName
 import pl.allegro.tech.hermes.api.TopicName
 import pl.allegro.tech.hermes.api.Constraints
@@ -13,7 +14,8 @@ import pl.allegro.tech.hermes.test.IntegrationTest
 
 import java.util.concurrent.TimeUnit
 
-import static com.jayway.awaitility.Awaitility.await
+import static org.awaitility.Awaitility.await
+
 
 class ZookeeperWorkloadConstraintsRepositoryTest extends IntegrationTest {
 
diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheTest.groovy
index 64411665ed..48b9c9490d 100644
--- a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheTest.groovy
+++ b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheTest.groovy
@@ -1,16 +1,16 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.cache
 
-import com.jayway.awaitility.Duration
-import com.jayway.awaitility.groovy.AwaitilityTrait
+import org.awaitility.Awaitility
 import pl.allegro.tech.hermes.test.IntegrationTest
 
+import java.time.Duration
 import java.util.concurrent.Executors
 
-import static com.jayway.awaitility.Awaitility.await
 import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_ADDED
 import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_REMOVED
+import static org.awaitility.Awaitility.await
 
-class HierarchicalCacheTest extends IntegrationTest implements AwaitilityTrait {
+class HierarchicalCacheTest extends IntegrationTest {
 
     private HierarchicalCache cache = new HierarchicalCache(
             zookeeper(),
@@ -48,7 +48,7 @@ class HierarchicalCacheTest extends IntegrationTest implements AwaitilityTrait {
                 .and().commit()
 
         then:
-        await().atMost(Duration.FIVE_SECONDS).until({
+        await().atMost(Duration.ofSeconds(5)).until({
             calledCallbacks.contains(new Tuple(CHILD_ADDED, '/hierarchicalCacheTest/groups/groupA', 'groupA'))
         })
 
@@ -59,7 +59,7 @@ class HierarchicalCacheTest extends IntegrationTest implements AwaitilityTrait {
                 .and().commit()
 
         then:
-        await().atMost(Duration.FIVE_SECONDS).until({
+        await().atMost(Duration.ofSeconds(5)).until({
             calledCallbacks.contains(new Tuple(CHILD_ADDED, '/hierarchicalCacheTest/groups/groupA/topics/topicA', 'topicA'))
         })
 
@@ -67,7 +67,7 @@ class HierarchicalCacheTest extends IntegrationTest implements AwaitilityTrait {
         zookeeper().create().forPath('/hierarchicalCacheTest/groups/groupA/topics/topicA/subscriptions/subA', 'subA'.bytes)
 
         then:
-        await().atMost(Duration.FIVE_SECONDS).until({
+        await().atMost(Duration.ofSeconds(5)).until({
             calledCallbacks.contains(new Tuple(CHILD_ADDED, '/hierarchicalCacheTest/groups/groupA/topics/topicA/subscriptions/subA', 'subA'))
         })
 
@@ -89,7 +89,7 @@ class HierarchicalCacheTest extends IntegrationTest implements AwaitilityTrait {
         cache.start()
 
         then:
-        await().atMost(Duration.FIVE_SECONDS).until({
+        await().atMost(Duration.ofSeconds(5)).until({
             calledCallbacks.contains(new Tuple(CHILD_ADDED, '/hierarchicalCacheTest/groups/groupB', 'groupB')) &&
             calledCallbacks.contains(new Tuple(CHILD_ADDED, '/hierarchicalCacheTest/groups/groupB/topics/topicB', 'topicB')) &&
             calledCallbacks.contains(new Tuple(CHILD_ADDED, '/hierarchicalCacheTest/groups/groupB/topics/topicB/subscriptions/subB', 'subB'))
@@ -110,7 +110,7 @@ class HierarchicalCacheTest extends IntegrationTest implements AwaitilityTrait {
                 '/hierarchicalCacheTest/groups/groupC/topics/topicC/metrics/published', '123'.bytes)
 
         then:
-        await().atMost(Duration.FIVE_SECONDS).until({
+        await().atMost(Duration.ofSeconds(5)).until({
             calledCallbacks.contains(
                     new Tuple(CHILD_REMOVED, '/hierarchicalCacheTest/groups/groupC/topics/topicC', ''))
         })
@@ -143,7 +143,7 @@ class HierarchicalCacheTest extends IntegrationTest implements AwaitilityTrait {
                 '/hierarchicalCacheTest/workload/runtime/topic$subscription/hs-consumer1', 'AUTO_ASSIGNED'.bytes)
 
         then:
-        await().atMost(Duration.FIVE_SECONDS).until({
+        await().atMost(Duration.ofSeconds(5)).until({
             calledCallbacks.contains(new Tuple(CHILD_ADDED, '/hierarchicalCacheTest/workload/runtime/topic$subscription', '')) &&
                     !calledCallbacks.contains(new Tuple(CHILD_REMOVED, '/hierarchicalCacheTest/workload/runtime/topic$subscription', ''))
         })
diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy
index 2f4a09a291..95bf3b028f 100644
--- a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy
+++ b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy
@@ -31,7 +31,7 @@ abstract class IntegrationTest extends Specification {
 
     protected RepositoryWaiter wait = new RepositoryWaiter(zookeeperResource.curator(), paths)
 
-    protected ObjectMapper mapper = new ObjectMapperFactory(true).provide()
+    protected ObjectMapper mapper = new ObjectMapperFactory(true, false).provide()
 
     protected ZookeeperGroupRepository groupRepository = new ZookeeperGroupRepository(zookeeper(), mapper, paths)
 
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/di/ObjectMapperFactoryTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/di/ObjectMapperFactoryTest.java
index ae1846c956..bfa508d545 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/di/ObjectMapperFactoryTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/di/ObjectMapperFactoryTest.java
@@ -1,63 +1,62 @@
 package pl.allegro.tech.hermes.common.di;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
 import pl.allegro.tech.hermes.common.di.factories.ObjectMapperFactory;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-
 public class ObjectMapperFactoryTest {
 
-    ObjectMapper mapper;
+  ObjectMapper mapper;
 
-    @Before
-    public void init() {
-        ObjectMapperFactory factory = new ObjectMapperFactory(false);
-        mapper = factory.provide();
-    }
+  @Before
+  public void init() {
+    ObjectMapperFactory factory = new ObjectMapperFactory(false, false);
+    mapper = factory.provide();
+  }
 
-    @Test
-    public void shouldDeserializeClassWithUnknownFields() throws Exception {
-        //given
-        String json = "{\"unknownProperty\": \"value\", \"name\":\"Charles\"}";
+  @Test
+  public void shouldDeserializeClassWithUnknownFields() throws Exception {
+    // given
+    String json = "{\"unknownProperty\": \"value\", \"name\":\"Charles\"}";
 
-        //when
-        DummyUser subscription = mapper.readValue(json, DummyUser.class);
+    // when
+    DummyUser subscription = mapper.readValue(json, DummyUser.class);
 
-        //then
-        assertEquals("Charles", subscription.name);
-    }
+    // then
+    assertEquals("Charles", subscription.name);
+  }
 
-    @Test
-    public void shouldSerializeObjectWithoutNullPropertiesInclusion() throws Exception {
-        //given
-        DummyUser object = new DummyUser(null);
+  @Test
+  public void shouldSerializeObjectWithoutNullPropertiesInclusion() throws Exception {
+    // given
+    DummyUser object = new DummyUser(null);
 
-        //when
-        final String jsonValue = mapper.writeValueAsString(object);
+    // when
+    final String jsonValue = mapper.writeValueAsString(object);
 
-        //then
-        assertThat(jsonValue).doesNotContain("name").doesNotContain("null");
-    }
+    // then
+    assertThat(jsonValue).doesNotContain("name").doesNotContain("null");
+  }
 
-    private static final class DummyUser {
-        private String name;
+  private static final class DummyUser {
+    private String name;
 
-        private DummyUser() {
-        }
+    private DummyUser() {}
 
-        private DummyUser(String name) {
-            this.name = name;
-        }
+    private DummyUser(String name) {
+      this.name = name;
+    }
 
-        public void setName(String name) {
-            this.name = name;
-        }
+    public void setName(String name) {
+      this.name = name;
+    }
 
-        public String getName() {
-            return name;
-        }
+    public String getName() {
+      return name;
     }
+  }
 }
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperUndeliveredMessageLogTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperUndeliveredMessageLogTest.java
index 0de45d0638..f04e72631a 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperUndeliveredMessageLogTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/undelivered/ZookeeperUndeliveredMessageLogTest.java
@@ -1,139 +1,138 @@
 package pl.allegro.tech.hermes.common.message.undelivered;
 
-import com.codahale.metrics.MetricRegistry;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.SentMessageTrace.Builder.undeliveredMessage;
+import static pl.allegro.tech.hermes.common.metric.Histograms.PERSISTED_UNDELIVERED_MESSAGE_SIZE;
+import static pl.allegro.tech.hermes.common.metric.Meters.PERSISTED_UNDELIVERED_MESSAGES_METER;
+import static pl.allegro.tech.hermes.test.helper.metrics.MicrometerUtils.metricValue;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.search.Search;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.util.Optional;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.test.helper.zookeeper.ZookeeperBaseTest;
 
-import java.util.Optional;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.SentMessageTrace.Builder.undeliveredMessage;
-import static pl.allegro.tech.hermes.common.metric.Histograms.PERSISTED_UNDELIVERED_MESSAGE_SIZE;
-import static pl.allegro.tech.hermes.common.metric.Meters.PERSISTED_UNDELIVERED_MESSAGES_METER;
-import static pl.allegro.tech.hermes.test.helper.metrics.MicrometerUtils.metricValue;
-
 public class ZookeeperUndeliveredMessageLogTest extends ZookeeperBaseTest {
 
-    private static final TopicName TOPIC = new TopicName("undeliveredMessageLogGroup", "topic");
-
-    private static final String SUBSCRIPTION = "subscription";
-
-    private final ZookeeperPaths paths = new ZookeeperPaths("/hermes");
-
-    private final HermesMetrics hermesMetrics = new HermesMetrics(
-            new MetricRegistry(), new PathsCompiler("host"));
-    private final MeterRegistry meterRegistry = new SimpleMeterRegistry();
-    private final MetricsFacade metricsFacade = new MetricsFacade(meterRegistry, hermesMetrics);
-
-    private final ZookeeperUndeliveredMessageLog log = new ZookeeperUndeliveredMessageLog(
-            zookeeperClient,
-            paths,
-            new ObjectMapper(),
-            metricsFacade
-    );
-
-    private final ZookeeperLastUndeliveredMessageReader reader = new ZookeeperLastUndeliveredMessageReader(
-            zookeeperClient,
-            paths,
-            new ObjectMapper()
-    );
-
-    @Before
-    public void setUp() throws Exception {
-        zookeeperClient.create().creatingParentsIfNeeded().forPath(paths.subscriptionPath(TOPIC, SUBSCRIPTION));
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-        deleteData(paths.basePath());
-        hermesMetrics.unregister(PERSISTED_UNDELIVERED_MESSAGES_METER);
-        hermesMetrics.unregister(PERSISTED_UNDELIVERED_MESSAGE_SIZE);
-    }
-
-    @Test
-    public void shouldAddUndeliveredMessageToLog() throws Exception {
-        // given when
-        log.add(createUndeliveredMessage(SUBSCRIPTION, "message"));
-        log.persist();
-
-        // then
-        SentMessageTrace lastMessage = reader.last(TOPIC, "subscription").get();
-        assertThat(lastMessage.getMessage()).isEqualTo("message");
-        assertThatMetricsHaveBeenReported(1);
-    }
-
-    @Test
-    public void shouldReturnLatestUndeliveredMessage() throws Exception {
-        // given
-        log.add(createUndeliveredMessage(SUBSCRIPTION, "old message"));
-        log.add(createUndeliveredMessage(SUBSCRIPTION, "new message"));
-        log.persist();
-
-        // when
-        SentMessageTrace lastMessage = reader.last(TOPIC, "subscription").get();
-
-        // then
-        assertThat(lastMessage.getMessage()).isEqualTo("new message");
-        assertThatMetricsHaveBeenReported(1);
-    }
-
-    @Test
-    public void shouldReturnAbsentIfThereAreNoUndeliveredMessagesForGivenSubscription() {
-        // when
-        Optional<SentMessageTrace> result = reader.last(new TopicName("unknown", "topic"), "subscription");
-
-        // then
-        assertThat(result.isPresent()).isFalse();
-        assertThatMetricsHaveBeenReported(0);
-    }
-
-    @Test
-    public void shouldNotAddUndeliveredMessageLogToNonExistingSubscriptionPath() {
-        // given
-        log.add(createUndeliveredMessage("unknownSubscription", "message"));
-        log.persist();
-
-        // when
-        Optional<SentMessageTrace> result = reader.last(TOPIC, "unknownSubscription");
-
-        // then
-        assertThat(result.isPresent()).isFalse();
-        assertThatMetricsHaveBeenReported(0);
-    }
-
-    private SentMessageTrace createUndeliveredMessage(String subscription, String message) {
-        return undeliveredMessage()
-                .withTopicName(TOPIC.qualifiedName())
-                .withSubscription(subscription)
-                .withMessage(message)
-                .withReason(new IllegalArgumentException().getMessage())
-                .withTimestamp(1L)
-                .withPartition(1)
-                .withOffset(1L)
-                .withCluster("cluster")
-                .build();
-    }
-
-    private void assertThatMetricsHaveBeenReported(int persistedMessageCount) {
-        assertThat(hermesMetrics.meter(PERSISTED_UNDELIVERED_MESSAGES_METER).getCount()).isEqualTo(persistedMessageCount);
-        assertThat(hermesMetrics.histogram(PERSISTED_UNDELIVERED_MESSAGE_SIZE).getCount()).isEqualTo(persistedMessageCount);
-        assertThat(metricValue(meterRegistry, PERSISTED_UNDELIVERED_MESSAGES_METER, Search::counter, Counter::count).orElse(0.0d))
-                .isEqualTo(persistedMessageCount);
-        assertThat(metricValue(meterRegistry, PERSISTED_UNDELIVERED_MESSAGE_SIZE + ".bytes", Search::summary, DistributionSummary::count)
-                .orElse(0L)).isEqualTo(persistedMessageCount);
-    }
+  private static final TopicName TOPIC = new TopicName("undeliveredMessageLogGroup", "topic");
+
+  private static final String SUBSCRIPTION = "subscription";
+
+  private final ZookeeperPaths paths = new ZookeeperPaths("/hermes");
+
+  private final MeterRegistry meterRegistry = new SimpleMeterRegistry();
+  private final MetricsFacade metricsFacade = new MetricsFacade(meterRegistry);
+
+  private final ZookeeperUndeliveredMessageLog log =
+      new ZookeeperUndeliveredMessageLog(zookeeperClient, paths, new ObjectMapper(), metricsFacade);
+
+  private final ZookeeperLastUndeliveredMessageReader reader =
+      new ZookeeperLastUndeliveredMessageReader(zookeeperClient, paths, new ObjectMapper());
+
+  @Before
+  public void setUp() throws Exception {
+    zookeeperClient
+        .create()
+        .creatingParentsIfNeeded()
+        .forPath(paths.subscriptionPath(TOPIC, SUBSCRIPTION));
+  }
+
+  @After
+  public void cleanUp() throws Exception {
+    deleteData(paths.basePath());
+  }
+
+  @Test
+  public void shouldAddUndeliveredMessageToLog() throws Exception {
+    // given when
+    log.add(createUndeliveredMessage(SUBSCRIPTION, "message"));
+    log.persist();
+
+    // then
+    SentMessageTrace lastMessage = reader.last(TOPIC, "subscription").get();
+    assertThat(lastMessage.getMessage()).isEqualTo("message");
+    assertThatMetricsHaveBeenReported(1);
+  }
+
+  @Test
+  public void shouldReturnLatestUndeliveredMessage() throws Exception {
+    // given
+    log.add(createUndeliveredMessage(SUBSCRIPTION, "old message"));
+    log.add(createUndeliveredMessage(SUBSCRIPTION, "new message"));
+    log.persist();
+
+    // when
+    SentMessageTrace lastMessage = reader.last(TOPIC, "subscription").get();
+
+    // then
+    assertThat(lastMessage.getMessage()).isEqualTo("new message");
+    assertThatMetricsHaveBeenReported(1);
+  }
+
+  @Test
+  public void shouldReturnAbsentIfThereAreNoUndeliveredMessagesForGivenSubscription() {
+    // when
+    Optional<SentMessageTrace> result =
+        reader.last(new TopicName("unknown", "topic"), "subscription");
+
+    // then
+    assertThat(result.isPresent()).isFalse();
+    assertThatMetricsHaveBeenReported(0);
+  }
+
+  @Test
+  public void shouldNotAddUndeliveredMessageLogToNonExistingSubscriptionPath() {
+    // given
+    log.add(createUndeliveredMessage("unknownSubscription", "message"));
+    log.persist();
+
+    // when
+    Optional<SentMessageTrace> result = reader.last(TOPIC, "unknownSubscription");
+
+    // then
+    assertThat(result.isPresent()).isFalse();
+    assertThatMetricsHaveBeenReported(0);
+  }
+
+  private SentMessageTrace createUndeliveredMessage(String subscription, String message) {
+    return undeliveredMessage()
+        .withTopicName(TOPIC.qualifiedName())
+        .withSubscription(subscription)
+        .withMessage(message)
+        .withReason(new IllegalArgumentException().getMessage())
+        .withTimestamp(1L)
+        .withPartition(1)
+        .withOffset(1L)
+        .withCluster("cluster")
+        .build();
+  }
+
+  private void assertThatMetricsHaveBeenReported(int persistedMessageCount) {
+    assertThat(
+            metricValue(
+                    meterRegistry,
+                    PERSISTED_UNDELIVERED_MESSAGES_METER,
+                    Search::counter,
+                    Counter::count)
+                .orElse(0.0d))
+        .isEqualTo(persistedMessageCount);
+    assertThat(
+            metricValue(
+                    meterRegistry,
+                    PERSISTED_UNDELIVERED_MESSAGE_SIZE + ".bytes",
+                    Search::summary,
+                    DistributionSummary::count)
+                .orElse(0L))
+        .isEqualTo(persistedMessageCount);
+  }
 }
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentWrapperTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentWrapperTest.java
index 4d7599ee11..bf018d6511 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentWrapperTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentWrapperTest.java
@@ -1,12 +1,12 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericRecord;
-import org.apache.avro.util.Utf8;
-import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
-import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
+import static java.lang.Long.valueOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
+import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.recordToBytes;
+import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MARKER;
+import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MESSAGE_ID_KEY;
+import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_TIMESTAMP_KEY;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -15,121 +15,127 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-
-import static java.lang.Long.valueOf;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
-import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.recordToBytes;
-import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MARKER;
-import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MESSAGE_ID_KEY;
-import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_TIMESTAMP_KEY;
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.util.Utf8;
+import org.apache.commons.io.IOUtils;
+import org.junit.Before;
+import org.junit.Test;
+import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 
 public class AvroMessageContentWrapperTest {
-    private AvroMessageContentWrapper avroMessageContentWrapper;
-    private AvroUser avroUser;
-    private byte[] content;
-
-    private final String id = UUID.randomUUID().toString();
-    private final Long timestamp = System.currentTimeMillis();
-
-    @Before
-    public void setup() throws IOException {
-        avroUser = new AvroUser("Bob", 10, "red");
-        content = avroUser.asBytes();
-        avroMessageContentWrapper = new AvroMessageContentWrapper(Clock.systemDefaultZone());
-    }
-
-    @Test
-    public void shouldWrapAndUnwrapAvroMessageWithMetadata() {
-        // when
-        byte[] wrappedMessage =
-            avroMessageContentWrapper.wrapContent(content, id, timestamp, avroUser.getSchema(), Collections.emptyMap());
-        UnwrappedMessageContent unwrappedMessageContent =
-            avroMessageContentWrapper.unwrapContent(wrappedMessage, avroUser.getCompiledSchema());
-
-        // then
-        assertThat(unwrappedMessageContent.getMessageMetadata().getId()).isEqualTo(id);
-        assertThat(unwrappedMessageContent.getMessageMetadata().getTimestamp()).isEqualTo(timestamp);
-        assertThat(unwrappedMessageContent.getContent()).contains(content);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void shouldWrappedMessageContainsMetadata() {
-        // when
-        byte[] wrappedMessage = avroMessageContentWrapper.wrapContent(content, id, timestamp, avroUser.getSchema(), Collections.emptyMap());
-
-        // then
-        GenericRecord messageWithMetadata = bytesToRecord(wrappedMessage, avroUser.getSchema());
-        Map<Utf8, Utf8> metadata = (Map<Utf8, Utf8>) messageWithMetadata.get(METADATA_MARKER);
-        assertThat(metadata.get(METADATA_MESSAGE_ID_KEY).toString()).isEqualTo(id);
-        assertThat(valueOf(metadata.get(METADATA_TIMESTAMP_KEY).toString())).isEqualTo(timestamp);
-        assertThat(wrappedMessage).contains(content);
-    }
-
-    @Test
-    public void shouldWrappedMessageBeUnchangedWhenSchemaNotContainsMetadata() throws IOException {
-        // when
-        Schema schemaWithoutMetadata = new Schema.Parser().parse(
-            IOUtils.toString(
-                getClass().getResourceAsStream("/schema/user_no_metadata.avsc"),
-                StandardCharsets.UTF_8
-            )
-        );
-        byte[] wrappedMessage =
-            avroMessageContentWrapper.wrapContent(content, id, timestamp, schemaWithoutMetadata, Collections.emptyMap());
-
-        // then
-        GenericRecord wrappedMessageAsRecord = bytesToRecord(wrappedMessage, avroUser.getSchema());
-        assertThat(wrappedMessageAsRecord.get(METADATA_MARKER)).isNull();
-    }
-
-    @Test
-    public void shouldUnwrapAvroMessageAndGenerateMetadataWhenNotExists() throws Throwable {
-        //given
-        byte [] wrappedMessage = wrapContentWithoutMetadata(content, avroUser.getSchema());
-
-        //when
-        UnwrappedMessageContent unwrappedMessage =
-            avroMessageContentWrapper.unwrapContent(wrappedMessage, avroUser.getCompiledSchema());
-
-        //then
-        assertThat(unwrappedMessage.getMessageMetadata().getId()).isEmpty();
-        assertThat(unwrappedMessage.getMessageMetadata().getTimestamp()).isNotNull();
-        assertThat(unwrappedMessage.getContent()).startsWith(content);
-    }
-
-    @Test
-    public void shouldUnwrapAvroMessageAndSetEmptyMessageIdWhenNotGivenInMetadata() throws Throwable {
-        // given
-        byte [] wrappedMessage = wrapContentWithoutMessageIdInMetadata(content, avroUser.getSchema());
-
-        //when
-        UnwrappedMessageContent unwrappedMessage = avroMessageContentWrapper.unwrapContent(wrappedMessage, avroUser.getCompiledSchema());
-
-        // then
-        assertThat(unwrappedMessage.getMessageMetadata().getId()).isEmpty();
-        assertThat(unwrappedMessage.getMessageMetadata().getTimestamp()).isNotNull();
-        assertThat(unwrappedMessage.getContent()).contains(content);
-    }
-
-    private byte[] wrapContentWithoutMetadata(byte[] message, Schema schema) throws Exception {
-        return wrapContent(message, schema, null);
-    }
-
-    private byte[] wrapContentWithoutMessageIdInMetadata(byte[] message, Schema schema) throws Exception {
-        return wrapContent(message, schema, metadataMapWithoutMessageId(timestamp));
-    }
-
-    private byte[] wrapContent(byte[] message, Schema schema, Map<Utf8, Utf8> metadata) throws Exception {
-        GenericRecord genericRecord = bytesToRecord(message, schema);
-        genericRecord.put(METADATA_MARKER, metadata);
-        return recordToBytes(genericRecord, schema);
-    }
-
-    private Map<Utf8, Utf8> metadataMapWithoutMessageId(long timestamp) {
-        Map<Utf8, Utf8> metadata = new HashMap<>();
-        metadata.put(METADATA_TIMESTAMP_KEY, new Utf8(Long.toString(timestamp)));
-        return metadata;
-    }
+  private AvroMessageContentWrapper avroMessageContentWrapper;
+  private AvroUser avroUser;
+  private byte[] content;
+
+  private final String id = UUID.randomUUID().toString();
+  private final Long timestamp = System.currentTimeMillis();
+
+  @Before
+  public void setup() throws IOException {
+    avroUser = new AvroUser("Bob", 10, "red");
+    content = avroUser.asBytes();
+    avroMessageContentWrapper = new AvroMessageContentWrapper(Clock.systemDefaultZone());
+  }
+
+  @Test
+  public void shouldWrapAndUnwrapAvroMessageWithMetadata() {
+    // when
+    byte[] wrappedMessage =
+        avroMessageContentWrapper.wrapContent(
+            content, id, timestamp, avroUser.getSchema(), Collections.emptyMap());
+    UnwrappedMessageContent unwrappedMessageContent =
+        avroMessageContentWrapper.unwrapContent(wrappedMessage, avroUser.getCompiledSchema());
+
+    // then
+    assertThat(unwrappedMessageContent.getMessageMetadata().getId()).isEqualTo(id);
+    assertThat(unwrappedMessageContent.getMessageMetadata().getTimestamp()).isEqualTo(timestamp);
+    assertThat(unwrappedMessageContent.getContent()).contains(content);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void shouldWrappedMessageContainsMetadata() {
+    // when
+    byte[] wrappedMessage =
+        avroMessageContentWrapper.wrapContent(
+            content, id, timestamp, avroUser.getSchema(), Collections.emptyMap());
+
+    // then
+    GenericRecord messageWithMetadata = bytesToRecord(wrappedMessage, avroUser.getSchema());
+    Map<Utf8, Utf8> metadata = (Map<Utf8, Utf8>) messageWithMetadata.get(METADATA_MARKER);
+    assertThat(metadata.get(METADATA_MESSAGE_ID_KEY).toString()).isEqualTo(id);
+    assertThat(valueOf(metadata.get(METADATA_TIMESTAMP_KEY).toString())).isEqualTo(timestamp);
+    assertThat(wrappedMessage).contains(content);
+  }
+
+  @Test
+  public void shouldWrappedMessageBeUnchangedWhenSchemaNotContainsMetadata() throws IOException {
+    // when
+    Schema schemaWithoutMetadata =
+        new Schema.Parser()
+            .parse(
+                IOUtils.toString(
+                    getClass().getResourceAsStream("/schema/user_no_metadata.avsc"),
+                    StandardCharsets.UTF_8));
+    byte[] wrappedMessage =
+        avroMessageContentWrapper.wrapContent(
+            content, id, timestamp, schemaWithoutMetadata, Collections.emptyMap());
+
+    // then
+    GenericRecord wrappedMessageAsRecord = bytesToRecord(wrappedMessage, avroUser.getSchema());
+    assertThat(wrappedMessageAsRecord.get(METADATA_MARKER)).isNull();
+  }
+
+  @Test
+  public void shouldUnwrapAvroMessageAndGenerateMetadataWhenNotExists() throws Throwable {
+    // given
+    byte[] wrappedMessage = wrapContentWithoutMetadata(content, avroUser.getSchema());
+
+    // when
+    UnwrappedMessageContent unwrappedMessage =
+        avroMessageContentWrapper.unwrapContent(wrappedMessage, avroUser.getCompiledSchema());
+
+    // then
+    assertThat(unwrappedMessage.getMessageMetadata().getId()).isEmpty();
+    assertThat(unwrappedMessage.getMessageMetadata().getTimestamp()).isNotNull();
+    assertThat(unwrappedMessage.getContent()).startsWith(content);
+  }
+
+  @Test
+  public void shouldUnwrapAvroMessageAndSetEmptyMessageIdWhenNotGivenInMetadata() throws Throwable {
+    // given
+    byte[] wrappedMessage = wrapContentWithoutMessageIdInMetadata(content, avroUser.getSchema());
+
+    // when
+    UnwrappedMessageContent unwrappedMessage =
+        avroMessageContentWrapper.unwrapContent(wrappedMessage, avroUser.getCompiledSchema());
+
+    // then
+    assertThat(unwrappedMessage.getMessageMetadata().getId()).isEmpty();
+    assertThat(unwrappedMessage.getMessageMetadata().getTimestamp()).isNotNull();
+    assertThat(unwrappedMessage.getContent()).contains(content);
+  }
+
+  private byte[] wrapContentWithoutMetadata(byte[] message, Schema schema) throws Exception {
+    return wrapContent(message, schema, null);
+  }
+
+  private byte[] wrapContentWithoutMessageIdInMetadata(byte[] message, Schema schema)
+      throws Exception {
+    return wrapContent(message, schema, metadataMapWithoutMessageId(timestamp));
+  }
+
+  private byte[] wrapContent(byte[] message, Schema schema, Map<Utf8, Utf8> metadata)
+      throws Exception {
+    GenericRecord genericRecord = bytesToRecord(message, schema);
+    genericRecord.put(METADATA_MARKER, metadata);
+    return recordToBytes(genericRecord, schema);
+  }
+
+  private Map<Utf8, Utf8> metadataMapWithoutMessageId(long timestamp) {
+    Map<Utf8, Utf8> metadata = new HashMap<>();
+    metadata.put(METADATA_TIMESTAMP_KEY, new Utf8(Long.toString(timestamp)));
+    return metadata;
+  }
 }
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/JsonMessageContentWrapperTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/JsonMessageContentWrapperTest.java
index c699023402..e6d332bffe 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/JsonMessageContentWrapperTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/JsonMessageContentWrapperTest.java
@@ -1,77 +1,87 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import org.assertj.core.data.MapEntry;
-import org.junit.Ignore;
-import org.junit.Test;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.entry;
+import org.assertj.core.data.MapEntry;
+import org.junit.Ignore;
+import org.junit.Test;
 
 public class JsonMessageContentWrapperTest {
 
-    private final byte[] testContent = "{\"key\":\"value\"}".getBytes();
-    private final ObjectMapper mapper = new ObjectMapper();
-    private final MessageMetadata metadata =
-        new MessageMetadata(System.currentTimeMillis(), "14cf17ea-f1ea-a464-6bd6478615bb", ImmutableMap.of());
-    private final Map<String, Object> metadataAsMap =
-        ImmutableMap.of("timestamp", metadata.getTimestamp(), "id", metadata.getId(), "externalMetadata", Collections.emptyMap());
-    private final MapEntry unwrappingMarker = entry("_w", true);
-    private final MapEntry content = entry("message", readMap(testContent));
+  private final byte[] testContent = "{\"key\":\"value\"}".getBytes();
+  private final ObjectMapper mapper = new ObjectMapper();
+  private final MessageMetadata metadata =
+      new MessageMetadata(
+          System.currentTimeMillis(), "14cf17ea-f1ea-a464-6bd6478615bb", ImmutableMap.of());
+  private final Map<String, Object> metadataAsMap =
+      ImmutableMap.of(
+          "timestamp",
+          metadata.getTimestamp(),
+          "id",
+          metadata.getId(),
+          "externalMetadata",
+          Collections.emptyMap());
+  private final MapEntry unwrappingMarker = entry("_w", true);
+  private final MapEntry content = entry("message", readMap(testContent));
 
-    private final JsonMessageContentWrapper contentWrapper = new JsonMessageContentWrapper(content.key.toString(), "metadata", mapper);
-    private Map<String, String> externalMetadata = ImmutableMap.of();
+  private final JsonMessageContentWrapper contentWrapper =
+      new JsonMessageContentWrapper(content.key.toString(), "metadata", mapper);
+  private Map<String, String> externalMetadata = ImmutableMap.of();
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void shouldWrapJsonWithMetadata() {
-        //when
-        byte[] result = contentWrapper.wrapContent(testContent, metadata.getId(), metadata.getTimestamp(), externalMetadata);
+  @Test
+  @SuppressWarnings("unchecked")
+  public void shouldWrapJsonWithMetadata() {
+    // when
+    byte[] result =
+        contentWrapper.wrapContent(
+            testContent, metadata.getId(), metadata.getTimestamp(), externalMetadata);
 
-        //then
-        assertThat(readMap(result)).containsExactly(unwrappingMarker, entry("metadata", metadataAsMap), content);
-    }
+    // then
+    assertThat(readMap(result))
+        .containsExactly(unwrappingMarker, entry("metadata", metadataAsMap), content);
+  }
 
-    @Test
-    public void shouldUnwrapMessageWithMetadata() {
-        //when
-        UnwrappedMessageContent result = contentWrapper.unwrapContent(
-            contentWrapper.wrapContent(testContent, metadata.getId(), metadata.getTimestamp(), externalMetadata)
-        );
+  @Test
+  public void shouldUnwrapMessageWithMetadata() {
+    // when
+    UnwrappedMessageContent result =
+        contentWrapper.unwrapContent(
+            contentWrapper.wrapContent(
+                testContent, metadata.getId(), metadata.getTimestamp(), externalMetadata));
 
-        //then
-        assertThat(result.getContent()).isEqualTo(testContent);
-        assertThat(result.getMessageMetadata()).isEqualTo(metadata);
-    }
+    // then
+    assertThat(result.getContent()).isEqualTo(testContent);
+    assertThat(result.getMessageMetadata()).isEqualTo(metadata);
+  }
 
-    @Test
-    public void shouldTolerateUnwrappingUnwrappedMessage() {
-        //when
-        UnwrappedMessageContent result = contentWrapper.unwrapContent(testContent);
+  @Test
+  public void shouldTolerateUnwrappingUnwrappedMessage() {
+    // when
+    UnwrappedMessageContent result = contentWrapper.unwrapContent(testContent);
 
-        //then
-        assertThat(result.getMessageMetadata().getId()).isNotEmpty();
-        assertThat(result.getMessageMetadata().getTimestamp()).isEqualTo(1L);
-    }
+    // then
+    assertThat(result.getMessageMetadata().getId()).isNotEmpty();
+    assertThat(result.getMessageMetadata().getTimestamp()).isEqualTo(1L);
+  }
 
-    @Ignore
-    @Test(expected = UnwrappingException.class)
-    public void shouldThrowExceptionWhenMetadataNotFound() {
-        contentWrapper.unwrapContent(testContent);
-    }
+  @Ignore
+  @Test(expected = UnwrappingException.class)
+  public void shouldThrowExceptionWhenMetadataNotFound() {
+    contentWrapper.unwrapContent(testContent);
+  }
 
-    private Map<String, Object> readMap(byte[] result) {
-        try {
-            return mapper.readValue(new String(result), new TypeReference<Map<String, Object>>(){});
-        } catch (IOException e) {
-            throw new IllegalStateException("Error while reading map", e);
-        }
+  private Map<String, Object> readMap(byte[] result) {
+    try {
+      return mapper.readValue(new String(result), new TypeReference<Map<String, Object>>() {});
+    } catch (IOException e) {
+      throw new IllegalStateException("Error while reading map", e);
     }
-
+  }
 }
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/MessageContentWrapperTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/MessageContentWrapperTest.java
index 3a38d65ca8..2f8507021f 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/MessageContentWrapperTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/MessageContentWrapperTest.java
@@ -1,20 +1,24 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
-import com.codahale.metrics.MetricRegistry;
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader.load;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.search.Search;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.nio.ByteBuffer;
+import java.time.Clock;
+import java.util.List;
 import org.apache.avro.Schema;
 import org.apache.commons.collections4.map.HashedMap;
-import org.junit.Before;
 import org.junit.Test;
 import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 import pl.allegro.tech.hermes.schema.CompiledSchemaRepository;
 import pl.allegro.tech.hermes.schema.SchemaId;
@@ -25,386 +29,418 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 import pl.allegro.tech.hermes.test.helper.metrics.MicrometerUtils;
 
-import java.nio.ByteBuffer;
-import java.time.Clock;
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader.load;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
 public class MessageContentWrapperTest {
 
-    private static final Integer NO_VERSION_IN_HEADER = null;
-    private static final Integer NO_ID_IN_HEADER = null;
-    private static final int MESSAGE_TIMESTAMP = 1582029457;
-    private static final HashedMap<String, String> NO_EXTERNAL_METADATA = new HashedMap<>();
-    private static final String MESSAGE_ID = "messageId-1";
-    private static final int VERSION_ONE = 1;
-    private static final int VERSION_TWO = 2;
-    private static final int VERSION_THREE = 3;
-    private static final int ID_ONE = 1;
-    private static final int ID_THREE = 3;
-    private static final int ID_FIVE = 5;
-
-    private final MetricRegistry metricRegistry = new MetricRegistry();
-    private final MeterRegistry meterRegistry = new SimpleMeterRegistry();
-    private final HermesMetrics hermesMetrics = new HermesMetrics(metricRegistry, new PathsCompiler(""));
-    private final MetricsFacade metricsFacade = new MetricsFacade(meterRegistry, hermesMetrics);
-    private final JsonMessageContentWrapper jsonWrapper = new JsonMessageContentWrapper("message", "metadata", new ObjectMapper());
-    private final AvroMessageContentWrapper avroWrapper = new AvroMessageContentWrapper(Clock.systemDefaultZone());
-
-
-    private final AvroMessageHeaderSchemaVersionContentWrapper headerSchemaVersionWrapper =
-            new AvroMessageHeaderSchemaVersionContentWrapper(schemaRepository, avroWrapper, metricsFacade);
-    private final AvroMessageSchemaIdAwareContentWrapper schemaAwareWrapper =
-            new AvroMessageSchemaIdAwareContentWrapper(schemaRepository, avroWrapper, metricsFacade);
-
-    private static final CompiledSchema<Schema> schema1 = CompiledSchema.of(load("/schema/user.avsc"), ID_ONE, VERSION_ONE);
-    private static final CompiledSchema<Schema> schema2 = CompiledSchema.of(load("/schema/user_v2.avsc"), ID_THREE, VERSION_TWO);
-    private static final CompiledSchema<Schema> schema3 = CompiledSchema.of(load("/schema/user_v3.avsc"), ID_FIVE, VERSION_THREE);
-
-    private CompositeMessageContentWrapper createMessageContentWrapper(
-            boolean schemaHeaderIdEnabled,
-            boolean schemaVersionTruncationEnabled
-    ) {
-
-        final AvroMessageHeaderSchemaIdContentWrapper headerSchemaIdWrapper =
-                new AvroMessageHeaderSchemaIdContentWrapper(schemaRepository, avroWrapper, metricsFacade, schemaHeaderIdEnabled);
-
-        final AvroMessageSchemaVersionTruncationContentWrapper schemaIdAndHeaderContentWrapper =
-                new AvroMessageSchemaVersionTruncationContentWrapper(
-                        schemaRepository,
-                        avroWrapper,
-                        metricsFacade,
-                        schemaVersionTruncationEnabled
-                );
-
-        return new CompositeMessageContentWrapper(jsonWrapper, avroWrapper, schemaAwareWrapper,
-                headerSchemaVersionWrapper, headerSchemaIdWrapper, schemaIdAndHeaderContentWrapper);
-    }
-
-    private final CompositeMessageContentWrapper compositeMessageContentWrapper = createMessageContentWrapper(false, true);
-
-    static SchemaVersionsRepository schemaVersionsRepository = new SchemaVersionsRepository() {
+  private static final Integer NO_VERSION_IN_HEADER = null;
+  private static final Integer NO_ID_IN_HEADER = null;
+  private static final int MESSAGE_TIMESTAMP = 1582029457;
+  private static final HashedMap<String, String> NO_EXTERNAL_METADATA = new HashedMap<>();
+  private static final String MESSAGE_ID = "messageId-1";
+  private static final int VERSION_ONE = 1;
+  private static final int VERSION_TWO = 2;
+  private static final int VERSION_THREE = 3;
+  private static final int ID_ONE = 1;
+  private static final int ID_THREE = 3;
+  private static final int ID_FIVE = 5;
+
+  private final MeterRegistry meterRegistry = new SimpleMeterRegistry();
+  private final MetricsFacade metricsFacade = new MetricsFacade(meterRegistry);
+  private final JsonMessageContentWrapper jsonWrapper =
+      new JsonMessageContentWrapper("message", "metadata", new ObjectMapper());
+  private final AvroMessageContentWrapper avroWrapper =
+      new AvroMessageContentWrapper(Clock.systemDefaultZone());
+
+  private final AvroMessageHeaderSchemaVersionContentWrapper headerSchemaVersionWrapper =
+      new AvroMessageHeaderSchemaVersionContentWrapper(
+          schemaRepository, avroWrapper, metricsFacade);
+  private final AvroMessageSchemaIdAwareContentWrapper schemaAwareWrapper =
+      new AvroMessageSchemaIdAwareContentWrapper(schemaRepository, avroWrapper, metricsFacade);
+
+  private static final CompiledSchema<Schema> schema1 =
+      CompiledSchema.of(load("/schema/user.avsc"), ID_ONE, VERSION_ONE);
+  private static final CompiledSchema<Schema> schema2 =
+      CompiledSchema.of(load("/schema/user_v2.avsc"), ID_THREE, VERSION_TWO);
+  private static final CompiledSchema<Schema> schema3 =
+      CompiledSchema.of(load("/schema/user_v3.avsc"), ID_FIVE, VERSION_THREE);
+
+  private CompositeMessageContentWrapper createMessageContentWrapper(
+      boolean schemaHeaderIdEnabled, boolean schemaVersionTruncationEnabled) {
+
+    final AvroMessageHeaderSchemaIdContentWrapper headerSchemaIdWrapper =
+        new AvroMessageHeaderSchemaIdContentWrapper(
+            schemaRepository, avroWrapper, metricsFacade, schemaHeaderIdEnabled);
+
+    final AvroMessageSchemaVersionTruncationContentWrapper schemaIdAndHeaderContentWrapper =
+        new AvroMessageSchemaVersionTruncationContentWrapper(
+            schemaRepository, avroWrapper, metricsFacade, schemaVersionTruncationEnabled);
+
+    return new CompositeMessageContentWrapper(
+        jsonWrapper,
+        avroWrapper,
+        schemaAwareWrapper,
+        headerSchemaVersionWrapper,
+        headerSchemaIdWrapper,
+        schemaIdAndHeaderContentWrapper);
+  }
+
+  private final CompositeMessageContentWrapper compositeMessageContentWrapper =
+      createMessageContentWrapper(false, true);
+
+  static SchemaVersionsRepository schemaVersionsRepository =
+      new SchemaVersionsRepository() {
         @Override
         public SchemaVersionsResult versions(Topic topic, boolean online) {
-            List<SchemaVersion> onlineVersions = asList(schema3.getVersion(), schema2.getVersion(), schema1.getVersion());
-            List<SchemaVersion> cachedVersions = asList(schema2.getVersion(), schema1.getVersion());
-            return online
-                    ? SchemaVersionsResult.succeeded(onlineVersions)
-                    : SchemaVersionsResult.succeeded(cachedVersions);
+          List<SchemaVersion> onlineVersions =
+              asList(schema3.getVersion(), schema2.getVersion(), schema1.getVersion());
+          List<SchemaVersion> cachedVersions = asList(schema2.getVersion(), schema1.getVersion());
+          return online
+              ? SchemaVersionsResult.succeeded(onlineVersions)
+              : SchemaVersionsResult.succeeded(cachedVersions);
         }
 
         @Override
-        public void close() {
-        }
-    };
+        public void close() {}
+      };
 
-    static CompiledSchemaRepository<Schema> compiledSchemaRepository = new CompiledSchemaRepository<Schema>() {
+  static CompiledSchemaRepository<Schema> compiledSchemaRepository =
+      new CompiledSchemaRepository<Schema>() {
         @Override
-        public CompiledSchema<Schema> getSchema(Topic topic, SchemaVersion version, boolean online) {
-            switch (version.value()) {
-                case VERSION_ONE:
-                    return schema1;
-                case VERSION_TWO:
-                    return schema2;
-                case VERSION_THREE:
-                    return schema3;
-                default:
-                    throw new RuntimeException("sry");
-            }
+        public CompiledSchema<Schema> getSchema(
+            Topic topic, SchemaVersion version, boolean online) {
+          switch (version.value()) {
+            case VERSION_ONE:
+              return schema1;
+            case VERSION_TWO:
+              return schema2;
+            case VERSION_THREE:
+              return schema3;
+            default:
+              throw new RuntimeException("sry");
+          }
         }
 
         @Override
         public CompiledSchema<Schema> getSchema(Topic topic, SchemaId id) {
-            switch (id.value()) {
-                case ID_ONE:
-                    return schema1;
-                case ID_THREE:
-                    return schema2;
-                case ID_FIVE:
-                    return schema3;
-                default:
-                    throw new RuntimeException("sry");
-            }
+          switch (id.value()) {
+            case ID_ONE:
+              return schema1;
+            case ID_THREE:
+              return schema2;
+            case ID_FIVE:
+              return schema3;
+            default:
+              throw new RuntimeException("sry");
+          }
         }
-    };
-
-    static SchemaRepository schemaRepository = new SchemaRepository(schemaVersionsRepository, compiledSchemaRepository);
-
-
-    @Before
-    public void clean() {
-        metricRegistry.getCounters().forEach((s, counter) -> counter.dec(counter.getCount()));
-    }
-
-    @Test
-    public void shouldUnwrapMessageUsingSchemaIdFromPayload() {
-        // given
-        String messageId = MESSAGE_ID;
-        int messageTimestamp = MESSAGE_TIMESTAMP;
-
-        SchemaId schemaId = createSchemaId(ID_FIVE);
-        Topic topic = createTopicWithSchemaIdAwarePayload();
-        AvroUser user = createAvroUser(schemaId, topic);
-
-        byte[] wrapped = compositeMessageContentWrapper.wrapAvro(
-                user.asBytes(),
-                messageId,
-                messageTimestamp,
-                topic,
-                user.getCompiledSchema(),
-                NO_EXTERNAL_METADATA
-        );
-
-        // when
-        UnwrappedMessageContent unwrappedMessageContent =
-                compositeMessageContentWrapper.unwrapAvro(wrapped, topic, NO_ID_IN_HEADER, NO_VERSION_IN_HEADER);
-
-        // then
-        assertResult(unwrappedMessageContent, schemaId, user.asBytes(), messageId, messageTimestamp);
-        assertMetrics(0, 0, 0, 0, 0, 1, 0, 0, 0);
-    }
-
-    @Test
-    public void shouldUnwrapUsingHeaderSchemaVersionIfHeaderPresent() {
-        // given
-        String messageId = MESSAGE_ID;
-        int messageTimestamp = MESSAGE_TIMESTAMP;
-
-        SchemaVersion schemaVersion = createSchemaVersion(VERSION_TWO);
-        Topic topic = createTopic();
-        AvroUser user = createAvroUser(schemaVersion, topic);
-
-        byte[] wrapped = compositeMessageContentWrapper.wrapAvro(
-                user.asBytes(),
-                messageId,
-                messageTimestamp,
-                topic,
-                user.getCompiledSchema(),
-                NO_EXTERNAL_METADATA
-        );
-
-        // when
-        UnwrappedMessageContent unwrappedMessageContent =
-                compositeMessageContentWrapper.unwrapAvro(wrapped, topic, NO_ID_IN_HEADER, schemaVersion.value());
-
-        // then
-        assertResult(unwrappedMessageContent, schemaVersion, user.asBytes(), messageId, messageTimestamp);
-        assertMetrics(0, 0, 0, 0, 0, 0, 1, 0, 0);
-    }
-
-    @Test
-    public void shouldUnwrapUsingHeaderSchemaIdIfHeaderPresent() {
-        // given
-        CompositeMessageContentWrapper compositeMessageContentWrapperWithHeaderEnabled = createMessageContentWrapper(true, false);
-        String messageId = MESSAGE_ID;
-        int messageTimestamp = MESSAGE_TIMESTAMP;
-
-        SchemaId schemaId = createSchemaId(ID_THREE);
-        Topic topic = createTopic();
-        AvroUser user = createAvroUser(schemaId, topic);
-
-        byte[] wrapped = compositeMessageContentWrapperWithHeaderEnabled
-                .wrapAvro(user.asBytes(), messageId, messageTimestamp, topic, user.getCompiledSchema(), NO_EXTERNAL_METADATA);
-
-        // when
-        UnwrappedMessageContent unwrappedMessageContent = compositeMessageContentWrapperWithHeaderEnabled
-                .unwrapAvro(wrapped, topic, schemaId.value(), NO_VERSION_IN_HEADER);
-
-        // then
-        assertResult(unwrappedMessageContent, schemaId, user.asBytes(), messageId, messageTimestamp);
-        assertMetrics(0, 0, 0, 0, 0, 0, 0, 1, 0);
-    }
-
-    @Test
-    public void shouldUnwrapUsingSchemaIdAwareIfVersionAndIdInSchemaPresentDespiteServiceHeaderPresent() {
-        // given
-        String messageId = MESSAGE_ID;
-        int messageTimestamp = MESSAGE_TIMESTAMP;
-
-        SchemaId schemaId = createSchemaId(ID_THREE);
-        Topic topic = createTopicWithSchemaIdAwarePayload();
-        AvroUser user = createAvroUser(schemaId, topic);
-        CompiledSchema<Schema> schema = user.getCompiledSchema();
-
-        byte[] wrapped =
-                compositeMessageContentWrapper.wrapAvro(user.asBytes(), messageId, messageTimestamp, topic, schema, NO_EXTERNAL_METADATA);
-
-        // when
-        UnwrappedMessageContent unwrappedMessageContent =
-                compositeMessageContentWrapper.unwrapAvro(wrapped, topic, schema.getId().value(), schema.getVersion().value());
-
-        // then
-        assertResult(unwrappedMessageContent, schema.getVersion(), user.asBytes(), messageId, messageTimestamp);
-        assertMetrics(0, 0, 0, 0, 0, 1, 0, 0, 0);
-    }
-
-    @Test
-    public void shouldUnwrapUsingHeaderSchemaVersionIfHeaderPresentAndNoMagicByte() {
-        // given
-        String messageId = MESSAGE_ID;
-        int messageTimestamp = MESSAGE_TIMESTAMP;
-
-        SchemaVersion schemaVersion = createSchemaVersion(VERSION_TWO); // no magic byte
-        Topic topicToWrap = createTopic();
-        AvroUser user = createAvroUser(schemaVersion, topicToWrap);
-
-        byte[] wrapped =
-                compositeMessageContentWrapper
-                        .wrapAvro(user.asBytes(), messageId, messageTimestamp, topicToWrap, user.getCompiledSchema(), NO_EXTERNAL_METADATA);
-
-        Topic topicToUnwrap = createTopicWithSchemaIdAwarePayload();
-
-        // when
-        UnwrappedMessageContent unwrappedMessageContent =
-                compositeMessageContentWrapper.unwrapAvro(wrapped, topicToUnwrap, NO_ID_IN_HEADER, schemaVersion.value());
-
-        // then
-        assertResult(unwrappedMessageContent, schemaVersion, user.asBytes(), messageId, messageTimestamp);
-
-        // missedSchemaVersionInPayload == no magic byte
-        assertMetrics(1, 0, 0, 0, 0, 0, 1, 0, 0);
-    }
-
-    @Test
-    public void shouldTrimSchemaVersionFromMessageWhenSchemaVersionPresentInHeader() {
-        // given
-        String messageId = MESSAGE_ID;
-        int messageTimestamp = MESSAGE_TIMESTAMP;
-
-        SchemaVersion schemaVersion = createSchemaVersion(VERSION_ONE);
-        Topic topic = createTopic();
-        AvroUser user = createAvroUser(schemaVersion, topic);
-
-        byte[] message =
-                compositeMessageContentWrapper
-                        .wrapAvro(user.asBytes(), messageId, messageTimestamp, topic, user.getCompiledSchema(), NO_EXTERNAL_METADATA);
-        byte[] wrapped = serializeWithSchemaVersionInPayload(schemaVersion, message);
-
-        // when
-        UnwrappedMessageContent unwrappedMessageContent =
-                compositeMessageContentWrapper.unwrapAvro(wrapped, topic, NO_ID_IN_HEADER, VERSION_ONE);
-
-        // then
-        assertResult(unwrappedMessageContent, schemaVersion, user.asBytes(), messageId, messageTimestamp);
-        assertMetrics(0, 0, 0, 0, 0, 0, 0, 0, 1);
-    }
-
-    private void assertResult(UnwrappedMessageContent result,
-                              SchemaVersion schemaVersion,
-                              byte[] recordBytes,
-                              String messageId,
-                              int timestamp) {
-        assertThat(result.getSchema().get().getVersion()).isEqualTo(schemaVersion);
-        assertResult(result, recordBytes, messageId, timestamp);
-    }
-
-    private void assertResult(UnwrappedMessageContent result,
-                              SchemaId schemaId,
-                              byte[] recordBytes,
-                              String messageId,
-                              int timestamp) {
-        assertThat(result.getSchema().get().getId()).isEqualTo(schemaId);
-        assertResult(result, recordBytes, messageId, timestamp);
-    }
-
-    private void assertResult(UnwrappedMessageContent result, byte[] recordBytes, String messageId, int timestamp) {
-        assertThat(result.getContent()).contains(recordBytes);
-        assertThat(result.getMessageMetadata().getId()).isEqualTo(messageId);
-        assertThat(result.getMessageMetadata().getTimestamp()).isEqualTo(timestamp);
-    }
-
-    private void assertMetrics(int missedSchemaIdInPayload,
-                               int errorsForPayloadWithSchemaId,
-                               int errorsForHeaderSchemaVersion,
-                               int errorsForHeaderSchemaId,
-                               int errorsWithSchemaVersionTruncation,
-                               int usingSchemaIdAware,
-                               int usingHeaderSchemaVersion,
-                               int usingHeaderSchemaId,
-                               int usingSchemaVersionTruncation) {
-        final String basePath = "content.avro.deserialization";
-        assertThat(metricRegistryCounterValue(basePath + ".missed.schemaIdInPayload")).isEqualTo(missedSchemaIdInPayload);
-        assertThat(meterRegistryCounterValue(basePath + ".missing_schemaIdInPayload", Tags.empty()))
-                .isEqualTo(missedSchemaIdInPayload);
-
-        assertThat(metricRegistryCounterValue(basePath + ".errors.payloadWithSchemaId")).isEqualTo(errorsForPayloadWithSchemaId);
-        assertThat(meterRegistryCounterValue(basePath + ".errors", Tags.of("deserialization_type", "payloadWithSchemaId")))
-                .isEqualTo(errorsForPayloadWithSchemaId);
-
-        assertThat(metricRegistryCounterValue(basePath + ".errors.headerSchemaVersion")).isEqualTo(errorsForHeaderSchemaVersion);
-        assertThat(meterRegistryCounterValue(basePath + ".errors", Tags.of("deserialization_type", "headerSchemaVersion")))
-                .isEqualTo(errorsForHeaderSchemaVersion);
-
-        assertThat(metricRegistryCounterValue(basePath + ".errors.headerSchemaId")).isEqualTo(errorsForHeaderSchemaId);
-        assertThat(meterRegistryCounterValue(basePath + ".errors", Tags.of("deserialization_type", "headerSchemaId")))
-                .isEqualTo(errorsForHeaderSchemaId);
-
-        assertThat(metricRegistryCounterValue(basePath + ".errors.schemaVersionTruncation")).isEqualTo(errorsWithSchemaVersionTruncation);
-        assertThat(meterRegistryCounterValue(basePath + ".errors", Tags.of("deserialization_type", "schemaVersionTruncation")))
-                .isEqualTo(errorsWithSchemaVersionTruncation);
-
-        assertThat(metricRegistryCounterValue(basePath + ".using.schemaIdAware")).isEqualTo(usingSchemaIdAware);
-        assertThat(meterRegistryCounterValue(basePath, Tags.of("deserialization_type", "payloadWithSchemaId")))
-                .isEqualTo(usingSchemaIdAware);
-
-        assertThat(metricRegistryCounterValue(basePath + ".using.headerSchemaVersion")).isEqualTo(usingHeaderSchemaVersion);
-        assertThat(meterRegistryCounterValue(basePath, Tags.of("deserialization_type", "headerSchemaVersion")))
-                .isEqualTo(usingHeaderSchemaVersion);
-
-        assertThat(metricRegistryCounterValue(basePath + ".using.headerSchemaId")).isEqualTo(usingHeaderSchemaId);
-        assertThat(meterRegistryCounterValue(basePath, Tags.of("deserialization_type", "headerSchemaId"))).isEqualTo(usingHeaderSchemaId);
-
-        assertThat(metricRegistryCounterValue(basePath + ".using.schemaVersionTruncation")).isEqualTo(usingSchemaVersionTruncation);
-        assertThat(meterRegistryCounterValue(basePath, Tags.of("deserialization_type", "schemaVersionTruncation")))
-                .isEqualTo(usingSchemaVersionTruncation);
-    }
-
-    private long metricRegistryCounterValue(String metricName) {
-        return metricRegistry.counter(metricName).getCount();
-    }
-
-    private int meterRegistryCounterValue(String metricName, Tags tags) {
-        return MicrometerUtils.metricValue(meterRegistry, metricName, tags, Search::counter, Counter::count).orElse(0.0d).intValue();
-    }
-
-
-    private Topic createTopic() {
-        return topic("group", "topic").build();
-    }
-
-    private Topic createTopicWithSchemaIdAwarePayload() {
-        return topic("group", "topic-idAware").withSchemaIdAwareSerialization().build();
-    }
-
-    private AvroUser createAvroUser(SchemaVersion schemaVersion, Topic topic) {
-        CompiledSchema<Schema> schema = schemaRepository.getKnownAvroSchemaVersion(topic, schemaVersion);
-        return new AvroUser(schema, "user-1", 15, "colour-1");
-    }
-
-    private AvroUser createAvroUser(SchemaId id, Topic topic) {
-        CompiledSchema<Schema> schema = schemaRepository.getAvroSchema(topic, id);
-        return new AvroUser(schema, "user-1", 15, "colour-1");
-    }
-
-    private static SchemaVersion createSchemaVersion(int schemaVersionValue) {
-        return SchemaVersion.valueOf(schemaVersionValue);
-    }
-
-    private static SchemaId createSchemaId(int schemaIdValue) {
-        return SchemaId.valueOf(schemaIdValue);
-    }
-
-    private static byte[] serializeWithSchemaVersionInPayload(SchemaVersion schemaVersion, byte[] data) {
-        final int HEADER_SIZE = 5;
-        final byte MAGIC_BYTE_VALUE = 0;
-        ByteBuffer buffer = ByteBuffer.allocate(HEADER_SIZE + data.length);
-        buffer.put(MAGIC_BYTE_VALUE);
-        buffer.putInt(schemaVersion.value());
-        buffer.put(data);
-        return buffer.array();
-    }
+      };
+
+  static SchemaRepository schemaRepository =
+      new SchemaRepository(schemaVersionsRepository, compiledSchemaRepository);
+
+  @Test
+  public void shouldUnwrapMessageUsingSchemaIdFromPayload() {
+    // given
+    String messageId = MESSAGE_ID;
+    int messageTimestamp = MESSAGE_TIMESTAMP;
+
+    SchemaId schemaId = createSchemaId(ID_FIVE);
+    Topic topic = createTopicWithSchemaIdAwarePayload();
+    AvroUser user = createAvroUser(schemaId, topic);
+
+    byte[] wrapped =
+        compositeMessageContentWrapper.wrapAvro(
+            user.asBytes(),
+            messageId,
+            messageTimestamp,
+            topic,
+            user.getCompiledSchema(),
+            NO_EXTERNAL_METADATA);
+
+    // when
+    UnwrappedMessageContent unwrappedMessageContent =
+        compositeMessageContentWrapper.unwrapAvro(
+            wrapped, topic, NO_ID_IN_HEADER, NO_VERSION_IN_HEADER);
+
+    // then
+    assertResult(unwrappedMessageContent, schemaId, user.asBytes(), messageId, messageTimestamp);
+    assertMetrics(0, 0, 0, 0, 0, 1, 0, 0, 0);
+  }
+
+  @Test
+  public void shouldUnwrapUsingHeaderSchemaVersionIfHeaderPresent() {
+    // given
+    String messageId = MESSAGE_ID;
+    int messageTimestamp = MESSAGE_TIMESTAMP;
+
+    SchemaVersion schemaVersion = createSchemaVersion(VERSION_TWO);
+    Topic topic = createTopic();
+    AvroUser user = createAvroUser(schemaVersion, topic);
+
+    byte[] wrapped =
+        compositeMessageContentWrapper.wrapAvro(
+            user.asBytes(),
+            messageId,
+            messageTimestamp,
+            topic,
+            user.getCompiledSchema(),
+            NO_EXTERNAL_METADATA);
+
+    // when
+    UnwrappedMessageContent unwrappedMessageContent =
+        compositeMessageContentWrapper.unwrapAvro(
+            wrapped, topic, NO_ID_IN_HEADER, schemaVersion.value());
+
+    // then
+    assertResult(
+        unwrappedMessageContent, schemaVersion, user.asBytes(), messageId, messageTimestamp);
+    assertMetrics(0, 0, 0, 0, 0, 0, 1, 0, 0);
+  }
+
+  @Test
+  public void shouldUnwrapUsingHeaderSchemaIdIfHeaderPresent() {
+    // given
+    CompositeMessageContentWrapper compositeMessageContentWrapperWithHeaderEnabled =
+        createMessageContentWrapper(true, false);
+    String messageId = MESSAGE_ID;
+    int messageTimestamp = MESSAGE_TIMESTAMP;
+
+    SchemaId schemaId = createSchemaId(ID_THREE);
+    Topic topic = createTopic();
+    AvroUser user = createAvroUser(schemaId, topic);
+
+    byte[] wrapped =
+        compositeMessageContentWrapperWithHeaderEnabled.wrapAvro(
+            user.asBytes(),
+            messageId,
+            messageTimestamp,
+            topic,
+            user.getCompiledSchema(),
+            NO_EXTERNAL_METADATA);
+
+    // when
+    UnwrappedMessageContent unwrappedMessageContent =
+        compositeMessageContentWrapperWithHeaderEnabled.unwrapAvro(
+            wrapped, topic, schemaId.value(), NO_VERSION_IN_HEADER);
+
+    // then
+    assertResult(unwrappedMessageContent, schemaId, user.asBytes(), messageId, messageTimestamp);
+    assertMetrics(0, 0, 0, 0, 0, 0, 0, 1, 0);
+  }
+
+  @Test
+  public void
+      shouldUnwrapUsingSchemaIdAwareIfVersionAndIdInSchemaPresentDespiteServiceHeaderPresent() {
+    // given
+    String messageId = MESSAGE_ID;
+    int messageTimestamp = MESSAGE_TIMESTAMP;
+
+    SchemaId schemaId = createSchemaId(ID_THREE);
+    Topic topic = createTopicWithSchemaIdAwarePayload();
+    AvroUser user = createAvroUser(schemaId, topic);
+    CompiledSchema<Schema> schema = user.getCompiledSchema();
+
+    byte[] wrapped =
+        compositeMessageContentWrapper.wrapAvro(
+            user.asBytes(), messageId, messageTimestamp, topic, schema, NO_EXTERNAL_METADATA);
+
+    // when
+    UnwrappedMessageContent unwrappedMessageContent =
+        compositeMessageContentWrapper.unwrapAvro(
+            wrapped, topic, schema.getId().value(), schema.getVersion().value());
+
+    // then
+    assertResult(
+        unwrappedMessageContent, schema.getVersion(), user.asBytes(), messageId, messageTimestamp);
+    assertMetrics(0, 0, 0, 0, 0, 1, 0, 0, 0);
+  }
+
+  @Test
+  public void shouldUnwrapUsingHeaderSchemaVersionIfHeaderPresentAndNoMagicByte() {
+    // given
+    String messageId = MESSAGE_ID;
+    int messageTimestamp = MESSAGE_TIMESTAMP;
+
+    SchemaVersion schemaVersion = createSchemaVersion(VERSION_TWO); // no magic byte
+    Topic topicToWrap = createTopic();
+    AvroUser user = createAvroUser(schemaVersion, topicToWrap);
+
+    byte[] wrapped =
+        compositeMessageContentWrapper.wrapAvro(
+            user.asBytes(),
+            messageId,
+            messageTimestamp,
+            topicToWrap,
+            user.getCompiledSchema(),
+            NO_EXTERNAL_METADATA);
+
+    Topic topicToUnwrap = createTopicWithSchemaIdAwarePayload();
+
+    // when
+    UnwrappedMessageContent unwrappedMessageContent =
+        compositeMessageContentWrapper.unwrapAvro(
+            wrapped, topicToUnwrap, NO_ID_IN_HEADER, schemaVersion.value());
+
+    // then
+    assertResult(
+        unwrappedMessageContent, schemaVersion, user.asBytes(), messageId, messageTimestamp);
+
+    // missedSchemaVersionInPayload == no magic byte
+    assertMetrics(1, 0, 0, 0, 0, 0, 1, 0, 0);
+  }
+
+  @Test
+  public void shouldTrimSchemaVersionFromMessageWhenSchemaVersionPresentInHeader() {
+    // given
+    String messageId = MESSAGE_ID;
+    int messageTimestamp = MESSAGE_TIMESTAMP;
+
+    SchemaVersion schemaVersion = createSchemaVersion(VERSION_ONE);
+    Topic topic = createTopic();
+    AvroUser user = createAvroUser(schemaVersion, topic);
+
+    byte[] message =
+        compositeMessageContentWrapper.wrapAvro(
+            user.asBytes(),
+            messageId,
+            messageTimestamp,
+            topic,
+            user.getCompiledSchema(),
+            NO_EXTERNAL_METADATA);
+    byte[] wrapped = serializeWithSchemaVersionInPayload(schemaVersion, message);
+
+    // when
+    UnwrappedMessageContent unwrappedMessageContent =
+        compositeMessageContentWrapper.unwrapAvro(wrapped, topic, NO_ID_IN_HEADER, VERSION_ONE);
+
+    // then
+    assertResult(
+        unwrappedMessageContent, schemaVersion, user.asBytes(), messageId, messageTimestamp);
+    assertMetrics(0, 0, 0, 0, 0, 0, 0, 0, 1);
+  }
+
+  private void assertResult(
+      UnwrappedMessageContent result,
+      SchemaVersion schemaVersion,
+      byte[] recordBytes,
+      String messageId,
+      int timestamp) {
+    assertThat(result.getSchema().get().getVersion()).isEqualTo(schemaVersion);
+    assertResult(result, recordBytes, messageId, timestamp);
+  }
+
+  private void assertResult(
+      UnwrappedMessageContent result,
+      SchemaId schemaId,
+      byte[] recordBytes,
+      String messageId,
+      int timestamp) {
+    assertThat(result.getSchema().get().getId()).isEqualTo(schemaId);
+    assertResult(result, recordBytes, messageId, timestamp);
+  }
+
+  private void assertResult(
+      UnwrappedMessageContent result, byte[] recordBytes, String messageId, int timestamp) {
+    assertThat(result.getContent()).contains(recordBytes);
+    assertThat(result.getMessageMetadata().getId()).isEqualTo(messageId);
+    assertThat(result.getMessageMetadata().getTimestamp()).isEqualTo(timestamp);
+  }
+
+  private void assertMetrics(
+      int missedSchemaIdInPayload,
+      int errorsForPayloadWithSchemaId,
+      int errorsForHeaderSchemaVersion,
+      int errorsForHeaderSchemaId,
+      int errorsWithSchemaVersionTruncation,
+      int usingSchemaIdAware,
+      int usingHeaderSchemaVersion,
+      int usingHeaderSchemaId,
+      int usingSchemaVersionTruncation) {
+    final String basePath = "content.avro.deserialization";
+    assertThat(meterRegistryCounterValue(basePath + ".missing_schemaIdInPayload", Tags.empty()))
+        .isEqualTo(missedSchemaIdInPayload);
+
+    assertThat(
+            meterRegistryCounterValue(
+                basePath + ".errors", Tags.of("deserialization_type", "payloadWithSchemaId")))
+        .isEqualTo(errorsForPayloadWithSchemaId);
+
+    assertThat(
+            meterRegistryCounterValue(
+                basePath + ".errors", Tags.of("deserialization_type", "headerSchemaVersion")))
+        .isEqualTo(errorsForHeaderSchemaVersion);
+
+    assertThat(
+            meterRegistryCounterValue(
+                basePath + ".errors", Tags.of("deserialization_type", "headerSchemaId")))
+        .isEqualTo(errorsForHeaderSchemaId);
+
+    assertThat(
+            meterRegistryCounterValue(
+                basePath + ".errors", Tags.of("deserialization_type", "schemaVersionTruncation")))
+        .isEqualTo(errorsWithSchemaVersionTruncation);
+
+    assertThat(
+            meterRegistryCounterValue(
+                basePath, Tags.of("deserialization_type", "payloadWithSchemaId")))
+        .isEqualTo(usingSchemaIdAware);
+
+    assertThat(
+            meterRegistryCounterValue(
+                basePath, Tags.of("deserialization_type", "headerSchemaVersion")))
+        .isEqualTo(usingHeaderSchemaVersion);
+
+    assertThat(
+            meterRegistryCounterValue(basePath, Tags.of("deserialization_type", "headerSchemaId")))
+        .isEqualTo(usingHeaderSchemaId);
+
+    assertThat(
+            meterRegistryCounterValue(
+                basePath, Tags.of("deserialization_type", "schemaVersionTruncation")))
+        .isEqualTo(usingSchemaVersionTruncation);
+  }
+
+  private int meterRegistryCounterValue(String metricName, Tags tags) {
+    return MicrometerUtils.metricValue(
+            meterRegistry, metricName, tags, Search::counter, Counter::count)
+        .orElse(0.0d)
+        .intValue();
+  }
+
+  private Topic createTopic() {
+    return topic("group", "topic").build();
+  }
+
+  private Topic createTopicWithSchemaIdAwarePayload() {
+    return topic("group", "topic-idAware").withSchemaIdAwareSerialization().build();
+  }
+
+  private AvroUser createAvroUser(SchemaVersion schemaVersion, Topic topic) {
+    CompiledSchema<Schema> schema =
+        schemaRepository.getKnownAvroSchemaVersion(topic, schemaVersion);
+    return new AvroUser(schema, "user-1", 15, "colour-1");
+  }
+
+  private AvroUser createAvroUser(SchemaId id, Topic topic) {
+    CompiledSchema<Schema> schema = schemaRepository.getAvroSchema(topic, id);
+    return new AvroUser(schema, "user-1", 15, "colour-1");
+  }
+
+  private static SchemaVersion createSchemaVersion(int schemaVersionValue) {
+    return SchemaVersion.valueOf(schemaVersionValue);
+  }
+
+  private static SchemaId createSchemaId(int schemaIdValue) {
+    return SchemaId.valueOf(schemaIdValue);
+  }
+
+  private static byte[] serializeWithSchemaVersionInPayload(
+      SchemaVersion schemaVersion, byte[] data) {
+    final int HEADER_SIZE = 5;
+    final byte MAGIC_BYTE_VALUE = 0;
+    ByteBuffer buffer = ByteBuffer.allocate(HEADER_SIZE + data.length);
+    buffer.put(MAGIC_BYTE_VALUE);
+    buffer.putInt(schemaVersion.value());
+    buffer.put(data);
+    return buffer.array();
+  }
 }
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwareSerDeTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwareSerDeTest.java
index 3ffa2ba9e2..8efa9d7212 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwareSerDeTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/message/wrapper/SchemaAwareSerDeTest.java
@@ -1,46 +1,44 @@
 package pl.allegro.tech.hermes.common.message.wrapper;
 
-import org.testng.annotations.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import org.junit.Test;
 import pl.allegro.tech.hermes.schema.SchemaId;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 
-import java.io.IOException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class SchemaAwareSerDeTest {
-    static final AvroUser avro = new AvroUser("bob", 10, "red");
-
-    @Test
-    public void shouldSerialize() throws IOException {
-        // given
-        SchemaId id = SchemaId.valueOf(8);
-
-        // when
-        byte[] serialized = SchemaAwareSerDe.serialize(id, avro.asBytes());
-
-        // then
-        assertThat(serialized).startsWith((byte) 0);
-    }
-
-    @Test
-    public void shouldDeserialize() throws IOException {
-        // given
-        byte[] serialized = SchemaAwareSerDe.serialize(SchemaId.valueOf(8), avro.asBytes());
-
-        // when
-        SchemaAwarePayload deserialized = SchemaAwareSerDe.deserialize(serialized);
-
-        // then
-        assertThat(deserialized.getSchemaId().value()).isEqualTo(8);
-        assertThat(deserialized.getPayload()).isEqualTo(avro.asBytes());
-    }
-
-    @Test(expectedExceptions = { DeserializationException.class })
-    public void shouldThrowExceptionWhenDeserializingWithoutMagicByte() throws IOException {
-        // when
-        SchemaAwareSerDe.deserialize(new byte[]{1, 2, 3});
-
-        // then exception is thrown
-    }
+  static final AvroUser avro = new AvroUser("bob", 10, "red");
+
+  @Test
+  public void shouldSerialize() {
+    // given
+    SchemaId id = SchemaId.valueOf(8);
+
+    // when
+    byte[] serialized = SchemaAwareSerDe.serialize(id, avro.asBytes());
+
+    // then
+    assertThat(serialized).startsWith((byte) 0);
+  }
+
+  @Test
+  public void shouldDeserialize() {
+    // given
+    byte[] serialized = SchemaAwareSerDe.serialize(SchemaId.valueOf(8), avro.asBytes());
+
+    // when
+    SchemaAwarePayload deserialized = SchemaAwareSerDe.deserialize(serialized);
+
+    // then
+    assertThat(deserialized.getSchemaId().value()).isEqualTo(8);
+    assertThat(deserialized.getPayload()).isEqualTo(avro.asBytes());
+  }
+
+  @Test
+  public void shouldThrowExceptionWhenDeserializingWithoutMagicByte() {
+    // when
+    assertThrows(
+        DeserializationException.class, () -> SchemaAwareSerDe.deserialize(new byte[] {1, 2, 3}));
+  }
 }
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/MetricsDeltaCalculatorTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/MetricsDeltaCalculatorTest.java
index 57a40c7988..cffce230aa 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/MetricsDeltaCalculatorTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/MetricsDeltaCalculatorTest.java
@@ -1,53 +1,53 @@
 package pl.allegro.tech.hermes.common.metric.counter;
 
-import org.junit.Test;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.Test;
+
 public class MetricsDeltaCalculatorTest {
 
-    private final MetricsDeltaCalculator calculator = new MetricsDeltaCalculator();
+  private final MetricsDeltaCalculator calculator = new MetricsDeltaCalculator();
 
-    @Test
-    public void shouldReturnCurrentValueWhenThereIsNoPreviousStateForMetric() {
-        // given when
-        long delta = calculator.calculateDelta("metricWithoutHistory", 13L);
+  @Test
+  public void shouldReturnCurrentValueWhenThereIsNoPreviousStateForMetric() {
+    // given when
+    long delta = calculator.calculateDelta("metricWithoutHistory", 13L);
 
-        // then
-        assertThat(delta).isEqualTo(13);
-    }
+    // then
+    assertThat(delta).isEqualTo(13);
+  }
 
-    @Test
-    public void shouldReturnDeltaBetweenCurrentAndPreviousState() {
-        // given
-        calculator.calculateDelta("metric", 13L);
+  @Test
+  public void shouldReturnDeltaBetweenCurrentAndPreviousState() {
+    // given
+    calculator.calculateDelta("metric", 13L);
 
-        // when
-        long delta = calculator.calculateDelta("metric", 20L);
+    // when
+    long delta = calculator.calculateDelta("metric", 20L);
 
-        // then
-        assertThat(delta).isEqualTo(7);
-    }
+    // then
+    assertThat(delta).isEqualTo(7);
+  }
 
-    @Test
-    public void shouldRevertDelta() {
-        //given
-        String metricName = "metricToRevert";
-        calculator.calculateDelta(metricName, 15L);
-        long delta = calculator.calculateDelta(metricName, 20L);
+  @Test
+  public void shouldRevertDelta() {
+    // given
+    String metricName = "metricToRevert";
+    calculator.calculateDelta(metricName, 15L);
+    long delta = calculator.calculateDelta(metricName, 20L);
 
-        //when
-        calculator.revertDelta(metricName, delta);
+    // when
+    calculator.revertDelta(metricName, delta);
 
-        assertThat(calculator.calculateDelta(metricName, 20L)).isEqualTo(5L);
-    }
+    assertThat(calculator.calculateDelta(metricName, 20L)).isEqualTo(5L);
+  }
 
-    @Test
-    public void shouldNotRevertDeltaForNonExistingMetric() {
-        // when
-        calculator.revertDelta("emptyMetric", 10L);
+  @Test
+  public void shouldNotRevertDeltaForNonExistingMetric() {
+    // when
+    calculator.revertDelta("emptyMetric", 10L);
 
-        // then
-        assertThat(calculator.calculateDelta("emptyMetric", 10L)).isEqualTo(10L);
-    }
+    // then
+    assertThat(calculator.calculateDelta("emptyMetric", 10L)).isEqualTo(10L);
+  }
 }
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterReporterTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterReporterTest.java
index 3788cfb46e..8e009bd91d 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterReporterTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterReporterTest.java
@@ -1,110 +1,103 @@
 package pl.allegro.tech.hermes.common.metric.counter.zookeeper;
 
-import com.codahale.metrics.MetricRegistry;
+import static org.mockito.Mockito.verify;
+
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.common.metric.counter.CounterStorage;
 import pl.allegro.tech.hermes.common.util.InstanceIdResolver;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ZookeeperCounterReporterTest {
-    public static final String GROUP_NAME = "pl.allegro.tech.skylab";
-    public static final String TOPIC_NAME_UNDERSCORE = "topic_1";
-    public static final String SUBSCRIPTION_NAME = "subscription.name";
-    public static final TopicName topic = new TopicName(GROUP_NAME, TOPIC_NAME_UNDERSCORE);
-    public static final SubscriptionName subscription = new SubscriptionName(SUBSCRIPTION_NAME, topic);
+  public static final String GROUP_NAME = "pl.allegro.tech.skylab";
+  public static final String TOPIC_NAME_UNDERSCORE = "topic_1";
+  public static final String SUBSCRIPTION_NAME = "subscription.name";
+  public static final TopicName topic = new TopicName(GROUP_NAME, TOPIC_NAME_UNDERSCORE);
+  public static final SubscriptionName subscription =
+      new SubscriptionName(SUBSCRIPTION_NAME, topic);
 
-    public static final long COUNT = 100L;
+  public static final long COUNT = 100L;
 
-    @Mock
-    private CounterStorage counterStorage;
+  @Mock private CounterStorage counterStorage;
 
-    private final MeterRegistry meterRegistry = new SimpleMeterRegistry();
+  private final MeterRegistry meterRegistry = new SimpleMeterRegistry();
 
-    private final MetricsFacade metricsFacade = new MetricsFacade(
-            meterRegistry, new HermesMetrics(new MetricRegistry(), new PathsCompiler("localhost")));
+  private final MetricsFacade metricsFacade = new MetricsFacade(meterRegistry);
 
-    @Mock
-    private InstanceIdResolver instanceIdResolver;
+  @Mock private InstanceIdResolver instanceIdResolver;
 
-    private ZookeeperCounterReporter zookeeperCounterReporter;
+  private ZookeeperCounterReporter zookeeperCounterReporter;
 
-    @Before
-    public void before() {
-        when(instanceIdResolver.resolve()).thenReturn("localhost.domain");
-        zookeeperCounterReporter = new ZookeeperCounterReporter(meterRegistry, counterStorage, "");
-    }
+  @Before
+  public void before() {
+    zookeeperCounterReporter = new ZookeeperCounterReporter(meterRegistry, counterStorage, "");
+  }
 
-    @Test
-    public void shouldReportPublishedMessages() {
-        // given
-        metricsFacade.topics().topicPublished(topic).increment(COUNT);
+  @Test
+  public void shouldReportPublishedMessages() {
+    // given
+    metricsFacade.topics().topicPublished(topic, "dc1").increment(COUNT);
 
-        // when
-        zookeeperCounterReporter.report();
+    // when
+    zookeeperCounterReporter.report();
 
-        // then
-        verify(counterStorage).setTopicPublishedCounter(topic, COUNT);
-    }
+    // then
+    verify(counterStorage).setTopicPublishedCounter(topic, COUNT);
+  }
 
-    @Test
-    public void shouldReportDeliveredMessages() {
-        // given
-        metricsFacade.subscriptions().successes(subscription).increment(COUNT);
+  @Test
+  public void shouldReportDeliveredMessages() {
+    // given
+    metricsFacade.subscriptions().successes(subscription).increment(COUNT);
 
-        // when
-        zookeeperCounterReporter.report();
+    // when
+    zookeeperCounterReporter.report();
 
-        // then
-        verify(counterStorage).setSubscriptionDeliveredCounter(topic, SUBSCRIPTION_NAME, COUNT);
-    }
+    // then
+    verify(counterStorage).setSubscriptionDeliveredCounter(topic, SUBSCRIPTION_NAME, COUNT);
+  }
 
-    @Test
-    public void shouldReportDiscardedMessages() {
-        // given
-        metricsFacade.subscriptions().discarded(subscription).increment(COUNT);
+  @Test
+  public void shouldReportDiscardedMessages() {
+    // given
+    metricsFacade.subscriptions().discarded(subscription).increment(COUNT);
 
-        // when
-        zookeeperCounterReporter.report();
+    // when
+    zookeeperCounterReporter.report();
 
-        // then
-        verify(counterStorage).setSubscriptionDiscardedCounter(topic, SUBSCRIPTION_NAME, COUNT);
-    }
+    // then
+    verify(counterStorage).setSubscriptionDiscardedCounter(topic, SUBSCRIPTION_NAME, COUNT);
+  }
 
-    @Test
-    public void shouldReportSubscriptionVolumeCounter() {
-        // given
-        metricsFacade.subscriptions().throughputInBytes(subscription).increment(COUNT);
+  @Test
+  public void shouldReportSubscriptionVolumeCounter() {
+    // given
+    metricsFacade.subscriptions().throughputInBytes(subscription).increment(COUNT);
 
-        // when
-        zookeeperCounterReporter.report();
+    // when
+    zookeeperCounterReporter.report();
 
-        // then
-        verify(counterStorage).incrementVolumeCounter(topic, SUBSCRIPTION_NAME, COUNT);
-    }
+    // then
+    verify(counterStorage).incrementVolumeCounter(topic, SUBSCRIPTION_NAME, COUNT);
+  }
 
-    @Test
-    public void shouldReportTopicVolumeCounter() {
-        // given
-        metricsFacade.topics().topicThroughputBytes(topic).increment(COUNT);
+  @Test
+  public void shouldReportTopicVolumeCounter() {
+    // given
+    metricsFacade.topics().topicThroughputBytes(topic).increment(COUNT);
 
-        // when
-        zookeeperCounterReporter.report();
+    // when
+    zookeeperCounterReporter.report();
 
-        // then
-        verify(counterStorage).incrementVolumeCounter(topic, COUNT);
-    }
-}
\ No newline at end of file
+    // then
+    verify(counterStorage).incrementVolumeCounter(topic, COUNT);
+  }
+}
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterStorageTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterStorageTest.java
index 4434989d2b..78bc2faa65 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterStorageTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/metric/counter/zookeeper/ZookeeperCounterStorageTest.java
@@ -1,93 +1,98 @@
 package pl.allegro.tech.hermes.common.metric.counter.zookeeper;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionNotExistsException;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.counter.SharedCounter;
 import pl.allegro.tech.hermes.metrics.PathsCompiler;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
 @RunWith(MockitoJUnitRunner.class)
 public class ZookeeperCounterStorageTest {
 
-    @Mock
-    private SharedCounter sharedCounter;
-
-    @Mock
-    private SubscriptionRepository subscriptionRepository;
-
-    private ZookeeperCounterStorage storage;
-
-    @Before
-    public void initialize() {
-        PathsCompiler pathCompiler = new PathsCompiler("my-host-example.net");
-        storage = new ZookeeperCounterStorage(sharedCounter, subscriptionRepository, pathCompiler, "/hermes");
-    }
-
-    @Test
-    public void shouldIncrementTopicMetricUsingSharedCounter() {
-        //when
-        storage.setTopicPublishedCounter(TopicName.fromQualifiedName("test.topic"), 10);
-
-        // then
-        verify(sharedCounter).increment("/hermes/groups/test/topics/topic/metrics/published", 10);
-    }
-
-    @Test
-    public void shouldReadValueFromTopicMetric() {
-        // given
-        when(sharedCounter.getValue("/hermes/groups/test/topics/topic/metrics/published")).thenReturn(10L);
-
-        // when
-        long value = storage.getTopicPublishedCounter(TopicName.fromQualifiedName("test.topic"));
-
-        // then
-        assertThat(value).isEqualTo(10);
-    }
-
-    @Test
-    public void shouldIncrementSubscriptionMetricUsingSharedCounter() {
-        // given when
-        storage.setSubscriptionDeliveredCounter(TopicName.fromQualifiedName("test.topic"), "sub", 10);
-
-        // then
-        verify(sharedCounter).increment("/hermes/groups/test/topics/topic/subscriptions/sub/metrics/delivered", 10);
-    }
-
-    @Test
-    public void shouldReadValueFromSubscriptionMetric() {
-        // given
-        when(sharedCounter.getValue("/hermes/groups/test/topics/topic/subscriptions/sub/metrics/delivered")).thenReturn(10L);
-
-        // when
-        long value = storage.getSubscriptionDeliveredCounter(TopicName.fromQualifiedName("test.topic"), "sub");
-
-        // then
-        assertThat(value).isEqualTo(10);
-    }
-
-    @Test
-    public void shouldNotIncrementSharedCounterForNonExistingSubscription() {
-        //given
-        TopicName topicName = TopicName.fromQualifiedName("test.topic");
-        String subscriptionName = "sub";
-        doThrow(new SubscriptionNotExistsException(topicName, subscriptionName))
-                .when(subscriptionRepository).ensureSubscriptionExists(topicName, subscriptionName);
-
-        //when
-        storage.setSubscriptionDeliveredCounter(topicName, subscriptionName, 1L);
-
-        //then
-        verifyZeroInteractions(sharedCounter);
-    }
-}
\ No newline at end of file
+  @Mock private SharedCounter sharedCounter;
+
+  @Mock private SubscriptionRepository subscriptionRepository;
+
+  private ZookeeperCounterStorage storage;
+
+  @Before
+  public void initialize() {
+    PathsCompiler pathCompiler = new PathsCompiler("my-host-example.net");
+    storage =
+        new ZookeeperCounterStorage(sharedCounter, subscriptionRepository, pathCompiler, "/hermes");
+  }
+
+  @Test
+  public void shouldIncrementTopicMetricUsingSharedCounter() {
+    // when
+    storage.setTopicPublishedCounter(TopicName.fromQualifiedName("test.topic"), 10);
+
+    // then
+    verify(sharedCounter).increment("/hermes/groups/test/topics/topic/metrics/published", 10);
+  }
+
+  @Test
+  public void shouldReadValueFromTopicMetric() {
+    // given
+    when(sharedCounter.getValue("/hermes/groups/test/topics/topic/metrics/published"))
+        .thenReturn(10L);
+
+    // when
+    long value = storage.getTopicPublishedCounter(TopicName.fromQualifiedName("test.topic"));
+
+    // then
+    assertThat(value).isEqualTo(10);
+  }
+
+  @Test
+  public void shouldIncrementSubscriptionMetricUsingSharedCounter() {
+    // given when
+    storage.setSubscriptionDeliveredCounter(TopicName.fromQualifiedName("test.topic"), "sub", 10);
+
+    // then
+    verify(sharedCounter)
+        .increment("/hermes/groups/test/topics/topic/subscriptions/sub/metrics/delivered", 10);
+  }
+
+  @Test
+  public void shouldReadValueFromSubscriptionMetric() {
+    // given
+    when(sharedCounter.getValue(
+            "/hermes/groups/test/topics/topic/subscriptions/sub/metrics/delivered"))
+        .thenReturn(10L);
+
+    // when
+    long value =
+        storage.getSubscriptionDeliveredCounter(TopicName.fromQualifiedName("test.topic"), "sub");
+
+    // then
+    assertThat(value).isEqualTo(10);
+  }
+
+  @Test
+  public void shouldNotIncrementSharedCounterForNonExistingSubscription() {
+    // given
+    TopicName topicName = TopicName.fromQualifiedName("test.topic");
+    String subscriptionName = "sub";
+    doThrow(new SubscriptionNotExistsException(topicName, subscriptionName))
+        .when(subscriptionRepository)
+        .ensureSubscriptionExists(topicName, subscriptionName);
+
+    // when
+    storage.setSubscriptionDeliveredCounter(topicName, subscriptionName, 1L);
+
+    // then
+    Mockito.verifyNoInteractions(sharedCounter);
+  }
+}
diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/SharedCounterTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/SharedCounterTest.java
index f3ab02804f..4f2996f757 100644
--- a/hermes-common/src/test/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/SharedCounterTest.java
+++ b/hermes-common/src/test/java/pl/allegro/tech/hermes/infrastructure/zookeeper/counter/SharedCounterTest.java
@@ -1,44 +1,44 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.counter;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
 import org.junit.Before;
 import org.junit.Test;
 import pl.allegro.tech.hermes.test.helper.zookeeper.ZookeeperBaseTest;
 
-import java.time.Duration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class SharedCounterTest extends ZookeeperBaseTest {
 
-    private SharedCounter counter;
-
-    @Before
-    public void initialize() {
-        this.counter = new SharedCounter(zookeeperClient, Duration.ofHours(72), Duration.ofSeconds(1), 3);
-    }
-
-    @Test
-    public void shouldIncrementAndRetrieveCounterForGivenPath() {
-        // given when
-        counter.increment("/increment", 10);
-        wait.untilZookeeperPathIsCreated("/increment");
-
-        // then
-        assertThat(counter.getValue("/increment")).isEqualTo(10);
-    }
-
-    @Test
-    public void shouldIncrementCounterAtomicallyWhenIncrementedConcurrently() {
-        // given
-        SharedCounter otherCounter = new SharedCounter(zookeeperClient, Duration.ofHours(72), Duration.ofSeconds(1), 3);
-
-        // when
-        counter.increment("/sharedIncrement", 10);
-        otherCounter.increment("/sharedIncrement", 15);
-        wait.untilZookeeperPathIsCreated("/sharedIncrement");
-
-        // then
-        assertThat(counter.getValue("/sharedIncrement")).isEqualTo(25);
-    }
-
+  private SharedCounter counter;
+
+  @Before
+  public void initialize() {
+    this.counter =
+        new SharedCounter(zookeeperClient, Duration.ofHours(72), Duration.ofSeconds(1), 3);
+  }
+
+  @Test
+  public void shouldIncrementAndRetrieveCounterForGivenPath() {
+    // given when
+    counter.increment("/increment", 10);
+    wait.untilZookeeperPathIsCreated("/increment");
+
+    // then
+    assertThat(counter.getValue("/increment")).isEqualTo(10);
+  }
+
+  @Test
+  public void shouldIncrementCounterAtomicallyWhenIncrementedConcurrently() {
+    // given
+    SharedCounter otherCounter =
+        new SharedCounter(zookeeperClient, Duration.ofHours(72), Duration.ofSeconds(1), 3);
+
+    // when
+    counter.increment("/sharedIncrement", 10);
+    otherCounter.increment("/sharedIncrement", 15);
+    wait.untilZookeeperPathIsCreated("/sharedIncrement");
+
+    // then
+    assertThat(counter.getValue("/sharedIncrement")).isEqualTo(25);
+  }
 }
diff --git a/hermes-common/src/test/resources/allure.properties b/hermes-common/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-common/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-console-vue/README.md b/hermes-console-vue/README.md
deleted file mode 100644
index 51dc8ee89a..0000000000
--- a/hermes-console-vue/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# hermes-console-vue
-
-Hermes console migrated from AngularJS to Vue 3.
-
-## Requirements
-
-* node >=18.0.0
-* yarn
-
-## Project Setup
-
-```sh
-yarn
-```
-
-### Run mocked backend server
-
-```sh
-yarn dev-server
-```
-
-### Compile and Hot-Reload for Development
-
-```sh
-yarn dev
-```
-
-### Type-Check, Compile and Minify for Production
-
-```sh
-yarn build
-```
-
-### Run Unit Tests with [Vitest](https://vitest.dev/)
-
-```sh
-yarn test:unit
-```
-
-### Lint with [ESLint](https://eslint.org/)
-
-```sh
-yarn lint
-```
-
-### Lint with [ESLint](https://eslint.org/) and fix
-
-```sh
-yarn lint:fix
-```
diff --git a/hermes-console-vue/package.json b/hermes-console-vue/package.json
deleted file mode 100644
index 385c7e31de..0000000000
--- a/hermes-console-vue/package.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "name": "hermes-console-vue",
-  "description": "Console for Hermes Management",
-  "license": "Apache-2.0",
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "scripts": {
-    "dev": "vite",
-    "build": "run-p type-check build-only",
-    "preview": "vite preview",
-    "test:unit": "vitest --environment jsdom",
-    "build-only": "vite build",
-    "type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore",
-    "lint:fix": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "dev-server": "node json-server/server.ts"
-  },
-  "dependencies": {
-    "ace-builds": "1.28.0",
-    "axios": "1.4.0",
-    "base64-arraybuffer": "1.0.2",
-    "jwt-decode": "3.1.2",
-    "pinia": "2.1.4",
-    "pinia-plugin-persistedstate": "3.2.0",
-    "query-string": "8.1.0",
-    "uuid": "9.0.0",
-    "vue": "3.3.4",
-    "vue-i18n": "9.2.2",
-    "vue-router": "4.2.2",
-    "vue3-ace-editor": "2.2.3",
-    "vuetify": "3.3.2"
-  },
-  "devDependencies": {
-    "@mdi/font": "7.1.96",
-    "@pinia/testing": "0.1.3",
-    "@rushstack/eslint-patch": "1.2.0",
-    "@testing-library/jest-dom": "5.16.5",
-    "@testing-library/user-event": "14.4.3",
-    "@testing-library/vue": "7.0.0",
-    "@types/jsdom": "21.1.0",
-    "@types/node": "18.13.0",
-    "@types/uuid": "9.0.2",
-    "@vitejs/plugin-vue": "4.0.0",
-    "@vue/eslint-config-prettier": "7.0.0",
-    "@vue/eslint-config-typescript": "11.0.2",
-    "@vue/test-utils": "2.3.2",
-    "@vue/tsconfig": "0.1.3",
-    "eslint": "8.34.0",
-    "eslint-plugin-sort-imports-es6-autofix": "0.6.0",
-    "eslint-plugin-vue": "9.9.0",
-    "jsdom": "22.1.0",
-    "json-server": "0.17.1",
-    "msw": "1.2.2",
-    "npm-run-all": "4.1.5",
-    "prettier": "2.8.4",
-    "sass": "1.58.1",
-    "typescript": "4.9.5",
-    "vite": "4.1.1",
-    "vite-plugin-rewrite-all": "1.0.1",
-    "vite-plugin-vuetify": "1.0.2",
-    "vitest": "0.31.4",
-    "vue-tsc": "1.0.24"
-  }
-}
diff --git a/hermes-console-vue/src/utils/date-formatter/date-formatter.ts b/hermes-console-vue/src/utils/date-formatter/date-formatter.ts
deleted file mode 100644
index b88d6d6c18..0000000000
--- a/hermes-console-vue/src/utils/date-formatter/date-formatter.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export function formatTimestamp(timestamp: number): string {
-  return new Date(timestamp * 1000)
-    .toISOString()
-    .replace('T', ' ')
-    .replace('Z', '')
-    .slice(0, 19);
-}
-
-export function formatTimestampMillis(timestamp: number): string {
-  return new Date(timestamp)
-    .toISOString()
-    .replace('T', ' ')
-    .replace('Z', '')
-    .slice(0, 19);
-}
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.spec.ts b/hermes-console-vue/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.spec.ts
deleted file mode 100644
index 797360fc80..0000000000
--- a/hermes-console-vue/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.spec.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { describe, expect } from 'vitest';
-import { inconsistentMetadata } from '@/dummy/inconsistentMetadata';
-import { render } from '@/utils/test-utils';
-import InconsistentMetadata from '@/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue';
-
-describe('InconsistentMetadataView', () => {
-  it('should render metadata inconsistencies', () => {
-    // when
-    const { getByText } = render(InconsistentMetadata, {
-      props: {
-        metadata: inconsistentMetadata,
-      },
-    });
-
-    // then
-    expect(
-      getByText('consistency.inconsistentGroup.metadata.inconsistent'),
-    ).toBeVisible();
-  });
-
-  it('should render banner with info that metadata are consistent', () => {
-    // when
-    const { getByText } = render(InconsistentMetadata, {
-      props: {
-        metadata: [],
-      },
-    });
-
-    // then
-    expect(
-      getByText('consistency.inconsistentGroup.metadata.consistent'),
-    ).toBeVisible();
-  });
-});
diff --git a/hermes-console-vue/src/views/search/subscription-search-results/SubscriptionSearchResults.vue b/hermes-console-vue/src/views/search/subscription-search-results/SubscriptionSearchResults.vue
deleted file mode 100644
index 8889cf8975..0000000000
--- a/hermes-console-vue/src/views/search/subscription-search-results/SubscriptionSearchResults.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<script setup lang="ts">
-  import { groupName } from '@/utils/topic-utils/topic-utils';
-  import { useRouter } from 'vue-router';
-  import type { Subscription } from '@/api/subscription';
-
-  const router = useRouter();
-
-  const props = defineProps<{
-    subscriptions: Subscription[];
-  }>();
-
-  function onSubscriptionClick(subscription: Subscription) {
-    const group = groupName(subscription.topicName);
-    router.push({
-      path: `/ui/groups/${group}/topics/${subscription.topicName}/subscriptions/${subscription.name}`,
-    });
-  }
-</script>
-
-<template>
-  <v-table
-    density="comfortable"
-    data-testid="subscription-search-results"
-    hover
-  >
-    <thead>
-      <tr>
-        <th>#</th>
-        <th>{{ $t('search.results.subscription.name') }}</th>
-        <th>{{ $t('search.results.subscription.endpoint') }}</th>
-        <th>{{ $t('search.results.subscription.owner') }}</th>
-        <th>{{ $t('search.results.subscription.status') }}</th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody v-if="props.subscriptions.length > 0">
-      <tr
-        v-for="(subscription, index) in subscriptions"
-        :key="subscription.name"
-        class="groups-table__row"
-        @click="onSubscriptionClick(subscription)"
-      >
-        <td class="text-medium-emphasis">
-          {{ index + 1 }}
-        </td>
-        <td class="font-weight-medium">
-          {{ subscription.name }}
-        </td>
-        <td class="font-weight-medium">
-          {{ subscription.endpoint }}
-        </td>
-        <td class="font-weight-medium">
-          {{ subscription.owner.id }}
-        </td>
-        <td class="font-weight-medium">
-          {{ subscription.state }}
-        </td>
-        <td>
-          <v-icon icon="mdi-chevron-right"></v-icon>
-        </td>
-      </tr>
-    </tbody>
-    <tbody v-else>
-      <tr>
-        <th colspan="12" class="text-center text-medium-emphasis">
-          {{ $t('search.results.subscription.noSubscriptions') }}
-        </th>
-      </tr>
-    </tbody>
-  </v-table>
-</template>
diff --git a/hermes-console-vue/src/views/search/topic-search-results/TopicSearchResults.vue b/hermes-console-vue/src/views/search/topic-search-results/TopicSearchResults.vue
deleted file mode 100644
index 8669dcaa06..0000000000
--- a/hermes-console-vue/src/views/search/topic-search-results/TopicSearchResults.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<script setup lang="ts">
-  import { groupName } from '@/utils/topic-utils/topic-utils';
-  import { useRouter } from 'vue-router';
-  import type { Topic } from '@/api/topic';
-
-  const router = useRouter();
-
-  const props = defineProps<{
-    topics: Topic[];
-  }>();
-
-  function onTopicClick(topic: Topic) {
-    const group = groupName(topic.name);
-    router.push({ path: `/ui/groups/${group}/topics/${topic.name}` });
-  }
-</script>
-
-<template>
-  <v-table density="comfortable" data-testid="topic-search-results" hover>
-    <thead>
-      <tr>
-        <th>#</th>
-        <th>{{ $t('search.results.topic.name') }}</th>
-        <th>{{ $t('search.results.topic.owner') }}</th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody v-if="props.topics.length > 0">
-      <tr
-        v-for="(topic, index) in topics"
-        :key="topic.name"
-        class="groups-table__row"
-        @click="onTopicClick(topic)"
-      >
-        <td class="text-medium-emphasis">
-          {{ index + 1 }}
-        </td>
-        <td class="font-weight-medium">
-          {{ topic.name }}
-        </td>
-        <td class="font-weight-medium">
-          {{ topic.owner.id }}
-        </td>
-        <td>
-          <v-icon icon="mdi-chevron-right"></v-icon>
-        </td>
-      </tr>
-    </tbody>
-    <tbody v-else>
-      <tr>
-        <th colspan="12" class="text-center text-medium-emphasis">
-          {{ $t('search.results.topic.noTopics') }}
-        </th>
-      </tr>
-    </tbody>
-  </v-table>
-</template>
diff --git a/hermes-console/.bowerrc b/hermes-console/.bowerrc
deleted file mode 100644
index a3a2355531..0000000000
--- a/hermes-console/.bowerrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "directory" : "static/components",
-    "registry": "https://bower.herokuapp.com"
-}
\ No newline at end of file
diff --git a/hermes-console-vue/.eslintrc.cjs b/hermes-console/.eslintrc.cjs
similarity index 100%
rename from hermes-console-vue/.eslintrc.cjs
rename to hermes-console/.eslintrc.cjs
diff --git a/hermes-console-vue/.gitignore b/hermes-console/.gitignore
similarity index 95%
rename from hermes-console-vue/.gitignore
rename to hermes-console/.gitignore
index 38adffa64e..b583b23b8b 100644
--- a/hermes-console-vue/.gitignore
+++ b/hermes-console/.gitignore
@@ -8,6 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
+allure-results
 .DS_Store
 dist
 dist-ssr
@@ -20,7 +21,6 @@ coverage
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
-.idea
 *.suo
 *.ntvs*
 *.njsproj
diff --git a/hermes-console/.jshintrc b/hermes-console/.jshintrc
deleted file mode 100644
index 53b202cb9f..0000000000
--- a/hermes-console/.jshintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "esversion": 6
-}
\ No newline at end of file
diff --git a/hermes-console-vue/.prettierrc.json b/hermes-console/.prettierrc.json
similarity index 100%
rename from hermes-console-vue/.prettierrc.json
rename to hermes-console/.prettierrc.json
diff --git a/hermes-console-vue/.vscode/extensions.json b/hermes-console/.vscode/extensions.json
similarity index 100%
rename from hermes-console-vue/.vscode/extensions.json
rename to hermes-console/.vscode/extensions.json
diff --git a/hermes-console/Gruntfile.js b/hermes-console/Gruntfile.js
deleted file mode 100644
index a6e9e0fb43..0000000000
--- a/hermes-console/Gruntfile.js
+++ /dev/null
@@ -1,30 +0,0 @@
-module.exports = function(grunt) {
-
-  grunt.initConfig({
-    jshint: {
-      files: ['Gruntfile.js', 'static/js/**/*.js', 'test/**/*.js'],
-      options: {
-        'esnext': 6,
-      }    },
-    watch: {
-      files: ['<%= jshint.files %>'],
-      tasks: ['jshint', 'karma']
-    },
-    karma: {
-      unit: {
-        configFile: 'karma.config.js',
-        browsers: ['ChromeHeadless']
-      }
-    }
-  });
-
-  
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-
-  grunt.registerTask('test', ['jshint', 'karma']);
-
-  grunt.registerTask('default', ['test']);
-
-};
diff --git a/hermes-console/README.md b/hermes-console/README.md
index 1cbc2a23b1..c3a8fd8b63 100644
--- a/hermes-console/README.md
+++ b/hermes-console/README.md
@@ -1,62 +1,50 @@
-Hermes Console
-====
+# hermes-console
 
-Hermes admin console - UI for Hermes Management API.
+Hermes console written in Vue 3.
 
-## Build and install
+## Requirements
 
-Install backend and frontend dependencies:
+* node >=20.0.0
+* yarn
 
-```bash
-npm install
-bower install
-```
-
-## Configuration
-
-Hermes Console has two initial configuration options, which can be specified using either
-command line or environment variables:
+## Project Setup
 
-* `-p` or `HERMES_CONSOLE_PORT`: specify port (default: `8000`)
-* `-c` or `HERMES_CONSOLE_CONFIG`: specify configuration source: local file or http resource (default: `./config.json`)
+```sh
+yarn
+```
 
-For example to run Hermes Console at port 8001 and fetch configuration from remote source:
+### Run mocked backend server
 
-```bash
-node serve.js -p 8001 -c http://configuration-source
+```sh
+yarn dev-server
 ```
 
-Other configuration can be found in `config.json.example` file.
+### Compile and Hot-Reload for Development
 
-## Run
+```sh
+yarn dev
+```
 
-Use provided node script:
+### Type-Check, Compile and Minify for Production
 
-```
-./serve.js
+```sh
+yarn build
 ```
 
-Or explicitly via node:
+### Run Unit Tests with [Vitest](https://vitest.dev/)
 
-```
-node serve.js
+```sh
+yarn test:unit
 ```
 
-For development purposes to have hermes console autoreload changed files it can be run with `nodemon`
+### Lint with [ESLint](https://eslint.org/)
 
-Install:
-```
-npm install nodemon -g
-```
-Run:
+```sh
+yarn lint
 ```
-nodemon serve.js
-```
-
-## Tests
 
-In order to run all tests and `jshint` code analysis run `grunt` tasks:
+### Lint with [ESLint](https://eslint.org/) and fix
 
-```
-grunt test
+```sh
+yarn lint:fix
 ```
diff --git a/hermes-console/bower.json b/hermes-console/bower.json
deleted file mode 100644
index 82f162af4b..0000000000
--- a/hermes-console/bower.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "hermes-console",
-  "version": "1.0.0",
-  "description": "Console for Hermes project",
-  "main": [],
-  "private": true,
-  "dependencies": {
-    "bootstrap": "~3.3.5",
-    "angular": "~1.4.9",
-    "angular-resource": "~1.4.9",
-    "angular-ui-router": "~0.2.15",
-    "angular-bootstrap": "~0.14.2",
-    "angular-animate": "~1.4.9",
-    "angular-sanitize": "~1.4.9",
-    "angularjs-toaster": "0.4.15",
-    "lodash": "2.4.1",
-    "font-awesome": "4.2.0",
-    "json-formatter": "0.2.2",
-    "hello": "~1.3.7",
-    "jquery": "2.1.4",
-    "angular-deferred-bootstrap": "~0.1.9",
-    "utf8": "3.0.0",
-    "angular-ui-ace": "0.2.3",
-    "eonasdan-bootstrap-datetimepicker": "~4.17.47"
-  },
-  "resolutions": {
-    "angular": "1.4.14"
-  }
-}
diff --git a/hermes-console/config.json.example b/hermes-console/config.json.example
deleted file mode 100644
index 9f58136c63..0000000000
--- a/hermes-console/config.json.example
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "console": {
-        "title": "hermes console" // page title
-        "footer": "<a href=\"http://hermes.allegro.tech\">hermes.allegro.tech</a>" // page footer
-        "criticalEnvironment": false  // should env alert be alert-danger
-        "environmentName": "LOCAL"  // console environment displayed in navbar
-    },
-    "dashboard": {
-        "metrics": "", // link to metrics dashboard
-        "docs": "http://hermes-pubsub.rtfd.org" // link to documentation
-    },
-    "hermes": {
-        "discovery": {
-            "type": "simple",
-            "simple": {
-                "url": "http://localhost:8080"
-            },
-            "consul": {
-                "serviceName": "hermes-management",
-                "agentUrl": "http://localhost:8500"
-            }
-        }
-    },
-    "metrics": {
-        "type": "graphite", // active metric store type
-        "graphite": {
-            "url": "localhost:8091",
-            "prefix": "hermes"
-        }
-    },
-    "auth": {
-        "oauth": {
-            "enabled": false,
-            "url": "localhost:8092/auth",
-            "clientId": "hermes",
-            "scope": "hermes"
-        },
-        "headers": {
-            "enabled": false,
-            "adminHeader": "Hermes-Admin-Password"
-        }
-    },
-    "topic": {
-        "messagePreviewEnabled": false,
-        "authEnabled": false,
-        "defaults": {
-            "ack": "LEADER",
-            "contentType": "JSON",
-            "retentionTime": {
-                "duration": 1
-            }
-        },
-        "contentTypes": {
-            {"value": "AVRO", "label": "AVRO"},
-            {"value": "JSON", "label": "JSON"}
-        },
-        "removeSchema": false,
-        "buttonsExtension": "<a class=\"btn btn-info {{topic.contentType === 'JSON' ? 'ng-show' : 'ng-hide'}}\" ng-href='http://migrator.example/topics/{{topic.name}}'>Migrate to AVRO</a>",
-        "offlineClientsEnabled": false
-    },
-    "group": {
-        "nonAdminCreationEnabled": false
-    },
-    "subscription": {
-        "endpointAddressResolverMetadata": {
-            "exampleEntryEnabled": {
-                "title": "Example boolean entry",
-                "type": "boolean"
-            },
-            "exampleTextEntry": {
-                "title": "Example text entry",
-                "type": "text",
-                "placeholder": "You should write something here",
-                "hint": "This should help somehow..."
-            },
-            "exampleSelectEntry": {
-                "title": "Example select entry",
-                "type": "select",
-                "options": {
-                    "": "<clear>",
-                    "a": "An option",
-                    "b": "Another option"
-                }
-            }
-        },
-        "deliveryTypes": [
-              {"value": "SERIAL", "label": "SERIAL"},
-              {"value": "BATCH", "label": "BATCH"}
-        ]
-    },
-    "owner": {
-        "sources": [
-            {"name": "Crowd", "placeholder": "Crowd group (or groups separated by ',')"}
-        ]
-    }
-}
diff --git a/hermes-console/config_default.json b/hermes-console/config_default.json
deleted file mode 100644
index 687d5536f5..0000000000
--- a/hermes-console/config_default.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "console": {
-    "title": "hermes console",
-    "criticalEnvironment": false,
-    "environmentName": "LOCAL"
-  },
-  "dashboard": {
-    "docs": "http://hermes-pubsub.rtfd.org"
-  },
-  "auth": {
-    "oauth": {
-      "enabled": false
-    },
-    "headers": {
-      "enabled": false
-    }
-  },
-  "topic": {
-    "messagePreviewEnabled": false,
-    "contentTypes": [
-      {"value": "AVRO", "label": "AVRO"},
-      {"value": "JSON", "label": "JSON"}
-    ],
-    "defaults": {
-      "contentType": "AVRO"
-    },
-    "offlineClientsEnabled": false
-  },
-  "group": {
-    "nonAdminCreationEnabled": true
-  },
-  "subscription": {
-    "deliveryTypes": [
-      {"value": "SERIAL", "label": "SERIAL"},
-      {"value": "BATCH", "label": "BATCH"}
-    ]
-  },
-  "owner": {
-    "sources": [
-      {"name": "Crowd", "placeholder": "Crowd group (or groups separated by ',')"}
-    ]
-  },
-  "consistency": {
-    "maxGroupBatchSize": 10
-  }
-}
diff --git a/hermes-console-vue/env.d.ts b/hermes-console/env.d.ts
similarity index 100%
rename from hermes-console-vue/env.d.ts
rename to hermes-console/env.d.ts
diff --git a/hermes-console-vue/index.html b/hermes-console/index.html
similarity index 100%
rename from hermes-console-vue/index.html
rename to hermes-console/index.html
diff --git a/hermes-console-vue/json-server/db.json b/hermes-console/json-server/db.json
similarity index 89%
rename from hermes-console-vue/json-server/db.json
rename to hermes-console/json-server/db.json
index b1a3f0ecb7..23dab13ee0 100644
--- a/hermes-console-vue/json-server/db.json
+++ b/hermes-console/json-server/db.json
@@ -91,6 +91,32 @@
       ]
     }
   ],
+  "inconsistentGroups3":[
+    {
+      "name": "pl.allegro.public.group",
+      "inconsistentMetadata": [],
+      "inconsistentTopics": [
+        {
+          "name": "pl.allegro.public.group.DummyEvent",
+          "inconsistentMetadata": [],
+          "inconsistentSubscriptions": [
+            {
+              "name": "pl.allegro.public.group.DummyEvent$foobar-service",
+              "inconsistentMetadata": [
+                {
+                  "datacenter": "DC1"
+                },
+                {
+                  "datacenter": "DC2",
+                  "content": "{\n  \"id\": \"foobar-service\",\n  \"topicName\": \"pl.allegro.public.group.DummyEvent\",\n  \"name\": \"foobar-service\",\n  \"endpoint\": \"service://foobar-service/events/dummy-event\",\n  \"state\": \"ACTIVE\",\n  \"description\": \"Test Hermes endpoint\",\n  \"subscriptionPolicy\": {\n    \"rate\": 10,\n    \"messageTtl\": 60,\n    \"messageBackoff\": 100,\n    \"requestTimeout\": 1000,\n    \"socketTimeout\": 0,\n    \"sendingDelay\": 0,\n    \"backoffMultiplier\": 1.0,\n    \"backoffMaxIntervalInSec\": 600,\n    \"retryClientErrors\": true,\n    \"backoffMaxIntervalMillis\": 600000\n  },\n  \"trackingEnabled\": false,\n  \"trackingMode\": \"trackingOff\",\n  \"owner\": {\n    \"source\": \"Service Catalog\",\n    \"id\": \"42\"\n  },\n  \"monitoringDetails\": {\n    \"severity\": \"NON_IMPORTANT\",\n    \"reaction\": \"\"\n  },\n  \"contentType\": \"JSON\",\n  \"deliveryType\": \"SERIAL\",\n  \"filters\": [\n    {\n      \"type\": \"avropath\",\n      \"path\": \"foobar\",\n      \"matcher\": \"^FOO_BAR$|^BAZ_BAR$\",\n      \"matchingStrategy\": \"any\"\n    },\n    {\n      \"type\": \"avropath\",\n      \"path\": \".foo.bar.baz\",\n      \"matcher\": \"true\",\n      \"matchingStrategy\": \"all\"\n    }\n  ],\n  \"mode\": \"ANYCAST\",\n  \"headers\": [\n    {\n      \"name\": \"X-My-Header\",\n      \"value\": \"boobar\"\n    },\n    {\n      \"name\": \"X-Another-Header\",\n      \"value\": \"foobar\"\n    }\n  ],\n  \"endpointAddressResolverMetadata\": {\n    \"additionalMetadata\": false,\n    \"nonSupportedProperty\": 2\n  },\n  \"http2Enabled\": false,\n  \"subscriptionIdentityHeadersEnabled\": false,\n  \"autoDeleteWithTopicEnabled\": false,\n  \"createdAt\": 1579507131.238,\n  \"modifiedAt\": 1672140855.813\n}"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "topicNames": [
     "pl.allegro.public.offer.product.ProductEventV1",
     "pl.allegro.public.offer.product.ProductEventV2",
@@ -128,7 +154,7 @@
     },
     {
       "datacenter": "DC3",
-      "status": "UNDEFINED"
+      "status": "READY"
     }
   ],
   "constraints": {
@@ -155,11 +181,6 @@
       "autocomplete": true,
       "deprecated": false
     },
-    {
-      "name": "Crowd Catalog",
-      "autocomplete": false,
-      "deprecated": false
-    },
     {
       "name": "Deprecated catalog",
       "autocomplete": true,
@@ -501,12 +522,13 @@
       "delivered": 39099,
       "discarded": 2137086,
       "volume": 1288032256,
-      "timeouts": "0.0",
-      "otherErrors": "0.0",
-      "codes2xx": "0",
-      "codes4xx": "0.0",
-      "codes5xx": "0.01",
-      "rate": "0",
+      "timeouts": "12.3028857479387",
+      "otherErrors": "16.3028857479387",
+      "codes2xx": "1236.3028857479387",
+      "codes4xx": "123.3028857479387",
+      "codes5xx": "6.3028857479387",
+      "retries": "24.3028857479387",
+      "rate": "1319.6064543974392",
       "throughput": "8.31",
       "batchRate": "0.0",
       "lag": "9055513"
@@ -521,6 +543,7 @@
       "codes2xx": "0",
       "codes4xx": "0.0",
       "codes5xx": "0.01",
+      "retries": "0.01",
       "rate": "0",
       "throughput": "8.36",
       "batchRate": "0.0",
@@ -591,10 +614,6 @@
     },
     "owner": {
       "sources": [
-        {
-          "name": "Crowd Catalog",
-          "placeholder": "Crowd group (or groups separated by ',')"
-        },
         {
           "name": "Service Catalog",
           "placeholder": "Service name from Service Catalog"
@@ -679,6 +698,14 @@
     },
     "group": {
       "nonAdminCreationEnabled": false
+    },
+    "costs": {
+      "enabled": true,
+      "globalDetailsUrl": "",
+      "topicIframeUrl": "",
+      "topicDetailsUrl": "",
+      "subscriptionIframeUrl": "",
+      "subscriptionDetailsUrl": ""
     }
   },
   "stats": {
diff --git a/hermes-console-vue/json-server/filter-debug.json b/hermes-console/json-server/filter-debug.json
similarity index 100%
rename from hermes-console-vue/json-server/filter-debug.json
rename to hermes-console/json-server/filter-debug.json
diff --git a/hermes-console-vue/json-server/routes.json b/hermes-console/json-server/routes.json
similarity index 94%
rename from hermes-console-vue/json-server/routes.json
rename to hermes-console/json-server/routes.json
index eb0b5ae948..0a741b6490 100644
--- a/hermes-console-vue/json-server/routes.json
+++ b/hermes-console/json-server/routes.json
@@ -3,6 +3,7 @@
   "/consistency/groups": "/consistencyGroups",
   "/consistency/inconsistencies/groups?groupNames=pl.allegro.public.offer*": "/inconsistentGroups",
   "/consistency/inconsistencies/groups?groupNames=pl.allegro.public.group2*": "/inconsistentGroups2",
+  "/consistency/inconsistencies/groups?groupNames=pl.allegro.public.group": "/inconsistentGroups3",
   "/groups": "/groups",
   "/owners/sources/Service%20Catalog/:id": "/topicsOwners/:id",
   "/readiness/datacenters": "/readinessDatacenters",
diff --git a/hermes-console-vue/json-server/server.ts b/hermes-console/json-server/server.ts
similarity index 85%
rename from hermes-console-vue/json-server/server.ts
rename to hermes-console/json-server/server.ts
index 6c1daab3d7..0a47cb6361 100644
--- a/hermes-console-vue/json-server/server.ts
+++ b/hermes-console/json-server/server.ts
@@ -87,6 +87,22 @@ server.put(
   },
 );
 
+server.post(
+  '/consistency/sync/topics/pl.allegro.public.group.DummyEvent/subscriptions/barbaz-service*',
+  (req, res) => {
+    res.sendStatus(200);
+  },
+);
+
+server.post(
+  '/consistency/sync/topics/pl.allegro.public.group.DummyEvent*',
+  (req, res) => {
+    res.status(404).jsonp({
+      message: 'Group pl.allegro.public.group not found',
+    });
+  },
+);
+
 server.post('/filters/:topic', (req, res) => {
   res.jsonp(filterDebug);
 });
diff --git a/hermes-console-vue/json-server/subscriptions.json b/hermes-console/json-server/subscriptions.json
similarity index 100%
rename from hermes-console-vue/json-server/subscriptions.json
rename to hermes-console/json-server/subscriptions.json
diff --git a/hermes-console-vue/json-server/topics.json b/hermes-console/json-server/topics.json
similarity index 100%
rename from hermes-console-vue/json-server/topics.json
rename to hermes-console/json-server/topics.json
diff --git a/hermes-console/karma.config.js b/hermes-console/karma.config.js
deleted file mode 100644
index 4222bdb6c7..0000000000
--- a/hermes-console/karma.config.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Karma configuration
-// Generated on Wed Oct 15 2014 23:49:21 GMT+0200 (CEST)
-
-module.exports = function(config) {
-  config.set({
-
-   plugins:[
-             'karma-jasmine',
-             'karma-requirejs',
-             'karma-coverage',
-             'karma-junit-reporter',
-             'karma-chrome-launcher',
-             'karma-ng-html2js-preprocessor'
-             ],
-
-    // base path that will be used to resolve all patterns (eg. files, exclude)
-    basePath: '',
-
-
-    // frameworks to use
-    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['jasmine'],
-
-
-    // list of files / patterns to load in the browser
-    files: [
-      "test/fixture/config.js",
-      "static/components/angular/angular.js",
-      "static/components/angular-ui-router/release/angular-ui-router.min.js",
-      "static/components/angular-bootstrap/ui-bootstrap-tpls.min.js",
-      "static/components/angular-resource/angular-resource.js",
-      "static/components/angular-sanitize/angular-sanitize.js",
-      "static/components/angular-animate/angular-animate.min.js",
-      "static/components/lodash/dist/lodash.min.js",
-      "static/components/angularjs-toaster/toaster.js",
-      "static/components/json-formatter/dist/json-formatter.min.js.js",
-      "static/components/hello/dist/hello.min.js",
-      "static/components/jquery/dist/jquery.min.js",
-      "static/js/console/owner/OwnerRepository.js",
-      "static/js/**/*.js",
-      "static/partials/**/*.html",
-      "node_modules/angular-mocks/angular-mocks.js",
-	  "test/unit/**/*.js"
-    ],
-
-    junitReporter : {
-          outputFile: 'test_out/unit.xml',
-          suite: 'unit'
-    },
-
-    // list of files to exclude
-    exclude: [
-        "static/js/bootstrap.js",
-    ],
-
-
-    // preprocess matching files before serving them to the browser
-    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-      preprocessors: {
-          // source files, that you wanna generate coverage for
-          // do not include tests or libraries
-          // (these files will be instrumented by Istanbul)
-          'js/**/*.js': ['coverage'],
-          'static/partials/**/*.html': ['ng-html2js']
-      },
-
-      ngHtml2JsPreprocessor: {
-          stripPrefix: 'static/',
-          moduleName: 'templates'
-      },
-
-    // optionally, configure the reporter
-      coverageReporter: {
-          type : 'html',
-          dir : 'coverage/'
-      },
-
-    // test results reporter to use
-    // possible values: 'dots', 'progress'
-    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['progress', 'junit', 'coverage'],
-
-
-    // web server port
-    port: 9876,
-
-
-    // enable / disable colors in the output (reporters and logs)
-    colors: true,
-
-
-    // level of logging
-    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-    logLevel: config.LOG_INFO,
-
-
-    // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: false,
-
-
-    // start these browsers
-    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['ChromeHeadless'],
-
-
-    // Continuous Integration mode
-    // if true, Karma captures browsers, runs the tests and exits
-    singleRun: true
-  });
-};
diff --git a/hermes-console/package.json b/hermes-console/package.json
index 6d9980ff88..39a78a0357 100644
--- a/hermes-console/package.json
+++ b/hermes-console/package.json
@@ -1,31 +1,66 @@
 {
   "name": "hermes-console",
   "description": "Console for Hermes Management",
-  "repository": "https://github.com/allegro/hermes",
-  "main": "serve.js",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=20.0.0"
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "run-p type-check build-only",
+    "preview": "vite preview",
+    "test:unit": "vitest --silent --environment jsdom",
+    "build-only": "vite build",
+    "type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore",
+    "lint:fix": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "dev-server": "node json-server/server.ts"
+  },
   "dependencies": {
-    "bower": "^1.7.2",
-    "lodash": "^4.17.4",
-    "node-static": "^0.7.6",
-    "request": "^2.67.0",
-    "yargs": "^3.32.0"
+    "ace-builds": "1.33.0",
+    "axios": "1.6.8",
+    "base64-arraybuffer": "1.0.2",
+    "jwt-decode": "4.0.0",
+    "pinia": "2.1.7",
+    "pinia-plugin-persistedstate": "3.2.1",
+    "query-string": "9.0.0",
+    "uuid": "9.0.1",
+    "vue": "3.4.23",
+    "vue-i18n": "9.13.0",
+    "vue-router": "4.3.2",
+    "vue3-ace-editor": "2.2.4",
+    "vuetify": "3.5.16"
   },
   "devDependencies": {
-    "angular-mocks": "~1.4.7",
-    "grunt": "^0.4.5",
-    "grunt-cli": "~0.1.13",
-    "grunt-contrib-jshint": "0.11.3",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-karma": "~0.12.1",
-    "jasmine-core": "~2.1.3",
-    "karma": "^6.3.4",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-coverage": "^2.0.3",
-    "karma-jasmine": "^4.0.1",
-    "karma-junit-reporter": "^2.0.1",
-    "karma-ng-html2js-preprocessor": "^1.0.0",
-    "karma-requirejs": "^1.1.0",
-    "phantomjs": "~1.9.18"
+    "@mdi/font": "7.4.47",
+    "@pinia/testing": "0.1.3",
+    "@rushstack/eslint-patch": "1.10.2",
+    "@testing-library/jest-dom": "6.4.2",
+    "@testing-library/user-event": "14.5.2",
+    "@testing-library/vue": "8.0.3",
+    "@types/jsdom": "21.1.6",
+    "@types/node": "20.12.7",
+    "@types/uuid": "9.0.8",
+    "@vitejs/plugin-vue": "5.0.4",
+    "@vue/eslint-config-prettier": "9.0.0",
+    "@vue/eslint-config-typescript": "13.0.0",
+    "@vue/test-utils": "2.4.5",
+    "@vue/tsconfig": "0.1.3",
+    "allure-commandline": "2.30.0",
+    "allure-vitest": "2.15.1",
+    "eslint": "8.57.0",
+    "eslint-plugin-sort-imports-es6-autofix": "0.6.0",
+    "eslint-plugin-vue": "9.25.0",
+    "jsdom": "24.0.0",
+    "json-server": "0.17.4",
+    "msw": "2.2.14",
+    "npm-run-all": "4.1.5",
+    "prettier": "3.2.5",
+    "sass": "1.75.0",
+    "typescript": "4.9.5",
+    "vite": "5.2.9",
+    "vite-plugin-vuetify": "2.0.3",
+    "vitest": "1.5.0",
+    "vue-tsc": "2.0.13"
   }
 }
diff --git a/hermes-console/package.sh b/hermes-console/package.sh
deleted file mode 100755
index fb6e08b3f7..0000000000
--- a/hermes-console/package.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-NAME=hermes-console
-
-if [ -z ${1+x} ]; then
-    ARCHIVE_NAME=hermes-console
-else
-    ARCHIVE_NAME=$1
-fi
-
-UNAME="$(uname -s)"
-case "${UNAME}" in
-    Darwin*)    DISTRO=darwin;;
-    *)          DISTRO=linux
-esac
-
-NODE_VERSION="v6.11.4"
-NODE_DIST="node-$NODE_VERSION-$DISTRO-x64"
-
-printf "Packaging Hermes Console\n"
-
-if [ ! -e dist ]; then
-    mkdir -p dist
-fi
-
-if [ ! -e dist/$NODE_DIST.tar.gz ]; then
-    printf "Downloading NodeJS distribution version $NODE_DIST\n"
-    wget --quiet --no-clobber "https://nodejs.org/dist/$NODE_VERSION/$NODE_DIST.tar.gz" --directory-prefix dist
-    mkdir -p dist/node
-    tar --extract --keep-old-files --strip 1 --file dist/$NODE_DIST.tar.gz -C dist/node
-fi
-
-export PATH=$(pwd)/dist/node/bin:$PATH
-
-printf "Running NPM and bower\n"
-
-npm install --production --yes
-node_modules/.bin/bower install --allow-root -F
-
-printf "Creating directory: dist/static\n"
-
-# copy static contents
-cp -r static dist
diff --git a/hermes-console-vue/public/favicon.ico b/hermes-console/public/favicon.ico
similarity index 100%
rename from hermes-console-vue/public/favicon.ico
rename to hermes-console/public/favicon.ico
diff --git a/hermes-console/run.sh b/hermes-console/run.sh
deleted file mode 100755
index ebf7ac6fcd..0000000000
--- a/hermes-console/run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export PATH=$(pwd)/node/bin:$PATH
-
-node serve.js "$@"
\ No newline at end of file
diff --git a/hermes-console/serve.js b/hermes-console/serve.js
deleted file mode 100755
index 079732eef7..0000000000
--- a/hermes-console/serve.js
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env node
-
-var static = require('node-static');
-
-var request = require('request');
-var fs = require('fs');
-
-var _ = require('lodash');
-
-var DEFAULT_CONFIG = './config_default.json';
-
-var yargs = require('yargs')
-    .env('HERMES_CONSOLE')
-    .option('p', {
-        alias: 'port',
-        default: 8000,
-        demand: true
-    })
-    .option('c', {
-        alias: 'config',
-        default: './config.json',
-        demand: true
-    })
-    .argv;
-
-var port = yargs.port;
-
-readConfiguration(yargs.config, startServer);
-
-function startServer(config) {
-    console.log('Starting Hermes Console at port: ' + port);
-    console.log('Config: ' + JSON.stringify(config, null, 2));
-
-    var file = new static.Server('./static');
-    require('http').createServer((request, response) => {
-        response.setHeader('Pragma', 'no-cache');
-        if(request.url == '/console') {
-            response.setHeader('Content-Type', 'application/json');
-            response.end('var config = ' + JSON.stringify(config) + ';', 'UTF-8');
-        }
-        else if(request.url == '/status/ping') {
-            response.end('pong', 'UTF-8');
-        }
-        else {
-            request.addListener('end', function () {
-                file.serve(request, response);
-            }).resume();
-        }
-    }).listen(port);
-}
-
-function readConfiguration(source, callback) {
-    console.log('Reading default configuration from file: ' + DEFAULT_CONFIG);
-    var defaultConfig = JSON.parse(fs.readFileSync(DEFAULT_CONFIG, 'utf8'));
-
-    if (source.indexOf('htt') === 0) {
-        console.log('Reading configuration from remote source: ' + source);
-        request.get(source, (error, res, body) => { callback(mergeConfig(defaultConfig, JSON.parse(body))); });
-    }
-    else {
-        console.log('Reading configuration from file: ' + source);
-        var config = JSON.parse(fs.readFileSync(source, 'utf8'));
-        callback(mergeConfig(defaultConfig, config));
-    }
-}
-
-function mergeConfig(defaultConfig, config) {
-    return _.mergeWith(defaultConfig, config, customizer)
-}
-
-function customizer(objValue, srcValue) {
-    if (_.isArray(objValue)) {
-        return srcValue
-    }
-}
\ No newline at end of file
diff --git a/hermes-console-vue/src/App.vue b/hermes-console/src/App.vue
similarity index 100%
rename from hermes-console-vue/src/App.vue
rename to hermes-console/src/App.vue
diff --git a/hermes-console-vue/src/api/OffsetRetransmissionDate.ts b/hermes-console/src/api/OffsetRetransmissionDate.ts
similarity index 100%
rename from hermes-console-vue/src/api/OffsetRetransmissionDate.ts
rename to hermes-console/src/api/OffsetRetransmissionDate.ts
diff --git a/hermes-console-vue/src/api/access-token-response.ts b/hermes-console/src/api/access-token-response.ts
similarity index 100%
rename from hermes-console-vue/src/api/access-token-response.ts
rename to hermes-console/src/api/access-token-response.ts
diff --git a/hermes-console-vue/src/api/app-configuration.ts b/hermes-console/src/api/app-configuration.ts
similarity index 93%
rename from hermes-console-vue/src/api/app-configuration.ts
rename to hermes-console/src/api/app-configuration.ts
index 72924a90ee..e1eb50b32f 100644
--- a/hermes-console-vue/src/api/app-configuration.ts
+++ b/hermes-console/src/api/app-configuration.ts
@@ -9,6 +9,7 @@ export interface AppConfiguration {
   subscription: SubscriptionViewConfiguration;
   consistency: ConsistencyViewConfiguration;
   group: GroupViewConfiguration;
+  costs: CostsConfiguration;
 }
 
 export interface ConsoleConfiguration {
@@ -153,3 +154,12 @@ export interface ConsistencyViewConfiguration {
 export interface GroupViewConfiguration {
   nonAdminCreationEnabled: boolean;
 }
+
+export interface CostsConfiguration {
+  enabled: boolean;
+  globalDetailsUrl: string;
+  topicIframeUrl: string;
+  topicDetailsUrl: string;
+  subscriptionIframeUrl: string;
+  subscriptionDetailsUrl: string;
+}
diff --git a/hermes-console-vue/src/api/constraints.ts b/hermes-console/src/api/constraints.ts
similarity index 100%
rename from hermes-console-vue/src/api/constraints.ts
rename to hermes-console/src/api/constraints.ts
diff --git a/hermes-console-vue/src/api/consumer-group.ts b/hermes-console/src/api/consumer-group.ts
similarity index 100%
rename from hermes-console-vue/src/api/consumer-group.ts
rename to hermes-console/src/api/consumer-group.ts
diff --git a/hermes-console-vue/src/api/content-type.ts b/hermes-console/src/api/content-type.ts
similarity index 100%
rename from hermes-console-vue/src/api/content-type.ts
rename to hermes-console/src/api/content-type.ts
diff --git a/hermes-console-vue/src/api/datacenter-readiness.ts b/hermes-console/src/api/datacenter-readiness.ts
similarity index 70%
rename from hermes-console-vue/src/api/datacenter-readiness.ts
rename to hermes-console/src/api/datacenter-readiness.ts
index e6acf35caa..cedad9c849 100644
--- a/hermes-console-vue/src/api/datacenter-readiness.ts
+++ b/hermes-console/src/api/datacenter-readiness.ts
@@ -1,6 +1,6 @@
 export interface DatacenterReadiness {
   datacenter: string;
-  status: 'READY' | 'NOT_READY' | 'UNDEFINED';
+  status: 'READY' | 'NOT_READY';
 }
 
 export interface Readiness {
diff --git a/hermes-console-vue/src/api/group.ts b/hermes-console/src/api/group.ts
similarity index 100%
rename from hermes-console-vue/src/api/group.ts
rename to hermes-console/src/api/group.ts
diff --git a/hermes-console-vue/src/api/hermes-client/index.ts b/hermes-console/src/api/hermes-client/index.ts
similarity index 93%
rename from hermes-console-vue/src/api/hermes-client/index.ts
rename to hermes-console/src/api/hermes-client/index.ts
index 4c4f6f89a4..23b7ca55ef 100644
--- a/hermes-console-vue/src/api/hermes-client/index.ts
+++ b/hermes-console/src/api/hermes-client/index.ts
@@ -464,3 +464,45 @@ export function verifyFilters(
     },
   );
 }
+
+export function syncGroup(
+  groupName: string,
+  primaryDatacenter: string,
+): ResponsePromise<void> {
+  return axios.post<void>(`/consistency/sync/groups/${groupName}`, null, {
+    params: {
+      primaryDatacenter: primaryDatacenter,
+    },
+  });
+}
+
+export function syncTopic(
+  topicQualifiedName: string,
+  primaryDatacenter: string,
+): ResponsePromise<void> {
+  return axios.post<void>(
+    `/consistency/sync/topics/${topicQualifiedName}`,
+    null,
+    {
+      params: {
+        primaryDatacenter: primaryDatacenter,
+      },
+    },
+  );
+}
+
+export function syncSubscription(
+  topicQualifiedName: string,
+  subscriptionName: string,
+  primaryDatacenter: string,
+): ResponsePromise<void> {
+  return axios.post<void>(
+    `/consistency/sync/topics/${topicQualifiedName}/subscriptions/${subscriptionName}`,
+    null,
+    {
+      params: {
+        primaryDatacenter: primaryDatacenter,
+      },
+    },
+  );
+}
diff --git a/hermes-console-vue/src/api/inconsistent-group.ts b/hermes-console/src/api/inconsistent-group.ts
similarity index 93%
rename from hermes-console-vue/src/api/inconsistent-group.ts
rename to hermes-console/src/api/inconsistent-group.ts
index 7ee039677b..7f27d1d4f1 100644
--- a/hermes-console-vue/src/api/inconsistent-group.ts
+++ b/hermes-console/src/api/inconsistent-group.ts
@@ -17,5 +17,5 @@ export interface InconsistentSubscription {
 
 export interface InconsistentMedata {
   datacenter: string;
-  content: string | undefined;
+  content?: string;
 }
diff --git a/hermes-console-vue/src/api/message-filters-verification.ts b/hermes-console/src/api/message-filters-verification.ts
similarity index 100%
rename from hermes-console-vue/src/api/message-filters-verification.ts
rename to hermes-console/src/api/message-filters-verification.ts
diff --git a/hermes-console-vue/src/api/offline-clients-source.ts b/hermes-console/src/api/offline-clients-source.ts
similarity index 100%
rename from hermes-console-vue/src/api/offline-clients-source.ts
rename to hermes-console/src/api/offline-clients-source.ts
diff --git a/hermes-console-vue/src/api/offline-retransmission.ts b/hermes-console/src/api/offline-retransmission.ts
similarity index 100%
rename from hermes-console-vue/src/api/offline-retransmission.ts
rename to hermes-console/src/api/offline-retransmission.ts
diff --git a/hermes-console-vue/src/api/owner-id.ts b/hermes-console/src/api/owner-id.ts
similarity index 100%
rename from hermes-console-vue/src/api/owner-id.ts
rename to hermes-console/src/api/owner-id.ts
diff --git a/hermes-console-vue/src/api/owner.ts b/hermes-console/src/api/owner.ts
similarity index 100%
rename from hermes-console-vue/src/api/owner.ts
rename to hermes-console/src/api/owner.ts
diff --git a/hermes-console-vue/src/api/role.ts b/hermes-console/src/api/role.ts
similarity index 100%
rename from hermes-console-vue/src/api/role.ts
rename to hermes-console/src/api/role.ts
diff --git a/hermes-console-vue/src/api/stats.ts b/hermes-console/src/api/stats.ts
similarity index 100%
rename from hermes-console-vue/src/api/stats.ts
rename to hermes-console/src/api/stats.ts
diff --git a/hermes-console-vue/src/api/subscription-health.ts b/hermes-console/src/api/subscription-health.ts
similarity index 100%
rename from hermes-console-vue/src/api/subscription-health.ts
rename to hermes-console/src/api/subscription-health.ts
diff --git a/hermes-console-vue/src/api/subscription-metrics.ts b/hermes-console/src/api/subscription-metrics.ts
similarity index 93%
rename from hermes-console-vue/src/api/subscription-metrics.ts
rename to hermes-console/src/api/subscription-metrics.ts
index 13fec3351d..6a0b5fe737 100644
--- a/hermes-console-vue/src/api/subscription-metrics.ts
+++ b/hermes-console/src/api/subscription-metrics.ts
@@ -7,6 +7,7 @@ export interface SubscriptionMetrics {
   codes2xx: string;
   codes4xx: string;
   codes5xx: string;
+  retries: string;
   lag: string;
   rate: string;
   throughput: string;
diff --git a/hermes-console-vue/src/api/subscription-undelivered.ts b/hermes-console/src/api/subscription-undelivered.ts
similarity index 100%
rename from hermes-console-vue/src/api/subscription-undelivered.ts
rename to hermes-console/src/api/subscription-undelivered.ts
diff --git a/hermes-console-vue/src/api/subscription.ts b/hermes-console/src/api/subscription.ts
similarity index 98%
rename from hermes-console-vue/src/api/subscription.ts
rename to hermes-console/src/api/subscription.ts
index cf892a3006..3df41b4e79 100644
--- a/hermes-console-vue/src/api/subscription.ts
+++ b/hermes-console/src/api/subscription.ts
@@ -83,7 +83,7 @@ export interface CreateSubscriptionFormRequestBody {
   contentType: string;
   deliveryType: string;
   description: string;
-  endpoint: string;
+  endpoint?: string;
   filters: SubscriptionFilterJson[];
   headers: SubscriptionHeaderJson[];
   http2Enabled: boolean;
@@ -128,6 +128,7 @@ export interface SerialSubscriptionPolicyJson {
   backoffMultiplier: number;
   messageBackoff: number;
   messageTtl: number;
+  inflightSize: number;
   rate: number;
   requestTimeout: number;
   sendingDelay: number;
diff --git a/hermes-console-vue/src/api/topic.ts b/hermes-console/src/api/topic.ts
similarity index 100%
rename from hermes-console-vue/src/api/topic.ts
rename to hermes-console/src/api/topic.ts
diff --git a/hermes-console-vue/src/assets/hermes-logo-dark-theme.png b/hermes-console/src/assets/hermes-logo-dark-theme.png
similarity index 100%
rename from hermes-console-vue/src/assets/hermes-logo-dark-theme.png
rename to hermes-console/src/assets/hermes-logo-dark-theme.png
diff --git a/hermes-console-vue/src/assets/hermes-logo-full-dark-theme.png b/hermes-console/src/assets/hermes-logo-full-dark-theme.png
similarity index 100%
rename from hermes-console-vue/src/assets/hermes-logo-full-dark-theme.png
rename to hermes-console/src/assets/hermes-logo-full-dark-theme.png
diff --git a/hermes-console-vue/src/assets/hermes-logo-full.png b/hermes-console/src/assets/hermes-logo-full.png
similarity index 100%
rename from hermes-console-vue/src/assets/hermes-logo-full.png
rename to hermes-console/src/assets/hermes-logo-full.png
diff --git a/hermes-console-vue/src/assets/hermes-logo-header-dark-theme.png b/hermes-console/src/assets/hermes-logo-header-dark-theme.png
similarity index 100%
rename from hermes-console-vue/src/assets/hermes-logo-header-dark-theme.png
rename to hermes-console/src/assets/hermes-logo-header-dark-theme.png
diff --git a/hermes-console-vue/src/assets/hermes-logo-header.png b/hermes-console/src/assets/hermes-logo-header.png
similarity index 100%
rename from hermes-console-vue/src/assets/hermes-logo-header.png
rename to hermes-console/src/assets/hermes-logo-header.png
diff --git a/hermes-console-vue/src/assets/hermes-logo.png b/hermes-console/src/assets/hermes-logo.png
similarity index 100%
rename from hermes-console-vue/src/assets/hermes-logo.png
rename to hermes-console/src/assets/hermes-logo.png
diff --git a/hermes-console-vue/src/components/ace-editor/AceEditor.vue b/hermes-console/src/components/ace-editor/AceEditor.vue
similarity index 100%
rename from hermes-console-vue/src/components/ace-editor/AceEditor.vue
rename to hermes-console/src/components/ace-editor/AceEditor.vue
diff --git a/hermes-console-vue/src/components/ace-editor/ace-config.ts b/hermes-console/src/components/ace-editor/ace-config.ts
similarity index 100%
rename from hermes-console-vue/src/components/ace-editor/ace-config.ts
rename to hermes-console/src/components/ace-editor/ace-config.ts
diff --git a/hermes-console-vue/src/components/app-notification/AppNotification.vue b/hermes-console/src/components/app-notification/AppNotification.vue
similarity index 100%
rename from hermes-console-vue/src/components/app-notification/AppNotification.vue
rename to hermes-console/src/components/app-notification/AppNotification.vue
diff --git a/hermes-console-vue/src/components/app-notification/AppNotificationProvider.vue b/hermes-console/src/components/app-notification/AppNotificationProvider.vue
similarity index 100%
rename from hermes-console-vue/src/components/app-notification/AppNotificationProvider.vue
rename to hermes-console/src/components/app-notification/AppNotificationProvider.vue
diff --git a/hermes-console-vue/src/components/confirmation-dialog/ConfirmationDialog.spec.ts b/hermes-console/src/components/confirmation-dialog/ConfirmationDialog.spec.ts
similarity index 92%
rename from hermes-console-vue/src/components/confirmation-dialog/ConfirmationDialog.spec.ts
rename to hermes-console/src/components/confirmation-dialog/ConfirmationDialog.spec.ts
index 5ac517f014..b32945bdf5 100644
--- a/hermes-console-vue/src/components/confirmation-dialog/ConfirmationDialog.spec.ts
+++ b/hermes-console/src/components/confirmation-dialog/ConfirmationDialog.spec.ts
@@ -126,20 +126,20 @@ describe('ConfirmationDialog', () => {
     ).toBeEnabled();
 
     //when
-    await userEvent.type(getAllByRole('textbox')[1], 'not matching text');
+    await userEvent.type(getAllByRole('textbox')[0], 'not matching text');
 
     //then
-    expect(getAllByRole('textbox')[1]).toHaveValue('not matching text');
+    expect(getAllByRole('textbox')[0]).toHaveValue('not matching text');
     expect(
       getByText('confirmationDialog.confirm').closest('button'),
     ).toBeDisabled();
 
     //when
-    await userEvent.clear(getAllByRole('textbox')[1]);
-    await userEvent.type(getAllByRole('textbox')[1], 'prod');
+    await userEvent.clear(getAllByRole('textbox')[0]);
+    await userEvent.type(getAllByRole('textbox')[0], 'prod');
 
     //then
-    expect(getAllByRole('textbox')[1]).toHaveValue('prod');
+    expect(getAllByRole('textbox')[0]).toHaveValue('prod');
     expect(
       getByText('confirmationDialog.confirm').closest('button'),
     ).toBeEnabled();
diff --git a/hermes-console-vue/src/components/confirmation-dialog/ConfirmationDialog.vue b/hermes-console/src/components/confirmation-dialog/ConfirmationDialog.vue
similarity index 100%
rename from hermes-console-vue/src/components/confirmation-dialog/ConfirmationDialog.vue
rename to hermes-console/src/components/confirmation-dialog/ConfirmationDialog.vue
diff --git a/hermes-console-vue/src/components/console-alert/ConsoleAlert.vue b/hermes-console/src/components/console-alert/ConsoleAlert.vue
similarity index 66%
rename from hermes-console-vue/src/components/console-alert/ConsoleAlert.vue
rename to hermes-console/src/components/console-alert/ConsoleAlert.vue
index 98ab23e19e..8b71ad7936 100644
--- a/hermes-console-vue/src/components/console-alert/ConsoleAlert.vue
+++ b/hermes-console/src/components/console-alert/ConsoleAlert.vue
@@ -4,6 +4,8 @@
     title?: string;
     text: string;
     type: 'error' | 'success' | 'warning' | 'info';
+    link?: string;
+    linkDescription?: string;
   }>();
 </script>
 
@@ -15,7 +17,14 @@
     :type="props.type"
     border="start"
     :icon="icon ?? `\$${type}`"
-  ></v-alert>
+  >
+    <a
+      v-if="link != null && linkDescription != null"
+      :href="link"
+      target="_blank"
+      >{{ linkDescription }}</a
+    >
+  </v-alert>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/hermes-console-vue/src/components/console-footer/ConsoleFooter.spec.ts b/hermes-console/src/components/console-footer/ConsoleFooter.spec.ts
similarity index 100%
rename from hermes-console-vue/src/components/console-footer/ConsoleFooter.spec.ts
rename to hermes-console/src/components/console-footer/ConsoleFooter.spec.ts
diff --git a/hermes-console-vue/src/components/console-footer/ConsoleFooter.vue b/hermes-console/src/components/console-footer/ConsoleFooter.vue
similarity index 100%
rename from hermes-console-vue/src/components/console-footer/ConsoleFooter.vue
rename to hermes-console/src/components/console-footer/ConsoleFooter.vue
diff --git a/hermes-console-vue/src/components/console-header/ConsoleHeader.spec.ts b/hermes-console/src/components/console-header/ConsoleHeader.spec.ts
similarity index 100%
rename from hermes-console-vue/src/components/console-header/ConsoleHeader.spec.ts
rename to hermes-console/src/components/console-header/ConsoleHeader.spec.ts
diff --git a/hermes-console-vue/src/components/console-header/ConsoleHeader.vue b/hermes-console/src/components/console-header/ConsoleHeader.vue
similarity index 100%
rename from hermes-console-vue/src/components/console-header/ConsoleHeader.vue
rename to hermes-console/src/components/console-header/ConsoleHeader.vue
diff --git a/hermes-console/src/components/costs-card/CostsCard.spec.ts b/hermes-console/src/components/costs-card/CostsCard.spec.ts
new file mode 100644
index 0000000000..15174af94e
--- /dev/null
+++ b/hermes-console/src/components/costs-card/CostsCard.spec.ts
@@ -0,0 +1,30 @@
+import { describe } from 'vitest';
+import { render } from '@/utils/test-utils';
+import CostsCard from '@/components/costs-card/CostsCard.vue';
+
+describe('CostsCard', () => {
+  const props = {
+    iframeUrl:
+      'https://www.openstreetmap.org/export/embed.html?bbox=-0.004017949104309083%2C51.47612752641776%2C0.00030577182769775396%2C51.478569861898606&layer=mapnik',
+    detailsUrl: 'https://www.openstreetmap.org',
+  };
+
+  it('should render title properly', () => {
+    // when
+    const { getByText } = render(CostsCard, { props });
+
+    // then
+    const row = getByText('costsCard.title');
+    expect(row).toBeVisible();
+  });
+
+  it('should render iframe properly', async () => {
+    // when
+    const { container } = render(CostsCard, { props });
+    const element = container.querySelector('iframe')!!;
+
+    // then
+    expect(element).toBeVisible();
+    expect(element).toHaveAttribute('src', props.iframeUrl);
+  });
+});
diff --git a/hermes-console/src/components/costs-card/CostsCard.vue b/hermes-console/src/components/costs-card/CostsCard.vue
new file mode 100644
index 0000000000..0526ba9d62
--- /dev/null
+++ b/hermes-console/src/components/costs-card/CostsCard.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+  const props = defineProps<{
+    iframeUrl: string;
+    detailsUrl: string;
+  }>();
+</script>
+
+<template>
+  <v-card>
+    <template #title>
+      <div class="d-flex justify-space-between">
+        <p class="font-weight-bold">
+          {{ $t('costsCard.title') }}
+        </p>
+        <v-card-actions>
+          <v-btn
+            class="text-none"
+            prepend-icon="mdi-open-in-new"
+            target="_blank"
+            :href="detailsUrl"
+          >
+            {{ $t('costsCard.detailsButton') }}
+          </v-btn>
+        </v-card-actions>
+      </div>
+    </template>
+    <v-card-item>
+      <iframe
+        height="100%"
+        style="border: none"
+        width="100%"
+        :src="props.iframeUrl"
+      />
+    </v-card-item>
+  </v-card>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/hermes-console-vue/src/components/environment-badge/EnviromentBadge.spec.ts b/hermes-console/src/components/environment-badge/EnviromentBadge.spec.ts
similarity index 100%
rename from hermes-console-vue/src/components/environment-badge/EnviromentBadge.spec.ts
rename to hermes-console/src/components/environment-badge/EnviromentBadge.spec.ts
diff --git a/hermes-console-vue/src/components/environment-badge/EnviromentBadge.vue b/hermes-console/src/components/environment-badge/EnviromentBadge.vue
similarity index 100%
rename from hermes-console-vue/src/components/environment-badge/EnviromentBadge.vue
rename to hermes-console/src/components/environment-badge/EnviromentBadge.vue
diff --git a/hermes-console-vue/src/components/key-value-card/KeyValueCard.spec.ts b/hermes-console/src/components/key-value-card/KeyValueCard.spec.ts
similarity index 100%
rename from hermes-console-vue/src/components/key-value-card/KeyValueCard.spec.ts
rename to hermes-console/src/components/key-value-card/KeyValueCard.spec.ts
diff --git a/hermes-console-vue/src/components/key-value-card/KeyValueCard.vue b/hermes-console/src/components/key-value-card/KeyValueCard.vue
similarity index 100%
rename from hermes-console-vue/src/components/key-value-card/KeyValueCard.vue
rename to hermes-console/src/components/key-value-card/KeyValueCard.vue
diff --git a/hermes-console-vue/src/components/key-value-card/key-value-card-item/KeyValueCardItem.spec.ts b/hermes-console/src/components/key-value-card/key-value-card-item/KeyValueCardItem.spec.ts
similarity index 100%
rename from hermes-console-vue/src/components/key-value-card/key-value-card-item/KeyValueCardItem.spec.ts
rename to hermes-console/src/components/key-value-card/key-value-card-item/KeyValueCardItem.spec.ts
diff --git a/hermes-console-vue/src/components/key-value-card/key-value-card-item/KeyValueCardItem.vue b/hermes-console/src/components/key-value-card/key-value-card-item/KeyValueCardItem.vue
similarity index 100%
rename from hermes-console-vue/src/components/key-value-card/key-value-card-item/KeyValueCardItem.vue
rename to hermes-console/src/components/key-value-card/key-value-card-item/KeyValueCardItem.vue
diff --git a/hermes-console-vue/src/components/loading-spinner/LoadingSpinner.vue b/hermes-console/src/components/loading-spinner/LoadingSpinner.vue
similarity index 100%
rename from hermes-console-vue/src/components/loading-spinner/LoadingSpinner.vue
rename to hermes-console/src/components/loading-spinner/LoadingSpinner.vue
diff --git a/hermes-console-vue/src/components/select-field/SelectField.vue b/hermes-console/src/components/select-field/SelectField.vue
similarity index 100%
rename from hermes-console-vue/src/components/select-field/SelectField.vue
rename to hermes-console/src/components/select-field/SelectField.vue
diff --git a/hermes-console-vue/src/components/select-field/types.ts b/hermes-console/src/components/select-field/types.ts
similarity index 100%
rename from hermes-console-vue/src/components/select-field/types.ts
rename to hermes-console/src/components/select-field/types.ts
diff --git a/hermes-console-vue/src/components/text-field/TextField.vue b/hermes-console/src/components/text-field/TextField.vue
similarity index 100%
rename from hermes-console-vue/src/components/text-field/TextField.vue
rename to hermes-console/src/components/text-field/TextField.vue
diff --git a/hermes-console-vue/src/components/theme-switch/ThemeSwitch.spec.ts b/hermes-console/src/components/theme-switch/ThemeSwitch.spec.ts
similarity index 100%
rename from hermes-console-vue/src/components/theme-switch/ThemeSwitch.spec.ts
rename to hermes-console/src/components/theme-switch/ThemeSwitch.spec.ts
diff --git a/hermes-console-vue/src/components/theme-switch/ThemeSwitch.vue b/hermes-console/src/components/theme-switch/ThemeSwitch.vue
similarity index 100%
rename from hermes-console-vue/src/components/theme-switch/ThemeSwitch.vue
rename to hermes-console/src/components/theme-switch/ThemeSwitch.vue
diff --git a/hermes-console-vue/src/components/tooltip-icon/TooltipIcon.vue b/hermes-console/src/components/tooltip-icon/TooltipIcon.vue
similarity index 100%
rename from hermes-console-vue/src/components/tooltip-icon/TooltipIcon.vue
rename to hermes-console/src/components/tooltip-icon/TooltipIcon.vue
diff --git a/hermes-console-vue/src/composables/constraints/use-constraints/useConstraints.spec.ts b/hermes-console/src/composables/constraints/use-constraints/useConstraints.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/constraints/use-constraints/useConstraints.spec.ts
rename to hermes-console/src/composables/constraints/use-constraints/useConstraints.spec.ts
diff --git a/hermes-console-vue/src/composables/constraints/use-constraints/useConstraints.ts b/hermes-console/src/composables/constraints/use-constraints/useConstraints.ts
similarity index 100%
rename from hermes-console-vue/src/composables/constraints/use-constraints/useConstraints.ts
rename to hermes-console/src/composables/constraints/use-constraints/useConstraints.ts
diff --git a/hermes-console-vue/src/composables/consumer-groups/use-consumer-groups/useConsumerGroups.spec.ts b/hermes-console/src/composables/consumer-groups/use-consumer-groups/useConsumerGroups.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/consumer-groups/use-consumer-groups/useConsumerGroups.spec.ts
rename to hermes-console/src/composables/consumer-groups/use-consumer-groups/useConsumerGroups.spec.ts
diff --git a/hermes-console-vue/src/composables/consumer-groups/use-consumer-groups/useConsumerGroups.ts b/hermes-console/src/composables/consumer-groups/use-consumer-groups/useConsumerGroups.ts
similarity index 100%
rename from hermes-console-vue/src/composables/consumer-groups/use-consumer-groups/useConsumerGroups.ts
rename to hermes-console/src/composables/consumer-groups/use-consumer-groups/useConsumerGroups.ts
diff --git a/hermes-console-vue/src/composables/dialog/use-dialog/useDialog.ts b/hermes-console/src/composables/dialog/use-dialog/useDialog.ts
similarity index 100%
rename from hermes-console-vue/src/composables/dialog/use-dialog/useDialog.ts
rename to hermes-console/src/composables/dialog/use-dialog/useDialog.ts
diff --git a/hermes-console-vue/src/composables/groups/use-groups/useGroups.spec.ts b/hermes-console/src/composables/groups/use-groups/useGroups.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/groups/use-groups/useGroups.spec.ts
rename to hermes-console/src/composables/groups/use-groups/useGroups.spec.ts
diff --git a/hermes-console-vue/src/composables/groups/use-groups/useGroups.ts b/hermes-console/src/composables/groups/use-groups/useGroups.ts
similarity index 100%
rename from hermes-console-vue/src/composables/groups/use-groups/useGroups.ts
rename to hermes-console/src/composables/groups/use-groups/useGroups.ts
diff --git a/hermes-console-vue/src/composables/inconsistent-topics/use-inconsistent-topics/useInconsistentTopics.spec.ts b/hermes-console/src/composables/inconsistent-topics/use-inconsistent-topics/useInconsistentTopics.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/inconsistent-topics/use-inconsistent-topics/useInconsistentTopics.spec.ts
rename to hermes-console/src/composables/inconsistent-topics/use-inconsistent-topics/useInconsistentTopics.spec.ts
diff --git a/hermes-console-vue/src/composables/inconsistent-topics/use-inconsistent-topics/useInconsistentTopics.ts b/hermes-console/src/composables/inconsistent-topics/use-inconsistent-topics/useInconsistentTopics.ts
similarity index 100%
rename from hermes-console-vue/src/composables/inconsistent-topics/use-inconsistent-topics/useInconsistentTopics.ts
rename to hermes-console/src/composables/inconsistent-topics/use-inconsistent-topics/useInconsistentTopics.ts
diff --git a/hermes-console-vue/src/composables/metrics/use-metrics/useMetrics.spec.ts b/hermes-console/src/composables/metrics/use-metrics/useMetrics.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/metrics/use-metrics/useMetrics.spec.ts
rename to hermes-console/src/composables/metrics/use-metrics/useMetrics.spec.ts
diff --git a/hermes-console-vue/src/composables/metrics/use-metrics/useMetrics.ts b/hermes-console/src/composables/metrics/use-metrics/useMetrics.ts
similarity index 100%
rename from hermes-console-vue/src/composables/metrics/use-metrics/useMetrics.ts
rename to hermes-console/src/composables/metrics/use-metrics/useMetrics.ts
diff --git a/hermes-console-vue/src/composables/readiness/use-readiness/useReadiness.spec.ts b/hermes-console/src/composables/readiness/use-readiness/useReadiness.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/readiness/use-readiness/useReadiness.spec.ts
rename to hermes-console/src/composables/readiness/use-readiness/useReadiness.spec.ts
diff --git a/hermes-console-vue/src/composables/readiness/use-readiness/useReadiness.ts b/hermes-console/src/composables/readiness/use-readiness/useReadiness.ts
similarity index 100%
rename from hermes-console-vue/src/composables/readiness/use-readiness/useReadiness.ts
rename to hermes-console/src/composables/readiness/use-readiness/useReadiness.ts
diff --git a/hermes-console-vue/src/composables/roles/use-roles/useRoles.spec.ts b/hermes-console/src/composables/roles/use-roles/useRoles.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/roles/use-roles/useRoles.spec.ts
rename to hermes-console/src/composables/roles/use-roles/useRoles.spec.ts
diff --git a/hermes-console-vue/src/composables/roles/use-roles/useRoles.ts b/hermes-console/src/composables/roles/use-roles/useRoles.ts
similarity index 100%
rename from hermes-console-vue/src/composables/roles/use-roles/useRoles.ts
rename to hermes-console/src/composables/roles/use-roles/useRoles.ts
diff --git a/hermes-console-vue/src/composables/search/useSearch.spec.ts b/hermes-console/src/composables/search/useSearch.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/search/useSearch.spec.ts
rename to hermes-console/src/composables/search/useSearch.spec.ts
diff --git a/hermes-console-vue/src/composables/search/useSearch.ts b/hermes-console/src/composables/search/useSearch.ts
similarity index 100%
rename from hermes-console-vue/src/composables/search/useSearch.ts
rename to hermes-console/src/composables/search/useSearch.ts
diff --git a/hermes-console-vue/src/composables/stats/use-stats/useStats.spec.ts b/hermes-console/src/composables/stats/use-stats/useStats.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/stats/use-stats/useStats.spec.ts
rename to hermes-console/src/composables/stats/use-stats/useStats.spec.ts
diff --git a/hermes-console-vue/src/composables/stats/use-stats/useStats.ts b/hermes-console/src/composables/stats/use-stats/useStats.ts
similarity index 100%
rename from hermes-console-vue/src/composables/stats/use-stats/useStats.ts
rename to hermes-console/src/composables/stats/use-stats/useStats.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-create-subscription/types.ts b/hermes-console/src/composables/subscription/use-create-subscription/types.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-create-subscription/types.ts
rename to hermes-console/src/composables/subscription/use-create-subscription/types.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-create-subscription/useCreateSubscription.spec.ts b/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-create-subscription/useCreateSubscription.spec.ts
rename to hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.spec.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-create-subscription/useCreateSubscription.ts b/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
similarity index 98%
rename from hermes-console-vue/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
rename to hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
index 2a616c680c..832c014aab 100644
--- a/hermes-console-vue/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
+++ b/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
@@ -126,8 +126,10 @@ function initializeForm(
       inflightMessageTTL:
         loadedConfig.value.subscription.defaults.subscriptionPolicy
           .messageTtl || 3600,
+      inflightMessagesCount: null,
       retryBackoff: 1000,
       retryBackoffMultiplier: 1.0,
+      backoffMaxIntervalInSec: 600,
       sendingDelay: 0,
       requestTimeout:
         loadedConfig.value.subscription.defaults.subscriptionPolicy
diff --git a/hermes-console-vue/src/composables/subscription/use-edit-subscription/types.ts b/hermes-console/src/composables/subscription/use-edit-subscription/types.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-edit-subscription/types.ts
rename to hermes-console/src/composables/subscription/use-edit-subscription/types.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-edit-subscription/useEditSubscription.spec.ts b/hermes-console/src/composables/subscription/use-edit-subscription/useEditSubscription.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-edit-subscription/useEditSubscription.spec.ts
rename to hermes-console/src/composables/subscription/use-edit-subscription/useEditSubscription.spec.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-edit-subscription/useEditSubscription.ts b/hermes-console/src/composables/subscription/use-edit-subscription/useEditSubscription.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-edit-subscription/useEditSubscription.ts
rename to hermes-console/src/composables/subscription/use-edit-subscription/useEditSubscription.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-form-subscription/form-mapper.ts b/hermes-console/src/composables/subscription/use-form-subscription/form-mapper.ts
similarity index 87%
rename from hermes-console-vue/src/composables/subscription/use-form-subscription/form-mapper.ts
rename to hermes-console/src/composables/subscription/use-form-subscription/form-mapper.ts
index 9ef05c62e1..f4aa8cfa75 100644
--- a/hermes-console-vue/src/composables/subscription/use-form-subscription/form-mapper.ts
+++ b/hermes-console/src/composables/subscription/use-form-subscription/form-mapper.ts
@@ -20,7 +20,7 @@ export function parseFormToRequestBody(
   const headerFilters = form.headerFilters.map((filter: HeaderFilter) =>
     mapHeaderFilter(filter),
   );
-  return {
+  const parsedForm: CreateSubscriptionFormRequestBody = {
     name: form.name,
     topicName: topic,
     owner: {
@@ -45,6 +45,17 @@ export function parseFormToRequestBody(
     subscriptionIdentityHeadersEnabled: form.attachSubscriptionIdentityHeaders,
     autoDeleteWithTopicEnabled: form.deleteSubscriptionAutomatically,
   };
+
+  if (isEndpointAnonymized(form.endpoint)) {
+    delete parsedForm.endpoint;
+  }
+
+  return parsedForm;
+}
+
+function isEndpointAnonymized(endpoint: string) {
+  const regexPattern: RegExp = /.*:([*]+)@.*/;
+  return regexPattern.test(endpoint);
 }
 
 function mapSubscriptionPolicy(form: SubscriptionForm): SubscriptionPolicyJson {
@@ -57,12 +68,17 @@ function mapSerialSubscriptionPolicy(
   form: SubscriptionForm,
 ): SerialSubscriptionPolicyJson {
   return {
-    backoffMaxIntervalInSec: 600,
+    backoffMaxIntervalInSec: parseFloat(
+      String(form.subscriptionPolicy.backoffMaxIntervalInSec),
+    ),
     backoffMultiplier: parseFloat(
       String(form.subscriptionPolicy.retryBackoffMultiplier),
     ),
     messageBackoff: parseFloat(String(form.subscriptionPolicy.retryBackoff)),
     messageTtl: parseFloat(String(form.subscriptionPolicy.inflightMessageTTL)),
+    inflightSize: parseFloat(
+      String(form.subscriptionPolicy.inflightMessagesCount),
+    ),
     rate: parseFloat(String(form.subscriptionPolicy.rateLimit!!)),
     requestTimeout: parseFloat(String(form.subscriptionPolicy.requestTimeout)),
     sendingDelay: parseFloat(String(form.subscriptionPolicy.sendingDelay)),
diff --git a/hermes-console-vue/src/composables/subscription/use-form-subscription/types.ts b/hermes-console/src/composables/subscription/use-form-subscription/types.ts
similarity index 94%
rename from hermes-console-vue/src/composables/subscription/use-form-subscription/types.ts
rename to hermes-console/src/composables/subscription/use-form-subscription/types.ts
index 3d21268760..3802629183 100644
--- a/hermes-console-vue/src/composables/subscription/use-form-subscription/types.ts
+++ b/hermes-console/src/composables/subscription/use-form-subscription/types.ts
@@ -38,9 +38,11 @@ export interface SubscriptionForm {
 export interface FormSubscriptionPolicy {
   rateLimit: number | null;
   inflightMessageTTL: number;
+  inflightMessagesCount: number | null;
   retryBackoff: number;
   sendingDelay: number;
   retryBackoffMultiplier: number;
+  backoffMaxIntervalInSec: number;
   requestTimeout: number;
   batchSize: number | null;
   batchTime: number | null;
@@ -68,8 +70,10 @@ export interface FormValidators {
   requestTimeout: FieldValidator<number>[];
   sendingDelay: FieldValidator<number>[];
   inflightMessageTTL: FieldValidator<number>[];
+  inflightMessagesCount: FieldValidator<number>[];
   retryBackoff: FieldValidator<number>[];
   retryBackoffMultiplier: FieldValidator<number>[];
+  backoffMaxIntervalInSec: FieldValidator<number>[];
   messageDeliveryTrackingMode: FieldValidator<string>[];
   monitoringSeverity: FieldValidator<string>[];
 }
diff --git a/hermes-console-vue/src/composables/subscription/use-form-subscription/useFormSubscription.spec.ts b/hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-form-subscription/useFormSubscription.spec.ts
rename to hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.spec.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-form-subscription/useFormSubscription.ts b/hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.ts
similarity index 96%
rename from hermes-console-vue/src/composables/subscription/use-form-subscription/useFormSubscription.ts
rename to hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.ts
index 865ab8ccdf..7c3104c694 100644
--- a/hermes-console-vue/src/composables/subscription/use-form-subscription/useFormSubscription.ts
+++ b/hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.ts
@@ -68,8 +68,10 @@ function formValidators(form: Ref<SubscriptionForm>): FormValidators {
     ],
     sendingDelay: [required(), min(0), max(5000)],
     inflightMessageTTL: [required(), min(0), max(7200)],
+    inflightMessagesCount: [min(1)],
     retryBackoff: [required(), min(0), max(1000000)],
     retryBackoffMultiplier: [required(), min(1), max(10)],
+    backoffMaxIntervalInSec: [required(), min(1), max(600)],
     messageDeliveryTrackingMode: [required()],
     monitoringSeverity: [required()],
   };
@@ -177,8 +179,10 @@ function createEmptyForm(): Ref<SubscriptionForm> {
     subscriptionPolicy: {
       rateLimit: null,
       inflightMessageTTL: 3600,
+      inflightMessagesCount: null,
       retryBackoff: 1000,
       retryBackoffMultiplier: 1.0,
+      backoffMaxIntervalInSec: 600,
       sendingDelay: 0,
       requestTimeout: 1000,
       batchSize: null,
@@ -220,11 +224,16 @@ export function initializeFullyFilledForm(
           ? subscription.subscriptionPolicy.rate
           : null,
       inflightMessageTTL: subscription.subscriptionPolicy.messageTtl,
+      inflightMessagesCount: subscription.subscriptionPolicy.inflightSize,
       retryBackoff: subscription.subscriptionPolicy.messageBackoff,
       retryBackoffMultiplier:
         subscription.deliveryType === DeliveryType.SERIAL
           ? subscription.subscriptionPolicy.backoffMultiplier
           : 1.0,
+      backoffMaxIntervalInSec:
+        subscription.deliveryType === DeliveryType.SERIAL
+          ? subscription.subscriptionPolicy.backoffMaxIntervalInSec
+          : 600,
       sendingDelay:
         subscription.deliveryType === DeliveryType.SERIAL
           ? subscription.subscriptionPolicy.sendingDelay
diff --git a/hermes-console-vue/src/composables/subscription/use-import-subscription/useImportSubscription.ts b/hermes-console/src/composables/subscription/use-import-subscription/useImportSubscription.ts
similarity index 96%
rename from hermes-console-vue/src/composables/subscription/use-import-subscription/useImportSubscription.ts
rename to hermes-console/src/composables/subscription/use-import-subscription/useImportSubscription.ts
index bb8904fe7a..3acffbb1ca 100644
--- a/hermes-console-vue/src/composables/subscription/use-import-subscription/useImportSubscription.ts
+++ b/hermes-console/src/composables/subscription/use-import-subscription/useImportSubscription.ts
@@ -22,8 +22,7 @@ export function useImportSubscription(): UseImportSubscription {
   ) {
     if (importedFile.value) {
       const reader = new FileReader();
-
-      reader.readAsText(importedFile.value[0]);
+      reader.readAsText(importedFile.value);
 
       reader.onload = function () {
         const subscription = JSON.parse(<string>reader.result);
diff --git a/hermes-console-vue/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.spec.ts b/hermes-console/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.spec.ts
rename to hermes-console/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.spec.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.ts b/hermes-console/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.ts
similarity index 89%
rename from hermes-console-vue/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.ts
rename to hermes-console/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.ts
index 43bc147515..35f7045596 100644
--- a/hermes-console-vue/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.ts
+++ b/hermes-console/src/composables/subscription/use-subscription-filters-debug/useSubscriptionFiltersDebug.ts
@@ -35,6 +35,15 @@ const toFiltersJSON = (
   };
 };
 
+// https://stackoverflow.com/a/30106551
+function b64EncodeUnicode(str: string): string {
+  return btoa(
+    encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function (match, p1) {
+      return String.fromCharCode(parseInt(p1, 16));
+    }),
+  );
+}
+
 export function useSubscriptionFiltersDebug(): UseSubscriptionFiltersDebug {
   const notificationStore = useNotificationsStore();
   const status: Ref<VerificationStatus | undefined> = ref();
@@ -52,7 +61,7 @@ export function useSubscriptionFiltersDebug(): UseSubscriptionFiltersDebug {
       );
       const response = (
         await verifyFilters(topicName, {
-          message: btoa(message),
+          message: b64EncodeUnicode(message),
           filters: filtersJSON,
         })
       ).data;
diff --git a/hermes-console-vue/src/composables/subscription/use-subscription/useSubscription.spec.ts b/hermes-console/src/composables/subscription/use-subscription/useSubscription.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-subscription/useSubscription.spec.ts
rename to hermes-console/src/composables/subscription/use-subscription/useSubscription.spec.ts
diff --git a/hermes-console-vue/src/composables/subscription/use-subscription/useSubscription.ts b/hermes-console/src/composables/subscription/use-subscription/useSubscription.ts
similarity index 100%
rename from hermes-console-vue/src/composables/subscription/use-subscription/useSubscription.ts
rename to hermes-console/src/composables/subscription/use-subscription/useSubscription.ts
diff --git a/hermes-console/src/composables/sync/use-sync/useSync.spec.ts b/hermes-console/src/composables/sync/use-sync/useSync.spec.ts
new file mode 100644
index 0000000000..e9c57240e4
--- /dev/null
+++ b/hermes-console/src/composables/sync/use-sync/useSync.spec.ts
@@ -0,0 +1,175 @@
+import { afterEach, describe, expect } from 'vitest';
+import { createTestingPinia } from '@pinia/testing';
+import {
+  expectNotificationDispatched,
+  notificationStoreSpy,
+} from '@/utils/test-utils';
+import { setActivePinia } from 'pinia';
+import { setupServer } from 'msw/node';
+import {
+  syncGroupHandler,
+  syncSubscriptionHandler,
+  syncTopicHandler,
+} from '@/mocks/handlers';
+import { useSync } from '@/composables/sync/use-sync/useSync';
+import { waitFor } from '@testing-library/vue';
+
+describe('useSync', () => {
+  const server = setupServer();
+
+  const pinia = createTestingPinia({
+    fakeApp: true,
+  });
+
+  beforeEach(() => {
+    setActivePinia(pinia);
+  });
+
+  afterEach(() => {
+    server.resetHandlers();
+  });
+
+  it('should show error notification when group sync fails', async () => {
+    // given
+    const groupName = 'group';
+    server.use(syncGroupHandler({ groupName, statusCode: 500 }));
+    server.listen();
+
+    const notificationStore = notificationStoreSpy();
+
+    // when
+    const { syncGroup } = useSync();
+    const result = await syncGroup(groupName, 'DC1');
+
+    // then
+    expect(result).toBeFalsy();
+
+    await waitFor(() => {
+      expectNotificationDispatched(notificationStore, {
+        type: 'error',
+        title: 'notifications.consistency.sync.failure',
+      });
+    });
+  });
+
+  it('should show error notification when topic sync fails', async () => {
+    // given
+    const topicName = 'group.topic';
+    server.use(syncTopicHandler({ topicName, statusCode: 500 }));
+    server.listen();
+
+    const notificationStore = notificationStoreSpy();
+
+    // when
+    const { syncTopic } = useSync();
+    const result = await syncTopic(topicName, 'DC1');
+
+    // then
+    expect(result).toBeFalsy();
+
+    await waitFor(() => {
+      expectNotificationDispatched(notificationStore, {
+        type: 'error',
+        title: 'notifications.consistency.sync.failure',
+      });
+    });
+  });
+
+  it('should show error notification when subscription sync fails', async () => {
+    // given
+    const topicName = 'group.topic';
+    const subscriptionName = 'subscription';
+    server.use(
+      syncSubscriptionHandler({ topicName, subscriptionName, statusCode: 500 }),
+    );
+    server.listen();
+
+    const notificationStore = notificationStoreSpy();
+
+    // when
+    const { syncSubscription } = useSync();
+    const result = await syncSubscription(topicName, subscriptionName, 'DC1');
+
+    // then
+    expect(result).toBeFalsy();
+
+    await waitFor(() => {
+      expectNotificationDispatched(notificationStore, {
+        type: 'error',
+        title: 'notifications.consistency.sync.failure',
+      });
+    });
+  });
+
+  it('should show success notification when group sync is successful', async () => {
+    const groupName = 'group';
+
+    server.use(syncGroupHandler({ groupName, statusCode: 200 }));
+    server.listen();
+
+    const notificationStore = notificationStoreSpy();
+
+    // when
+    const { syncGroup } = useSync();
+    const result = await syncGroup(groupName, 'DC1');
+
+    // then
+    expect(result).toBeTruthy();
+
+    await waitFor(() => {
+      expectNotificationDispatched(notificationStore, {
+        type: 'success',
+        text: 'notifications.consistency.sync.success',
+      });
+    });
+  });
+
+  it('should show success notification when topic sync is successful', async () => {
+    // given
+    const topicName = 'group.topic';
+    server.use(syncTopicHandler({ topicName, statusCode: 200 }));
+    server.listen();
+
+    const notificationStore = notificationStoreSpy();
+
+    // when
+    const { syncTopic } = useSync();
+    const result = await syncTopic(topicName, 'DC1');
+
+    // then
+    expect(result).toBeTruthy();
+
+    await waitFor(() => {
+      expectNotificationDispatched(notificationStore, {
+        type: 'success',
+        text: 'notifications.consistency.sync.success',
+      });
+    });
+  });
+
+  it('should show success notification when subscription sync is successful', async () => {
+    // given
+    const topicName = 'group.topic';
+    const subscriptionName = 'subscription';
+    server.use(
+      syncSubscriptionHandler({ topicName, subscriptionName, statusCode: 200 }),
+    );
+    server.listen();
+
+    const notificationStore = notificationStoreSpy();
+
+    // when
+    const { syncSubscription } = useSync();
+    const result = await syncSubscription(topicName, subscriptionName, 'DC1');
+
+    // then
+    expect(result).toBeTruthy();
+
+    await waitFor(() => {
+      expectNotificationDispatched(notificationStore, {
+        type: 'success',
+        text: 'notifications.consistency.sync.success',
+      });
+    });
+  });
+});
diff --git a/hermes-console/src/composables/sync/use-sync/useSync.ts b/hermes-console/src/composables/sync/use-sync/useSync.ts
new file mode 100644
index 0000000000..ff6ed46f9e
--- /dev/null
+++ b/hermes-console/src/composables/sync/use-sync/useSync.ts
@@ -0,0 +1,116 @@
+import { dispatchErrorNotification } from '@/utils/notification-utils';
+import {
+  syncGroup as doSyncGroup,
+  syncSubscription as doSyncSubscription,
+  syncTopic as doSyncTopic,
+} from '@/api/hermes-client';
+import { groupName } from '@/utils/topic-utils/topic-utils';
+import { useConsistencyStore } from '@/store/consistency/useConsistencyStore';
+import { useGlobalI18n } from '@/i18n';
+import { useNotificationsStore } from '@/store/app-notifications/useAppNotifications';
+
+export interface UseSync {
+  syncGroup: (groupName: string, primaryDatacenter: string) => Promise<boolean>;
+  syncTopic: (
+    topicQualifiedName: string,
+    primaryDatacenter: string,
+  ) => Promise<boolean>;
+  syncSubscription: (
+    topicQualifiedName: string,
+    subscriptionName: string,
+    primaryDatacenter: string,
+  ) => Promise<boolean>;
+}
+
+export function useSync(): UseSync {
+  const notificationStore = useNotificationsStore();
+  const consistencyStore = useConsistencyStore();
+
+  const syncGroup = async (groupName: string, primaryDatacenter: string) => {
+    try {
+      await doSyncGroup(groupName, primaryDatacenter);
+      await notificationStore.dispatchNotification({
+        text: useGlobalI18n().t('notifications.consistency.sync.success', {
+          group: groupName,
+        }),
+        type: 'success',
+      });
+      await consistencyStore.refresh(groupName);
+      return true;
+    } catch (e: any) {
+      dispatchErrorNotification(
+        e,
+        notificationStore,
+        useGlobalI18n().t('notifications.consistency.sync.failure', {
+          group: groupName,
+        }),
+      );
+      return false;
+    }
+  };
+
+  const syncTopic = async (
+    topicQualifiedName: string,
+    primaryDatacenter: string,
+  ) => {
+    const group = groupName(topicQualifiedName);
+    try {
+      await doSyncTopic(topicQualifiedName, primaryDatacenter);
+      await notificationStore.dispatchNotification({
+        text: useGlobalI18n().t('notifications.consistency.sync.success', {
+          group,
+        }),
+        type: 'success',
+      });
+      await consistencyStore.refresh(group);
+      return true;
+    } catch (e: any) {
+      dispatchErrorNotification(
+        e,
+        notificationStore,
+        useGlobalI18n().t('notifications.consistency.sync.failure', {
+          group,
+        }),
+      );
+      return false;
+    }
+  };
+
+  const syncSubscription = async (
+    topicQualifiedName: string,
+    subscriptionName: string,
+    primaryDatacenter: string,
+  ) => {
+    const group = groupName(topicQualifiedName);
+    try {
+      await doSyncSubscription(
+        topicQualifiedName,
+        subscriptionName,
+        primaryDatacenter,
+      );
+      await notificationStore.dispatchNotification({
+        text: useGlobalI18n().t('notifications.consistency.sync.success', {
+          group,
+        }),
+        type: 'success',
+      });
+      await consistencyStore.refresh(group);
+      return true;
+    } catch (e: any) {
+      dispatchErrorNotification(
+        e,
+        notificationStore,
+        useGlobalI18n().t('notifications.consistency.sync.failure', {
+          group,
+        }),
+      );
+      return false;
+    }
+  };
+
+  return {
+    syncGroup,
+    syncSubscription,
+    syncTopic,
+  };
+}
diff --git a/hermes-console-vue/src/composables/topic/use-create-topic/types.ts b/hermes-console/src/composables/topic/use-create-topic/types.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-create-topic/types.ts
rename to hermes-console/src/composables/topic/use-create-topic/types.ts
diff --git a/hermes-console-vue/src/composables/topic/use-create-topic/useCreateTopic.spec.ts b/hermes-console/src/composables/topic/use-create-topic/useCreateTopic.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-create-topic/useCreateTopic.spec.ts
rename to hermes-console/src/composables/topic/use-create-topic/useCreateTopic.spec.ts
diff --git a/hermes-console-vue/src/composables/topic/use-create-topic/useCreateTopic.ts b/hermes-console/src/composables/topic/use-create-topic/useCreateTopic.ts
similarity index 96%
rename from hermes-console-vue/src/composables/topic/use-create-topic/useCreateTopic.ts
rename to hermes-console/src/composables/topic/use-create-topic/useCreateTopic.ts
index 5a10e2ff9a..cb2ca34f15 100644
--- a/hermes-console-vue/src/composables/topic/use-create-topic/useCreateTopic.ts
+++ b/hermes-console/src/composables/topic/use-create-topic/useCreateTopic.ts
@@ -2,6 +2,7 @@ import { dispatchErrorNotification } from '@/utils/notification-utils';
 import { createTopic as doCreateTopic } from '@/api/hermes-client';
 import { ref } from 'vue';
 import { storeToRefs } from 'pinia';
+import { topicName } from '@/utils/topic-utils/topic-utils';
 import { useAppConfigStore } from '@/store/app-config/useAppConfigStore';
 import {
   useFormTopic,
@@ -49,6 +50,7 @@ export function useCreateTopic(group: string): UseCreateTopic {
         notificationsStore,
         useGlobalI18n().t('notifications.topic.create.failure'),
       );
+      form.value.name = topicName(form.value.name);
     } finally {
       creatingTopic.value = false;
     }
@@ -101,7 +103,7 @@ function initializeForm(form: Ref<TopicForm>): void {
     trackingEnabled: false,
     contentType: loadedConfig.value.topic.defaults.contentType,
     maxMessageSize: defaultMaxMessageSize,
-    ack: loadedConfig.value.topic.defaults.ack,
+    ack: '',
     schema: '',
   };
 }
diff --git a/hermes-console-vue/src/composables/topic/use-edit-topic/types.ts b/hermes-console/src/composables/topic/use-edit-topic/types.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-edit-topic/types.ts
rename to hermes-console/src/composables/topic/use-edit-topic/types.ts
diff --git a/hermes-console-vue/src/composables/topic/use-edit-topic/useEditTopic.spec.ts b/hermes-console/src/composables/topic/use-edit-topic/useEditTopic.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-edit-topic/useEditTopic.spec.ts
rename to hermes-console/src/composables/topic/use-edit-topic/useEditTopic.spec.ts
diff --git a/hermes-console-vue/src/composables/topic/use-edit-topic/useEditTopic.ts b/hermes-console/src/composables/topic/use-edit-topic/useEditTopic.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-edit-topic/useEditTopic.ts
rename to hermes-console/src/composables/topic/use-edit-topic/useEditTopic.ts
diff --git a/hermes-console-vue/src/composables/topic/use-form-topic/parser.ts b/hermes-console/src/composables/topic/use-form-topic/parser.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-form-topic/parser.ts
rename to hermes-console/src/composables/topic/use-form-topic/parser.ts
diff --git a/hermes-console-vue/src/composables/topic/use-form-topic/types.ts b/hermes-console/src/composables/topic/use-form-topic/types.ts
similarity index 93%
rename from hermes-console-vue/src/composables/topic/use-form-topic/types.ts
rename to hermes-console/src/composables/topic/use-form-topic/types.ts
index 55d2ef1a5b..10b6cdb388 100644
--- a/hermes-console-vue/src/composables/topic/use-form-topic/types.ts
+++ b/hermes-console/src/composables/topic/use-form-topic/types.ts
@@ -50,9 +50,11 @@ export interface FormValidators {
   ownerSource: FieldValidator<string>[];
   owner: FieldValidator<any>[];
   contentType: FieldValidator<string>[];
-  retentionTimeDuration: FieldValidator<number>[];
+  retentionTimeDurationHours: FieldValidator<number>[];
+  retentionTimeDurationDays: FieldValidator<number>[];
   maxMessageSize: FieldValidator<number>[];
   offlineRetentionTime: FieldValidator<number>[];
+  ack: FieldValidator<string>[];
 }
 
 export interface RawDataSources {
diff --git a/hermes-console-vue/src/composables/topic/use-form-topic/useFormTopic.spec.ts b/hermes-console/src/composables/topic/use-form-topic/useFormTopic.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-form-topic/useFormTopic.spec.ts
rename to hermes-console/src/composables/topic/use-form-topic/useFormTopic.spec.ts
diff --git a/hermes-console-vue/src/composables/topic/use-form-topic/useFormTopic.ts b/hermes-console/src/composables/topic/use-form-topic/useFormTopic.ts
similarity index 96%
rename from hermes-console-vue/src/composables/topic/use-form-topic/useFormTopic.ts
rename to hermes-console/src/composables/topic/use-form-topic/useFormTopic.ts
index adb5f29dd7..4490d20725 100644
--- a/hermes-console-vue/src/composables/topic/use-form-topic/useFormTopic.ts
+++ b/hermes-console/src/composables/topic/use-form-topic/useFormTopic.ts
@@ -38,9 +38,11 @@ function formValidators(): FormValidators {
     ownerSource: [required()],
     owner: [required()],
     contentType: [required()],
-    retentionTimeDuration: [required(), min(0), max(7)],
+    retentionTimeDurationDays: [required(), min(1), max(7)],
+    retentionTimeDurationHours: [required(), min(1), max(24)],
     maxMessageSize: [required(), min(0)],
-    offlineRetentionTime: [required(), min(0)],
+    offlineRetentionTime: [required(), min(1)],
+    ack: [required()],
   };
 }
 
diff --git a/hermes-console-vue/src/composables/topic/use-import-topic/useImportTopic.ts b/hermes-console/src/composables/topic/use-import-topic/useImportTopic.ts
similarity index 96%
rename from hermes-console-vue/src/composables/topic/use-import-topic/useImportTopic.ts
rename to hermes-console/src/composables/topic/use-import-topic/useImportTopic.ts
index 9f756c72fa..3d33c58722 100644
--- a/hermes-console-vue/src/composables/topic/use-import-topic/useImportTopic.ts
+++ b/hermes-console/src/composables/topic/use-import-topic/useImportTopic.ts
@@ -23,7 +23,7 @@ export function useImportTopic(): UseImportTopic {
     if (importedFile.value) {
       const reader = new FileReader();
 
-      reader.readAsText(importedFile.value[0]);
+      reader.readAsText(importedFile.value);
 
       reader.onload = function () {
         const topic = JSON.parse(<string>reader.result);
diff --git a/hermes-console-vue/src/composables/topic/use-offline-retransmission/useOfflineRetransmission.spec.ts b/hermes-console/src/composables/topic/use-offline-retransmission/useOfflineRetransmission.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-offline-retransmission/useOfflineRetransmission.spec.ts
rename to hermes-console/src/composables/topic/use-offline-retransmission/useOfflineRetransmission.spec.ts
diff --git a/hermes-console-vue/src/composables/topic/use-offline-retransmission/useOfflineRetransmission.ts b/hermes-console/src/composables/topic/use-offline-retransmission/useOfflineRetransmission.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-offline-retransmission/useOfflineRetransmission.ts
rename to hermes-console/src/composables/topic/use-offline-retransmission/useOfflineRetransmission.ts
diff --git a/hermes-console-vue/src/composables/topic/use-topic/useTopic.spec.ts b/hermes-console/src/composables/topic/use-topic/useTopic.spec.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-topic/useTopic.spec.ts
rename to hermes-console/src/composables/topic/use-topic/useTopic.spec.ts
diff --git a/hermes-console-vue/src/composables/topic/use-topic/useTopic.ts b/hermes-console/src/composables/topic/use-topic/useTopic.ts
similarity index 100%
rename from hermes-console-vue/src/composables/topic/use-topic/useTopic.ts
rename to hermes-console/src/composables/topic/use-topic/useTopic.ts
diff --git a/hermes-console-vue/src/dummy/app-config.ts b/hermes-console/src/dummy/app-config.ts
similarity index 93%
rename from hermes-console-vue/src/dummy/app-config.ts
rename to hermes-console/src/dummy/app-config.ts
index a83cdb1ca8..a5166433e7 100644
--- a/hermes-console-vue/src/dummy/app-config.ts
+++ b/hermes-console/src/dummy/app-config.ts
@@ -124,4 +124,12 @@ export const dummyAppConfig: AppConfiguration = {
   group: {
     nonAdminCreationEnabled: true,
   },
+  costs: {
+    enabled: true,
+    globalDetailsUrl: '',
+    topicIframeUrl: '',
+    topicDetailsUrl: '',
+    subscriptionIframeUrl: '',
+    subscriptionDetailsUrl: '',
+  },
 };
diff --git a/hermes-console-vue/src/dummy/constraints.ts b/hermes-console/src/dummy/constraints.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/constraints.ts
rename to hermes-console/src/dummy/constraints.ts
diff --git a/hermes-console-vue/src/dummy/consumerGroups.ts b/hermes-console/src/dummy/consumerGroups.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/consumerGroups.ts
rename to hermes-console/src/dummy/consumerGroups.ts
diff --git a/hermes-console-vue/src/dummy/groupInconsistency.ts b/hermes-console/src/dummy/groupInconsistency.ts
similarity index 82%
rename from hermes-console-vue/src/dummy/groupInconsistency.ts
rename to hermes-console/src/dummy/groupInconsistency.ts
index ae114b1938..2e06da4fc7 100644
--- a/hermes-console-vue/src/dummy/groupInconsistency.ts
+++ b/hermes-console/src/dummy/groupInconsistency.ts
@@ -58,3 +58,34 @@ export const dummyGroupInconsistency3: InconsistentGroup[] = [
     inconsistentTopics: [],
   },
 ];
+
+export const dummyGroupInconsistency4: InconsistentGroup[] = [
+  {
+    name: 'pl.allegro.public.group',
+    inconsistentMetadata: [
+      {
+        datacenter: 'DC1',
+        content: '{"lorem": "ipsum"}',
+      },
+      {
+        datacenter: 'DC2',
+        content: '{"lorem": "ipsum"}',
+      },
+    ],
+    inconsistentTopics: [],
+  },
+  {
+    name: 'pl.allegro.public.group2',
+    inconsistentMetadata: [
+      {
+        datacenter: 'DC1',
+        content: '{"lorem": "ipsum"}',
+      },
+      {
+        datacenter: 'DC2',
+        content: '{"lorem": "ipsum"}',
+      },
+    ],
+    inconsistentTopics: [],
+  },
+];
diff --git a/hermes-console-vue/src/dummy/groups.ts b/hermes-console/src/dummy/groups.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/groups.ts
rename to hermes-console/src/dummy/groups.ts
diff --git a/hermes-console-vue/src/dummy/inconsistentGroups.ts b/hermes-console/src/dummy/inconsistentGroups.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/inconsistentGroups.ts
rename to hermes-console/src/dummy/inconsistentGroups.ts
diff --git a/hermes-console-vue/src/dummy/inconsistentMetadata.ts b/hermes-console/src/dummy/inconsistentMetadata.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/inconsistentMetadata.ts
rename to hermes-console/src/dummy/inconsistentMetadata.ts
diff --git a/hermes-console-vue/src/dummy/inconsistentTopics.ts b/hermes-console/src/dummy/inconsistentTopics.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/inconsistentTopics.ts
rename to hermes-console/src/dummy/inconsistentTopics.ts
diff --git a/hermes-console-vue/src/dummy/jwt-tokens.ts b/hermes-console/src/dummy/jwt-tokens.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/jwt-tokens.ts
rename to hermes-console/src/dummy/jwt-tokens.ts
diff --git a/hermes-console-vue/src/dummy/metricsDashboardUrl.ts b/hermes-console/src/dummy/metricsDashboardUrl.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/metricsDashboardUrl.ts
rename to hermes-console/src/dummy/metricsDashboardUrl.ts
diff --git a/hermes-console-vue/src/dummy/readiness.ts b/hermes-console/src/dummy/readiness.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/readiness.ts
rename to hermes-console/src/dummy/readiness.ts
diff --git a/hermes-console-vue/src/dummy/roles.ts b/hermes-console/src/dummy/roles.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/roles.ts
rename to hermes-console/src/dummy/roles.ts
diff --git a/hermes-console-vue/src/dummy/stats.ts b/hermes-console/src/dummy/stats.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/stats.ts
rename to hermes-console/src/dummy/stats.ts
diff --git a/hermes-console-vue/src/dummy/store.ts b/hermes-console/src/dummy/store.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/store.ts
rename to hermes-console/src/dummy/store.ts
diff --git a/hermes-console-vue/src/dummy/subscription-form.ts b/hermes-console/src/dummy/subscription-form.ts
similarity index 93%
rename from hermes-console-vue/src/dummy/subscription-form.ts
rename to hermes-console/src/dummy/subscription-form.ts
index ee096c6158..ee9f361aa5 100644
--- a/hermes-console-vue/src/dummy/subscription-form.ts
+++ b/hermes-console/src/dummy/subscription-form.ts
@@ -18,8 +18,10 @@ export const dummySubscriptionForm = {
   subscriptionPolicy: {
     rateLimit: null,
     inflightMessageTTL: 3600,
+    inflightMessagesCount: null,
     retryBackoff: 1000,
     retryBackoffMultiplier: 1.0,
+    backoffMaxIntervalInSec: 600,
     sendingDelay: 0,
     requestTimeout: 1000,
     batchSize: null,
@@ -58,8 +60,10 @@ export const dummySubscriptionFormValidator = {
   requestTimeout: [required(), min(0), max(10000)],
   sendingDelay: [required(), min(0), max(5000)],
   inflightMessageTTL: [required(), min(0), max(7200)],
+  inflightMessagesCount: [min(1)],
   retryBackoff: [required(), min(0), max(1000000)],
   retryBackoffMultiplier: [required(), min(1), max(10)],
+  backoffMaxIntervalInSec: [required(), min(1), max(600)],
   messageDeliveryTrackingMode: [required()],
   monitoringSeverity: [required()],
 };
@@ -141,8 +145,10 @@ export const dummyInitializedSubscriptionForm = {
     inflightMessageTTL:
       dummyAppConfig.subscription.defaults.subscriptionPolicy.messageTtl ||
       3600,
+    inflightMessagesCount: null,
     retryBackoff: 1000,
     retryBackoffMultiplier: 1.0,
+    backoffMaxIntervalInSec: 600,
     sendingDelay: 0,
     requestTimeout:
       dummyAppConfig.subscription.defaults.subscriptionPolicy.requestTimeout ||
@@ -180,9 +186,12 @@ export const dummyInitializedEditSubscriptionForm = {
   subscriptionPolicy: {
     rateLimit: dummySubscription.subscriptionPolicy.rate,
     inflightMessageTTL: dummySubscription.subscriptionPolicy.messageTtl,
+    inflightMessagesCount: dummySubscription.subscriptionPolicy.inflightSize,
     retryBackoff: dummySubscription.subscriptionPolicy.messageBackoff,
     retryBackoffMultiplier:
       dummySubscription.subscriptionPolicy.backoffMultiplier,
+    backoffMaxIntervalInSec:
+      dummySubscription.subscriptionPolicy.backoffMaxIntervalInSec,
     sendingDelay: dummySubscription.subscriptionPolicy.sendingDelay,
     requestTimeout: dummySubscription.subscriptionPolicy.requestTimeout,
     batchSize: null,
diff --git a/hermes-console-vue/src/dummy/subscription.ts b/hermes-console/src/dummy/subscription.ts
similarity index 96%
rename from hermes-console-vue/src/dummy/subscription.ts
rename to hermes-console/src/dummy/subscription.ts
index 49e26ab53b..8b31670201 100644
--- a/hermes-console-vue/src/dummy/subscription.ts
+++ b/hermes-console/src/dummy/subscription.ts
@@ -83,10 +83,11 @@ export const dummySubscriptionMetrics: SubscriptionMetrics = {
   discarded: 2137086,
   volume: 1288032256,
   timeouts: '0.0',
-  otherErrors: '0.0',
-  codes2xx: '0',
-  codes4xx: '0.0',
-  codes5xx: '0.01',
+  otherErrors: '1.4',
+  codes2xx: '123',
+  codes4xx: '2.0',
+  codes5xx: '1.32',
+  retries: '2.03',
   rate: '0',
   throughput: '8.31',
   batchRate: '0.0',
diff --git a/hermes-console-vue/src/dummy/topic-form.ts b/hermes-console/src/dummy/topic-form.ts
similarity index 96%
rename from hermes-console-vue/src/dummy/topic-form.ts
rename to hermes-console/src/dummy/topic-form.ts
index f6f667fb36..af21cde489 100644
--- a/hermes-console-vue/src/dummy/topic-form.ts
+++ b/hermes-console/src/dummy/topic-form.ts
@@ -43,9 +43,11 @@ export const dummyTopicFormValidator = {
   ownerSource: [required()],
   owner: [required()],
   contentType: [required()],
-  retentionTimeDuration: [required(), min(0), max(7)],
+  retentionTimeDurationDays: [required(), min(1), max(7)],
+  retentionTimeDurationHours: [required(), min(1), max(24)],
   maxMessageSize: [required(), min(0)],
   offlineRetentionTime: [required(), min(0)],
+  ack: [required()],
 };
 
 export const dummyContentTypes = [
@@ -123,7 +125,7 @@ export const dummyInitializedTopicForm = {
   trackingEnabled: false,
   contentType: dummyAppConfig.topic.defaults.contentType,
   maxMessageSize: defaultMaxMessageSize,
-  ack: dummyAppConfig.topic.defaults.ack,
+  ack: '',
   schema: '',
 };
 
diff --git a/hermes-console-vue/src/dummy/topic.ts b/hermes-console/src/dummy/topic.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/topic.ts
rename to hermes-console/src/dummy/topic.ts
diff --git a/hermes-console-vue/src/dummy/topics.ts b/hermes-console/src/dummy/topics.ts
similarity index 100%
rename from hermes-console-vue/src/dummy/topics.ts
rename to hermes-console/src/dummy/topics.ts
diff --git a/hermes-console-vue/src/i18n.ts b/hermes-console/src/i18n.ts
similarity index 100%
rename from hermes-console-vue/src/i18n.ts
rename to hermes-console/src/i18n.ts
diff --git a/hermes-console-vue/src/i18n/en-US/index.ts b/hermes-console/src/i18n/en-US/index.ts
similarity index 94%
rename from hermes-console-vue/src/i18n/en-US/index.ts
rename to hermes-console/src/i18n/en-US/index.ts
index 1f16fc42dd..01ec3f08b8 100644
--- a/hermes-console-vue/src/i18n/en-US/index.ts
+++ b/hermes-console/src/i18n/en-US/index.ts
@@ -11,6 +11,7 @@ const en_US = {
       statistics: 'Stats',
       search: 'Search',
       documentation: 'Docs',
+      costs: 'Costs',
       adminTools: 'Admin tools',
     },
   },
@@ -46,6 +47,12 @@ const en_US = {
     confirmText: "Type 'prod' to confirm action.",
   },
   consistency: {
+    sync: {
+      header: 'Sync datacenters',
+      explanation:
+        'Pick DC which contains correct data. Data from that DC will be propagated to other DCs.',
+      cta: 'Correct data is in DC:',
+    },
     connectionError: {
       title: 'Connection error',
       text: 'Could not fetch information about consistency',
@@ -326,10 +333,10 @@ const en_US = {
       modificationDate: 'Modification date',
       tooltips: {
         acknowledgement:
-          'Specifies the strength of guarantees that acknowledged message was indeed persisted. In ' +
-          '"Leader" mode ACK is required only from topic leader, which is fast and gives 99.99999% guarantee. It might ' +
-          'be not enough when cluster is unstable. "All" mode means message needs to be saved on all replicas before ' +
-          'sending ACK, which is quite slow but gives 100% guarantee that message has been persisted.',
+          'Specifies the strength of guarantees that acknowledged message was indeed persisted. ' +
+          'With `ACK leader` message writes are replicated asynchronously, thus the acknowledgment latency will be low. However, message write may be lost when there is a topic leadership change - e.g. due to rebalance or broker restart. ' +
+          'With `ACK all` messages writes are synchronously replicated to replicas. Write acknowledgement latency will be much higher than with leader ACK,' +
+          ' it will also have higher variance due to tail latency. However, messages will be persisted as long as the whole replica set does not go down simultaneously.',
         retentionTime:
           'For how many hours/days message is available for subscribers after being published.',
         authorizedPublishers:
@@ -471,8 +478,13 @@ const en_US = {
       subscriberLatency: 'Subscriber latency',
       delivered: 'Delivered',
       discarded: 'Discarded',
+      timeouts: 'Timeouts',
+      otherErrors: 'Other errors',
+      codes2xx: 'Codes 2xx',
+      codes4xx: 'Codes 4xx',
+      codes5xx: 'Codes 5xx',
+      retries: 'Retries',
       lag: 'Lag',
-      outputRate: 'Output rate',
       tooltips: {
         subscriberLatency:
           'Latency of acknowledging messages by subscribing service as ' +
@@ -480,10 +492,8 @@ const en_US = {
         lag:
           'Total number of events waiting to be delivered. Each subscription ' +
           'has a "natural" lag, which depends on production rate.',
-        outputRate:
-          'Maximum sending rate calculated based on receiving service ' +
-          'performance. For well-performing service output rate should be ' +
-          'equal to rate limit.',
+        retries:
+          'Total number of message sending retries. Retrying messages significantly reduces the rate on subscriptions.',
       },
     },
     propertiesCard: {
@@ -506,7 +516,7 @@ const en_US = {
       retryClientErrors: 'Retry on 4xx status',
       retryBackoff: 'Retry backoff',
       backoffMultiplier: 'Retry backoff multiplier',
-      backoffMaxInterval: 'Retry backoff max interval',
+      backoffMaxIntervalInSec: 'Retry backoff max interval',
       monitoringSeverity: 'Monitoring severity',
       monitoringReaction: 'Monitoring reaction',
       http2: 'Deliver using http/2',
@@ -704,6 +714,12 @@ const en_US = {
         failure: "Couldn't delete topic {topic}",
       },
     },
+    consistency: {
+      sync: {
+        success: 'Synchronization of {group} succeeded',
+        failure: 'Synchronization of {group} failed',
+      },
+    },
     subscription: {
       create: {
         success: 'Subscription {subscriptionName} successfully created',
@@ -795,6 +811,10 @@ const en_US = {
     notMatched: 'Not Matched',
     error: 'Error',
   },
+  costsCard: {
+    title: 'Costs',
+    detailsButton: 'DASHBOARD',
+  },
 };
 
 export default en_US;
diff --git a/hermes-console-vue/src/i18n/en-US/subscription-form.ts b/hermes-console/src/i18n/en-US/subscription-form.ts
similarity index 85%
rename from hermes-console-vue/src/i18n/en-US/subscription-form.ts
rename to hermes-console/src/i18n/en-US/subscription-form.ts
index 392a6e0956..f16420b02b 100644
--- a/hermes-console-vue/src/i18n/en-US/subscription-form.ts
+++ b/hermes-console/src/i18n/en-US/subscription-form.ts
@@ -64,6 +64,11 @@ const messages = {
         'Time when message can be resent to endpoint after failed sending attempts',
       suffix: 'seconds',
     },
+    inflightMessagesCount: {
+      label: 'Inflight messages count',
+      placeholder:
+        'How many messages can be in inflight state at the same time',
+    },
     retryOn4xx: {
       label: 'Retry on http 4xx status',
     },
@@ -77,6 +82,12 @@ const messages = {
       placeholder:
         'Delay multiplier between consecutive send attempts of failed requests',
     },
+    backoffMaxIntervalInSec: {
+      label: 'Retry backoff max interval',
+      placeholder:
+        'Max delay between consecutive send attempts of failed requests',
+      suffix: 'seconds',
+    },
     messageDeliveryTrackingMode: {
       label: 'Message delivery tracking mode',
     },
@@ -112,6 +123,10 @@ const messages = {
       title: 'Warning: Tracking all messages enabled',
       text: 'Please chose this option only when necessary. Mainly this is for debugging problems with subscription. Remember to disable this mode after the problem is solved.',
     },
+    adminForm: {
+      title: 'Warning: Admin form enabled.',
+      text: 'New fields in the form have been revealed (they are followed by a warning sign). The form will be submitted regardless of the validation of the fields.',
+    },
   },
   actions: {
     create: 'Create subscription',
diff --git a/hermes-console-vue/src/i18n/en-US/topic-form.ts b/hermes-console/src/i18n/en-US/topic-form.ts
similarity index 77%
rename from hermes-console-vue/src/i18n/en-US/topic-form.ts
rename to hermes-console/src/i18n/en-US/topic-form.ts
index 478898b459..d9d505bd6c 100644
--- a/hermes-console-vue/src/i18n/en-US/topic-form.ts
+++ b/hermes-console/src/i18n/en-US/topic-form.ts
@@ -32,6 +32,12 @@ const messages = {
       days: 'DAYS',
     },
     ack: 'Kafka ACK level',
+    ackHelpTitle: 'ACK level is very important',
+    ackHelpText:
+      'Set ACK level according to your durability and latency requirements, see: ',
+    ackHelpLink:
+      'https://hermes-pubsub.readthedocs.io/en/latest/user/publishing/#acknowledgment-level',
+    ackHelpLinkDescription: 'ACK docs.',
     contentType: 'Content type',
     maxMessageSize: {
       label: 'Max message size',
@@ -50,6 +56,10 @@ const messages = {
       title: 'Warning: Tracking all messages enabled',
       text: 'Please chose this option only when necessary. Mainly this is for debugging problems with subscription. Remember to disable this mode after the problem is solved.',
     },
+    adminForm: {
+      title: 'Warning: Admin form enabled.',
+      text: 'New fields in the form have been revealed (they are followed by a warning sign). The form will be submitted regardless of the validation of the fields.',
+    },
   },
   info: {
     avro: {
diff --git a/hermes-console-vue/src/i18n/messages.ts b/hermes-console/src/i18n/messages.ts
similarity index 100%
rename from hermes-console-vue/src/i18n/messages.ts
rename to hermes-console/src/i18n/messages.ts
diff --git a/hermes-console-vue/src/main.scss b/hermes-console/src/main.scss
similarity index 100%
rename from hermes-console-vue/src/main.scss
rename to hermes-console/src/main.scss
diff --git a/hermes-console-vue/src/main.ts b/hermes-console/src/main.ts
similarity index 100%
rename from hermes-console-vue/src/main.ts
rename to hermes-console/src/main.ts
diff --git a/hermes-console-vue/src/mocks/handlers.ts b/hermes-console/src/mocks/handlers.ts
similarity index 60%
rename from hermes-console-vue/src/mocks/handlers.ts
rename to hermes-console/src/mocks/handlers.ts
index 97355c3d14..ebcccbb847 100644
--- a/hermes-console-vue/src/mocks/handlers.ts
+++ b/hermes-console/src/mocks/handlers.ts
@@ -13,7 +13,7 @@ import {
   dummyUndeliveredMessages,
   secondDummySubscription,
 } from '@/dummy/subscription';
-import { rest } from 'msw';
+import { http, HttpResponse } from 'msw';
 import type { AccessTokenResponse } from '@/api/access-token-response';
 import type { ConstraintsConfig } from '@/api/constraints';
 import type { ConsumerGroup } from '@/api/consumer-group';
@@ -43,8 +43,8 @@ export const fetchTopicHandler = ({
 }: {
   topic?: TopicWithSchema;
 }) =>
-  rest.get(`${url}/topics/${topic.name}`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(topic));
+  http.get(`${url}/topics/${topic.name}`, () => {
+    return HttpResponse.json(topic);
   });
 
 export const fetchTopicErrorHandler = ({
@@ -54,21 +54,20 @@ export const fetchTopicErrorHandler = ({
   topicName: string;
   errorCode?: number;
 }) =>
-  rest.get(`${url}/topics/${topicName}`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/topics/${topicName}`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchOwnerHandler = ({ owner = dummyOwner }: { owner?: Owner }) =>
-  rest.get(
-    `${url}/owners/sources/Service%20Catalog/${owner.id}`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(owner));
-    },
-  );
+  http.get(`${url}/owners/sources/Service%20Catalog/${owner.id}`, () => {
+    return HttpResponse.json(owner);
+  });
 
 export const fetchOwnerSourcesHandler = (body: any) =>
-  rest.get(`${url}/owners/sources`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(body));
+  http.get(`${url}/owners/sources`, () => {
+    return HttpResponse.json(body);
   });
 
 export const fetchOwnerErrorHandler = ({
@@ -78,12 +77,11 @@ export const fetchOwnerErrorHandler = ({
   owner: string;
   errorCode?: number;
 }) =>
-  rest.get(
-    `${url}/owners/sources/Service%20Catalog/${owner}`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
-    },
-  );
+  http.get(`${url}/owners/sources/Service%20Catalog/${owner}`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
+  });
 
 export const fetchTopicMessagesPreviewHandler = ({
   topicName,
@@ -92,8 +90,8 @@ export const fetchTopicMessagesPreviewHandler = ({
   topicName: string;
   messages?: MessagePreview[];
 }) =>
-  rest.get(`${url}/topics/${topicName}/preview`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(messages));
+  http.get(`${url}/topics/${topicName}/preview`, () => {
+    return HttpResponse.json(messages);
   });
 
 export const fetchTopicMessagesPreviewErrorHandler = ({
@@ -103,8 +101,10 @@ export const fetchTopicMessagesPreviewErrorHandler = ({
   topicName: string;
   errorCode?: number;
 }) =>
-  rest.get(`${url}/topics/${topicName}/preview`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/topics/${topicName}/preview`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchTopicMetricsHandler = ({
@@ -114,8 +114,8 @@ export const fetchTopicMetricsHandler = ({
   topicName: string;
   metrics?: TopicMetrics;
 }) =>
-  rest.get(`${url}/topics/${topicName}/metrics`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(metrics));
+  http.get(`${url}/topics/${topicName}/metrics`, () => {
+    return HttpResponse.json(metrics);
   });
 
 export const fetchTopicMetricsErrorHandler = ({
@@ -125,8 +125,10 @@ export const fetchTopicMetricsErrorHandler = ({
   topicName: string;
   errorCode?: number;
 }) =>
-  rest.get(`${url}/topics/${topicName}/metrics`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/topics/${topicName}/metrics`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchTopicSubscriptionsHandler = ({
@@ -136,8 +138,8 @@ export const fetchTopicSubscriptionsHandler = ({
   topicName: string;
   subscriptions?: string[];
 }) =>
-  rest.get(`${url}/topics/${topicName}/subscriptions`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(subscriptions));
+  http.get(`${url}/topics/${topicName}/subscriptions`, () => {
+    return HttpResponse.json(subscriptions);
   });
 
 export const fetchTopicSubscriptionsErrorHandler = ({
@@ -147,8 +149,10 @@ export const fetchTopicSubscriptionsErrorHandler = ({
   topicName: string;
   errorCode?: number;
 }) =>
-  rest.get(`${url}/topics/${topicName}/subscriptions`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/topics/${topicName}/subscriptions`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchTopicSubscriptionDetailsHandler = ({
@@ -156,10 +160,10 @@ export const fetchTopicSubscriptionDetailsHandler = ({
 }: {
   subscription?: Subscription;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${subscription.topicName}/subscriptions/${subscription.name}`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(subscription));
+    () => {
+      return HttpResponse.json(subscription);
     },
   );
 
@@ -172,10 +176,12 @@ export const fetchTopicSubscriptionDetailsErrorHandler = ({
   subscriptionName: string;
   errorCode?: number;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: errorCode,
+      });
     },
   );
 
@@ -196,10 +202,10 @@ export const fetchSubscriptionHandler = ({
 }: {
   subscription?: Subscription;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${subscription.topicName}/subscriptions/${subscription.name}`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(subscription));
+    () => {
+      return HttpResponse.json(subscription);
     },
   );
 
@@ -212,10 +218,10 @@ export const fetchSubscriptionMetricsHandler = ({
   subscriptionName?: string;
   subscriptionMetrics?: SubscriptionMetrics;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/metrics`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(subscriptionMetrics));
+    () => {
+      return HttpResponse.json(subscriptionMetrics);
     },
   );
 
@@ -228,10 +234,10 @@ export const fetchSubscriptionHealthHandler = ({
   subscriptionName?: string;
   subscriptionHealth?: SubscriptionHealth;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/health`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(subscriptionHealth));
+    () => {
+      return HttpResponse.json(subscriptionHealth);
     },
   );
 
@@ -244,10 +250,10 @@ export const fetchSubscriptionUndeliveredMessagesHandler = ({
   subscriptionName?: string;
   subscriptionUndeliveredMessages?: SentMessageTrace[];
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/undelivered`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(subscriptionUndeliveredMessages));
+    () => {
+      return HttpResponse.json(subscriptionUndeliveredMessages);
     },
   );
 
@@ -260,10 +266,10 @@ export const fetchSubscriptionLastUndeliveredMessageHandler = ({
   subscriptionName?: string;
   subscriptionLastUndeliveredMessage?: SentMessageTrace;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/undelivered/last`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(subscriptionLastUndeliveredMessage));
+    () => {
+      return HttpResponse.json(subscriptionLastUndeliveredMessage);
     },
   );
 
@@ -274,10 +280,12 @@ export const fetchSubscriptionErrorHandler = ({
   subscription?: Subscription;
   errorCode?: number;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${subscription.topicName}/subscriptions/${subscription.name}`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: errorCode,
+      });
     },
   );
 
@@ -290,10 +298,12 @@ export const fetchSubscriptionMetricsErrorHandler = ({
   subscriptionName?: string;
   errorCode?: number;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/metrics`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: errorCode,
+      });
     },
   );
 
@@ -306,10 +316,12 @@ export const fetchSubscriptionHealthErrorHandler = ({
   subscriptionName?: string;
   errorCode?: number;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/health`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: errorCode,
+      });
     },
   );
 
@@ -322,10 +334,12 @@ export const fetchSubscriptionUndeliveredMessagesErrorHandler = ({
   subscriptionName?: string;
   errorCode?: number;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/undelivered`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: errorCode,
+      });
     },
   );
 
@@ -338,10 +352,12 @@ export const fetchSubscriptionLastUndeliveredMessageErrorHandler = ({
   subscriptionName?: string;
   errorCode?: number;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/undelivered/last`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: errorCode,
+      });
     },
   );
 
@@ -359,8 +375,8 @@ export const fetchConstraintsHandler = ({
 }: {
   constraints: ConstraintsConfig;
 }) =>
-  rest.get(`${url}/workload-constraints`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(constraints));
+  http.get(`${url}/workload-constraints`, () => {
+    return HttpResponse.json(constraints);
   });
 
 export const fetchConstraintsErrorHandler = ({
@@ -368,8 +384,10 @@ export const fetchConstraintsErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.get(`${url}/workload-constraints`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/workload-constraints`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchReadinessHandler = ({
@@ -377,8 +395,8 @@ export const fetchReadinessHandler = ({
 }: {
   datacentersReadiness: DatacenterReadiness[];
 }) =>
-  rest.get(`${url}/readiness/datacenters`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(datacentersReadiness));
+  http.get(`${url}/readiness/datacenters`, () => {
+    return HttpResponse.json(datacentersReadiness);
   });
 
 export const fetchReadinessErrorHandler = ({
@@ -386,8 +404,10 @@ export const fetchReadinessErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.get(`${url}/readiness/datacenters`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/readiness/datacenters`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchConsumerGroupsHandler = ({
@@ -399,10 +419,10 @@ export const fetchConsumerGroupsHandler = ({
   topicName: string;
   subscriptionName: string;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/consumer-groups`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(consumerGroups));
+    () => {
+      return HttpResponse.json(consumerGroups);
     },
   );
 
@@ -415,10 +435,12 @@ export const fetchConsumerGroupsErrorHandler = ({
   topicName: string;
   subscriptionName: string;
 }) =>
-  rest.get(
+  http.get(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/consumer-groups`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: errorCode,
+      });
     },
   );
 
@@ -427,8 +449,8 @@ export const fetchInconsistentTopicsHandler = ({
 }: {
   topics: string[];
 }) =>
-  rest.get(`${url}/consistency/inconsistencies/topics`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(topics));
+  http.get(`${url}/consistency/inconsistencies/topics`, () => {
+    return HttpResponse.json(topics);
   });
 
 export const fetchInconsistentTopicsErrorHandler = ({
@@ -436,8 +458,10 @@ export const fetchInconsistentTopicsErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.get(`${url}/consistency/inconsistencies/topics`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/consistency/inconsistencies/topics`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchTopicNamesHandler = ({
@@ -445,8 +469,8 @@ export const fetchTopicNamesHandler = ({
 }: {
   topicNames: string[];
 }) =>
-  rest.get(`${url}/topics`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(topicNames));
+  http.get(`${url}/topics`, () => {
+    return HttpResponse.json(topicNames);
   });
 
 export const fetchTopicNamesErrorHandler = ({
@@ -454,8 +478,10 @@ export const fetchTopicNamesErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.get(`${url}/topics`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/topics`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchGroupNamesHandler = ({
@@ -463,8 +489,8 @@ export const fetchGroupNamesHandler = ({
 }: {
   groupNames: string[];
 }) =>
-  rest.get(`${url}/groups`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(groupNames));
+  http.get(`${url}/groups`, () => {
+    return HttpResponse.json(groupNames);
   });
 
 export const fetchGroupNamesErrorHandler = ({
@@ -472,13 +498,15 @@ export const fetchGroupNamesErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.get(`${url}/groups`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/groups`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchStatsHandler = ({ stats }: { stats: Stats }) =>
-  rest.get(`${url}/stats`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(stats));
+  http.get(`${url}/stats`, () => {
+    return HttpResponse.json(stats);
   });
 
 export const fetchStatsErrorHandler = ({
@@ -486,8 +514,10 @@ export const fetchStatsErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.get(`${url}/stats`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/stats`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchTokenHandler = ({
@@ -495,8 +525,8 @@ export const fetchTokenHandler = ({
 }: {
   accessToken: AccessTokenResponse;
 }) =>
-  rest.post(`http://localhost:8080/token`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(accessToken));
+  http.post(`http://localhost:8080/token`, () => {
+    return HttpResponse.json(accessToken);
   });
 
 export const queryTopicsHandler = ({
@@ -504,8 +534,8 @@ export const queryTopicsHandler = ({
 }: {
   topics?: Topic[];
 }) =>
-  rest.post(`${url}/query/topics`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(topics));
+  http.post(`${url}/query/topics`, () => {
+    return HttpResponse.json(topics);
   });
 
 export const queryTopicsErrorHandler = ({
@@ -513,8 +543,10 @@ export const queryTopicsErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.post(`${url}/query/topics`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.post(`${url}/query/topics`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const querySubscriptionsHandler = ({
@@ -522,8 +554,8 @@ export const querySubscriptionsHandler = ({
 }: {
   subscriptions?: Subscription[];
 }) =>
-  rest.post(`${url}/query/subscriptions`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(subscriptions));
+  http.post(`${url}/query/subscriptions`, () => {
+    return HttpResponse.json(subscriptions);
   });
 
 export const querySubscriptionsErrorHandler = ({
@@ -531,8 +563,10 @@ export const querySubscriptionsErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.post(`${url}/query/subscriptions`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.post(`${url}/query/subscriptions`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchRolesHandler = ({
@@ -542,8 +576,8 @@ export const fetchRolesHandler = ({
   roles: Role[];
   path: string;
 }) =>
-  rest.get(path, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(roles));
+  http.get(path, () => {
+    return HttpResponse.json(roles);
   });
 
 export const fetchRolesErrorHandler = ({
@@ -553,8 +587,10 @@ export const fetchRolesErrorHandler = ({
   errorCode?: number;
   path: string;
 }) =>
-  rest.get(path, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(path, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchMetricsDashboardUrlHandler = ({
@@ -564,8 +600,8 @@ export const fetchMetricsDashboardUrlHandler = ({
   dashboardUrl: DashboardUrl;
   path: string;
 }) =>
-  rest.get(path, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(dashboardUrl));
+  http.get(path, () => {
+    return HttpResponse.json(dashboardUrl);
   });
 
 export const fetchMetricsDashboardUrlErrorHandler = ({
@@ -575,8 +611,10 @@ export const fetchMetricsDashboardUrlErrorHandler = ({
   errorCode?: number;
   path: string;
 }) =>
-  rest.get(path, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(path, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchConsistencyGroupsHandler = ({
@@ -584,8 +622,8 @@ export const fetchConsistencyGroupsHandler = ({
 }: {
   groups: string[];
 }) =>
-  rest.get(`${url}/consistency/groups`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(groups));
+  http.get(`${url}/consistency/groups`, () => {
+    return HttpResponse.json(groups);
   });
 
 export const fetchConsistencyGroupsErrorHandler = ({
@@ -593,8 +631,10 @@ export const fetchConsistencyGroupsErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.get(`${url}/consistency/groups`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/consistency/groups`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const fetchGroupInconsistenciesHandler = ({
@@ -602,8 +642,8 @@ export const fetchGroupInconsistenciesHandler = ({
 }: {
   groupsInconsistency: InconsistentGroup[];
 }) =>
-  rest.get(`${url}/consistency/inconsistencies/groups`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(groupsInconsistency));
+  http.get(`${url}/consistency/inconsistencies/groups`, () => {
+    return HttpResponse.json(groupsInconsistency);
   });
 
 export const fetchGroupInconsistenciesErrorHandler = ({
@@ -611,13 +651,15 @@ export const fetchGroupInconsistenciesErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.get(`${url}/consistency/inconsistencies/groups`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.get(`${url}/consistency/inconsistencies/groups`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const removeGroupHandler = ({ group }: { group: string }) =>
-  rest.delete(`/groups/${group}`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(undefined));
+  http.delete(`/groups/${group}`, () => {
+    return HttpResponse.json(undefined);
   });
 
 export const removeGroupErrorHandler = ({
@@ -627,13 +669,15 @@ export const removeGroupErrorHandler = ({
   group: string;
   errorCode: number;
 }) =>
-  rest.delete(`/groups/${group}`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.delete(`/groups/${group}`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const removeTopicHandler = ({ topic }: { topic: string }) =>
-  rest.delete(`/topics/${topic}`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(undefined));
+  http.delete(`/topics/${topic}`, () => {
+    return HttpResponse.json(undefined);
   });
 
 export const removeTopicErrorHandler = ({
@@ -643,13 +687,15 @@ export const removeTopicErrorHandler = ({
   topic: string;
   errorCode: number;
 }) =>
-  rest.delete(`/topics/${topic}`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.delete(`/topics/${topic}`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const removeInconsistentTopicHandler = () =>
-  rest.delete(`/consistency/inconsistencies/topics`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(undefined));
+  http.delete(`/consistency/inconsistencies/topics`, () => {
+    return HttpResponse.json(undefined);
   });
 
 export const removeInconsistentTopicErrorHandler = ({
@@ -657,8 +703,10 @@ export const removeInconsistentTopicErrorHandler = ({
 }: {
   errorCode: number;
 }) =>
-  rest.delete(`/consistency/inconsistencies/topics`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.delete(`/consistency/inconsistencies/topics`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const removeSubscriptionHandler = ({
@@ -668,12 +716,9 @@ export const removeSubscriptionHandler = ({
   topic: string;
   subscription: string;
 }) =>
-  rest.delete(
-    `/topics/${topic}/subscriptions/${subscription}`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(undefined));
-    },
-  );
+  http.delete(`/topics/${topic}/subscriptions/${subscription}`, () => {
+    return HttpResponse.json(undefined);
+  });
 
 export const removeSubscriptionErrorHandler = ({
   topic,
@@ -684,12 +729,11 @@ export const removeSubscriptionErrorHandler = ({
   subscription: string;
   errorCode: number;
 }) =>
-  rest.delete(
-    `/topics/${topic}/subscriptions/${subscription}`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
-    },
-  );
+  http.delete(`/topics/${topic}/subscriptions/${subscription}`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
+  });
 
 export const subscriptionStateHandler = ({
   topic,
@@ -698,12 +742,9 @@ export const subscriptionStateHandler = ({
   topic: string;
   subscription: string;
 }) =>
-  rest.put(
-    `/topics/${topic}/subscriptions/${subscription}/state`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(undefined));
-    },
-  );
+  http.put(`/topics/${topic}/subscriptions/${subscription}/state`, () => {
+    return HttpResponse.json(undefined);
+  });
 
 export const subscriptionStateErrorHandler = ({
   topic,
@@ -714,20 +755,19 @@ export const subscriptionStateErrorHandler = ({
   subscription: string;
   errorCode: number;
 }) =>
-  rest.put(
-    `/topics/${topic}/subscriptions/${subscription}/state`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
-    },
-  );
+  http.put(`/topics/${topic}/subscriptions/${subscription}/state`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
+  });
 
 export const switchReadinessHandler = ({
   datacenter,
 }: {
   datacenter: string;
 }) =>
-  rest.post(`/readiness/datacenters/${datacenter}`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(undefined));
+  http.post(`/readiness/datacenters/${datacenter}`, () => {
+    return HttpResponse.json(undefined);
   });
 
 export const switchReadinessErrorHandler = ({
@@ -737,8 +777,10 @@ export const switchReadinessErrorHandler = ({
   datacenter: string;
   errorCode: number;
 }) =>
-  rest.post(`/readiness/datacenters/${datacenter}`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.post(`/readiness/datacenters/${datacenter}`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const moveSubscriptionOffsetsHandler = ({
@@ -750,10 +792,12 @@ export const moveSubscriptionOffsetsHandler = ({
   subscriptionName: string;
   statusCode: number;
 }) =>
-  rest.post(
+  http.post(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/moveOffsetsToTheEnd`,
-    (req, res, ctx) => {
-      return res(ctx.status(statusCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: statusCode,
+      });
     },
   );
 
@@ -762,8 +806,10 @@ export const upsertTopicConstraintHandler = ({
 }: {
   statusCode: number;
 }) =>
-  rest.put(`${url}/workload-constraints/topic`, (req, res, ctx) => {
-    return res(ctx.status(statusCode), ctx.json(undefined));
+  http.put(`${url}/workload-constraints/topic`, () => {
+    return new HttpResponse(undefined, {
+      status: statusCode,
+    });
   });
 
 export const upsertSubscriptionConstraintHandler = ({
@@ -771,8 +817,10 @@ export const upsertSubscriptionConstraintHandler = ({
 }: {
   statusCode: number;
 }) =>
-  rest.put(`${url}/workload-constraints/subscription`, (req, res, ctx) => {
-    return res(ctx.status(statusCode), ctx.json(undefined));
+  http.put(`${url}/workload-constraints/subscription`, () => {
+    return new HttpResponse(undefined, {
+      status: statusCode,
+    });
   });
 
 export const deleteTopicConstraintHandler = ({
@@ -782,12 +830,11 @@ export const deleteTopicConstraintHandler = ({
   statusCode: number;
   topicName: string;
 }) =>
-  rest.delete(
-    `${url}/workload-constraints/topic/${topicName}`,
-    (req, res, ctx) => {
-      return res(ctx.status(statusCode), ctx.json(undefined));
-    },
-  );
+  http.delete(`${url}/workload-constraints/topic/${topicName}`, () => {
+    return new HttpResponse(undefined, {
+      status: statusCode,
+    });
+  });
 
 export const deleteSubscriptionConstraintHandler = ({
   statusCode,
@@ -798,69 +845,73 @@ export const deleteSubscriptionConstraintHandler = ({
   topicName: string;
   subscriptionName: string;
 }) =>
-  rest.delete(
+  http.delete(
     `${url}/workload-constraints/subscription/${topicName}/${subscriptionName}`,
-    (req, res, ctx) => {
-      return res(ctx.status(statusCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: statusCode,
+      });
     },
   );
 
 export const createSubscriptionHandler = (topic: string) =>
-  rest.post(`${url}/topics/${topic}/subscriptions`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(undefined));
+  http.post(`${url}/topics/${topic}/subscriptions`, () => {
+    return HttpResponse.json(undefined);
   });
 
 export const createSubscriptionErrorHandler = (
   topic: string,
   errorCode: number,
 ) =>
-  rest.post(`${url}/topics/${topic}/subscriptions`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.post(`${url}/topics/${topic}/subscriptions`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const createTopicHandler = () =>
-  rest.post(`${url}/topics`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(undefined));
+  http.post(`${url}/topics`, () => {
+    return HttpResponse.json(undefined);
   });
 
 export const createTopicErrorHandler = (errorCode: number) =>
-  rest.post(`${url}/topics`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.post(`${url}/topics`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const editSubscriptionHandler = (topic: string, subscription: string) =>
-  rest.put(
-    `${url}/topics/${topic}/subscriptions/${subscription}`,
-    (req, res, ctx) => {
-      return res(ctx.status(200), ctx.json(undefined));
-    },
-  );
+  http.put(`${url}/topics/${topic}/subscriptions/${subscription}`, () => {
+    return HttpResponse.json(undefined);
+  });
 
 export const editSubscriptionErrorHandler = (
   topic: string,
   subscription: string,
   errorCode: number,
 ) =>
-  rest.put(
-    `${url}/topics/${topic}/subscriptions/${subscription}`,
-    (req, res, ctx) => {
-      return res(ctx.status(errorCode), ctx.json(undefined));
-    },
-  );
+  http.put(`${url}/topics/${topic}/subscriptions/${subscription}`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
+  });
 
 export const editTopicHandler = (topic: string) =>
-  rest.put(`${url}/topics/${topic}`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(undefined));
+  http.put(`${url}/topics/${topic}`, () => {
+    return HttpResponse.json(undefined);
   });
 
 export const editTopicErrorHandler = (topic: string, errorCode: number) =>
-  rest.put(`${url}/topics/${topic}`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.put(`${url}/topics/${topic}`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const createGroupHandler = ({ group }: { group: Group }) =>
-  rest.post(`${url}/groups`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(group));
+  http.post(`${url}/groups`, () => {
+    return HttpResponse.json(group);
   });
 
 export const createGroupErrorHandler = ({
@@ -868,8 +919,10 @@ export const createGroupErrorHandler = ({
 }: {
   errorCode?: number;
 }) =>
-  rest.post(`${url}/groups`, (req, res, ctx) => {
-    return res(ctx.status(errorCode), ctx.json(undefined));
+  http.post(`${url}/groups`, () => {
+    return new HttpResponse(undefined, {
+      status: errorCode,
+    });
   });
 
 export const createRetransmissionTaskHandler = ({
@@ -877,8 +930,10 @@ export const createRetransmissionTaskHandler = ({
 }: {
   statusCode: number;
 }) =>
-  rest.post(`${url}/offline-retransmission/tasks`, (req, res, ctx) => {
-    return res(ctx.status(statusCode), ctx.json(undefined));
+  http.post(`${url}/offline-retransmission/tasks`, () => {
+    return new HttpResponse(undefined, {
+      status: statusCode,
+    });
   });
 
 export const createRetransmissionHandler = ({
@@ -890,10 +945,12 @@ export const createRetransmissionHandler = ({
   topicName: string;
   subscriptionName: string;
 }) =>
-  rest.put(
+  http.put(
     `${url}/topics/${topicName}/subscriptions/${subscriptionName}/retransmission`,
-    (req, res, ctx) => {
-      return res(ctx.status(statusCode), ctx.json(undefined));
+    () => {
+      return new HttpResponse(undefined, {
+        status: statusCode,
+      });
     },
   );
 
@@ -904,8 +961,8 @@ export const subscriptionFilterVerificationHandler = ({
   topicName: string;
   response: MessageFiltersVerificationResponse;
 }) =>
-  rest.post(`${url}/filters/${topicName}`, (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(response));
+  http.post(`${url}/filters/${topicName}`, () => {
+    return HttpResponse.json(response);
   });
 
 export const subscriptionFilterVerificationErrorHandler = ({
@@ -913,6 +970,52 @@ export const subscriptionFilterVerificationErrorHandler = ({
 }: {
   topicName: string;
 }) =>
-  rest.post(`${url}/filters/${topicName}`, (req, res, ctx) => {
-    return res(ctx.status(500), ctx.json(undefined));
+  http.post(`${url}/filters/${topicName}`, () => {
+    return new HttpResponse(undefined, {
+      status: 500,
+    });
+  });
+
+export const syncGroupHandler = ({
+  groupName,
+  statusCode,
+}: {
+  groupName: string;
+  statusCode: number;
+}) =>
+  http.post(`${url}/consistency/sync/groups/${groupName}`, () => {
+    return new HttpResponse(undefined, {
+      status: statusCode,
+    });
+  });
+
+export const syncTopicHandler = ({
+  topicName,
+  statusCode,
+}: {
+  topicName: string;
+  statusCode: number;
+}) =>
+  http.post(`${url}/consistency/sync/topics/${topicName}`, () => {
+    return new HttpResponse(undefined, {
+      status: statusCode,
+    });
   });
+
+export const syncSubscriptionHandler = ({
+  topicName,
+  statusCode,
+  subscriptionName,
+}: {
+  topicName: string;
+  subscriptionName: string;
+  statusCode: number;
+}) =>
+  http.post(
+    `${url}/consistency/sync/topics/${topicName}/subscriptions/${subscriptionName}`,
+    () => {
+      return new HttpResponse(undefined, {
+        status: statusCode,
+      });
+    },
+  );
diff --git a/hermes-console-vue/src/router/index.ts b/hermes-console/src/router/index.ts
similarity index 95%
rename from hermes-console-vue/src/router/index.ts
rename to hermes-console/src/router/index.ts
index 50603c1e2b..0c39398ad4 100644
--- a/hermes-console-vue/src/router/index.ts
+++ b/hermes-console/src/router/index.ts
@@ -96,6 +96,11 @@ const router = createRouter({
       path: '/ui/search',
       name: 'search',
       component: () => import('@/views/search/SearchView.vue'),
+      props: (route) => ({
+        collection: route.query.collection,
+        filter: route.query.filter,
+        pattern: route.query.pattern,
+      }),
     },
   ],
 });
diff --git a/hermes-console-vue/src/settings.scss b/hermes-console/src/settings.scss
similarity index 100%
rename from hermes-console-vue/src/settings.scss
rename to hermes-console/src/settings.scss
diff --git a/hermes-console-vue/src/store/app-config/types.ts b/hermes-console/src/store/app-config/types.ts
similarity index 100%
rename from hermes-console-vue/src/store/app-config/types.ts
rename to hermes-console/src/store/app-config/types.ts
diff --git a/hermes-console-vue/src/store/app-config/useAppConfigStore.ts b/hermes-console/src/store/app-config/useAppConfigStore.ts
similarity index 100%
rename from hermes-console-vue/src/store/app-config/useAppConfigStore.ts
rename to hermes-console/src/store/app-config/useAppConfigStore.ts
diff --git a/hermes-console-vue/src/store/app-notifications/types.ts b/hermes-console/src/store/app-notifications/types.ts
similarity index 100%
rename from hermes-console-vue/src/store/app-notifications/types.ts
rename to hermes-console/src/store/app-notifications/types.ts
diff --git a/hermes-console-vue/src/store/app-notifications/useAppNotifications.ts b/hermes-console/src/store/app-notifications/useAppNotifications.ts
similarity index 100%
rename from hermes-console-vue/src/store/app-notifications/useAppNotifications.ts
rename to hermes-console/src/store/app-notifications/useAppNotifications.ts
diff --git a/hermes-console-vue/src/store/auth/types.ts b/hermes-console/src/store/auth/types.ts
similarity index 100%
rename from hermes-console-vue/src/store/auth/types.ts
rename to hermes-console/src/store/auth/types.ts
diff --git a/hermes-console-vue/src/store/auth/useAuthStore.spec.ts b/hermes-console/src/store/auth/useAuthStore.spec.ts
similarity index 100%
rename from hermes-console-vue/src/store/auth/useAuthStore.spec.ts
rename to hermes-console/src/store/auth/useAuthStore.spec.ts
diff --git a/hermes-console-vue/src/store/auth/useAuthStore.ts b/hermes-console/src/store/auth/useAuthStore.ts
similarity index 96%
rename from hermes-console-vue/src/store/auth/useAuthStore.ts
rename to hermes-console/src/store/auth/useAuthStore.ts
index eed5c9af22..c49f2f1cec 100644
--- a/hermes-console-vue/src/store/auth/useAuthStore.ts
+++ b/hermes-console/src/store/auth/useAuthStore.ts
@@ -1,9 +1,9 @@
 import { encode as base64encode } from 'base64-arraybuffer';
 import { defineStore } from 'pinia';
 import { fetchToken } from '@/api/hermes-client';
+import { jwtDecode } from 'jwt-decode';
 import { useAppConfigStore } from '@/store/app-config/useAppConfigStore';
 import axios from '@/utils/axios/axios-instance';
-import decode from 'jwt-decode';
 import qs from 'query-string';
 import type { AuthStoreState } from '@/store/auth/types';
 
@@ -79,7 +79,7 @@ export const useAuthStore = defineStore('auth', {
   },
   getters: {
     userData(state: AuthStoreState): { exp: number } {
-      return state.accessToken ? decode(state.accessToken) : { exp: 0 };
+      return state.accessToken ? jwtDecode(state.accessToken) : { exp: 0 };
     },
     isUserAuthorized(state: AuthStoreState): boolean {
       const expiresAt = this.userData.exp * 1000;
diff --git a/hermes-console-vue/src/store/consistency/types.ts b/hermes-console/src/store/consistency/types.ts
similarity index 100%
rename from hermes-console-vue/src/store/consistency/types.ts
rename to hermes-console/src/store/consistency/types.ts
diff --git a/hermes-console-vue/src/store/consistency/useConsistencyStore.spec.ts b/hermes-console/src/store/consistency/useConsistencyStore.spec.ts
similarity index 67%
rename from hermes-console-vue/src/store/consistency/useConsistencyStore.spec.ts
rename to hermes-console/src/store/consistency/useConsistencyStore.spec.ts
index bb5e1b73d1..52dd62e082 100644
--- a/hermes-console-vue/src/store/consistency/useConsistencyStore.spec.ts
+++ b/hermes-console/src/store/consistency/useConsistencyStore.spec.ts
@@ -1,6 +1,10 @@
 import { beforeEach, describe, expect } from 'vitest';
 import { createPinia, setActivePinia } from 'pinia';
-import { dummyGroupInconsistency } from '@/dummy/groupInconsistency';
+import {
+  dummyGroupInconsistency,
+  dummyGroupInconsistency2,
+  dummyGroupInconsistency4,
+} from '@/dummy/groupInconsistency';
 import { dummyInconsistentGroups } from '@/dummy/inconsistentGroups';
 import {
   fetchConsistencyGroupsErrorHandler,
@@ -86,4 +90,41 @@ describe('useConsistencyStore', () => {
 
     expect(consistencyStore.error.fetchError).not.toBeNull();
   });
+
+  it('should remove group from store when refresh returns that it is consistent', async () => {
+    // given
+    server.use(fetchGroupInconsistenciesHandler({ groupsInconsistency: [] }));
+    server.listen();
+    const consistencyStore = useConsistencyStore();
+    consistencyStore.groups = dummyGroupInconsistency4;
+    // make a copy of initial state
+    const expected = JSON.parse(JSON.stringify(dummyGroupInconsistency4[1]));
+
+    // when
+    await consistencyStore.refresh(dummyGroupInconsistency4[0].name);
+
+    // then
+    expect(consistencyStore.groups.length).toEqual(1);
+    expect(consistencyStore.groups[0]).toEqual(expected);
+  });
+
+  it('should update group in store when refresh returns different value', async () => {
+    // given
+    server.use(
+      fetchGroupInconsistenciesHandler({
+        groupsInconsistency: dummyGroupInconsistency2,
+      }),
+    );
+    server.listen();
+    const consistencyStore = useConsistencyStore();
+    consistencyStore.groups = dummyGroupInconsistency;
+    // make a copy of initial state
+
+    // when
+    await consistencyStore.refresh(dummyGroupInconsistency[0].name);
+
+    // then
+    expect(consistencyStore.groups.length).toEqual(1);
+    expect(consistencyStore.groups).toEqual(dummyGroupInconsistency2);
+  });
 });
diff --git a/hermes-console-vue/src/store/consistency/useConsistencyStore.ts b/hermes-console/src/store/consistency/useConsistencyStore.ts
similarity index 75%
rename from hermes-console-vue/src/store/consistency/useConsistencyStore.ts
rename to hermes-console/src/store/consistency/useConsistencyStore.ts
index 1d18182c20..3a6bbf4a52 100644
--- a/hermes-console-vue/src/store/consistency/useConsistencyStore.ts
+++ b/hermes-console/src/store/consistency/useConsistencyStore.ts
@@ -52,6 +52,29 @@ export const useConsistencyStore = defineStore('consistency', {
         this.fetchInProgress = false;
       }
     },
+    async refresh(group: string) {
+      this.fetchInProgress = true;
+      try {
+        const refreshedGroup = (await fetchInconsistentGroups([group])).data;
+        let groupIndex = -1;
+        for (let i = 0; i < this.groups.length; i++) {
+          if (this.groups[i].name == group) {
+            groupIndex = i;
+            break;
+          }
+        }
+        if (groupIndex == -1) return;
+        if (refreshedGroup.length == 0) {
+          this.groups.splice(groupIndex, 1);
+        } else {
+          this.groups[groupIndex] = refreshedGroup[0];
+        }
+      } catch (e) {
+        this.error.fetchError = e as Error;
+      } finally {
+        this.fetchInProgress = false;
+      }
+    },
   },
   getters: {
     group(
diff --git a/hermes-console-vue/src/store/favorites/types.ts b/hermes-console/src/store/favorites/types.ts
similarity index 100%
rename from hermes-console-vue/src/store/favorites/types.ts
rename to hermes-console/src/store/favorites/types.ts
diff --git a/hermes-console-vue/src/store/favorites/useFavorites.ts b/hermes-console/src/store/favorites/useFavorites.ts
similarity index 100%
rename from hermes-console-vue/src/store/favorites/useFavorites.ts
rename to hermes-console/src/store/favorites/useFavorites.ts
diff --git a/hermes-console-vue/src/utils/axios/axios-instance.ts b/hermes-console/src/utils/axios/axios-instance.ts
similarity index 100%
rename from hermes-console-vue/src/utils/axios/axios-instance.ts
rename to hermes-console/src/utils/axios/axios-instance.ts
diff --git a/hermes-console-vue/src/utils/axios/axios-utils.ts b/hermes-console/src/utils/axios/axios-utils.ts
similarity index 100%
rename from hermes-console-vue/src/utils/axios/axios-utils.ts
rename to hermes-console/src/utils/axios/axios-utils.ts
diff --git a/hermes-console-vue/src/utils/copy-utils.ts b/hermes-console/src/utils/copy-utils.ts
similarity index 100%
rename from hermes-console-vue/src/utils/copy-utils.ts
rename to hermes-console/src/utils/copy-utils.ts
diff --git a/hermes-console-vue/src/utils/date-formatter/date-formatter.spec.ts b/hermes-console/src/utils/date-formatter/date-formatter.spec.ts
similarity index 100%
rename from hermes-console-vue/src/utils/date-formatter/date-formatter.spec.ts
rename to hermes-console/src/utils/date-formatter/date-formatter.spec.ts
diff --git a/hermes-console/src/utils/date-formatter/date-formatter.ts b/hermes-console/src/utils/date-formatter/date-formatter.ts
new file mode 100644
index 0000000000..be9833ac8e
--- /dev/null
+++ b/hermes-console/src/utils/date-formatter/date-formatter.ts
@@ -0,0 +1,23 @@
+export function formatTimestamp(timestamp: number): string {
+  try {
+    return new Date(timestamp * 1000)
+      .toISOString()
+      .replace('T', ' ')
+      .replace('Z', '')
+      .slice(0, 19);
+  } catch (ignore) {
+    return 'Invalid format';
+  }
+}
+
+export function formatTimestampMillis(timestamp: number): string {
+  try {
+    return new Date(timestamp)
+      .toISOString()
+      .replace('T', ' ')
+      .replace('Z', '')
+      .slice(0, 19);
+  } catch (ignore) {
+    return 'Invalid format';
+  }
+}
diff --git a/hermes-console-vue/src/utils/download-utils.ts b/hermes-console/src/utils/download-utils.ts
similarity index 100%
rename from hermes-console-vue/src/utils/download-utils.ts
rename to hermes-console/src/utils/download-utils.ts
diff --git a/hermes-console-vue/src/utils/notification-utils.ts b/hermes-console/src/utils/notification-utils.ts
similarity index 96%
rename from hermes-console-vue/src/utils/notification-utils.ts
rename to hermes-console/src/utils/notification-utils.ts
index fc8f479e05..12a201fc10 100644
--- a/hermes-console-vue/src/utils/notification-utils.ts
+++ b/hermes-console/src/utils/notification-utils.ts
@@ -6,7 +6,7 @@ export function dispatchErrorNotification(
   notificationStore: any,
   title: string,
 ): void {
-  let text = '';
+  let text: string;
   if (axios.isAxiosError(err)) {
     const e = err as AxiosError;
     // @ts-ignore
diff --git a/hermes-console-vue/src/utils/number-formatter/number-formatter.spec.ts b/hermes-console/src/utils/number-formatter/number-formatter.spec.ts
similarity index 100%
rename from hermes-console-vue/src/utils/number-formatter/number-formatter.spec.ts
rename to hermes-console/src/utils/number-formatter/number-formatter.spec.ts
diff --git a/hermes-console-vue/src/utils/number-formatter/number-formatter.ts b/hermes-console/src/utils/number-formatter/number-formatter.ts
similarity index 100%
rename from hermes-console-vue/src/utils/number-formatter/number-formatter.ts
rename to hermes-console/src/utils/number-formatter/number-formatter.ts
diff --git a/hermes-console-vue/src/utils/roles-util.ts b/hermes-console/src/utils/roles-util.ts
similarity index 100%
rename from hermes-console-vue/src/utils/roles-util.ts
rename to hermes-console/src/utils/roles-util.ts
diff --git a/hermes-console-vue/src/utils/subscription-utils/subscription-utils.spec.ts b/hermes-console/src/utils/subscription-utils/subscription-utils.spec.ts
similarity index 100%
rename from hermes-console-vue/src/utils/subscription-utils/subscription-utils.spec.ts
rename to hermes-console/src/utils/subscription-utils/subscription-utils.spec.ts
diff --git a/hermes-console-vue/src/utils/subscription-utils/subscription-utils.ts b/hermes-console/src/utils/subscription-utils/subscription-utils.ts
similarity index 100%
rename from hermes-console-vue/src/utils/subscription-utils/subscription-utils.ts
rename to hermes-console/src/utils/subscription-utils/subscription-utils.ts
diff --git a/hermes-console-vue/src/utils/test-utils.ts b/hermes-console/src/utils/test-utils.ts
similarity index 100%
rename from hermes-console-vue/src/utils/test-utils.ts
rename to hermes-console/src/utils/test-utils.ts
diff --git a/hermes-console-vue/src/utils/topic-utils/topic-utils.spec.ts b/hermes-console/src/utils/topic-utils/topic-utils.spec.ts
similarity index 100%
rename from hermes-console-vue/src/utils/topic-utils/topic-utils.spec.ts
rename to hermes-console/src/utils/topic-utils/topic-utils.spec.ts
diff --git a/hermes-console-vue/src/utils/topic-utils/topic-utils.ts b/hermes-console/src/utils/topic-utils/topic-utils.ts
similarity index 100%
rename from hermes-console-vue/src/utils/topic-utils/topic-utils.ts
rename to hermes-console/src/utils/topic-utils/topic-utils.ts
diff --git a/hermes-console-vue/src/utils/validators/index.ts b/hermes-console/src/utils/validators/index.ts
similarity index 100%
rename from hermes-console-vue/src/utils/validators/index.ts
rename to hermes-console/src/utils/validators/index.ts
diff --git a/hermes-console-vue/src/views/admin/consistency/ConsistencyView.spec.ts b/hermes-console/src/views/admin/consistency/ConsistencyView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/consistency/ConsistencyView.spec.ts
rename to hermes-console/src/views/admin/consistency/ConsistencyView.spec.ts
diff --git a/hermes-console-vue/src/views/admin/consistency/ConsistencyView.vue b/hermes-console/src/views/admin/consistency/ConsistencyView.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/consistency/ConsistencyView.vue
rename to hermes-console/src/views/admin/consistency/ConsistencyView.vue
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-group/InconsistentGroup.spec.ts b/hermes-console/src/views/admin/consistency/inconsistent-group/InconsistentGroup.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-group/InconsistentGroup.spec.ts
rename to hermes-console/src/views/admin/consistency/inconsistent-group/InconsistentGroup.spec.ts
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-group/InconsistentGroup.vue b/hermes-console/src/views/admin/consistency/inconsistent-group/InconsistentGroup.vue
similarity index 89%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-group/InconsistentGroup.vue
rename to hermes-console/src/views/admin/consistency/inconsistent-group/InconsistentGroup.vue
index 8352004610..56c7b25696 100644
--- a/hermes-console-vue/src/views/admin/consistency/inconsistent-group/InconsistentGroup.vue
+++ b/hermes-console/src/views/admin/consistency/inconsistent-group/InconsistentGroup.vue
@@ -2,6 +2,7 @@
   import { useConsistencyStore } from '@/store/consistency/useConsistencyStore';
   import { useI18n } from 'vue-i18n';
   import { useRouter } from 'vue-router';
+  import { useSync } from '@/composables/sync/use-sync/useSync';
   import InconsistentMetadata from '@/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue';
 
   const router = useRouter();
@@ -13,6 +14,7 @@
   >;
 
   const consistencyStore = useConsistencyStore();
+  const { syncGroup } = useSync();
 
   const group = consistencyStore.group(groupId);
 
@@ -33,6 +35,13 @@
       title: groupId,
     },
   ];
+
+  async function sync(datacenter: string) {
+    const succeeded = await syncGroup(groupId, datacenter);
+    if (succeeded) {
+      router.push('/ui/consistency');
+    }
+  }
 </script>
 
 <template>
@@ -52,6 +61,7 @@
     <InconsistentMetadata
       :metadata="group.inconsistentMetadata"
       v-if="group"
+      @sync="sync"
       class="mt-8"
     ></InconsistentMetadata>
     <v-card
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupListing.spec.ts b/hermes-console/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupListing.spec.ts
similarity index 57%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupListing.spec.ts
rename to hermes-console/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupListing.spec.ts
index 872b65a9fc..0a6d135874 100644
--- a/hermes-console-vue/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupListing.spec.ts
+++ b/hermes-console/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupListing.spec.ts
@@ -10,21 +10,32 @@ describe('InconsistentGroupListing', () => {
     setActivePinia(createPinia());
   });
 
-  it('should render inconsistent groups table', async () => {
-    // given
-    const group = 'pl.allegro.public.group';
+  it.each([
+    [null, 1],
+    ['pl.allegro.public.group', 1],
+    ['PL.ALLEGRO.PUBLIC.GROUP', 1],
+    ['public', 1],
+    ['Public', 1],
+    ['pl.allegro.internal.group', 0],
+    ['FOO', 0],
+  ])(
+    'should render inconsistent groups table with filter applied (case-insensitive, filter: %s)',
+    async (filter: string | null, expectedGroups: number) => {
+      // given
+      const group = 'pl.allegro.public.group';
 
-    // when
-    const { getByText } = render(InconsistentGroupsListing, {
-      props: {
-        filter: null,
-        inconsistentGroups: dummyGroupInconsistency,
-      },
-    });
+      // when
+      const { queryAllByText } = render(InconsistentGroupsListing, {
+        props: {
+          filter,
+          inconsistentGroups: dummyGroupInconsistency,
+        },
+      });
 
-    // then
-    expect(getByText(group)).toBeVisible();
-  });
+      // then
+      expect(queryAllByText(group).length).toBe(expectedGroups);
+    },
+  );
 
   it('should render empty groups table', async () => {
     //given
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupsListing.vue b/hermes-console/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupsListing.vue
similarity index 93%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupsListing.vue
rename to hermes-console/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupsListing.vue
index 352e2a58a8..0b1f5d846f 100644
--- a/hermes-console-vue/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupsListing.vue
+++ b/hermes-console/src/views/admin/consistency/inconsistent-groups-listing/InconsistentGroupsListing.vue
@@ -14,7 +14,9 @@
 
   const filteredGroups = computed(() => {
     return props.inconsistentGroups.filter(
-      (group) => !props.filter || group.name.includes(props.filter),
+      (group) =>
+        !props.filter ||
+        group.name.toLowerCase().includes(props.filter.toLowerCase()),
     );
   });
 
diff --git a/hermes-console/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.spec.ts b/hermes-console/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.spec.ts
new file mode 100644
index 0000000000..16a723fe1b
--- /dev/null
+++ b/hermes-console/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.spec.ts
@@ -0,0 +1,61 @@
+import { beforeEach, describe, expect } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { inconsistentMetadata } from '@/dummy/inconsistentMetadata';
+import { render, renderWithEmits } from '@/utils/test-utils';
+import { waitFor } from '@testing-library/vue';
+import InconsistentMetadata from '@/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue';
+import router from '@/router';
+
+describe('InconsistentMetadataView', () => {
+  beforeEach(async () => {
+    setActivePinia(createPinia());
+  });
+
+  it('should render metadata inconsistencies', () => {
+    // when
+    const { getByText } = render(InconsistentMetadata, {
+      props: {
+        metadata: inconsistentMetadata,
+      },
+    });
+
+    // then
+    expect(
+      getByText('consistency.inconsistentGroup.metadata.inconsistent'),
+    ).toBeVisible();
+  });
+
+  it('should render banner with info that metadata are consistent', () => {
+    // when
+    const { getByText } = render(InconsistentMetadata, {
+      props: {
+        metadata: [],
+      },
+    });
+
+    // then
+    expect(
+      getByText('consistency.inconsistentGroup.metadata.consistent'),
+    ).toBeVisible();
+  });
+
+  it('should emit event with selected datacenter when sync button is clicked', async () => {
+    const group = 'pl.allegro.public.group';
+    await router.push(`/ui/consistency/${group}`);
+
+    const wrapper = renderWithEmits(InconsistentMetadata, {
+      props: {
+        metadata: inconsistentMetadata,
+      },
+    });
+
+    const buttonId = `sync-datacenter-${inconsistentMetadata[0].datacenter}`;
+    await wrapper.find(`[data-testid="${buttonId}"]`).trigger('click');
+
+    await waitFor(() => {
+      const syncEvents = wrapper.emitted('sync')!!;
+      expect(syncEvents.length).toEqual(1);
+      expect(syncEvents[0]).toEqual([inconsistentMetadata[0].datacenter]);
+    });
+  });
+});
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue b/hermes-console/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue
similarity index 61%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue
rename to hermes-console/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue
index 99d6e721d3..66519c1b95 100644
--- a/hermes-console-vue/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue
+++ b/hermes-console/src/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue
@@ -8,6 +8,10 @@
 
   const { t } = useI18n();
 
+  const emit = defineEmits<{
+    sync: [datacenter: string];
+  }>();
+
   const prettyJson = (jsonString: string | undefined): string => {
     if (jsonString === undefined) {
       return 'null';
@@ -15,6 +19,10 @@
       return JSON.parse(jsonString);
     }
   };
+
+  function sync(datacenter: string) {
+    emit('sync', datacenter);
+  }
 </script>
 
 <template>
@@ -40,6 +48,24 @@
         </tr>
       </tbody>
     </v-table>
+    <v-card-text>
+      <p class="text-h5">{{ $t('consistency.sync.header') }}</p>
+      <p class="text-subtitle-1 mt-2">
+        {{ $t('consistency.sync.explanation') }}
+      </p>
+    </v-card-text>
+    <v-card-actions>
+      <p class="text mt-2 mr-4 ml-2">{{ $t('consistency.sync.cta') }}</p>
+      <v-btn
+        class="bg-primary"
+        v-for="meta in metadata"
+        @click="sync(meta.datacenter)"
+        :key="meta.datacenter"
+        :data-testid="`sync-datacenter-${meta.datacenter}`"
+      >
+        {{ meta.datacenter }}
+      </v-btn>
+    </v-card-actions>
   </v-card>
   <v-banner
     v-else
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.spec.ts b/hermes-console/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.spec.ts
rename to hermes-console/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.spec.ts
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.vue b/hermes-console/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.vue
similarity index 71%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.vue
rename to hermes-console/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.vue
index c7da46468c..814cef6d4b 100644
--- a/hermes-console-vue/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.vue
+++ b/hermes-console/src/views/admin/consistency/inconsistent-topic/InconsistentTopic.vue
@@ -1,15 +1,19 @@
 <script setup lang="ts">
+  import { parseSubscriptionFqn } from '@/utils/subscription-utils/subscription-utils';
   import { useConsistencyStore } from '@/store/consistency/useConsistencyStore';
   import { useI18n } from 'vue-i18n';
-  import { useRoute } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
+  import { useSync } from '@/composables/sync/use-sync/useSync';
   import InconsistentMetadata from '@/views/admin/consistency/inconsistent-metadata/InconsistentMetadata.vue';
 
+  const router = useRouter();
   const route = useRoute();
   const { t } = useI18n();
 
   const { groupId, topicId } = route.params as Record<string, string>;
 
   const consistencyStore = useConsistencyStore();
+  const { syncTopic, syncSubscription } = useSync();
 
   const topic = consistencyStore.topic(groupId, topicId);
 
@@ -31,6 +35,28 @@
       href: `/ui/consistency/${groupId}/topics/${topicId}`,
     },
   ];
+
+  async function doSyncTopic(datacenter: string) {
+    const succeeded = await syncTopic(topicId, datacenter);
+    if (succeeded) {
+      router.push('/ui/consistency');
+    }
+  }
+
+  async function doSyncSubscription(
+    subscriptionQualifiedName: string,
+    datacenter: string,
+  ) {
+    const subscriptionName = parseSubscriptionFqn(subscriptionQualifiedName);
+    const succeeded = await syncSubscription(
+      subscriptionName.topicName,
+      subscriptionName.subscriptionName,
+      datacenter,
+    );
+    if (succeeded) {
+      router.push('/ui/consistency');
+    }
+  }
 </script>
 
 <template>
@@ -55,6 +81,7 @@
       :metadata="topic.inconsistentMetadata"
       v-if="topic"
       class="mt-8"
+      @sync="doSyncTopic"
     ></InconsistentMetadata>
 
     <v-card
@@ -77,6 +104,7 @@
           <v-expansion-panel-text>
             <InconsistentMetadata
               :metadata="subscription.inconsistentMetadata"
+              @sync="(dc) => doSyncSubscription(subscription.name, dc)"
             ></InconsistentMetadata>
           </v-expansion-panel-text>
         </v-expansion-panel>
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.spec.ts b/hermes-console/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.spec.ts
similarity index 77%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.spec.ts
rename to hermes-console/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.spec.ts
index 89841f9a02..653549e9e6 100644
--- a/hermes-console-vue/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.spec.ts
+++ b/hermes-console/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.spec.ts
@@ -25,26 +25,29 @@ describe('ConstraintsListing', () => {
     });
   });
 
-  it('should render inconsistent topics listing with a filter applied', () => {
-    // given
-    const props = {
-      inconsistentTopics: dummyInconsistentTopics,
-      filter: 'Dummy',
-    };
+  it.each(['dummy', 'Dummy', 'DUMMY'])(
+    'should render inconsistent topics listing with a filter applied (case-insensitive, filter: %s)',
+    (filter: string) => {
+      // given
+      const props = {
+        inconsistentTopics: dummyInconsistentTopics,
+        filter,
+      };
 
-    // when
-    const inconsistentTopic = render(InconsistentTopicsListing, { props })
-      .getAllByText(/Dummy/)
-      .map((inconsistentTopic) => inconsistentTopic.closest('tr'));
+      // when
+      const inconsistentTopic = render(InconsistentTopicsListing, { props })
+        .getAllByText(/Dummy/)
+        .map((inconsistentTopic) => inconsistentTopic.closest('tr'));
 
-    // then
-    expect(inconsistentTopic).toHaveLength(1);
-    expect(
-      within(inconsistentTopic[0]!).getByText(
-        'consistency.inconsistentTopics.actions.delete',
-      ),
-    ).toBeVisible();
-  });
+      // then
+      expect(inconsistentTopic).toHaveLength(1);
+      expect(
+        within(inconsistentTopic[0]!).getByText(
+          'consistency.inconsistentTopics.actions.delete',
+        ),
+      ).toBeVisible();
+    },
+  );
 
   it('should render inconsistent topics listing with a filter applied (no results)', () => {
     // given
diff --git a/hermes-console-vue/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.vue b/hermes-console/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.vue
similarity index 94%
rename from hermes-console-vue/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.vue
rename to hermes-console/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.vue
index 73ccfaf4fc..704cbd098a 100644
--- a/hermes-console-vue/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.vue
+++ b/hermes-console/src/views/admin/consistency/inconsistent-topics-listing/InconsistentTopicsListing.vue
@@ -10,7 +10,9 @@
 
   const filteredTopics = computed(() => {
     return props.inconsistentTopics.filter(
-      (topic) => !props.filter || topic.includes(props.filter),
+      (topic) =>
+        !props.filter ||
+        topic.toLowerCase().includes(props.filter.toLowerCase()),
     );
   });
 
diff --git a/hermes-console-vue/src/views/admin/constraints/ConstraintsView.spec.ts b/hermes-console/src/views/admin/constraints/ConstraintsView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/constraints/ConstraintsView.spec.ts
rename to hermes-console/src/views/admin/constraints/ConstraintsView.spec.ts
diff --git a/hermes-console-vue/src/views/admin/constraints/ConstraintsView.vue b/hermes-console/src/views/admin/constraints/ConstraintsView.vue
similarity index 98%
rename from hermes-console-vue/src/views/admin/constraints/ConstraintsView.vue
rename to hermes-console/src/views/admin/constraints/ConstraintsView.vue
index e662e63eb7..a0da409f01 100644
--- a/hermes-console-vue/src/views/admin/constraints/ConstraintsView.vue
+++ b/hermes-console/src/views/admin/constraints/ConstraintsView.vue
@@ -67,9 +67,8 @@
   };
 
   const onSubscriptionConstraintDeleted = async (subscriptionFqn: string) => {
-    const constraintChanged = await deleteSubscriptionConstraint(
-      subscriptionFqn,
-    );
+    const constraintChanged =
+      await deleteSubscriptionConstraint(subscriptionFqn);
     refreshOnMutation(constraintChanged);
   };
 </script>
diff --git a/hermes-console-vue/src/views/admin/constraints/constraints-listing/ConstraintsListing.spec.ts b/hermes-console/src/views/admin/constraints/constraints-listing/ConstraintsListing.spec.ts
similarity index 81%
rename from hermes-console-vue/src/views/admin/constraints/constraints-listing/ConstraintsListing.spec.ts
rename to hermes-console/src/views/admin/constraints/constraints-listing/ConstraintsListing.spec.ts
index 806ef6972f..8042c80f13 100644
--- a/hermes-console-vue/src/views/admin/constraints/constraints-listing/ConstraintsListing.spec.ts
+++ b/hermes-console/src/views/admin/constraints/constraints-listing/ConstraintsListing.spec.ts
@@ -10,8 +10,6 @@ describe('ConstraintsListing', () => {
     // given
     const props = {
       constraints: dummyConstraints.topicConstraints,
-      upsertConstraint: () => {},
-      deleteConstraint: () => {},
     };
 
     // when
@@ -35,8 +33,6 @@ describe('ConstraintsListing', () => {
     // given
     const props = {
       constraints: dummyConstraints.subscriptionConstraints,
-      upsertConstraint: () => {},
-      deleteConstraint: () => {},
     };
 
     // when
@@ -56,34 +52,33 @@ describe('ConstraintsListing', () => {
     );
   });
 
-  it('should render constraints listing with a filter applied', () => {
-    // given
-    const props = {
-      constraints: dummyConstraints.topicConstraints,
-      filter: 'pl.group.Topic1',
-      upsertConstraint: () => {},
-      deleteConstraint: () => {},
-    };
-
-    // when
-    const constraints = render(ConstraintsListing, { props })
-      .getAllByText(/pl\.group\.Topic1/)
-      .map((constraint) => constraint.closest('tr'));
-
-    // then
-    expect(constraints).toHaveLength(1);
-    expect(
-      within(constraints[0]!).getByText(/consumersNumberChip 2/),
-    ).toBeVisible();
-  });
+  it.each(['pl.group.Topic1', 'pl.group.topic1', 'PL.GROUP.TOPIC1'])(
+    'should render constraints listing with a filter applied (case-insensitive, filter: %s)',
+    (filter: string) => {
+      // given
+      const props = {
+        constraints: dummyConstraints.topicConstraints,
+        filter,
+      };
+
+      // when
+      const constraints = render(ConstraintsListing, { props })
+        .getAllByText(/pl\.group\.Topic1/)
+        .map((constraint) => constraint.closest('tr'));
+
+      // then
+      expect(constraints).toHaveLength(1);
+      expect(
+        within(constraints[0]!).getByText(/consumersNumberChip 2/),
+      ).toBeVisible();
+    },
+  );
 
   it('should render constraints listing with a filter applied (no results)', () => {
     // given
     const props = {
       constraints: dummyConstraints.topicConstraints,
       filter: 'pl.group.NoExistingTopic',
-      upsertConstraint: () => {},
-      deleteConstraint: () => {},
     };
 
     // when
@@ -130,8 +125,6 @@ describe('ConstraintsListing', () => {
 
     const props = {
       constraints: dummyConstraints.topicConstraints,
-      upsertConstraint: () => {},
-      deleteConstraint: () => {},
     };
 
     const { queryByText, getByText } = render(ConstraintsListing, { props });
@@ -150,8 +143,6 @@ describe('ConstraintsListing', () => {
 
     const props = {
       constraints: dummyConstraints.subscriptionConstraints,
-      upsertConstraint: () => {},
-      deleteConstraint: () => {},
     };
 
     const { queryByText, getByText } = render(ConstraintsListing, { props });
diff --git a/hermes-console-vue/src/views/admin/constraints/constraints-listing/ConstraintsListing.vue b/hermes-console/src/views/admin/constraints/constraints-listing/ConstraintsListing.vue
similarity index 95%
rename from hermes-console-vue/src/views/admin/constraints/constraints-listing/ConstraintsListing.vue
rename to hermes-console/src/views/admin/constraints/constraints-listing/ConstraintsListing.vue
index b1cfe6f77a..1f438ae147 100644
--- a/hermes-console-vue/src/views/admin/constraints/constraints-listing/ConstraintsListing.vue
+++ b/hermes-console/src/views/admin/constraints/constraints-listing/ConstraintsListing.vue
@@ -18,7 +18,9 @@
   const filteredConstraints = computed(() =>
     Object.fromEntries(
       Object.entries(props.constraints).filter(
-        ([name]) => !props.filter || name.indexOf(props.filter) !== -1,
+        ([name]) =>
+          !props.filter ||
+          name.toLowerCase().includes(props.filter.toLowerCase()),
       ),
     ),
   );
diff --git a/hermes-console-vue/src/views/admin/constraints/create-constraint-form/CreateConstraintDialog.vue b/hermes-console/src/views/admin/constraints/create-constraint-form/CreateConstraintDialog.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/constraints/create-constraint-form/CreateConstraintDialog.vue
rename to hermes-console/src/views/admin/constraints/create-constraint-form/CreateConstraintDialog.vue
diff --git a/hermes-console-vue/src/views/admin/constraints/create-constraint-form/CreateConstraintFormView.spec.ts b/hermes-console/src/views/admin/constraints/create-constraint-form/CreateConstraintFormView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/constraints/create-constraint-form/CreateConstraintFormView.spec.ts
rename to hermes-console/src/views/admin/constraints/create-constraint-form/CreateConstraintFormView.spec.ts
diff --git a/hermes-console-vue/src/views/admin/constraints/create-constraint-form/CreateConstraintFormView.vue b/hermes-console/src/views/admin/constraints/create-constraint-form/CreateConstraintFormView.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/constraints/create-constraint-form/CreateConstraintFormView.vue
rename to hermes-console/src/views/admin/constraints/create-constraint-form/CreateConstraintFormView.vue
diff --git a/hermes-console-vue/src/views/admin/constraints/edit-constraint-form/EditConstraintDialog.vue b/hermes-console/src/views/admin/constraints/edit-constraint-form/EditConstraintDialog.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/constraints/edit-constraint-form/EditConstraintDialog.vue
rename to hermes-console/src/views/admin/constraints/edit-constraint-form/EditConstraintDialog.vue
diff --git a/hermes-console-vue/src/views/admin/constraints/edit-constraint-form/EditConstraintFormView.spec.ts b/hermes-console/src/views/admin/constraints/edit-constraint-form/EditConstraintFormView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/constraints/edit-constraint-form/EditConstraintFormView.spec.ts
rename to hermes-console/src/views/admin/constraints/edit-constraint-form/EditConstraintFormView.spec.ts
diff --git a/hermes-console-vue/src/views/admin/constraints/edit-constraint-form/EditConstraintFormView.vue b/hermes-console/src/views/admin/constraints/edit-constraint-form/EditConstraintFormView.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/constraints/edit-constraint-form/EditConstraintFormView.vue
rename to hermes-console/src/views/admin/constraints/edit-constraint-form/EditConstraintFormView.vue
diff --git a/hermes-console-vue/src/views/admin/consumer-groups/ConsumerGroupsView.spec.ts b/hermes-console/src/views/admin/consumer-groups/ConsumerGroupsView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/consumer-groups/ConsumerGroupsView.spec.ts
rename to hermes-console/src/views/admin/consumer-groups/ConsumerGroupsView.spec.ts
diff --git a/hermes-console-vue/src/views/admin/consumer-groups/ConsumerGroupsView.vue b/hermes-console/src/views/admin/consumer-groups/ConsumerGroupsView.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/consumer-groups/ConsumerGroupsView.vue
rename to hermes-console/src/views/admin/consumer-groups/ConsumerGroupsView.vue
diff --git a/hermes-console-vue/src/views/admin/consumer-groups/consumer-group-member/ConsumerGroupMembers.spec.ts b/hermes-console/src/views/admin/consumer-groups/consumer-group-member/ConsumerGroupMembers.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/consumer-groups/consumer-group-member/ConsumerGroupMembers.spec.ts
rename to hermes-console/src/views/admin/consumer-groups/consumer-group-member/ConsumerGroupMembers.spec.ts
diff --git a/hermes-console-vue/src/views/admin/consumer-groups/consumer-group-member/ConsumerGroupMembers.vue b/hermes-console/src/views/admin/consumer-groups/consumer-group-member/ConsumerGroupMembers.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/consumer-groups/consumer-group-member/ConsumerGroupMembers.vue
rename to hermes-console/src/views/admin/consumer-groups/consumer-group-member/ConsumerGroupMembers.vue
diff --git a/hermes-console-vue/src/views/admin/consumer-groups/consumer-groups-table/ConsumerGroupsTable.spec.ts b/hermes-console/src/views/admin/consumer-groups/consumer-groups-table/ConsumerGroupsTable.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/consumer-groups/consumer-groups-table/ConsumerGroupsTable.spec.ts
rename to hermes-console/src/views/admin/consumer-groups/consumer-groups-table/ConsumerGroupsTable.spec.ts
diff --git a/hermes-console-vue/src/views/admin/consumer-groups/consumer-groups-table/ConsumerGroupsTable.vue b/hermes-console/src/views/admin/consumer-groups/consumer-groups-table/ConsumerGroupsTable.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/consumer-groups/consumer-groups-table/ConsumerGroupsTable.vue
rename to hermes-console/src/views/admin/consumer-groups/consumer-groups-table/ConsumerGroupsTable.vue
diff --git a/hermes-console-vue/src/views/admin/readiness/ReadinessView.spec.ts b/hermes-console/src/views/admin/readiness/ReadinessView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/admin/readiness/ReadinessView.spec.ts
rename to hermes-console/src/views/admin/readiness/ReadinessView.spec.ts
diff --git a/hermes-console-vue/src/views/admin/readiness/ReadinessView.vue b/hermes-console/src/views/admin/readiness/ReadinessView.vue
similarity index 100%
rename from hermes-console-vue/src/views/admin/readiness/ReadinessView.vue
rename to hermes-console/src/views/admin/readiness/ReadinessView.vue
diff --git a/hermes-console-vue/src/views/favorite/subscriptions/FavoriteSubscriptionsView.spec.ts b/hermes-console/src/views/favorite/subscriptions/FavoriteSubscriptionsView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/favorite/subscriptions/FavoriteSubscriptionsView.spec.ts
rename to hermes-console/src/views/favorite/subscriptions/FavoriteSubscriptionsView.spec.ts
diff --git a/hermes-console-vue/src/views/favorite/subscriptions/FavoriteSubscriptionsView.vue b/hermes-console/src/views/favorite/subscriptions/FavoriteSubscriptionsView.vue
similarity index 100%
rename from hermes-console-vue/src/views/favorite/subscriptions/FavoriteSubscriptionsView.vue
rename to hermes-console/src/views/favorite/subscriptions/FavoriteSubscriptionsView.vue
diff --git a/hermes-console-vue/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.spec.ts b/hermes-console/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.spec.ts
similarity index 86%
rename from hermes-console-vue/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.spec.ts
rename to hermes-console/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.spec.ts
index 94026953f6..3ea064e024 100644
--- a/hermes-console-vue/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.spec.ts
+++ b/hermes-console/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.spec.ts
@@ -29,21 +29,24 @@ describe('FavoriteSubscriptionsListing', () => {
     });
   });
 
-  it('should render listing with a filter applied', () => {
-    // given
-    const props = {
-      subscriptions: dummySubscriptions,
-      filter: 'fo',
-    };
-
-    // when
-    const subscriptions = render(FavoriteSubscriptionsListing, { props })
-      .getAllByText(/foo/)
-      .map((subscription) => subscription.closest('tr'));
-
-    // then
-    expect(subscriptions).toHaveLength(1);
-  });
+  it.each(['fo', 'Fo', 'FO'])(
+    'should render listing with a filter applied (case-insensitive, filter: %s)',
+    (filter: string) => {
+      // given
+      const props = {
+        subscriptions: dummySubscriptions,
+        filter,
+      };
+
+      // when
+      const subscriptions = render(FavoriteSubscriptionsListing, { props })
+        .getAllByText(/foo/)
+        .map((subscription) => subscription.closest('tr'));
+
+      // then
+      expect(subscriptions).toHaveLength(1);
+    },
+  );
 
   it('should render listing with a filter applied (no results)', () => {
     // given
diff --git a/hermes-console-vue/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.vue b/hermes-console/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.vue
similarity index 96%
rename from hermes-console-vue/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.vue
rename to hermes-console/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.vue
index 07398a0ab1..9dfb9e5024 100644
--- a/hermes-console-vue/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.vue
+++ b/hermes-console/src/views/favorite/subscriptions/subscription-listing/FavoriteSubscriptionsListing.vue
@@ -18,7 +18,9 @@
 
   const filteredSubscriptions = computed(() => {
     return (props.subscriptions ?? []).filter(
-      (subscription) => !props.filter || subscription.includes(props.filter),
+      (subscription) =>
+        !props.filter ||
+        subscription.toLowerCase().includes(props.filter.toLowerCase()),
     );
   });
 
diff --git a/hermes-console-vue/src/views/favorite/topics/FavoriteTopicsView.spec.ts b/hermes-console/src/views/favorite/topics/FavoriteTopicsView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/favorite/topics/FavoriteTopicsView.spec.ts
rename to hermes-console/src/views/favorite/topics/FavoriteTopicsView.spec.ts
diff --git a/hermes-console-vue/src/views/favorite/topics/FavoriteTopicsView.vue b/hermes-console/src/views/favorite/topics/FavoriteTopicsView.vue
similarity index 100%
rename from hermes-console-vue/src/views/favorite/topics/FavoriteTopicsView.vue
rename to hermes-console/src/views/favorite/topics/FavoriteTopicsView.vue
diff --git a/hermes-console-vue/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.spec.ts b/hermes-console/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.spec.ts
similarity index 86%
rename from hermes-console-vue/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.spec.ts
rename to hermes-console/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.spec.ts
index d9c03e130d..c26bf51b91 100644
--- a/hermes-console-vue/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.spec.ts
+++ b/hermes-console/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.spec.ts
@@ -27,21 +27,24 @@ describe('FavoriteTopicsListing', () => {
     });
   });
 
-  it('should render listing with a filter applied', () => {
-    // given
-    const props = {
-      topics: dummyTopics,
-      filter: 'fo',
-    };
-
-    // when
-    const topics = render(FavoriteTopicsListing, { props })
-      .getAllByText(/foobarEventV1/)
-      .map((topic) => topic.closest('tr'));
-
-    // then
-    expect(topics).toHaveLength(1);
-  });
+  it.each(['fo', 'Fo', 'FO'])(
+    'should render listing with a filter applied (case-insensitive, %s)',
+    (filter: string) => {
+      // given
+      const props = {
+        topics: dummyTopics,
+        filter,
+      };
+
+      // when
+      const topics = render(FavoriteTopicsListing, { props })
+        .getAllByText(/foobarEventV1/)
+        .map((topic) => topic.closest('tr'));
+
+      // then
+      expect(topics).toHaveLength(1);
+    },
+  );
 
   it('should render listing with a filter applied (no results)', () => {
     // given
diff --git a/hermes-console-vue/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.vue b/hermes-console/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.vue
similarity index 95%
rename from hermes-console-vue/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.vue
rename to hermes-console/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.vue
index 4b04758010..6870854186 100644
--- a/hermes-console-vue/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.vue
+++ b/hermes-console/src/views/favorite/topics/topic-listing/FavoriteTopicsListing.vue
@@ -17,7 +17,9 @@
 
   const filteredTopics = computed(() => {
     return (props.topics ?? []).filter(
-      (topic) => !props.filter || topic.includes(props.filter),
+      (topic) =>
+        !props.filter ||
+        topic.toLowerCase().includes(props.filter.toLowerCase()),
     );
   });
 
diff --git a/hermes-console-vue/src/views/group-topics/GroupTopicsView.spec.ts b/hermes-console/src/views/group-topics/GroupTopicsView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/group-topics/GroupTopicsView.spec.ts
rename to hermes-console/src/views/group-topics/GroupTopicsView.spec.ts
diff --git a/hermes-console-vue/src/views/group-topics/GroupTopicsView.vue b/hermes-console/src/views/group-topics/GroupTopicsView.vue
similarity index 98%
rename from hermes-console-vue/src/views/group-topics/GroupTopicsView.vue
rename to hermes-console/src/views/group-topics/GroupTopicsView.vue
index 62cdca499e..e1745eaf15 100644
--- a/hermes-console-vue/src/views/group-topics/GroupTopicsView.vue
+++ b/hermes-console/src/views/group-topics/GroupTopicsView.vue
@@ -102,7 +102,7 @@
     <v-row dense>
       <v-col>
         <v-card density="compact" class="d-flex flex-row justify-space-between">
-          <v-card-text>
+          <v-card-text style="min-width: 70%">
             <p class="text-overline">{{ $t('groupTopics.title') }}</p>
             <p class="text-h4 font-weight-bold mb-2">
               {{ groupId }}
@@ -143,6 +143,7 @@
                     operation="add"
                     :group="groupId"
                     :topic="null"
+                    :roles="roles"
                     @created="pushToTopic"
                     @cancel="hideTopicForm"
                   />
diff --git a/hermes-console-vue/src/views/group-topics/group-topics-listing/GroupTopicsListing.spec.ts b/hermes-console/src/views/group-topics/group-topics-listing/GroupTopicsListing.spec.ts
similarity index 80%
rename from hermes-console-vue/src/views/group-topics/group-topics-listing/GroupTopicsListing.spec.ts
rename to hermes-console/src/views/group-topics/group-topics-listing/GroupTopicsListing.spec.ts
index 093ce7c0d0..8d9bb47c3b 100644
--- a/hermes-console-vue/src/views/group-topics/group-topics-listing/GroupTopicsListing.spec.ts
+++ b/hermes-console/src/views/group-topics/group-topics-listing/GroupTopicsListing.spec.ts
@@ -21,21 +21,24 @@ describe('GroupTopicsListing', () => {
     });
   });
 
-  it('should render group topics listing with a filter applied', () => {
-    // given
-    const props = {
-      group: dummyGroup,
-      filter: 'V1',
-    };
+  it.each(['v1', 'V1', 'productevent', 'ProductEvent', 'PRODUCTEVENT'])(
+    'should render group topics listing with a filter applied (case-insensitive, filter: %s)',
+    (filter: string) => {
+      // given
+      const props = {
+        group: dummyGroup,
+        filter,
+      };
 
-    // when
-    const topics = render(GroupTopicsListing, { props })
-      .getAllByText(/ProductEventV1/)
-      .map((topic) => topic.closest('tr'));
+      // when
+      const topics = render(GroupTopicsListing, { props })
+        .getAllByText(/ProductEventV1/)
+        .map((topic) => topic.closest('tr'));
 
-    // then
-    expect(topics).toHaveLength(1);
-  });
+      // then
+      expect(topics).toHaveLength(1);
+    },
+  );
 
   it('should render group topics listing with a filter applied (no results)', () => {
     // given
diff --git a/hermes-console-vue/src/views/group-topics/group-topics-listing/GroupTopicsListing.vue b/hermes-console/src/views/group-topics/group-topics-listing/GroupTopicsListing.vue
similarity index 94%
rename from hermes-console-vue/src/views/group-topics/group-topics-listing/GroupTopicsListing.vue
rename to hermes-console/src/views/group-topics/group-topics-listing/GroupTopicsListing.vue
index 55445cb056..f2a2759b83 100644
--- a/hermes-console-vue/src/views/group-topics/group-topics-listing/GroupTopicsListing.vue
+++ b/hermes-console/src/views/group-topics/group-topics-listing/GroupTopicsListing.vue
@@ -14,7 +14,9 @@
 
   const filteredTopics = computed(() => {
     return (props.group?.topics ?? []).filter(
-      (topic) => !props.filter || topic.includes(props.filter),
+      (topic) =>
+        !props.filter ||
+        topic.toLowerCase().includes(props.filter.toLowerCase()),
     );
   });
 
@@ -25,7 +27,6 @@
   }
 
   function onTopicBlankClick(topicName: string) {
-    console.log(router.currentRoute.value.path);
     window.open(
       `${router.currentRoute.value.path}/topics/${topicName}`,
       '_blank',
diff --git a/hermes-console-vue/src/views/groups/GroupsView.spec.ts b/hermes-console/src/views/groups/GroupsView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/groups/GroupsView.spec.ts
rename to hermes-console/src/views/groups/GroupsView.spec.ts
diff --git a/hermes-console-vue/src/views/groups/GroupsView.vue b/hermes-console/src/views/groups/GroupsView.vue
similarity index 100%
rename from hermes-console-vue/src/views/groups/GroupsView.vue
rename to hermes-console/src/views/groups/GroupsView.vue
diff --git a/hermes-console-vue/src/views/groups/group-form/GroupForm.spec.ts b/hermes-console/src/views/groups/group-form/GroupForm.spec.ts
similarity index 95%
rename from hermes-console-vue/src/views/groups/group-form/GroupForm.spec.ts
rename to hermes-console/src/views/groups/group-form/GroupForm.spec.ts
index 34bf7e19db..a21fd4768b 100644
--- a/hermes-console-vue/src/views/groups/group-form/GroupForm.spec.ts
+++ b/hermes-console/src/views/groups/group-form/GroupForm.spec.ts
@@ -79,8 +79,6 @@ describe('GroupForm', () => {
     );
 
     // then
-    expect(
-      getByText('groups.groupForm.save').closest('button'),
-    ).not.toBeEnabled();
+    expect(getByText('groups.groupForm.save').closest('button')).toBeEnabled();
   });
 });
diff --git a/hermes-console-vue/src/views/groups/group-form/GroupForm.vue b/hermes-console/src/views/groups/group-form/GroupForm.vue
similarity index 100%
rename from hermes-console-vue/src/views/groups/group-form/GroupForm.vue
rename to hermes-console/src/views/groups/group-form/GroupForm.vue
diff --git a/hermes-console-vue/src/views/groups/group-listing/GroupListing.spec.ts b/hermes-console/src/views/groups/group-listing/GroupListing.spec.ts
similarity index 76%
rename from hermes-console-vue/src/views/groups/group-listing/GroupListing.spec.ts
rename to hermes-console/src/views/groups/group-listing/GroupListing.spec.ts
index 9dd1b51157..09add2df22 100644
--- a/hermes-console-vue/src/views/groups/group-listing/GroupListing.spec.ts
+++ b/hermes-console/src/views/groups/group-listing/GroupListing.spec.ts
@@ -26,23 +26,26 @@ describe('GroupListing', () => {
     });
   });
 
-  it('should render group listing with a filter applied', () => {
-    // given
-    const props = {
-      groups: dummyGroups,
-      filter: 'pl.allegro.offer',
-    };
+  it.each(['pl.allegro.offer', 'PL.ALLEGRO.OFFER', 'Pl.Allegro.Offer'])(
+    'should render group listing with a filter applied (case-insensitive, filter: %s)',
+    (filter: string) => {
+      // given
+      const props = {
+        groups: dummyGroups,
+        filter,
+      };
 
-    // when
-    const groups = render(GroupListing, { props })
-      .getAllByText(/pl\.allegro\.offer/)
-      .map((group) => group.closest('tr'));
+      // when
+      const groups = render(GroupListing, { props })
+        .getAllByText(/pl\.allegro\.offer/)
+        .map((group) => group.closest('tr'));
 
-    // then
-    expect(groups).toHaveLength(2);
-    expect(within(groups[0]!).getByText(/topicsChip 1/)).toBeInTheDocument();
-    expect(within(groups[1]!).getByText(/topicsChip 2/)).toBeInTheDocument();
-  });
+      // then
+      expect(groups).toHaveLength(2);
+      expect(within(groups[0]!).getByText(/topicsChip 1/)).toBeInTheDocument();
+      expect(within(groups[1]!).getByText(/topicsChip 2/)).toBeInTheDocument();
+    },
+  );
 
   it('should render group listing with a filter applied (no results)', () => {
     // given
diff --git a/hermes-console-vue/src/views/groups/group-listing/GroupListing.vue b/hermes-console/src/views/groups/group-listing/GroupListing.vue
similarity index 95%
rename from hermes-console-vue/src/views/groups/group-listing/GroupListing.vue
rename to hermes-console/src/views/groups/group-listing/GroupListing.vue
index 98f3e8f778..c4fe18bd2c 100644
--- a/hermes-console-vue/src/views/groups/group-listing/GroupListing.vue
+++ b/hermes-console/src/views/groups/group-listing/GroupListing.vue
@@ -14,7 +14,9 @@
 
   const filteredGroups = computed(() => {
     return (props.groups ?? []).filter(
-      (group) => !props.filter || group.name.includes(props.filter),
+      (group) =>
+        !props.filter ||
+        group.name.toLowerCase().includes(props.filter.toLowerCase()),
     );
   });
 
diff --git a/hermes-console-vue/src/views/home/HomeView.spec.ts b/hermes-console/src/views/home/HomeView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/home/HomeView.spec.ts
rename to hermes-console/src/views/home/HomeView.spec.ts
diff --git a/hermes-console-vue/src/views/home/HomeView.vue b/hermes-console/src/views/home/HomeView.vue
similarity index 90%
rename from hermes-console-vue/src/views/home/HomeView.vue
rename to hermes-console/src/views/home/HomeView.vue
index 507360e574..6da5947388 100644
--- a/hermes-console-vue/src/views/home/HomeView.vue
+++ b/hermes-console/src/views/home/HomeView.vue
@@ -94,6 +94,20 @@
       </v-col>
     </v-row>
 
+    <v-row justify="center" v-if="configStore.loadedConfig.costs.enabled">
+      <v-col cols="6">
+        <v-btn
+          color="primary"
+          block
+          :href="configStore.loadedConfig.costs.globalDetailsUrl"
+          target="_blank"
+        >
+          <v-icon left icon="mdi-currency-usd"></v-icon>
+          <span class="ml-1">{{ $t('homeView.links.costs') }}</span>
+        </v-btn>
+      </v-col>
+    </v-row>
+
     <v-row justify="center" v-if="isAdmin(roles)">
       <v-col cols="6">
         <v-btn color="secondary" block>
diff --git a/hermes-console-vue/src/views/home/home-menu/HomeMenu.spec.ts b/hermes-console/src/views/home/home-menu/HomeMenu.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/home/home-menu/HomeMenu.spec.ts
rename to hermes-console/src/views/home/home-menu/HomeMenu.spec.ts
diff --git a/hermes-console-vue/src/views/home/home-menu/HomeMenu.vue b/hermes-console/src/views/home/home-menu/HomeMenu.vue
similarity index 100%
rename from hermes-console-vue/src/views/home/home-menu/HomeMenu.vue
rename to hermes-console/src/views/home/home-menu/HomeMenu.vue
diff --git a/hermes-console-vue/src/views/redirect/RedirectView.spec.ts b/hermes-console/src/views/redirect/RedirectView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/redirect/RedirectView.spec.ts
rename to hermes-console/src/views/redirect/RedirectView.spec.ts
diff --git a/hermes-console-vue/src/views/redirect/RedirectView.vue b/hermes-console/src/views/redirect/RedirectView.vue
similarity index 100%
rename from hermes-console-vue/src/views/redirect/RedirectView.vue
rename to hermes-console/src/views/redirect/RedirectView.vue
diff --git a/hermes-console-vue/src/views/search/SearchView.spec.ts b/hermes-console/src/views/search/SearchView.spec.ts
similarity index 69%
rename from hermes-console-vue/src/views/search/SearchView.spec.ts
rename to hermes-console/src/views/search/SearchView.spec.ts
index 97fd2247ab..084a7617cb 100644
--- a/hermes-console-vue/src/views/search/SearchView.spec.ts
+++ b/hermes-console/src/views/search/SearchView.spec.ts
@@ -1,9 +1,13 @@
 import { computed, ref } from 'vue';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPiniaWithState } from '@/dummy/store';
 import { dummySubscription } from '@/dummy/subscription';
 import { dummyTopic } from '@/dummy/topic';
 import { expect } from 'vitest';
+import { fireEvent, waitFor } from '@testing-library/vue';
 import { render } from '@/utils/test-utils';
 import { useSearch } from '@/composables/search/useSearch';
+import router from '@/router';
 import SearchView from '@/views/search/SearchView.vue';
 import type { UseSearch } from '@/composables/search/useSearch';
 
@@ -21,6 +25,11 @@ const useSearchStub: UseSearch = {
 };
 
 describe('SearchView', () => {
+  beforeEach(() => {
+    vi.mocked(useSearch).mockReturnValue(useSearchStub);
+    setActivePinia(createPinia());
+  });
+
   it('should render subscriptions table when subscriptions are present', () => {
     // given
     vi.mocked(useSearch).mockReturnValueOnce({
@@ -110,4 +119,38 @@ describe('SearchView', () => {
     expect(queryByText('search.connectionError.title')).not.toBeInTheDocument();
     expect(queryByText('search.connectionError.text')).not.toBeInTheDocument();
   });
+
+  it('should modify form inputs based on passed query parameters', async () => {
+    await router.push({
+      path: '/ui/search',
+      query: { collection: 'topics', filter: 'name', pattern: 'test' },
+    });
+
+    const { getByLabelText } = render(SearchView, {
+      testPinia: createTestingPiniaWithState(),
+      global: { plugins: [router] },
+    });
+
+    expect(getByLabelText('collection').value).toBe('topics');
+    expect(getByLabelText('filter').value).toBe('name');
+    expect(getByLabelText('regex pattern').value).toBe('test');
+  });
+
+  it('should update query parameters in URL when form inputs are modified', async () => {
+    const { getByLabelText, getByRole } = render(SearchView, {
+      testPinia: createTestingPiniaWithState(),
+      global: { plugins: [router] },
+    });
+
+    await fireEvent.update(getByLabelText('regex pattern'), 'newPattern');
+    await fireEvent.click(getByRole('button'));
+
+    await waitFor(() => {
+      expect(router.currentRoute.value.query).toEqual({
+        collection: 'subscriptions',
+        filter: 'endpoint',
+        pattern: 'newPattern',
+      });
+    });
+  });
 });
diff --git a/hermes-console-vue/src/views/search/SearchView.vue b/hermes-console/src/views/search/SearchView.vue
similarity index 51%
rename from hermes-console-vue/src/views/search/SearchView.vue
rename to hermes-console/src/views/search/SearchView.vue
index e025c8ccd3..fca3feaee5 100644
--- a/hermes-console-vue/src/views/search/SearchView.vue
+++ b/hermes-console/src/views/search/SearchView.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-  import { ref } from 'vue';
+  import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
+  import { onMounted, ref } from 'vue';
   import { SearchFilter, useSearch } from '@/composables/search/useSearch';
   import { useI18n } from 'vue-i18n';
   import ConsoleAlert from '@/components/console-alert/ConsoleAlert.vue';
@@ -8,21 +9,40 @@
   import TopicSearchResults from '@/views/search/topic-search-results/TopicSearchResults.vue';
 
   const { t } = useI18n();
+  const route = useRoute();
+  const router = useRouter();
 
+  const searchCollectionValues = ['subscriptions', 'topics'];
   const searchCollections = [
-    { title: t('search.collection.subscriptions'), value: 'subscriptions' },
-    { title: t('search.collection.topics'), value: 'topics' },
+    {
+      title: t('search.collection.subscriptions'),
+      value: searchCollectionValues[0],
+    },
+    { title: t('search.collection.topics'), value: searchCollectionValues[1] },
   ];
-  const selectedSearchCollection = ref(searchCollections[0].value);
+  const selectedSearchCollection = ref(
+    searchCollectionValues.includes(route.query.collection)
+      ? route.query.collection
+      : searchCollectionValues[0],
+  );
 
+  const searchFilterValues = [
+    SearchFilter.ENDPOINT,
+    SearchFilter.NAME,
+    SearchFilter.OWNER,
+  ];
   const searchFilters = [
-    { title: t('search.filter.endpoint'), value: SearchFilter.ENDPOINT },
-    { title: t('search.filter.name'), value: SearchFilter.NAME },
-    { title: t('search.filter.owner'), value: SearchFilter.OWNER },
+    { title: t('search.filter.endpoint'), value: searchFilterValues[0] },
+    { title: t('search.filter.name'), value: searchFilterValues[1] },
+    { title: t('search.filter.owner'), value: searchFilterValues[2] },
   ];
-  const selectedSearchFilter = ref(searchFilters[0].value);
+  const selectedSearchFilter = ref(
+    searchFilterValues.includes(route.query.filter)
+      ? route.query.filter
+      : searchFilterValues[0],
+  );
 
-  const searchPattern = ref('');
+  const searchPattern = ref(route.query.pattern || '');
 
   const {
     topics,
@@ -33,6 +53,16 @@
     error,
   } = useSearch();
 
+  function updateQueryParams() {
+    router.push({
+      query: {
+        collection: selectedSearchCollection.value,
+        filter: selectedSearchFilter.value,
+        pattern: searchPattern.value,
+      },
+    });
+  }
+
   function search() {
     if (selectedSearchCollection.value === 'topics') {
       subscriptions.value = undefined;
@@ -44,6 +74,30 @@
       throw Error(`Unknown search filter: ${selectedSearchCollection.value}`);
     }
   }
+
+  function searchAndUpdateQueryParams() {
+    updateQueryParams();
+    search();
+  }
+
+  onBeforeRouteUpdate((to) => {
+    selectedSearchCollection.value = searchCollectionValues.includes(
+      to.query.collection,
+    )
+      ? to.query.collection
+      : searchCollectionValues[0];
+    selectedSearchFilter.value = searchFilterValues.includes(to.query.filter)
+      ? to.query.filter
+      : searchFilterValues[0];
+    searchPattern.value = to.query.pattern || '';
+    search();
+  });
+
+  onMounted(() => {
+    if (route.query.collection || route.query.filter || route.query.pattern) {
+      search();
+    }
+  });
 </script>
 
 <template>
@@ -57,11 +111,12 @@
     <v-row>
       <p class="text-h3 mt-16">Search</p>
     </v-row>
-    <v-form @submit.prevent="search">
+    <v-form @submit.prevent="searchAndUpdateQueryParams">
       <v-row class="mt-8">
         <v-col md="2" cols="12">
           <v-select
             v-model="selectedSearchCollection"
+            label="collection"
             :items="searchCollections"
             variant="outlined"
           ></v-select>
@@ -69,6 +124,7 @@
         <v-col md="2" cols="12">
           <v-select
             v-model="selectedSearchFilter"
+            label="filter"
             :items="searchFilters"
             variant="outlined"
           ></v-select>
@@ -94,13 +150,15 @@
     <v-row>
       <loading-spinner v-if="loading" />
     </v-row>
-    <v-card class="mb-2 mt-8">
-      <TopicSearchResults v-if="topics" :topics="topics"></TopicSearchResults>
-      <SubscriptionSearchResults
-        v-if="subscriptions"
-        :subscriptions="subscriptions"
-      ></SubscriptionSearchResults>
-    </v-card>
+    <v-row dense>
+      <v-col md="12">
+        <TopicSearchResults v-if="topics" :topics="topics"></TopicSearchResults>
+        <SubscriptionSearchResults
+          v-if="subscriptions"
+          :subscriptions="subscriptions"
+        ></SubscriptionSearchResults>
+      </v-col>
+    </v-row>
   </v-container>
 </template>
 
diff --git a/hermes-console-vue/src/views/search/subscription-search-results/SubscriptionSearchResults.spec.ts b/hermes-console/src/views/search/subscription-search-results/SubscriptionSearchResults.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/search/subscription-search-results/SubscriptionSearchResults.spec.ts
rename to hermes-console/src/views/search/subscription-search-results/SubscriptionSearchResults.spec.ts
diff --git a/hermes-console/src/views/search/subscription-search-results/SubscriptionSearchResults.vue b/hermes-console/src/views/search/subscription-search-results/SubscriptionSearchResults.vue
new file mode 100644
index 0000000000..f7c66412ff
--- /dev/null
+++ b/hermes-console/src/views/search/subscription-search-results/SubscriptionSearchResults.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+  import { groupName } from '@/utils/topic-utils/topic-utils';
+  import { useRouter } from 'vue-router';
+  import type { Subscription } from '@/api/subscription';
+
+  const router = useRouter();
+
+  const props = defineProps<{
+    subscriptions: Subscription[];
+  }>();
+
+  function onSubscriptionClick(subscription: Subscription) {
+    const group = groupName(subscription.topicName);
+    router.push({
+      path: `/ui/groups/${group}/topics/${subscription.topicName}/subscriptions/${subscription.name}`,
+    });
+  }
+  function onSubscriptionBlankClick(subscription: Subscription) {
+    const group = groupName(subscription.topicName);
+    window.open(
+      `/ui/groups/${group}/topics/${subscription.topicName}/subscriptions/${subscription.name}`,
+      '_blank',
+    );
+  }
+</script>
+
+<template>
+  <v-card class="mb-2">
+    <v-table
+      density="comfortable"
+      data-testid="subscription-search-results"
+      hover
+    >
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>{{ $t('search.results.subscription.name') }}</th>
+          <th>{{ $t('search.results.subscription.endpoint') }}</th>
+          <th>{{ $t('search.results.subscription.owner') }}</th>
+          <th>{{ $t('search.results.subscription.status') }}</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody v-if="props.subscriptions.length > 0">
+        <tr
+          v-for="(subscription, index) in subscriptions"
+          :key="subscription.name"
+          class="table__row"
+          @click.exact="onSubscriptionClick(subscription)"
+          @click.meta="onSubscriptionBlankClick(subscription)"
+          @click.ctrl="onSubscriptionBlankClick(subscription)"
+          @contextmenu="onSubscriptionBlankClick(subscription)"
+        >
+          <td class="text-medium-emphasis">
+            {{ index + 1 }}
+          </td>
+          <td class="font-weight-medium">
+            {{ subscription.name }}
+          </td>
+          <td class="font-weight-medium">
+            {{ subscription.endpoint }}
+          </td>
+          <td class="font-weight-medium">
+            {{ subscription.owner.id }}
+          </td>
+          <td class="font-weight-medium">
+            {{ subscription.state }}
+          </td>
+          <td>
+            <v-icon icon="mdi-chevron-right"></v-icon>
+          </td>
+        </tr>
+      </tbody>
+      <tbody v-else>
+        <tr>
+          <th colspan="12" class="text-center text-medium-emphasis">
+            {{ $t('search.results.subscription.noSubscriptions') }}
+          </th>
+        </tr>
+      </tbody>
+    </v-table>
+  </v-card>
+</template>
+
+<style scoped lang="scss">
+  .table__row:hover {
+    cursor: pointer;
+  }
+</style>
diff --git a/hermes-console-vue/src/views/search/topic-search-results/TopicSearchResults.spec.ts b/hermes-console/src/views/search/topic-search-results/TopicSearchResults.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/search/topic-search-results/TopicSearchResults.spec.ts
rename to hermes-console/src/views/search/topic-search-results/TopicSearchResults.spec.ts
diff --git a/hermes-console/src/views/search/topic-search-results/TopicSearchResults.vue b/hermes-console/src/views/search/topic-search-results/TopicSearchResults.vue
new file mode 100644
index 0000000000..10241862b2
--- /dev/null
+++ b/hermes-console/src/views/search/topic-search-results/TopicSearchResults.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+  import { groupName } from '@/utils/topic-utils/topic-utils';
+  import { useRouter } from 'vue-router';
+  import type { Topic } from '@/api/topic';
+
+  const router = useRouter();
+
+  const props = defineProps<{
+    topics: Topic[];
+  }>();
+
+  function onTopicClick(topic: Topic) {
+    const group = groupName(topic.name);
+    router.push({ path: `/ui/groups/${group}/topics/${topic.name}` });
+  }
+  function onTopicBlankClick(topic: Topic) {
+    const group = groupName(topic.name);
+    window.open(`/ui/groups/${group}/topics/${topic.name}`, '_blank');
+  }
+</script>
+
+<template>
+  <v-card class="mb-2">
+    <v-table density="comfortable" data-testid="topic-search-results" hover>
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>{{ $t('search.results.topic.name') }}</th>
+          <th>{{ $t('search.results.topic.owner') }}</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody v-if="props.topics.length > 0">
+        <tr
+          v-for="(topic, index) in topics"
+          :key="topic.name"
+          class="table__row"
+          @click.exact="onTopicClick(topic)"
+          @click.meta="onTopicBlankClick(topic)"
+          @click.ctrl="onTopicBlankClick(topic)"
+          @contextmenu="onTopicBlankClick(topic)"
+        >
+          <td class="text-medium-emphasis">
+            {{ index + 1 }}
+          </td>
+          <td class="font-weight-medium">
+            {{ topic.name }}
+          </td>
+          <td class="font-weight-medium">
+            {{ topic.owner.id }}
+          </td>
+          <td>
+            <v-icon icon="mdi-chevron-right"></v-icon>
+          </td>
+        </tr>
+      </tbody>
+      <tbody v-else>
+        <tr>
+          <th colspan="12" class="text-center text-medium-emphasis">
+            {{ $t('search.results.topic.noTopics') }}
+          </th>
+        </tr>
+      </tbody>
+    </v-table>
+  </v-card>
+</template>
+
+<style scoped lang="scss">
+  .table__row:hover {
+    cursor: pointer;
+  }
+</style>
diff --git a/hermes-console-vue/src/views/stats/StatsView.spec.ts b/hermes-console/src/views/stats/StatsView.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/stats/StatsView.spec.ts
rename to hermes-console/src/views/stats/StatsView.spec.ts
diff --git a/hermes-console-vue/src/views/stats/StatsView.vue b/hermes-console/src/views/stats/StatsView.vue
similarity index 100%
rename from hermes-console-vue/src/views/stats/StatsView.vue
rename to hermes-console/src/views/stats/StatsView.vue
diff --git a/hermes-console-vue/src/views/subscription/SubscriptionView.spec.ts b/hermes-console/src/views/subscription/SubscriptionView.spec.ts
similarity index 90%
rename from hermes-console-vue/src/views/subscription/SubscriptionView.spec.ts
rename to hermes-console/src/views/subscription/SubscriptionView.spec.ts
index 1b0c1ba2c1..8e19728ce8 100644
--- a/hermes-console-vue/src/views/subscription/SubscriptionView.spec.ts
+++ b/hermes-console/src/views/subscription/SubscriptionView.spec.ts
@@ -1,7 +1,9 @@
-import { beforeEach } from 'vitest';
+import { beforeEach, expect } from 'vitest';
 import { computed, ref } from 'vue';
 import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
 import { createTestingPiniaWithState } from '@/dummy/store';
+import { dummyAppConfig } from '@/dummy/app-config';
 import { dummyMetricsDashboardUrl } from '@/dummy/metricsDashboardUrl';
 import { dummyOwner } from '@/dummy/topic';
 import {
@@ -20,6 +22,7 @@ import { useRoles } from '@/composables/roles/use-roles/useRoles';
 import { useSubscription } from '@/composables/subscription/use-subscription/useSubscription';
 import router from '@/router';
 import SubscriptionView from '@/views/subscription/SubscriptionView.vue';
+import TopicView from '@/views/topic/TopicView.vue';
 import type { UseMetrics } from '@/composables/metrics/use-metrics/useMetrics';
 import type { UseRoles } from '@/composables/roles/use-roles/useRoles';
 
@@ -92,6 +95,7 @@ describe('SubscriptionView', () => {
     // then
     const cardTitles = [
       'subscription.metricsCard.title',
+      'costsCard.title',
       'subscription.manageMessagesCard.title',
       'subscription.propertiesCard.title',
       'subscription.lastUndeliveredMessage.title',
@@ -315,4 +319,34 @@ describe('SubscriptionView', () => {
       getByText('subscription.confirmationDialog.activate.text'),
     ).toBeInTheDocument();
   });
+
+  it('should not render costs card when it is disabled in app config', () => {
+    // given
+    vi.mocked(useSubscription).mockReturnValueOnce(useSubscriptionStub);
+    vi.mocked(useRoles).mockReturnValueOnce(useRolesStub);
+    vi.mocked(useMetrics).mockReturnValueOnce(useMetricsStub);
+
+    // when
+    const { queryByText } = render(TopicView, {
+      testPinia: createTestingPinia({
+        initialState: {
+          appConfig: {
+            appConfig: {
+              ...dummyAppConfig,
+              costs: {
+                enabled: false,
+              },
+            },
+            loading: false,
+            error: {
+              loadConfig: null,
+            },
+          },
+        },
+      }),
+    });
+
+    // then
+    expect(queryByText('costsCard.title')).not.toBeInTheDocument();
+  });
 });
diff --git a/hermes-console-vue/src/views/subscription/SubscriptionView.vue b/hermes-console/src/views/subscription/SubscriptionView.vue
similarity index 91%
rename from hermes-console-vue/src/views/subscription/SubscriptionView.vue
rename to hermes-console/src/views/subscription/SubscriptionView.vue
index d79798b30c..f5bd73b56f 100644
--- a/hermes-console-vue/src/views/subscription/SubscriptionView.vue
+++ b/hermes-console/src/views/subscription/SubscriptionView.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
   import { isSubscriptionOwnerOrAdmin } from '@/utils/roles-util';
+  import { useAppConfigStore } from '@/store/app-config/useAppConfigStore';
   import { useDialog } from '@/composables/dialog/use-dialog/useDialog';
   import { useI18n } from 'vue-i18n';
   import { useRoles } from '@/composables/roles/use-roles/useRoles';
@@ -7,6 +8,7 @@
   import { useSubscription } from '@/composables/subscription/use-subscription/useSubscription';
   import ConfirmationDialog from '@/components/confirmation-dialog/ConfirmationDialog.vue';
   import ConsoleAlert from '@/components/console-alert/ConsoleAlert.vue';
+  import CostsCard from '@/components/costs-card/CostsCard.vue';
   import FiltersCard from '@/views/subscription/filters-card/FiltersCard.vue';
   import HeadersCard from '@/views/subscription/headers-card/HeadersCard.vue';
   import HealthProblemsAlerts from '@/views/subscription/health-problems-alerts/HealthProblemsAlerts.vue';
@@ -124,6 +126,25 @@
       title: subscriptionId,
     },
   ];
+
+  const configStore = useAppConfigStore();
+
+  function resolveCostsUrl(url?: string): string {
+    return (
+      url
+        ?.replace('{{topic_name}}', topicId)
+        .replace('{{subscription_name}}', subscriptionId) ?? ''
+    );
+  }
+
+  const costs = {
+    iframeUrl: resolveCostsUrl(
+      configStore.appConfig?.costs.subscriptionIframeUrl,
+    ),
+    detailsUrl: resolveCostsUrl(
+      configStore.appConfig?.costs.subscriptionDetailsUrl,
+    ),
+  };
 </script>
 
 <template>
@@ -196,6 +217,11 @@
             :topic-name="topicId"
             :subscription-name="subscriptionId"
           />
+          <costs-card
+            v-if="configStore.appConfig?.costs.enabled"
+            :iframe-url="costs.iframeUrl"
+            :details-url="costs.detailsUrl"
+          />
           <manage-messages-card
             v-if="isSubscriptionOwnerOrAdmin(roles)"
             :topic="topicId"
diff --git a/hermes-console-vue/src/views/subscription/filters-card/FiltersCard.vue b/hermes-console/src/views/subscription/filters-card/FiltersCard.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/filters-card/FiltersCard.vue
rename to hermes-console/src/views/subscription/filters-card/FiltersCard.vue
diff --git a/hermes-console-vue/src/views/subscription/filters-card/FitersCard.spec.ts b/hermes-console/src/views/subscription/filters-card/FitersCard.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/filters-card/FitersCard.spec.ts
rename to hermes-console/src/views/subscription/filters-card/FitersCard.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/headers-card/HeadersCard.spec.ts b/hermes-console/src/views/subscription/headers-card/HeadersCard.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/headers-card/HeadersCard.spec.ts
rename to hermes-console/src/views/subscription/headers-card/HeadersCard.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/headers-card/HeadersCard.vue b/hermes-console/src/views/subscription/headers-card/HeadersCard.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/headers-card/HeadersCard.vue
rename to hermes-console/src/views/subscription/headers-card/HeadersCard.vue
diff --git a/hermes-console-vue/src/views/subscription/health-problems-alerts/HealthProblemsAlerts.spec.ts b/hermes-console/src/views/subscription/health-problems-alerts/HealthProblemsAlerts.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/health-problems-alerts/HealthProblemsAlerts.spec.ts
rename to hermes-console/src/views/subscription/health-problems-alerts/HealthProblemsAlerts.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/health-problems-alerts/HealthProblemsAlerts.vue b/hermes-console/src/views/subscription/health-problems-alerts/HealthProblemsAlerts.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/health-problems-alerts/HealthProblemsAlerts.vue
rename to hermes-console/src/views/subscription/health-problems-alerts/HealthProblemsAlerts.vue
diff --git a/hermes-console-vue/src/views/subscription/last-undelivered-message/LastUndeliveredMessage.spec.ts b/hermes-console/src/views/subscription/last-undelivered-message/LastUndeliveredMessage.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/last-undelivered-message/LastUndeliveredMessage.spec.ts
rename to hermes-console/src/views/subscription/last-undelivered-message/LastUndeliveredMessage.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/last-undelivered-message/LastUndeliveredMessage.vue b/hermes-console/src/views/subscription/last-undelivered-message/LastUndeliveredMessage.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/last-undelivered-message/LastUndeliveredMessage.vue
rename to hermes-console/src/views/subscription/last-undelivered-message/LastUndeliveredMessage.vue
diff --git a/hermes-console-vue/src/views/subscription/manage-messages-card/ManageMessagesCard.spec.ts b/hermes-console/src/views/subscription/manage-messages-card/ManageMessagesCard.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/manage-messages-card/ManageMessagesCard.spec.ts
rename to hermes-console/src/views/subscription/manage-messages-card/ManageMessagesCard.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/manage-messages-card/ManageMessagesCard.vue b/hermes-console/src/views/subscription/manage-messages-card/ManageMessagesCard.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/manage-messages-card/ManageMessagesCard.vue
rename to hermes-console/src/views/subscription/manage-messages-card/ManageMessagesCard.vue
diff --git a/hermes-console-vue/src/views/subscription/metrics-card/MetricsCard.spec.ts b/hermes-console/src/views/subscription/metrics-card/MetricsCard.spec.ts
similarity index 58%
rename from hermes-console-vue/src/views/subscription/metrics-card/MetricsCard.spec.ts
rename to hermes-console/src/views/subscription/metrics-card/MetricsCard.spec.ts
index 5572f11637..8b78c7e09f 100644
--- a/hermes-console-vue/src/views/subscription/metrics-card/MetricsCard.spec.ts
+++ b/hermes-console/src/views/subscription/metrics-card/MetricsCard.spec.ts
@@ -99,4 +99,79 @@ describe('MetricsCard', () => {
     )!;
     expect(within(deliveryRateRow).getByText('9,055,513')).toBeVisible();
   });
+
+  it('should render subscription otherErrors', () => {
+    // when
+    vi.mocked(useMetrics).mockReturnValueOnce(useMetricsStub);
+    const { getByText } = render(MetricsCard, {
+      props,
+      testPinia: createTestingPiniaWithState(),
+    });
+
+    // then
+    const deliveryRateRow = getByText(
+      'subscription.metricsCard.otherErrors',
+    ).closest('tr')!;
+    expect(within(deliveryRateRow).getByText('1.40')).toBeVisible();
+  });
+
+  it('should render subscription codes2xx', () => {
+    // when
+    vi.mocked(useMetrics).mockReturnValueOnce(useMetricsStub);
+    const { getByText } = render(MetricsCard, {
+      props,
+      testPinia: createTestingPiniaWithState(),
+    });
+
+    // then
+    const deliveryRateRow = getByText(
+      'subscription.metricsCard.codes2xx',
+    ).closest('tr')!;
+    expect(within(deliveryRateRow).getByText('123.00')).toBeVisible();
+  });
+
+  it('should render subscription codes4xx', () => {
+    // when
+    vi.mocked(useMetrics).mockReturnValueOnce(useMetricsStub);
+    const { getByText } = render(MetricsCard, {
+      props,
+      testPinia: createTestingPiniaWithState(),
+    });
+
+    // then
+    const deliveryRateRow = getByText(
+      'subscription.metricsCard.codes4xx',
+    ).closest('tr')!;
+    expect(within(deliveryRateRow).getByText('2.00')).toBeVisible();
+  });
+
+  it('should render subscription codes5xx', () => {
+    // when
+    vi.mocked(useMetrics).mockReturnValueOnce(useMetricsStub);
+    const { getByText } = render(MetricsCard, {
+      props,
+      testPinia: createTestingPiniaWithState(),
+    });
+
+    // then
+    const deliveryRateRow = getByText(
+      'subscription.metricsCard.codes5xx',
+    ).closest('tr')!;
+    expect(within(deliveryRateRow).getByText('1.32')).toBeVisible();
+  });
+
+  it('should render subscription retries', () => {
+    // when
+    vi.mocked(useMetrics).mockReturnValueOnce(useMetricsStub);
+    const { getByText } = render(MetricsCard, {
+      props,
+      testPinia: createTestingPiniaWithState(),
+    });
+
+    // then
+    const deliveryRateRow = getByText(
+      'subscription.metricsCard.retries',
+    ).closest('tr')!;
+    expect(within(deliveryRateRow).getByText('2.03')).toBeVisible();
+  });
 });
diff --git a/hermes-console-vue/src/views/subscription/metrics-card/MetricsCard.vue b/hermes-console/src/views/subscription/metrics-card/MetricsCard.vue
similarity index 66%
rename from hermes-console-vue/src/views/subscription/metrics-card/MetricsCard.vue
rename to hermes-console/src/views/subscription/metrics-card/MetricsCard.vue
index c20a827be5..210827133f 100644
--- a/hermes-console-vue/src/views/subscription/metrics-card/MetricsCard.vue
+++ b/hermes-console/src/views/subscription/metrics-card/MetricsCard.vue
@@ -29,11 +29,6 @@
       :name="$t('subscription.metricsCard.deliveryRate')"
       :value="formatNumber(props.subscriptionMetrics.rate, 2)"
     />
-    <key-value-card-item
-      :name="$t('subscription.metricsCard.subscriberLatency')"
-      value="?"
-      :tooltip="$t('subscription.metricsCard.tooltips.subscriberLatency')"
-    />
     <key-value-card-item
       :name="$t('subscription.metricsCard.delivered')"
       :value="formatNumber(props.subscriptionMetrics.delivered)"
@@ -42,16 +37,36 @@
       :name="$t('subscription.metricsCard.discarded')"
       :value="formatNumber(props.subscriptionMetrics.discarded)"
     />
+    <key-value-card-item
+      :name="$t('subscription.metricsCard.timeouts')"
+      :value="formatNumber(props.subscriptionMetrics.timeouts, 2)"
+    />
+    <key-value-card-item
+      :name="$t('subscription.metricsCard.otherErrors')"
+      :value="formatNumber(props.subscriptionMetrics.otherErrors, 2)"
+    />
+    <key-value-card-item
+      :name="$t('subscription.metricsCard.codes2xx')"
+      :value="formatNumber(props.subscriptionMetrics.codes2xx, 2)"
+    />
+    <key-value-card-item
+      :name="$t('subscription.metricsCard.codes4xx')"
+      :value="formatNumber(props.subscriptionMetrics.codes4xx, 2)"
+    />
+    <key-value-card-item
+      :name="$t('subscription.metricsCard.codes5xx')"
+      :value="formatNumber(props.subscriptionMetrics.codes5xx, 2)"
+    />
+    <key-value-card-item
+      :name="$t('subscription.metricsCard.retries')"
+      :value="formatNumber(props.subscriptionMetrics.retries, 2)"
+      :tooltip="$t('subscription.metricsCard.tooltips.retries')"
+    />
     <key-value-card-item
       :name="$t('subscription.metricsCard.lag')"
       :value="formatNumber(props.subscriptionMetrics.lag)"
       :tooltip="$t('subscription.metricsCard.tooltips.lag')"
     />
-    <key-value-card-item
-      :name="$t('subscription.metricsCard.outputRate')"
-      value="?"
-      :tooltip="$t('subscription.metricsCard.tooltips.outputRate')"
-    />
   </key-value-card>
 </template>
 
diff --git a/hermes-console-vue/src/views/subscription/properties-card/PropertiesCard.spec.ts b/hermes-console/src/views/subscription/properties-card/PropertiesCard.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/properties-card/PropertiesCard.spec.ts
rename to hermes-console/src/views/subscription/properties-card/PropertiesCard.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/properties-card/PropertiesCard.vue b/hermes-console/src/views/subscription/properties-card/PropertiesCard.vue
similarity index 99%
rename from hermes-console-vue/src/views/subscription/properties-card/PropertiesCard.vue
rename to hermes-console/src/views/subscription/properties-card/PropertiesCard.vue
index 8dba5276bf..dbe02867ea 100644
--- a/hermes-console-vue/src/views/subscription/properties-card/PropertiesCard.vue
+++ b/hermes-console/src/views/subscription/properties-card/PropertiesCard.vue
@@ -36,7 +36,7 @@
         key
       ]!!;
     const value =
-      data?.options == undefined || data?.options == null
+      data?.options == undefined
         ? props.subscription.endpointAddressResolverMetadata[key]
         : data.options[props.subscription.endpointAddressResolverMetadata[key]];
     return {
diff --git a/hermes-console-vue/src/views/subscription/service-response-metrics/ServiceResponseMetrics.spec.ts b/hermes-console/src/views/subscription/service-response-metrics/ServiceResponseMetrics.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/service-response-metrics/ServiceResponseMetrics.spec.ts
rename to hermes-console/src/views/subscription/service-response-metrics/ServiceResponseMetrics.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/service-response-metrics/ServiceResponseMetrics.vue b/hermes-console/src/views/subscription/service-response-metrics/ServiceResponseMetrics.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/service-response-metrics/ServiceResponseMetrics.vue
rename to hermes-console/src/views/subscription/service-response-metrics/ServiceResponseMetrics.vue
diff --git a/hermes-console-vue/src/views/subscription/show-event-trace/ShowEventTrace.spec.ts b/hermes-console/src/views/subscription/show-event-trace/ShowEventTrace.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/show-event-trace/ShowEventTrace.spec.ts
rename to hermes-console/src/views/subscription/show-event-trace/ShowEventTrace.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/show-event-trace/ShowEventTrace.vue b/hermes-console/src/views/subscription/show-event-trace/ShowEventTrace.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/show-event-trace/ShowEventTrace.vue
rename to hermes-console/src/views/subscription/show-event-trace/ShowEventTrace.vue
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/SubscriptionForm.spec.ts b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
rename to hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/SubscriptionForm.vue b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
similarity index 90%
rename from hermes-console-vue/src/views/subscription/subscription-form/SubscriptionForm.vue
rename to hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
index 7792a1effb..e32a2b57ef 100644
--- a/hermes-console-vue/src/views/subscription/subscription-form/SubscriptionForm.vue
+++ b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
   import { computed, ref } from 'vue';
+  import { isAdmin } from '@/utils/roles-util';
   import { useAppConfigStore } from '@/store/app-config/useAppConfigStore';
   import { useCreateSubscription } from '@/composables/subscription/use-create-subscription/useCreateSubscription';
   import { useEditSubscription } from '@/composables/subscription/use-edit-subscription/useEditSubscription';
@@ -13,12 +14,14 @@
   import SubscriptionPathFiltersDebug from '@/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.vue';
   import TextField from '@/components/text-field/TextField.vue';
   import TooltipIcon from '@/components/tooltip-icon/TooltipIcon.vue';
+  import type { Role } from '@/api/role';
   import type { Subscription } from '@/api/subscription';
 
   const props = defineProps<{
     topic: string;
     subscription: Subscription | null;
     operation: 'add' | 'edit';
+    roles: Role[] | undefined;
   }>();
   const emit = defineEmits<{
     created: [subscription: string];
@@ -69,7 +72,7 @@
   }
 
   async function submit() {
-    if (isFormValid.value) {
+    if (isFormValid.value || isAdmin(props.roles)) {
       const isOperationSucceeded = await createOrUpdateSubscription();
       if (isOperationSucceeded) {
         emit('created', form.value.name);
@@ -85,6 +88,13 @@
 </script>
 
 <template>
+  <console-alert
+    v-if="isAdmin(roles)"
+    :title="$t('subscriptionForm.warnings.adminForm.title')"
+    :text="$t('subscriptionForm.warnings.adminForm.text')"
+    type="warning"
+    class="mb-4"
+  />
   <v-file-input
     v-if="operation === 'add'"
     :label="$t('subscriptionForm.actions.import')"
@@ -253,6 +263,18 @@
       :suffix="$t('subscriptionForm.fields.inflightMessageTTL.suffix')"
     />
 
+    <text-field
+      v-if="isAdmin(roles)"
+      v-model="form.subscriptionPolicy.inflightMessagesCount"
+      :rules="validators.inflightMessagesCount"
+      prepend-icon="$warning"
+      type="number"
+      :label="$t('subscriptionForm.fields.inflightMessagesCount.label')"
+      :placeholder="
+        $t('subscriptionForm.fields.inflightMessagesCount.placeholder')
+      "
+    />
+
     <v-divider />
 
     <v-switch
@@ -286,6 +308,18 @@
       "
     />
 
+    <text-field
+      v-if="isSerialDeliveryTypeSelected"
+      v-model="form.subscriptionPolicy.backoffMaxIntervalInSec"
+      :rules="validators.backoffMaxIntervalInSec"
+      type="number"
+      :suffix="$t('subscriptionForm.fields.backoffMaxIntervalInSec.suffix')"
+      :label="$t('subscriptionForm.fields.backoffMaxIntervalInSec.label')"
+      :placeholder="
+        $t('subscriptionForm.fields.backoffMaxIntervalInSec.placeholder')
+      "
+    />
+
     <v-divider />
 
     <select-field
@@ -374,7 +408,9 @@
     />
 
     <div
-      v-for="([propertyName, propertyValue]) in Object.entries(configStore.appConfig!.subscription.endpointAddressResolverMetadata)"
+      v-for="[propertyName, propertyValue] in Object.entries(
+        configStore.appConfig!.subscription.endpointAddressResolverMetadata,
+      )"
       :key="propertyName"
       class="d-flex flex-row"
     >
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFilters.vue b/hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFilters.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFilters.vue
rename to hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFilters.vue
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.spec.ts b/hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.spec.ts
rename to hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.vue b/hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.vue
rename to hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.vue
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/path-filter-row/PathFilterRow.vue b/hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/path-filter-row/PathFilterRow.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/path-filter-row/PathFilterRow.vue
rename to hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/path-filter-row/PathFilterRow.vue
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/types.ts b/hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/types.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/subscription-basic-filters/types.ts
rename to hermes-console/src/views/subscription/subscription-form/subscription-basic-filters/types.ts
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/subscription-header-filters/SubscriptionHeaderFilters.vue b/hermes-console/src/views/subscription/subscription-form/subscription-header-filters/SubscriptionHeaderFilters.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/subscription-header-filters/SubscriptionHeaderFilters.vue
rename to hermes-console/src/views/subscription/subscription-form/subscription-header-filters/SubscriptionHeaderFilters.vue
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/subscription-header-filters/header-filter-row/HeaderFilterRow.vue b/hermes-console/src/views/subscription/subscription-form/subscription-header-filters/header-filter-row/HeaderFilterRow.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/subscription-header-filters/header-filter-row/HeaderFilterRow.vue
rename to hermes-console/src/views/subscription/subscription-form/subscription-header-filters/header-filter-row/HeaderFilterRow.vue
diff --git a/hermes-console-vue/src/views/subscription/subscription-form/subscription-header-filters/types.ts b/hermes-console/src/views/subscription/subscription-form/subscription-header-filters/types.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-form/subscription-header-filters/types.ts
rename to hermes-console/src/views/subscription/subscription-form/subscription-header-filters/types.ts
diff --git a/hermes-console-vue/src/views/subscription/subscription-metadata/SubscriptionMetadata.spec.ts b/hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/subscription-metadata/SubscriptionMetadata.spec.ts
rename to hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue b/hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue
similarity index 99%
rename from hermes-console-vue/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue
rename to hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue
index d74866a21c..ed2cd74a6f 100644
--- a/hermes-console-vue/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue
+++ b/hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue
@@ -78,6 +78,7 @@
               operation="edit"
               :subscription="subscription"
               :topic="subscription.topicName"
+              :roles="roles"
               @created="refreshPage"
               @cancel="hideSubscriptionForm"
             />
diff --git a/hermes-console-vue/src/views/subscription/undelivered-messages-card/UndeliveredMessagesCard.spec.ts b/hermes-console/src/views/subscription/undelivered-messages-card/UndeliveredMessagesCard.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/subscription/undelivered-messages-card/UndeliveredMessagesCard.spec.ts
rename to hermes-console/src/views/subscription/undelivered-messages-card/UndeliveredMessagesCard.spec.ts
diff --git a/hermes-console-vue/src/views/subscription/undelivered-messages-card/UndeliveredMessagesCard.vue b/hermes-console/src/views/subscription/undelivered-messages-card/UndeliveredMessagesCard.vue
similarity index 100%
rename from hermes-console-vue/src/views/subscription/undelivered-messages-card/UndeliveredMessagesCard.vue
rename to hermes-console/src/views/subscription/undelivered-messages-card/UndeliveredMessagesCard.vue
diff --git a/hermes-console-vue/src/views/topic/TopicView.spec.ts b/hermes-console/src/views/topic/TopicView.spec.ts
similarity index 92%
rename from hermes-console-vue/src/views/topic/TopicView.spec.ts
rename to hermes-console/src/views/topic/TopicView.spec.ts
index 5105c26ba0..b826c53b02 100644
--- a/hermes-console-vue/src/views/topic/TopicView.spec.ts
+++ b/hermes-console/src/views/topic/TopicView.spec.ts
@@ -102,6 +102,7 @@ describe('TopicView', () => {
     const expectedTitles = [
       'topicView.header.topic',
       'topicView.metrics.title',
+      'costsCard.title',
       'topicView.properties.title',
       'topicView.messagesPreview.title',
       'topicView.schema.title',
@@ -197,6 +198,35 @@ describe('TopicView', () => {
     ).not.toBeInTheDocument();
   });
 
+  it('should not render costs card when it is disabled in app config', () => {
+    // given
+    vi.mocked(useTopic).mockReturnValueOnce(useTopicMock);
+    vi.mocked(useRoles).mockReturnValueOnce(useRolesStub);
+
+    // when
+    const { queryByText } = render(TopicView, {
+      testPinia: createTestingPinia({
+        initialState: {
+          appConfig: {
+            appConfig: {
+              ...dummyAppConfig,
+              costs: {
+                enabled: false,
+              },
+            },
+            loading: false,
+            error: {
+              loadConfig: null,
+            },
+          },
+        },
+      }),
+    });
+
+    // then
+    expect(queryByText('costsCard.title')).not.toBeInTheDocument();
+  });
+
   it('should not render offline clients when topic has disabled offline storage', () => {
     // given
     vi.mocked(useTopic).mockReturnValueOnce({
diff --git a/hermes-console-vue/src/views/topic/TopicView.vue b/hermes-console/src/views/topic/TopicView.vue
similarity index 84%
rename from hermes-console-vue/src/views/topic/TopicView.vue
rename to hermes-console/src/views/topic/TopicView.vue
index fedd8ba8f4..bacbc5db56 100644
--- a/hermes-console-vue/src/views/topic/TopicView.vue
+++ b/hermes-console/src/views/topic/TopicView.vue
@@ -8,6 +8,7 @@
   import { useTopic } from '@/composables/topic/use-topic/useTopic';
   import ConfirmationDialog from '@/components/confirmation-dialog/ConfirmationDialog.vue';
   import ConsoleAlert from '@/components/console-alert/ConsoleAlert.vue';
+  import CostsCard from '@/components/costs-card/CostsCard.vue';
   import LoadingSpinner from '@/components/loading-spinner/LoadingSpinner.vue';
   import MessagesPreview from '@/views/topic/messages-preview/MessagesPreview.vue';
   import MetricsList from '@/views/topic/metrics-list/MetricsList.vue';
@@ -81,6 +82,15 @@
       router.push({ path: `/ui/groups/${groupId}` });
     }
   }
+
+  function resolveCostsUrl(url?: string): string {
+    return url?.replace('{{topic_name}}', topicName) ?? '';
+  }
+
+  const costs = {
+    iframeUrl: resolveCostsUrl(configStore.appConfig?.costs.topicIframeUrl),
+    detailsUrl: resolveCostsUrl(configStore.appConfig?.costs.topicDetailsUrl),
+  };
 </script>
 
 <template>
@@ -114,14 +124,23 @@
         @remove="openRemoveDialog"
       />
 
-      <div class="topic-view__upper_panel">
-        <metrics-list
-          v-if="metrics"
-          :metrics="metrics"
-          :topic-name="topicName"
-        />
-        <properties-list v-if="topic" :topic="topic" />
-      </div>
+      <v-row dense>
+        <v-col md="6" class="d-flex flex-column row-gap-2">
+          <metrics-list
+            v-if="metrics"
+            :metrics="metrics"
+            :topic-name="topicName"
+          />
+          <costs-card
+            v-if="configStore.appConfig?.costs.enabled"
+            :iframe-url="costs.iframeUrl"
+            :details-url="costs.detailsUrl"
+          />
+        </v-col>
+        <v-col md="6">
+          <properties-list v-if="topic" :topic="topic" />
+        </v-col>
+      </v-row>
 
       <schema-panel v-if="topic" :schema="topic.schema" />
 
diff --git a/hermes-console-vue/src/views/topic/messages-preview/MessagesPreview.spec.ts b/hermes-console/src/views/topic/messages-preview/MessagesPreview.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/topic/messages-preview/MessagesPreview.spec.ts
rename to hermes-console/src/views/topic/messages-preview/MessagesPreview.spec.ts
diff --git a/hermes-console-vue/src/views/topic/messages-preview/MessagesPreview.vue b/hermes-console/src/views/topic/messages-preview/MessagesPreview.vue
similarity index 100%
rename from hermes-console-vue/src/views/topic/messages-preview/MessagesPreview.vue
rename to hermes-console/src/views/topic/messages-preview/MessagesPreview.vue
diff --git a/hermes-console-vue/src/views/topic/metrics-list/MetricsList.spec.ts b/hermes-console/src/views/topic/metrics-list/MetricsList.spec.ts
similarity index 94%
rename from hermes-console-vue/src/views/topic/metrics-list/MetricsList.spec.ts
rename to hermes-console/src/views/topic/metrics-list/MetricsList.spec.ts
index 106de46baf..c507ce0b42 100644
--- a/hermes-console-vue/src/views/topic/metrics-list/MetricsList.spec.ts
+++ b/hermes-console/src/views/topic/metrics-list/MetricsList.spec.ts
@@ -40,8 +40,6 @@ describe('MetricsList', () => {
     { property: 'topicView.metrics.rate', value: '3.40' },
     { property: 'topicView.metrics.deliveryRate', value: '3.50' },
     { property: 'topicView.metrics.published', value: 100 },
-    { property: 'topicView.metrics.latency', value: '?' },
-    { property: 'topicView.metrics.messageSize', value: '?' },
   ])('should render all metrics properties %s', ({ property, value }) => {
     // given
     vi.mocked(useMetrics).mockReturnValueOnce(useMetricsStub);
diff --git a/hermes-console-vue/src/views/topic/metrics-list/MetricsList.vue b/hermes-console/src/views/topic/metrics-list/MetricsList.vue
similarity index 88%
rename from hermes-console-vue/src/views/topic/metrics-list/MetricsList.vue
rename to hermes-console/src/views/topic/metrics-list/MetricsList.vue
index d1745d9cb5..3fbecf9f4f 100644
--- a/hermes-console-vue/src/views/topic/metrics-list/MetricsList.vue
+++ b/hermes-console/src/views/topic/metrics-list/MetricsList.vue
@@ -36,11 +36,6 @@
       :name="$t('topicView.metrics.published')"
       :value="formatNumber(props.metrics.published)"
     />
-    <key-value-card-item :name="$t('topicView.metrics.latency')" value="?" />
-    <key-value-card-item
-      :name="$t('topicView.metrics.messageSize')"
-      value="?"
-    />
   </key-value-card>
 </template>
 
diff --git a/hermes-console-vue/src/views/topic/offline-clients/OfflineClients.spec.ts b/hermes-console/src/views/topic/offline-clients/OfflineClients.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/topic/offline-clients/OfflineClients.spec.ts
rename to hermes-console/src/views/topic/offline-clients/OfflineClients.spec.ts
diff --git a/hermes-console-vue/src/views/topic/offline-clients/OfflineClients.vue b/hermes-console/src/views/topic/offline-clients/OfflineClients.vue
similarity index 100%
rename from hermes-console-vue/src/views/topic/offline-clients/OfflineClients.vue
rename to hermes-console/src/views/topic/offline-clients/OfflineClients.vue
diff --git a/hermes-console-vue/src/views/topic/offline-retransmission/OfflineRetransmissionDialog.vue b/hermes-console/src/views/topic/offline-retransmission/OfflineRetransmissionDialog.vue
similarity index 100%
rename from hermes-console-vue/src/views/topic/offline-retransmission/OfflineRetransmissionDialog.vue
rename to hermes-console/src/views/topic/offline-retransmission/OfflineRetransmissionDialog.vue
diff --git a/hermes-console-vue/src/views/topic/offline-retransmission/OfflineRetransmissionForm.spec.ts b/hermes-console/src/views/topic/offline-retransmission/OfflineRetransmissionForm.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/topic/offline-retransmission/OfflineRetransmissionForm.spec.ts
rename to hermes-console/src/views/topic/offline-retransmission/OfflineRetransmissionForm.spec.ts
diff --git a/hermes-console-vue/src/views/topic/offline-retransmission/OfflineRetransmissionForm.vue b/hermes-console/src/views/topic/offline-retransmission/OfflineRetransmissionForm.vue
similarity index 100%
rename from hermes-console-vue/src/views/topic/offline-retransmission/OfflineRetransmissionForm.vue
rename to hermes-console/src/views/topic/offline-retransmission/OfflineRetransmissionForm.vue
diff --git a/hermes-console-vue/src/views/topic/properties-list/PropertiesList.spec.ts b/hermes-console/src/views/topic/properties-list/PropertiesList.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/topic/properties-list/PropertiesList.spec.ts
rename to hermes-console/src/views/topic/properties-list/PropertiesList.spec.ts
diff --git a/hermes-console-vue/src/views/topic/properties-list/PropertiesList.vue b/hermes-console/src/views/topic/properties-list/PropertiesList.vue
similarity index 100%
rename from hermes-console-vue/src/views/topic/properties-list/PropertiesList.vue
rename to hermes-console/src/views/topic/properties-list/PropertiesList.vue
diff --git a/hermes-console-vue/src/views/topic/schema-panel/AvroTypes.ts b/hermes-console/src/views/topic/schema-panel/AvroTypes.ts
similarity index 100%
rename from hermes-console-vue/src/views/topic/schema-panel/AvroTypes.ts
rename to hermes-console/src/views/topic/schema-panel/AvroTypes.ts
diff --git a/hermes-console-vue/src/views/topic/schema-panel/SchemaPanel.spec.ts b/hermes-console/src/views/topic/schema-panel/SchemaPanel.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/topic/schema-panel/SchemaPanel.spec.ts
rename to hermes-console/src/views/topic/schema-panel/SchemaPanel.spec.ts
diff --git a/hermes-console-vue/src/views/topic/schema-panel/SchemaPanel.vue b/hermes-console/src/views/topic/schema-panel/SchemaPanel.vue
similarity index 100%
rename from hermes-console-vue/src/views/topic/schema-panel/SchemaPanel.vue
rename to hermes-console/src/views/topic/schema-panel/SchemaPanel.vue
diff --git a/hermes-console-vue/src/views/topic/schema-panel/avro-viewer/AvroNode.vue b/hermes-console/src/views/topic/schema-panel/avro-viewer/AvroNode.vue
similarity index 100%
rename from hermes-console-vue/src/views/topic/schema-panel/avro-viewer/AvroNode.vue
rename to hermes-console/src/views/topic/schema-panel/avro-viewer/AvroNode.vue
diff --git a/hermes-console-vue/src/views/topic/schema-panel/avro-viewer/AvroViewer.vue b/hermes-console/src/views/topic/schema-panel/avro-viewer/AvroViewer.vue
similarity index 100%
rename from hermes-console-vue/src/views/topic/schema-panel/avro-viewer/AvroViewer.vue
rename to hermes-console/src/views/topic/schema-panel/avro-viewer/AvroViewer.vue
diff --git a/hermes-console-vue/src/views/topic/subscriptions-list/SubscriptionsList.spec.ts b/hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.spec.ts
similarity index 79%
rename from hermes-console-vue/src/views/topic/subscriptions-list/SubscriptionsList.spec.ts
rename to hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.spec.ts
index d8f5f7fa8f..4bd8dcfd66 100644
--- a/hermes-console-vue/src/views/topic/subscriptions-list/SubscriptionsList.spec.ts
+++ b/hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.spec.ts
@@ -99,4 +99,34 @@ describe('SubscriptionsList', () => {
     ).toBeInTheDocument();
     expect(getByText('subscriptionForm.actions.create')).toBeInTheDocument();
   });
+
+  it.each(['foobar', 'FOOBAR', 'FooBar'])(
+    'should render subscription list and apply a filter (case-insensitive, filter: %s)',
+    async (filter: string) => {
+      // given
+      const { getByText, getByLabelText, queryByText } = render(
+        SubscriptionsList,
+        {
+          props,
+        },
+      );
+
+      // when
+      await fireEvent.click(getByText('topicView.subscriptions.title (2)'));
+
+      // then
+      expect(queryByText('foobar-service')).toBeInTheDocument();
+      expect(queryByText('bazbar-service')).toBeInTheDocument();
+
+      // when
+      await fireEvent.update(
+        getByLabelText('topicView.subscriptions.search'),
+        filter,
+      );
+
+      // then
+      expect(queryByText('foobar-service')).toBeInTheDocument();
+      expect(queryByText('bazbar-service')).not.toBeInTheDocument();
+    },
+  );
 });
diff --git a/hermes-console-vue/src/views/topic/subscriptions-list/SubscriptionsList.vue b/hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.vue
similarity index 87%
rename from hermes-console-vue/src/views/topic/subscriptions-list/SubscriptionsList.vue
rename to hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.vue
index d43d615a97..4cfa56b1a6 100644
--- a/hermes-console-vue/src/views/topic/subscriptions-list/SubscriptionsList.vue
+++ b/hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.vue
@@ -25,27 +25,30 @@
 
   const subscriptionItems = computed(() =>
     props.subscriptions
+      ?.filter((subscription) =>
+        subscription.name.toLowerCase().includes(filter.value.toLowerCase()),
+      )
       ?.map((subscription) => {
         const currentUrl = window.location.href;
-        if (subscription.name.toLowerCase().includes(filter.value)) {
-          return {
-            name: subscription.name,
-            color: statusTextColor[subscription.state],
-            statusText: subscription.state,
-            href: `${currentUrl}/subscriptions/${subscription.name}`,
-          };
-        }
-        return null;
-      })
-      .filter(Boolean),
+        return {
+          name: subscription.name,
+          color: statusTextColor[subscription.state],
+          statusText: subscription.state,
+          href: `${currentUrl}/subscriptions/${subscription.name}`,
+        };
+      }),
   );
+
   const showSubscriptionCreationForm = ref(false);
+
   function showSubscriptionForm() {
     showSubscriptionCreationForm.value = true;
   }
+
   function hideSubscriptionForm() {
     showSubscriptionCreationForm.value = false;
   }
+
   function pushToSubscription(subscription: string) {
     router.push({
       path: `/ui/groups/${props.groupId}/topics/${props.topicName}/subscriptions/${subscription}`,
@@ -95,6 +98,7 @@
                   operation="add"
                   :subscription="null"
                   :topic="props.topicName"
+                  :roles="roles"
                   @created="pushToSubscription"
                   @cancel="hideSubscriptionForm"
                 />
@@ -111,9 +115,9 @@
           >
             <v-list-item-title>{{ subscription.name }}</v-list-item-title>
             <template v-slot:append>
-              <v-chip size="small" :color="subscription.color">{{
-                subscription.statusText
-              }}</v-chip>
+              <v-chip size="small" :color="subscription.color"
+                >{{ subscription.statusText }}
+              </v-chip>
             </template>
           </v-list-item>
         </v-list>
diff --git a/hermes-console-vue/src/views/topic/topic-form/TopicForm.spec.ts b/hermes-console/src/views/topic/topic-form/TopicForm.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/topic/topic-form/TopicForm.spec.ts
rename to hermes-console/src/views/topic/topic-form/TopicForm.spec.ts
diff --git a/hermes-console-vue/src/views/topic/topic-form/TopicForm.vue b/hermes-console/src/views/topic/topic-form/TopicForm.vue
similarity index 86%
rename from hermes-console-vue/src/views/topic/topic-form/TopicForm.vue
rename to hermes-console/src/views/topic/topic-form/TopicForm.vue
index 5c47f9fc9d..c87d02391c 100644
--- a/hermes-console-vue/src/views/topic/topic-form/TopicForm.vue
+++ b/hermes-console/src/views/topic/topic-form/TopicForm.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
   import { computed, ref } from 'vue';
+  import { isAdmin } from '@/utils/roles-util';
   import { useAppConfigStore } from '@/store/app-config/useAppConfigStore';
   import { useCreateTopic } from '@/composables/topic/use-create-topic/useCreateTopic';
   import { useEditTopic } from '@/composables/topic/use-edit-topic/useEditTopic';
@@ -10,12 +11,15 @@
   import ConsoleAlert from '@/components/console-alert/ConsoleAlert.vue';
   import SelectField from '@/components/select-field/SelectField.vue';
   import TextField from '@/components/text-field/TextField.vue';
-  import type { TopicWithSchema } from '@/api/Topic';
+  import type { Role } from '@/api/role';
+  import type { SelectFieldOption } from '@/components/select-field/types';
+  import type { TopicWithSchema } from '@/api/topic';
 
   const props = defineProps<{
     topic: TopicWithSchema | null;
     group: string | null;
     operation: 'add' | 'edit';
+    roles: Role[] | undefined;
   }>();
   const emit = defineEmits<{
     created: [topic: string];
@@ -37,6 +41,17 @@
       : useEditTopic(props.topic!!);
   const { importFormData } = useImportTopic();
 
+  const adminContentTypes: SelectFieldOption[] = [
+    {
+      title: 'AVRO',
+      value: 'AVRO',
+    },
+    {
+      title: 'JSON',
+      value: 'JSON',
+    },
+  ];
+
   const ownerSelectorPlaceholder = computed(
     () =>
       configStore.loadedConfig.owner.sources.find(
@@ -54,6 +69,16 @@
 
   const isAuthorizationSelected = computed(() => form.value.auth.enabled);
 
+  const durationValidator = computed(() =>
+    form.value.retentionTime.retentionUnit === 'DAYS'
+      ? validators.retentionTimeDurationDays
+      : validators.retentionTimeDurationHours,
+  );
+
+  const allowedContentTypes = computed(() =>
+    isAdmin(props.roles) ? adminContentTypes : dataSources.contentTypes,
+  );
+
   const isAvroContentTypeSelected = computed(
     () => form.value.contentType === 'AVRO',
   );
@@ -71,7 +96,7 @@
   const showAvroAlert = computed(() => form.value.contentType === 'AVRO');
 
   async function submit() {
-    if (isFormValid.value) {
+    if (isFormValid.value || isAdmin(props.roles)) {
       const isOperationSucceeded = await createOrUpdateTopic();
       if (isOperationSucceeded) {
         emit('created', form.value.name);
@@ -87,6 +112,13 @@
 </script>
 
 <template>
+  <console-alert
+    v-if="isAdmin(roles)"
+    :title="$t('topicForm.warnings.adminForm.title')"
+    :text="$t('topicForm.warnings.adminForm.text')"
+    type="warning"
+    class="mb-4"
+  />
   <v-file-input
     v-if="operation === 'add'"
     :label="$t('topicForm.actions.import')"
@@ -213,13 +245,24 @@
 
     <text-field
       v-model.number="form.retentionTime.duration"
-      :rules="validators.retentionTimeDuration"
+      :rules="durationValidator"
       type="number"
       :label="$t('topicForm.fields.retentionTime.duration')"
     />
 
+    <console-alert
+      :title="$t('topicForm.fields.ackHelpTitle')"
+      :text="$t('topicForm.fields.ackHelpText')"
+      type="info"
+      class="mb-4"
+      :link="$t('topicForm.fields.ackHelpLink')"
+      :link-description="$t('topicForm.fields.ackHelpLinkDescription')"
+    >
+    </console-alert>
+
     <select-field
       v-model="form.ack"
+      :rules="validators.ack"
       :label="$t('topicForm.fields.ack')"
       :items="dataSources.ackModes"
     />
@@ -227,7 +270,7 @@
     <select-field
       v-model="form.contentType"
       :label="$t('topicForm.fields.contentType')"
-      :items="dataSources.contentTypes"
+      :items="allowedContentTypes"
     />
 
     <text-field
@@ -269,7 +312,6 @@
     />
 
     <v-divider />
-
     <!--      text not in i18n because of a problem with escaping characters-->
     <console-alert
       style="white-space: pre"
diff --git a/hermes-console-vue/src/views/topic/topic-header/TopicHeader.spec.ts b/hermes-console/src/views/topic/topic-header/TopicHeader.spec.ts
similarity index 100%
rename from hermes-console-vue/src/views/topic/topic-header/TopicHeader.spec.ts
rename to hermes-console/src/views/topic/topic-header/TopicHeader.spec.ts
diff --git a/hermes-console-vue/src/views/topic/topic-header/TopicHeader.vue b/hermes-console/src/views/topic/topic-header/TopicHeader.vue
similarity index 98%
rename from hermes-console-vue/src/views/topic/topic-header/TopicHeader.vue
rename to hermes-console/src/views/topic/topic-header/TopicHeader.vue
index 0a80537a1f..61a3f39f98 100644
--- a/hermes-console-vue/src/views/topic/topic-header/TopicHeader.vue
+++ b/hermes-console/src/views/topic/topic-header/TopicHeader.vue
@@ -36,14 +36,14 @@
     remove: [];
   }>();
 
-  const offlineRentramission = useOfflineRetransmission();
+  const offlineRetransmission = useOfflineRetransmission();
 
   const onRetransmit = (
     targetTopic: string,
     startTimestamp: string,
     endTimestamp: string,
   ) => {
-    offlineRentramission.retransmit({
+    offlineRetransmission.retransmit({
       sourceTopic: props.topic.name,
       targetTopic,
       startTimestamp,
@@ -91,6 +91,7 @@
               operation="edit"
               :topic="topic"
               :group="null"
+              :roles="roles"
               @created="refreshPage"
               @cancel="hideTopicForm"
             />
diff --git a/hermes-console/static/css/main.css b/hermes-console/static/css/main.css
deleted file mode 100644
index bde284526b..0000000000
--- a/hermes-console/static/css/main.css
+++ /dev/null
@@ -1,160 +0,0 @@
-body {
-    position: relative;
-    padding-bottom: 5rem;
-    min-height: 100vh;
-}
-
-.logo-mini {
-    margin-top: -12px;
-    height: 40px;
-}
-
-.hero-box {
-    margin-bottom: 4em;
-    margin-top: 4em;
-}
-
-.margin-right-4 {
-    margin-right: 4px;
-}
-
-.margin-right-half-em {
-    margin-right: .5em;
-}
-
-.margin-top-10 {
-    margin-top: 10px;
-}
-
-.padding-lr-2 {
-    padding-left: 2px;
-    padding-right: 2px;
-}
-
-.input-dropdown-menu {
-    margin-top: 35px;
-}
-
-.borderless td {
-    border: none;
-}
-
-span.helpme {
-    color: #428bca;
-    padding: .2em .6em .2em;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: baseline;
-    border-radius: .25em;
-}
-
-span.helpme-addon {
-    color: #428bca;
-    text-align: center;
-    font-weight: bold;
-}
-
-.panel-body.collapsing:not(.in) {
-    padding: 0px;
-}
-
-.btn-main {
-    color: #428bca;
-    background-color: #f5f5f5;
-    font-weight: bold;
-    font-size: 2em;
-    border-color: #e7e7e7;
-}
-
-.btn-main:hover, .btn-main:focus {
-    color: #2a6496;
-}
-
-.auth-pane {
-    margin: 10px;
-}
-
-.loading-in-panel {
-    margin-left: 100px;
-}
-
-a.navbar-brand.console-title {
-    color: #2a6496;
-}
-
-.message-preview > .content {
-    margin: 10px 0 0 0;
-}
-
-.message-preview > .truncated-info {
-    font-style: italic;
-}
-
-#toast-container > div {
-    width: auto;
-    max-width: 800px;
-}
-
-.tooltip .tooltip-inner {
-    color: #333;
-    background-color: #fff;
-    box-shadow: 0 5px 10px rgba(0,0,0,.2);
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-    font-size: 14px;
-    font-style: normal;
-    font-weight: 400;
-    padding: 9px 14px;
-    border: 1px solid rgba(0,0,0,.2);
-    border-radius: 6px;
-}
-
-footer {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    padding: 1rem;
-
-    background-color: #f8f8f8;
-    border: 1px solid #e7e7e7;
-
-    text-align: center;
-    color: #b9b9b9;
-}
-
-.full-width {
-    display: block;
-}
-
-.ace_editor_debug { height: 300px; }
-.ace_editor_schema { height: 500px; }
-
-.monospaced {
-    font-family: monospace, monospace;
-}
-
-.flex-row {
-    display: flex;
-    flex-direction: row;
-}
-
-.rotated-90-deg {
-    transform: rotate(-90deg)
-}
-
-avro-viewer {
-    line-height: 1.7;
-}
-
-.tree-branch {
-    position: absolute;
-    border-bottom: 1px dashed rgba(0, 0, 0, 0.2);
-    border-left: 1px dashed rgba(0, 0, 0, 0.2);
-    cursor: default;
-    margin-left: -1.5em;
-    height: 1em;
-    width: 1em;
-}
-
-.long-branch {
-    width: 2em;
-}
diff --git a/hermes-console/static/img/hermes-logo-full.png b/hermes-console/static/img/hermes-logo-full.png
deleted file mode 100644
index 1ab5050200..0000000000
Binary files a/hermes-console/static/img/hermes-logo-full.png and /dev/null differ
diff --git a/hermes-console/static/img/hermes-logo.png b/hermes-console/static/img/hermes-logo.png
deleted file mode 100644
index e3f37e93e2..0000000000
Binary files a/hermes-console/static/img/hermes-logo.png and /dev/null differ
diff --git a/hermes-console/static/index.html b/hermes-console/static/index.html
deleted file mode 100644
index 743f3ade6b..0000000000
--- a/hermes-console/static/index.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>Hermes Console</title>
-
-        <link href="components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" media="screen">
-        <link href="components/angularjs-toaster/toaster.css" rel="stylesheet" media="screen">
-        <link href="components/font-awesome/css/font-awesome.min.css" rel="stylesheet" media="screen">
-        <link href="components/json-formatter/dist/json-formatter.min.css.css" rel="stylesheet" media="screen">
-        <link href="components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css" rel="stylesheet" media="screen">
-        <link href="css/main.css" rel="stylesheet" media="screen">
-
-        <script src="components/jquery/dist/jquery.min.js"></script>
-        <script src="components/angular/angular.js"></script>
-        <script src="components/angular-deferred-bootstrap/angular-deferred-bootstrap.min.js"></script>
-        <script src="components/angular-ui-router/release/angular-ui-router.min.js"></script>
-        <script src="components/angular-resource/angular-resource.js"></script>
-        <script src="components/angular-sanitize/angular-sanitize.js"></script>
-        <script src="components/angular-animate/angular-animate.min.js"></script>
-        <script src="components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-        <script src="components/lodash/dist/lodash.min.js"></script>
-        <script src="components/angularjs-toaster/toaster.js"></script>
-        <script src="components/json-formatter/dist/json-formatter.min.js.js"></script>
-        <script src="components/hello/dist/hello.min.js"></script>
-        <script src="components/moment/min/moment.min.js"></script>
-        <script src="components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
-        <script src="components/utf8/utf8.js"></script>
-
-        <script src="/console"></script>
-
-        <script src="js/directives/endpoint.js"></script>
-        <script src="js/directives/hoverDelay.js"></script>
-        <script src="js/directives/emptyToNull.js"></script>
-        <script src="js/directives/bindHtml.js"></script>
-        <script src="js/directives/calendar.js"></script>
-        <script src="js/console/Filters.js"></script>
-        <script src="js/console/Discovery.js"></script>
-        <script src="js/console/Home.js"></script>
-        <script src="js/console/PasswordService.js"></script>
-        <script src="js/console/owner/OwnerRepository.js"></script>
-        <script src="js/console/owner/OwnerSelector.js"></script>
-        <script src="js/console/owner/OwnerName.js"></script>
-        <script src="js/console/Modals.js"></script>
-        <script src="js/console/MetricStoreUrlResolver.js"></script>
-        <script src="js/console/subscription/SubscriptionRepository.js"></script>
-        <script src="js/console/subscription/SubscriptionHealth.js"></script>
-        <script src="js/console/subscription/SubscriptionMetrics.js"></script>
-        <script src="js/console/subscription/SubscriptionFactory.js"></script>
-        <script src="js/console/subscription/SubscriptionController.js"></script>
-        <script src="js/console/filters/FiltersEditor.js"></script>
-        <script src="js/console/filters/HttpHeaderFiltersEditor.js"></script>
-        <script src="js/console/filters/FiltersRepository.js"></script>
-        <script src="js/console/filters/FiltersDebugger.js"></script>
-        <script src="js/console/constraints/ConstraintsRepository.js"></script>
-        <script src="js/console/constraints/ConstraintsController.js"></script>
-        <script src="js/console/readiness/ReadinessController.js"></script>
-        <script src="js/console/readiness/ReadinessRepository.js"></script>
-        <script src="js/console/diagnostics/DiagnosticsRepository.js"></script>
-        <script src="js/console/diagnostics/DiagnosticsController.js"></script>
-        <script src="js/console/consistency/ConsistencyRepository.js"></script>
-        <script src="js/console/consistency/ConsistencyController.js"></script>
-        <script src="js/console/subscriptionoffsets/SubsriptionService.js"></script>
-        <script src="js/console/subscriptionoffsets/SubscriptionOffsetsController.js"></script>
-        <script src="js/console/offlineretransmission/OfflineRetransmissionController.js"></script>
-        <script src="js/console/offlineretransmission/OfflineRetransmissionRespository.js"></script>
-        <script src="js/console/topic/TopicRepository.js"></script>
-        <script src="js/console/topic/TopicFactory.js"></script>
-        <script src="js/console/topic/TopicMetrics.js"></script>
-        <script src="js/console/topic/TopicController.js"></script>
-        <script src="js/console/topic/AvroViewer.js"></script>
-        <script src="js/console/Groups.js"></script>
-        <script src="js/console/MessagePreview.js"></script>
-        <script src="js/console/Auth.js"></script>
-        <script src="js/console/Search.js"></script>
-        <script src="js/console/Stats.js"></script>
-        <script src="js/console/Visibility.js"></script>
-        <script src="js/console/Mode.js"></script>
-        <script src="js/app.js"></script>
-        <script src="js/bootstrap.js"></script>
-        <script type="text/javascript" src="components/ace-builds/src-min-noconflict/ace.js"></script>
-        <script type="text/javascript" src="components/angular-ui-ace/ui-ace.js"></script>
-        <script type="text/javascript" src="components/ace-builds/src-min-noconflict/ext-language_tools.js"></script>
-    </head>
-    <body>
-        <nav class="navbar navbar-default" role="navigation">
-            <div class="container-fluid">
-                <div class="navbar-header">
-                    <a class="navbar-brand console-title" href="#/">
-                        <span><img class="logo-mini" src="img/hermes-logo.png" alt="Hermes"/></span>
-                        &nbsp;&nbsp; {{console.title}}
-                        <span ng-show="console.criticalEnvironment" class="alert alert-danger" style="padding: 10px"><strong>{{console.environmentName}}</strong></span>
-                        <span ng-show="!console.criticalEnvironment" class="alert alert-info" style="padding: 10px"><strong>{{console.environmentName}}</strong></span>
-                    </a>
-                </div>
-                <auth-pane ng-show="enabled"></auth-pane>
-            </div>
-        </nav>
-        <div ng-if="readOnly" class="container alert alert-danger">
-            <h4 class="alert-heading">Running in read only mode</h4>
-            If you need to make any modifications, please contact the Hermes administrators.
-        </div>
-
-        <toaster-container toaster-options="{'time-out': {'toast-error': 0, 'toast-warning': 0, 'toast-success': 5000, 'toast-info': 5000}, 'close-button': {'toast-error': true, 'toast-warning': true}}"></toaster-container>
-        <div ui-view class="container"></div>
-
-        <footer ng-bind-html="console.footer"></footer>
-    </body>
-</html>
diff --git a/hermes-console/static/js/app.js b/hermes-console/static/js/app.js
deleted file mode 100644
index dca2af1a57..0000000000
--- a/hermes-console/static/js/app.js
+++ /dev/null
@@ -1,132 +0,0 @@
-var hermes = angular.module('hermes', [
-    'ngResource',
-    'ui.router',
-    'ui.bootstrap',
-    'jsonFormatter',
-    'hermes.discovery',
-    'hermes.home',
-    'hermes.directives',
-    'hermes.groups',
-    'hermes.messagePreview',
-    'hermes.auth',
-    'hermes.search',
-    'hermes.stats',
-    'hermes.constraints',
-    'hermes.diagnostics',
-    'hermes.consistency',
-    'hermes.visibility',
-    'hermes.mode',
-    'hermes.readiness',
-    'hermes.subscriptionOffsets',
-    'hermes.offlineRetransmission',
-    'ui.ace',
-]);
-
-hermes.constant('DASHBOARD_CONFIG', config.dashboard);
-hermes.constant('DISCOVERY_CONFIG', config.hermes.discovery);
-hermes.constant('AUTH_CONFIG', config.auth);
-hermes.constant('AUTH_OAUTH_CONFIG', config.auth.oauth);
-hermes.constant('METRICS_CONFIG', config.metrics);
-hermes.constant('CONSOLE_CONFIG', config.console);
-hermes.constant('TOPIC_CONFIG', config.topic || {});
-hermes.constant('GROUP_CONFIG', config.group || {});
-hermes.constant('SUBSCRIPTION_CONFIG', config.subscription || {});
-hermes.constant('OWNER_CONFIG', config.owner || {});
-hermes.constant('CONSISTENCY_CONFIG', config.consistency || {});
-
-hermes.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$uibTooltipProvider',
-    function ($stateProvider, $urlRouterProvider, $httpProvider, $tooltipProvider) {
-
-        $urlRouterProvider.otherwise('/');
-
-        $stateProvider
-                .state('home', {
-                    url: '/',
-                    templateUrl: 'partials/home.html'
-                })
-                .state('groups', {
-                    url: '/groups',
-                    templateUrl: 'partials/groups.html'
-                })
-                .state('group', {
-                    url: '/groups/:groupName',
-                    templateUrl: 'partials/group.html'
-                })
-                .state('topic', {
-                    url: '/groups/:groupName/topics/:topicName',
-                    templateUrl: 'partials/topic.html'
-                })
-                .state('subscription', {
-                    url: '/groups/:groupName/topics/:topicName/subscriptions/:subscriptionName',
-                    templateUrl: 'partials/subscription.html'
-                })
-                .state('diagnostics', {
-                    url: '/groups/:groupName/topics/:topicName/subscriptions/:subscriptionName/diagnostics',
-                    templateUrl: 'partials/diagnostics.html'
-                })
-                .state('constraints', {
-                    url: '/constraints',
-                    templateUrl: 'partials/constraints.html'
-                })
-                .state('consistency', {
-                    url: '/consistency',
-                    templateUrl: 'partials/consistency.html'
-                })
-                .state('groupConsistency', {
-                    url: '/consistency/:groupName',
-                    templateUrl: 'partials/groupConsistency.html'
-                })
-                .state('topicConsistency', {
-                    url: '/consistency/:groupName/topics/:topicName',
-                    templateUrl: 'partials/topicConsistency.html'
-                })
-                .state('datacenterReadiness', {
-                  url: '/readiness',
-                  templateUrl: 'partials/readiness.html'
-                })
-                .state('subscriptionOffsets', {
-                  url: '/subscription-offsets',
-                  templateUrl: 'partials/subscriptionOffsets.html'
-                })
-                .state('search', {
-                    url: '/search?entity&property&operator&pattern',
-                    templateUrl: 'partials/search.html'
-                })
-                .state('stats', {
-                    url: '/stats',
-                    templateUrl: 'partials/stats.html'
-                });
-
-        $httpProvider.interceptors.push(['PasswordService', 'AUTH_CONFIG', 'AuthService', function (passwordService, authConfig, AuthService) {
-                return {
-                    request: function (config) {
-                        if (AuthService.isEnabled() && AuthService.isAuthorized()) {
-                            config.headers.Authorization = 'Token ' + AuthService.getAccessToken();
-                        } else if (authConfig.headers.enabled) {
-                            config.headers[authConfig.headers.adminHeader] = passwordService.getRoot();
-                        }
-                        return config;
-                    }
-                };
-            }]);
-
-        $tooltipProvider.options({ placement: 'left' });
-    }]);
-
-hermes.run(['$rootScope', 'CONSOLE_CONFIG', 'AUTH_CONFIG', "$sce", 'Mode', 'Visibility',
-    function ($rootScope, config, authConfig, $sce, mode, visibility) {
-        $rootScope.console = {
-            title: config.title,
-            criticalEnvironment: config.criticalEnvironment,
-            environmentName: config.environmentName,
-            footer: $sce.trustAsHtml(config.footer)
-        };
-        $rootScope.authEnabled = {
-            oauth: authConfig.oauth.enabled,
-            headers: authConfig.headers.enabled
-        };
-        $rootScope.$on('$viewContentLoaded', function (event) {
-            visibility.update();
-        });
-        mode.reload();
-}]);
diff --git a/hermes-console/static/js/bootstrap.js b/hermes-console/static/js/bootstrap.js
deleted file mode 100644
index 771e7d9836..0000000000
--- a/hermes-console/static/js/bootstrap.js
+++ /dev/null
@@ -1,61 +0,0 @@
-deferredBootstrapper.bootstrap({
-  element: document,
-  module: 'hermes',
-  resolve: {
-    HERMES_URLS: ['$http', '$q', function ($http, $q) {
-        var serviceDiscovery;
-
-        if(config.hermes.discovery.type === 'consul') {
-            serviceDiscovery = new ConsulServiceDiscovery(config.hermes.discovery.consul, $http, $q);
-        }
-        else {
-            serviceDiscovery = new SimpleServiceDiscovery(config.hermes.discovery.simple.url, $q);
-        }
-        return serviceDiscovery.resolveInstances();
-    }]
-  }
-});
-
-function removeTrailingSlash(url) {
-    if (url.indexOf("/", url.length - 1) !== -1) {
-        return url.slice(0, -1);
-    }
-    return url;
-}
-
-function SimpleServiceDiscovery(url, $q) {
-    var normalizedUrl = removeTrailingSlash(url);
-
-    this.resolveInstances = function() {
-        return $q(function(resolve) { resolve([normalizedUrl]); });
-    };
-}
-
-function ConsulServiceDiscovery(config, $http, $q) {
-    var serviceName = config.serviceName;
-
-    this.resolveInstances = function() {
-        return $http.get(config.agentUrl + '/v1/catalog/datacenters')
-        .then(function(response) {
-            var datacenters = response.data;
-            var promises = [];
-            for(var i = 0; i < datacenters.length; ++i) {
-                promises.push($http.get(config.agentUrl + '/v1/catalog/service/' + serviceName + '?dc=' + datacenters[i]));
-            }
-            return $q.all(promises);
-        })
-        .then(function(results) {
-            var instances = [];
-            for(var i = 0; i < results.length; ++i) {
-                for(var j =0; j < results[i].data.length; ++j) {
-                    instances = instances.concat(createUrl(results[i].data[j]));
-                }
-            }
-            return instances;
-        });
-    };
-
-    function createUrl(data) {
-        return 'http://' + data.ServiceAddress + ':' + data.ServicePort;
-    }
-}
diff --git a/hermes-console/static/js/console/Auth.js b/hermes-console/static/js/console/Auth.js
deleted file mode 100644
index e5466670c6..0000000000
--- a/hermes-console/static/js/console/Auth.js
+++ /dev/null
@@ -1,109 +0,0 @@
-var auth = angular.module('hermes.auth', []);
-
-auth.controller('AuthController', ['$scope', '$rootScope', 'AuthService', 'toaster', 'Visibility',
-    function($scope, $rootScope, AuthService, toaster, visibility) {
-
-    $scope.enabled = AuthService.isEnabled();
-    if(!AuthService.isEnabled()) {
-        // abandon any actions if OAuth is not enabled
-        return;
-    }
-
-    AuthService.init();
-
-    $rootScope.isAuthorized = AuthService.isAuthorized();
-
-    $scope.signIn = function() {
-        AuthService.login().then(function() {
-            $rootScope.isAuthorized = true;
-            $rootScope.$apply();
-            visibility.update();
-        }, function(e) {
-            toaster.pop('error', 'An error occurred', AuthService.parseErrorMessage(e));
-            $rootScope.$apply();
-        });
-    };
-
-    $scope.signOut = function() {
-        AuthService.logout().then(function() {
-            $rootScope.isAuthorized = false;
-            $rootScope.$apply();
-            visibility.update();
-        }, function() {
-            toaster.pop('error', 'An error occurred',  AuthService.parseErrorMessage(e));
-            $rootScope.$apply();
-        });
-    };
-}]);
-
-auth.service('AuthService', ['AUTH_OAUTH_CONFIG', function(authConfig) {
-
-    this.init = function() {
-        hello.init({
-            auth: {
-                name: 'auth',
-                oauth: {
-                    version: 2,
-                    auth: authConfig.url
-                },
-                scope: {
-                    basic: ''
-                },
-                login: function(p) {
-                    p.options.window_width = 500;
-                    p.options.window_height = 400;
-                }
-            }
-        });
-        hello.init({
-            auth: authConfig.scope
-        });
-    };
-
-    this.login = function(config) {
-        var options = angular.extend({display: 'popup', scope: authConfig.scope}, config);
-        return hello('auth').login(options);
-    };
-
-    this.logout = function() {
-        return hello('auth').logout();
-    };
-
-    this.parseErrorMessage = function(response) {
-        if (response && response.error && response.error.message) {
-            // messages are in form of "text+text+text+text+text"
-            return response.error.message.replace(/\+/g, ' ');
-        }
-        if (response && response.error && response.error.code) {
-            // error codes are in form of "text_text"
-            return response.error.code.replace(/_/g, ' ');
-        }
-        return 'Unknown error';
-    };
-
-    this.isEnabled = function() {
-        return authConfig.enabled;
-    };
-
-    this.isAuthorized = function() {
-        if(authConfig.enabled) {
-            var response = hello('auth').getAuthResponse();
-            var now = new Date().getTime() / 1000;
-            // this is just a soft validation for UI, token must be validated on server
-            return response && response.access_token && response.expires > now;
-        }
-        return false;
-    };
-
-    this.getAccessToken = function() {
-        return hello('auth').getAuthResponse().access_token;
-    };
-}]);
-
-auth.directive('authPane', function() {
-    return {
-        restrict: 'E',
-        templateUrl: 'partials/authPane.html',
-        controller: 'AuthController'
-    };
-});
diff --git a/hermes-console/static/js/console/Discovery.js b/hermes-console/static/js/console/Discovery.js
deleted file mode 100644
index 398809b6fb..0000000000
--- a/hermes-console/static/js/console/Discovery.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var discovery = angular.module('hermes.discovery', []);
-
-discovery.factory('DiscoveryService', ['HERMES_URLS', function(urls) {
-        var counter = 0;
-
-        return {
-            resolve: function(path) {
-                return urls[counter++ % urls.length] + path;
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/Filters.js b/hermes-console/static/js/console/Filters.js
deleted file mode 100644
index 8a56ec5cbd..0000000000
--- a/hermes-console/static/js/console/Filters.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var filters = angular.module('hermes.filters', []);
-
-filters.filter('readableSize', function () {
-    return function (size) {
-        if (size) {
-            var i = Math.floor(Math.log(size)/Math.log(1024));
-            return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i];
-        }
-        return "";
-    };
-});
-
-filters.filter('prettyJson', function () {
-
-    return function (jsonString) {
-        if (jsonString) {
-            return JSON.stringify(JSON.parse(jsonString), null, 2);
-        }
-        return "null";
-    };
-});
-
-filters.filter('toLowercase', function () {
-    return function(string) {
-        return angular.lowercase(string);
-    };
-});
diff --git a/hermes-console/static/js/console/Groups.js b/hermes-console/static/js/console/Groups.js
deleted file mode 100644
index d8fa39d558..0000000000
--- a/hermes-console/static/js/console/Groups.js
+++ /dev/null
@@ -1,216 +0,0 @@
-var groups = angular.module('hermes.groups', ['hermes.topic', 'hermes.discovery', 'ui.bootstrap']);
-
-groups.controller('GroupsController', ['GROUP_CONFIG', 'GroupRepository', '$scope', '$rootScope', '$uibModal',
-    function (groupConfig, groupRepository, $scope, $rootScope, $modal) {
-        $scope.fetching = true;
-        $scope.search = groupRepository.getSearchFilter();
-
-        $scope.canCreateGroup = function() {
-            return $rootScope.admin || groupConfig.nonAdminCreationEnabled;
-        };
-
-        function loadGroups() {
-            groupRepository.list().then(function (groups) {
-                $scope.groups = groups;
-                $scope.fetching = false;
-            });
-        }
-
-        loadGroups();
-
-        $scope.addGroup = function () {
-            $modal.open({
-                templateUrl: 'partials/modal/editGroup.html',
-                controller: 'GroupEditController',
-                size: 'lg',
-                backdrop: 'static',
-                resolve: {
-                    group: function() {
-                        return {};
-                    },
-                    operation: function() {
-                        return 'ADD';
-                    }
-                }
-            }).result.then(function () {
-                loadGroups();
-            });
-        };
-
-        $scope.storeSearchFilter = function () {
-            groupRepository.storeSearchFilter($scope.search);
-        };
-    }]);
-
-groups.controller('GroupController', ['GroupRepository', 'TopicFactory', '$scope', '$location', '$stateParams', '$uibModal', 'toaster', 'ConfirmationModal', 'PasswordService',
-    function (groupRepository, topicFactory, $scope, $location, $stateParams, $modal, toaster, confirmationModal, passwordService) {
-        $scope.fetching = true;
-        var groupName = $scope.groupName = $stateParams.groupName;
-
-        $scope.group = groupRepository.get(groupName);
-        $scope.topics = [];
-
-        $scope.showTopic = function(topicName) {
-            $location.path('/groups/' + groupName + '/topics/' + topicName);
-        };
-
-        $scope.fetchSubscriptions = function(topic) {
-            groupRepository.listSubscriptions(topic.name).then(function(subscriptions) {
-                topic.subscriptions = subscriptions;
-            });
-        };
-
-        $scope.addTopic = function() {
-            $modal.open({
-                templateUrl: 'partials/modal/editTopic.html',
-                controller: 'TopicEditController',
-                size: 'lg',
-                backdrop: 'static',
-                resolve: {
-                    operation: function () {
-                        return 'ADD';
-                    },
-                    groupName: function () {
-                        return groupName;
-                    },
-                    topic: function () {
-                        return topicFactory.create();
-                    },
-                    messageSchema: function() {
-                        return null;
-                    }
-                }
-            }).result.then(function(){
-                loadTopics();
-            });
-
-
-        };
-
-        $scope.edit = function() {
-            $modal.open({
-                templateUrl: 'partials/modal/editGroup.html',
-                controller: 'GroupEditController',
-                size: 'lg',
-                backdrop: 'static',
-                resolve: {
-                    group: function() {
-                        return $scope.group;
-                    },
-                    operation: function () {
-                        return 'EDIT';
-                    }
-                }
-            });
-        };
-
-        $scope.remove = function() {
-            confirmationModal.open({
-                action: 'Remove',
-                actionSubject: 'Group ' + $scope.group.groupName,
-                passwordLabel: 'Root password',
-                passwordHint: 'root password '
-            }).result.then(function (result) {
-                    $scope.disableRemoveButton = true;
-                    passwordService.setRoot(result.password);
-                    groupRepository.remove($scope.group.groupName).$promise
-                        .then(function () {
-                            toaster.pop('success', 'Success', 'Group has been removed');
-                            $location.path('/groups').replace();
-                        })
-                        .catch(function (response) {
-                            toaster.pop('error', 'Error ' + response.status, response.data.message);
-                        })
-                        .finally(function () {
-                            passwordService.reset();
-                            $scope.disableRemoveButton = false;
-                        });
-                });
-        };
-
-        loadTopics = function() {
-                groupRepository.listTopics(groupName).then(function (topics) {
-                $scope.topics = topics;
-                $scope.fetching = false;
-            });
-        };
-        loadTopics();
-    }]);
-
-groups.controller('GroupEditController', ['GroupRepository', '$scope', '$uibModalInstance', 'group', 'PasswordService', 'toaster', 'operation',
-    function (groupRepository, $scope, $modal, group, passwordService, toaster, operation) {
-        $scope.group = group;
-        $scope.operation = operation;
-
-        $scope.save = function () {
-            $scope.disableSaveButton = true;
-            passwordService.setRoot($scope.rootPassword);
-            var response = operation === 'ADD'? groupRepository.add($scope.group) : groupRepository.save($scope.group);
-            response.$promise
-                .then(function () {
-                    toaster.pop('success', 'Success', 'Group has been saved');
-                    $modal.close();
-                })
-                .catch(function (response) {
-                    toaster.pop('error', 'Error ' + response.status, response.data.message);
-                })
-                .finally(function () {
-                    passwordService.reset();
-                    $scope.disableSaveButton = false;
-                });
-        };
-    }]);
-
-groups.factory('GroupRepository', ['$resource', '$q', '$location', 'TopicRepository', 'DiscoveryService',
-    function ($resource, $q, $location, topicRepository, discovery) {
-        var repository = $resource(discovery.resolve('/groups/:name'), null, {update: {method: 'PUT'}});
-        var listing = $resource(discovery.resolve('/groups'));
-
-        var filterGroupTopics = function (groupName, topics) {
-            return _.filter(topics, function (topic) {
-                return topic.indexOf(groupName) === 0 && groupName.length === topic.lastIndexOf('.');
-            });
-        };
-
-        var searchFilter = '';
-
-        return {
-            list: function () {
-                return $q.all([listing.query().$promise, topicRepository.list().$promise]).then(function (data) {
-                    return _.map(data[0], function (group) {
-                        return {name: group, topics: filterGroupTopics(group, data[1])};
-                    });
-                });
-            },
-            get: function (name) {
-                return repository.get({name: name}, function() {}, function(e) {
-                    if(e.status == 404) { $location.path('/groups'); }
-                });
-            },
-            add: function (group) {
-                return listing.save({}, group);
-            },
-            save: function(group) {
-                return repository.update({name: group.groupName}, group);
-            },
-            remove: function(groupName) {
-                return repository.remove({name: groupName});
-            },
-            listTopics: function (name) {
-                return topicRepository.list().$promise.then(_.curry(filterGroupTopics)(name)).then(function (topics) {
-                    return _.map(topics, function (topic) {
-                        return { name: topic };
-                    });
-                });
-            },
-            listSubscriptions: function(topicName) {
-                return topicRepository.listSubscriptions(topicName).$promise;
-            },
-            storeSearchFilter: function (filter) {
-                searchFilter = filter;
-            },
-            getSearchFilter: function () {
-                return searchFilter;
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/Home.js b/hermes-console/static/js/console/Home.js
deleted file mode 100644
index 9dbe5be48e..0000000000
--- a/hermes-console/static/js/console/Home.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var home = angular.module('hermes.home', []);
-
-home.controller('HomeController', ['$scope', 'DASHBOARD_CONFIG', function($scope, config) {
-
-    $scope.statsDashboard = config.metrics;
-    $scope.docs = config.docs;
-    $scope.costs = {
-        detailsUrl: window.config.costs.globalDetailsUrl,
-        enabled:  window.config.costs.enabled
-    };
-}]);
diff --git a/hermes-console/static/js/console/MessagePreview.js b/hermes-console/static/js/console/MessagePreview.js
deleted file mode 100644
index 6af4be6aa7..0000000000
--- a/hermes-console/static/js/console/MessagePreview.js
+++ /dev/null
@@ -1,70 +0,0 @@
-var messagePreview = angular.module('hermes.messagePreview', ['ui.bootstrap', 'hermes.services', 'toaster', 'hermes.modals']);
-
-messagePreview.controller('MessagePreviewController', ['$scope', 'topicName', 'partition', 'offset', 'previewedMessage',
-    function ($scope, topicName, partition, offset, previewedMessage) {
-        $scope.previewedMessage = previewedMessage;
-        $scope.topicName = topicName;
-        $scope.partition = partition;
-        $scope.offset = offset;
-
-
-    }
-]);
-
-messagePreview.factory('MessagePreviewModal', ['$uibModal', 'toaster', 'ConfirmationModal', 'PasswordService', 'MessagePreviewRepository',
-    function ($modal, toaster, confirmationModal, passwordService, messagePreviewRepository) {
-    return {
-        previewMessage: function (topicName, cluster, partition, offset, messageId) {
-            confirmationModal.open({
-                action: 'Preview',
-                actionSubject: messageId,
-                passwordLabel: 'Superuser password'
-            }).result.then(function (result) {
-                    passwordService.setRoot(result.password);
-                    messagePreviewRepository.messagePreview(topicName, cluster, partition, offset).$promise
-                        .then(function (previewedMessage) {
-                            openModal(topicName, partition, offset, previewedMessage);
-                        })
-                        .catch(function (response) {
-                            toaster.pop('error', 'Error ' + response.status, 'Cannot get message preview due to error: ' + response.status + ' ' + response.statusText);
-                        })
-                        .finally(function () {
-                            passwordService.reset();
-                        });
-                });
-
-            function openModal(topicName, partition, offset, previewedMessage) {
-                $modal.open({
-                    templateUrl: 'partials/modal/messagePreview.html',
-                    controller: 'MessagePreviewController',
-                    size: 'lg',
-                    resolve: {
-                        previewedMessage: function () {
-                            return previewedMessage;
-                        },
-                        topicName: function () {
-                            return topicName;
-                        },
-                        partition: function () {
-                            return partition;
-                        },
-                        offset: function () {
-                            return offset;
-                        }
-                    }
-                });
-            }
-        }
-    };
-}]);
-
-
-messagePreview.factory('MessagePreviewRepository', ['DiscoveryService', '$resource',
-    function (discovery, $resource) {
-        var messagePreview = $resource(discovery.resolve('/topics/:name/preview/cluster/:cluster/partition/:partition/offset/:offset'));
-        return {
-            messagePreview: function(topicName, cluster, partition, offset) {
-                return messagePreview.get({name: topicName, cluster: cluster, partition: partition, offset: offset});
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/MetricStoreUrlResolver.js b/hermes-console/static/js/console/MetricStoreUrlResolver.js
deleted file mode 100644
index 2bd08f609d..0000000000
--- a/hermes-console/static/js/console/MetricStoreUrlResolver.js
+++ /dev/null
@@ -1,73 +0,0 @@
-var metricStore = angular.module('hermes.metrics', []);
-
-metricStore.factory('MetricStoreUrlResolver', ['METRICS_CONFIG', function(config) {
-        if(config.type == 'graphite') {
-            return new GraphiteUrlResolver(config.graphite);
-        } else {
-            console.error('Metric store type: ' + config.type + ' is not supported.');
-        }
-    }]);
-
-function GraphiteUrlResolver(config) {
-    var prefix = config.prefix;
-
-    function compile(template, values) {
-        var regex = /{}/g;
-        var text = template;
-        var i = 0;
-
-        while(regex.test(text)) {
-            text = text.replace(/{}/, values[i]);
-            i++;
-        }
-        return text;
-    }
-
-    function sanitize(value) {
-        return value.replace(/\./g, '_');
-    }
-
-    function consumerGroupId(group, topic, subscription) {
-        return compile("{}_{}_{}", _.map([group, topic, subscription], function(item) {
-            return sanitize(item.replace(/_/g, '__'));
-        }));
-    }
-
-    function url(value) {
-        return config.url + '/render/?width=1514&height=952&target=' + value;
-    }
-
-    function topicPath(group, topic) {
-        return sanitize(group) + '.' + sanitize(topic);
-    }
-
-    function subscriptionPath(group, topic, subscription) {
-        return topicPath(group, topic) + '.' + sanitize(subscription);
-    }
-
-    this.topicMetrics = function(group, topic) { return {
-            rate: url(compile('sumSeries({}.producer.*.meter.{}.m1_rate)', [prefix, topicPath(group, topic)])),
-            deliveryRate: url(compile('sumSeries({}.consumer.*.meter.{}.m1_rate)', [prefix, topicPath(group, topic)])),
-            published: url(compile('sumSeries({}.producer.*.published.{}.count)', [prefix, topicPath(group, topic)])),
-            latency: url(compile('{}.producer.*.ack-*.latency.{}.p99', [prefix, topicPath(group, topic)])),
-            messageSize: url(compile('{}.producer.*.message-size.{}.max', [prefix, topicPath(group, topic)]))
-        };
-    };
-
-    this.subscriptionMetrics = function(group, topic, subscription) { return {
-            rate: url(compile('sumSeries({}.consumer.*.meter.{}.m1_rate)', [prefix, subscriptionPath(group, topic, subscription)])),
-            delivered: url(compile('sumSeries({}.consumer.*.delivered.{}.count)', [prefix, subscriptionPath(group, topic, subscription)])),
-            discarded: url(compile('sumSeries({}.consumer.*.discarded.{}.count)', [prefix, subscriptionPath(group, topic, subscription)])),
-            outputRate: url(compile('sumSeries({}.consumer.*.output-rate.{})', [prefix, subscriptionPath(group, topic, subscription)])),
-            latency: url(compile('{}.consumer.*.latency.{}.p99', [prefix, subscriptionPath(group, topic, subscription)])),
-            timeouts: url(compile('sumSeries({}.consumer.*.status.{}.errors.timeout.m1_rate)', [prefix, subscriptionPath(group, topic, subscription)])),
-            networkErrors: url(compile('sumSeries({}.consumer.*.status.{}.errors.other.m1_rate)', [prefix, subscriptionPath(group, topic, subscription)])),
-            '2xx': url(compile('sumSeries({}.consumer.*.status.{}.2xx.m1_rate)', [prefix, subscriptionPath(group, topic, subscription)])),
-            '4xx': url(compile('sumSeries({}.consumer.*.status.{}.4xx.m1_rate)', [prefix, subscriptionPath(group, topic, subscription)])),
-            '5xx': url(compile('sumSeries({}.consumer.*.status.{}.5xx.m1_rate)', [prefix, subscriptionPath(group, topic, subscription)])),
-            lag: url(compile('sumSeries({}.consumer-offset.*.{}_{}*.{}.*.lag)', [
-                    prefix, sanitize(group), sanitize(topic), consumerGroupId(group, topic, subscription)
-                ]))
-        };
-    };
-}
diff --git a/hermes-console/static/js/console/Modals.js b/hermes-console/static/js/console/Modals.js
deleted file mode 100644
index fb5b0fda16..0000000000
--- a/hermes-console/static/js/console/Modals.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var modals = angular.module('hermes.modals', []);
-
-modals.factory('ConfirmationModal', ['$uibModal', function ($modal) {
-        return {
-            open: function (actionDescription) {
-                return $modal.open({
-                    templateUrl: 'partials/modal/confirm.html',
-                    controller: 'ConfirmationController',
-                    size: 'lg',
-                    resolve: {
-                        actionDescription: function () {
-                            return actionDescription;
-                        }
-                    }
-                });
-            }
-        };
-    }]);
-
-modals.controller('ConfirmationController', ['$scope', 'actionDescription',
-    function ($scope, actionDescription) {
-        $scope.description = actionDescription;
-    }]);
diff --git a/hermes-console/static/js/console/Mode.js b/hermes-console/static/js/console/Mode.js
deleted file mode 100644
index 20a254b63e..0000000000
--- a/hermes-console/static/js/console/Mode.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var modeModule = angular.module('hermes.mode', []);
-
-modeModule.factory('Mode', ['DiscoveryService', '$http', '$rootScope',
-    function (discovery, $http, $rootScope) {
-        return {
-            reload: function () {
-                // intentionally use $http over $resource because of https://stackoverflow.com/questions/24876593/resource-query-return-split-strings-array-of-char-instead-of-a-string
-                $http.get(discovery.resolve('/mode')).then(
-                    function (response) {
-                        $rootScope.readOnly = (response.data === 'readOnly' || response.data === 'readOnlyAdmin');
-                    });
-            }
-        };
-
-    }]);
diff --git a/hermes-console/static/js/console/PasswordService.js b/hermes-console/static/js/console/PasswordService.js
deleted file mode 100644
index ef5f0793f1..0000000000
--- a/hermes-console/static/js/console/PasswordService.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var services = angular.module('hermes.services', []);
-
-services.service('PasswordService', ['$rootScope', function ($rootScope) {
-
-        return {
-            getRoot: function () {
-                return $rootScope.rootPassword;
-            },
-            setRoot: function (password) {
-                $rootScope.rootPassword = password;
-            },
-            reset: function() {
-                $rootScope.rootPassword = '';
-            }
-        };
-
-    }]);
\ No newline at end of file
diff --git a/hermes-console/static/js/console/Search.js b/hermes-console/static/js/console/Search.js
deleted file mode 100644
index 3928fe69fc..0000000000
--- a/hermes-console/static/js/console/Search.js
+++ /dev/null
@@ -1,97 +0,0 @@
-var search = angular.module('hermes.search', []);
-
-search.controller('SearchController', ['$scope', '$stateParams', 'SearchRepository',
-    function($scope, $stateParams, searchRepository) {
-
-    $scope.entity = $stateParams.entity || 'subscription';
-    $scope.property = $stateParams.property || 'endpoint';
-    $scope.operator = $stateParams.operator || 'like';
-    $scope.pattern = $stateParams.pattern || '';
-
-    $scope.fetching = false;
-    $scope.state = {
-        notSearched: true,
-        noResults: false
-    };
-
-    $scope.search = function() {
-        $scope.fetching = true;
-        var query = createQuery($scope.property, $scope.operator, $scope.pattern);
-
-        searchRepository.search($scope.entity, query).then(function (items) {
-            $scope.items = postProcess($scope.entity, items);
-            $scope.fetching = false;
-            $scope.state.notSearched = false;
-            $scope.state.noResults = !items || items.length === 0;
-        });
-    };
-
-    function createQuery(property, operator, value) {
-        var query = {};
-        query[property] = {};
-
-        var sanitizedOperator = operator || 'like';
-        query[property][sanitizedOperator] = decorateQueryValue(value);
-
-        return {query: query};
-    }
-
-    function decorateQueryValue(value) {
-        if (value === '' || value.length < 4) {
-            return value;
-        }
-
-        if (value.startsWith('.*') || value.endsWith('.*')) {
-            return value;
-        }
-
-        return '.*' + value + '.*';
-    }
-
-    function postProcess(entity, items) {
-        if (entity === 'topic') {
-            return _.map(items, function(item) {
-                var fullName = decomposeTopicName(item.name);
-                return {
-                    name: item.name,
-                    data: [{label: 'owner', value: item.owner.id}],
-                    url: '#/groups/' + fullName.group + '/topics/' + item.name
-                };
-            });
-        }
-        else if (entity === 'subscription') {
-            return _.map(items, function(item) {
-                var fullName = decomposeTopicName(item.topicName);
-                return {
-                    name: item.topicName + '.' + item.name,
-                    data: [{label: 'endpoint', value: item.endpoint}, {label: 'owner', value: item.owner.id}, {label: 'status', value: item.state}],
-                    url: '#/groups/' + fullName.group + '/topics/' + item.topicName + '/subscriptions/' + item.name
-                };
-            });
-        }
-    }
-
-    function decomposeTopicName(topicName) {
-        return {
-            group: topicName.substring(0, topicName.lastIndexOf(".")),
-            topic: topicName.substring(topicName.lastIndexOf(".") + 1)
-        };
-    }
-}]);
-
-search.factory('SearchRepository', ['$resource', 'DiscoveryService',
-    function ($resource, discovery) {
-        var querySubscriptions = $resource(discovery.resolve('/query/subscriptions'), null, {query: {method: 'POST', isArray: true}});
-        var queryTopics = $resource(discovery.resolve('/query/topics'), null, {query: {method: 'POST', isArray: true}});
-
-        return {
-            search: function (entity, query) {
-                if (entity === 'topic') {
-                    return queryTopics.query(query).$promise;
-                }
-                else if (entity === 'subscription') {
-                    return querySubscriptions.query(query).$promise;
-                }
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/Stats.js b/hermes-console/static/js/console/Stats.js
deleted file mode 100644
index d7a5104467..0000000000
--- a/hermes-console/static/js/console/Stats.js
+++ /dev/null
@@ -1,51 +0,0 @@
-var stats = angular.module('hermes.stats', ['ngResource', 'hermes.search', 'hermes.topic.repository']);
-
-stats.controller('StatsController', ['$scope', 'SearchRepository', 'TopicRepository', function($scope, searchRepository, topicRepository) {
-
-    $scope.topics = {};
-    $scope.subscriptions = {};
-
-    topicRepository.list().$promise
-    .then(function(list) {
-        $scope.topics.total = list.length;
-    })
-    .then(function() {
-        searchRepository.search('topic', {query: {ack: {eq: 'ALL'}}}).then(function(ackAllTopics) {
-            $scope.topics.ackAll = {
-                count: ackAllTopics.length,
-                ratio: (ackAllTopics.length / $scope.topics.total) * 100
-            };
-        });
-        searchRepository.search('topic', {query: {trackingEnabled: {eq: true}}}).then(function(trackedTopics) {
-            $scope.topics.tracked = {
-                count: trackedTopics.length,
-                ratio: (trackedTopics.length / $scope.topics.total) * 100
-            };
-        });
-        searchRepository.search('topic', {query: {contentType: {eq: 'AVRO'}}}).then(function(avroTopics) {
-            $scope.topics.avro = {
-                count: avroTopics.length,
-                ratio: (avroTopics.length / $scope.topics.total) * 100
-            };
-        });
-    });
-
-    searchRepository.search('subscription', {query: {name: {like: '.*'}}}).then(function(list) {
-        $scope.subscriptions.total = list.length;
-    })
-    .then(function() {
-        searchRepository.search('subscription', {query: {trackingEnabled: {eq: true}}}).then(function(trackedTopics) {
-            $scope.subscriptions.tracked = {
-                count: trackedTopics.length,
-                ratio: (trackedTopics.length / $scope.subscriptions.total) * 100
-            };
-        });
-        searchRepository.search('subscription', {query: {contentType: {eq: 'AVRO'}}}).then(function(avroTopics) {
-            $scope.subscriptions.avro = {
-                count: avroTopics.length,
-                ratio: (avroTopics.length / $scope.subscriptions.total) * 100
-            };
-        });
-    });
-
-}]);
diff --git a/hermes-console/static/js/console/Visibility.js b/hermes-console/static/js/console/Visibility.js
deleted file mode 100644
index 5df903f7b1..0000000000
--- a/hermes-console/static/js/console/Visibility.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var rolesModule = angular.module('hermes.visibility', []);
-
-rolesModule.factory('Visibility', ['DiscoveryService', '$resource', '$rootScope', '$stateParams',
-    function (discovery, $resource, $rootScope, $stateParams) {
-
-    return   {
-        update: function () {
-
-            var topicName = $stateParams.topicName;
-            var subscriptionName = $stateParams.subscriptionName;
-
-            var topicPath = topicName && '/topics/' + topicName || '';
-            var subscriptionPath = topicPath && subscriptionName && '/subscriptions/' + subscriptionName || '';
-
-            var rolesResource = $resource(discovery.resolve('/roles' + topicPath + subscriptionPath));
-
-            function isAdmin(rolesList) {
-                return rolesList.includes('admin');
-            }
-
-            function hasSufficientPrivileges(rolesList) {
-                if (isAdmin(rolesList)) {
-                    return true;
-                }
-                if (subscriptionName) {
-                    return rolesList.includes('subscriptionOwner');
-                }
-                if (topicName) {
-                    return rolesList.includes('topicOwner');
-                }
-                return rolesList.includes('any');
-            }
-
-            rolesResource.query().$promise.then(
-                function (commaSeparatedRoles) {
-                    const rolesList = commaSeparatedRoles.toString().split(',');
-                    $rootScope.admin = isAdmin(rolesList);
-                    $rootScope.userHasSufficientPrivileges = hasSufficientPrivileges(rolesList);
-                    $rootScope.userWithoutAccess = $rootScope.readOnly ? !$rootScope.admin : !$rootScope.userHasSufficientPrivileges;
-                },
-                function() {
-                    $rootScope.admin = false;
-                    $rootScope.userHasSufficientPrivileges = false;
-                    $rootScope.userWithoutAccess = true;
-                }
-            );
-        }
-    };
-
-}]);
diff --git a/hermes-console/static/js/console/consistency/ConsistencyController.js b/hermes-console/static/js/console/consistency/ConsistencyController.js
deleted file mode 100644
index 577b062c98..0000000000
--- a/hermes-console/static/js/console/consistency/ConsistencyController.js
+++ /dev/null
@@ -1,158 +0,0 @@
-var consistency = angular.module('hermes.consistency', [
-    'ui.bootstrap',
-    'hermes.consistency.repository'
-]);
-
-consistency.controller('ConsistencyController', ['$scope', '$state', 'toaster', 'CONSISTENCY_CONFIG', 'ConsistencyRepository', 'ConfirmationModal',
-    function ($scope, $state, toaster, config, consistencyRepository, confirmationModal) {
-
-        const consistencyCheckingStates = {
-            READY: 'READY',
-            CHECKING_CONSISTENCY: 'CHECKING_CONSISTENCY'
-        };
-
-        $scope.consistencyChecking = {
-            state: consistencyCheckingStates.READY,
-            result: consistencyRepository.getLastConsistencyCheckingResult()
-        };
-
-        $scope.topicsConsistencyChecking = {
-            state: consistencyCheckingStates.READY,
-            result: consistencyRepository.getLastTopicsConsistencyCheckingResult()
-        };
-
-        $scope.$watch('consistencyChecking.result', function (result) {
-            consistencyRepository.setLastConsistencyCheckingResult(result);
-        }, true);
-
-        $scope.$watch('topicsConsistencyChecking.result', function (result) {
-            consistencyRepository.setLastTopicsConsistencyCheckingResult(result);
-        }, true);
-
-        $scope.checkConsistency = function() {
-            checkGroupConsistency();
-            findTopicsNotPresentInHermes();
-        };
-
-        $scope.removeTopic = function (topicName) {
-            confirmationModal.open({
-                actionSubject: 'Are you sure you want to remove topic: ' + topicName,
-                action: "Remove"
-            }).result.then(function () {
-                consistencyRepository.removeTopic(topicName);
-            })
-            .then(function () {
-                let newArray = $scope.topicsConsistencyChecking.result.filter(
-                    function (element) {
-                        return element !== topicName;
-                    });
-                setInconsistentTopics(newArray);
-                toaster.pop('success', 'Success', 'Topic has been removed');
-            })
-            .catch(function (e) {
-                showErrorPopup("cannot remove topic: " + e);
-                setInconsistentTopics(null);
-            });
-        };
-
-        function checkGroupConsistency() {
-            setGroupsState(consistencyCheckingStates.CHECKING_CONSISTENCY);
-            setInconsistentGroups(null);
-            setInconsistentTopics(null);
-            $scope.processedGroupsPercent = 0;
-            $scope.processedGroups = 0;
-
-            consistencyRepository.listGroupNames()
-                .then(function (groups) {
-
-                    return partition(groups, config.maxGroupBatchSize)
-                        .reduce(
-                            (promise, groupsToCheck) => promise
-                                .then(inconsistentGroups => listInconsistentGroups(groupsToCheck)
-                                    .then(function (newInconsistentGroups) {
-                                        $scope.processedGroups += groupsToCheck.length;
-                                        $scope.processedGroupsPercent = Math.floor(($scope.processedGroups / groups.length) * 100);
-                                        return inconsistentGroups.concat(newInconsistentGroups);
-                                    })
-                                ),
-                            Promise.resolve([])
-                        )
-                        .then(setInconsistentGroups);
-                })
-                .catch(function (response) {
-                    showErrorPopup('Cannot check consistency', response);
-                    setInconsistentGroups(null);
-                })
-                .finally(function () {
-                    setGroupsState(consistencyCheckingStates.READY);
-                });
-        }
-
-        function findTopicsNotPresentInHermes() {
-            setTopicsState(consistencyCheckingStates.CHECKING_CONSISTENCY);
-            consistencyRepository.listInconsistentTopics()
-            .then(function (topics) {
-                setInconsistentTopics(topics);
-            })
-            .finally(function () {
-                setTopicsState(consistencyCheckingStates.READY);
-            });
-        }
-
-        function showErrorPopup(message, response) {
-            toaster.pop(
-                'error',
-                'Error ' + response.status,
-                message + ' due to error: ' + response.status + ' ' + response.statusText
-            );
-        }
-
-        function setGroupsState(inconsistentGroupsState) {
-            $scope.consistencyChecking.state = inconsistentGroupsState;
-        }
-
-        function setTopicsState(inconsistentGroupsState) {
-            $scope.topicsConsistencyChecking.state = inconsistentGroupsState;
-        }
-
-        function setInconsistentGroups(inconsistentGroups) {
-            $scope.consistencyChecking.result = inconsistentGroups
-        }
-
-        function setInconsistentTopics(inconsistentTopics) {
-            $scope.topicsConsistencyChecking.result =inconsistentTopics
-        }
-
-        function partition(items, size) {
-            const result = _.groupBy(items, function (item, i) {
-                return Math.floor(i / size);
-            });
-            return _.values(result);
-        }
-
-        function listInconsistentGroups(groupsToCheck) {
-            return consistencyRepository.listInconsistentGroups(groupsToCheck);
-        }
-    }]);
-
-consistency.controller('GroupConsistencyController', ['$scope', '$stateParams', '$state', 'ConsistencyRepository',
-    function ($scope, $stateParams, $state, consistencyRepository) {
-
-        $scope.groupName = $stateParams.groupName;
-        $scope.group = consistencyRepository.getGroup($scope.groupName);
-
-        if (!$scope.group) {
-            $state.go('consistency');
-        }
-    }]);
-
-consistency.controller('TopicConsistencyController', ['$scope', '$stateParams', '$state', 'ConsistencyRepository',
-    function ($scope, $stateParams, $state, consistencyRepository) {
-
-        $scope.groupName = $stateParams.groupName;
-        $scope.topicName = $stateParams.topicName;
-        $scope.topic = consistencyRepository.getTopic($scope.groupName, $scope.topicName);
-        if (!$scope.topic) {
-            $state.go('groupConsistency',{groupName: $scope.groupName});
-        }
-    }]);
diff --git a/hermes-console/static/js/console/consistency/ConsistencyRepository.js b/hermes-console/static/js/console/consistency/ConsistencyRepository.js
deleted file mode 100644
index b678c08f66..0000000000
--- a/hermes-console/static/js/console/consistency/ConsistencyRepository.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var repository = angular.module('hermes.consistency.repository', []);
-
-repository.factory('ConsistencyRepository', ['DiscoveryService', '$resource',
-    function (discovery, $resource) {
-
-        const consistencyResource = $resource(discovery.resolve('/consistency/inconsistencies/groups'));
-        const groupsResource = $resource(discovery.resolve('/consistency/groups'));
-        const consistencyTopicsResource = $resource(discovery.resolve('/consistency/inconsistencies/topics'));
-
-        var lastConsistencyCheckingResult = {
-            inconsistentGroups: null,
-            inconsistentTopics: null
-        };
-
-        function getGroup(groupName) {
-            return _.find(lastConsistencyCheckingResult.inconsistentGroups, {'name': groupName});
-        }
-
-        return {
-            listInconsistentGroups: function (groupNames) {
-                return consistencyResource.query({groupNames: groupNames}).$promise;
-            },
-            listGroupNames: function () {
-                return groupsResource.query().$promise;
-            },
-            setLastConsistencyCheckingResult: function (result) {
-                lastConsistencyCheckingResult.inconsistentGroups = result;
-            },
-            getLastConsistencyCheckingResult: function () {
-                return lastConsistencyCheckingResult.inconsistentGroups;
-            },
-            getLastTopicsConsistencyCheckingResult: function () {
-                return lastConsistencyCheckingResult.inconsistentTopics;
-            },
-            setLastTopicsConsistencyCheckingResult: function (result) {
-                lastConsistencyCheckingResult.inconsistentTopics = result;
-            },
-            listInconsistentTopics: function () {
-                return consistencyTopicsResource.query().$promise;
-            },
-            removeTopic: function (topicName) {
-                return consistencyTopicsResource.remove({topicName: topicName});
-            },
-            getGroup: getGroup,
-            getTopic: function (groupName, topicName) {
-                const group = getGroup(groupName) || {};
-                return _.find(group.inconsistentTopics, {'name': topicName});
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/constraints/ConstraintsController.js b/hermes-console/static/js/console/constraints/ConstraintsController.js
deleted file mode 100644
index 29d2ffd00f..0000000000
--- a/hermes-console/static/js/console/constraints/ConstraintsController.js
+++ /dev/null
@@ -1,172 +0,0 @@
-var constraints = angular.module('hermes.constraints', [
-    'ui.bootstrap',
-    'hermes.constraints.repository'
-]);
-
-constraints.controller('ConstraintsController', ['ConstraintsRepository', '$scope', '$stateParams', '$location', '$uibModal',
-    function (constraintsRepository, $scope, $stateParams, $location, $modal) {
-
-        var isSubscription = function (constraints) {
-            return constraints.subscriptionName !== undefined;
-        };
-
-        $scope.edit = function (constraints) {
-            $modal.open({
-                templateUrl: 'partials/modal/editConstraints.html',
-                controller: 'ConstraintsEditController',
-                size: 'lg',
-                resolve: {
-                    constraintsType: function () {
-                        return isSubscription(constraints) ? 'subscription' : 'topic';
-                    },
-                    constraintsName: function () {
-                        return isSubscription(constraints) ? constraints.subscriptionName : constraints.topicName;
-                    },
-                    consumersNumber: function () {
-                        return constraints.consumersNumber;
-                    }
-                }
-            }).result.then(function () {
-                loadConstraints();
-            });
-        };
-
-        var addConstraints = function (constraintsType) {
-            $modal.open({
-                templateUrl: 'partials/modal/addConstraints.html',
-                controller: 'ConstraintsAddController',
-                size: 'lg',
-                resolve: {
-                    constraintsType: function () {
-                        return constraintsType;
-                    }
-                }
-            }).result.then(function () {
-                loadConstraints();
-            });
-        };
-
-        $scope.addTopicConstraints = function () {
-            addConstraints('topic');
-        };
-
-        $scope.addSubscriptionConstraints = function () {
-            addConstraints('subscription');
-        };
-
-        var loadConstraints = function () {
-            constraintsRepository.getWorkloadConstraints()
-                .then(function (workloadConstraints) {
-                    $scope.topicConstraints = workloadConstraints.topicConstraints;
-                    $scope.subscriptionConstraints = workloadConstraints.subscriptionConstraints;
-                });
-        };
-
-        loadConstraints();
-    }]);
-
-constraints.controller('ConstraintsAddController', ['ConstraintsRepository', '$scope', '$uibModalInstance', 'constraintsType',
-    function (constraintsRepository, $scope, $modalInstance, constraintsType) {
-        $scope.constraintsType = constraintsType;
-        $scope.consumersNumber = 1;
-        $scope.constraintsName = { topicName: '', subscriptionName: '' };
-
-        $scope.save = function () {
-            if ($scope.constraintsType === 'topic') {
-                constraintsRepository.updateTopicConstraints({
-                    topicName: $scope.constraintsName.topicName,
-                    constraints: {
-                        consumersNumber: $scope.consumersNumber
-                    }
-                }).then(function () {
-                    $modalInstance.close();
-                });
-            } else {
-                constraintsRepository.updateSubscriptionConstraints({
-                    subscriptionName: $scope.constraintsName.topicName + '$' + $scope.constraintsName.subscriptionName,
-                    constraints: {
-                        consumersNumber: $scope.consumersNumber
-                    }
-                }).then(function () {
-                    $modalInstance.close();
-                });
-            }
-        };
-    }]);
-
-constraints.controller('ConstraintsEditController', ['ConstraintsRepository', '$scope', '$uibModal', '$uibModalInstance',
-    'constraintsType', 'constraintsName', 'consumersNumber',
-    function (constraintsRepository, $scope, $modal, $modalInstance, constraintsType, constraintsName, consumersNumber) {
-        $scope.constraintsType = constraintsType;
-        $scope.constraintsName = constraintsName;
-        $scope.consumersNumber = consumersNumber;
-
-        $scope.save = function () {
-            if ($scope.constraintsType === 'topic') {
-                constraintsRepository.updateTopicConstraints({
-                    topicName: $scope.constraintsName,
-                    constraints: {
-                        consumersNumber: $scope.consumersNumber
-                    }
-                }).then(closeModal);
-            } else {
-                constraintsRepository.updateSubscriptionConstraints({
-                    subscriptionName: $scope.constraintsName,
-                    constraints: {
-                        consumersNumber: $scope.consumersNumber
-                    }
-                }).then(closeModal);
-            }
-        };
-
-        $scope.remove = function () {
-            $modal.open({
-                templateUrl: 'partials/modal/removeConstraints.html',
-                controller: 'ConstraintsRemoveController',
-                size: 'lg',
-                resolve: {
-                    constraintsName: function () {
-                        return $scope.constraintsName;
-                    },
-                    constraintsType: function () {
-                        return $scope.constraintsType;
-                    }
-                }
-            }).result.then(acceptHandler, dismissHandler);
-        };
-
-        var closeModal = function () {
-            $modalInstance.close();
-        };
-
-        var acceptHandler = function (response) {
-            if (response === 'REMOVE') {
-                if ($scope.constraintsType === 'topic') {
-                    constraintsRepository.removeTopicConstraints($scope.constraintsName)
-                        .$promise
-                        .then(closeModal);
-                } else {
-                    var splittedName = $scope.constraintsName.split("$");
-                    var topicName = splittedName[0];
-                    var subscriptionName = splittedName[1];
-                    constraintsRepository.removeSubscriptionConstraints(topicName, subscriptionName)
-                        .$promise
-                        .then(closeModal);
-                }
-            }
-        };
-
-        var dismissHandler = function () {
-            $modalInstance.dismiss();
-        };
-    }]);
-
-constraints.controller('ConstraintsRemoveController', ['ConstraintsRepository', '$scope', '$uibModalInstance',
-    'constraintsName', 'constraintsType',
-    function (constraintsRepository, $scope, $modalInstance, constraintsName, constraintsType) {
-        $scope.constraintsName = constraintsName;
-        $scope.constraintsType = constraintsType;
-        $scope.remove = function () {
-            $modalInstance.close('REMOVE');
-        };
-    }]);
diff --git a/hermes-console/static/js/console/constraints/ConstraintsRepository.js b/hermes-console/static/js/console/constraints/ConstraintsRepository.js
deleted file mode 100644
index 20b3085fe0..0000000000
--- a/hermes-console/static/js/console/constraints/ConstraintsRepository.js
+++ /dev/null
@@ -1,53 +0,0 @@
-var repository = angular.module('hermes.constraints.repository', []);
-
-repository.factory('ConstraintsRepository', ['DiscoveryService', '$resource',
-    function (discovery, $resource) {
-        var workloadConstraints = $resource(discovery.resolve('/workload-constraints'), {}, { query: { method: 'GET' } });
-        var updateTopicConstraintsEndpoint = $resource(discovery.resolve('/workload-constraints/topic'), null, { update: { method: 'PUT' } });
-        var updateSubscriptionConstraintsEndpoint = $resource(discovery.resolve('/workload-constraints/subscription'), null, { update: { method: 'PUT' } });
-        var removeTopicConstraintsEndpoint = $resource(discovery.resolve('/workload-constraints/topic/:topicName'));
-        var removeSubscriptionConstraintsEndpoint = $resource(discovery.resolve('/workload-constraints/subscription/:topicName/:subscriptionName'));
-
-        return {
-            getWorkloadConstraints: function () {
-                return workloadConstraints.query({}).$promise
-                    .then(function (response) {
-                        var workloadConstraints = {};
-                        workloadConstraints.topicConstraints = [];
-                        for (var topicName in response.topicConstraints) {
-                            workloadConstraints.topicConstraints.push({
-                                topicName: topicName,
-                                consumersNumber: response.topicConstraints[topicName].consumersNumber
-                            });
-                        }
-
-                        workloadConstraints.subscriptionConstraints = [];
-                        for (var subscriptionName in response.subscriptionConstraints) {
-                            workloadConstraints.subscriptionConstraints.push({
-                                subscriptionName: subscriptionName,
-                                consumersNumber: response.subscriptionConstraints[subscriptionName].consumersNumber
-                            });
-                        }
-                        return workloadConstraints;
-                    })
-                    .catch(function () {
-                        return {
-                            topicConstraints: [],
-                            subscriptionConstraints: []
-                        };
-                    });
-            },
-            updateTopicConstraints: function (topicConstraints) {
-                return updateTopicConstraintsEndpoint.update({}, topicConstraints).$promise;
-            },
-            updateSubscriptionConstraints: function (subscriptionConstraints) {
-                return updateSubscriptionConstraintsEndpoint.update({}, subscriptionConstraints).$promise;
-            },
-            removeTopicConstraints: function (topicName) {
-                return removeTopicConstraintsEndpoint.remove({ topicName: topicName });
-            },
-            removeSubscriptionConstraints: function (topicName, subscriptionName) {
-                return removeSubscriptionConstraintsEndpoint.remove({ topicName: topicName, subscriptionName: subscriptionName });
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/diagnostics/DiagnosticsController.js b/hermes-console/static/js/console/diagnostics/DiagnosticsController.js
deleted file mode 100644
index 8967d26de5..0000000000
--- a/hermes-console/static/js/console/diagnostics/DiagnosticsController.js
+++ /dev/null
@@ -1,52 +0,0 @@
-var diagnostics = angular.module('hermes.diagnostics', [
-    'ui.bootstrap',
-    'hermes.diagnostics.repository'
-]);
-
-diagnostics.controller('DiagnosticsController', ['DiagnosticsRepository', '$scope', '$stateParams',
-    function (diagnosticsRepository, $scope, $stateParams) {
-        $scope.groupName = $stateParams.groupName;
-        $scope.topicName = $stateParams.topicName;
-        $scope.subscriptionName = $stateParams.subscriptionName;
-
-        diagnosticsRepository.getConsumerGroups($scope.topicName, $scope.subscriptionName)
-            .then(function (consumerGroups) {
-                $scope.consumerGroups = consumerGroups;
-            })
-            .catch(function () {
-                $scope.consumerGroups = [];
-            });
-
-        $scope.isConsumerGroupStable = function (consumerGroup) {
-            return consumerGroup.state === 'Stable';
-        };
-
-        $scope.isConsumerGroupDuringRebalance = function (consumerGroup) {
-            return consumerGroup.state === 'PreparingRebalance' || consumerGroup.state === 'CompletingRebalance';
-        };
-
-        $scope.isConsumerGroupUnstable = function (consumerGroup) {
-            return !$scope.isConsumerGroupStable(consumerGroup) && !$scope.isConsumerGroupDuringRebalance(consumerGroup);
-        };
-
-        $scope.isJsonTopic = function (partition) {
-            return partition.contentType === 'JSON';
-        };
-
-        $scope.isAvroTopic = function (partition) {
-            return partition.contentType === 'AVRO';
-        };
-
-        $scope.consumerGroupExists = function () {
-            return !_.isEmpty($scope.consumerGroups);
-        };
-
-        $scope.copyTopicNameToClipboard = function (partition) {
-            var tempElement = document.createElement('textarea');
-            tempElement.value = partition.topic;
-            document.body.appendChild(tempElement);
-            tempElement.select();
-            document.execCommand('copy');
-            document.body.removeChild(tempElement);
-        };
-    }]);
diff --git a/hermes-console/static/js/console/diagnostics/DiagnosticsRepository.js b/hermes-console/static/js/console/diagnostics/DiagnosticsRepository.js
deleted file mode 100644
index d0cfd60219..0000000000
--- a/hermes-console/static/js/console/diagnostics/DiagnosticsRepository.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var repository = angular.module('hermes.diagnostics.repository', []);
-
-repository.factory('DiagnosticsRepository', ['DiscoveryService', '$resource',
-    function (discovery, $resource) {
-
-        var consumerGroups = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/consumer-groups'),
-            {}, {query:  {method: 'GET', isArray: true}});
-
-        return {
-            getConsumerGroups: function (topicName, subscriptionName) {
-                return consumerGroups.query({topicName: topicName, subscriptionName: subscriptionName}).$promise;
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/filters/FiltersDebugger.js b/hermes-console/static/js/console/filters/FiltersDebugger.js
deleted file mode 100644
index fb4ecd0cd2..0000000000
--- a/hermes-console/static/js/console/filters/FiltersDebugger.js
+++ /dev/null
@@ -1,70 +0,0 @@
-angular.module('hermes.filters.debugger', ['hermes.filters.repository'])
-    .controller('FiltersDebuggerController', ['$scope', '$uibModalInstance', 'FiltersRepository', 'topicName',
-        'messageFilters', 'topicContentType',
-        function ($scope, $modal, filtersRepository, topicName, messageFilters, topicContentType) {
-
-            $scope.topicName = topicName;
-            $scope.messageFilters = messageFilters;
-            $scope.topicContentType = topicContentType;
-
-            resetVerificationState();
-
-            $scope.verify = function () {
-                resetVerificationState();
-                var filtersWithoutHeaderFilterType = _.reject($scope.messageFilters, function (f) {
-                    return f.header;
-                });
-                filtersRepository.verify($scope.topicName, filtersWithoutHeaderFilterType, $scope.message).$promise
-                    .then(function (response) {
-                        $scope.verificationStatus = response.status;
-                        $scope.errorMessage = response.errorMessage;
-                    })
-                    .catch(function (response) {
-                        $scope.verificationStatus = 'ERROR';
-                        $scope.errorMessage = response.data.message;
-                    })
-                    .finally(function () {
-                        $scope.verificationInProgress = false;
-                    });
-                beautifyText();
-            };
-
-            $scope.updateFilters = function () {
-                $modal.close({messageFilters: $scope.messageFilters});
-            };
-
-            function resetVerificationState() {
-                $scope.verificationStatus = '';
-                $scope.errorMessage = null;
-                $scope.verificationInProgress = false;
-            }
-            function beautifyText(){
-                const obj_message = JSON.parse($scope.message);
-                if (obj_message !== undefined) {
-                    $scope.message = JSON.stringify(obj_message, null, 4);
-                }
-            }
-        }])
-    .factory('FiltersDebuggerModalFactory', ['$uibModal', function ($modal) {
-        return {
-            open: function (topicName, messageFilters, topicContentType) {
-                return $modal.open({
-                    templateUrl: 'partials/modal/debugFilters.html',
-                    controller: 'FiltersDebuggerController',
-                    size: 'lg',
-                    backdrop: 'static',
-                    resolve: {
-                        topicName: function () {
-                            return topicName;
-                        },
-                        topicContentType: function () {
-                            return topicContentType;
-                        },
-                        messageFilters: function () {
-                            return _.cloneDeep(messageFilters);
-                        }
-                    }
-                }).result;
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/filters/FiltersEditor.js b/hermes-console/static/js/console/filters/FiltersEditor.js
deleted file mode 100644
index 72a27ecc88..0000000000
--- a/hermes-console/static/js/console/filters/FiltersEditor.js
+++ /dev/null
@@ -1,46 +0,0 @@
-angular.module('hermes.filters')
-    .controller('FiltersEditorController', ['$scope', '$uibModal',
-        'FiltersDebuggerModalFactory',
-        function ($scope, $modal, filtersDebuggerModal) {
-
-            $scope.addFilter = function () {
-                if (!$scope.filter.path || !$scope.filter.matcher) {
-                    return;
-                }
-
-                $scope.filters.push({
-                    type: $scope.topicContentType === 'JSON' ? 'jsonpath' : 'avropath',
-                    path: $scope.filter.path,
-                    matcher: $scope.filter.matcher,
-                    matchingStrategy: $scope.filter.matchingStrategy
-                });
-                $scope.filter = {};
-            };
-
-            $scope.delFilter = function (filter) {
-                $scope.filters = _.reject($scope.filters, function (f) {
-                    return f === filter;
-                });
-            };
-
-            $scope.debugFilters = function () {
-                filtersDebuggerModal.open($scope.topicName, $scope.filters, $scope.topicContentType)
-                    .then(function (result) {
-                        $scope.filters = result.messageFilters;
-                    });
-            };
-        }])
-    .directive('filtersEditor', function () {
-        return {
-            controller: 'FiltersEditorController',
-            restrict: 'E',
-            templateUrl: 'partials/filter/filtersEditor.html',
-            scope: {
-                form: '=',
-                topicContentType: '=topicContentType',
-                filters: '=filters',
-                withDebugger: '=',
-                topicName: '='
-            }
-        };
-    });
diff --git a/hermes-console/static/js/console/filters/FiltersRepository.js b/hermes-console/static/js/console/filters/FiltersRepository.js
deleted file mode 100644
index 4539e5be18..0000000000
--- a/hermes-console/static/js/console/filters/FiltersRepository.js
+++ /dev/null
@@ -1,11 +0,0 @@
-angular.module('hermes.filters.repository', [])
-    .factory('FiltersRepository', ['DiscoveryService', '$resource',
-        function (discovery, $resource) {
-            var filtersResource = $resource(discovery.resolve('/filters/:topicName'), null, {verify: {method: 'POST'}});
-
-            return {
-                verify: function (topicName, filters, message) {
-                    return filtersResource.verify({topicName: topicName}, {filters: filters, message: btoa(utf8.encode(message || ""))});
-                }
-            };
-        }]);
diff --git a/hermes-console/static/js/console/filters/HttpHeaderFiltersEditor.js b/hermes-console/static/js/console/filters/HttpHeaderFiltersEditor.js
deleted file mode 100644
index 160df33b9a..0000000000
--- a/hermes-console/static/js/console/filters/HttpHeaderFiltersEditor.js
+++ /dev/null
@@ -1,36 +0,0 @@
-angular.module('hermes.filters')
-    .controller('HttpHeaderFiltersEditorController', ['$scope',
-        function ($scope) {
-
-            $scope.addFilter = function () {
-                if (!$scope.filter.header || !$scope.filter.matcher) {
-                    return;
-                }
-
-                $scope.filters.push({
-                    type: 'header',
-                    header: $scope.filter.header,
-                    matcher: $scope.filter.matcher,
-                    matchingStrategy: $scope.filter.matchingStrategy
-                });
-                $scope.filter = {};
-            };
-
-            $scope.delFilter = function (filter) {
-                $scope.filters = _.reject($scope.filters, function (f) {
-                    return f === filter;
-                });
-            };
-
-        }])
-    .directive('httpHeaderFiltersEditor', function () {
-        return {
-            controller: 'HttpHeaderFiltersEditorController',
-            restrict: 'E',
-            templateUrl: 'partials/filter/httpHeaderFiltersEditor.html',
-            scope: {
-                form: '=',
-                filters: '=filters'
-            }
-        };
-    });
diff --git a/hermes-console/static/js/console/offlineretransmission/OfflineRetransmissionController.js b/hermes-console/static/js/console/offlineretransmission/OfflineRetransmissionController.js
deleted file mode 100644
index 1ac31d7532..0000000000
--- a/hermes-console/static/js/console/offlineretransmission/OfflineRetransmissionController.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var offlineRetransmission = angular.module('hermes.offlineRetransmission', [
-  'hermes.offlineRetransmission.repository'
-]);
-
-offlineRetransmission.controller('OfflineRetransmissionController', ['$scope', 'RetransmissionRepository', 'toaster', '$uibModalInstance', 'topic', 'topicConfig',
-  function ($scope, retransmissionRepository, toaster, $modal, topic, topicConfig) {
-    if (topic.offlineStorage.retentionTime.infinite) {
-      $scope.calendarDaysBack = 1000;
-    } else {
-      $scope.calendarDaysBack = topic.offlineStorage.retentionTime.duration;
-    }
-    $scope.retransmissionRequest = {
-      targetTopic: null,
-      startTimestamp: null,
-      endTimestamp: null
-    };
-    $scope.retransmissionDescription = topicConfig.offlineRetransmissionDescription;
-
-    $scope.createTask = function () {
-      const request = {
-        sourceTopic: topic.name,
-        targetTopic: $scope.retransmissionRequest.targetTopic,
-        startTimestamp: new Date($scope.retransmissionRequest.startTimestamp).toISOString(),
-        endTimestamp: new Date($scope.retransmissionRequest.endTimestamp).toISOString()
-      };
-      retransmissionRepository.createTask(request)
-        .then(function () {
-            toaster.pop('success', 'Success', 'Retransmission has been scheduled.');
-            $modal.close();
-          }
-        ).catch(function (response) {
-        toaster.pop('error', 'Error ' + response.status, response.data.message);
-      });
-    };
-  }]);
diff --git a/hermes-console/static/js/console/offlineretransmission/OfflineRetransmissionRespository.js b/hermes-console/static/js/console/offlineretransmission/OfflineRetransmissionRespository.js
deleted file mode 100644
index 6b23908ce5..0000000000
--- a/hermes-console/static/js/console/offlineretransmission/OfflineRetransmissionRespository.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var repository = angular.module('hermes.offlineRetransmission.repository', ['hermes.discovery']);
-
-repository.factory('RetransmissionRepository', ['DiscoveryService', '$resource',
-  function (discovery, $resource) {
-    const retransmissionEndpoint = $resource(discovery.resolve('/offline-retransmission/tasks/'), null, {save: {method: 'POST'}});
-
-    return {
-      createTask: function (task) {
-        return retransmissionEndpoint.save({}, task).$promise;
-      }
-    };
-  }]);
diff --git a/hermes-console/static/js/console/owner/OwnerName.js b/hermes-console/static/js/console/owner/OwnerName.js
deleted file mode 100644
index b4085417a5..0000000000
--- a/hermes-console/static/js/console/owner/OwnerName.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var owner = angular.module('hermes.owner');
-owner.controller('OwnerNameController', ['$scope', 'OwnerRepository', function ($scope, ownerRepository) {
-    $scope.$watch('owner', function (newOwner) {
-        if (newOwner !== undefined && newOwner.id && newOwner.source) {
-            ownerRepository.getOwner(newOwner.source, newOwner.id).then(function (owner) {
-                $scope.name = owner.name;
-                $scope.url = owner.url ? owner.url : null;
-            });
-        } else {
-            $scope.name = "";
-            $scope.url = null;
-        }
-    }, true);
-}]);
-owner.directive('ownerName', function () {
-    return {
-        controller: 'OwnerNameController',
-        restrict: 'E',
-        templateUrl: 'partials/ownerName.html',
-        scope: {
-            owner: '='
-        }
-    };
-});
\ No newline at end of file
diff --git a/hermes-console/static/js/console/owner/OwnerRepository.js b/hermes-console/static/js/console/owner/OwnerRepository.js
deleted file mode 100644
index 0527c79fe9..0000000000
--- a/hermes-console/static/js/console/owner/OwnerRepository.js
+++ /dev/null
@@ -1,21 +0,0 @@
-angular.module('hermes.owner', ['hermes.services'])
-    .service('OwnerRepository', ['$resource', 'DiscoveryService',
-        function ($resource, discovery) {
-
-            var searchOwnersResource = $resource(discovery.resolve('/owners/sources/:source'));
-            var getOwnerResource = $resource(discovery.resolve('/owners/sources/:source/:id'));
-            var sourceNamesResource = $resource(discovery.resolve('/owners/sources'));
-
-            this.getOwners = function (source, searchString) {
-                return searchOwnersResource.query({source: source, search: searchString}).$promise;
-            };
-
-            this.getOwner = function (source, id) {
-                return getOwnerResource.get({source: source, id: id}).$promise;
-            };
-
-            this.getSourceNames = function () {
-                return sourceNamesResource.query().$promise;
-            };
-
-        }]);
\ No newline at end of file
diff --git a/hermes-console/static/js/console/owner/OwnerSelector.js b/hermes-console/static/js/console/owner/OwnerSelector.js
deleted file mode 100644
index d6b3b63b30..0000000000
--- a/hermes-console/static/js/console/owner/OwnerSelector.js
+++ /dev/null
@@ -1,76 +0,0 @@
-angular.module('hermes.owner')
-    .controller('OwnerSelectorController', ['$scope', 'OWNER_CONFIG', 'OwnerRepository',
-        function ($scope, config, ownerRepository) {
-
-        ownerRepository.getSourceNames().then(function (sources) {
-            $scope.possibleSources = _.filter(sources, function (source) {
-                return !source.deprecated || $scope.sourceName === source.name;
-            });
-            $scope.sourceSelectModel = _.find($scope.possibleSources, {'name': $scope.sourceName}) || _.first($scope.possibleSources);
-            if ($scope.ownerId) {
-                ownerRepository.getOwner($scope.sourceSelectModel.name, $scope.ownerId).then(function(owner) {
-                    if ($scope.sourceSelectModel.autocomplete) {
-                        $scope.ownerInputModel = {id: owner.id, name: owner.name};
-                    } else {
-                        $scope.ownerInputModel = owner.id;
-                    }
-                });
-            }
-        });
-
-        $scope.onSourceChanged = function () {
-            $scope.ownerInputModel = '';
-        };
-
-        $scope.$watch('sourceSelectModel', function (model) {
-            if (model === undefined) {
-                return;
-            }
-
-            $scope.sourceName = model.name;
-        });
-
-        $scope.$watch('ownerInputModel', function(model) {
-            if (model === undefined) {
-                return;
-            }
-
-            if (model instanceof Object && model.id !== undefined) {
-                $scope.ownerId = model.id;
-            } else {
-                $scope.ownerId = model;
-            }
-        });
-
-        $scope.owners = function(searchString) {
-            return ownerRepository.getOwners($scope.sourceSelectModel.name, searchString);
-        };
-
-        $scope.placeholder = function () {
-            if (!$scope.sourceName) {
-                return '';
-            }
-
-            var sourceConfig = _.find(config.sources, function (s) {
-                return s.name === $scope.sourceName;
-            });
-
-            if (sourceConfig && sourceConfig.placeholder) {
-                return sourceConfig.placeholder;
-            }
-
-            return "who's the owner?";
-        };
-    }])
-    .directive('ownerSelector', function () {
-        return {
-            controller: 'OwnerSelectorController',
-            restrict: 'E',
-            templateUrl: 'partials/ownerSelector.html',
-            scope: {
-                sourceName: '=source',
-                ownerId: '=owner',
-                form: '='
-            }
-        };
-    });
diff --git a/hermes-console/static/js/console/readiness/ReadinessController.js b/hermes-console/static/js/console/readiness/ReadinessController.js
deleted file mode 100644
index 3d5bd8b0ec..0000000000
--- a/hermes-console/static/js/console/readiness/ReadinessController.js
+++ /dev/null
@@ -1,42 +0,0 @@
-var readiness = angular.module('hermes.readiness', ['hermes.readiness.repository']);
-
-readiness.controller('ReadinessController', ['$scope', 'ReadinessRepository', 'ConfirmationModal',
-  function ($scope, readinessRepository, confirmationModal) {
-
-    $scope.error = null;
-
-    function loadDatacenters() {
-      return readinessRepository.getDatacenters().then(function (data) {
-        $scope.datacenters = data;
-      }).catch(function (e) {
-        displayError(e);
-      });
-    }
-
-    $scope.openModal = function openModal(datacenterInfo) {
-      var action = datacenterInfo.status === 'READY' ? "Turn off" : "Turn on";
-      confirmationModal.open({
-        actionSubject: 'Are you sure you want to ' + action.toLowerCase() + ' the ' + datacenterInfo.datacenter + ' datacenter ?',
-        action: action
-      }).result.then(function () {
-        readinessRepository.setReadiness(datacenterInfo)
-          .then(function () {
-            clearError();
-            return loadDatacenters();
-          })
-          .catch(function (e) {
-            displayError(e);
-          });
-      });
-    };
-
-    function displayError(msg) {
-      $scope.error = msg;
-    }
-
-    function clearError() {
-      $scope.error = null;
-    }
-
-    loadDatacenters();
-  }]);
\ No newline at end of file
diff --git a/hermes-console/static/js/console/readiness/ReadinessRepository.js b/hermes-console/static/js/console/readiness/ReadinessRepository.js
deleted file mode 100644
index ac25b6b3eb..0000000000
--- a/hermes-console/static/js/console/readiness/ReadinessRepository.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var repository = angular.module('hermes.readiness.repository', ['hermes.discovery']);
-
-repository.factory('ReadinessRepository', ['DiscoveryService', '$resource',
-  function (discovery, $resource) {
-    var queryEndpoint = $resource(discovery.resolve('/readiness/datacenters'), null, {
-      query: {
-        method: 'GET',
-        isArray: true
-      }
-    });
-    var setReadinessEndpoint = $resource(discovery.resolve('/readiness/datacenters/:datacenter'), null, {save: {method: 'POST'}});
-
-    return {
-      getDatacenters: function () {
-        return queryEndpoint.query().$promise.then(function (data) {
-          return data;
-        });
-      },
-      setReadiness: function (datacenterInfo) {
-        return setReadinessEndpoint.save(
-            {datacenter: datacenterInfo.datacenter},
-            {isReady: datacenterInfo.status === 'NOT_READY'}
-        ).$promise;
-      }
-    };
-  }]);
diff --git a/hermes-console/static/js/console/subscription/SubscriptionController.js b/hermes-console/static/js/console/subscription/SubscriptionController.js
deleted file mode 100644
index 3fc2dc3237..0000000000
--- a/hermes-console/static/js/console/subscription/SubscriptionController.js
+++ /dev/null
@@ -1,387 +0,0 @@
-var subscriptions = angular.module('hermes.subscription', [
-    'ui.bootstrap',
-    'hermes.modals',
-    'hermes.subscription.repository',
-    'hermes.subscription.health',
-    'hermes.subscription.metrics',
-    'hermes.subscription.factory',
-    'hermes.topic.metrics',
-    'hermes.filters.debugger',
-    'hermes.owner'
-]);
-
-subscriptions.controller('SubscriptionController', ['SubscriptionRepository', 'SubscriptionHealth', 'SubscriptionMetrics',
-    'TopicRepository', 'TopicMetrics', '$scope', '$location', '$stateParams', '$uibModal', '$q', 'ConfirmationModal',
-    'toaster', 'PasswordService', 'MessagePreviewModal', 'FiltersDebuggerModalFactory', 'SUBSCRIPTION_CONFIG', '$sce',
-    function (subscriptionRepository, subscriptionHealth, subscriptionMetrics, topicRepository, topicMetrics,
-              $scope, $location, $stateParams, $modal, $q, confirmationModal, toaster, passwordService,
-              messagePreviewModal, filtersDebuggerModal, config, $sce) {
-        var groupName = $scope.groupName = $stateParams.groupName;
-        var topicName = $scope.topicName = $stateParams.topicName;
-        var subscriptionName = $scope.subscriptionName = $stateParams.subscriptionName;
-        $scope.config = config;
-        $scope.costs = {
-            enabled: window.config.costs.enabled,
-            iframeUrl: $sce.trustAsResourceUrl(resolveCostsUrl(window.config.costs.subscriptionIframeUrl)),
-            detailsUrl: resolveCostsUrl(window.config.costs.subscriptionDetailsUrl)
-        };
-
-        function resolveCostsUrl(template) {
-            if (template) {
-                return template.replace('{{topic_name}}', topicName).replace('{{subscription_name}}', subscriptionName);
-            }
-            return template;
-        }
-
-        function getUndelivered() {
-            subscriptionRepository.undelivered(topicName, subscriptionName).$promise
-                .then(function (undelivered) {
-                    $scope.undelivered = undelivered;
-                })
-                .catch(function () {
-                    $scope.undelivered = [];
-                });
-        }
-
-        function getLastUndelivered() {
-            subscriptionRepository.lastUndelivered(topicName, subscriptionName).$promise
-                .then(function (lastUndelivered) {
-                    $scope.lastUndelivered = lastUndelivered;
-                })
-                .catch(function () {
-                    $scope.lastUndelivered = null;
-                });
-        }
-
-
-        subscriptionRepository.get(topicName, subscriptionName).$promise
-                .then(function(subscription) {
-                    $scope.subscription = subscription;
-                    if (subscription && subscription.createdAt && subscription.modifiedAt) {
-                        var createdAt = new Date(0);
-                        createdAt.setUTCSeconds(subscription.createdAt);
-                        $scope.subscription.createdAt = createdAt;
-
-                        var modifiedAt = new Date(0);
-                        modifiedAt.setUTCSeconds(subscription.modifiedAt);
-                        $scope.subscription.modifiedAt = modifiedAt;
-                    }
-                });
-
-        $scope.retransmissionLoading = false;
-
-        $scope.showHeadersFilter = config.showHeadersFilter;
-        $scope.showFixedHeaders = config.showFixedHeaders;
-
-        $scope.endpointAddressResolverMetadataConfig = config.endpointAddressResolverMetadata;
-
-        $scope.metricsUrls = subscriptionMetrics.metricsUrls(groupName, topicName, subscriptionName);
-
-        topicRepository.get(topicName).then(function(topic) {
-            $scope.topicContentType = topic.contentType;
-            $scope.daysBack = topic.retentionTime.duration;
-        });
-
-        subscriptionMetrics.metrics(topicName, subscriptionName).then(function(metrics) {
-            $scope.metrics = metrics;
-        });
-
-        subscriptionHealth.health(topicName, subscriptionName).then(function(health) {
-            $scope.health = health;
-        });
-
-        $scope.$watch('userHasSufficientPrivileges', function (currentValue) {
-            // user has privileges to see undelivered messages
-            if (currentValue === true) {
-                getUndelivered();
-                getLastUndelivered();
-            }
-        });
-
-        $scope.notSupportedEndpointAddressResolverMetadataEntries = function(metadataEntries) {
-          var filtered = {};
-          _.each(metadataEntries, function(entry, key) {
-              if (key in config.endpointAddressResolverMetadata === false) {
-                  filtered[key] = entry;
-              }
-          });
-          return filtered;
-        };
-
-        $scope.edit = function (subscription) {
-            $modal.open({
-                templateUrl: 'partials/modal/editSubscription.html',
-                controller: 'SubscriptionEditController',
-                size: 'lg',
-                backdrop: 'static',
-                resolve: {
-                    subscription: function () {
-                        return _.cloneDeep(subscription);
-                    },
-                    topicName: function () {
-                        return topicName;
-                    },
-                    operation: function () {
-                        return 'EDIT';
-                    },
-                    endpointAddressResolverMetadataConfig: function() {
-                        return config.endpointAddressResolverMetadata;
-                    },
-                    topicContentType: function () {
-                        return $scope.topicContentType;
-                    },
-                    showFixedHeaders: function () {
-                        return $scope.showFixedHeaders;
-                    },
-                    showHeadersFilter: function () {
-                      return $scope.showHeadersFilter;
-                    }
-                }
-            }).result.then(function(response){
-                $scope.subscription = response.subscription;
-            });
-        };
-
-        $scope.clone = function () {
-            $modal.open({
-                templateUrl: 'partials/modal/editSubscription.html',
-                controller: 'SubscriptionEditController',
-                size: 'lg',
-                backdrop: 'static',
-                resolve: {
-                    subscription: function () {
-                        return $scope.subscription;
-                    },
-                    topicName: function () {
-                        return topicName;
-                    },
-                    operation: function () {
-                        return 'ADD';
-                    },
-                    endpointAddressResolverMetadataConfig: function() {
-                        return config.endpointAddressResolverMetadata;
-                    },
-                    topicContentType: function () {
-                        return $scope.topicContentType;
-                    },
-                    showFixedHeaders: function () {
-                        return $scope.showFixedHeaders;
-                    },
-                    showHeadersFilter: function () {
-                        return $scope.showHeadersFilter;
-                    }
-                }
-            }).result.then(function(response){
-                var subscriptionName = response.subscription.name;
-                $location.path('/groups/' + groupName + '/topics/' + topicName + '/subscriptions/' + subscriptionName);
-            });
-        };
-
-        $scope.remove = function () {
-            confirmationModal.open({
-                action: 'Remove',
-                actionSubject: 'Subscription ' + $scope.subscription.name,
-                passwordLabel: 'Root password',
-                passwordHint: 'root password'
-            }).result.then(function (result) {
-                $scope.disableRemoveButton = true;
-                passwordService.setRoot(result.password);
-                subscriptionRepository.remove(topicName, $scope.subscription.name).$promise
-                        .then(function () {
-                            toaster.pop('success', 'Success', 'Subscription has been removed');
-                            $location.path('/groups/' + groupName + '/topics/' + topicName).replace();
-                        })
-                        .catch(function (response) {
-                            toaster.pop('error', 'Error ' + response.status, response.data.message);
-                        })
-                        .finally(function () {
-                            passwordService.reset();
-                            $scope.disableRemoveButton = false;
-                        });
-            });
-        };
-
-        $scope.suspend = function () {
-            confirmationModal.open({
-                action: 'Suspend',
-                actionSubject: 'Subscription '+ $scope.subscription.name,
-                passwordLabel: 'Root password',
-                passwordHint: 'root password'
-            }).result.then(function (result) {
-                passwordService.setRoot(result.password);
-                subscriptionRepository.suspend(topicName, $scope.subscription.name).$promise
-                        .then(function () {
-                            $scope.subscription.state = 'SUSPENDED';
-                            toaster.pop('success', 'Success', 'Subscription has been suspended');
-                        })
-                        .catch(function (response) {
-                            toaster.pop('error', 'Error ' + response.status, response.data.message);
-                        })
-                        .finally(function () {
-                            passwordService.reset();
-                        });
-            });
-        };
-
-        $scope.activate = function () {
-            confirmationModal.open({
-                action: 'Activate',
-                actionSubject: 'Subcription ' + $scope.subscription.name,
-                passwordLabel: 'Root password',
-                passwordHint: 'root password'
-            }).result.then(function (result) {
-                passwordService.setRoot(result.password);
-                subscriptionRepository.activate(topicName, $scope.subscription.name).$promise
-                        .then(function () {
-                            $scope.subscription.state = 'ACTIVE';
-                            toaster.pop('success', 'Success', 'Subscription has been activated');
-                        })
-                        .catch(function (response) {
-                            toaster.pop('error', 'Error ' + response.status, response.data.message);
-                        })
-                        .finally(function () {
-                            passwordService.reset();
-                        });
-            });
-        };
-
-        $scope.previewMessage = function(cluster, partition, offset, messageId) {
-            messagePreviewModal.previewMessage(topicName, cluster, partition, offset, messageId);
-        };
-
-        $scope.showTrace = function() {
-            subscriptionRepository.eventTrace(topicName, subscriptionName, $scope.eventId).$promise
-                .then(function (trace) {
-                    $scope.eventTrace = trace;
-                })
-                .catch(function () {
-                    $scope.eventTrace = [];
-                });
-        };
-
-        $scope.retransmit = function() {
-            var retransmitFromDate = $('#retransmitFromDate').data().date;
-
-            if (!retransmitFromDate) {
-                toaster.pop('info', 'Info', 'Select date & time from which retransmission should be started');
-                return;
-            }
-
-            confirmationModal.open({
-                action: 'Retransmit',
-                actionSubject: 'Subscription ' + $scope.subscription.name,
-                additionalInfo: "This action re-send all messages starting from given date. Do you want to continue?",
-                passwordLabel: 'Root password',
-                passwordHint: 'root password'
-            }).result.then(function (result) {
-                    passwordService.setRoot(result.password);
-                    $scope.retransmissionLoading = true;
-                    subscriptionRepository.retransmit(topicName, $scope.subscription.name, retransmitFromDate).$promise
-                        .then(function () {
-                            toaster.pop('success', 'Success', 'Retransmission started');
-                            $scope.retransmissionLoading = false;
-                        })
-                        .catch(function (response) {
-                            toaster.pop('error', 'Error ' + response.status, response.data.message);
-                            $scope.retransmissionLoading = false;
-                        });
-                });
-        };
-        $scope.skipMessages = function (){
-            tommorowDate = new Date();
-            tommorowDate.setDate(tommorowDate.getDate() + 1);
-
-            confirmationModal.open({
-                action: 'Skip messages',
-                actionSubject: 'Subscription ' + $scope.subscription.name,
-                additionalInfo: "This action will skip all undelivered messages for this subscription. Do you want to continue?",
-                passwordLabel: 'Root password',
-                passwordHint: 'root password'
-            }).result.then(function (result) {
-                passwordService.setRoot(result.password);
-                $scope.skipMessagesLoading = true;
-                subscriptionRepository.retransmit(topicName, $scope.subscription.name, tommorowDate.toISOString()).$promise
-                    .then(function () {
-                        toaster.pop('success', 'Success', 'Skipped messages.');
-                        $scope.skipMessagesLoading = false;
-                    })
-                    .catch(function (response) {
-                        toaster.pop('error', 'Error ' + response.status, response.data.message);
-                        $scope.skipMessagesLoading = false;
-                    });
-            });
-
-        };
-        $scope.debugFilters = function () {
-            filtersDebuggerModal.open(topicName, $scope.subscription.filters, $scope.topicContentType)
-                .then(function (result) {
-                    var subscription = _.cloneDeep($scope.subscription);
-                    subscription.filters = result.messageFilters;
-                    $scope.edit(subscription);
-                });
-        };
-
-        $scope.trackingModeName = {"trackingOff": "No tracking", "discardedOnly": "Track message discarding only", "trackingAll": "Track everything"};
-
-        $scope.goToCostDetails = function () {
-            window.open($scope.costs.detailsUrl, '_blank');
-        };
-    }]);
-
-subscriptions.controller('SubscriptionEditController', ['SubscriptionRepository', '$scope', '$uibModalInstance', 'subscription',
-    'topicName', 'PasswordService', 'toaster', 'operation', 'endpointAddressResolverMetadataConfig', 'topicContentType',
-    'showFixedHeaders', 'showHeadersFilter', 'SUBSCRIPTION_CONFIG',
-    function (subscriptionRepository, $scope, $modal, subscription, topicName, passwordService, toaster, operation,
-              endpointAddressResolverMetadataConfig, topicContentType, showFixedHeaders, showHeadersFilter, subscriptionConfig) {
-        $scope.topicName = topicName;
-        $scope.topicContentType = topicContentType;
-        $scope.subscription = _.cloneDeep(subscription);
-        $scope.operation = operation;
-        $scope.endpointAddressResolverMetadataConfig = endpointAddressResolverMetadataConfig;
-        $scope.showFixedHeaders = showFixedHeaders;
-        $scope.showHeadersFilter = showHeadersFilter;
-        $scope.config = subscriptionConfig;
-
-        $scope.save = function () {
-            $scope.disableSaveButton = true;
-            var promise;
-            var subscriptionToSave = _.cloneDeep($scope.subscription);
-            passwordService.setRoot($scope.rootPassword);
-
-            if (operation === 'ADD') {
-                promise = subscriptionRepository.add(topicName, subscriptionToSave).$promise;
-            } else {
-                if(subscription.endpoint === subscriptionToSave.endpoint) {
-                    delete subscriptionToSave.endpoint;
-                }
-                delete subscriptionToSave.oAuthPolicy; // prevent from resetting password
-                promise = subscriptionRepository.save(topicName, subscriptionToSave).$promise;
-            }
-
-            promise
-                    .then(function () {
-                        toaster.pop('success', 'Success', 'Subscription has been saved');
-                        $modal.close({ subscription: $scope.subscription });
-                    })
-                    .catch(function (response) {
-                        toaster.pop('error', 'Error ' + response.status, response.data.message);
-                    })
-                    .finally(function () {
-                        passwordService.reset();
-                        $scope.disableSaveButton = false;
-                    });
-        };
-
-        $scope.addHeader = function() {
-            if(!$scope.header.name || !$scope.header.value) {
-                return;
-            }
-            $scope.subscription.headers.push(angular.copy($scope.header));
-            $scope.header = {};
-        };
-
-        $scope.delHeader = function (index) {
-            $scope.subscription.headers.splice(index, 1);
-        };
-
-    }]);
\ No newline at end of file
diff --git a/hermes-console/static/js/console/subscription/SubscriptionFactory.js b/hermes-console/static/js/console/subscription/SubscriptionFactory.js
deleted file mode 100644
index 0f3bea3699..0000000000
--- a/hermes-console/static/js/console/subscription/SubscriptionFactory.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var subscriptions = angular.module('hermes.subscription.factory', []);
-
-subscriptions.factory('SubscriptionFactory', ['SUBSCRIPTION_CONFIG', function (subscriptionConfig) {
-        return {
-            create: function (topicName) {
-                var defaults = {
-                    topicName: topicName,
-                    name: '',
-                    endpoint: '',
-                    description: '',
-                    owner: {
-                        source: '',
-                        id: ''
-                    },
-                    deliveryType: 'SERIAL',
-                    mode: 'ANYCAST',
-                    filters: [],
-                    headers: [],
-                    contentType: 'JSON',
-                    subscriptionPolicy: {
-                        messageTtl: 3600,
-                        messageBackoff: 1000,
-                        sendingDelay: 0,
-                        backoffMultiplier: 1.0,
-                        backoffMaxIntervalInSec: 600,
-                        requestTimeout: 1000
-                    },
-                    monitoringDetails: {
-                        severity: 'NON_IMPORTANT',
-                        reaction: ''
-                    }
-                };
-
-                _.merge(defaults, subscriptionConfig.defaults);
-                return defaults;
-            }
-        };
-
-    }]);
diff --git a/hermes-console/static/js/console/subscription/SubscriptionHealth.js b/hermes-console/static/js/console/subscription/SubscriptionHealth.js
deleted file mode 100644
index 6730a29e27..0000000000
--- a/hermes-console/static/js/console/subscription/SubscriptionHealth.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var health = angular.module('hermes.subscription.health', []);
-
-health.factory('SubscriptionHealth', ['DiscoveryService', '$resource',
-    function (discovery, $resource) {
-        var health = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/health'));
-
-        return {
-            health: function (topicName, subscriptionName) {
-                return health.get({topicName: topicName, subscriptionName: subscriptionName})
-                    .$promise.then(function (health) {
-                        var problemOccurs = function (problemCode) {
-                            return _.some(health.problems, {code: problemCode});
-                        };
-
-                        return {
-                            status: health.status,
-                            problems: {
-                                lagging: problemOccurs('LAGGING'),
-                                malfunctioning: problemOccurs('MALFUNCTIONING'),
-                                receivingMalformedMessages: problemOccurs('RECEIVING_MALFORMED_MESSAGES'),
-                                timingOut: problemOccurs('TIMING_OUT'),
-                                unreachable: problemOccurs('UNREACHABLE')
-                            }
-                        };
-                    });
-            }
-        };
-    }
-]);
diff --git a/hermes-console/static/js/console/subscription/SubscriptionMetrics.js b/hermes-console/static/js/console/subscription/SubscriptionMetrics.js
deleted file mode 100644
index 21932680ec..0000000000
--- a/hermes-console/static/js/console/subscription/SubscriptionMetrics.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var metrics = angular.module('hermes.subscription.metrics', ['hermes.metrics']);
-
-metrics.factory('SubscriptionMetrics', ['DiscoveryService', '$resource', 'MetricStoreUrlResolver',
-    function(discovery, $resource, metricStoreUrlResolver) {
-        var metrics = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/metrics'));
-
-        return {
-            metrics: function (topicName, subscriptionName) {
-                return metrics.get({topicName: topicName, subscriptionName: subscriptionName})
-                    .$promise.then(function(metrics) {
-                        return {
-                            rate: parseFloat(metrics.rate),
-                            delivered: metrics.delivered,
-                            discarded: metrics.discarded,
-                            lag: metrics.lag,
-                            responses: {
-                                '2xx': parseFloat(metrics.codes2xx),
-                                '4xx': parseFloat(metrics.codes4xx),
-                                '5xx': parseFloat(metrics.codes5xx),
-                                errors: parseFloat(metrics.otherErrors),
-                                timeouts: parseFloat(metrics.timeouts)
-                            },
-                        };
-                    });
-            },
-            metricsUrls: function(groupName, topicName, subscriptionName) {
-                var topicWithoutGroup = topicName.substring(groupName.length + 1, topicName.length);
-                return metricStoreUrlResolver.subscriptionMetrics(groupName, topicWithoutGroup, subscriptionName);
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/subscription/SubscriptionRepository.js b/hermes-console/static/js/console/subscription/SubscriptionRepository.js
deleted file mode 100644
index e476edd41c..0000000000
--- a/hermes-console/static/js/console/subscription/SubscriptionRepository.js
+++ /dev/null
@@ -1,80 +0,0 @@
-var repository = angular.module('hermes.subscription.repository', []);
-
-repository.factory('SubscriptionRepository', ['DiscoveryService', '$resource', function (discovery, $resource) {
-        var repository = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName'), null, {update: {method: 'PUT'}});
-        var state = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/state'), null, {update: {method: 'PUT'}});
-        var lastUndelivered = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/undelivered/last'));
-        var undelivered = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/undelivered'), {}, {
-                query: {
-                    method:'GET',
-                    isArray:true,
-                    transformResponse: function (data, header) {
-                        var extended = angular.fromJson(data);
-                        angular.forEach(extended, function(item, idx) {
-                                extended[idx].isPreviewable = function() {
-                                    return typeof this.offset !== 'undefined' && typeof this.partition !== 'undefined';
-                                };
-                        });
-                        return extended;
-                    }
-                }
-            });
-        var metrics = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/metrics'));
-        var listing = $resource(discovery.resolve('/topics/:topicName/subscriptions/'));
-        var eventTrace = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/events/:eventId/trace'));
-        var retransmission = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/retransmission'), null, {save: {method: 'PUT'}});
-
-        return {
-            list: function (topicName) {
-                return listing.query({topicName: topicName});
-            },
-            get: function (topicName, subscriptionName) {
-                return repository.get({topicName: topicName, subscriptionName: subscriptionName});
-            },
-            add: function (topicName, subscription) {
-                return listing.save({topicName: topicName}, subscription);
-            },
-            save: function (topicName, subscription) {
-                return repository.update({topicName: topicName, subscriptionName: subscription.name}, subscription);
-            },
-            metrics: function (topicName, subscriptionName) {
-                return metrics.get({topicName: topicName, subscriptionName: subscriptionName})
-                    .$promise.then(function(metrics) {
-                        return {
-                            rate: parseFloat(metrics.rate),
-                            delivered: metrics.delivered,
-                            discarded: metrics.discarded,
-                            lag: metrics.lag,
-                            responses: {
-                                '2xx': parseFloat(metrics.codes2xx),
-                                '4xx': parseFloat(metrics.codes4xx),
-                                '5xx': parseFloat(metrics.codes5xx),
-                                errors: parseFloat(metrics.otherErrors),
-                                timeouts: parseFloat(metrics.timeouts)
-                            },
-                        };
-                    });
-            },
-            remove: function (topicName, subscriptionName) {
-                return repository.remove({topicName: topicName, subscriptionName: subscriptionName});
-            },
-            suspend: function (topicName, subscriptionName) {
-                return state.update({topicName: topicName, subscriptionName: subscriptionName}, '"SUSPENDED"');
-            },
-            activate: function (topicName, subscriptionName) {
-                return state.update({topicName: topicName, subscriptionName: subscriptionName}, '"ACTIVE"');
-            },
-            lastUndelivered: function(topicName, subscriptionName) {
-                return lastUndelivered.get({topicName: topicName, subscriptionName: subscriptionName});
-            },
-            undelivered: function(topicName, subscriptionName) {
-                return undelivered.query({topicName: topicName, subscriptionName: subscriptionName});
-            },
-            eventTrace: function(topicName, subscriptionName, eventId) {
-                return eventTrace.query({topicName: topicName, subscriptionName: subscriptionName, eventId: eventId});
-            },
-            retransmit: function (topicName, subscriptionName, fromDate) {
-                return retransmission.save({topicName: topicName, subscriptionName: subscriptionName}, {retransmissionDate: fromDate});
-            }
-        };
-}]);
diff --git a/hermes-console/static/js/console/subscriptionoffsets/SubscriptionOffsetsController.js b/hermes-console/static/js/console/subscriptionoffsets/SubscriptionOffsetsController.js
deleted file mode 100644
index ce4bb8af52..0000000000
--- a/hermes-console/static/js/console/subscriptionoffsets/SubscriptionOffsetsController.js
+++ /dev/null
@@ -1,49 +0,0 @@
-var subscriptionOffsets = angular.module('hermes.subscriptionOffsets', ['hermes.subscriptionOffsets.service']);
-
-subscriptionOffsets.controller('SubscriptionOffsetsController', ['$scope', 'SubscriptionService', 'toaster',
-    function ($scope, subscriptionService, toaster) {
-        $scope.error = null;
-        $scope.subscriptionFullName = '';
-
-        $scope.moveOffsets = function () {
-            var subscription = parseSubscription($scope.subscriptionFullName);
-            subscriptionService.moveOffsets(subscription.topicName, subscription.subscriptionName)
-                .then(function () {
-                    clearError();
-                    clearData();
-                    displaySuccess();
-                })
-                .catch(function (e) {
-                    displayError(e);
-                });
-        };
-
-        function displayError(msg) {
-            $scope.error = msg;
-        }
-
-        function clearError() {
-            $scope.error = null;
-        }
-
-        function displaySuccess() {
-            toaster.pop('success', 'Success', 'Offsets moved successfully');
-        }
-
-        function clearData() {
-            $scope.subscriptionFullName = "";
-        }
-
-        function parseSubscription(subscriptionFullName) {
-            var subscriptionChunks = subscriptionFullName.split('.');
-            var subscriptionName = subscriptionChunks.pop();
-            return {
-                topicName: subscriptionChunks.join('.'),
-                subscriptionName: subscriptionName,
-            };
-        }
-
-        function validate() {
-
-        }
-    }]);
\ No newline at end of file
diff --git a/hermes-console/static/js/console/subscriptionoffsets/SubsriptionService.js b/hermes-console/static/js/console/subscriptionoffsets/SubsriptionService.js
deleted file mode 100644
index c5d37b8baf..0000000000
--- a/hermes-console/static/js/console/subscriptionoffsets/SubsriptionService.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var service = angular.module('hermes.subscriptionOffsets.service', ['hermes.discovery']);
-
-repository.factory('SubscriptionService', ['DiscoveryService', '$resource',
-    function (discovery, $resource) {
-        var subscriptionOffsetsEndpoint = $resource(discovery.resolve('/topics/:topicName/subscriptions/:subscriptionName/moveOffsetsToTheEnd'), null, {
-            query: {
-                method: 'POST',
-                isArray: true
-            }
-        });
-
-        return {
-            moveOffsets: function (topicName, subscriptionName) {
-                return subscriptionOffsetsEndpoint.save({topicName: topicName, subscriptionName: subscriptionName}, {}).$promise;
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/topic/AvroViewer.js b/hermes-console/static/js/console/topic/AvroViewer.js
deleted file mode 100644
index 264e649b20..0000000000
--- a/hermes-console/static/js/console/topic/AvroViewer.js
+++ /dev/null
@@ -1,161 +0,0 @@
-var avroViewer = angular.module('hermes.topic.avroViewer', []);
-
-avroViewer.directive('avroViewer', function () {
-    return {
-        template: '<avro-node ng-if="rootField" root="true" field="rootField"></avro-node>',
-        restrict: 'E',
-        scope: {
-            schema: '='
-        },
-        controller: function ($scope) {
-            $scope.$watch('schema', (value) => value && updateFields());
-
-            function updateFields() {
-                const jsonSchema = JSON.parse($scope.schema);
-                $scope.rootField = {
-                    name: jsonSchema.name,
-                    doc: jsonSchema.doc,
-                    type: {
-                        type: "record",
-                        fields: jsonSchema.fields.filter(field => field.name !== '__metadata')
-                    }
-                };
-            }
-        }
-    };
-});
-
-avroViewer.controller('AvroNodeController', ['$scope', function ($scope) {
-    $scope.name = $scope.root ? $scope.field.name : `${$scope.field.name}:`;
-    $scope.doc = $scope.field.doc && formatDocumentation($scope.field.doc);
-    $scope.types = getTypes($scope.field.type);
-    $scope.isRecord = $scope.types.some(type => type.includes('record'));
-    $scope.isEnum = $scope.types.some(type => type.includes('enum'));
-    $scope.expandable = $scope.isRecord || $scope.isEnum;
-    $scope.expanded = true;
-
-    const FOLD_EVENT = "fold";
-    $scope.toggleExpansion = function () {
-        $scope.expanded = !$scope.expanded;
-        if ($scope.expanded === false) {
-            $scope.$broadcast(FOLD_EVENT);
-        }
-    };
-    $scope.$on(FOLD_EVENT, () => $scope.expanded = false);
-
-    if ($scope.isRecord) {
-        $scope.nestedType = findNestedType($scope.field.type);
-    }
-
-    if ($scope.isEnum) {
-        $scope.enumSymbols = findEnumSymbols($scope.field.type);
-    }
-
-    if ($scope.expandable) {
-        $scope.expandableTypesNumber = countExpandableTypes($scope.types);
-    }
-
-    function getTypes(typeField) {
-        if (typeof typeField === 'string' || typeField instanceof String) {
-            return [typeField.toLowerCase()];
-        } else if (Array.isArray(typeField)) {
-            let types = typeField.flatMap(type => getTypes(type));
-            const nullable = types.includes('null');
-            if (nullable) {
-                types = types.filter(type => type !== 'null').map(type => `${type}?`);
-            }
-            return types;
-        } else if (typeField.hasOwnProperty('type')) {
-            return [getComplexType(typeField)];
-        }
-        return ['unknown'];
-    }
-
-    function getComplexType(type) {
-        if (type.type === 'array') {
-            const arrayType = getTypes(type.items)[0];
-            return `[]${arrayType}`;
-        } else if (type.type === 'map') {
-            const mapType = getTypes(type.values)[0];
-            return `map[string]${mapType}`;
-        } else if (type.type === 'fixed') {
-            return `fixed(${type.size}B)`;
-        }
-        return type.type;
-    }
-
-    function findNestedType(type) {
-        if (Array.isArray(type)) {
-            return type
-                .map(subType => findNestedType(subType))
-                .find(subType => subType.hasOwnProperty('type'));
-        }
-        if (type.type === 'array') {
-            return type.items;
-        }
-        if (type.type === 'map') {
-            return type.values;
-        }
-        return type;
-    }
-
-    function findEnumSymbols(type) {
-        if (Array.isArray(type)) {
-            return type.find(subType => subType.hasOwnProperty('symbols')).symbols;
-        }
-        if (type.type === 'enum') {
-            return type.symbols;
-        }
-        if (type.type === 'array') {
-            return type.items.symbols;
-        }
-        if (type.type === 'map') {
-            return type.values.symbols;
-        }
-    }
-
-    function countExpandableTypes(types) {
-        return types
-            .filter(subType => subType.includes("record") || subType.includes("enum"))
-            .length;
-    }
-
-    function formatDocumentation(documentation) {
-        let formattedDocumentation = documentation.trim();
-        if(formattedDocumentation.length === 0) {
-            return null;
-        }
-        formattedDocumentation = formattedDocumentation[0].toUpperCase() + formattedDocumentation.slice(1);
-        if(formattedDocumentation.slice(-1).match(/[a-zA-Z0-9]/i)) {
-            formattedDocumentation += '.';
-        }
-        return formattedDocumentation;
-    }
-}]);
-
-avroViewer.directive('avroNode', ['$compile', function ($compile) {
-    return {
-        templateUrl: 'partials/avroViewerNode.html',
-        restrict: 'E',
-        scope: {
-            field: '=',
-            root: '=?'
-        },
-        controller: 'AvroNodeController',
-        link: function postLink(scope, element) {
-            let template;
-            if (scope.isRecord) {
-                template = `<avro-node ng-repeat="nestedField in nestedType.fields track by nestedField.name"
-                            field="nestedField"></avro-node>`;
-            } else if (scope.isEnum) {
-                template = `<div class="tree-branch"></div>
-                            <span ng-repeat="symbol in enumSymbols">
-                                <code>{{symbol}}</code>
-                                <span ng-if="!$last">, </span>
-                            </span>`;
-            }
-            const newElement = $compile(template)(scope);
-            element.find('[data-ref="children"]').html(newElement);
-        }
-    };
-}]);
diff --git a/hermes-console/static/js/console/topic/TopicController.js b/hermes-console/static/js/console/topic/TopicController.js
deleted file mode 100644
index 1c0bcd1907..0000000000
--- a/hermes-console/static/js/console/topic/TopicController.js
+++ /dev/null
@@ -1,358 +0,0 @@
-var topics = angular.module('hermes.topic', [
-    'ui.bootstrap',
-    'toaster',
-    'hermes.subscription',
-    'hermes.topic.repository',
-    'hermes.topic.metrics',
-    'hermes.topic.factory',
-    'hermes.topic.avroViewer',
-    'hermes.services',
-    'hermes.filters',
-    'hermes.owner',
-    'hermes.offlineRetransmission'
-]);
-
-topics.controller('TopicController', ['TOPIC_CONFIG', 'TopicRepository', 'TopicMetrics', '$scope', '$location', '$stateParams', '$uibModal', '$sce',
-    'ConfirmationModal', 'toaster', 'PasswordService', 'SubscriptionFactory', 'SUBSCRIPTION_CONFIG', 'OfflineClientsRepository',
-    function (topicConfig, topicRepository, topicMetrics, $scope, $location, $stateParams, $modal, $sce, confirmationModal, toaster, passwordService,
-              subscriptionFactory, subscriptionConfig, offlineClientsRepository) {
-        var groupName = $scope.groupName = $stateParams.groupName;
-        var topicName = $scope.topicName = $stateParams.topicName;
-
-        $scope.subscriptionsFetching = true;
-        $scope.showMessageSchema = false;
-        $scope.showRawMessageSchema = false;
-        $scope.config = topicConfig;
-        $scope.showFixedHeaders = subscriptionConfig.showFixedHeaders;
-        $scope.showHeadersFilter = subscriptionConfig.showHeadersFilter;
-        $scope.offlineRetransmissionEnabled = topicConfig.offlineRetransmissionEnabled;
-        $scope.iframeSource = "";
-        $scope.costs = {
-            enabled: window.config.costs.enabled,
-            iframeUrl: $sce.trustAsResourceUrl(resolveCostsUrl(window.config.costs.topicIframeUrl)),
-            detailsUrl: resolveCostsUrl(window.config.costs.topicDetailsUrl)
-        };
-
-        function resolveCostsUrl(template) {
-            if (template) {
-                return template.replace('{{topic_name}}', topicName);
-            }
-            return template;
-        }
-
-        topicRepository.get(topicName).then(function(topicWithSchema) {
-            $scope.topic = topicWithSchema;
-            $scope.topic.shortName = $scope.topic.name.substring($scope.topic.name.lastIndexOf('.') + 1);
-            $scope.topic.labelValues = $scope.topic.labels.map(function(label) { return label.value; });
-            if (topicWithSchema && topicWithSchema.createdAt && topicWithSchema.modifiedAt) {
-                var createdAt = new Date(0);
-                createdAt.setUTCSeconds(topicWithSchema.createdAt);
-                $scope.topic.createdAt = createdAt;
-
-                var modifiedAt = new Date(0);
-                modifiedAt.setUTCSeconds(topicWithSchema.modifiedAt);
-                $scope.topic.modifiedAt = modifiedAt;
-            }
-            try {
-                $scope.messageSchema = topicWithSchema.schema ? JSON.stringify(JSON.parse(topicWithSchema.schema), null, 2) : null;
-            } catch (e) {
-                console.error('Could not parse topic schema: ', e);
-                $scope.messageSchema = '[schema parsing failure]';
-            }
-            $scope.offlineRetransmissionEnabled = $scope.offlineRetransmissionEnabled && $scope.topic.offlineStorage.enabled;
-        });
-
-        $scope.metricsUrls = topicMetrics.metricsUrls(groupName, topicName);
-        topicMetrics.metrics(topicName).then(function(metrics) { $scope.metrics = metrics; });
-
-        function loadSubscriptions() {
-            topicRepository.listSubscriptionsWithDetails(topicName).then(function (subscriptions) {
-                $scope.subscriptions = subscriptions;
-                $scope.subscriptionsFetching = false;
-            });
-        }
-
-        function loadBlacklistStatus() {
-            topicRepository.blacklistStatus(topicName).then(function (blacklistStatus) {
-                $scope.isBlacklisted = blacklistStatus.blacklisted;
-            });
-        }
-
-        function loadIframeSource() {
-            offlineClientsRepository.getIframeSource(topicName).then(function (iframeSource) {
-                $scope.iframeSource = iframeSource.source;
-            });
-        }
-
-        loadSubscriptions();
-        loadBlacklistStatus();
-        if ($scope.config.offlineClientsEnabled) {
-            loadIframeSource();
-        }
-
-        topicRepository.preview(topicName).then(function(preview) {
-            $scope.preview = preview;
-        });
-
-        $scope.trustSrc = function(src) {
-            return $sce.trustAsResourceUrl(src);
-        };
-
-        $scope.edit = function () {
-            $modal.open({
-                templateUrl: 'partials/modal/editTopic.html',
-                controller: 'TopicEditController',
-                size: 'lg',
-                backdrop: 'static',
-                resolve: {
-                    operation: function () {
-                        return 'EDIT';
-                    },
-                    topic: function () {
-                        return $scope.topic;
-                    },
-                    messageSchema: function() {
-                        return $scope.messageSchema;
-                    },
-                    groupName: function () {
-                        return groupName;
-                    }
-                }
-            }).result.then(function (result) {
-                $scope.topic = result.topic;
-                $scope.offlineRetransmissionEnabled = $scope.offlineRetransmissionEnabled && $scope.topic.offlineStorage.enabled;
-                $scope.messageSchema = result.messageSchema;
-            });
-        };
-
-        $scope.clone = function() {
-            $modal.open({
-                templateUrl: 'partials/modal/editTopic.html',
-                controller: 'TopicEditController',
-                size: 'lg',
-                backdrop: 'static',
-                resolve: {
-                    operation: function () {
-                        return 'ADD';
-                    },
-                    groupName: function () {
-                        return groupName;
-                    },
-                    topic: function () {
-                        return $scope.topic;
-                    },
-                    messageSchema: function() {
-                        return $scope.messageSchema;
-                    }
-                }
-            }).result.then(function(response){
-                var topicName = response.topic.name;
-                $location.path('/groups/' + groupName + '/topics/' + topicName);
-            });
-        };
-
-        $scope.copyClientsToClipboard = function () {
-            topicRepository.getTopicUsers(topicName)
-                .then(function (topicUsersFromRepository) {
-                    var topicUsers = topicUsersFromRepository.join(", ");
-                    var tempElement = document.createElement('textarea');
-                    tempElement.value = topicUsers;
-                    document.body.appendChild(tempElement);
-                    tempElement.select();
-                    document.execCommand('copy');
-                    document.body.removeChild(tempElement);
-                    toaster.pop('info', 'Info', 'All topic users has been copied to clipboard');
-                })
-                .catch(function (response) {
-                    toaster.pop('error', 'Error ' + response.status, response.data.message);
-                });
-        };
-
-        $scope.remove = function () {
-            confirmationModal.open({
-                action: 'Remove',
-                actionSubject: 'Topic ' + $scope.topic.name,
-                passwordLabel: 'Root password',
-                passwordHint: 'root password'
-            }).result.then(function (result) {
-                    $scope.disableRemoveButton = true;
-                    passwordService.setRoot(result.password);
-                    var topic = $scope.topic;
-                    topicRepository.remove($scope.topic)
-                        .then(function () {
-                            toaster.pop('success', 'Success', 'Topic has been removed');
-                            if (!topicConfig.removeSchema && topic.contentType == 'AVRO') {
-                                toaster.pop('warning', 'Topic schema was not removed',
-                                    'Note that schema was not removed for this topic. Schema is persisted in an external registry ' +
-                                    'and its removal is disabled in this environment. Before creating topic with the same name make sure ' +
-                                    'it\'s manually removed by the schema registry operator.');
-                            }
-                            $location.path('/groups/' + groupName).replace();
-                        })
-                        .catch(function (response) {
-                            toaster.pop('error', 'Error ' + response.status, response.data.message);
-                        })
-                        .finally(function () {
-                            passwordService.reset();
-                            $scope.disableRemoveButton = false;
-                        });
-                });
-        };
-
-        $scope.blacklist = function () {
-            confirmationModal.open({
-                action: 'Blacklist',
-                actionSubject: 'Topic ' + $scope.topic.name,
-                passwordLabel: 'Root password',
-                passwordHint: 'root password'
-            }).result.then(function () {
-                topicRepository.blacklist(topicName).$promise
-                    .then(function () {
-                        toaster.pop('success', 'Success', 'Topic has been blacklisted');
-                    })
-                    .catch(function (response) {
-                        toaster.pop('error', 'Error ' + response.status, response.data.message);
-                    })
-                    .finally(function () {
-                        loadBlacklistStatus();
-                    });
-            });
-        };
-
-        $scope.unblacklist = function () {
-            confirmationModal.open({
-                action: 'Unblacklist',
-                actionSubject: 'Topic ' + $scope.topic.name,
-                passwordLabel: 'Root password',
-                passwordHint: 'root password'
-            }).result.then(function () {
-                topicRepository.unblacklist(topicName).$promise
-                    .then(function () {
-                        toaster.pop('success', 'Success', 'Topic has been unblacklisted');
-                    })
-                    .catch(function (response) {
-                        toaster.pop('error', 'Error ' + response.status, response.data.message);
-                    })
-                    .finally(function () {
-                        loadBlacklistStatus();
-                    });
-            });
-        };
-
-        $scope.addSubscription = function () {
-            $modal.open({
-                templateUrl: 'partials/modal/editSubscription.html',
-                controller: 'SubscriptionEditController',
-                size: 'lg',
-                backdrop: 'static',
-                resolve: {
-                    operation: function () {
-                        return 'ADD';
-                    },
-                    topicName: function () {
-                        return topicName;
-                    },
-                    subscription: function () {
-                        return subscriptionFactory.create(topicName);
-                    },
-                    endpointAddressResolverMetadataConfig: function() {
-                        return subscriptionConfig.endpointAddressResolverMetadata;
-                    },
-                    topicContentType: function () {
-                        return $scope.topic.contentType;
-                    },
-                    showFixedHeaders: function () {
-                        return $scope.showFixedHeaders;
-                    },
-                    showHeadersFilter: function () {
-                        return $scope.showHeadersFilter;
-                    }
-                }
-            }).result.then(function () {
-                loadSubscriptions();
-            });
-        };
-
-        $scope.copyToClipboard = function () {
-            var tempElement = document.createElement('textarea');
-            tempElement.value = $scope.messageSchema;
-            document.body.appendChild(tempElement);
-            tempElement.select();
-            document.execCommand('copy');
-            document.body.removeChild(tempElement);
-
-            toaster.pop('info', 'Info', 'Message schema has been copied to clipboard');
-        };
-
-        $scope.retransmitOffline = function () {
-            $modal.open({
-                templateUrl: 'partials/modal/offlineRetransmission.html',
-                controller: 'OfflineRetransmissionController',
-                size: 'md',
-                backdrop: 'static',
-                resolve: {
-                    topic: function () {
-                        return $scope.topic;
-                    },
-                    topicConfig: function () {
-                        return $scope.config;
-                    }
-                }
-            });
-        };
-
-        $scope.goToCostDetails = function () {
-            window.open($scope.costs.detailsUrl, '_blank');
-        };
-    }]);
-
-topics.controller('TopicEditController', ['TOPIC_CONFIG', 'TopicRepository', '$scope', '$uibModalInstance', 'PasswordService',
-    'toaster', 'topic', 'messageSchema', 'groupName', 'operation',
-    function (topicConfig, topicRepository, $scope, $modal, passwordService, toaster, topic, messageSchema, groupName, operation) {
-        $scope.config = topicConfig;
-        $scope.topic = _(topic).clone();
-        $scope.messageSchema = messageSchema;
-        $scope.groupName = groupName;
-        $scope.operation = operation;
-
-        $scope.save = function () {
-            $scope.disableSaveButton = true;
-            var promise;
-            var originalTopicName = $scope.topic.name;
-            passwordService.setRoot($scope.rootPassword);
-
-            var topic = _.cloneDeep($scope.topic);
-            delete topic.shortName;
-
-            topic.labels = ($scope.topic.labelValues || []).map(function(labelValue) { return {value: labelValue};} );
-            if (operation === 'ADD') {
-                topic.name = groupName + '.' + $scope.topic.shortName;
-                $scope.topic.name = topic.name;
-                promise = topicRepository.add(topic, $scope.messageSchema);
-            }
-            else {
-                promise = topicRepository.save(topic, $scope.messageSchema);
-            }
-
-            promise
-                    .then(function () {
-                        toaster.pop('success', 'Success', 'Topic has been saved');
-                        $modal.close({topic: $scope.topic, messageSchema: $scope.messageSchema});
-                    })
-                    .catch(function (response) {
-                        toaster.pop('error', 'Error ' + response.status, response.data.message);
-                        $scope.topic.name = originalTopicName;
-                    })
-                    .finally(function () {
-                        passwordService.reset();
-                        $scope.disableSaveButton = false;
-                    });
-        };
-         $scope.beautifyText = function (){
-            const obj_message = JSON.parse($scope.messageSchema);
-            if (obj_message !== undefined) {
-                $scope.messageSchema = JSON.stringify(obj_message, null, 4);
-            }
-        };
-
-    }]);
diff --git a/hermes-console/static/js/console/topic/TopicFactory.js b/hermes-console/static/js/console/topic/TopicFactory.js
deleted file mode 100644
index 6d98f3b4ec..0000000000
--- a/hermes-console/static/js/console/topic/TopicFactory.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var topics = angular.module('hermes.topic.factory', []);
-
-topics.factory('TopicFactory', ['TOPIC_CONFIG',
-    function(topicConfig) {
-        return {
-            create: function() {
-                var defaults = {
-                    retentionTime: {
-                        duration: 1,
-                        retentionUnit: 'DAYS'
-                    },
-                    contentType: 'JSON',
-                    ack: 'LEADER',
-                    maxMessageSize: 10240,
-                    owner: {
-                        id: '',
-                        source: ''
-                    },
-                    offlineStorage: {
-                        enabled: false,
-                        retentionTime: {
-                            duration: 60
-                        }
-                    }
-                };
-                _.merge(defaults, topicConfig.defaults);
-
-                return defaults;
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/topic/TopicMetrics.js b/hermes-console/static/js/console/topic/TopicMetrics.js
deleted file mode 100644
index 8bd8440a0f..0000000000
--- a/hermes-console/static/js/console/topic/TopicMetrics.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var metrics = angular.module('hermes.topic.metrics', ['hermes.metrics']);
-
-metrics.factory('TopicMetrics', ['DiscoveryService', '$resource', 'MetricStoreUrlResolver',
-    function(discovery, $resource, metricStoreUrlResolver) {
-        var metrics = $resource(discovery.resolve('/topics/:topicName/metrics'));
-
-        return {
-            metrics: function (topicName) {
-                return metrics.get({topicName: topicName})
-                    .$promise.then(function(metrics) {
-                        return {
-                            published: metrics.published,
-                            rate: parseFloat(metrics.rate),
-                            deliveryRate: parseFloat(metrics.deliveryRate)
-                        };
-                    });
-            },
-            metricsUrls: function(groupName, topicName) {
-                var topicWithoutGroup = topicName.substring(groupName.length + 1, topicName.length);
-                return metricStoreUrlResolver.topicMetrics(groupName, topicWithoutGroup);
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/console/topic/TopicRepository.js b/hermes-console/static/js/console/topic/TopicRepository.js
deleted file mode 100644
index 6975ab387c..0000000000
--- a/hermes-console/static/js/console/topic/TopicRepository.js
+++ /dev/null
@@ -1,67 +0,0 @@
-var repository = angular.module('hermes.topic.repository', ['hermes.subscription.repository']);
-
-repository.factory('TopicRepository', ['DiscoveryService', '$resource', '$location', 'SubscriptionRepository',
-    function (discovery, $resource, $location, subscriptionRepository) {
-
-        var repository = $resource(discovery.resolve('/topics/:name'), null, {update: {method: 'PUT'}});
-        var previewRepository = $resource(discovery.resolve('/topics/:name/preview'), null);
-        var blacklistRepository = $resource(discovery.resolve('/blacklist/topics/:name'), null,
-            { blacklist: { method: 'POST', url: discovery.resolve('/blacklist/topics') } });
-        var listing = $resource(discovery.resolve('/topics'));
-        var topicUsersRepository = $resource(discovery.resolve('/topics/:name/clients'));
-
-        return {
-            list: listing.query,
-            get: function (name) {
-                return repository.get({name: name}).$promise;
-            },
-            add: function (topic, schema) {
-                return repository.save({}, angular.extend({}, topic, {"schema": schema})).$promise;
-            },
-            remove: function (topic) {
-                return repository.delete({name: topic.name}).$promise;
-            },
-            save: function (topic, schema) {
-                return repository.update({name: topic.name}, angular.extend({}, topic, {"schema": schema})).$promise;
-            },
-            listSubscriptions: function (topicName) {
-                return subscriptionRepository.list(topicName);
-            },
-            listSubscriptionsWithDetails: function (topicName) {
-                return subscriptionRepository.list(topicName).$promise.then(function (subscriptions) {
-                    return _.map(subscriptions, function (subscription) {
-                        return {
-                            name: subscription,
-                            details: subscriptionRepository.get(topicName, subscription)
-                        };
-                    });
-                });
-            },
-            preview: function (topicName) {
-                return previewRepository.query({name: topicName}).$promise;
-            },
-            blacklistStatus: function (topicName) {
-                return blacklistRepository.get({name: topicName}).$promise;
-            },
-            blacklist: function (topicName) {
-                return blacklistRepository.blacklist([topicName]);
-            },
-            unblacklist: function (topicName) {
-                return blacklistRepository.delete({name: topicName});
-            },
-            getTopicUsers: function (topicName) {
-                return topicUsersRepository.query({name: topicName}).$promise;
-            }
-        };
-    }]);
-
-repository.factory('OfflineClientsRepository', ['DiscoveryService', '$resource',
-    function (discovery, $resource) {
-        var repository = $resource(discovery.resolve('/topics/:topic/offline-clients-source'));
-
-        return {
-            getIframeSource: function (topic) {
-                return repository.get({topic: topic}).$promise;
-            }
-        };
-    }]);
diff --git a/hermes-console/static/js/directives/bindHtml.js b/hermes-console/static/js/directives/bindHtml.js
deleted file mode 100644
index 7b5f0942a1..0000000000
--- a/hermes-console/static/js/directives/bindHtml.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var directives = angular.module('hermes.directives', []);
-
-directives.directive('bindHtml', ['$compile', function ($compile) {
-    return {
-        restrict: 'A',
-        link: function (scope, element, attrs) {
-            scope.$watch(function () {
-                return scope.$eval(attrs.bindHtml);
-            }, function (value) {
-                element.html(value);
-                $compile(element.contents())(scope);
-            });
-        }
-    };
-}]);
diff --git a/hermes-console/static/js/directives/calendar.js b/hermes-console/static/js/directives/calendar.js
deleted file mode 100644
index 4c9508f51e..0000000000
--- a/hermes-console/static/js/directives/calendar.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var directives = angular.module('hermes.directives', []);
-
-directives.directive('calendar', [function () {
-  return {
-    link: function (scope, elem, attrs) {
-      scope.$watch(function () {
-        return scope.$eval(attrs.daysBack);
-      }, function (value) {
-        if (!value) {
-          return;
-        }
-
-        const startDate = moment().subtract(parseInt(value), "days");
-        const endDate = moment().add(1, "second");
-
-        let idSelector = `#${attrs.id}`;
-        $(idSelector).datetimepicker({
-          format: "YYYY-MM-DDTHH:mm:ssZ",
-          ignoreReadonly: true,
-          useCurrent: true,
-          minDate: startDate,
-          maxDate: endDate,
-          sideBySide: true,
-        }).on('dp.change', function () {
-          $(idSelector).change();
-        });
-      });
-    }
-  };
-}]);
\ No newline at end of file
diff --git a/hermes-console/static/js/directives/emptyToNull.js b/hermes-console/static/js/directives/emptyToNull.js
deleted file mode 100644
index 64bc579380..0000000000
--- a/hermes-console/static/js/directives/emptyToNull.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var directives = angular.module('hermes.directives', []);
-
-directives.directive('emptyToNull', function () {
-    return {
-        restrict: 'A',
-        require: 'ngModel',
-        link: function (scope, elem, attrs, ctrl) {
-            ctrl.$parsers.push(function(viewValue) {
-                if(viewValue === "") {
-                    return null;
-                }
-                return viewValue;
-            });
-        }
-    };
-});
diff --git a/hermes-console/static/js/directives/endpoint.js b/hermes-console/static/js/directives/endpoint.js
deleted file mode 100644
index b9d491018a..0000000000
--- a/hermes-console/static/js/directives/endpoint.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var directives = angular.module('hermes.directives', []);
-
-directives.directive('endpoint', function () {
-    return {
-        require: 'ngModel',
-        link: function (scope, element, attrs, ctrl) {
-            ctrl.$parsers.unshift(function (value) {
-                ctrl.$setValidity('endpoint',hasValidProtocol(value));
-                return value;
-            });
-
-            var hasValidProtocol = function (value) {
-                var supportedProtocols = [
-                    "http",
-                    "service",
-                    "jms",
-                    "googlepubsub",
-                    "hdfs",
-                    "zmq",
-                    "ems"
-                ];
-
-                for (var i = 0; i < supportedProtocols.length; i++) {
-                    if (beginsWith(supportedProtocols[i] + "://", value)) return true;
-                }
-
-                return false;
-            };
-
-            var beginsWith = function (needle, haystack) {
-                return (haystack.substr(0, needle.length) === needle);
-            };
-        }
-    };
-
-});
\ No newline at end of file
diff --git a/hermes-console/static/js/directives/hoverDelay.js b/hermes-console/static/js/directives/hoverDelay.js
deleted file mode 100644
index 6f976387c9..0000000000
--- a/hermes-console/static/js/directives/hoverDelay.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var directives = angular.module('hermes.directives', []);
-
-directives.directive('hoverDelay', ['$timeout', function($timeout) {
-
-    return {
-        link: function(scope, element, attrs) {
-            var counting = false;
-            var alreadyRun = false;
-            var delay = parseInt(attrs.hoverDelayTime, 10) || 1000;
-            var repeat = attrs.hoverDelayRepeat || false;
-
-            element.on('mouseover', function() {
-                if(!counting && (repeat || !alreadyRun)) {
-                    counting = true;
-                    $timeout(function() {
-                        if(counting) {
-                            scope.$eval(attrs.hoverDelay);
-                            alreadyRun = true;
-                        }
-                        counting = false;
-                    }, delay);
-                }
-            });
-
-            element.on('mouseleave', function() {
-                counting = false;
-            });
-        }
-    };
-}]);
diff --git a/hermes-console/static/partials/authPane.html b/hermes-console/static/partials/authPane.html
deleted file mode 100644
index 8bdd41710f..0000000000
--- a/hermes-console/static/partials/authPane.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="auth-pane pull-right">
-    <button ng-show="!isAuthorized" class="btn btn-primary" ng-click="signIn()">Sign in</button>
-    <button ng-show="isAuthorized" class="btn btn-primary" ng-click="signOut()">Sign out</button>
-</div>
diff --git a/hermes-console/static/partials/avroViewerNode.html b/hermes-console/static/partials/avroViewerNode.html
deleted file mode 100644
index 3d83fcf535..0000000000
--- a/hermes-console/static/partials/avroViewerNode.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-    <div ng-click="toggleExpansion()" ng-style="{'cursor': expandable ? 'pointer' : 'default'}" class="flex-row">
-        <div ng-if="!root" class="tree-branch" ng-class="{'long-branch': !expandable}"></div>
-        <span ng-style="{'visibility': expandable ? 'visible' : 'hidden'}" class="caret margin-right-4" style="margin-top: .7em" ng-class="{'rotated-90-deg': !expanded}"></span>
-        <span  class="text-info margin-right-4" data-ref="name">{{name}}</span></span>
-        <span class="text-primary margin-right-4 monospaced" data-ref="type" ng-if="!root">{{types.join('|')}}</span>
-        <span ng-if="expandableTypesNumber > 1" class="text-warning margin-right-half-em">(only one type is shown)</span>
-        <span class="text-muted margin-right-4" ng-if="field.doc" data-ref="doc">{{doc}}</span>
-        <span ng-if="field.default" class="text-muted" data-ref="default">Default: {{field.default}}</span>
-    </div>
-    <div style="padding-left: 2em" ng-show="expanded" data-ref="children"></div>
-</div>
diff --git a/hermes-console/static/partials/consistency.html b/hermes-console/static/partials/consistency.html
deleted file mode 100644
index e84296a788..0000000000
--- a/hermes-console/static/partials/consistency.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<section ng-controller="ConsistencyController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li class="active">consistency</li>
-    </ol>
-
-    <div class="pull-right">
-        <button class="btn btn-primary" ng-disabled="consistencyChecking.state !== 'READY'" ng-click="checkConsistency()">
-            Check consistency
-        </button>
-    </div>
-
-    <h1>Consistency</h1>
-
-    <div class="row text-center">
-        <div class="col-md-12">
-            <p class="alert alert-info" ng-if="consistencyChecking.state == 'READY' && topicsConsistencyChecking.state == 'READY'">
-                Click 'Check consistency' to detect inconsistencies between clusters.
-            </p>
-            <div class="alert alert-info" ng-if="consistencyChecking.state == 'CHECKING_CONSISTENCY'">
-                Groups consistency check is in progress.
-                <span style="font-size: 20px; vertical-align: middle;" class="fa fa-circle-o-notch fa-spin"></span>
-            </div>
-            <div class="alert alert-info" ng-if="topicsConsistencyChecking.state == 'CHECKING_CONSISTENCY'">
-                Topics consistency check is in progress.
-                <span style="font-size: 20px; vertical-align: middle;" class="fa fa-circle-o-notch fa-spin"></span>
-            </div>
-        </div>
-    </div>
-
-    <uib-progressbar ng-if="consistencyChecking.state == 'CHECKING_CONSISTENCY'" animate="false" value="processedGroupsPercent" type="success">
-        <b>{{processedGroupsPercent}}%</b>
-    </uib-progressbar>
-
-    <div class="row text-center" ng-if="consistencyChecking.result.length == 0">
-        <div class="col-md-12">
-            <p class="alert alert-success">All groups are consistent.</p>
-        </div>
-    </div>
-
-    <div class="row container" ng-if="consistencyChecking.result.length > 0">
-        <div class="list-group">
-            <div class="list-group-item list-group-item-warning">
-                <div class="form-inline pull-right">
-                    <div class="input-group">
-                        <span class="input-group-addon"><span class="glyphicon glyphicon-search"></span></span>
-                        <input class="form-control" ng-model="search.name" placeholder="search...">
-                    </div>
-                </div>
-                <h4>Inconsistent groups</h4>
-            </div>
-            <a class="list-group-item"
-               ng-repeat="group in consistencyChecking.result | filter:search:strict | orderBy:'name'"
-               ng-href="#/consistency/{{group.name}}">
-                <small>{{$index + 1}}</small>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-                <strong>{{group.name}}</strong>
-                <div class="pull-right">
-                    <span class="glyphicon glyphicon-chevron-right"></span>
-                </div>
-            </a>
-        </div>
-    </div>
-
-    <div class="row container" ng-if="topicsConsistencyChecking.result.length > 0" >
-        <div class="list-group">
-            <div class="list-group-item list-group-item-warning">
-                <div class="form-inline pull-right">
-                    <div class="input-group">
-                        <span class="input-group-addon"><span class="glyphicon glyphicon-search"></span></span>
-                        <input class="form-control" ng-model="search" placeholder="search...">
-                    </div>
-                </div>
-                <h4>Topics existing on kafka cluster but not present in hermes</h4>
-            </div>
-            <div class="list-group-item clearfix"
-                 ng-repeat="topic in topicsConsistencyChecking.result | filter:search:strict | orderBy">
-                <small>{{$index + 1}}</small>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-                <strong>{{topic}}</strong>
-                <div class="pull-right">
-                    <button class="btn btn-danger" ng-click="removeTopic(topic)">Remove</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/constraints.html b/hermes-console/static/partials/constraints.html
deleted file mode 100644
index 0973fce681..0000000000
--- a/hermes-console/static/partials/constraints.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<section ng-controller="ConstraintsController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li class="active">constraints</li>
-    </ol>
-
-    <h1><small>Constraints:</small></h1>
-
-    <div class="row container">
-        <div class="list-group">
-            <div class="list-group-item">
-                <div class="form-inline pull-right">
-                    <div class="input-group">
-                        <span class="input-group-addon"><span class="glyphicon glyphicon-search"></span></span>
-                        <input class="form-control" ng-model="search.topicName" placeholder="search...">
-                    </div>
-                    <button class="btn btn-primary" ng-click="addTopicConstraints()">
-                        <span class="glyphicon glyphicon-plus"></span>
-                    </button>
-                </div>
-                <h4>
-                    Topic constraints
-                </h4>
-            </div>
-            <a class="list-group-item" ng-repeat="item in topicConstraints | filter:search:strict | orderBy:'topicName'" ng-click="edit(item)">
-                <small>{{$index + 1}}</small>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-                <strong>{{item.topicName}}</strong>
-                <div class="pull-right">
-                    <span class="label label-info">consumers number: {{ item.consumersNumber }}</span>
-                    <span class="glyphicon glyphicon-chevron-right"></span>
-                </div>
-            </a>
-        </div>
-    </div>
-
-    <div class="row container">
-        <div class="list-group">
-            <div class="list-group-item">
-                <div class="form-inline pull-right">
-                    <div class="input-group">
-                        <span class="input-group-addon"><span class="glyphicon glyphicon-search"></span></span>
-                        <input class="form-control" ng-model="search.subscriptionName" placeholder="search...">
-                    </div>
-                    <button class="btn btn-primary" ng-click="addSubscriptionConstraints()">
-                        <span class="glyphicon glyphicon-plus"></span>
-                    </button>
-                </div>
-                <h4>
-                    Subscription constraints
-                </h4>
-            </div>
-            <a class="list-group-item" ng-repeat="item in subscriptionConstraints | filter:search:strict | orderBy:'subscriptionName'" ng-click="edit(item)">
-                <small>{{$index + 1}}</small>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-                <strong>{{item.subscriptionName}}</strong>
-                <div class="pull-right">
-                    <span class="label label-info">consumers number: {{ item.consumersNumber }}</span>
-                    <span class="glyphicon glyphicon-chevron-right"></span>
-                </div>
-            </a>
-        </div>
-    </div>
-
-</section>
diff --git a/hermes-console/static/partials/diagnostics.html b/hermes-console/static/partials/diagnostics.html
deleted file mode 100644
index aced79aa9d..0000000000
--- a/hermes-console/static/partials/diagnostics.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<section ng-controller="DiagnosticsController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li><a href="#/groups">groups</a></li>
-        <li><a ng-href="#/groups/{{groupName}}">{{groupName}}</a></li>
-        <li><a ng-href="#/groups/{{groupName}}/topics/{{topicName}}">{{topicName}}</a></li>
-        <li><a ng-href="#/groups/{{groupName}}/topics/{{topicName}}/subscriptions/{{subscriptionName}}">{{subscriptionName}}</a></li>
-        <li class="active">diagnostics</li>
-    </ol>
-
-    <h3 ng-if="consumerGroupExists()" style="margin-bottom: 1em;">
-        <small>Group Id:</small> {{consumerGroups[0].groupId}}
-    </h3>
-
-    <div class="row">
-        <div class="col-md-6" ng-repeat="consumerGroup in consumerGroups | orderBy:'clusterName'">
-            <div class="panel"
-                 ng-class="{
-                    'panel-success': isConsumerGroupStable(consumerGroup),
-                    'panel-warning': isConsumerGroupDuringRebalance(consumerGroup),
-                    'panel-danger': isConsumerGroupUnstable(consumerGroup)}">
-                <div class="panel-heading">
-                    <h3 class="panel-title">{{consumerGroup.clusterName}} ({{consumerGroup.state}})</h3>
-                </div>
-                <table class="table">
-                    <tr>
-                        <th>Topic</th>
-                        <th>Partition</th>
-                        <th>Current Offset</th>
-                        <th>End Offset</th>
-                        <th>Lag</th>
-                    </tr>
-                    <tbody ng-repeat="consumer in consumerGroup.members | orderBy:'host'">
-                        <tr>
-                            <td colspan="5"><strong>{{consumer.host}}</strong></td>
-                        </tr>
-                        <tr ng-repeat="partition in consumer.partitions | orderBy:['contentType','partition']">
-                            <td>
-                                <button ng-click="copyTopicNameToClipboard(partition)"
-                                        uib-popover="Copy Kafka topic name to clipboard." popover-placement="top" popover-trigger="mouseenter"
-                                        class="btn btn-xs"
-                                        ng-class="{
-                                            'btn-success': isAvroTopic(partition),
-                                            'btn-warning': isJsonTopic(partition),
-                                            'btn-danger': !isAvroTopic(partition) && !isJsonTopic(partition)
-                                        }">
-                                    {{partition.contentType}}
-                                </button>
-                            </td>
-                            <td>{{partition.partition}}</td>
-                            <td>{{partition.currentOffset}}</td>
-                            <td>{{partition.logEndOffset}}</td>
-                            <td>{{partition.lag}}</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-
-</section>
diff --git a/hermes-console/static/partials/filter/filtersEditor.html b/hermes-console/static/partials/filter/filtersEditor.html
deleted file mode 100644
index 7d6e22473f..0000000000
--- a/hermes-console/static/partials/filter/filtersEditor.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<div>
-    <table class="table borderless table-condensed">
-        <tr>
-            <th>Path</th>
-            <th>Matcher</th>
-            <th>Matching strategy</th>
-            <th>
-                <button ng-if="withDebugger" class="btn btn-success btn-xs btn-block" ng-click="debugFilters()">
-                    <span class="glyphicon glyphicon-console"></span> Debug
-                </button>
-            </th>
-        </tr>
-        <tr ng-repeat="filter in filters" ng-if="filter.type !== 'header'">
-            <td>
-                <input ng-model="filter.path"
-                       class="form-control col-md-1 {{filter.path.$valid ? '' : 'has-error'}}"
-                       name="subscriptionFilterPathInput" placeholder="{{filter.path}}"/>
-            </td>
-            <td>
-                <input ng-model="filter.matcher"
-                       class="form-control col-md-1 {{filter.matcher.$valid ? '' : 'has-error'}}"
-                       name="subscriptionFilterMatcherInput" placeholder="{{filter.matcher}}"/>
-            </td>
-            <td>
-                <select ng-model="filter.matchingStrategy"
-                        class="form-control col-md-1"
-                        name="subscriptionFilterMatchingStrategySelect">
-                    <option value="all">all (default)</option>
-                    <option value="any">any</option>
-                </select>
-            </td>
-            <td>
-                <button class="btn btn-danger btn-block" ng-click="delFilter(filter)">Delete</button>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <input ng-model="filter.path"
-                       class="form-control col-md-1 {{filter.path.$valid ? '' : 'has-error'}}"
-                       name="subscriptionFilterPathInput" placeholder="Path for filter"/>
-            </td>
-            <td>
-                <input ng-model="filter.matcher"
-                       class="form-control col-md-1 {{filter.matcher.$valid ? '' : 'has-error'}}"
-                       name="subscriptionFilterMatcherInput" placeholder="Matcher for filter"/>
-            </td>
-            <td>
-                <select ng-model="filter.matchingStrategy" ng-init="filter.matchingStrategy='all'"
-                        class="form-control col-md-1"
-                        name="subscriptionFilterMatchingStrategySelect">
-                    <option value="all">all (default)</option>
-                    <option value="any">any</option>
-                </select>
-            </td>
-            <td>
-                <button class="btn btn-success btn-block" ng-click="addFilter()">Add</button>
-            </td>
-        </tr>
-    </table>
-</div>
diff --git a/hermes-console/static/partials/filter/httpHeaderFiltersEditor.html b/hermes-console/static/partials/filter/httpHeaderFiltersEditor.html
deleted file mode 100644
index 62f910b5eb..0000000000
--- a/hermes-console/static/partials/filter/httpHeaderFiltersEditor.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<div>
-    <table class="table borderless">
-        <tr>
-            <th>Header name</th>
-            <th>Matcher</th>
-            <th></th>
-        </tr>
-        <tr ng-repeat="filter in filters" ng-if="filter.type === 'header'">
-            <td>
-                <input ng-model="filter.header"
-                       class="form-control col-md-1 {{filter.header.$valid ? '' : 'has-error'}}"
-                       name="subscriptionHttpHeaderFilterInput" placeholder="{{filter.header}}"/>
-            </td>
-            <td>
-                <input ng-model="filter.matcher"
-                       class="form-control col-md-1 {{filter.matcher.$valid ? '' : 'has-error'}}"
-                       name="subscriptionHttpFilterMatcherEdit" placeholder="{{filter.matcher}}"/>
-            </td>
-            <td>
-                <button class="btn btn-danger" ng-click="delFilter(filter)">Delete</button>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <input ng-model="filter.header"
-                       class="form-control col-md-1 {{filter.header.$valid ? '' : 'has-error'}}"
-                       name="subscriptionHttpHeaderFilterInput" placeholder="Header name"/>
-            </td>
-            <td>
-                <input ng-model="filter.matcher"
-                       class="form-control col-md-1 {{filter.matcher.$valid ? '' : 'has-error'}}"
-                       name="subscriptionHttpFilterMatcherInput" placeholder="Matcher for filter"/>
-            </td>
-            <td>
-                <div class="col-md-1">
-                    <button class="btn btn-success" ng-click="addFilter()">Add</button>
-                </div>
-            </td>
-        </tr>
-    </table>
-</div>
diff --git a/hermes-console/static/partials/group.html b/hermes-console/static/partials/group.html
deleted file mode 100644
index bd3ac1fc32..0000000000
--- a/hermes-console/static/partials/group.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<section ng-controller="GroupController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li><a href="#/groups">groups</a></li>
-        <li class="active">{{groupName}}</li>
-    </ol>
-
-    <div class="pull-right">
-        <button class="btn btn-primary" ng-disabled="userWithoutAccess" ng-show="admin" ng-click="edit()">Edit</button>
-        <button class="btn btn-danger" ng-disabled="userWithoutAccess || disableRemoveButton" ng-show="admin" ng-click="remove()">Remove</button>
-    </div>
-
-    <h1><small>Group:</small> {{group.groupName}}</h1>
-
-    <div class="row container">
-        <div class="list-group">
-            <div class="list-group-item">
-                <div class="pull-right">
-                    <span ng-show="!userHasSufficientPrivileges" uib-popover='Sign in to add a topic' popover-trigger="mouseenter" class="fa helpme">&#xf128;</span>
-                    <button class="btn btn-primary" ng-disabled="userWithoutAccess" ng-click="addTopic()"><span class="glyphicon glyphicon-plus"></span></button>
-                </div>
-                <h4>
-                    Topics
-                </h4>
-            </div>
-            <a ng-href="#/groups/{{groupName}}/topics/{{topic.name}}" hover-delay="fetchSubscriptions(topic)" class="list-group-item" ng-repeat="topic in topics">
-                <small>{{$index + 1}}</small>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-                <strong>{{topic.name}}</strong>
-                <div class="pull-right">
-                    <span class="label label-info">subscriptions: {{topic.subscriptions ? topic.subscriptions.length : '?'}}</span>
-                    <span class="glyphicon glyphicon-chevron-right"></span>
-                </div>
-            </a>
-        </div>
-
-        <div ng-show="fetching" class="text-center">
-            <h1><i class="fa fa-circle-o-notch fa-spin"></i></h1>
-        </div>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/groupConsistency.html b/hermes-console/static/partials/groupConsistency.html
deleted file mode 100644
index 7b9d6cb97e..0000000000
--- a/hermes-console/static/partials/groupConsistency.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<section ng-controller="GroupConsistencyController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li><a href="#/consistency">consistency</a></li>
-        <li class="active">{{groupName}}</li>
-    </ol>
-
-    <h1><small>Group:</small> {{groupName}}</h1>
-
-    <div class="row container" ng-if="group.inconsistentMetadata.length > 0">
-        <div class="panel panel-warning">
-            <div class="panel-heading">
-                <h3 class="panel-title">Inconsistent metadata</h3>
-            </div>
-            <div class="table-responsive">
-                <table class="table table-bordered">
-                    <thead>
-                    <tr>
-                        <th class="col-md-6" ng-repeat="metadata in group.inconsistentMetadata">
-                            {{metadata.datacenter}}
-                        </th>
-                    </tr>
-                    </thead>
-                    <tbody style="overflow-y: scroll">
-                    <tr>
-                        <td class="col-md-6" ng-repeat="metadata in group.inconsistentMetadata">
-                            <pre class="content">{{metadata.content | prettyJson}}</pre>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-
-    <div class="row text-center" ng-if="group.inconsistentMetadata.length === 0">
-        <div class="col-md-12">
-            <p class="alert alert-success">Group metadata are consistent.</p>
-        </div>
-    </div>
-
-    <div class="row container" ng-if="group.inconsistentTopics.length > 0">
-        <div class="list-group">
-            <div class="list-group-item list-group-item-warning">
-                <h4>Inconsistent topics</h4>
-            </div>
-            <a class="list-group-item" ng-repeat="topic in group.inconsistentTopics | orderBy:'name'"
-               ng-href="#/consistency/{{groupName}}/topics/{{topic.name}}">
-                <div>
-                    <small>{{$index + 1}}</small>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-                    <strong>{{topic.name}}</strong>
-                    <div class="pull-right">
-                        <span class="glyphicon glyphicon-chevron-right"></span>
-                    </div>
-                </div>
-            </a>
-        </div>
-    </div>
-
-    <div class="row text-center" ng-if="group.inconsistentTopics.length === 0">
-        <div class="col-md-12">
-            <p class="alert alert-success">All topics are consistent.</p>
-        </div>
-    </div>
-
-</section>
diff --git a/hermes-console/static/partials/groups.html b/hermes-console/static/partials/groups.html
deleted file mode 100644
index 624ac94256..0000000000
--- a/hermes-console/static/partials/groups.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<section ng-controller="GroupsController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li class="active">groups</li>
-    </ol>
-
-    <h1>Groups</h1>
-
-    <div ng-show="!canCreateGroup()" class="alert alert-info">In order to create a new group, please contact Hermes administrator</div>
-
-    <div class="row container">
-        <div class="input-group col-md-2 col-md-offset-10">
-            <div class="input-group-addon"><span class="glyphicon glyphicon-search"></span></div>
-            <input class="form-control" ng-model="search.name" ng-change="storeSearchFilter()" placeholder="search...">
-        </div>
-    </div>
-
-    <div class="row container">
-        <div class="list-group">
-            <div class="list-group-item" ng-show="canCreateGroup()">
-                <div class="pull-right">
-                    <span ng-show="!userHasSufficientPrivileges" uib-popover='Sign in to add a group' popover-trigger="mouseenter" class="fa helpme">&#xf128;</span>
-                    <button class="btn btn-primary" ng-disabled="userWithoutAccess" ng-click="addGroup()"><span class="glyphicon glyphicon-plus"></span></button>
-                </div>
-                <h4>&nbsp;</h4>
-            </div>
-            <a ng-href="#/groups/{{group.name}}" class="list-group-item" ng-repeat="group in groups| filter:search:strict">
-                <small>{{$index + 1}}</small>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-                <strong>{{group.name}}</strong>
-                <div class="pull-right">
-                    <span class="label label-info">topics: {{group.topics.length}}</span>
-                    <span class="glyphicon glyphicon-chevron-right"></span>
-                </div>
-            </a>
-        </div>
-
-        <div ng-show="fetching" class="text-center">
-            <h1><i class="fa fa-circle-o-notch fa-spin"></i></h1>
-        </div>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/home.html b/hermes-console/static/partials/home.html
deleted file mode 100644
index 7d5a34fa2f..0000000000
--- a/hermes-console/static/partials/home.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<section ng-controller="HomeController">
-
-    <div class="hero-box text-center">
-        <img src="img/hermes-logo-full.png" alt="Hermes"/>
-    </div>
-
-    <div class="row" style="margin-bottom: 2em;">
-        <div class="col-md-{{costs.enabled ? 3 : 6}} col-md-offset-3">
-            <a class="btn btn-main btn-block" ng-href="#/groups">
-                <i class="fa fa-cogs"></i> Console
-            </a>
-        </div>
-        <div class="col-md-3" ng-if="costs.enabled">
-            <a class="btn btn-main btn-block" ng-href="{{costs.detailsUrl}}" target="_blank">
-                <i class="fa fa-money"></i> Costs
-            </a>
-        </div>
-    </div>
-
-    <div class="row" style="margin-bottom: 2em;">
-        <div class="col-md-3 col-md-offset-3">
-            <a class="btn btn-main btn-block" ng-href="#/stats">
-                <i class="fa fa-tasks"></i> Stats
-            </a>
-        </div>
-        <div class="col-md-3">
-            <a class="btn btn-main btn-block" ng-href="#/search">
-                <i class="fa fa-search"></i> Search
-            </a>
-        </div>
-    </div>
-
-    <div class="row" style="margin-bottom: 2em;">
-        <div class="col-md-3 col-md-offset-3">
-            <a class="btn btn-main btn-block" ng-href="{{statsDashboard}}" target="_blank">
-                <i class="fa fa-bar-chart"></i> Runtime
-            </a>
-        </div>
-        <div class="col-md-3">
-            <a class="btn btn-main btn-block" ng-href="{{docs}}" target="_blank">
-                <i class="fa fa-book"></i> Docs
-            </a>
-        </div>
-    </div>
-
-    <div class="row" ng-if="admin">
-        <div class="col-md-6 col-md-offset-3">
-            <div class=" btn-group btn-block" dropdown>
-                <button class="btn btn-main btn-block dropdown-toggle" dropdown-toggle>
-                    <i class="fa fa-wrench"></i> Admin Tools <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu btn-block" role="menu" aria-labelledby="single-button">
-                    <li role="menuitem"><a href="#/constraints">Constraints</a></li>
-                    <li role="menuitem"><a href="#/consistency">Consistency</a></li>
-                    <li role="menuitem"><a href="#/readiness">Readiness</a></li>
-                    <li role="menuitem"><a href="#/subscription-offsets">Subscription offsets</a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-
-</section>
diff --git a/hermes-console/static/partials/modal/addConstraints.html b/hermes-console/static/partials/modal/addConstraints.html
deleted file mode 100644
index 505f8dc502..0000000000
--- a/hermes-console/static/partials/modal/addConstraints.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<section>
-    <div class="modal-header">
-        <h3 class="modal-title">
-            <small>Create constraints for {{constraintsType}}:</small>
-        </h3>
-    </div>
-    <div class="modal-body">
-        <form name="constraintsForm" class="form-horizontal" role="form">
-            <div ng-hide="!authEnabled.headers || isAuthorized" class="form-group {{constraintsForm.rootPassword.$valid ? '' : 'has-error'}}">
-                <label for="rootPassword" class="col-md-3 control-label">Root password</label>
-                <div class="col-md-9">
-                    <input class="form-control" type="password" ng-required="!isAuthorized && authEnabled.headers"
-                           id="rootPassword" name="rootPassword" placeholder="root password" ng-model="rootPassword"/>
-                </div>
-            </div>
-            <div class="form-group {{constraintsForm.topicName.$valid ? '' : 'has-error'}}">
-                <label for="topicName" class="col-md-3 control-label">Topic name</label>
-                <div class="col-md-9">
-                    <input class="form-control" id="topicName" required name="topicName" ng-model="constraintsName.topicName"/>
-                </div>
-            </div>
-            <div class="form-group {{constraintsForm.subscriptionName.$valid ? '' : 'has-error'}}" ng-if="constraintsType === 'subscription'">
-                <label for="subscriptionName" class="col-md-3 control-label">Subscription name</label>
-                <div class="col-md-9">
-                    <input class="form-control" id="subscriptionName" required name="subscriptionName" ng-model="constraintsName.subscriptionName"/>
-                </div>
-            </div>
-            <div class="form-group {{constraintsForm.consumersNumber.$valid ? '' : 'has-error'}}">
-                <label for="consumersNumber" class="col-md-3 control-label">Consumers number</label>
-                <div class="col-md-9">
-                    <input class="form-control" id="consumersNumber" required name="consumersNumber" ng-model="consumersNumber" ng-pattern="/^[0-9]+$/"/>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="constraintsForm.$invalid" ng-click="save()">Save</button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/modal/confirm.html b/hermes-console/static/partials/modal/confirm.html
deleted file mode 100644
index dfa4abf7a5..0000000000
--- a/hermes-console/static/partials/modal/confirm.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<section>
-    <div class="modal-header">
-        <h3 class="modal-title"><small>{{description.action}}:</small> {{description.actionSubject}}</h3>
-    </div>
-    <div class="modal-body">
-            {{description.additionalInfo}}
-    </div>
-    <div class="modal-body" ng-hide="!authEnabled.headers || isAuthorized">
-        <form class="form-horizontal" role="form">
-            <div class="form-group">
-                <label for="providedPassword" class="col-md-3 control-label">{{description.passwordLabel}}</label>
-                <div class="col-md-9">
-                    <input class="form-control" type="password" id="providedPassword" placeholder="{{description.passwordHint}}" ng-model="providedPassword" focus-me/>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-click="$close({password: providedPassword})" >{{description.action}}</button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/modal/debugFilters.html b/hermes-console/static/partials/modal/debugFilters.html
deleted file mode 100644
index 4e572981dc..0000000000
--- a/hermes-console/static/partials/modal/debugFilters.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<section>
-    <div class="modal-body">
-        <form name="debuggerForm" class="form-horizontal" role="form">
-            <div class="form-group">
-                <div class="col-md-9">
-                    <div class="form-control ace_editor_debug" id="message"
-                         name="message" ng-model="message"
-                         ui-ace="{
-                              useWrapMode : true,
-                              theme:'chrome',
-                              mode: 'json'}">
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <button class="btn btn-info btn-block btn-lg" ng-disabled="verificationInProgress" ng-click="verify()">Verify</button>
-                    <hr/>
-                    <h2>
-                        <span ng-if="verificationStatus=='MATCHED'" class="label label-success full-width">Matched</span>
-                        <span ng-if="verificationStatus=='NOT_MATCHED'" class="label label-warning full-width">Not Matched</span>
-                        <span ng-if="verificationStatus=='ERROR'" class="label label-danger full-width">Error</span>
-                    </h2>
-                    <div ng-if="verificationStatus=='ERROR'"
-                         class="alert alert-danger pre-scrollable" style="height: 284px; margin-bottom: 0">{{errorMessage}}</div>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-9">
-                    <filters-editor form="debuggerForm" topic-content-type="topicContentType" filters="messageFilters"></filters-editor>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="debuggerForm.$invalid || disabled" ng-click="updateFilters()">Update Subscription Filters</button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/modal/editConstraints.html b/hermes-console/static/partials/modal/editConstraints.html
deleted file mode 100644
index f881a2ad56..0000000000
--- a/hermes-console/static/partials/modal/editConstraints.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<section>
-    <div class="modal-header">
-        <h3 class="modal-title">
-            <small>Edit constraints for {{constraintsType}}:</small> {{constraintsName}}
-        </h3>
-    </div>
-    <div class="modal-body">
-        <form name="constraintsForm" class="form-horizontal" role="form">
-            <div ng-hide="!authEnabled.headers || isAuthorized" class="form-group {{constraintsForm.rootPassword.$valid ? '' : 'has-error'}}">
-                <label for="rootPassword" class="col-md-3 control-label">Root password</label>
-                <div class="col-md-9">
-                    <input class="form-control" type="password" ng-required="!isAuthorized && authEnabled.headers"
-                           id="rootPassword" name="rootPassword" placeholder="root password" ng-model="rootPassword"/>
-                </div>
-            </div>
-            <div class="form-group {{constraintsForm.consumersNumber.$valid ? '' : 'has-error'}}">
-                <label for="consumersNumber" class="col-md-3 control-label">Consumers number</label>
-                <div class="col-md-9">
-                    <input class="form-control" id="consumersNumber" required name="consumersNumber" ng-model="consumersNumber"
-                           ng-pattern="/^[0-9]+$/"/>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="constraintsForm.$invalid" ng-click="save()">Save</button>
-        <button class="btn btn-danger" ng-click="remove()">Remove</button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/modal/editGroup.html b/hermes-console/static/partials/modal/editGroup.html
deleted file mode 100644
index ed4bae3c0c..0000000000
--- a/hermes-console/static/partials/modal/editGroup.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<section>
-    <div class="modal-header">
-        <h3 class="modal-title" ng-show="operation === 'ADD'"><small>Create group:</small> {{group.groupName}}</h3>
-        <h3 class="modal-title" ng-show="operation === 'EDIT'"><small>Edit group:</small> {{group.groupName}}</h3>
-    </div>
-    <div class="modal-body">
-        <div ng-show="!admin && operation == 'ADD'" class="alert alert-warning">When creating a group please make sure that it complies with general
-            group standards and naming conventions. Ensure that a group that meets your requirements does not already exist. </div>
-
-        <form name="groupForm" class="form-horizontal" role="form">
-            <div ng-hide="!authEnabled.headers || isAuthorized" class="form-group {{groupForm.rootPassword.$valid ? '' : 'has-error'}}">
-                <label for="rootPassword" class="col-md-3 control-label">Root password</label>
-                <div class="col-md-9">
-                    <input class="form-control" type="password" ng-required="!isAuthorized && authEnabled.headers" id="rootPassword" name="rootPassword" placeholder="root password" ng-model="rootPassword"/>
-                </div>
-            </div>
-            <div class="form-group {{groupForm.groupName.$valid ? '' : 'has-error'}}" ng-if="operation === 'ADD'">
-                <label for="groupName" class="col-md-3 control-label">Name</label>
-                <div class="col-md-9">
-                    <input class="form-control" id="groupName" required name="groupName" placeholder="group name" ng-model="group.groupName"/>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="groupForm.$invalid || disableSaveButton" ng-click="save()">Save</button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/modal/editSubscription.html b/hermes-console/static/partials/modal/editSubscription.html
deleted file mode 100644
index d9636890ec..0000000000
--- a/hermes-console/static/partials/modal/editSubscription.html
+++ /dev/null
@@ -1,360 +0,0 @@
-<section>
-    <div class="modal-header">
-        <h3 class="modal-title" ng-show="operation === 'ADD'"><small>Create:</small> {{subscription.name}}</h3>
-        <h3 class="modal-title" ng-show="operation === 'EDIT'"><small>Edit:</small> {{subscription.name}}</h3>
-    </div>
-    <div class="modal-body">
-        <form name="subscriptionForm" class="form-horizontal" role="form">
-            <div ng-hide="!authEnabled.headers || isAuthorized" class="form-group {{subscriptionForm.rootPassword.$valid ? '' : 'has-error'}}">
-                <label for="rootPassword" class="col-md-3 control-label">Root password</label>
-                <div class="col-md-9">
-                    <input class="form-control" type="password" id="rootPassword" name="rootPassword" ng-required="!isAuthorized && authEnabled.headers" placeholder="root password" ng-model="rootPassword"/>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.subscriptionName.$valid ? '' : 'has-error'}} " ng-if="operation === 'ADD'">
-                <label for="subscriptionName" class="col-md-3 control-label">Name</label>
-                <div class="col-md-9" ng-if="operation === 'ADD'">
-                    <input class="form-control" id="subscriptionName" name="subscriptionName" ng-required="operation === 'ADD'" placeholder="name of subscription" ng-model="subscription.name" ng-pattern="/^[a-zA-Z0-9.-]+$/"/>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.subscriptionEndpoint.$valid ? '' : 'has-error'}}">
-                <label for="subscriptionEndpoint" class="col-md-3 control-label">Endpoint</label>
-                <div class="col-md-9">
-                    <input class="form-control" endpoint="" id="subscriptionEndpoint" name="subscriptionEndpoint" required placeholder="where to send messages" ng-model="subscription.endpoint"/>
-                </div>
-            </div>
-            <div class="form-group {{subscriptionForm.subscriptionDescription.$valid ? '' : 'has-error'}}">
-                <label for="subscriptionDescription" class="col-md-3 control-label">Description</label>
-                <div class="col-md-9">
-                    <input class="form-control" id="subscriptionDescription" name="subscriptionDescription" required placeholder="who and why subscribes?" ng-model="subscription.description"/>
-                </div>
-            </div>
-
-            <owner-selector form="subscriptionForm" source="subscription.owner.source" owner="subscription.owner.id"></owner-selector>
-
-            <div class="form-group">
-                <label for="subscriptionType" class="col-md-3 control-label">Content type</label>
-                <div class="col-md-9">
-                    <select required class="form-control" id="subscriptionType" name="subscriptionType" ng-model="subscription.contentType">
-                        <option value="JSON">JSON</option>
-                        <option value="AVRO" ng-disabled="subscription.deliveryType === 'BATCH'">AVRO (not supported in BATCH delivery mode)</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="form-group" ng-hide="subscription.deliveryType === 'SERIAL' && operation === 'EDIT'">
-                <label for="subscriptionType" class="col-md-3 control-label">Delivery type</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <select required class="form-control" id="deliveryType" name="deliveryType" ng-model="subscription.deliveryType">
-                            <option ng-repeat="deliveryType in config.deliveryTypes" value="{{deliveryType.value}}" ng-disabled="deliveryType.value == 'BATCH' && subscription.subscriptionType === 'AVRO'">{{deliveryType.label}}</option>
-                        </select>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Hermes can deliver messages in SERIAL (one message at a time) or in BATCH (group of messages at a time).">?</span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="mode" class="col-md-3 control-label">Mode</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <select required class="form-control" id="mode" name="mode" ng-model="subscription.mode">
-                            <option value="ANYCAST">ANYCAST</option>
-                            <option value="BROADCAST">BROADCAST (incubating feature)</option>
-                        </select>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Hermes can deliver messages in ANYCAST (to one of subscribed hosts) or in BROADCAST (to all subscribed hosts) mode.">?</span>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.subscriptionRateLimit.$valid ? '' : 'has-error'}}" ng-show="subscription.deliveryType === 'SERIAL'">
-                <label for="subscriptionRateLimit" class="col-md-3 control-label">Rate limit</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="0" max="5000" step="10" ng-required="subscription.deliveryType === 'SERIAL'" class="form-control" id="subscriptionRateLimit" name="subscriptionRateLimit" placeholder="limit of messages sent by Hermes" ng-model="subscription.subscriptionPolicy.rate"/>
-                        <span class="input-group-addon">messages/second</span>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Maximum rate defined by user (per data center). Maximum rate calculated by algorithm can be observed in 'Output rate' metric.">?</span>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.subscriptionBatchSize.$valid ? '' : 'has-error'}}" ng-show="subscription.deliveryType === 'BATCH'">
-                <label for="subscriptionBatchSize" class="col-md-3 control-label">Batch size</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="1" max="1000000" step="1" ng-required="subscription.deliveryType === 'BATCH'" class="form-control" id="subscriptionBatchSize" name="subscriptionBatchSize" placeholder="Desired number of messages in a single batch." ng-model="subscription.subscriptionPolicy.batchSize"/>
-                        <span class="input-group-addon">messages</span>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.subscriptionBatchTime.$valid ? '' : 'has-error'}}" ng-show="subscription.deliveryType === 'BATCH'">
-                <label for="subscriptionBatchTime" class="col-md-3 control-label">Batch time window</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="1" max="1000000" step="1" ng-required="subscription.deliveryType === 'BATCH'" class="form-control" id="subscriptionBatchTime" name="subscriptionBatchTime" placeholder="Max time between arrival of first message to batch delivery attempt." ng-model="subscription.subscriptionPolicy.batchTime"/>
-                        <span class="input-group-addon">milliseconds</span>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.subscriptionBatchVolume.$valid ? '' : 'has-error'}}" ng-show="subscription.deliveryType === 'BATCH'">
-                <label for="subscriptionBatchVolume" class="col-md-3 control-label">Batch volume</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="1" max="1000000" step="1" ng-required="subscription.deliveryType === 'BATCH'" class="form-control" id="subscriptionBatchVolume" name="subscriptionBatchVolume" placeholder="Desired number of bytes in single batch." ng-model="subscription.subscriptionPolicy.batchVolume"/>
-                        <span class="input-group-addon">bytes</span>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.subscriptionRequestTimeout.$valid ? '' : 'has-error'}}">
-                <label for="subscriptionRequestTimeout" class="col-md-3 control-label">Request timeout</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="0" max="{{subscription.deliveryType === 'SERIAL' ? 10000 : 1000000}}"
-                               step="1" ng-required="subscription.deliveryType === 'BATCH'" class="form-control"
-                               id="subscriptionRequestTimeout" name="subscriptionRequestTimeout"
-                               placeholder="Max time for processing message by the subscriber"
-                               ng-model="subscription.subscriptionPolicy.requestTimeout"/>
-                        <span class="input-group-addon">milliseconds</span>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Max time for processing message by the subscriber. The value is used in Hermes http client.">?</span>
-                    </div>
-                    <div class="alert alert-warning"
-                         ng-show="subscription.subscriptionPolicy.requestTimeout >= config.requestTimeoutWarningThreshold && subscription.deliveryType === 'SERIAL'">
-                        <strong>High request timeout <span class="glyphicon glyphicon-alert" /></strong>
-                        Please consider lower value to comply with the fail-fast principle.
-                        In some cases it is better to rethink the design of a subscriber rather than increase the timeout.
-                    </div>
-                </div>
-            </div>
-            <div class="form-group {{subscriptionForm.subscriptionSendingDelay.$valid ? '' : 'has-error'}}" ng-show="subscription.deliveryType === 'SERIAL'">
-                <label for="subscriptionSendingDelay" class="col-md-3 control-label">Sending delay</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="0" max="5000" step="1" ng-required="subscription.deliveryType === 'SERIAL'" class="form-control" id="subscriptionSendingDelay" name="subscriptionSendingDelay" placeholder="Delay after which an event will be send" ng-model="subscription.subscriptionPolicy.sendingDelay"/>
-                        <span class="input-group-addon">milliseconds</span>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Amount of time in ms after which an event will be send. Useful if events from two topics are sent at the same time and you want to increase chance that events from one topic will be deliver after events from other topic.">?</span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group {{subscriptionForm.subscriptionMessageTtl.$valid ? '' : 'has-error'}}">
-                <label for="subscriptionMessageTtl" class="col-md-3 control-label">Inflight message TTL</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="0" max="7200" step="1" required class="form-control" id="subscriptionMessageTtl" name="subscriptionMessageTtl" placeholder="Time when message can be resent to endpoint after failed sending attempts" ng-model="subscription.subscriptionPolicy.messageTtl"/>
-                        <span class="input-group-addon">seconds</span>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Amount of time a message can be held in sending queue and retried. If message will not be delivered during this time, it will be discarded.">?</span>
-                    </div>
-                </div>
-            </div>
-
-            <hr/>
-            <div class="form-group {{subscriptionForm.retryClientErrors.$valid ? '' : 'has-error'}}">
-                <label for="retryClientErrors" class="col-md-3 control-label">Retry on 4xx status</label>
-                <div class="col-md-9">
-                    <div class="input-group checkbox">
-                        <label>
-                            <input type="checkbox" id="retryClientErrors" name="retryClientErrors" ng-model="subscription.subscriptionPolicy.retryClientErrors"/>
-                        </label>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group {{subscriptionForm.subscriptionMessageBackoff.$valid ? '' : 'has-error'}}">
-                <label for="subscriptionMessageBackoff" class="col-md-3 control-label">Retry backoff</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="0" max="1000000" step="1" required class="form-control" id="subscriptionMessageBackoff" name="subscriptionMessageBackoff" placeholder="Delay between send attempts of failed requests" ng-model="subscription.subscriptionPolicy.messageBackoff"/>
-                        <span class="input-group-addon">milliseconds</span>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Minimum amount of time between consecutive message retries.">?</span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group {{subscriptionForm.subscriptionBackoffMultiplier.$valid ? '' : 'has-error'}}" ng-show="subscription.deliveryType === 'SERIAL'">
-                <label for="subscriptionBackoffMultiplier" class="col-md-3 control-label">Retry backoff multiplier</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="1.0" max="10.0" step="0.1" ng-required="subscription.deliveryType === 'SERIAL'" class="form-control" id="subscriptionBackoffMultiplier" name="subscriptionBackoffMultiplier" placeholder="Delay multiplier between consecutive send attempts of failed requests" ng-model="subscription.subscriptionPolicy.backoffMultiplier" ng-pattern="/^\d+(\.[0-9])?$/"/>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Rate between consecutive message retries. The value above 1 signifies proportionally longer time lapses between retries.">?</span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group {{subscriptionForm.subscriptionBackoffMaxIntervalInSec.$valid ? '' : 'has-error'}}" ng-show="subscription.deliveryType === 'SERIAL' && subscription.subscriptionPolicy.backoffMultiplier > 1">
-                <label for="subscriptionBackoffMaxIntervalInSec" class="col-md-3 control-label">Retry backoff max interval</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="1" max="600" step="1" ng-required="subscription.deliveryType === 'SERIAL' && subscription.subscriptionPolicy.backoffMultiplier > 1" class="form-control" id="subscriptionBackoffMaxIntervalInSec" name="subscriptionBackoffMaxIntervalInSec" placeholder="Maximum value of delay backoff" ng-model="subscription.subscriptionPolicy.backoffMaxIntervalInSec" ng-pattern="/^\d+$/"/>
-                        <span class="input-group-addon">seconds</span>
-                        <span class="input-group-addon helpme-addon" uib-tooltip="Maximum value of delay backoff when using exponential calculation">?</span>
-                    </div>
-                </div>
-            </div>
-            <hr/>
-
-            <div class="form-group">
-                <label for="trackingMode" class="col-md-3 control-label">Message delivery tracking mode</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <select class="form-control" id="trackingMode" name="trackingMode" ng-model="subscription.trackingMode">
-                            <option value="trackingOff">No tracking</option>
-                            <option value="discardedOnly">Track message discarding only</option>
-                            <option value="trackingAll">Track everything</option>
-                        </select>
-                    </div>
-                    <div class="alert alert-warning"
-                         ng-show="subscription.trackingMode === 'trackingAll'">
-                        <strong>Tracking all messages enabled <span class="glyphicon glyphicon-alert" /></strong>
-                        Please chose this option only when necessary. Mainly this is for debugging problems with subscription.
-                        Remember to disable this mode after the problem is solved.
-                    </div>
-                </div>
-            </div>
-
-
-            <div class="form-group">
-                <label class="col-md-3 control-label">Filter</label>
-                <div class="col-md-9">
-                    <filters-editor form="subscriptionForm"
-                                    topic-content-type="topicContentType"
-                                    filters="subscription.filters"
-                                    with-debugger="true"
-                                    topic-name="topicName"></filters-editor>
-                </div>
-            </div>
-
-            <div class="form-group" ng-show="showHeadersFilter">
-                <label class="col-md-3 control-label">HTTP header filter</label>
-                <div class="col-md-9">
-                    <http-header-filters-editor
-                        form="subscriptionForm"
-                        filters="subscription.filters"></http-header-filters-editor>
-                </div>
-            </div>
-
-            <div class="form-group" ng-show="showFixedHeaders">
-                <label class="col-md-3 control-label">Fixed HTTP headers</label>
-                <div class="col-md-9">
-                    <table class="table borderless">
-                        <tr>
-                            <th>Name</th>
-                            <th>Value</th>
-                            <th></th>
-                        </tr>
-                        <tr ng-repeat="header in subscription.headers">
-                            <td>
-                                <input ng-model="header.name"
-                                       class="form-control col-md-1" placeholder="{{header.name}}"/>
-                            </td>
-                            <td>
-                                <input ng-model="header.value"
-                                       class="form-control col-md-1" placeholder="{{header.value}}"/>
-                            </td>
-                            <td>
-                                <button class="btn btn-danger" ng-click="delHeader($index)">Delete</button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input ng-model="header.name"
-                                       class="form-control col-md-1" placeholder="Header name"/>
-                            </td>
-                            <td>
-                                <input ng-model="header.value"
-                                       class="form-control col-md-1" placeholder="Header pattern"/>
-                            </td>
-                            <td>
-                                <div class="col-md-1">
-                                    <button class="btn btn-success" ng-click="addHeader()">Add</button>
-                                </div>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <hr/>
-
-            <div class="form-group">
-                <label for="monitoringSeverity" class="col-md-3 control-label">Monitoring severity</label>
-                <div class="col-md-9">
-                    <select required class="form-control" id="monitoringSeverity" name="monitoringSeverity" ng-model="subscription.monitoringDetails.severity">
-                        <option value="NON_IMPORTANT">Non-important</option>
-                        <option value="IMPORTANT">Important</option>
-                        <option value="CRITICAL">Critical</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group {{subscriptionForm.monitoringReaction.$valid ? '' : 'has-error'}}">
-                <label for="monitoringReaction" class="col-md-3 control-label">Monitoring reaction</label>
-                <div class="col-md-9">
-                    <input class="form-control" id="monitoringReaction" name="monitoringReaction" placeholder="information for monitoring how to react when the subscription becomes unhealthy (e.g. team name or Pager Duty ID)" ng-model="subscription.monitoringDetails.reaction"/>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.http2Enabled.$valid ? '' : 'has-error'}}">
-                <label for="http2Enabled" class="col-md-3 control-label">Deliver using http/2</label>
-                <div class="col-md-9">
-                    <div class="input-group checkbox">
-                        <label>
-                            <input type="checkbox" id="http2Enabled" name="http2Enabled" ng-model="subscription.http2Enabled"/>
-                        </label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.subscriptionIdentityHeadersEnabled.$valid ? '' : 'has-error'}}">
-                <label for="subscriptionIdentityHeadersEnabled" class="col-md-3 control-label">Attach subscription identity headers</label>
-                <div class="col-md-9">
-                    <div class="input-group checkbox">
-                        <label>
-                            <input type="checkbox" id="subscriptionIdentityHeadersEnabled"
-                                   name="subscriptionIdentityHeadersEnabled"
-                                   ng-model="subscription.subscriptionIdentityHeadersEnabled"/>
-                        </label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group {{subscriptionForm.autoDeleteWithTopicEnabled.$valid ? '' : 'has-error'}}">
-                <label for="subscriptionIdentityHeadersEnabled" class="col-md-3 control-label">Delete the subscription automatically</label>
-                <div class="col-md-9">
-                    <div class="input-group checkbox">
-                        <label>
-                            <input type="checkbox" id="autoDeleteWithTopicEnabled"
-                                   name="autoDeleteWithTopicEnabled"
-                                   ng-model="subscription.autoDeleteWithTopicEnabled"/>
-                        </label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="form-group" ng-repeat="(key, entry) in endpointAddressResolverMetadataConfig">
-                <label for="{{key}}" class="col-md-3 control-label">{{entry.title}}</label>
-                <div class="col-md-9" ng-switch on="entry.type">
-                    <div ng-switch-when="boolean" class="input-group checkbox">
-                        <label>
-                            <input type="checkbox" id="{{key}}" name="{{key}}" ng-model="subscription.endpointAddressResolverMetadata[key]"/>
-                            {{entry.placeholder}}
-                        </label>
-                    </div>
-
-                    <input ng-switch-when="text" empty-to-null class="form-control" type="text" id="{{key}}" name="{{key}}" placeholder="{{entry.placeholder}}" ng-model="subscription.endpointAddressResolverMetadata[key]" />
-
-                    <div ng-switch-when="number" class="input-group">
-                        <input type="number" min="{{entry.min}}" max="{{entry.max}}" step="{{entry.step}}" class="form-control" id="{{key}}" name="{{key}}" placeholder="{{entry.placeholder}}" ng-model="subscription.endpointAddressResolverMetadata[key]"/>
-                        <span class="input-group-addon">{{entry.addon}}</span>
-                    </div>
-
-                    <select ng-switch-when="select" empty-to-null class="form-control" id="{{key}}" name="{{key}}" ng-model="subscription.endpointAddressResolverMetadata[key]">
-                        <option ng-repeat="(key, value) in entry.options" value="{{key}}">{{value}}</option>
-                    </select>
-                </div>
-            </div>
-
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="subscriptionForm.$invalid || disableSaveButton" ng-click="save()">Save</button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/modal/editTopic.html b/hermes-console/static/partials/modal/editTopic.html
deleted file mode 100644
index 9dba941c49..0000000000
--- a/hermes-console/static/partials/modal/editTopic.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<section>
-    <div class="modal-header">
-        <h3 class="modal-title" ng-show="operation === 'ADD'"><small>Create topic:</small> {{groupName}}.{{topic.shortName}}</h3>
-        <h3 class="modal-title" ng-show="operation === 'EDIT'"><small>Edit topic:</small> {{topic.name}}</h3>
-    </div>
-    <div class="modal-body">
-        <form name="topicForm" class="form-horizontal" role="form">
-            <div ng-hide="!authEnabled.headers || isAuthorized" class="form-group {{topicForm.rootPassword.$valid ? '' : 'has-error'}}">
-                <label for="rootPassword" class="col-md-3 control-label">Root password</label>
-                <div class="col-md-9">
-                    <input class="form-control" type="password" ng-required="!isAuthorized && authEnabled.headers" id="rootPassword" name="rootPassword" placeholder="root password" ng-model="rootPassword"/>
-                </div>
-            </div>
-            <div class="form-group {{topicForm.topicName.$valid ? '' : 'has-error'}}" ng-if="operation === 'ADD'">
-                <label for="topicName" class="col-md-3 control-label">Name</label>
-                <div class="col-md-9">
-                    <input class="form-control" id="topicName" required name="topicName" placeholder="name of topic, without group prefix" ng-model="topic.shortName" ng-pattern="/^[a-zA-Z0-9_]+$/"/>
-                </div>
-            </div>
-            <div class="form-group {{topicForm.topicDescription.$valid ? '' : 'has-error'}}">
-                <label for="topicDescription" class="col-md-3 control-label">Description</label>
-                <div class="col-md-9">
-                    <input class="form-control" required id="topicDescription" name="topicDescription" placeholder="what type of messages you publish?" ng-model="topic.description"/>
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="topicLabels" class="col-md-3 control-label">Labels</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <select id="topicLabels" class="form-control" ng-model="topic.labelValues" multiple="true">
-                            <option ng-repeat="label in config.allowedTopicLabels" value="{{label}}">{{label}}</option>
-                        </select>
-                        <span class="input-group-addon helpme-addon" uib-tooltip='Topic labels. Multiple values can be selected'>?</span>
-                    </div>
-                </div>
-            </div>
-
-            <owner-selector form="topicForm" source="topic.owner.source" owner="topic.owner.id"></owner-selector>
-
-            <div class="ng-hide" ng-show="config.authEnabled">
-                <hr />
-                <div class="form-group">
-                    <label for="topicAuthEnabled" class="col-md-3 control-label">Authorisation enabled</label>
-                    <div class="col-md-9">
-                        <input type="checkbox" id="topicAuthEnabled" name="topicAuthEnabled" ng-model="topic.auth.enabled" />
-                    </div>
-                </div>
-
-                <div class="form-group {{topicForm.topicPublishers.$valid ? '' : 'has-error'}}">
-                    <label for="topicPublishers" class="col-md-3 control-label">Authorised publishers</label>
-                    <div class="col-md-9">
-                        <input ng-model="topic.auth.publishers" ng-list=", " class="form-control" ng-required="topic.auth.enabled" id="topicPublishers" name="topicPublishers" placeholder="who is allowed to publish on this topic? (comma separated)"/>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label for="topicUnauthenticatedAccessEnabled" class="col-md-3 control-label">Allow unauthenticated access</label>
-                    <div class="col-md-9">
-                        <input type="checkbox" id="topicUnauthenticatedAccessEnabled" name="topicUnauthenticatedAccessEnabled" ng-model="topic.auth.unauthenticatedAccessEnabled"/>
-                    </div>
-                </div>
-                <hr />
-            </div>
-
-            <div class="form-group">
-                <label for="topicSubscribingRestricted" class="col-md-3 control-label">Restrict subscribing</label>
-                <div class="col-md-9">
-                    <input type="checkbox" id="topicSubscribingRestricted" name="topicSubscribingRestricted" ng-model="topic.subscribingRestricted"/>
-                </div>
-            </div>
-            <hr />
-            <div class="form-group">
-                <label for="retentionUnit" class="col-md-3 control-label">Retention unit</label>
-                <div class="col-md-9">
-                    <select id="retentionUnit" class="form-control" ng-model="topic.retentionTime.retentionUnit">
-                        <option ng-repeat="retentionUnit in config.retentionUnits" value="{{retentionUnit.value}}">{{retentionUnit.label}}</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group {{topicForm.topicRetention.$valid ? '' : 'has-error'}}">
-                <label for="topicRetention" class="col-md-3 control-label">Retention time</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" min="0" max="7" required class="form-control" id="topicRetention" name="topicRetention" ng-model="topic.retentionTime.duration" placeholder="how long should we keep them for subscribers?"/>
-                        <span class="input-group-addon" ng-bind="topic.retentionTime.retentionUnit | toLowercase"></span>
-                        <span class="input-group-addon helpme-addon" uib-tooltip='For how many hours/days message is available for subscribers after being published.'>?</span>
-                    </div>
-                </div>
-            </div>
-            <hr />
-            <div class="form-group">
-                <label for="topicAck" class="col-md-3 control-label">Kafka ACK Level</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <select id="topicAck" class="form-control" ng-model="topic.ack">
-                            <option>LEADER</option>
-                            <option>ALL</option>
-                        </select>
-                        <span class="input-group-addon helpme-addon" uib-tooltip='Specifies the strength of guarantees that acknowledged message was indeed persisted. In "Leader" mode ACK is required only from topic leader, which is fast and gives 99.99999% guarantee. It might be not enough when cluster is unstable. "All" mode means message needs to be saved on all replicas before sending ACK, which is quite slow but gives 100% guarantee that message has been persisted.'>?</span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="trackingEnabled" class="col-md-3 control-label">Tracking enabled</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="checkbox" id="trackingEnabled" name="trackingEnabled" ng-model="topic.trackingEnabled"/>
-                    </div>
-                    <div class="alert alert-warning"
-                         ng-show="topic.trackingEnabled">
-                        <strong>Tracking all messages enabled <span class="glyphicon glyphicon-alert" /></strong>
-                        Please chose this option only when necessary. Mainly this is for debugging problems with topic.
-                        Remember to disable it after the problem is solved.
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="topicType" class="col-md-3 control-label">Content type</label>
-                <div class="col-md-9">
-                    <select id="topicType" class="form-control" ng-disabled="operation === 'EDIT'" ng-model="topic.contentType">
-                        <option ng-repeat="contentType in config.contentTypes" value="{{contentType.value}}">{{contentType.label}}</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group {{topicForm.topicMaxMessageSize.$valid ? '' : 'has-error'}}">
-                <label for="topicMaxMessageSize" class="col-md-3 control-label">Max message size</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" required class="form-control" id="topicMaxMessageSize" name="topicMaxMessageSize" ng-model="topic.maxMessageSize" placeholder="what is the message size limit for this topic?"/>
-                        <span class="input-group-addon">bytes</span>
-                    </div>
-                </div>
-            </div>
-
-            <hr />
-            <div class="form-group {{topicForm.topicStoreOffline.$valid ? '' : 'has-error'}}">
-                <label for="topicStoreOffline" class="col-md-3 control-label">Store offline</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <select id="topicStoreOffline" name="topicStoreOffline" ng-model="topic.offlineStorage.enabled" class="form-control"
-                            ng-options="(item ? 'yes':'no') for item in [true, false]"
-                            required unknown-value-required/>
-                        <span class="input-group-addon helpme-addon" uib-tooltip='Should data from this topic be stored in offline storage (e.g. HDFS).'>?</span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group {{topicForm.topicOfflineRetention.$valid ? '' : 'has-error'}}" ng-show="topic.offlineStorage.enabled && !topic.offlineStorage.retentionTime.infinite">
-                <label for="topicOfflineRetention" class="col-md-3 control-label">Offline retention time</label>
-                <div class="col-md-9">
-                    <div class="input-group">
-                        <input type="number" ng-min="topic.offlineStorage.enabled && !topic.offlineStorage.retentionTime.infinite ? 1 : false"
-                               ng-required="topic.offlineStorage.enabled && !topic.offlineStorage.retentionTime.infinite" class="form-control"
-                               id="topicOfflineRetention" name="topicOfflineRetention" ng-model="topic.offlineStorage.retentionTime.duration"
-                               placeholder="how long should it be stored in offline storage?"/>
-                        <span class="input-group-addon">days</span>
-                        <span class="input-group-addon helpme-addon" uib-tooltip='When publishing personal data on a topic, remember to correctly indicate fields with personal data in the Avro schema.'>?</span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group" ng-show="topic.offlineStorage.enabled">
-                <label for="topicOfflineRetentionInfinity" class="col-md-3 control-label">Keep forever</label>
-                <div class="col-md-9">
-                    <input type="checkbox" id="topicOfflineRetentionInfinity" name="topicOfflineRetentionInfinity" ng-model="topic.offlineStorage.retentionTime.infinite"/>
-                </div>
-            </div>
-
-            <hr />
-            <div class="form-group {{topicForm.messageSchema.$valid ? '' : 'has-error'}}" ng-show="topic.contentType === 'AVRO'">
-                <label for="messageSchema" class="col-md-3 control-label">
-                    <a href="http://hermes-pubsub.rtfd.org/en/latest/user/publishing-avro/" target="_blank">AVRO schema</a>
-                </label>
-                <div class="col-md-9">
-                    <div class="alert alert-info" ng-hide="config.avroContentTypeMetadataRequired === false">
-                        Schema definition <b>must contain</b> an additional field for Hermes internal use:<br>
-                        <pre>
-{
-    "name": "__metadata", "default": null,
-    "type": ["null", {"type": "map", "values": "string"}],
-    "doc": "Field used in Hermes internals to propagate metadata"
-}
-                        </pre>
-                    </div>
-                    <div class="form-control ace_editor_schema" id="messageSchema" ng-required="topic.contentType === 'AVRO'"
-                         name="message" ng-model="messageSchema"
-                         ui-ace="{
-                            require: ['ace/ext/language_tools'],
-                            advanced: {
-                                enableBasicAutocompletion: true,
-                                enableLiveAutocompletion: true
-                            },
-                            useWrapMode : true,
-                            theme:'chrome',
-                            mode: 'json'}">
-                    </div>
-                    <button class="btn btn-info pull-right margin-top-10" ng-click="beautifyText()">Beautify</button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="topicForm.$invalid || disableSaveButton" ng-click="save()">Save</button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/modal/messagePreview.html b/hermes-console/static/partials/modal/messagePreview.html
deleted file mode 100644
index 8fdd5a46a8..0000000000
--- a/hermes-console/static/partials/modal/messagePreview.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<section>
-    <div class="modal-header">
-        <h3 class="modal-title">Message preview</h3>
-    </div>
-    <div class="modal-body">
-
-        <div class="panel-body">
-
-            <p><strong>Topic</strong> {{topicName}}</p>
-            <p><strong>Message Id:</strong> {{previewedMessage.__metadata.messageId}}</p>
-            <p><strong>Message timestamp:</strong> {{previewedMessage.__metadata.timestamp | date:'yyyy-MM-dd HH:mm:ss'}}</p>
-            <p><strong>Partition:</strong> {{partition}}</p>
-            <p><strong>Offset:</strong> {{offset}}</p>
-
-            <p>
-                <strong>Message:</strong>
-                        <pre class="pre-scrollable">
-{{previewedMessage}}
-                        </pre>
-            </p>
-
-            <div class="modal-footer">
-                <button class="btn btn-warning" ng-click="$dismiss()">Close</button>
-            </div>
-        </div>
-    </div>
-</section>
\ No newline at end of file
diff --git a/hermes-console/static/partials/modal/offlineRetransmission.html b/hermes-console/static/partials/modal/offlineRetransmission.html
deleted file mode 100644
index 102cf91f24..0000000000
--- a/hermes-console/static/partials/modal/offlineRetransmission.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<section>
-    <div class="modal-header">
-        {{retransmissionDescription}}
-    </div>
-    <div class="modal-body">
-        <form name="retransmissionForm" class="form-horizontal" role="form">
-            <div class="form-group row {{retransmissionForm.targetTopic.$valid ? '' : 'has-error'}}">
-                <label for="targetTopic" class="control-label col-md-3 pull-left">Target topic</label>
-                <div class="input-group col-md-8 pull-left">
-                    <input class="form-control" id="targetTopic" required name="targetTopic"
-                           placeholder="target.topic.full.name" ng-model="retransmissionRequest.targetTopic"/>
-                </div>
-            </div>
-            <div class="form-group row {{retransmissionForm.startTimestamp.$valid ? '' : 'has-error'}}">
-                <label for="startTimestamp" class="control-label col-md-3 pull-left">Start timestamp</label>
-                <div class="input-group date col-md-8 pull-left">
-                    <input type="text" class="form-control" required ng-model="retransmissionRequest.startTimestamp"
-                           placeholder="start..." id="startTimestamp" name="startTimestamp" calendar
-                           days-back="calendarDaysBack"/>
-                    <span class="input-group-addon">
-                        <span class="glyphicon glyphicon-time"></span>
-                    </span>
-                </div>
-            </div>
-            <div class="form-group row {{retransmissionForm.endTimestamp.$valid ? '' : 'has-error'}}">
-                <label for="endTimestamp" class="control-label col-md-3 pull-left">End timestamp</label>
-                <div class="input-group date col-md-8 pull-left">
-                    <input type="text" class="form-control" required ng-model="retransmissionRequest.endTimestamp"
-                           placeholder="end..." id="endTimestamp" name="endTimestamp" calendar
-                           days-back="calendarDaysBack"/>
-                    <span class="input-group-addon">
-                        <span class="glyphicon glyphicon-time"></span>
-                    </span>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="retransmissionForm.$invalid" ng-click="createTask()">
-            Retransmit
-        </button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/modal/removeConstraints.html b/hermes-console/static/partials/modal/removeConstraints.html
deleted file mode 100644
index 02a9af2bdf..0000000000
--- a/hermes-console/static/partials/modal/removeConstraints.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<section>
-    <div class="modal-header">
-        <h3 class="modal-title">
-            <small>Are you sure you want to remove constraints for {{constraintsType}}:</small> {{constraintsName}} <small>?</small>
-        </h3>
-    </div>
-    <div class="modal-footer">
-        <button class="btn btn-primary" ng-click="remove()">Remove</button>
-        <button class="btn btn-warning" ng-click="$dismiss()">Cancel</button>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/ownerName.html b/hermes-console/static/partials/ownerName.html
deleted file mode 100644
index 13bae1b364..0000000000
--- a/hermes-console/static/partials/ownerName.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<a ng-if="!url" style="pointer-events: none; cursor: default; color: inherit">{{name}}</a>
-<a ng-if="url" ng-href="{{url}}">{{name}}</a>
diff --git a/hermes-console/static/partials/ownerSelector.html b/hermes-console/static/partials/ownerSelector.html
deleted file mode 100644
index 535c8c7e29..0000000000
--- a/hermes-console/static/partials/ownerSelector.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="form-group">
-    <label for="sourceSelect" class="col-md-3 control-label">Owner source</label>
-    <div class="col-md-9">
-        <select required class="form-control" id="sourceSelect" name="sourceSelect"
-                ng-model="sourceSelectModel" ng-options="s.name for s in possibleSources"
-                ng-change="onSourceChanged()"></select>
-    </div>
-</div>
-<div class="form-group {{form.owner.$valid ? '' : 'has-error'}}">
-    <label ng-if="sourceSelectModel.autocomplete" for="ownerWithAutocomplete" class="col-md-3 control-label">Owner</label>
-    <label ng-if="!sourceSelectModel.autocomplete" for="ownerWithoutAutocomplete" class="col-md-3 control-label">Owner</label>
-    <div class="col-md-9">
-        <input required ng-if="sourceSelectModel.autocomplete" class="form-control" id="ownerWithAutocomplete" name="owner"
-               uib-typeahead="owner as owner.name for owner in owners($viewValue)" typeahead-min-length="1" typeahead-wait-ms="500"
-               placeholder="{{placeholder()}}" ng-model="$parent.ownerInputModel" autocomplete="off" editable="false" typeahead-editable="false" />
-        <input required ng-if="!sourceSelectModel.autocomplete" class="form-control" id="ownerWithoutAutocomplete" name="owner"
-               placeholder="{{placeholder()}}" ng-model="$parent.ownerInputModel" />
-    </div>
-</div>
diff --git a/hermes-console/static/partials/readiness.html b/hermes-console/static/partials/readiness.html
deleted file mode 100644
index edadb59d8d..0000000000
--- a/hermes-console/static/partials/readiness.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<section ng-controller="ReadinessController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li class="active">readiness</li>
-    </ol>
-
-    <div class="alert alert-danger" role="alert" ng-if="error">
-        Error during setting datacenter readiness:<br>
-        {{error}}
-    </div>
-
-    <h1>Datacenter readiness</h1>
-    <div class="container">
-        <div class="row">
-            <div class="col-md-5">
-                <table class="table">
-                    <tr>
-                        <th>#</th>
-                        <th>Datacenter</th>
-                        <th></th>
-                    </tr>
-                    <tr ng-repeat="item in datacenters">
-                        <td>{{$index + 1}}</td>
-                        <td>{{item.datacenter}}</td>
-                        <td>
-                            <button class="btn btn-danger" ng-if="item.status === 'READY'" ng-click="openModal(item)">Turn off</button>
-                            <button class="btn btn-success" ng-if="item.status === 'NOT_READY'" ng-click="openModal(item)">Turn on</button>
-                            <div class="alert alert-warning" ng-if="item.status === 'UNDEFINED'">Cannot obtain readiness status</div>
-                        </td>
-                    </tr>
-
-                </table>
-            </div>
-        </div>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/search.html b/hermes-console/static/partials/search.html
deleted file mode 100644
index ab6d576558..0000000000
--- a/hermes-console/static/partials/search.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<section ng-controller="SearchController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li class="active">search</li>
-    </ol>
-    <div class="row" style="margin: 2rem;">
-    <h1>Search</h1>
-    </div>
-
-    <div class="row" style="margin: 2rem;">
-        <form name="searchForm" class="form col-md-10 col-md-offset-1">
-            <div class="row">
-             <div class="col-md-2 padding-lr-2">
-                <div class="form-group">
-                    <select class="form-control" ng-model="entity">
-                        <option value="topic">topics</option>
-                        <option value="subscription">subscriptions</option>
-                    </select>
-                </div>
-             </div>
-
-            <div class="col-md-2 padding-lr-2">
-                <div class="form-group">
-                    <select class="form-control" ng-model="property">
-                        <option value="name">by name</option>
-                        <option value="owner.id">by owner</option>
-                        <option value="endpoint">by endpoint</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="col-md-6 padding-lr-2">
-                <div class="form-group {{searchForm.pattern.$valid ? '' : 'has-error'}}">
-                    <input name="pattern" id="pattern" class="form-control" placeholder="regex pattern"
-                        ng-model="pattern" required />
-                </div>
-            </div>
-            <div class="col-md-2 padding-lr-2">
-                <button type="submit" class="btn btn-primary" ng-disabled="searchForm.$invalid" ng-click="search()"><i
-                        class="fa fa-search"></i></button>
-            </div>
-        </div>
-        </div>
-    </div>
-
-    <div class="row" style="margin: 2rem;">
-        <div class="list-group">
-            <a ng-href="{{item.url}}" class="list-group-item" ng-repeat="item in items">
-                <div class="pull-right">
-                    <span class="glyphicon glyphicon-chevron-right"></span>
-                </div>
-
-                <h4 class="list-group-item-heading">
-                    {{item.name}}
-                </h4>
-
-                <p class="list-group-item-text" style="margin-top: 1em;">
-                    <span class="" ng-repeat="object in item.data">
-                        <strong>{{object.label}}:</strong> {{object.value}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    </span>
-                </p>
-            </a>
-        </div>
-
-        <div ng-show="state.noResults" class="text-center">
-            No items found
-        </div>
-
-        <div ng-show="state.notSearched" class="text-center">
-            Search for something
-        </div>
-
-        <div ng-show="fetching" class="text-center">
-            <h1><i class="fa fa-circle-o-notch fa-spin"></i></h1>
-        </div>
-    </div>
-</section>
diff --git a/hermes-console/static/partials/stats.html b/hermes-console/static/partials/stats.html
deleted file mode 100644
index a48d5e6b03..0000000000
--- a/hermes-console/static/partials/stats.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<section ng-controller="StatsController">
-
-    <h1>Statistics</h1>
-
-    <h2>Topics</h2>
-    <div class="row stats">
-        <div class="col-md-3">
-            <h4>Total</h4>
-            <h3>{{topics.total}}</h3>
-        </div>
-
-        <div class="col-md-3">
-            <h4>Ack ALL</h4>
-            <h3>{{topics.ackAll.count}} ({{topics.ackAll.ratio | number:1}}%)</h3>
-        </div>
-
-        <div class="col-md-3">
-            <h4>Tracking enabled</h4>
-            <h3>{{topics.tracked.count}} ({{topics.tracked.ratio | number:1}}%)</h3>
-        </div>
-
-        <div class="col-md-3">
-            <h4>Avro</h4>
-            <h3>{{topics.avro.count}} ({{topics.avro.ratio | number:1}}%)</h3>
-        </div>
-    </div>
-
-    <h2>Subscriptions</h2>
-    <div class="row stats">
-
-        <div class="col-md-3">
-            <div class="tile">
-                <h4>Total</h4>
-                <h3>{{subscriptions.total}}</h3>
-            </div>
-        </div>
-
-        <div class="col-md-3">
-            <h4>Tracking enabled</h4>
-            <h3>{{subscriptions.tracked.count}} ({{subscriptions.tracked.ratio | number:1}}%)</h3>
-        </div>
-
-        <div class="col-md-3">
-            <h4>Avro</h4>
-            <h3>{{subscriptions.avro.count}} ({{subscriptions.avro.ratio | number:1}}%)</h3>
-        </div>
-    </div>
-
-</section>
diff --git a/hermes-console/static/partials/subscription.html b/hermes-console/static/partials/subscription.html
deleted file mode 100644
index 0f20569782..0000000000
--- a/hermes-console/static/partials/subscription.html
+++ /dev/null
@@ -1,450 +0,0 @@
-<section ng-controller="SubscriptionController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li><a href="#/groups">groups</a></li>
-        <li><a ng-href="#/groups/{{groupName}}">{{groupName}}</a></li>
-        <li><a ng-href="#/groups/{{groupName}}/topics/{{topicName}}">{{topicName}}</a></li>
-        <li class="active">{{subscriptionName}}</li>
-    </ol>
-
-    <div class="pull-right">
-        <span ng-show="!userHasSufficientPrivileges" uib-popover='Sign in to edit the subscription' popover-trigger="mouseenter" class="fa helpme">&#xf128;</span>
-        <button ng-show="subscription.state === 'ACTIVE'" class="btn btn-warning" ng-disabled="userWithoutAccess" ng-click="suspend()">Suspend</button>
-        <button ng-show="subscription.state === 'SUSPENDED'" class="btn btn-success" ng-disabled="userWithoutAccess" ng-click="activate()">Activate</button>
-        <button class="btn btn-primary" ng-disabled="userWithoutAccess" ng-click="edit(subscription)">Edit</button>
-        <button class="btn btn-primary" ng-disabled="userWithoutAccess" ng-click="clone()">Clone</button>
-        <button class="btn btn-danger" ng-disabled="userWithoutAccess || disableRemoveButton" ng-click="remove()">Remove</button>
-    </div>
-
-    <h2><small>Subscription:</small> {{subscription.name}}</h2>
-    <h3><small>Endpoint:</small> {{subscription.endpoint}}</h3>
-    <h3><small>Owner ({{subscription.owner.source}}):</small> <owner-name owner="subscription.owner"/></h3>
-    <p class="lead">{{subscription.description}}</p>
-
-    <div class="row text-center">
-        <div class="col-md-12">
-            <p class="alert {{subscription.state === 'ACTIVE' ? 'alert-success' : 'alert-danger'}}">
-                {{subscription.state}}
-            </p>
-        </div>
-    </div>
-
-    <div class="row" ng-show="health.status === 'UNHEALTHY'">
-        <div class="col-md-12">
-            <div class="panel panel-danger">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Subscription health problems</h3>
-                </div>
-                <div class="panel-body">
-                    <p ng-show="health.problems.lagging">
-                        <b>Subscription lag is growing</b>. Examine output rate and service response codes, looks like it is
-                        not consuming at full speed.
-                    </p>
-                    <p ng-show="health.problems.malfunctioning">
-                        <b>Consuming service returns a lot of 5xx codes</b>. Looks like it might be malfunctioning or doesn't know
-                        how to handle messages. Take a look at "Last undelivered message" for more information.
-                    </p>
-                    <p ng-show="health.problems.receivingMalformedMessages">
-                        <b>Consuming service returns a lot of 4xx codes</b>. Maybe you are receiving some malformed messages?
-                        If this is normal behavior, switch <b>Retry on 4xx status</b> flag to false. This way Hermes will
-                        not try to resend malformed messages, reducing traffic.
-                    </p>
-                    <p ng-show="health.problems.timingOut">
-                        <b>Consuming service times out a lot</b>. Hermes times out after 1 second, if you are not able to process
-                        message during this time, connection is reset and delivery fails.
-                    </p>
-                    <p ng-show="health.problems.unreachable">
-                        <b>Unable to connect to consuming service instances</b>. It is either network issue or your service instance
-                        is down.
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-6">
-            <div class="panel panel-info">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Subscription metrics</h3>
-                </div>
-                <div class="panel-body">
-                    <p><strong><a ng-href="{{metricsUrls.rate}}">Delivery rate:</a></strong> {{metrics.rate | number:2}}</p>
-                    <p>
-                        <strong><a ng-href="{{metricsUrls.latency}}">Subscriber latency</a></strong>
-                        <span uib-popover='Latency of acknowledging messages by subscribing service as measured by Hermes.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p><strong><a ng-href="{{metricsUrls.delivered}}">Delivered:</a></strong> {{metrics.delivered}}</p>
-                    <p><strong><a ng-href="{{metricsUrls.discarded}}">Discarded:</a></strong> {{metrics.discarded}}</p>
-                    <p>
-                        <strong><a ng-href="{{metricsUrls.lag}}">Lag:</a></strong> {{metrics.lag}}
-                        <span uib-popover='Total number of events waiting to be delivered. Each subscription has a "natural" lag, which depends on production rate.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong><a ng-href="{{metricsUrls.outputRate}}">Output rate</a></strong>
-                        <span uib-popover='Maximum sending rate calculated based on receiving service performance. For well-performing service output rate should be equal to rate limit.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                </div>
-            </div>
-            <div class="panel panel-info">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Service response metrics</h3>
-                </div>
-                <div class="panel-body">
-                    <p><strong><a ng-href="{{metricsUrls['2xx']}}">2xx</a></strong></p>
-                    <p><strong><a ng-href="{{metricsUrls['4xx']}}">4xx</a></strong></p>
-                    <p><strong><a ng-href="{{metricsUrls['5xx']}}">5xx</a></strong></p>
-                    <p><strong><a ng-href="{{metricsUrls.timeouts}}">Network timeouts</a></strong></p>
-                    <p><strong><a ng-href="{{metricsUrls.networkErrors}}">Other network errors</a></strong></p>
-                </div>
-            </div>
-
-            <div class="panel panel-info" ng-if="costs.enabled">
-                <div class="panel-heading">
-                    <div class="pull-right">
-                        <button class="btn btn-primary btn-xs" ng-click="goToCostDetails()">Go to details</button>
-                    </div>
-                    <h3 class="panel-title">Costs</h3>
-                </div>
-                <div class="panel-body">
-                    <iframe height="100%" width="100%" style="border: none;" ng-src="{{costs.iframeUrl}}"></iframe>
-                </div>
-            </div>
-
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Manage subscription messages</h3>
-                </div>
-                <ul class="list-group">
-                    <li class="list-group-item">
-                        <p>
-                            <strong>Retransmit messages from the past:</strong>
-                            <span uib-popover='This action re-send all messages starting the date chosen in datepicker.'
-                                  popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                        </p>
-                        <form class="form-inline">
-                            <div class="form-group">
-
-                                <div class="input-group date" id="retransmitFromDate" calendar days-back="daysBack">
-                                    <input type="text" class="form-control" style="width: 250px"
-                                           placeholder="since..."
-                                           ng-disabled="disabled || subscription.state !== 'ACTIVE'"/>
-                                    <span class="input-group-addon"
-                                          ng-disabled="disabled || subscription.state !== 'ACTIVE'">
-                                        <span class="glyphicon glyphicon-time"></span>
-                                    </span>
-                                </div>
-                                <button class="btn btn-danger" ng-click="retransmit()"
-                                        ng-disabled="userWithoutAccess || subscription.state !== 'ACTIVE'"></span>
-                                    Retransmit
-                                </button>
-                                <span class="loading-in-panel" ng-show="retransmissionLoading">
-                                    <i class=" fa fa-circle-o-notch fa-spin fa-2x"></i>
-                                </span>
-                            </div>
-                        </form>
-                    </li>
-                    <li class="list-group-item">
-                        <p>
-                            <strong>Skip all messages:</strong>
-                            <span uib-popover="This action skips all messages from the past (messages from the past won't be send to subscription endpoint)."
-                                  popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                        </p>
-                        <form class="form-inline">
-                            <div class="form-group">
-                                <button class="btn btn-danger" ng-click="skipMessages()"
-                                        ng-disabled="userWithoutAccess || subscription.state !== 'ACTIVE'"></span>
-                                    Skip messages
-                                </button>
-                                <span class="loading-in-panel" ng-show="skipMessagesLoading">
-                                    <i class=" fa fa-circle-o-notch fa-spin fa-2x"></i>
-                                </span>
-                            </div>
-                        </form>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="col-md-6">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Properties</h3>
-                </div>
-                <div class="panel-body">
-                    <p>
-                        <strong>Content type:</strong> {{subscription.contentType}}
-                    </p>
-                    <p>
-                        <strong>Delivery type:</strong> {{subscription.deliveryType}}
-                        <span uib-popover='Hermes can deliver messages in SERIAL (one message at a time) or in BATCH (group of messages at a time).' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Mode:</strong> {{subscription.mode}}
-                        <span uib-popover='Hermes can deliver messages in ANYCAST (to one of subscribed hosts) or in BROADCAST (to all subscribed hosts) mode.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="subscription.deliveryType === 'SERIAL'">
-                        <strong>Rate limit:</strong> {{subscription.subscriptionPolicy.rate}}
-                        <span uib-popover='Maximum rate defined by user (per data center). Maximum rate calculated by algorithm can be observed in "Output rate" metric.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="subscription.deliveryType === 'BATCH'">
-                        <strong>Batch size:</strong> {{subscription.subscriptionPolicy.batchSize}} messages
-                        <span uib-popover='Desired number of messages in a single batch.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="subscription.deliveryType === 'BATCH'">
-                        <strong>Batch time window:</strong> {{subscription.subscriptionPolicy.batchTime}} milliseconds
-                        <span uib-popover='Max time between arrival of first message to batch delivery attempt.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="subscription.deliveryType === 'BATCH'">
-                        <strong>Batch volume:</strong> {{subscription.subscriptionPolicy.batchVolume}} bytes
-                        <span uib-popover='Desired number of bytes in single batch.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="subscription.deliveryType === 'BATCH'">
-                        <strong>Request timeout:</strong> {{subscription.subscriptionPolicy.requestTimeout}} milliseconds
-                        <span uib-popover='Max time for processing message by subscriber.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="subscription.deliveryType === 'SERIAL'">
-                        <strong>Sending delay:</strong> {{subscription.subscriptionPolicy.sendingDelay}} milliseconds
-                        <span uib-popover='Amount of time in ms after which an event will be send. Useful if events from two topics are sent at the same time and you want to increase chance that events from one topic will be deliver after events from other topic.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Message TTL:</strong> {{subscription.subscriptionPolicy.messageTtl}} seconds
-                        <span uib-popover='Amount of time a message can be held in sending queue and retried. If message will not be delivered during this time, it will be discarded.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Request timeout:</strong> {{subscription.subscriptionPolicy.requestTimeout}} milliseconds
-                        <span uib-popover='Http client request timeout in milliseconds.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p><strong>Message delivery tracking:</strong> {{ trackingModeName[subscription.trackingMode] }}</p>
-                    <hr/>
-                    <p>
-                        <strong>Retry on 4xx status:</strong> {{subscription.subscriptionPolicy.retryClientErrors}}
-                        <span uib-popover='If false, message will not be retried when service responds with 4xx status (i.e. Bad Request).' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Retry backoff:</strong> {{subscription.subscriptionPolicy.messageBackoff}} milliseconds
-                        <span uib-popover='Minimum amount of time between consecutive message retries.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="subscription.deliveryType === 'SERIAL'">
-                        <strong>Retry backoff multiplier:</strong> {{subscription.subscriptionPolicy.backoffMultiplier}}
-                        <span uib-popover='Delay multiplier between consecutive send attempts of failed requests' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="subscription.deliveryType === 'SERIAL' && subscription.subscriptionPolicy.backoffMultiplier > 1">
-                        <strong>Retry backoff max interval:</strong> {{subscription.subscriptionPolicy.backoffMaxIntervalInSec}} seconds
-                        <span uib-popover='Maximum value of delay backoff when using exponential calculation' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <hr/>
-                    <p>
-                        <strong>Monitoring severity:</strong> {{subscription.monitoringDetails.severity}}
-                        <span uib-popover="How important should be the subscription's health for the monitoring." popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Monitoring reaction:</strong> {{subscription.monitoringDetails.reaction}}
-                        <span uib-popover='Information for monitoring how to react when the subscription becomes unhealthy (e.g. team name or Pager Duty ID).' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Deliver using http/2:</strong> {{subscription.http2Enabled}}
-                        <span uib-popover='If true Hermes will deliver messages using http/2 protocol.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Attach subscription identity headers:</strong> {{subscription.subscriptionIdentityHeadersEnabled}}
-                        <span uib-popover='If true Hermes will attach HTTP headers with subscription identity.'
-                              popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Automatically remove:</strong> {{subscription.autoDeleteWithTopicEnabled}}
-                        <span uib-popover='When the associated topic is deleted, Hermes will delete the subscription automatically.'
-                              popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-repeat="(key, entry) in endpointAddressResolverMetadataConfig">
-                        <strong>{{entry.title}}:</strong>
-                        {{entry.options[subscription.endpointAddressResolverMetadata[key]] || subscription.endpointAddressResolverMetadata[key]}}
-                        <span ng-show="entry.hint" uib-popover="{{entry.hint}}" popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-repeat="(key, value) in notSupportedEndpointAddressResolverMetadataEntries(subscription.endpointAddressResolverMetadata)">
-                        <strong>{{key}}:</strong> {{value}}
-                    </p>
-
-                    <hr/>
-                    <p ng-show="subscription.createdAt">
-                        <strong>Creation date:</strong> {{subscription.createdAt | date:'yyyy-MM-dd HH:mm:ss'}}
-                    </p>
-                    <p ng-show="subscription.modifiedAt">
-                        <strong>Modification date:</strong> {{subscription.modifiedAt | date:'yyyy-MM-dd HH:mm:ss'}}
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div ng-show="userHasSufficientPrivileges" class="row">
-        <div class="col-md-6" ng-show="lastUndelivered.message">
-            <div class="panel panel-warning">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Last undelivered message</h3>
-                </div>
-                <div class="panel-body">
-                    <p><strong>Time:</strong> {{lastUndelivered.timestamp | date:'yyyy-MM-dd HH:mm:ss'}}</p>
-                    <p><strong>Reason:</strong> {{lastUndelivered.reason}}</p>
-                    <p>
-                        <strong>Message:</strong>
-                    <pre class="pre-scrollable">{{lastUndelivered.message}}
-                        </pre>
-                    </p>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-6" ng-show="subscription.trackingEnabled">
-            <div class="panel panel-info">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Show event trace</h3>
-                </div>
-                <div class="panel-body">
-                    <form class="form-inline">
-                        <div class="form-group">
-                            <input class="form-control" style="width: 350px" type="input" id="eventId" name="eventId" placeholder="event id: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" ng-model="eventId"/>
-                            <button class="btn btn-primary" ng-click="showTrace()"><span class="glyphicon glyphicon-search" aria-hidden="true"></span></button>
-                        </div>
-                    </form>
-
-                    <h5>&nbsp;</h5>
-
-                    <table class="table" ng-show="eventTrace.length > 0">
-                        <th>Phase</th>
-                        <th>Time</th>
-                        <th>Status</th>
-                        <tbody>
-                            <tr ng-repeat="trace in eventTrace">
-                                <td>{{trace.subscription ? 'SENDING' : 'RECEIVING'}}</td>
-                                <td>{{trace.timestamp | date:'yyyy-MM-dd HH:mm:ss.sss'}}</td>
-                                <td>{{trace.status}} {{trace.status != 'SUCCESS' ? trace.reason : ''}}</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <p ng-show="eventTrace.length == 0 && eventId">No matches found - is the id correct? Remember we keep traces for 14 days.</p>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="row" ng-show="subscription.filters.length > 0">
-
-        <div class="col-md-12" ng-show="subscription.filters">
-
-            <div class="panel panel-default">
-
-                <div class="panel-heading">
-                    <div class="btn-group pull-right">
-                        <button class="btn btn-success btn-xs" ng-click="debugFilters()">
-                            <span class="glyphicon glyphicon-console"></span> Debug
-                        </button>
-                    </div>
-                    <h3 class="panel-title">Subscription message filters</h3>
-                </div>
-
-                <table class="table">
-                    <tr>
-                        <th>#</th>
-                        <th>Type</th>
-                        <th ng-show="showHeadersFilter">Path or Header name</th>
-                        <th ng-show="!showHeadersFilter">Path</th>
-                        <th>Matcher</th>
-                        <th>Matching strategy</th>
-                        <th> </th>
-                    </tr>
-
-                    <tr ng-repeat="filter in subscription.filters">
-                        <td>{{$index + 1}}</td>
-                        <td>{{filter.type}}</td>
-                        <td>{{filter.path}}{{filter.header}}</td>
-                        <td>{{filter.matcher}}</td>
-                        <td>{{filter.matchingStrategy}}</td>
-                    </tr>
-
-                </table>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="row" ng-show="subscription.headers.length > 0">
-        <div class="col-md-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Fixed HTTP headers</h3>
-                </div>
-                <table class="table">
-                    <tr>
-                        <th>#</th>
-                        <th>Name</th>
-                        <th>Value</th>
-                        <th> </th>
-                    </tr>
-                    <tr ng-repeat="header in subscription.headers">
-                        <td>{{$index + 1}}</td>
-                        <td>{{header.name}}</td>
-                        <td>{{header.value}}</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
-
-    <div ng-show="userHasSufficientPrivileges" class="row">
-
-        <div class="col-md-12" ng-show="undelivered">
-
-            <div class="panel panel-danger">
-
-                <div class="panel-heading">
-                    <h3 class="panel-title">Last 100 undelivered messages</h3>
-                </div>
-
-                <table class="table">
-                    <tr>
-                        <th>#</th>
-                        <th>MessageId</th>
-                        <th>Status</th>
-                        <th>Reason</th>
-                        <th>Timestamp</th>
-                        <th> </th>
-                    </tr>
-
-                    <tr ng-repeat="msglog in undelivered">
-                        <td>{{$index + 1}}</td>
-                        <td>{{msglog.messageId}}</td>
-                        <td>{{msglog.status}}</td>
-                        <td>{{msglog.reason}}</td>
-                        <td>{{msglog.timestamp | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-                        <td><button type="button" class="btn-xs btn-primary" ng-show="msglog.isPreviewable()"
-                                    ng-click="previewMessage(msglog.cluster, msglog.partition, msglog.offset, msglog.messageId)">
-                            <span class="glyphicon glyphicon-search"></span></button></td>
-                    </tr>
-
-                </table>
-
-            </div>
-        </div>
-    </div>
-
-    <div class="row" ng-show="admin">
-        <div class="col-md-6">
-            <div class="panel panel-warning">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Diagnostics</h3>
-                </div>
-                <div class="panel-body">
-                    <p>
-                        <strong>
-                            <a ng-href="#/groups/{{groupName}}/topics/{{topicName}}/subscriptions/{{subscriptionName}}/diagnostics">Consumer groups</a>
-                        </strong>
-                        <span uib-popover='List of consumers and partitions for the given subscription'
-                              popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
-
-</section>
diff --git a/hermes-console/static/partials/subscriptionOffsets.html b/hermes-console/static/partials/subscriptionOffsets.html
deleted file mode 100644
index a2a96af6ac..0000000000
--- a/hermes-console/static/partials/subscriptionOffsets.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<section ng-controller="SubscriptionOffsetsController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li class="active">subscription-offsets</li>
-    </ol>
-
-    <div class="alert alert-danger" role="alert" ng-if="error">
-        Error during moving offsets for subscription:<br>
-        {{error}}
-    </div>
-
-    <h1>Move subscription offsets to the end</h1>
-    <div class="container">
-        <div class="row">
-            <form name="moveOffsetsForm" class="form col-md-10">
-                <div class="row">
-                    <div class="col-md-6 padding-lr-2">
-                        <div class="form-group">
-                            <input name="subscriptionFullName" class="form-control" placeholder="groupName.topicName.subscriptionName"
-                                   ng-model="subscriptionFullName" required pattern="(.+)\.(.+)\.(.+)"/>
-                        </div>
-                    </div>
-                    <div class="col-md-2 padding-lr-2">
-                        <button type="submit" class="btn btn-primary" ng-disabled="moveOffsetsForm.$invalid" ng-click="moveOffsets()">Move</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-</section>
diff --git a/hermes-console/static/partials/topic.html b/hermes-console/static/partials/topic.html
deleted file mode 100644
index 0145b0242c..0000000000
--- a/hermes-console/static/partials/topic.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<section ng-controller="TopicController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li><a href="#/groups">groups</a></li>
-        <li><a ng-href="#/groups/{{groupName}}">{{groupName}}</a></li>
-        <li class="active">{{topicName}}</li>
-    </ol>
-
-    <div class="pull-right">
-        <span ng-show="!userHasSufficientPrivileges" uib-popover='Sign in to edit the topic' popover-trigger="mouseenter" class="fa helpme">&#xf128;</span>
-        <span bind-html="config.buttonsExtension"></span>
-        <button class="btn btn-primary" ng-disabled="userWithoutAccess || config.readOnlyModeEnabled" ng-click="edit()">Edit</button>
-        <button class="btn btn-primary" ng-disabled="userWithoutAccess" ng-click="clone()">Clone</button>
-        <button class="btn btn-primary" ng-disabled="userWithoutAccess" ng-show="offlineRetransmissionEnabled" ng-click="retransmitOffline()">Offline retransmission</button>
-        <button class="btn btn-warning" ng-disabled="userWithoutAccess" ng-show="admin && !isBlacklisted" ng-click="blacklist()" >Blacklist</button>
-        <button class="btn btn-default" ng-disabled="userWithoutAccess" ng-show="admin && isBlacklisted"ng-click="unblacklist()" >Unblacklist</button>
-        <button class="btn btn-danger" ng-disabled="userWithoutAccess || disableRemoveButton" ng-click="remove()">Remove</button>
-    </div>
-
-    <h1><small>Topic:</small> {{topic.name}}</h1>
-
-    <div class="pull-right ng-hide" ng-show="config.authEnabled">
-        <div uib-popover="Authorisation is enabled for this topic." popover-trigger="mouseenter"
-             ng-show="topic.auth.enabled && !topic.auth.unauthenticatedAccessEnabled" class="ng-hide badge alert-success">
-            Secured <span class="glyphicon glyphicon-lock"></span>
-        </div>
-        <div uib-popover="Currently anyone is allowed to publish on this topic without authentication. Consider enabling authorisation." popover-trigger="mouseenter"
-             ng-show="topic && !topic.auth.enabled || topic.auth.unauthenticatedAccessEnabled" class="ng-hide badge alert-warning">
-            Unauthenticated access allowed <span class="glyphicon glyphicon-alert"></span>
-        </div>
-        <div uib-popover="Topic editing is disabled. Contact administrator for more details." popover-trigger="mouseenter"
-             ng-show="topic && config.readOnlyModeEnabled" class="ng-hide badge alert-warning">
-            Read only mode <span class="glyphicon glyphicon-alert"></span>
-        </div>
-    </div>
-
-    <h3><small>Owner ({{topic.owner.source}}):</small> <owner-name owner="topic.owner"/></h3>
-
-    <p class="lead">{{topic.description}}</p>
-
-    <div class="alert alert-danger" role="alert" ng-show="isBlacklisted">
-        <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
-        The topic has been blacklisted - contact Hermes admins why publishing returns 403's.
-    </div>
-
-    <div class="row">
-        <div class="col-md-6">
-            <div class="panel panel-info">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Metrics</h3>
-                </div>
-                <div class="panel-body">
-                    <p><strong><a ng-href="{{metricsUrls.rate}}">Rate:</a></strong> {{metrics.rate | number:2}}</p>
-                    <p><strong><a ng-href="{{metricsUrls.deliveryRate}}">Delivery rate:</a></strong> {{metrics.deliveryRate | number:2}}</p>
-                    <p><strong><a ng-href="{{metricsUrls.published}}">Published:</a></strong> {{metrics.published}}</p>
-                    <p><strong><a ng-href="{{metricsUrls.latency}}">Latency</a></strong></p>
-                    <p><strong><a ng-href="{{metricsUrls.messageSize}}">Message size</a></strong></p>
-                </div>
-            </div>
-            <div ng-if="costs.enabled" class="panel panel-info">
-                <div class="panel-heading">
-                    <div class="pull-right">
-                        <button class="btn btn-primary btn-xs" ng-click="goToCostDetails()">Go to details</button>
-                    </div>
-                    <h3 class="panel-title">Costs</h3>
-                </div>
-                <div class="panel-body">
-                    <iframe height="100%" width="100%" style="border: none;" ng-src="{{costs.iframeUrl}}"></iframe>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-6">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Properties</h3>
-                </div>
-                <div class="panel-body">
-                    <p>
-                        <strong>Content type:</strong> {{topic.contentType}}
-                    </p>
-                    <p>
-                        <strong>Labels:</strong>
-                        <span ng-repeat="label in topic.labelValues">
-                            <span class="label label-info margin-right-4"> {{label}} </span>
-                        </span>
-                    </p>
-                    <p>
-                        <strong>Acknowlegment:</strong> {{topic.ack == 'ALL' ? 'all brokers' : 'leader only'}}
-                        <span uib-popover='Specifies the strength of guarantees that acknowledged message was indeed persisted. In "Leader" mode ACK is required only from topic leader, which is fast and gives 99.99999% guarantee. It might be not enough when cluster is unstable. "All" mode means message needs to be saved on all replicas before sending ACK, which is quite slow but gives 100% guarantee that message has been persisted.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p>
-                        <strong>Retention time:</strong> {{topic.retentionTime.duration}} {{topic.retentionTime.retentionUnit | toLowercase}}
-                        <span uib-popover='For how many hours/days message is available for subscribers after being published.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p><strong>Tracking enabled:</strong> {{topic.trackingEnabled}}</p>
-                    <p><strong>Max message size:</strong> {{topic.maxMessageSize | readableSize}}</p>
-                    <p><strong>SchemaId Serialization Enabled:</strong> {{topic.schemaIdAwareSerializationEnabled}}</p>
-
-                    <div class="ng-hide" ng-show="config.authEnabled">
-                        <hr />
-                        <p>
-                            <strong>Authorisation enabled:</strong> {{topic.auth.enabled}}
-                        </p>
-                        <p>
-                            <strong>Authorised publishers:</strong> {{topic.auth.publishers.join(', ')}}
-                            <span uib-popover='When authorisation is enabled, only authenticated services are allowed to publish on this topic.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                        </p>
-                        <p>
-                            <strong>Allow unauthenticated access:</strong> {{topic.auth.unauthenticatedAccessEnabled}}
-                            <span uib-popover='Allowing unauthenticated access should be enabled only when migrating topic to authorised, so both authenticated and unauthenticated clients are allowed to publish simultaneously.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                        </p>
-                    </div>
-                    <hr />
-                    <p>
-                        <strong>Restrict subscribing:</strong> {{topic.subscribingRestricted}}
-                        <span uib-popover='When subscribing is restricted, only owner of this topic can create new subscriptions.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-
-                    <hr />
-                    <p>
-                        <strong>Store offline:</strong> {{topic.offlineStorage.enabled}}
-                        <span uib-popover='Should data from this topic be stored in offline storage (e.g. HDFS).' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-                    <p ng-show="topic.offlineStorage.enabled">
-                        <strong>Offline retention:</strong> {{topic.offlineStorage.retentionTime.infinite ? 'infinite' : topic.offlineStorage.retentionTime.duration + ' days'}}
-                        <span uib-popover='For how long should this topic be stored in offline storage.' popover-trigger="mouseenter" class="fa helpme pull-right">&#xf128;</span>
-                    </p>
-
-                    <hr/>
-                    <p ng-show="topic.createdAt">
-                        <strong>Creation date:</strong> {{topic.createdAt | date:'yyyy-MM-dd HH:mm:ss'}}
-                    </p>
-                    <p ng-show="topic.modifiedAt">
-                        <strong>Modification date:</strong> {{topic.modifiedAt | date:'yyyy-MM-dd HH:mm:ss'}}
-                    </p>
-
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="row" ng-show="topic.contentType == 'AVRO'">
-        <div class="col-md-12">
-            <div class="panel panel-default" style="position: relative">
-                <span class="btn pull-right glyphicon {{showMessageSchema ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down' }}" ng-click="showMessageSchema = !showMessageSchema"></span>
-                <button class="btn btn-default pull-right" style="padding: 4px; margin-top: 4px" ng-click="copyToClipboard()">Copy to clipboard</button>
-                <div class="pull-right" style="padding: 4px; margin-top: 4px; margin-right: 0.6em !important;">
-                    <label>
-                        <input type="checkbox" style="vertical-align: top" ng-model="showRawMessageSchema">
-                        Raw
-                    </label>
-                </div>
-                <div class="panel-heading" ng-click="showMessageSchema = !showMessageSchema">
-                    <h3 class="panel-title">Message schema</h3>
-                </div>
-                <div class="panel-body" uib-collapse="!showMessageSchema">
-                    <pre class="pre-scrollable" ng-show="showRawMessageSchema">{{ messageSchema }}</pre>
-                    <avro-viewer schema="messageSchema" ng-show="!showRawMessageSchema"></avro-viewer>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="row" ng-show="config.messagePreviewEnabled">
-        <div class="col-md-12">
-            <div class="panel panel-default" style="position: relative">
-                <span class="btn pull-right glyphicon {{showPreview ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down' }}" ng-click="showPreview = !showPreview"></span>
-                <div class="panel-heading" ng-click="showPreview = !showPreview">
-                    <h3 class="panel-title">Topic messages preview</h3>
-                </div>
-                <div class="panel-body" uib-collapse="!showPreview">
-                    <div class="pre-scrollable message-preview" ng-repeat="message in preview track by $index">
-                        <pre class="content">{{message.content}}</pre>
-                        <span class="truncated-info" ng-if="::(message.truncated)">(preview was too large and has been truncated)</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="row container">
-        <div class="list-group">
-            <div class="list-group-item">
-                <div class="pull-right">
-                    <button class="btn btn-primary" ng-click="copyClientsToClipboard()">Copy clients to clipboard</button>
-                    <span ng-show="!userHasSufficientPrivileges" uib-popover='Sign in to add a subscription' popover-trigger="mouseenter" class="fa helpme">&#xf128;</span>
-                    <button class="btn btn-primary" ng-disabled="(topic.subscribingRestricted && !userHasSufficientPrivileges) || readOnly" ng-click="addSubscription()"><span class="glyphicon glyphicon-plus"></span></button>
-                </div>
-                <h4>
-                    Subscriptions
-                </h4>
-            </div>
-            <a ng-href="#/groups/{{groupName}}/topics/{{topicName}}/subscriptions/{{subscription.name}}" class="list-group-item" ng-repeat="subscription in subscriptions">
-                <small>{{$index + 1}}</small>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-                <strong>{{subscription.name}}</strong>
-                <div class="pull-right">
-                    <span class="label {{subscription.details.state === 'ACTIVE' ? 'label-success' : 'label-danger'}}" >{{subscription.details.state}}</span>
-                    <span class="glyphicon glyphicon-chevron-right"></span>
-                </div>
-            </a>
-        </div>
-
-        <div ng-show="subscriptionsFetching" class="text-center">
-            <h1><i class="fa fa-circle-o-notch fa-spin"></i></h1>
-        </div>
-    </div>
-
-    <div class="row container" ng-if="config.offlineClientsEnabled">
-        <div class="list-group">
-            <div class="list-group-item">
-                <h4>
-                    Offline clients
-                </h4>
-            </div>
-            <div class="list-group-item">
-                <iframe height="400" ng-src="{{trustSrc(iframeSource)}}" style="border: none;" width="100%"></iframe>
-            </div>
-        </div>
-    </div>
-
-</section>
diff --git a/hermes-console/static/partials/topicConsistency.html b/hermes-console/static/partials/topicConsistency.html
deleted file mode 100644
index 1a88e5ba23..0000000000
--- a/hermes-console/static/partials/topicConsistency.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<section ng-controller="TopicConsistencyController">
-
-    <ol class="breadcrumb">
-        <li><a href="#/">home</a></li>
-        <li><a href="#/consistency">consistency</a></li>
-        <li><a ng-href="#/consistency/{{groupName}}">{{groupName}}</a></li>
-        <li class="active">{{topicName}}</li>
-    </ol>
-
-    <h1><small>Topic:</small> {{topic.name}}</h1>
-
-    <div class="row container" ng-if="topic.inconsistentMetadata.length > 0">
-        <div class="panel panel-warning">
-            <div class="panel-heading">
-                <h3 class="panel-title">Inconsistent metadata</h3>
-            </div>
-            <div class="table-responsive">
-                <table class="table table-bordered">
-                    <thead>
-                    <tr>
-                        <th ng-repeat="metadata in topic.inconsistentMetadata">{{metadata.datacenter}}</th>
-                    </tr>
-                    </thead>
-                    <tbody style="overflow-y: scroll">
-                    <tr>
-                        <td ng-repeat="metadata in topic.inconsistentMetadata">
-                            <pre class="content">{{metadata.content | prettyJson}}</pre>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-
-    <div class="row text-center" ng-if="topic.inconsistentMetadata.length === 0">
-        <div class="col-md-12">
-            <p class="alert alert-success">Topic metadata are consistent.</p>
-        </div>
-    </div>
-
-    <div class="row container" ng-if="topic.inconsistentSubscriptions.length > 0">
-        <div class="panel panel-warning">
-            <div class="panel-heading">
-                <h3 class="panel-title">Inconsistent subscriptions</h3>
-            </div>
-            <div ng-repeat="subscription in topic.inconsistentSubscriptions">
-                <a class="list-group-item" ng-click="showPreview = !showPreview">
-                    <strong>{{subscription.name}}</strong>
-                    <div class="pull-right">
-                        <span class="glyphicon {{showPreview ? 'glyphicon-chevron-up' : 'glyphicon-chevron-down' }}"></span>
-                    </div>
-                </a>
-                <div uib-collapse="!showPreview" class="table-responsive">
-                    <table class="table table-bordered">
-                        <thead>
-                        <tr>
-                            <th class="col-md-6" ng-repeat="metadata in subscription.inconsistentMetadata">
-                                {{metadata.datacenter}}
-                            </th>
-                        </tr>
-                        </thead>
-                        <tbody style="overflow-y: scroll">
-                        <tr>
-                            <td class="col-md-6" ng-repeat="metadata in subscription.inconsistentMetadata">
-                                <pre class="content">{{metadata.content | prettyJson}}</pre>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="row text-center" ng-if="topic.inconsistentSubscriptions.length === 0">
-        <div class="col-md-12">
-            <p class="alert alert-success">All subscriptions are consistent.</p>
-        </div>
-    </div>
-
-</section>
\ No newline at end of file
diff --git a/hermes-console/test/fixture/config.js b/hermes-console/test/fixture/config.js
deleted file mode 100644
index 3750f0e00b..0000000000
--- a/hermes-console/test/fixture/config.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var config = {
-    "console": {
-        "title": "hermes console"
-    },
-    "dashboard": {
-        "metrics": "",
-        "docs": "http://hermes-pubsub.rtfd.org"
-    },
-    "hermes": {
-        "url": "http://hermes.allegro.tech"
-    },
-    "metrics": {
-        "type": "graphite",
-        "graphite": {
-            "url": "localhost:8091",
-            "prefix": "hermes"
-        }
-    },
-    "auth": {
-        "oauth": {
-            "enabled": false,
-            "url": "localhost:8092/auth",
-            "clientId": "hermes",
-            "scope": "hermes"
-        },
-        "headers": {
-            "enabled": false,
-            "adminHeader": "Hermes-Admin-Password"
-        }
-    }
-};
diff --git a/hermes-console/test/unit/AvroNodeControllerTest.js b/hermes-console/test/unit/AvroNodeControllerTest.js
deleted file mode 100644
index b296e4c644..0000000000
--- a/hermes-console/test/unit/AvroNodeControllerTest.js
+++ /dev/null
@@ -1,429 +0,0 @@
-describe("AvroNodeController", function () {
-
-    var $controller;
-    var $scope;
-
-    beforeEach(module('hermes.topic.avroViewer'));
-
-    beforeEach(inject(function ($rootScope, _$controller_) {
-        $controller = _$controller_;
-        $scope = $rootScope;
-    }));
-
-    [
-        {
-            name: "primitive",
-            avroType: "string",
-            expectedOutputType: ["string"]
-        },
-        {
-            name: "nullable primitive",
-            avroType: ["string", "null"],
-            expectedOutputType: ["string?"]
-        },
-        {
-            name: "record",
-            avroType: {"type": "record"},
-            expectedOutputType: ["record"]
-        },
-        {
-            name: "nullable record",
-            avroType: [{"type": "record"}, "null"],
-            expectedOutputType: ["record?"]
-        },
-        {
-            name: "primitive map",
-            avroType: {"type": "map", "values": "int"},
-            expectedOutputType: ["map[string]int"]
-        },
-        {
-            name: "record map",
-            avroType: {"type": "map", "values": {"type": "record"}},
-            expectedOutputType: ["map[string]record"]
-        },
-        {
-            name: "nullable map",
-            avroType: [{"type": "map", "values": "int"}, "null"],
-            expectedOutputType: ["map[string]int?"]
-        },
-        {
-            name: "enum",
-            avroType: {"type": "enum"},
-            expectedOutputType: ["enum"]
-        },
-        {
-            name: "primitive union",
-            avroType: ["int", "string"],
-            expectedOutputType: ["int", "string"]
-        },
-        {
-            name: "nullable primitive union",
-            avroType: ["int", "string", "null"],
-            expectedOutputType: ["int?", "string?"]
-        },
-        {
-            name: "primitive array",
-            avroType: {"type": "array", "items": "int"},
-            expectedOutputType: ["[]int"]
-        },
-        {
-            name: "record array",
-            avroType: {"type": "array", "items": {"type": "record"}},
-            expectedOutputType: ["[]record"]
-        },
-        {
-            name: "fixed",
-            avroType: {"type": "fixed", "size": 16},
-            expectedOutputType: ["fixed(16B)"]
-        }
-    ].forEach(testCase =>
-        it(`should read ${testCase.name} type correctly`, function () {
-            // given
-            $scope.field = {
-                type: testCase.avroType
-            };
-
-            // when
-            $controller('AvroNodeController', {$scope: $scope});
-
-            // then
-            expect($scope.types).toEqual(testCase.expectedOutputType);
-        })
-    );
-
-    it("should find record's children", function () {
-        // given
-        $scope.field = {
-            "name": "test",
-            "type": {
-                "type": "record",
-                "name": "testType",
-                "fields": [
-                    {
-                        "name": "field1",
-                        "type": "int",
-                        "doc": "Field 1"
-                    },
-                    {
-                        "name": "field2",
-                        "type": "long",
-                        "doc": "Field 2"
-                    }
-                ]
-            }
-        };
-
-        // when
-        $controller('AvroNodeController', {$scope: $scope});
-
-        // then
-        expect($scope.isRecord).toBeTruthy();
-        expect($scope.expandable).toBeTruthy();
-        expect($scope.nestedType.fields.length).toBe(2);
-        expect($scope.nestedType.fields[0].name).toBe("field1");
-        expect($scope.nestedType.fields[1].name).toBe("field2");
-    });
-
-    it("should find only children of the first record in union", function () {
-        // given
-        $scope.field = {
-            "name": "test",
-            "type": [
-                {
-                    "type": "record",
-                    "name": "testType",
-                    "fields": [{"name": "field1", "type": "int"}]
-                },
-                {
-                    "type": "record",
-                    "name": "testType",
-                    "fields": [{"name": "field2", "type": "int"}]
-                }
-            ]
-        };
-
-        // when
-        $controller('AvroNodeController', {$scope: $scope});
-
-        // then
-        expect($scope.isRecord).toBeTruthy();
-        expect($scope.nestedType.fields.length).toBe(1);
-        expect($scope.nestedType.fields[0].name).toBe("field1");
-    });
-
-    [
-        {
-            name: "enum",
-            field: {
-                "name": "test",
-                "type": {
-                    "type": "enum",
-                    "name": "testType",
-                    "symbols": ["one", "two", "three"]
-                }
-            }
-        },
-        {
-            name: "enum array",
-            field: {
-                "name": "test",
-                "type": {
-                    "type": "array",
-                    "items": {
-                        "type": "enum",
-                        "name": "testType",
-                        "symbols": ["one", "two", "three"]
-                    }
-                }
-            }
-        },
-        {
-            name: "enum map",
-            field: {
-                "name": "test",
-                "type": {
-                    "type": "map",
-                    "values": {
-                        "type": "enum",
-                        "name": "testType",
-                        "symbols": ["one", "two", "three"]
-                    }
-                }
-            }
-        },
-        {
-            name: "enum union",
-            field: {
-                "name": "test",
-                "type": [
-                    {
-                        "type": "enum",
-                        "name": "testType",
-                        "symbols": ["one", "two", "three"]
-                    },
-                    "int"
-                ]
-            }
-        }
-    ].forEach(testCase =>
-        it(`should recognize ${testCase.name}`, function () {
-            // given
-            $scope.field = testCase.field;
-
-            // when
-            $controller('AvroNodeController', {$scope: $scope});
-
-            // then
-            expect($scope.isEnum).toBeTruthy();
-            expect($scope.expandable).toBeTruthy();
-            expect($scope.enumSymbols).toEqual(["one", "two", "three"]);
-        })
-    );
-
-    it("should toggle expansion", function () {
-        // given
-        $scope.field = {
-            "name": "test",
-            "type": {
-                "type": "record",
-                "name": "testType",
-                "fields": [{"name": "field1", "type": "int"}]
-            }
-        };
-
-        // when
-        $controller('AvroNodeController', {$scope: $scope});
-
-        // then
-        expect($scope.expanded).toBeTruthy();
-
-        // when
-        $scope.toggleExpansion();
-
-        // then
-        expect($scope.expanded).toBeFalsy();
-
-        // when
-        $scope.toggleExpansion();
-
-        // then
-        expect($scope.expanded).toBeTruthy();
-    });
-
-    it("should broadcast a fold event when collapsing a node", function () {
-        // given
-        $scope.field = {
-            "name": "test",
-            "type": {
-                "type": "record",
-                "name": "testType",
-                "fields": [{"name": "field1", "type": "int"}]
-            }
-        };
-        $controller('AvroNodeController', {$scope: $scope});
-        spyOn($scope, '$broadcast');
-
-        // and
-        $scope.expanded = true;
-
-        // when
-        $scope.toggleExpansion();
-
-        // then
-        expect($scope.$broadcast).toHaveBeenCalledWith("fold");
-    });
-
-    it("should not broadcast an event when expanding a node", function () {
-        // given
-        $scope.field = {
-            "name": "test",
-            "type": {
-                "type": "record",
-                "name": "testType",
-                "fields": [{"name": "field1", "type": "int"}]
-            }
-        };
-        $controller('AvroNodeController', {$scope: $scope});
-        spyOn($scope, '$broadcast');
-
-        // and
-        $scope.expanded = false;
-
-        // when
-        $scope.toggleExpansion();
-
-        // then
-        expect($scope.$broadcast).not.toHaveBeenCalled();
-    });
-
-    [
-        {
-            name: "union of primitive and record",
-            field: {
-                "name": "test",
-                "type": [
-                    {
-                        "type": "record",
-                        "name": "testType",
-                        "fields": [{"name": "field1", "type": "int"}]
-                    },
-                    "int"
-                ],
-            },
-            expectedCount: 1
-        },
-        {
-            name: "union of primitive map and record",
-            field: {
-                "name": "test",
-                "type": [
-                    {
-                        "type": "record",
-                        "name": "testType",
-                        "fields": [{"name": "field1", "type": "int"}]
-                    },
-                    {
-                        "type": "map",
-                        "name": "testType2",
-                        "values": "int"
-                    }
-                ],
-            },
-            expectedCount: 1
-        },
-        {
-            name: "union of records",
-            field: {
-                "name": "test",
-                "type": [
-                    {
-                        "type": "record",
-                        "name": "testType1",
-                        "fields": [{"name": "field1", "type": "int"}]
-                    },
-                    {
-                        "type": "record",
-                        "name": "testType2",
-                        "fields": [{"name": "field1", "type": "int"}]
-                    }
-                ],
-            },
-            expectedCount: 2
-        },
-        {
-            name: "union of record and enum",
-            field: {
-                "name": "test",
-                "type": [
-                    {
-                        "type": "record",
-                        "name": "testType",
-                        "fields": [{"name": "field1", "type": "int"}]
-                    },
-                    {
-                        "type": "enum",
-                        "name": "testType",
-                        "symbols": ["one", "two", "three"]
-                    }
-                ]
-            },
-            expectedCount: 2
-        }
-    ].forEach(testCase =>
-        it(`should count expandable types of ${testCase.name}`, function () {
-            // given
-            $scope.field = testCase.field;
-
-            // when
-            $controller('AvroNodeController', {$scope: $scope});
-
-            // then
-            expect($scope.expandableTypesNumber).toBe(testCase.expectedCount);
-        })
-    );
-
-    it("should format a doc field", function () {
-        // given
-        $scope.field = {
-            "name": "test",
-            "type": "int",
-            "doc": " some documentation  "
-        };
-
-        // when
-        $controller('AvroNodeController', {$scope: $scope});
-
-        // then
-        expect($scope.doc).toBe("Some documentation.");
-    });
-
-    it("should not add a dot to documentation if there already is one", function () {
-        // given
-        $scope.field = {
-            "name": "test",
-            "type": "int",
-            "doc": "some documentation."
-        };
-
-        // when
-        $controller('AvroNodeController', {$scope: $scope});
-
-        // then
-        expect($scope.doc).toBe("Some documentation.");
-    });
-
-    it("should not add a dot to documentation if it ends with a non-letter character", function () {
-        // given
-        $scope.field = {
-            "name": "test",
-            "type": "int",
-            "doc": "some documentation!"
-        };
-
-        // when
-        $controller('AvroNodeController', {$scope: $scope});
-
-        // then
-        expect($scope.doc).toBe("Some documentation!");
-    });
-});
diff --git a/hermes-console/test/unit/AvroNodeDirectiveTest.js b/hermes-console/test/unit/AvroNodeDirectiveTest.js
deleted file mode 100644
index c1e4127eb5..0000000000
--- a/hermes-console/test/unit/AvroNodeDirectiveTest.js
+++ /dev/null
@@ -1,53 +0,0 @@
-describe("AvroNodeDirective", function () {
-
-    var $compile;
-    var $rootScope;
-
-    beforeEach(module('templates'));
-    beforeEach(module('hermes.topic.avroViewer'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-        $compile = _$compile_;
-        $rootScope = _$rootScope_;
-    }));
-
-    it("should properly render a simple field", function () {
-        // given
-        const element = $compile("<avro-node field='field'></avro-node>")($rootScope);
-        const simpleField = {
-            "name": "test",
-            "type": "string",
-            "doc": "Test field.",
-            "default": "test"
-        };
-
-        // when
-        $rootScope.field = simpleField;
-        $rootScope.$digest();
-
-        // then
-        expect($(element).find("[data-ref='name']").text()).toBe("test:");
-        expect($(element).find("[data-ref='type']").text()).toBe("string");
-        expect($(element).find("[data-ref='doc']").text()).toBe("Test field.");
-        expect($(element).find("[data-ref='default']").text()).toBe("Default: test");
-    });
-
-    it("should properly render a root field", function () {
-        // given
-        const element = $compile("<avro-node root='true' field='field'></avro-node>")($rootScope);
-        const simpleField = {
-            "name": "test",
-            "type": {"type": "record", "fields": []},
-            "doc": "Test field."
-        };
-
-        // when
-        $rootScope.field = simpleField;
-        $rootScope.$digest();
-
-        // then
-        expect($(element).find("[data-ref='name']").text()).toBe("test");
-        expect($(element).find("[data-ref='type']").length).toBe(0);
-        expect($(element).find("[data-ref='doc']").text()).toBe("Test field.");
-    });
-});
diff --git a/hermes-console/test/unit/AvroViewerDirectiveTest.js b/hermes-console/test/unit/AvroViewerDirectiveTest.js
deleted file mode 100644
index 0910564401..0000000000
--- a/hermes-console/test/unit/AvroViewerDirectiveTest.js
+++ /dev/null
@@ -1,63 +0,0 @@
-describe("AvroViewerDirective", function () {
-
-    const schema = `
-    {
-      "type": "record",
-      "name": "TestSchema",
-      "doc":  "Test schema doc",
-      "namespace": "pl.allegro.test",
-      "fields": [
-        {
-          "name": "__metadata",
-          "type": {"type": "map", "values": "string"}
-        },
-        {
-          "name": "field1",
-          "type": "string"
-        },
-        {
-          "name": "field2",
-          "type": "int"
-        }
-      ]
-    }`;
-
-    var $compile;
-    var $rootScope;
-
-    beforeEach(module('templates'));
-    beforeEach(module('hermes.topic.avroViewer'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-        $compile = _$compile_;
-        $rootScope = _$rootScope_;
-    }));
-
-    it("should create dummy field for top-level node", function () {
-        // given
-        const element = $compile("<avro-viewer schema='schema'></avro-viewer>")($rootScope);
-
-        // when
-        $rootScope.schema = schema;
-        $rootScope.$digest();
-
-        // then
-        const elementScope = element.isolateScope();
-        expect(elementScope.rootField.name).toBe("TestSchema");
-        expect(elementScope.rootField.doc).toBe("Test schema doc");
-        expect(elementScope.rootField.type.type).toBe("record");
-    });
-
-    it("should add top level nodes of the schema except for __metadata", function () {
-        // given
-        const element = $compile("<avro-viewer schema='schema'></avro-viewer>")($rootScope);
-
-        // when
-        $rootScope.schema = schema;
-        $rootScope.$digest();
-
-        // then
-        const elementScope = element.isolateScope();
-        expect(elementScope.rootField.type.fields.length).toBe(2);
-    });
-});
diff --git a/hermes-console/test/unit/GroupControllerTest.js b/hermes-console/test/unit/GroupControllerTest.js
deleted file mode 100644
index 69f910e67a..0000000000
--- a/hermes-console/test/unit/GroupControllerTest.js
+++ /dev/null
@@ -1,46 +0,0 @@
-describe("GroupController", function() {
-
-    var $controller, $httpBackend;
-
-    beforeEach(angular.mock.module('hermes.groups'));
-    beforeEach(angular.mock.module('ngResource'));
-    beforeEach(angular.mock.module(function($provide) {
-        $provide.constant('HERMES_URLS', ["hermes_url"]);
-        $provide.value("TOPIC_CONFIG", {});
-
-    }));
-
-    beforeEach(inject(function(_$controller_, _$httpBackend_) {
-        $controller = _$controller_;
-        $httpBackend = _$httpBackend_;
-    }));
-
-    afterEach(function() {
-        $httpBackend.verifyNoOutstandingExpectation();
-        $httpBackend.verifyNoOutstandingRequest();
-    });
-
-    beforeEach(function () {
-        // given
-
-        $scope = {};
-        $stateParams = {
-            "groupName": "someGroup"
-        };
-        controller = $controller('GroupController', {$scope: $scope, $stateParams: $stateParams});
-
-    });
-
-    it("should fetch group with all properties", function() {
-        // when
-
-        $httpBackend.when('GET', 'hermes_url/groups/someGroup').respond("group");
-        $httpBackend.when('GET', 'hermes_url/groups').respond(['someGroup']);
-        $httpBackend.when('GET', 'hermes_url/topics').respond([]);
-
-        // then
-        $httpBackend.flush();
-        expect($scope.fetching).toEqual(false);
-        expect($scope.groupName).toEqual($stateParams.groupName);
-    });
-});
diff --git a/hermes-console/test/unit/GroupEditControllerTest.js b/hermes-console/test/unit/GroupEditControllerTest.js
deleted file mode 100644
index 51196dda5d..0000000000
--- a/hermes-console/test/unit/GroupEditControllerTest.js
+++ /dev/null
@@ -1,40 +0,0 @@
-
-describe("GroupEditController", function() {
-    var $controller, $httpBackend;
-
-    beforeEach(angular.mock.module('hermes.groups'));
-    beforeEach(angular.mock.module('ngResource'));
-    beforeEach(angular.mock.module(function($provide) {
-        $provide.constant('HERMES_URLS', ["hermes_url"]);
-        $provide.value("TOPIC_CONFIG", {});
-
-    }));
-
-    beforeEach(inject(function(_$controller_, _$httpBackend_) {
-        $controller = _$controller_;
-        $httpBackend = _$httpBackend_;
-    }));
-    afterEach(function() {
-        $httpBackend.verifyNoOutstandingExpectation();
-        $httpBackend.verifyNoOutstandingRequest();
-    });
-
-    it("should create group", function() {
-        // given
-        var group = {
-            "groupName": "someGroup"
-        };
-
-        $httpBackend.when('POST', 'hermes_url/groups', group).respond(201, true);
-
-        // when
-        var $scope = {};
-        $controller('GroupEditController', {$scope: $scope, group: group, operation: "ADD", $uibModalInstance: { close: function() {} }});
-        $scope.save();
-
-        $httpBackend.flush();
-
-        // then part is in afterEach()
-    });
-
-});
diff --git a/hermes-console/test/unit/GroupsControllerTest.js b/hermes-console/test/unit/GroupsControllerTest.js
deleted file mode 100644
index f1282c4904..0000000000
--- a/hermes-console/test/unit/GroupsControllerTest.js
+++ /dev/null
@@ -1,59 +0,0 @@
-describe("GroupsController", function() {
-
-    var $controller, $httpBackend;
-
-    beforeEach(angular.mock.module('hermes.groups'));
-    beforeEach(angular.mock.module('ngResource'));
-    beforeEach(angular.mock.module(function($provide) {
-        $provide.constant('HERMES_URLS', ["hermes_url"]);
-        $provide.value("TOPIC_CONFIG", {});
-        $provide.value("GROUP_CONFIG", {});
-    }));
-
-    beforeEach(inject(function(_$controller_, _$httpBackend_) {
-        $controller = _$controller_;
-        $httpBackend = _$httpBackend_;
-    }));
-
-    afterEach(function() {
-        $httpBackend.verifyNoOutstandingExpectation();
-        $httpBackend.verifyNoOutstandingRequest();
-    });
-
-    it("should fetch empty list of groups", function() {
-        // given
-        $httpBackend.when('GET', 'hermes_url/groups').respond([]);
-        $httpBackend.when('GET', 'hermes_url/topics').respond([]);
-
-        // when
-        var $scope = {};
-        $controller('GroupsController', {$scope: $scope});
-
-        $httpBackend.flush();
-
-        // then
-        expect($scope.groups.length).toEqual(0);
-        expect($scope.fetching).toEqual(false);
-    });
-
-    it("should fetch groups with corresponding topics", function() {
-
-        // given
-        $httpBackend.when('GET', 'hermes_url/groups').respond(['g1', 'g2', 'g3', 'g12']);
-        $httpBackend.when('GET', 'hermes_url/topics').respond(['g1.t1', 'g1.t2', 'g3.t1', 'g12.t1']);
-
-
-        // when
-        var $scope = {};
-        $controller('GroupsController', {$scope: $scope});
-        $httpBackend.flush();
-
-        // then
-        expect($scope.groups).toEqual([{name: 'g1', topics: ['g1.t1', 'g1.t2']},
-            {name: 'g2', topics: []},
-            {name: 'g3', topics: ['g3.t1']},
-            {name: 'g12', topics: ['g12.t1']}]);
-        expect($scope.fetching).toEqual(false);
-
-    });
-});
diff --git a/hermes-console/test/unit/MessagePreviewControllerTest.js b/hermes-console/test/unit/MessagePreviewControllerTest.js
deleted file mode 100644
index dad45ded96..0000000000
--- a/hermes-console/test/unit/MessagePreviewControllerTest.js
+++ /dev/null
@@ -1,25 +0,0 @@
-describe("MessagePreviewController", function() {
-
-    beforeEach(module('hermes.messagePreview'));
-
-    var $controller;
-
-    beforeEach(inject(function(_$controller_) {
-        $controller = _$controller_;
-    }));
-
-    it("set up all necessary $scope properties", function() {
-        var $scope = {};
-
-        $controller('MessagePreviewController', { $scope: $scope,
-                                                  topicName: 'exampleTopicName',
-                                                  partition: 778,
-                                                  offset: 98798798,
-                                                  previewedMessage: 'This is example message' });
-
-        expect($scope.topicName).toBe('exampleTopicName');
-        expect($scope.partition).toBe(778);
-        expect($scope.offset).toBe(98798798);
-        expect($scope.previewedMessage).toBe('This is example message');
-    });
-});
diff --git a/hermes-console/test/unit/subscription/SubscriptionEditControllerTest.js b/hermes-console/test/unit/subscription/SubscriptionEditControllerTest.js
deleted file mode 100644
index 81b036f83a..0000000000
--- a/hermes-console/test/unit/subscription/SubscriptionEditControllerTest.js
+++ /dev/null
@@ -1,92 +0,0 @@
-describe("SubscriptionEditController", function() {
-
-    var $controller, $httpBackend;
-
-    beforeEach(angular.mock.module('hermes.subscription'));
-    beforeEach(angular.mock.module('hermes.discovery'));
-    beforeEach(angular.mock.module('toaster'));
-    beforeEach(angular.mock.module('ngResource'));
-    beforeEach(angular.mock.module(function($provide) {
-        $provide.constant('HERMES_URLS', ["hermes_url"]);
-        $provide.value("SUBSCRIPTION_CONFIG", {});
-    }));
-
-    beforeEach(inject(function(_$controller_, _$httpBackend_) {
-        $controller = _$controller_;
-        $httpBackend = _$httpBackend_;
-    }));
-
-    afterEach(function() {
-        $httpBackend.verifyNoOutstandingExpectation();
-        $httpBackend.verifyNoOutstandingRequest();
-    });
-
-    it("should edit subscription", function() {
-        // given
-        var subscription = {
-            name: 'subscription',
-            endpoint: "http://my-endpoint",
-            description: "Initial description"
-        };
-
-        var $scope = {};
-        $controller('SubscriptionEditController', {
-            $scope: $scope,
-            subscription: subscription,
-            operation: "SAVE",
-            groupName: 'group',
-            topicName: 'topic',
-            endpointAddressResolverMetadataConfig: {},
-            topicContentType: {},
-            showHeadersFilter: {},
-            showFixedHeaders:{},
-            $uibModalInstance: { close: function() {} }}
-        );
-
-        // when
-        $scope.subscription.endpoint = "http://changed-endpoint";
-        $scope.subscription.description = "Changed description";
-        $httpBackend.expect('PUT', 'hermes_url/topics/topic/subscriptions/subscription', {
-            name: 'subscription', endpoint: "http://changed-endpoint", description: "Changed description"
-        }).respond(200, true);
-        $scope.save();
-        $httpBackend.flush();
-
-        // then part is in afterEach()
-    });
-
-   it("should not send endpoint when it has not changed on save", function() {
-        // given
-        var subscription = {
-            name: 'subscription',
-            endpoint: "http://my-endpoint",
-            description: "Initial description"
-        };
-
-        var $scope = {};
-        $controller('SubscriptionEditController', {
-            $scope: $scope,
-            subscription: subscription,
-            operation: "SAVE",
-            groupName: 'group',
-            topicName: 'topic',
-            endpointAddressResolverMetadataConfig: {},
-            topicContentType: {},
-            showHeadersFilter: {},
-            showFixedHeaders:{},
-            $uibModalInstance: { close: function() {} }}
-        );
-
-        // when
-        $scope.subscription.description = "Changed description";
-        $httpBackend.expect('PUT',
-            'hermes_url/topics/topic/subscriptions/subscription',
-            {name: 'subscription', description: "Changed description"})
-                .respond(200, true);
-        $scope.save();
-        $httpBackend.flush();
-
-        // then part is in afterEach()
-    });
-
-});
diff --git a/hermes-console-vue/tsconfig.app.json b/hermes-console/tsconfig.app.json
similarity index 96%
rename from hermes-console-vue/tsconfig.app.json
rename to hermes-console/tsconfig.app.json
index ef6bcc95a7..0d09815a87 100644
--- a/hermes-console-vue/tsconfig.app.json
+++ b/hermes-console/tsconfig.app.json
@@ -16,6 +16,7 @@
     "types": [
       "node",
       "jsdom",
+      "jest",
       "vitest/globals",
       "@testing-library/jest-dom"
     ]
diff --git a/hermes-console-vue/tsconfig.config.json b/hermes-console/tsconfig.config.json
similarity index 100%
rename from hermes-console-vue/tsconfig.config.json
rename to hermes-console/tsconfig.config.json
diff --git a/hermes-console-vue/tsconfig.json b/hermes-console/tsconfig.json
similarity index 100%
rename from hermes-console-vue/tsconfig.json
rename to hermes-console/tsconfig.json
diff --git a/hermes-console-vue/tsconfig.vitest.json b/hermes-console/tsconfig.vitest.json
similarity index 94%
rename from hermes-console-vue/tsconfig.vitest.json
rename to hermes-console/tsconfig.vitest.json
index 55a23f55b5..a007f270d4 100644
--- a/hermes-console-vue/tsconfig.vitest.json
+++ b/hermes-console/tsconfig.vitest.json
@@ -7,6 +7,7 @@
     "types": [
       "node",
       "jsdom",
+      "jest",
       "vitest/globals",
       "@testing-library/jest-dom"
     ]
diff --git a/hermes-console-vue/vite.config.ts b/hermes-console/vite.config.mts
similarity index 74%
rename from hermes-console-vue/vite.config.ts
rename to hermes-console/vite.config.mts
index 85c12d72f9..9007cf9d46 100644
--- a/hermes-console-vue/vite.config.ts
+++ b/hermes-console/vite.config.mts
@@ -2,13 +2,12 @@
 import { fileURLToPath, URL } from 'node:url';
 
 import { defineConfig } from 'vite';
-import pluginRewriteAll from 'vite-plugin-rewrite-all';
 import vue from '@vitejs/plugin-vue';
 import vuetify from 'vite-plugin-vuetify';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [vue(), vuetify({ autoImport: true }), pluginRewriteAll()],
+  plugins: [vue(), vuetify({ autoImport: true })],
   resolve: {
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url)),
diff --git a/hermes-console-vue/vitest.config.ts b/hermes-console/vitest.config.mts
similarity index 74%
rename from hermes-console-vue/vitest.config.ts
rename to hermes-console/vitest.config.mts
index 754a17217e..e7dab4b83d 100644
--- a/hermes-console-vue/vitest.config.ts
+++ b/hermes-console/vitest.config.mts
@@ -1,5 +1,6 @@
 import { defineConfig } from 'vitest/config';
 import { fileURLToPath, URL } from 'node:url';
+import AllureReporter from 'allure-vitest/reporter';
 import vue from '@vitejs/plugin-vue';
 import vuetify from 'vite-plugin-vuetify';
 
@@ -17,6 +18,7 @@ export default defineConfig({
     },
     environment: 'jsdom',
     globals: true,
-    setupFiles: ['vitest.setup.ts'],
+    setupFiles: ['vitest.setup.ts', 'allure-vitest/setup'],
+    reporters: ['default', new AllureReporter({})],
   },
 });
diff --git a/hermes-console-vue/vitest.setup.ts b/hermes-console/vitest.setup.ts
similarity index 100%
rename from hermes-console-vue/vitest.setup.ts
rename to hermes-console/vitest.setup.ts
diff --git a/hermes-console-vue/yarn.lock b/hermes-console/yarn.lock
similarity index 62%
rename from hermes-console-vue/yarn.lock
rename to hermes-console/yarn.lock
index 44ebc52eba..d1a2019318 100644
--- a/hermes-console-vue/yarn.lock
+++ b/hermes-console/yarn.lock
@@ -2,12 +2,17 @@
 # yarn lockfile v1
 
 
-"@adobe/css-tools@^4.0.1":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.1.0.tgz#417fef4a143f4396ad0b3b4351fee21323f15aa8"
-  integrity sha512-mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ==
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@adobe/css-tools@^4.3.2":
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.3.tgz#90749bde8b89cd41764224f5aac29cd4138f75ff"
+  integrity sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==
 
-"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13":
+"@babel/code-frame@^7.10.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -28,15 +33,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.4":
-  version "7.20.15"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.15.tgz#eec9f36d8eaf0948bb88c87a46784b5ee9fd0c89"
-  integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==
-
-"@babel/parser@^7.20.15", "@babel/parser@^7.21.3":
-  version "7.22.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.4.tgz#a770e98fd785c231af9d93f6459d36770993fb32"
-  integrity sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==
+"@babel/parser@^7.24.1":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
+  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
 
 "@babel/runtime@^7.12.5", "@babel/runtime@^7.9.2":
   version "7.20.13"
@@ -45,131 +45,162 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.21.0":
-  version "7.22.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.3.tgz#0a7fce51d43adbf0f7b517a71f4c3aaca92ebcbb"
-  integrity sha512-XsDuspWKLUsxwCp6r7EhsExHtYfbe5oAGQ19kqngTdCPUoPQzOPdUbD/pB9PJiwb2ptYKQDjSJT3R6dC+EPqfQ==
+"@babel/runtime@^7.23.2":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
+  integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
   dependencies:
-    regenerator-runtime "^0.13.11"
+    regenerator-runtime "^0.14.0"
 
-"@esbuild/android-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23"
-  integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==
-
-"@esbuild/android-arm@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2"
-  integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==
-
-"@esbuild/android-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e"
-  integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==
-
-"@esbuild/darwin-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220"
-  integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==
-
-"@esbuild/darwin-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4"
-  integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==
-
-"@esbuild/freebsd-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27"
-  integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==
-
-"@esbuild/freebsd-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72"
-  integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==
-
-"@esbuild/linux-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca"
-  integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==
-
-"@esbuild/linux-arm@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196"
-  integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==
-
-"@esbuild/linux-ia32@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54"
-  integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==
-
-"@esbuild/linux-loong64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8"
-  integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==
-
-"@esbuild/linux-mips64el@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726"
-  integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==
-
-"@esbuild/linux-ppc64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8"
-  integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==
-
-"@esbuild/linux-riscv64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9"
-  integrity sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==
-
-"@esbuild/linux-s390x@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz#661f271e5d59615b84b6801d1c2123ad13d9bd87"
-  integrity sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==
-
-"@esbuild/linux-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz#e4ba18e8b149a89c982351443a377c723762b85f"
-  integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==
-
-"@esbuild/netbsd-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz#7d4f4041e30c5c07dd24ffa295c73f06038ec775"
-  integrity sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==
-
-"@esbuild/openbsd-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz#970fa7f8470681f3e6b1db0cc421a4af8060ec35"
-  integrity sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==
-
-"@esbuild/sunos-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz#abc60e7c4abf8b89fb7a4fe69a1484132238022c"
-  integrity sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==
-
-"@esbuild/win32-arm64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz#7b0ff9e8c3265537a7a7b1fd9a24e7bd39fcd87a"
-  integrity sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==
-
-"@esbuild/win32-ia32@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz#e90fe5267d71a7b7567afdc403dfd198c292eb09"
-  integrity sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==
-
-"@esbuild/win32-x64@0.16.17":
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091"
-  integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==
-
-"@eslint/eslintrc@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
-  integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
+"@bundled-es-modules/cookie@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@bundled-es-modules/cookie/-/cookie-2.0.0.tgz#c3b82703969a61cf6a46e959a012b2c257f6b164"
+  integrity sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==
+  dependencies:
+    cookie "^0.5.0"
+
+"@bundled-es-modules/statuses@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@bundled-es-modules/statuses/-/statuses-1.0.1.tgz#761d10f44e51a94902c4da48675b71a76cc98872"
+  integrity sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==
+  dependencies:
+    statuses "^2.0.1"
+
+"@esbuild/aix-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
+
+"@esbuild/android-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
+
+"@esbuild/android-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
+
+"@esbuild/android-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
+
+"@esbuild/darwin-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
+
+"@esbuild/darwin-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
+
+"@esbuild/freebsd-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
+
+"@esbuild/freebsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
+
+"@esbuild/linux-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
+
+"@esbuild/linux-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
+
+"@esbuild/linux-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
+
+"@esbuild/linux-loong64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
+
+"@esbuild/linux-mips64el@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
+
+"@esbuild/linux-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
+
+"@esbuild/linux-riscv64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
+
+"@esbuild/linux-s390x@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
+
+"@esbuild/linux-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
+
+"@esbuild/netbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
+
+"@esbuild/openbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
+
+"@esbuild/sunos-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
+
+"@esbuild/win32-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
+
+"@esbuild/win32-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
+
+"@esbuild/win32-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
+
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.4.0"
+    espree "^9.6.0"
     globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -177,13 +208,18 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
@@ -191,106 +227,114 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
-"@intlify/core-base@9.2.2":
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.2.2.tgz#5353369b05cc9fe35cab95fe20afeb8a4481f939"
-  integrity sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==
+"@inquirer/confirm@^3.0.0":
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-3.1.5.tgz#21856f937bc8292eca4146c052271107f8ac949a"
+  integrity sha512-6+dwZrpko5vr5EFEQmUbfBVhtu6IsnB8lQNsLHgO9S9fbfS5J6MuUj+NY0h98pPpYZXEazLR7qzypEDqVzf6aQ==
   dependencies:
-    "@intlify/devtools-if" "9.2.2"
-    "@intlify/message-compiler" "9.2.2"
-    "@intlify/shared" "9.2.2"
-    "@intlify/vue-devtools" "9.2.2"
+    "@inquirer/core" "^8.0.1"
+    "@inquirer/type" "^1.3.0"
 
-"@intlify/devtools-if@9.2.2":
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/@intlify/devtools-if/-/devtools-if-9.2.2.tgz#b13d9ac4b4e2fe6d2e7daa556517a8061fe8bd39"
-  integrity sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==
-  dependencies:
-    "@intlify/shared" "9.2.2"
+"@inquirer/core@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-8.0.1.tgz#ac3d9a34a6826dc193791b2feec19061a9c250ca"
+  integrity sha512-qJRk1y51Os2ARc11Bg2N6uIwiQ9qBSrmZeuMonaQ/ntFpb4+VlcQ8Gl1TFH67mJLz3HA2nvuave0nbv6Lu8pbg==
+  dependencies:
+    "@inquirer/figures" "^1.0.1"
+    "@inquirer/type" "^1.3.0"
+    "@types/mute-stream" "^0.0.4"
+    "@types/node" "^20.12.7"
+    "@types/wrap-ansi" "^3.0.0"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    cli-spinners "^2.9.2"
+    cli-width "^4.1.0"
+    mute-stream "^1.0.0"
+    signal-exit "^4.1.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^6.2.0"
 
-"@intlify/message-compiler@9.2.2":
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.2.2.tgz#e42ab6939b8ae5b3d21faf6a44045667a18bba1c"
-  integrity sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==
-  dependencies:
-    "@intlify/shared" "9.2.2"
-    source-map "0.6.1"
+"@inquirer/figures@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.1.tgz#d65f0bd0e9511a90b4d3543ee6a3ce7211f29417"
+  integrity sha512-mtup3wVKia3ZwULPHcbs4Mor8Voi+iIXEWD7wCNbIO6lYR62oPCTQyrddi5OMYVXHzeCSoneZwJuS8sBvlEwDw==
 
-"@intlify/shared@9.2.2":
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.2.tgz#5011be9ca2b4ab86f8660739286e2707f9abb4a5"
-  integrity sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==
+"@inquirer/type@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.3.0.tgz#9dcb4e0e8bbec03063aff7806072cc90eea2c61d"
+  integrity sha512-RW4Zf6RCTnInRaOZuRHTqAUl+v6VJuQGglir7nW2BkT3OXOphMhkIFhvFRjorBx2l0VwtC/M4No8vYR65TdN9Q==
 
-"@intlify/vue-devtools@9.2.2":
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz#b95701556daf7ebb3a2d45aa3ae9e6415aed8317"
-  integrity sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==
+"@intlify/core-base@9.13.0":
+  version "9.13.0"
+  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.13.0.tgz#b6305c99521a613c4577b2a9e7dc503631ebcd85"
+  integrity sha512-Lx8+YTrFpom7AtdbbuJHzgmr612/bceHU92v8ZPU9HU9/rczf+TmCs95BxWPIR4K42xh4MVMLsNzLUWiXcNaLg==
   dependencies:
-    "@intlify/core-base" "9.2.2"
-    "@intlify/shared" "9.2.2"
+    "@intlify/message-compiler" "9.13.0"
+    "@intlify/shared" "9.13.0"
 
-"@jest/expect-utils@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.2.tgz#cd0065dfdd8e8a182aa350cc121db97b5eed7b3f"
-  integrity sha512-Dd3ilDJpBnqa0GiPN7QrudVs0cczMMHtehSo2CSTjm3zdHx0RcpmhFNVEltuEFeqfLIyWKFI224FsMSQ/nsJQA==
+"@intlify/message-compiler@9.13.0":
+  version "9.13.0"
+  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.13.0.tgz#3b523a5331d7ac89dde4aefc2f1952e79b49070b"
+  integrity sha512-zhESuudiDpFQhUOx/qrSMd7ZYHbmgCc0QzBc27cDUxaaAj3olbYJnsx3osiHPQyYnv/LuC+WTqoNOEBoHP6dqQ==
   dependencies:
-    jest-get-type "^29.4.2"
+    "@intlify/shared" "9.13.0"
+    source-map-js "^1.0.2"
 
-"@jest/schemas@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.2.tgz#cf7cfe97c5649f518452b176c47ed07486270fc1"
-  integrity sha512-ZrGzGfh31NtdVH8tn0mgJw4khQuNHiKqdzJAFbCaERbyCP9tHlxWuL/mnMu8P7e/+k4puWjI1NOzi/sFsjce/g==
+"@intlify/shared@9.13.0":
+  version "9.13.0"
+  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.13.0.tgz#e723296fdab798d280087b89764aab06791bc7a4"
+  integrity sha512-fUwWcpDz9Wm4dSaz+6XmjoNXWBjZLJtT1Zf1cpLBELbCAOS8WBRscPtgOSfzm6JCqf5KgMI4g917f5TtEeez3A==
+
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
   dependencies:
-    "@sinclair/typebox" "^0.25.16"
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
-"@jest/types@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.2.tgz#8f724a414b1246b2bfd56ca5225d9e1f39540d82"
-  integrity sha512-CKlngyGP0fwlgC1BRUtPZSiWLBhyS9dKwKmyGxk8Z6M82LBEGB2aLQSg+U1MyLsU+M7UjnlLllBM2BLWKVm/Uw==
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
   dependencies:
-    "@jest/schemas" "^29.4.2"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
+    "@sinclair/typebox" "^0.27.8"
 
-"@jridgewell/sourcemap-codec@^1.4.13":
+"@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@mdi/font@7.1.96":
-  version "7.1.96"
-  resolved "https://registry.yarnpkg.com/@mdi/font/-/font-7.1.96.tgz#211ca4acfa31964278e5085de595e8c73967d400"
-  integrity sha512-Imag6npmfkBDi2Ze2jiZVAPTDIKLxhz2Sx82xJ2zctyAU5LYJejLI5ChnDwiD9bMkQfVuzEsI98Q8toHyC+HCg==
+"@mdi/font@7.4.47":
+  version "7.4.47"
+  resolved "https://registry.yarnpkg.com/@mdi/font/-/font-7.4.47.tgz#2ae522867da3a5c88b738d54b403eb91471903af"
+  integrity sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==
 
-"@mswjs/cookies@^0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@mswjs/cookies/-/cookies-0.2.2.tgz#b4e207bf6989e5d5427539c2443380a33ebb922b"
-  integrity sha512-mlN83YSrcFgk7Dm1Mys40DLssI1KdJji2CMKN8eOlBqsTADYzj2+jWzsANsUTFbxDMWPD5e9bfA1RGqBpS3O1g==
-  dependencies:
-    "@types/set-cookie-parser" "^2.4.0"
-    set-cookie-parser "^2.4.6"
+"@mswjs/cookies@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@mswjs/cookies/-/cookies-1.1.0.tgz#1528eb43630caf83a1d75d5332b30e75e9bb1b5b"
+  integrity sha512-0ZcCVQxifZmhwNBoQIrystCb+2sWBY2Zw8lpfJBPCHGCA/HWqehITeCRVIv4VMy8MPlaHo2w2pTHFV2pFfqKPw==
 
-"@mswjs/interceptors@^0.17.5":
-  version "0.17.9"
-  resolved "https://registry.yarnpkg.com/@mswjs/interceptors/-/interceptors-0.17.9.tgz#0096fc88fea63ee42e36836acae8f4ae33651c04"
-  integrity sha512-4LVGt03RobMH/7ZrbHqRxQrS9cc2uh+iNKSj8UWr8M26A2i793ju+csaB5zaqYltqJmA2jUq4VeYfKmVqvsXQg==
+"@mswjs/interceptors@^0.26.14":
+  version "0.26.15"
+  resolved "https://registry.yarnpkg.com/@mswjs/interceptors/-/interceptors-0.26.15.tgz#256ad5c89f325c87d972cc27fc7d0d6d382ce804"
+  integrity sha512-HM47Lu1YFmnYHKMBynFfjCp0U/yRskHj/8QEJW0CBEPOlw8Gkmjfll+S9b8M7V5CNDw2/ciRxjjnWeaCiblSIQ==
   dependencies:
-    "@open-draft/until" "^1.0.3"
-    "@types/debug" "^4.1.7"
-    "@xmldom/xmldom" "^0.8.3"
-    debug "^4.3.3"
-    headers-polyfill "^3.1.0"
+    "@open-draft/deferred-promise" "^2.2.0"
+    "@open-draft/logger" "^0.3.0"
+    "@open-draft/until" "^2.0.0"
+    is-node-process "^1.2.0"
     outvariant "^1.2.1"
-    strict-event-emitter "^0.2.4"
-    web-encoding "^1.1.5"
+    strict-event-emitter "^0.5.1"
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -313,10 +357,28 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@open-draft/until@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
-  integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==
+"@one-ini/wasm@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@one-ini/wasm/-/wasm-0.1.1.tgz#6013659736c9dbfccc96e8a9c2b3de317df39323"
+  integrity sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==
+
+"@open-draft/deferred-promise@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz#4a822d10f6f0e316be4d67b4d4f8c9a124b073bd"
+  integrity sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==
+
+"@open-draft/logger@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@open-draft/logger/-/logger-0.3.0.tgz#2b3ab1242b360aa0adb28b85f5d7da1c133a0954"
+  integrity sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==
+  dependencies:
+    is-node-process "^1.2.0"
+    outvariant "^1.4.0"
+
+"@open-draft/until@^2.0.0", "@open-draft/until@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-2.1.0.tgz#0acf32f470af2ceaf47f095cdecd40d68666efda"
+  integrity sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==
 
 "@pinia/testing@0.1.3":
   version "0.1.3"
@@ -325,596 +387,526 @@
   dependencies:
     vue-demi ">=0.14.5"
 
-"@rushstack/eslint-patch@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
-  integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
-
-"@sinclair/typebox@^0.25.16":
-  version "0.25.21"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272"
-  integrity sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@testing-library/dom@^9.0.1":
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.0.tgz#ed8ce10aa5e05eb6eaf0635b5b8975d889f66075"
-  integrity sha512-Dffe68pGwI6WlLRYR2I0piIkyole9cSBH5jGQKCGMRpHW5RHCqAUaqc2Kv0tUyd4dU4DLPKhJIjyKOnjv4tuUw==
+"@pkgr/core@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
+  integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
+
+"@rollup/rollup-android-arm-eabi@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.3.tgz#bddf05c3387d02fac04b6b86b3a779337edfed75"
+  integrity sha512-X9alQ3XM6I9IlSlmC8ddAvMSyG1WuHk5oUnXGw+yUBs3BFoTizmG1La/Gr8fVJvDWAq+zlYTZ9DBgrlKRVY06g==
+
+"@rollup/rollup-android-arm64@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.3.tgz#b26bd09de58704c0a45e3375b76796f6eda825e4"
+  integrity sha512-eQK5JIi+POhFpzk+LnjKIy4Ks+pwJ+NXmPxOCSvOKSNRPONzKuUvWE+P9JxGZVxrtzm6BAYMaL50FFuPe0oWMQ==
+
+"@rollup/rollup-darwin-arm64@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.3.tgz#c5f3fd1aa285b6d33dda6e3f3ca395f8c37fd5ca"
+  integrity sha512-Od4vE6f6CTT53yM1jgcLqNfItTsLt5zE46fdPaEmeFHvPs5SjZYlLpHrSiHEKR1+HdRfxuzXHjDOIxQyC3ptBA==
+
+"@rollup/rollup-darwin-x64@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.3.tgz#8e4673734d7dc9d68f6d48e81246055cda0e840f"
+  integrity sha512-0IMAO21axJeNIrvS9lSe/PGthc8ZUS+zC53O0VhF5gMxfmcKAP4ESkKOCwEi6u2asUrt4mQv2rjY8QseIEb1aw==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.3.tgz#53ed38eb13b58ababdb55a7f66f0538a7f85dcba"
+  integrity sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==
+
+"@rollup/rollup-linux-arm-musleabihf@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.14.3.tgz#0706ee38330e267a5c9326956820f009cfb21fcd"
+  integrity sha512-ljcuiDI4V3ySuc7eSk4lQ9wU8J8r8KrOUvB2U+TtK0TiW6OFDmJ+DdIjjwZHIw9CNxzbmXY39wwpzYuFDwNXuw==
+
+"@rollup/rollup-linux-arm64-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.3.tgz#426fce7b8b242ac5abd48a10a5020f5a468c6cb4"
+  integrity sha512-Eci2us9VTHm1eSyn5/eEpaC7eP/mp5n46gTRB3Aar3BgSvDQGJZuicyq6TsH4HngNBgVqC5sDYxOzTExSU+NjA==
+
+"@rollup/rollup-linux-arm64-musl@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.3.tgz#65bf944530d759b50d7ffd00dfbdf4125a43406f"
+  integrity sha512-UrBoMLCq4E92/LCqlh+blpqMz5h1tJttPIniwUgOFJyjWI1qrtrDhhpHPuFxULlUmjFHfloWdixtDhSxJt5iKw==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.3.tgz#494ba3b31095e9a45df9c3f646d21400fb631a95"
+  integrity sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==
+
+"@rollup/rollup-linux-riscv64-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.3.tgz#8b88ed0a40724cce04aa15374ebe5ba4092d679f"
+  integrity sha512-sk/Qh1j2/RJSX7FhEpJn8n0ndxy/uf0kI/9Zc4b1ELhqULVdTfN6HL31CDaTChiBAOgLcsJ1sgVZjWv8XNEsAQ==
+
+"@rollup/rollup-linux-s390x-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.3.tgz#09c9e5ec57a0f6ec3551272c860bb9a04b96d70f"
+  integrity sha512-jOO/PEaDitOmY9TgkxF/TQIjXySQe5KVYB57H/8LRP/ux0ZoO8cSHCX17asMSv3ruwslXW/TLBcxyaUzGRHcqg==
+
+"@rollup/rollup-linux-x64-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.3.tgz#197f27fd481ad9c861021d5cbbf21793922a631c"
+  integrity sha512-8ybV4Xjy59xLMyWo3GCfEGqtKV5M5gCSrZlxkPGvEPCGDLNla7v48S662HSGwRd6/2cSneMQWiv+QzcttLrrOA==
+
+"@rollup/rollup-linux-x64-musl@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.3.tgz#5cc0522f4942f2df625e9bfb6fb02c6580ffbce6"
+  integrity sha512-s+xf1I46trOY10OqAtZ5Rm6lzHre/UiLA1J2uOhCFXWkbZrJRkYBPO6FhvGfHmdtQ3Bx793MNa7LvoWFAm93bg==
+
+"@rollup/rollup-win32-arm64-msvc@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.3.tgz#a648122389d23a7543b261fba082e65fefefe4f6"
+  integrity sha512-+4h2WrGOYsOumDQ5S2sYNyhVfrue+9tc9XcLWLh+Kw3UOxAvrfOrSMFon60KspcDdytkNDh7K2Vs6eMaYImAZg==
+
+"@rollup/rollup-win32-ia32-msvc@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.3.tgz#34727b5c7953c35fc6e1ae4f770ad3a2025f8e03"
+  integrity sha512-T1l7y/bCeL/kUwh9OD4PQT4aM7Bq43vX05htPJJ46RTI4r5KNt6qJRzAfNfM+OYMNEVBWQzR2Gyk+FXLZfogGw==
+
+"@rollup/rollup-win32-x64-msvc@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.3.tgz#5b2fb4d8cd44c05deef8a7b0e6deb9ccb8939d18"
+  integrity sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==
+
+"@rushstack/eslint-patch@1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.2.tgz#053f1540703faa81dea2966b768ee5581c66aeda"
+  integrity sha512-hw437iINopmQuxWPSUEvqE56NCPsiU8N4AYtfHmJFckclktzK9YQJieD3XkDCDH4OjL+C7zgPUh73R/nrcHrqw==
+
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+
+"@testing-library/dom@^9.3.3":
+  version "9.3.4"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.4.tgz#50696ec28376926fec0a1bf87d9dbac5e27f60ce"
+  integrity sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
     "@types/aria-query" "^5.0.1"
-    aria-query "^5.0.0"
+    aria-query "5.1.3"
     chalk "^4.1.0"
     dom-accessibility-api "^0.5.9"
     lz-string "^1.5.0"
     pretty-format "^27.0.2"
 
-"@testing-library/jest-dom@5.16.5":
-  version "5.16.5"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e"
-  integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==
+"@testing-library/jest-dom@6.4.2":
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.4.2.tgz#38949f6b63722900e2d75ba3c6d9bf8cffb3300e"
+  integrity sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==
   dependencies:
-    "@adobe/css-tools" "^4.0.1"
+    "@adobe/css-tools" "^4.3.2"
     "@babel/runtime" "^7.9.2"
-    "@types/testing-library__jest-dom" "^5.9.1"
     aria-query "^5.0.0"
     chalk "^3.0.0"
     css.escape "^1.5.1"
-    dom-accessibility-api "^0.5.6"
+    dom-accessibility-api "^0.6.3"
     lodash "^4.17.15"
     redent "^3.0.0"
 
-"@testing-library/user-event@14.4.3":
-  version "14.4.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.4.3.tgz#af975e367743fa91989cd666666aec31a8f50591"
-  integrity sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==
+"@testing-library/user-event@14.5.2":
+  version "14.5.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd"
+  integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==
 
-"@testing-library/vue@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/vue/-/vue-7.0.0.tgz#b85957ec7c69069d52c27d10926dbbe842e7dfc4"
-  integrity sha512-JU/q93HGo2qdm1dCgWymkeQlfpC0/0/DBZ2nAHgEAsVZxX11xVIxT7gbXdI7HACQpUbsUWt1zABGU075Fzt9XQ==
+"@testing-library/vue@8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@testing-library/vue/-/vue-8.0.3.tgz#088bd8e6272fd5e38e9bf40cc195a1c346c314a6"
+  integrity sha512-wSsbNlZ69ZFQgVlHMtc/ZC/g9BHO7MhyDrd4nHyfEubtMr3kToN/w4/BsSBknGIF8w9UmPbsgbIuq/CbdBHzCA==
   dependencies:
-    "@babel/runtime" "^7.21.0"
-    "@testing-library/dom" "^9.0.1"
-    "@vue/test-utils" "^2.3.1"
-
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+    "@babel/runtime" "^7.23.2"
+    "@testing-library/dom" "^9.3.3"
+    "@vue/test-utils" "^2.4.1"
 
 "@types/aria-query@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
   integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==
 
-"@types/chai-subset@^1.3.3":
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz#97893814e92abd2c534de422cb377e0e0bdaac94"
-  integrity sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==
-  dependencies:
-    "@types/chai" "*"
-
-"@types/chai@*":
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4"
-  integrity sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==
-
-"@types/chai@^4.3.5":
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b"
-  integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==
-
-"@types/cookie@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
-  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
-
-"@types/debug@^4.1.7":
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317"
-  integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==
-  dependencies:
-    "@types/ms" "*"
-
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
-
-"@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
-  dependencies:
-    "@types/istanbul-lib-report" "*"
-
-"@types/jest@*":
-  version "29.4.0"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.4.0.tgz#a8444ad1704493e84dbf07bb05990b275b3b9206"
-  integrity sha512-VaywcGQ9tPorCX/Jkkni7RWGFfI11whqzs8dvxF41P17Z+z872thvEvlIbznjPJ02kl1HMX3LmLOonsj2n7HeQ==
-  dependencies:
-    expect "^29.0.0"
-    pretty-format "^29.0.0"
+"@types/cookie@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.6.0.tgz#eac397f28bf1d6ae0ae081363eca2f425bedf0d5"
+  integrity sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==
 
-"@types/js-levenshtein@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/js-levenshtein/-/js-levenshtein-1.1.1.tgz#ba05426a43f9e4e30b631941e0aa17bf0c890ed5"
-  integrity sha512-qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g==
+"@types/estree@1.0.5", "@types/estree@^1.0.0":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
-"@types/jsdom@21.1.0":
-  version "21.1.0"
-  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.0.tgz#219f15e3370da3f85d18fe02ae86bda7ff66104a"
-  integrity sha512-leWreJOdnuIxq9Y70tBVm/bvTuh31DSlF/r4l7Cfi4uhVQqLHD0Q4v301GMisEMwwbMgF7ZKxuZ+Jbd4NcdmRw==
+"@types/jsdom@21.1.6":
+  version "21.1.6"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.6.tgz#bcbc7b245787ea863f3da1ef19aa1dcfb9271a1b"
+  integrity sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==
   dependencies:
     "@types/node" "*"
     "@types/tough-cookie" "*"
     parse5 "^7.0.0"
 
-"@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+"@types/json-schema@^7.0.15":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
-"@types/ms@*":
-  version "0.7.31"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
-  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+"@types/mute-stream@^0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@types/mute-stream/-/mute-stream-0.0.4.tgz#77208e56a08767af6c5e1237be8888e2f255c478"
+  integrity sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==
+  dependencies:
+    "@types/node" "*"
 
-"@types/node@*", "@types/node@18.13.0":
+"@types/node@*":
   version "18.13.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.13.0.tgz#0400d1e6ce87e9d3032c19eb6c58205b0d3f7850"
   integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==
 
-"@types/semver@^7.3.12":
-  version "7.3.13"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
-  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
-
-"@types/set-cookie-parser@^2.4.0":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@types/set-cookie-parser/-/set-cookie-parser-2.4.2.tgz#b6a955219b54151bfebd4521170723df5e13caad"
-  integrity sha512-fBZgytwhYAUkj/jC/FAV4RQ5EerRup1YQsXQCh8rZfiHkc4UahC192oH0smGwsXol3cL3A5oETuAHeQHmhXM4w==
+"@types/node@20.12.7", "@types/node@^20.12.7":
+  version "20.12.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384"
+  integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==
   dependencies:
-    "@types/node" "*"
+    undici-types "~5.26.4"
 
-"@types/stack-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
-  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+"@types/semver@^7.5.8":
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
 
-"@types/testing-library__jest-dom@^5.9.1":
-  version "5.14.5"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f"
-  integrity sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==
-  dependencies:
-    "@types/jest" "*"
+"@types/statuses@^2.0.4":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/statuses/-/statuses-2.0.5.tgz#f61ab46d5352fd73c863a1ea4e1cef3b0b51ae63"
+  integrity sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==
 
 "@types/tough-cookie@*":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
   integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
 
-"@types/uuid@9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.2.tgz#ede1d1b1e451548d44919dc226253e32a6952c4b"
-  integrity sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==
+"@types/uuid@9.0.8":
+  version "9.0.8"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba"
+  integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==
 
-"@types/yargs-parser@*":
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
-  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
-
-"@types/yargs@^17.0.8":
-  version "17.0.22"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a"
-  integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@typescript-eslint/eslint-plugin@^5.0.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz#da3f2819633061ced84bb82c53bba45a6fe9963a"
-  integrity sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.51.0"
-    "@typescript-eslint/type-utils" "5.51.0"
-    "@typescript-eslint/utils" "5.51.0"
+"@types/wrap-ansi@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz#18b97a972f94f60a679fd5c796d96421b9abb9fd"
+  integrity sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==
+
+"@typescript-eslint/eslint-plugin@^7.1.1":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz#bf34a02f221811505b8bf2f31060c8560c1bb0a3"
+  integrity sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==
+  dependencies:
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "7.7.0"
+    "@typescript-eslint/type-utils" "7.7.0"
+    "@typescript-eslint/utils" "7.7.0"
+    "@typescript-eslint/visitor-keys" "7.7.0"
     debug "^4.3.4"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    regexpp "^3.2.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/parser@^5.0.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.51.0.tgz#2d74626652096d966ef107f44b9479f02f51f271"
-  integrity sha512-fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.51.0"
-    "@typescript-eslint/types" "5.51.0"
-    "@typescript-eslint/typescript-estree" "5.51.0"
+    graphemer "^1.4.0"
+    ignore "^5.3.1"
+    natural-compare "^1.4.0"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/parser@^7.1.1":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.7.0.tgz#6b1b3ce76c5de002c43af8ae933613b0f2b4bcc6"
+  integrity sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.7.0"
+    "@typescript-eslint/types" "7.7.0"
+    "@typescript-eslint/typescript-estree" "7.7.0"
+    "@typescript-eslint/visitor-keys" "7.7.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz#ad3e3c2ecf762d9a4196c0fbfe19b142ac498990"
-  integrity sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==
+"@typescript-eslint/scope-manager@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz#3f0db079b275bb8b0cb5be7613fb3130cfb5de77"
+  integrity sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==
   dependencies:
-    "@typescript-eslint/types" "5.51.0"
-    "@typescript-eslint/visitor-keys" "5.51.0"
+    "@typescript-eslint/types" "7.7.0"
+    "@typescript-eslint/visitor-keys" "7.7.0"
 
-"@typescript-eslint/type-utils@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz#7af48005531700b62a20963501d47dfb27095988"
-  integrity sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ==
+"@typescript-eslint/type-utils@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz#36792ff4209a781b058de61631a48df17bdefbc5"
+  integrity sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.51.0"
-    "@typescript-eslint/utils" "5.51.0"
+    "@typescript-eslint/typescript-estree" "7.7.0"
+    "@typescript-eslint/utils" "7.7.0"
     debug "^4.3.4"
-    tsutils "^3.21.0"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.51.0.tgz#e7c1622f46c7eea7e12bbf1edfb496d4dec37c90"
-  integrity sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==
+"@typescript-eslint/types@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.7.0.tgz#23af4d24bf9ce15d8d301236e3e3014143604f27"
+  integrity sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==
 
-"@typescript-eslint/typescript-estree@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz#0ec8170d7247a892c2b21845b06c11eb0718f8de"
-  integrity sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==
+"@typescript-eslint/typescript-estree@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz#b5dd6383b4c6a852d7b256a37af971e8982be97f"
+  integrity sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==
   dependencies:
-    "@typescript-eslint/types" "5.51.0"
-    "@typescript-eslint/visitor-keys" "5.51.0"
+    "@typescript-eslint/types" "7.7.0"
+    "@typescript-eslint/visitor-keys" "7.7.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.51.0.tgz#074f4fabd5b12afe9c8aa6fdee881c050f8b4d47"
-  integrity sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.51.0"
-    "@typescript-eslint/types" "5.51.0"
-    "@typescript-eslint/typescript-estree" "5.51.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-    semver "^7.3.7"
-
-"@typescript-eslint/visitor-keys@5.51.0":
-  version "5.51.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz#c0147dd9a36c0de758aaebd5b48cae1ec59eba87"
-  integrity sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==
-  dependencies:
-    "@typescript-eslint/types" "5.51.0"
-    eslint-visitor-keys "^3.3.0"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/utils@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.7.0.tgz#3d2b6606a60ac34f3c625facfb3b3ab7e126f58d"
+  integrity sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.15"
+    "@types/semver" "^7.5.8"
+    "@typescript-eslint/scope-manager" "7.7.0"
+    "@typescript-eslint/types" "7.7.0"
+    "@typescript-eslint/typescript-estree" "7.7.0"
+    semver "^7.6.0"
+
+"@typescript-eslint/visitor-keys@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz#950148cf1ac11562a2d903fdf7acf76714a2dc9e"
+  integrity sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==
+  dependencies:
+    "@typescript-eslint/types" "7.7.0"
+    eslint-visitor-keys "^3.4.3"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@vitejs/plugin-vue@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.0.0.tgz#93815beffd23db46288c787352a8ea31a0c03e5e"
-  integrity sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==
-
-"@vitest/expect@0.31.4":
-  version "0.31.4"
-  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.31.4.tgz#115c517404488bf3cb6ce4ac411c40d8e86891b8"
-  integrity sha512-tibyx8o7GUyGHZGyPgzwiaPaLDQ9MMuCOrc03BYT0nryUuhLbL7NV2r/q98iv5STlwMgaKuFJkgBW/8iPKwlSg==
-  dependencies:
-    "@vitest/spy" "0.31.4"
-    "@vitest/utils" "0.31.4"
-    chai "^4.3.7"
-
-"@vitest/runner@0.31.4":
-  version "0.31.4"
-  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.31.4.tgz#e99abee89132a500d9726a53b58dfc9160db1078"
-  integrity sha512-Wgm6UER+gwq6zkyrm5/wbpXGF+g+UBB78asJlFkIOwyse0pz8lZoiC6SW5i4gPnls/zUcPLWS7Zog0LVepXnpg==
-  dependencies:
-    "@vitest/utils" "0.31.4"
-    concordance "^5.0.4"
-    p-limit "^4.0.0"
-    pathe "^1.1.0"
+"@vitejs/plugin-vue@5.0.4":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz#508d6a0f2440f86945835d903fcc0d95d1bb8a37"
+  integrity sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==
 
-"@vitest/snapshot@0.31.4":
-  version "0.31.4"
-  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.31.4.tgz#59a42046fec4950a1ac70cf0ec64aada3b995559"
-  integrity sha512-LemvNumL3NdWSmfVAMpXILGyaXPkZbG5tyl6+RQSdcHnTj6hvA49UAI8jzez9oQyE/FWLKRSNqTGzsHuk89LRA==
+"@vitest/expect@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.5.0.tgz#961190510a2723bd4abf5540bcec0a4dfd59ef14"
+  integrity sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==
   dependencies:
-    magic-string "^0.30.0"
-    pathe "^1.1.0"
-    pretty-format "^27.5.1"
+    "@vitest/spy" "1.5.0"
+    "@vitest/utils" "1.5.0"
+    chai "^4.3.10"
 
-"@vitest/spy@0.31.4":
-  version "0.31.4"
-  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.31.4.tgz#fce8e348cea32deff79996d116c67893b19cc47d"
-  integrity sha512-3ei5ZH1s3aqbEyftPAzSuunGICRuhE+IXOmpURFdkm5ybUADk+viyQfejNk6q8M5QGX8/EVKw+QWMEP3DTJDag==
+"@vitest/runner@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.5.0.tgz#1f7cb78ee4064e73e53d503a19c1b211c03dfe0c"
+  integrity sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==
   dependencies:
-    tinyspy "^2.1.0"
+    "@vitest/utils" "1.5.0"
+    p-limit "^5.0.0"
+    pathe "^1.1.1"
 
-"@vitest/utils@0.31.4":
-  version "0.31.4"
-  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.31.4.tgz#5cfdcecfd604a7dbe3972cfe0f2b1e0af1246ad2"
-  integrity sha512-DobZbHacWznoGUfYU8XDPY78UubJxXfMNY1+SUdOp1NsI34eopSA6aZMeaGu10waSOeYwE8lxrd/pLfT0RMxjQ==
+"@vitest/snapshot@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.5.0.tgz#cd2d611fd556968ce8fb6b356a09b4593c525947"
+  integrity sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==
   dependencies:
-    concordance "^5.0.4"
-    loupe "^2.3.6"
-    pretty-format "^27.5.1"
-
-"@volar/language-core@1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.0.24.tgz#5d767571e77728464635e61af1debca944811fe0"
-  integrity sha512-vTN+alJiWwK0Pax6POqrmevbtFW2dXhjwWiW/MW4f48eDYPLdyURWcr8TixO7EN/nHsUBj2udT7igFKPtjyAKg==
-  dependencies:
-    "@volar/source-map" "1.0.24"
-    muggle-string "^0.1.0"
-
-"@volar/source-map@1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.0.24.tgz#ad4c827fea5c26b4bf38a86d983e7deb65b1c61e"
-  integrity sha512-Qsv/tkplx18pgBr8lKAbM1vcDqgkGKQzbChg6NW+v0CZc3G7FLmK+WrqEPzKlN7Cwdc6XVL559Nod8WKAfKr4A==
-  dependencies:
-    muggle-string "^0.1.0"
-
-"@volar/typescript@1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.0.24.tgz#f934eda9774b31abdff53efc56782cd2623723d5"
-  integrity sha512-f8hCSk+PfKR1/RQHxZ79V1NpDImHoivqoizK+mstphm25tn/YJ/JnKNjZHB+o21fuW0yKlI26NV3jkVb2Cc/7A==
-  dependencies:
-    "@volar/language-core" "1.0.24"
-
-"@volar/vue-language-core@1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.0.24.tgz#81d180a8e09a53cb575e83acb79a31493891a1a4"
-  integrity sha512-2NTJzSgrwKu6uYwPqLiTMuAzi7fAY3yFy5PJ255bGJc82If0Xr+cW8pC80vpjG0D/aVLmlwAdO4+Ya2BI8GdDg==
-  dependencies:
-    "@volar/language-core" "1.0.24"
-    "@volar/source-map" "1.0.24"
-    "@vue/compiler-dom" "^3.2.45"
-    "@vue/compiler-sfc" "^3.2.45"
-    "@vue/reactivity" "^3.2.45"
-    "@vue/shared" "^3.2.45"
-    minimatch "^5.1.1"
-    vue-template-compiler "^2.7.14"
+    magic-string "^0.30.5"
+    pathe "^1.1.1"
+    pretty-format "^29.7.0"
 
-"@volar/vue-typescript@1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.0.24.tgz#bef9b2bfb1b108c0f6cb12ec6fbf449b43fc8257"
-  integrity sha512-9a25oHDvGaNC0okRS47uqJI6FxY4hUQZUsxeOUFHcqVxZEv8s17LPuP/pMMXyz7jPygrZubB/qXqHY5jEu/akA==
+"@vitest/spy@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.5.0.tgz#1369a1bec47f46f18eccfa45f1e8fbb9b5e15e77"
+  integrity sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==
   dependencies:
-    "@volar/typescript" "1.0.24"
-    "@volar/vue-language-core" "1.0.24"
+    tinyspy "^2.2.0"
 
-"@vue/compiler-core@3.2.47":
-  version "3.2.47"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.47.tgz#3e07c684d74897ac9aa5922c520741f3029267f8"
-  integrity sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==
+"@vitest/utils@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-1.5.0.tgz#90c9951f4516f6d595da24876b58e615f6c99863"
+  integrity sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==
   dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/shared" "3.2.47"
-    estree-walker "^2.0.2"
-    source-map "^0.6.1"
+    diff-sequences "^29.6.3"
+    estree-walker "^3.0.3"
+    loupe "^2.3.7"
+    pretty-format "^29.7.0"
 
-"@vue/compiler-core@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.4.tgz#7fbf591c1c19e1acd28ffd284526e98b4f581128"
-  integrity sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==
+"@volar/language-core@2.2.0-alpha.8":
+  version "2.2.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.2.0-alpha.8.tgz#74120a27ff2498ad297e86d17be95a9c7e1b46f5"
+  integrity sha512-Ew1Iw7/RIRNuDLn60fWJdOLApAlfTVPxbPiSLzc434PReC9kleYtaa//Wo2WlN1oiRqneW0pWQQV0CwYqaimLQ==
   dependencies:
-    "@babel/parser" "^7.21.3"
-    "@vue/shared" "3.3.4"
-    estree-walker "^2.0.2"
-    source-map-js "^1.0.2"
+    "@volar/source-map" "2.2.0-alpha.8"
 
-"@vue/compiler-dom@3.2.47", "@vue/compiler-dom@^3.0.1", "@vue/compiler-dom@^3.2.45":
-  version "3.2.47"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz#a0b06caf7ef7056939e563dcaa9cbde30794f305"
-  integrity sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==
+"@volar/source-map@2.2.0-alpha.8":
+  version "2.2.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.2.0-alpha.8.tgz#ca090f828fbef7e09ea06a636c41a06aa2afe153"
+  integrity sha512-E1ZVmXFJ5DU4fWDcWHzi8OLqqReqIDwhXvIMhVdk6+VipfMVv4SkryXu7/rs4GA/GsebcRyJdaSkKBB3OAkIcA==
   dependencies:
-    "@vue/compiler-core" "3.2.47"
-    "@vue/shared" "3.2.47"
+    muggle-string "^0.4.0"
 
-"@vue/compiler-dom@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz#f56e09b5f4d7dc350f981784de9713d823341151"
-  integrity sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==
+"@volar/typescript@2.2.0-alpha.8":
+  version "2.2.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.2.0-alpha.8.tgz#83a056c52995b4142364be3dda41d955a96f7356"
+  integrity sha512-RLbRDI+17CiayHZs9HhSzlH0FhLl/+XK6o2qoiw2o2GGKcyD1aDoY6AcMd44acYncTOrqoTNoY6LuCiRyiJiGg==
   dependencies:
-    "@vue/compiler-core" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@volar/language-core" "2.2.0-alpha.8"
+    path-browserify "^1.0.1"
 
-"@vue/compiler-sfc@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz#b19d942c71938893535b46226d602720593001df"
-  integrity sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==
-  dependencies:
-    "@babel/parser" "^7.20.15"
-    "@vue/compiler-core" "3.3.4"
-    "@vue/compiler-dom" "3.3.4"
-    "@vue/compiler-ssr" "3.3.4"
-    "@vue/reactivity-transform" "3.3.4"
-    "@vue/shared" "3.3.4"
+"@vue/compiler-core@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.23.tgz#a08f5998e391ad75e602a66dd7255af9054df2f3"
+  integrity sha512-HAFmuVEwNqNdmk+w4VCQ2pkLk1Vw4XYiiyxEp3z/xvl14aLTUBw2OfVH3vBcx+FtGsynQLkkhK410Nah1N2yyQ==
+  dependencies:
+    "@babel/parser" "^7.24.1"
+    "@vue/shared" "3.4.23"
+    entities "^4.5.0"
     estree-walker "^2.0.2"
-    magic-string "^0.30.0"
-    postcss "^8.1.10"
-    source-map-js "^1.0.2"
-
-"@vue/compiler-sfc@^3.2.45":
-  version "3.2.47"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz#1bdc36f6cdc1643f72e2c397eb1a398f5004ad3d"
-  integrity sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==
-  dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.47"
-    "@vue/compiler-dom" "3.2.47"
-    "@vue/compiler-ssr" "3.2.47"
-    "@vue/reactivity-transform" "3.2.47"
-    "@vue/shared" "3.2.47"
+    source-map-js "^1.2.0"
+
+"@vue/compiler-dom@3.4.23", "@vue/compiler-dom@^3.4.0":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.23.tgz#6fa622d1e5c8508551564c5dc5948e9cddf60867"
+  integrity sha512-t0b9WSTnCRrzsBGrDd1LNR5HGzYTr7LX3z6nNBG+KGvZLqrT0mY6NsMzOqlVMBKKXKVuusbbB5aOOFgTY+senw==
+  dependencies:
+    "@vue/compiler-core" "3.4.23"
+    "@vue/shared" "3.4.23"
+
+"@vue/compiler-sfc@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.23.tgz#7041517b9bbd1b304f0db33bfa424e9a899fda8d"
+  integrity sha512-fSDTKTfzaRX1kNAUiaj8JB4AokikzStWgHooMhaxyjZerw624L+IAP/fvI4ZwMpwIh8f08PVzEnu4rg8/Npssw==
+  dependencies:
+    "@babel/parser" "^7.24.1"
+    "@vue/compiler-core" "3.4.23"
+    "@vue/compiler-dom" "3.4.23"
+    "@vue/compiler-ssr" "3.4.23"
+    "@vue/shared" "3.4.23"
     estree-walker "^2.0.2"
-    magic-string "^0.25.7"
-    postcss "^8.1.10"
-    source-map "^0.6.1"
-
-"@vue/compiler-ssr@3.2.47":
-  version "3.2.47"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz#35872c01a273aac4d6070ab9d8da918ab13057ee"
-  integrity sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==
-  dependencies:
-    "@vue/compiler-dom" "3.2.47"
-    "@vue/shared" "3.2.47"
+    magic-string "^0.30.8"
+    postcss "^8.4.38"
+    source-map-js "^1.2.0"
 
-"@vue/compiler-ssr@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz#9d1379abffa4f2b0cd844174ceec4a9721138777"
-  integrity sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==
+"@vue/compiler-ssr@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.23.tgz#1ae4afe962a9e156b1a79eff909c37cd423dd4c2"
+  integrity sha512-hb6Uj2cYs+tfqz71Wj6h3E5t6OKvb4MVcM2Nl5i/z1nv1gjEhw+zYaNOV+Xwn+SSN/VZM0DgANw5TuJfxfezPg==
   dependencies:
-    "@vue/compiler-dom" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/compiler-dom" "3.4.23"
+    "@vue/shared" "3.4.23"
 
-"@vue/devtools-api@^6.2.1", "@vue/devtools-api@^6.5.0":
+"@vue/devtools-api@^6.5.0":
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz#98b99425edee70b4c992692628fa1ea2c1e57d07"
   integrity sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==
 
-"@vue/eslint-config-prettier@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz#44ab55ca22401102b57795c59428e9dade72be34"
-  integrity sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw==
-  dependencies:
-    eslint-config-prettier "^8.3.0"
-    eslint-plugin-prettier "^4.0.0"
-
-"@vue/eslint-config-typescript@11.0.2":
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz#03353f404d4472900794e653450bb6623de3c642"
-  integrity sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==
-  dependencies:
-    "@typescript-eslint/eslint-plugin" "^5.0.0"
-    "@typescript-eslint/parser" "^5.0.0"
-    vue-eslint-parser "^9.0.0"
-
-"@vue/reactivity-transform@3.2.47":
-  version "3.2.47"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz#e45df4d06370f8abf29081a16afd25cffba6d84e"
-  integrity sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==
-  dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.47"
-    "@vue/shared" "3.2.47"
-    estree-walker "^2.0.2"
-    magic-string "^0.25.7"
+"@vue/devtools-api@^6.5.1":
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
+  integrity sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==
 
-"@vue/reactivity-transform@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz#52908476e34d6a65c6c21cd2722d41ed8ae51929"
-  integrity sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==
-  dependencies:
-    "@babel/parser" "^7.20.15"
-    "@vue/compiler-core" "3.3.4"
-    "@vue/shared" "3.3.4"
-    estree-walker "^2.0.2"
-    magic-string "^0.30.0"
-
-"@vue/reactivity@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.4.tgz#a27a29c6cd17faba5a0e99fbb86ee951653e2253"
-  integrity sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==
-  dependencies:
-    "@vue/shared" "3.3.4"
+"@vue/eslint-config-prettier@9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#f63394f8f7759d92b6ef3f3e1d30ff6b0c0b97c1"
+  integrity sha512-z1ZIAAUS9pKzo/ANEfd2sO+v2IUalz7cM/cTLOZ7vRFOPk5/xuRKQteOu1DErFLAh/lYGXMVZ0IfYKlyInuDVg==
+  dependencies:
+    eslint-config-prettier "^9.0.0"
+    eslint-plugin-prettier "^5.0.0"
+
+"@vue/eslint-config-typescript@13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-13.0.0.tgz#f5f3d986ace34a10f403921d5044831b89a1b679"
+  integrity sha512-MHh9SncG/sfqjVqjcuFLOLD6Ed4dRAis4HNt0dXASeAuLqIAx4YMB1/m2o4pUKK1vCt8fUvYG8KKX2Ot3BVZTg==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "^7.1.1"
+    "@typescript-eslint/parser" "^7.1.1"
+    vue-eslint-parser "^9.3.1"
+
+"@vue/language-core@2.0.13":
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.0.13.tgz#2d1638b882011187b4b57115425d52b0901acab5"
+  integrity sha512-oQgM+BM66SU5GKtUMLQSQN0bxHFkFpLSSAiY87wVziPaiNQZuKVDt/3yA7GB9PiQw0y/bTNL0bOc0jM/siYjKg==
+  dependencies:
+    "@volar/language-core" "2.2.0-alpha.8"
+    "@vue/compiler-dom" "^3.4.0"
+    "@vue/shared" "^3.4.0"
+    computeds "^0.0.1"
+    minimatch "^9.0.3"
+    path-browserify "^1.0.1"
+    vue-template-compiler "^2.7.14"
 
-"@vue/reactivity@^3.2.45":
-  version "3.2.47"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.47.tgz#1d6399074eadfc3ed35c727e2fd707d6881140b6"
-  integrity sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==
+"@vue/reactivity@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.23.tgz#f29044a90a24994af075e4368790f31fa29ed747"
+  integrity sha512-GlXR9PL+23fQ3IqnbSQ8OQKLodjqCyoCrmdLKZk3BP7jN6prWheAfU7a3mrltewTkoBm+N7qMEb372VHIkQRMQ==
   dependencies:
-    "@vue/shared" "3.2.47"
+    "@vue/shared" "3.4.23"
 
-"@vue/runtime-core@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.4.tgz#4bb33872bbb583721b340f3088888394195967d1"
-  integrity sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==
+"@vue/runtime-core@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.23.tgz#21f6c7153c33f56081145c2819c2f194cbe3eb22"
+  integrity sha512-FeQ9MZEXoFzFkFiw9MQQ/FWs3srvrP+SjDKSeRIiQHIhtkzoj0X4rWQlRNHbGuSwLra6pMyjAttwixNMjc/xLw==
   dependencies:
-    "@vue/reactivity" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/reactivity" "3.4.23"
+    "@vue/shared" "3.4.23"
 
-"@vue/runtime-dom@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz#992f2579d0ed6ce961f47bbe9bfe4b6791251566"
-  integrity sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==
+"@vue/runtime-dom@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.23.tgz#d5a9cca88b445de125c57e6b0d73faa2491e853f"
+  integrity sha512-RXJFwwykZWBkMiTPSLEWU3kgVLNAfActBfWFlZd0y79FTUxexogd0PLG4HH2LfOktjRxV47Nulygh0JFXe5f9A==
   dependencies:
-    "@vue/runtime-core" "3.3.4"
-    "@vue/shared" "3.3.4"
-    csstype "^3.1.1"
+    "@vue/runtime-core" "3.4.23"
+    "@vue/shared" "3.4.23"
+    csstype "^3.1.3"
 
-"@vue/server-renderer@3.3.4", "@vue/server-renderer@^3.0.1":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.4.tgz#ea46594b795d1536f29bc592dd0f6655f7ea4c4c"
-  integrity sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==
+"@vue/server-renderer@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.23.tgz#e605872e26d995f5ba9382e8758cd8cc7fa2e16d"
+  integrity sha512-LDwGHtnIzvKFNS8dPJ1SSU5Gvm36p2ck8wCZc52fc3k/IfjKcwCyrWEf0Yag/2wTFUBXrqizfhK9c/mC367dXQ==
   dependencies:
-    "@vue/compiler-ssr" "3.3.4"
-    "@vue/shared" "3.3.4"
-
-"@vue/shared@3.2.47", "@vue/shared@^3.2.45":
-  version "3.2.47"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.47.tgz#e597ef75086c6e896ff5478a6bfc0a7aa4bbd14c"
-  integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==
+    "@vue/compiler-ssr" "3.4.23"
+    "@vue/shared" "3.4.23"
 
-"@vue/shared@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
-  integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
+"@vue/shared@3.4.23", "@vue/shared@^3.4.0":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.23.tgz#e536a6dfd2f5f950d08c2e8ebcfe7e5329a851a1"
+  integrity sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==
 
-"@vue/test-utils@2.3.2", "@vue/test-utils@^2.3.1":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.3.2.tgz#b47ce6d7be7bf9700e0bb4322410e4cd8724d277"
-  integrity sha512-hJnVaYhbrIm0yBS0+e1Y0Sj85cMyAi+PAbK4JHqMRUZ6S622Goa+G7QzkRSyvCteG8wop7tipuEbHoZo26wsSA==
+"@vue/test-utils@2.4.5", "@vue/test-utils@^2.4.1":
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.4.5.tgz#010aa4debe6602d83dc75f233b397092742105a2"
+  integrity sha512-oo2u7vktOyKUked36R93NB7mg2B+N7Plr8lxp2JBGwr18ch6EggFjixSCdIVVLkT6Qr0z359Xvnafc9dcKyDUg==
   dependencies:
-    js-beautify "1.14.6"
-  optionalDependencies:
-    "@vue/compiler-dom" "^3.0.1"
-    "@vue/server-renderer" "^3.0.1"
+    js-beautify "^1.14.9"
+    vue-component-type-helpers "^2.0.0"
 
 "@vue/tsconfig@0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@vue/tsconfig/-/tsconfig-0.1.3.tgz#4a61dbd29783d01ddab504276dcf0c2b6988654f"
   integrity sha512-kQVsh8yyWPvHpb8gIc9l/HIDiiVUy1amynLNpCy8p+FoCiZXCo6fQos5/097MmnNZc9AtseDsCrfkhqCrJ8Olg==
 
-"@vuetify/loader-shared@^1.7.1":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@vuetify/loader-shared/-/loader-shared-1.7.1.tgz#0f63a3d41b6df29a2db1ff438aa1819b237c37a3"
-  integrity sha512-kLUvuAed6RCvkeeTNJzuy14pqnkur8lTuner7v7pNE/kVhPR97TuyXwBSBMR1cJeiLiOfu6SF5XlCYbXByEx1g==
+"@vuetify/loader-shared@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@vuetify/loader-shared/-/loader-shared-2.0.3.tgz#11451c717e4a352ec311da52a79c857cd256c92f"
+  integrity sha512-Ss3GC7eJYkp2SF6xVzsT7FAruEmdihmn4OCk2+UocREerlXKWgOKKzTN5PN3ZVN5q05jHHrsNhTuWbhN61Bpdg==
   dependencies:
-    find-cache-dir "^3.3.2"
     upath "^2.0.1"
 
-"@xmldom/xmldom@^0.8.3":
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.8.tgz#d0d11511cbc1de77e53342ad1546a4d487d6ea72"
-  integrity sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q==
-
-"@zxing/text-encoding@0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b"
-  integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==
-
-abab@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
-  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
-
-abbrev@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+abbrev@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
+  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
 
 accepts@~1.3.5, accepts@~1.3.7, accepts@~1.3.8:
   version "1.3.8"
@@ -924,34 +916,39 @@ accepts@~1.3.5, accepts@~1.3.7, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-ace-builds@1.28.0:
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.28.0.tgz#b606702c33dec470393531d9808a1082add8302b"
-  integrity sha512-wkJp+Wz8MRHtCVdt65L/jPFLAQ0iqJZ2EeD2XWOvKGbIi4mZNwHlpHRLRB8ZnQ07VoiB0TLFWwIjjm2FL9gUcQ==
+ace-builds@1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.33.0.tgz#3b6fb993a4b1d3f2b5923aecded098e13e6527d8"
+  integrity sha512-PDvytkZNvAfuh+PaP5Oy3l3sBGd7xMk4NsB+4w/w1e3gjBqEOGeJwcX+wF/SB6mLtT3VfJLrhDNPT3eaCjtR3w==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+acorn-walk@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
+  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
+
+acorn@^8.11.3, acorn@^8.9.0:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
 acorn@^8.8.0, acorn@^8.8.2:
   version "8.8.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
   dependencies:
-    debug "4"
+    debug "^4.3.4"
 
-ajv@^6.10.0, ajv@^6.12.4:
+ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -961,18 +958,49 @@ ajv@^6.10.0, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ansi-escapes@^4.2.1:
+allure-commandline@2.30.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/allure-commandline/-/allure-commandline-2.30.0.tgz#c121021d263cad2474ec0fd7490de4d3c65a06f3"
+  integrity sha512-qSaGG/I8P38q8gufnxvEog+IrIeCick+PJxxoTp5Vh/L8kviymIfv3A7fvYWziOqZ/oDywyOuNFMEfPZiiKwAA==
+
+allure-js-commons@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/allure-js-commons/-/allure-js-commons-2.15.1.tgz#570285472c80759017de699035218821fd12a7d3"
+  integrity sha512-5V/VINplbu0APnfSZOkYpKOzucO36Q2EtTD1kqjWjl7n6tj7Hh+IHCZsH3Vpk/LXRDfj9RuXugBBvwYKV5YMJw==
+  dependencies:
+    md5 "^2.3.0"
+    properties "^1.2.1"
+    strip-ansi "^5.2.0"
+
+allure-vitest@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/allure-vitest/-/allure-vitest-2.15.1.tgz#2befeae639450bccf4c7fdc60b936779ca7b6d3a"
+  integrity sha512-/G2lVJzUP5VB7AEDKy/KoU7z8JNNtPwXDNV4ZzSus3/QLzYVayVYpJd3S1XZbNrULK23z8PWUufBGQD8nIdjZA==
+  dependencies:
+    allure-js-commons "2.15.1"
+
+ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
     type-fest "^0.21.3"
 
+ansi-regex@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -992,6 +1020,11 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
@@ -1005,7 +1038,7 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@^5.0.0:
+aria-query@5.1.3, aria-query@^5.0.0:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
   integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
@@ -1037,12 +1070,12 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-axios@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
-  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
+axios@1.6.8:
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
+  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
   dependencies:
-    follow-redirects "^1.15.0"
+    follow-redirects "^1.15.6"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
@@ -1056,11 +1089,6 @@ base64-arraybuffer@1.0.2:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
   integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
 
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 basic-auth@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
@@ -1073,20 +1101,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bl@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-blueimp-md5@^2.10.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0"
-  integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==
-
 body-parser@1.20.1, body-parser@^1.19.0:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
@@ -1132,14 +1146,6 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-buffer@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -1168,26 +1174,18 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-chai@^4.3.7:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51"
-  integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==
+chai@^4.3.10:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.4.1.tgz#3603fa6eba35425b0f2ac91a009fe924106e50d1"
+  integrity sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==
   dependencies:
     assertion-error "^1.1.0"
-    check-error "^1.0.2"
-    deep-eql "^4.1.2"
-    get-func-name "^2.0.0"
-    loupe "^2.3.1"
+    check-error "^1.0.3"
+    deep-eql "^4.1.3"
+    get-func-name "^2.0.2"
+    loupe "^2.3.6"
     pathval "^1.1.1"
-    type-detect "^4.0.5"
-
-chalk@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
-  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
+    type-detect "^4.0.8"
 
 chalk@^2.0.0, chalk@^2.4.1:
   version "2.4.2"
@@ -1206,7 +1204,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -1214,17 +1212,19 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+charenc@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+  integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
+check-error@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694"
+  integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==
+  dependencies:
+    get-func-name "^2.0.2"
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2:
+"chokidar@>=3.0.0 <4.0.0":
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -1239,27 +1239,15 @@ check-error@^1.0.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
-ci-info@^3.2.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-spinners@^2.5.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db"
-  integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==
+cli-spinners@^2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
+  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
 
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+cli-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5"
+  integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==
 
 cliui@^8.0.1:
   version "8.0.1"
@@ -1270,11 +1258,6 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -1306,15 +1289,10 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.19.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
+commander@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
 compressible@~2.0.16:
   version "2.0.18"
@@ -1336,25 +1314,16 @@ compression@^1.7.4:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
+computeds@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/computeds/-/computeds-0.0.1.tgz#215b08a4ba3e08a11ff6eee5d6d8d7166a97ce2e"
+  integrity sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concordance@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/concordance/-/concordance-5.0.4.tgz#9896073261adced72f88d60e4d56f8efc4bbbbd2"
-  integrity sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==
-  dependencies:
-    date-time "^3.1.0"
-    esutils "^2.0.3"
-    fast-diff "^1.2.0"
-    js-string-escape "^1.0.1"
-    lodash "^4.17.15"
-    md5-hex "^3.0.1"
-    semver "^7.3.2"
-    well-known-symbols "^2.0.0"
-
 config-chain@^1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
@@ -1363,11 +1332,6 @@ config-chain@^1.1.13:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-connect-history-api-fallback@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
-
 connect-pause@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/connect-pause/-/connect-pause-0.1.1.tgz#b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"
@@ -1390,16 +1354,11 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.5.0:
+cookie@0.5.0, cookie@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
-cookie@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
-
 cors@^2.8.5:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
@@ -1419,7 +1378,7 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -1428,6 +1387,11 @@ cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+crypt@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+  integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
+
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
@@ -1438,40 +1402,32 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssstyle@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a"
-  integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==
+cssstyle@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.0.1.tgz#ef29c598a1e90125c870525490ea4f354db0660a"
+  integrity sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==
   dependencies:
     rrweb-cssom "^0.6.0"
 
-csstype@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
-  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
-
-data-urls@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4"
-  integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==
-  dependencies:
-    abab "^2.0.6"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^12.0.0"
+csstype@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-date-time@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/date-time/-/date-time-3.1.0.tgz#0d1e934d170579f481ed8df1e2b8ff70ee845e1e"
-  integrity sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
   dependencies:
-    time-zone "^1.0.0"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
 
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
   integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
 
-debug@*, debug@4, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+debug@*, debug@4, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -1502,7 +1458,7 @@ decode-uri-component@^0.4.1:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.4.1.tgz#2ac4859663c704be22bf7db760a1494a49ab2cc5"
   integrity sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==
 
-deep-eql@^4.1.2:
+deep-eql@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d"
   integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==
@@ -1537,13 +1493,6 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
-  dependencies:
-    clone "^1.0.2"
-
 define-properties@^1.1.3, define-properties@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
@@ -1567,10 +1516,10 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-diff-sequences@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.2.tgz#711fe6bd8a5869fe2539cee4a5152425ff671fda"
-  integrity sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw==
+diff-sequences@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -1586,27 +1535,30 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9:
+dom-accessibility-api@^0.5.9:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453"
   integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==
 
-domexception@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
-  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
-  dependencies:
-    webidl-conversions "^7.0.0"
+dom-accessibility-api@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz#993e925cc1d73f2c662e7d75dd5a5445259a8fd8"
+  integrity sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==
 
-editorconfig@^0.15.3:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
-  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
+editorconfig@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-1.0.4.tgz#040c9a8e9a6c5288388b87c2db07028aa89f53a3"
+  integrity sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==
   dependencies:
-    commander "^2.19.0"
-    lru-cache "^4.1.5"
-    semver "^5.6.0"
-    sigmund "^1.0.1"
+    "@one-ini/wasm" "0.1.1"
+    commander "^10.0.0"
+    minimatch "9.0.1"
+    semver "^7.5.3"
 
 ee-first@1.1.1:
   version "1.1.1"
@@ -1618,6 +1570,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -1628,6 +1585,11 @@ entities@^4.4.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
   integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
 
+entities@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -1715,33 +1677,34 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild@^0.16.14:
-  version "0.16.17"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.17.tgz#fc2c3914c57ee750635fee71b89f615f25065259"
-  integrity sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==
+esbuild@^0.20.1:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
   optionalDependencies:
-    "@esbuild/android-arm" "0.16.17"
-    "@esbuild/android-arm64" "0.16.17"
-    "@esbuild/android-x64" "0.16.17"
-    "@esbuild/darwin-arm64" "0.16.17"
-    "@esbuild/darwin-x64" "0.16.17"
-    "@esbuild/freebsd-arm64" "0.16.17"
-    "@esbuild/freebsd-x64" "0.16.17"
-    "@esbuild/linux-arm" "0.16.17"
-    "@esbuild/linux-arm64" "0.16.17"
-    "@esbuild/linux-ia32" "0.16.17"
-    "@esbuild/linux-loong64" "0.16.17"
-    "@esbuild/linux-mips64el" "0.16.17"
-    "@esbuild/linux-ppc64" "0.16.17"
-    "@esbuild/linux-riscv64" "0.16.17"
-    "@esbuild/linux-s390x" "0.16.17"
-    "@esbuild/linux-x64" "0.16.17"
-    "@esbuild/netbsd-x64" "0.16.17"
-    "@esbuild/openbsd-x64" "0.16.17"
-    "@esbuild/sunos-x64" "0.16.17"
-    "@esbuild/win32-arm64" "0.16.17"
-    "@esbuild/win32-ia32" "0.16.17"
-    "@esbuild/win32-x64" "0.16.17"
+    "@esbuild/aix-ppc64" "0.20.2"
+    "@esbuild/android-arm" "0.20.2"
+    "@esbuild/android-arm64" "0.20.2"
+    "@esbuild/android-x64" "0.20.2"
+    "@esbuild/darwin-arm64" "0.20.2"
+    "@esbuild/darwin-x64" "0.20.2"
+    "@esbuild/freebsd-arm64" "0.20.2"
+    "@esbuild/freebsd-x64" "0.20.2"
+    "@esbuild/linux-arm" "0.20.2"
+    "@esbuild/linux-arm64" "0.20.2"
+    "@esbuild/linux-ia32" "0.20.2"
+    "@esbuild/linux-loong64" "0.20.2"
+    "@esbuild/linux-mips64el" "0.20.2"
+    "@esbuild/linux-ppc64" "0.20.2"
+    "@esbuild/linux-riscv64" "0.20.2"
+    "@esbuild/linux-s390x" "0.20.2"
+    "@esbuild/linux-x64" "0.20.2"
+    "@esbuild/netbsd-x64" "0.20.2"
+    "@esbuild/openbsd-x64" "0.20.2"
+    "@esbuild/sunos-x64" "0.20.2"
+    "@esbuild/win32-arm64" "0.20.2"
+    "@esbuild/win32-ia32" "0.20.2"
+    "@esbuild/win32-x64" "0.20.2"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -1758,54 +1721,43 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-prettier@^8.3.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz#dec1d29ab728f4fa63061774e1672ac4e363d207"
-  integrity sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==
+eslint-config-prettier@^9.0.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
+  integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
 
-eslint-plugin-prettier@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
-  integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
+eslint-plugin-prettier@^5.0.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz#17cfade9e732cef32b5f5be53bd4e07afd8e67e1"
+  integrity sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==
   dependencies:
     prettier-linter-helpers "^1.0.0"
+    synckit "^0.8.6"
 
 eslint-plugin-sort-imports-es6-autofix@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-sort-imports-es6-autofix/-/eslint-plugin-sort-imports-es6-autofix-0.6.0.tgz#b8cd8639d7a54cefce6b17898b102fd5ec31e52b"
   integrity sha512-2NVaBGF9NN+727Fyq+jJYihdIeegjXeUUrZED9Q8FVB8MsV3YQEyXG96GVnXqWt0pmn7xfCZOZf3uKnIhBrfeQ==
 
-eslint-plugin-vue@9.9.0:
-  version "9.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz#ac788ebccd2eb94d846a507df55da50693b80c91"
-  integrity sha512-YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ==
+eslint-plugin-vue@9.25.0:
+  version "9.25.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.25.0.tgz#615cb7bb6d0e2140d21840b9aa51dce69e803e7a"
+  integrity sha512-tDWlx14bVe6Bs+Nnh3IGrD+hb11kf2nukfm6jLsmJIhmiRQ1SUaksvwY9U5MvPB0pcrg0QK0xapQkfITs3RKOA==
   dependencies:
-    eslint-utils "^3.0.0"
+    "@eslint-community/eslint-utils" "^4.4.0"
+    globals "^13.24.0"
     natural-compare "^1.4.0"
-    nth-check "^2.0.1"
-    postcss-selector-parser "^6.0.9"
-    semver "^7.3.5"
-    vue-eslint-parser "^9.0.1"
+    nth-check "^2.1.1"
+    postcss-selector-parser "^6.0.15"
+    semver "^7.6.0"
+    vue-eslint-parser "^9.4.2"
     xml-name-validator "^4.0.0"
 
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
@@ -1814,69 +1766,69 @@ eslint-scope@^7.1.1:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@8.34.0:
-  version "8.34.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.34.0.tgz#fe0ab0ef478104c1f9ebc5537e303d25a8fb22d6"
-  integrity sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==
-  dependencies:
-    "@eslint/eslintrc" "^1.4.1"
-    "@humanwhocodes/config-array" "^0.11.8"
+eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint@8.57.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.4.0"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
     globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.3.1, espree@^9.4.0:
+espree@^9.3.1:
   version "9.4.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
   integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
@@ -1885,6 +1837,15 @@ espree@^9.3.1, espree@^9.4.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
 esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
@@ -1892,6 +1853,13 @@ esquery@^1.4.0:
   dependencies:
     estraverse "^5.1.0"
 
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -1899,11 +1867,6 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
@@ -1914,7 +1877,14 @@ estree-walker@^2.0.2:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
-esutils@^2.0.2, esutils@^2.0.3:
+estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
+esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -1924,21 +1894,20 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
-events@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-expect@^29.0.0:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.4.2.tgz#2ae34eb88de797c64a1541ad0f1e2ea8a7a7b492"
-  integrity sha512-+JHYg9O3hd3RlICG90OPVjRkPBoiUH7PxvDVMnRiaq1g6JUgZStX514erMl0v2Dc5SkfVbm7ztqbd6qHHPn+mQ==
-  dependencies:
-    "@jest/expect-utils" "^29.4.2"
-    jest-get-type "^29.4.2"
-    jest-matcher-utils "^29.4.2"
-    jest-message-util "^29.4.2"
-    jest-util "^29.4.2"
+execa@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
+  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^8.0.1"
+    human-signals "^5.0.0"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^4.1.0"
+    strip-final-newline "^3.0.0"
 
 express-urlrewrite@^1.4.0:
   version "1.4.0"
@@ -1985,15 +1954,6 @@ express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -2004,11 +1964,6 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-diff@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
-  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
-
 fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
@@ -2037,13 +1992,6 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -2076,23 +2024,6 @@ finalhandler@1.2.0:
     statuses "2.0.1"
     unpipe "~1.0.0"
 
-find-cache-dir@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
-find-up@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
 find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -2114,10 +2045,10 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-follow-redirects@^1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+follow-redirects@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -2126,6 +2057,14 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -2155,6 +2094,11 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
+fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -2185,6 +2129,11 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
 
+get-func-name@^2.0.1, get-func-name@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
+  integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
+
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
@@ -2194,6 +2143,11 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-stream@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
+  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -2216,6 +2170,17 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
+glob@^10.3.3:
+  version "10.3.12"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
+  integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.6"
+    minimatch "^9.0.1"
+    minipass "^7.0.4"
+    path-scurry "^1.10.2"
+
 glob@^7.1.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -2228,17 +2193,6 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.3:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
-  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 globals@^13.19.0:
   version "13.20.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
@@ -2246,6 +2200,13 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
+globals@^13.24.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
+  dependencies:
+    type-fest "^0.20.2"
+
 globalthis@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
@@ -2272,20 +2233,20 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.3:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-"graphql@^15.0.0 || ^16.0.0":
-  version "16.7.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.7.1.tgz#11475b74a7bff2aefd4691df52a0eca0abd9b642"
-  integrity sha512-DRYR9tf+UGU0KOsMcKAlXeFfX89UiiIZ0dRU3mR0yJfu6OjZqUcp68NnFLnqQU5RexygFoDy1EW+ccOYcPfmHg==
+graphql@^16.8.1:
+  version "16.8.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07"
+  integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==
 
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
@@ -2338,22 +2299,22 @@ he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-headers-polyfill@^3.1.0, headers-polyfill@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/headers-polyfill/-/headers-polyfill-3.1.2.tgz#9a4dcb545c5b95d9569592ef7ec0708aab763fbe"
-  integrity sha512-tWCK4biJ6hcLqTviLXVR9DTRfYGQMXEIUj3gwJ2rZ5wO/at3XtkI4g8mCvFdUF9l1KMBNCfmNAdnahm1cgavQA==
+headers-polyfill@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/headers-polyfill/-/headers-polyfill-4.0.3.tgz#922a0155de30ecc1f785bcf04be77844ca95ad07"
+  integrity sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-html-encoding-sniffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
-  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
   dependencies:
-    whatwg-encoding "^2.0.0"
+    whatwg-encoding "^3.1.1"
 
 http-errors@2.0.0:
   version "2.0.0"
@@ -2366,24 +2327,28 @@ http-errors@2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-proxy-agent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    agent-base "^7.1.0"
+    debug "^4.3.4"
 
-https-proxy-agent@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+https-proxy-agent@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
+  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
   dependencies:
-    agent-base "6"
+    agent-base "^7.0.2"
     debug "4"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+human-signals@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
+  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
+
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -2397,22 +2362,22 @@ iconv-lite@0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
 ignore@^5.2.0:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
+ignore@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
+
 immutable@^4.0.0:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.4.tgz#83260d50889526b4b531a5e293709a77f7c55a2a"
   integrity sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -2438,7 +2403,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4:
+inherits@2, inherits@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -2448,27 +2413,6 @@ ini@^1.3.4:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-inquirer@^8.2.0:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8"
-  integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.1"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.21"
-    mute-stream "0.0.8"
-    ora "^5.4.1"
-    run-async "^2.4.0"
-    rxjs "^7.5.5"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-    wrap-ansi "^7.0.0"
-
 internal-slot@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3"
@@ -2483,7 +2427,7 @@ ipaddr.js@1.9.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-is-arguments@^1.0.4, is-arguments@^1.1.1:
+is-arguments@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
   integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
@@ -2527,6 +2471,11 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-buffer@~1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
 is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
@@ -2556,13 +2505,6 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-generator-function@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
-  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -2570,11 +2512,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-interactive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
-  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
-
 is-map@^2.0.1, is-map@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
@@ -2637,6 +2574,11 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
+
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -2651,7 +2593,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9:
+is-typed-array@^1.1.10, is-typed-array@^1.1.9:
   version "1.1.10"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
   integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
@@ -2662,11 +2604,6 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
 is-weakmap@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
@@ -2702,93 +2639,46 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-jest-diff@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.2.tgz#b88502d5dc02d97f6512d73c37da8b36f49b4871"
-  integrity sha512-EK8DSajVtnjx9sa1BkjZq3mqChm2Cd8rIzdXkQMA8e0wuXq53ypz6s5o5V8HRZkoEt2ywJ3eeNWFKWeYr8HK4g==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^29.4.2"
-    jest-get-type "^29.4.2"
-    pretty-format "^29.4.2"
-
-jest-get-type@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.2.tgz#7cb63f154bca8d8f57364d01614477d466fa43fe"
-  integrity sha512-vERN30V5i2N6lqlFu4ljdTqQAgrkTFMC9xaIIfOPYBw04pufjXRty5RuXBiB1d72tGbURa/UgoiHB90ruOSivg==
-
-jest-matcher-utils@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.2.tgz#08d0bf5abf242e3834bec92c7ef5071732839e85"
-  integrity sha512-EZaAQy2je6Uqkrm6frnxBIdaWtSYFoR8SVb2sNLAtldswlR/29JAgx+hy67llT3+hXBaLB0zAm5UfeqerioZyg==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^29.4.2"
-    jest-get-type "^29.4.2"
-    pretty-format "^29.4.2"
-
-jest-message-util@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.4.2.tgz#309a2924eae6ca67cf7f25781a2af1902deee717"
-  integrity sha512-SElcuN4s6PNKpOEtTInjOAA8QvItu0iugkXqhYyguRvQoXapg5gN+9RQxLAkakChZA7Y26j6yUCsFWN+hlKD6g==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.4.2"
-    "@types/stack-utils" "^2.0.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    micromatch "^4.0.4"
-    pretty-format "^29.4.2"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
-jest-util@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.2.tgz#3db8580b295df453a97de4a1b42dd2578dabd2c2"
-  integrity sha512-wKnm6XpJgzMUSRFB7YF48CuwdzuDIHenVuoIb1PLuJ6F+uErZsuDkU+EiExkChf6473XcawBrSfDSnXl+/YG4g==
+jackspeak@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
   dependencies:
-    "@jest/types" "^29.4.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
 
 jju@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
   integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==
 
-js-beautify@1.14.6:
-  version "1.14.6"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.6.tgz#b23ca5d74a462c282c7711bb51150bcc97f2b507"
-  integrity sha512-GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw==
+js-beautify@^1.14.9:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.15.1.tgz#4695afb508c324e1084ee0b952a102023fc65b64"
+  integrity sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==
   dependencies:
     config-chain "^1.1.13"
-    editorconfig "^0.15.3"
-    glob "^8.0.3"
-    nopt "^6.0.0"
-
-js-levenshtein@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
-  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
-
-js-sdsl@^4.1.4:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711"
-  integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==
+    editorconfig "^1.0.4"
+    glob "^10.3.3"
+    js-cookie "^3.0.5"
+    nopt "^7.2.0"
 
-js-string-escape@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
-  integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==
+js-cookie@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc"
+  integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==
 
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-tokens@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-9.0.0.tgz#0f893996d6f3ed46df7f0a3b12a03f5fd84223c1"
+  integrity sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==
+
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -2796,34 +2686,32 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsdom@22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8"
-  integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==
+jsdom@24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-24.0.0.tgz#e2dc04e4c79da368481659818ee2b0cd7c39007c"
+  integrity sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==
   dependencies:
-    abab "^2.0.6"
-    cssstyle "^3.0.0"
-    data-urls "^4.0.0"
+    cssstyle "^4.0.1"
+    data-urls "^5.0.0"
     decimal.js "^10.4.3"
-    domexception "^4.0.0"
     form-data "^4.0.0"
-    html-encoding-sniffer "^3.0.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.1"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.2"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.4"
+    nwsapi "^2.2.7"
     parse5 "^7.1.2"
     rrweb-cssom "^0.6.0"
     saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.1.2"
-    w3c-xmlserializer "^4.0.0"
+    tough-cookie "^4.1.3"
+    w3c-xmlserializer "^5.0.0"
     webidl-conversions "^7.0.0"
-    whatwg-encoding "^2.0.0"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^12.0.1"
-    ws "^8.13.0"
-    xml-name-validator "^4.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+    ws "^8.16.0"
+    xml-name-validator "^5.0.0"
 
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
@@ -2842,10 +2730,10 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-server@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/json-server/-/json-server-0.17.1.tgz#7ce793e4ee52e815648b0ce4e0736197bb671e5c"
-  integrity sha512-2cR/IAL9xX4M1Y5ONMpnvRvJ5o9gJH5GsSQs7fQHdTKTKoN4YRZu1ApQKg/4P0XzwlLyUDqTlwhPq9nsvJ9acw==
+json-server@0.17.4:
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/json-server/-/json-server-0.17.4.tgz#d4ef25a516e26d9ba86fd6db2f9d81a5f405421e"
+  integrity sha512-bGBb0WtFuAKbgI7JV3A864irWnMZSvBYRJbohaOuatHwKSRFUfqtQlrYMrB6WbalXy/cJabyjlb7JkHli6dYjQ==
   dependencies:
     body-parser "^1.19.0"
     chalk "^4.1.2"
@@ -2877,10 +2765,10 @@ jsonc-parser@^3.2.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
-jwt-decode@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
-  integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==
+jwt-decode@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b"
+  integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
 
 levn@^0.4.1:
   version "0.4.1"
@@ -2900,17 +2788,13 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-local-pkg@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.3.tgz#0ff361ab3ae7f1c19113d9bb97b98b905dbc4963"
-  integrity sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+local-pkg@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.5.0.tgz#093d25a346bae59a99f80e75f6e9d36d7e8c925c"
+  integrity sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==
   dependencies:
-    p-locate "^4.1.0"
+    mlly "^1.4.2"
+    pkg-types "^1.0.3"
 
 locate-path@^6.0.0:
   version "6.0.0"
@@ -2934,21 +2818,20 @@ lodash@4, lodash@^4.17.15, lodash@^4.17.21:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-loupe@^2.3.1, loupe@^2.3.6:
+loupe@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53"
   integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==
   dependencies:
     get-func-name "^2.0.0"
 
+loupe@^2.3.7:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697"
+  integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==
+  dependencies:
+    get-func-name "^2.0.1"
+
 lowdb@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowdb/-/lowdb-1.0.0.tgz#5243be6b22786ccce30e50c9a33eac36b20c8064"
@@ -2960,13 +2843,10 @@ lowdb@^1.0.0:
     pify "^3.0.0"
     steno "^0.4.1"
 
-lru-cache@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+lru-cache@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
+  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
 
 lru-cache@^6.0.0:
   version "6.0.0"
@@ -2980,33 +2860,21 @@ lz-string@^1.5.0:
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
   integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==
 
-magic-string@^0.25.7:
-  version "0.25.9"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
-  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
-  dependencies:
-    sourcemap-codec "^1.4.8"
-
-magic-string@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529"
-  integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==
+magic-string@^0.30.5, magic-string@^0.30.8:
+  version "0.30.10"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.10.tgz#123d9c41a0cb5640c892b041d4cfb3bd0aa4b39e"
+  integrity sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==
   dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.13"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
 
-make-dir@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-md5-hex@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c"
-  integrity sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==
+md5@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
+  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
   dependencies:
-    blueimp-md5 "^2.10.0"
+    charenc "0.0.2"
+    crypt "0.0.2"
+    is-buffer "~1.1.6"
 
 media-typer@0.3.0:
   version "0.3.0"
@@ -3023,6 +2891,11 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
@@ -3068,16 +2941,23 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
 
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+minimatch@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
+  integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -3085,13 +2965,18 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.1:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+minimatch@^9.0.1, minimatch@^9.0.3, minimatch@^9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
   dependencies:
     brace-expansion "^2.0.1"
 
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
 mlly@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.3.0.tgz#3184cb80c6437bda861a9f452ae74e3434ed9cd1"
@@ -3102,6 +2987,16 @@ mlly@^1.2.0:
     pkg-types "^1.0.3"
     ufo "^1.1.2"
 
+mlly@^1.4.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.6.1.tgz#0983067dc3366d6314fc5e12712884e6978d028f"
+  integrity sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==
+  dependencies:
+    acorn "^8.11.3"
+    pathe "^1.1.2"
+    pkg-types "^1.0.3"
+    ufo "^1.3.2"
+
 morgan@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
@@ -3128,50 +3023,48 @@ ms@2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-msw@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/msw/-/msw-1.2.2.tgz#126c3150c07f651e97b24fbd405821f3aeaf9397"
-  integrity sha512-GsW3PE/Es/a1tYThXcM8YHOZ1S1MtivcS3He/LQbbTCx3rbWJYCtWD5XXyJ53KlNPT7O1VI9sCW3xMtgFe8XpQ==
-  dependencies:
-    "@mswjs/cookies" "^0.2.2"
-    "@mswjs/interceptors" "^0.17.5"
-    "@open-draft/until" "^1.0.3"
-    "@types/cookie" "^0.4.1"
-    "@types/js-levenshtein" "^1.1.1"
-    chalk "4.1.1"
-    chokidar "^3.4.2"
-    cookie "^0.4.2"
-    graphql "^15.0.0 || ^16.0.0"
-    headers-polyfill "^3.1.2"
-    inquirer "^8.2.0"
+msw@2.2.14:
+  version "2.2.14"
+  resolved "https://registry.yarnpkg.com/msw/-/msw-2.2.14.tgz#ed16b89f99ffc105a84b0295a6fcae2ee99f5c62"
+  integrity sha512-64i8rNCa1xzDK8ZYsTrVMli05D687jty8+Th+PU5VTbJ2/4P7fkQFVyDQ6ZFT5FrNR8z2BHhbY47fKNvfHrumA==
+  dependencies:
+    "@bundled-es-modules/cookie" "^2.0.0"
+    "@bundled-es-modules/statuses" "^1.0.1"
+    "@inquirer/confirm" "^3.0.0"
+    "@mswjs/cookies" "^1.1.0"
+    "@mswjs/interceptors" "^0.26.14"
+    "@open-draft/until" "^2.1.0"
+    "@types/cookie" "^0.6.0"
+    "@types/statuses" "^2.0.4"
+    chalk "^4.1.2"
+    graphql "^16.8.1"
+    headers-polyfill "^4.0.2"
     is-node-process "^1.2.0"
-    js-levenshtein "^1.1.6"
-    node-fetch "^2.6.7"
-    outvariant "^1.4.0"
+    outvariant "^1.4.2"
     path-to-regexp "^6.2.0"
-    strict-event-emitter "^0.4.3"
-    type-fest "^2.19.0"
-    yargs "^17.3.1"
+    strict-event-emitter "^0.5.1"
+    type-fest "^4.9.0"
+    yargs "^17.7.2"
 
-muggle-string@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.1.0.tgz#1fda8a281c8b27bb8b70466dbc9f27586a8baa6c"
-  integrity sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==
+muggle-string@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.4.1.tgz#3b366bd43b32f809dc20659534dd30e7c8a0d328"
+  integrity sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+mute-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
+  integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
 
-nanoid@^3.1.23, nanoid@^3.3.4:
+nanoid@^3.1.23:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
-natural-compare-lite@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
-  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -3188,19 +3081,12 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-fetch@^2.6.7:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
-  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+nopt@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
+  integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==
   dependencies:
-    abbrev "^1.0.0"
+    abbrev "^2.0.0"
 
 normalize-package-data@^2.3.2:
   version "2.5.0"
@@ -3232,17 +3118,24 @@ npm-run-all@4.1.5:
     shell-quote "^1.6.1"
     string.prototype.padend "^3.0.0"
 
-nth-check@^2.0.1:
+npm-run-path@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f"
+  integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==
+  dependencies:
+    path-key "^4.0.0"
+
+nth-check@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
   integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
-nwsapi@^2.2.4:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2"
-  integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==
+nwsapi@^2.2.7:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
+  integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
 object-assign@^4:
   version "4.1.1"
@@ -3303,56 +3196,34 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
   dependencies:
-    mimic-fn "^2.1.0"
+    mimic-fn "^4.0.0"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
-ora@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
-  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
-  dependencies:
-    bl "^4.1.0"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-spinners "^2.5.0"
-    is-interactive "^1.0.0"
-    is-unicode-supported "^0.1.0"
-    log-symbols "^4.1.0"
-    strip-ansi "^6.0.0"
-    wcwidth "^1.0.1"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
 outvariant@^1.2.1, outvariant@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/outvariant/-/outvariant-1.4.0.tgz#e742e4bda77692da3eca698ef5bfac62d9fba06e"
   integrity sha512-AlWY719RF02ujitly7Kk/0QlV+pXGFDHrHf9O2OKqyqgBieaPOIeuSkL8sRK6j2WK+/ZAURq2kZsY0d8JapUiw==
 
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
+outvariant@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/outvariant/-/outvariant-1.4.2.tgz#f54f19240eeb7f15b28263d5147405752d8e2066"
+  integrity sha512-Ou3dJ6bA/UJ5GVHxah4LnqDwZRwAmWxrG3wtrHrbGnP4RnLCtA64A4F+ae7Y8ww660JaddSoArUR5HjipWSHAQ==
 
 p-limit@^3.0.2:
   version "3.1.0"
@@ -3361,20 +3232,13 @@ p-limit@^3.0.2:
   dependencies:
     yocto-queue "^0.1.0"
 
-p-limit@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
-  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
+p-limit@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-5.0.0.tgz#6946d5b7140b649b7a33a027d89b4c625b3a5985"
+  integrity sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==
   dependencies:
     yocto-queue "^1.0.0"
 
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
 p-locate@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
@@ -3382,11 +3246,6 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -3414,6 +3273,11 @@ parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+path-browserify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
+
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -3434,11 +3298,24 @@ path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
+  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -3473,6 +3350,11 @@ pathe@^1.1.0:
   resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.0.tgz#e2e13f6c62b31a3289af4ba19886c230f295ec03"
   integrity sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==
 
+pathe@^1.1.1, pathe@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec"
+  integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==
+
 pathval@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
@@ -3483,7 +3365,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -3498,26 +3380,19 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
-pinia-plugin-persistedstate@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.0.tgz#9932ca2ae88aa6c0d6763bebc6447d7bd1f097d0"
-  integrity sha512-tZbNGf2vjAQcIm7alK40sE51Qu/m9oWr+rEgNm/2AWr1huFxj72CjvpQcIQzMknDBJEkQznCLAGtJTIcLKrKdw==
+pinia-plugin-persistedstate@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.1.tgz#66780602aecd6c7b152dd7e3ddc249a1f7a13fe5"
+  integrity sha512-MK++8LRUsGF7r45PjBFES82ISnPzyO6IZx3CH5vyPseFLZCk1g2kgx6l/nW8pEBKxxd4do0P6bJw+mUSZIEZUQ==
 
-pinia@2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.4.tgz#a642adfe6208e10c36d3dc16184a91064788142a"
-  integrity sha512-vYlnDu+Y/FXxv1ABo1vhjC+IbqvzUdiUC3sfDRrRyY2CQSrqqaa+iiHmqtARFxJVqWQMCJfXx1PBvFs9aJVLXQ==
+pinia@2.1.7:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.7.tgz#4cf5420d9324ca00b7b4984d3fbf693222115bbc"
+  integrity sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==
   dependencies:
     "@vue/devtools-api" "^6.5.0"
     vue-demi ">=0.14.5"
 
-pkg-dir@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
 pkg-types@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.3.tgz#988b42ab19254c01614d13f4f65a2cfc7880f868"
@@ -3539,22 +3414,22 @@ pluralize@^8.0.0:
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
   integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
 
-postcss-selector-parser@^6.0.9:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
+postcss-selector-parser@^6.0.15:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
+  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss@^8.1.10, postcss@^8.4.21:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+postcss@^8.4.38:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.7"
     picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -3568,12 +3443,12 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@2.8.4:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3"
-  integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
+prettier@3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
+  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
 
-pretty-format@^27.0.2, pretty-format@^27.5.1:
+pretty-format@^27.0.2:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
   integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
@@ -3582,15 +3457,20 @@ pretty-format@^27.0.2, pretty-format@^27.5.1:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-pretty-format@^29.0.0, pretty-format@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.2.tgz#64bf5ccc0d718c03027d94ac957bdd32b3fb2401"
-  integrity sha512-qKlHR8yFVCbcEWba0H0TOC8dnLlO4vPlyEjRPw31FZ2Rupy9nLa8ZLbYny8gWEl8CkEhJqAE6IzdNELTBVcBEg==
+pretty-format@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
   dependencies:
-    "@jest/schemas" "^29.4.2"
+    "@jest/schemas" "^29.6.3"
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/properties/-/properties-1.2.1.tgz#0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"
+  integrity sha512-qYNxyMj1JeW54i/EWEFsM1cVwxJbtgPp8+0Wg9XjNaK6VE/c4oRi6PNu5p7w1mNXEIQIjV5Wwn8v8Gz82/QzdQ==
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -3609,21 +3489,21 @@ proxy-from-env@^1.1.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
-
 psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
-punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
+punycode@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
 qs@6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
@@ -3631,10 +3511,10 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
-query-string@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-8.1.0.tgz#e7f95367737219544cd360a11a4f4ca03836e115"
-  integrity sha512-BFQeWxJOZxZGix7y+SByG3F36dA0AbTy9o6pSmKFcFz7DAj0re9Frkty3saBn3nHo3D0oZJ/+rx3r8H8r8Jbpw==
+query-string@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-9.0.0.tgz#1fe177cd95545600f0deab93f5fb02fd4e3e7273"
+  integrity sha512-4EWwcRGsO2H+yzq6ddHcVqkCQ2EFUSfDMEjF8ryp8ReymyZhIuaFRGLomeOQLkrzacMHoyky2HW0Qe30UbzkKw==
   dependencies:
     decode-uri-component "^0.4.1"
     filter-obj "^5.1.0"
@@ -3684,15 +3564,6 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-readable-stream@^3.4.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -3713,6 +3584,11 @@ regenerator-runtime@^0.13.11:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
+regenerator-runtime@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
+
 regexp.prototype.flags@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
@@ -3722,11 +3598,6 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -3747,7 +3618,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve@^1.10.0, resolve@^1.22.1:
+resolve@^1.10.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -3756,14 +3627,6 @@ resolve@^1.10.0, resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -3776,11 +3639,29 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rollup@^3.10.0:
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.15.0.tgz#6f4105e8c4b8145229657b74ad660b02fbfacc05"
-  integrity sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==
+rollup@^4.13.0:
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.14.3.tgz#bcbb7784b35826d3164346fa6d5aac95190d8ba9"
+  integrity sha512-ag5tTQKYsj1bhrFC9+OEWqb5O6VYgtQDO9hPDBMmIbePwhfSr+ExlcU741t8Dhw5DkPCQf6noz0jb36D6W9/hw==
+  dependencies:
+    "@types/estree" "1.0.5"
   optionalDependencies:
+    "@rollup/rollup-android-arm-eabi" "4.14.3"
+    "@rollup/rollup-android-arm64" "4.14.3"
+    "@rollup/rollup-darwin-arm64" "4.14.3"
+    "@rollup/rollup-darwin-x64" "4.14.3"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.14.3"
+    "@rollup/rollup-linux-arm-musleabihf" "4.14.3"
+    "@rollup/rollup-linux-arm64-gnu" "4.14.3"
+    "@rollup/rollup-linux-arm64-musl" "4.14.3"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.14.3"
+    "@rollup/rollup-linux-riscv64-gnu" "4.14.3"
+    "@rollup/rollup-linux-s390x-gnu" "4.14.3"
+    "@rollup/rollup-linux-x64-gnu" "4.14.3"
+    "@rollup/rollup-linux-x64-musl" "4.14.3"
+    "@rollup/rollup-win32-arm64-msvc" "4.14.3"
+    "@rollup/rollup-win32-ia32-msvc" "4.14.3"
+    "@rollup/rollup-win32-x64-msvc" "4.14.3"
     fsevents "~2.3.2"
 
 rrweb-cssom@^0.6.0:
@@ -3788,11 +3669,6 @@ rrweb-cssom@^0.6.0:
   resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
   integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
 
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -3800,19 +3676,12 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@^7.5.5:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-buffer@5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -3831,10 +3700,10 @@ safe-regex-test@^1.0.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@1.58.1:
-  version "1.58.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.1.tgz#17ab0390076a50578ed0733f1cc45429e03405f6"
-  integrity sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==
+sass@1.75.0:
+  version "1.75.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.75.0.tgz#91bbe87fb02dfcc34e052ddd6ab80f60d392be6c"
+  integrity sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -3852,30 +3721,25 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^7.3.2:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
-  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.5, semver@^7.3.6, semver@^7.3.7:
+semver@^7.3.6:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -3910,11 +3774,6 @@ server-destroy@^1.0.1:
   resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
   integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==
 
-set-cookie-parser@^2.4.6:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51"
-  integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==
-
 setprototypeof@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
@@ -3963,15 +3822,10 @@ siginfo@^2.0.0:
   resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
   integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
 
-sigmund@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==
-
-signal-exit@^3.0.2:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+signal-exit@^4.0.1, signal-exit@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 slash@^3.0.0:
   version "3.0.0"
@@ -3983,15 +3837,10 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-source-map@0.6.1, source-map@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sourcemap-codec@^1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
 spdx-correct@^3.0.0:
   version "3.1.1"
@@ -4024,27 +3873,20 @@ split-on-first@^3.0.0:
   resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-3.0.0.tgz#f04959c9ea8101b9b0bbf35a61b9ebea784a23e7"
   integrity sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==
 
-stack-utils@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
-  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
-  dependencies:
-    escape-string-regexp "^2.0.0"
-
 stackback@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
   integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
 
-statuses@2.0.1:
+statuses@2.0.1, statuses@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-std-env@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.3.tgz#a54f06eb245fdcfef53d56f3c0251f1d5c3d01fe"
-  integrity sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==
+std-env@^3.5.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2"
+  integrity sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==
 
 steno@^0.4.1:
   version "0.4.4"
@@ -4060,17 +3902,19 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-strict-event-emitter@^0.2.4:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/strict-event-emitter/-/strict-event-emitter-0.2.8.tgz#b4e768927c67273c14c13d20e19d5e6c934b47ca"
-  integrity sha512-KDf/ujU8Zud3YaLtMCcTI4xkZlZVIYxTLr+XIULexP+77EEVWixeXroLUXQXiVtH4XH2W7jr/3PT1v3zBuvc3A==
-  dependencies:
-    events "^3.3.0"
+strict-event-emitter@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz#1602ece81c51574ca39c6815e09f1a3e8550bd93"
+  integrity sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==
 
-strict-event-emitter@^0.4.3:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/strict-event-emitter/-/strict-event-emitter-0.4.6.tgz#ff347c8162b3e931e3ff5f02cfce6772c3b07eb3"
-  integrity sha512-12KWeb+wixJohmnwNFerbyiBrAlq5qJLwIt38etRtKtmmHyDSoGlIqFE9wx+4IwG0aDjI7GV8tc8ZccjWZZtTg==
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
@@ -4081,6 +3925,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string.prototype.padend@^3.0.0:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.4.tgz#2c43bb3a89eb54b6750de5942c123d6c98dd65b6"
@@ -4108,12 +3961,19 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    safe-buffer "~5.2.0"
+    ansi-regex "^4.1.0"
 
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
@@ -4122,11 +3982,23 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
+strip-final-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
+
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -4134,17 +4006,17 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strip-literal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-1.0.1.tgz#0115a332710c849b4e46497891fb8d585e404bd2"
-  integrity sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==
+strip-literal@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-2.1.0.tgz#6d82ade5e2e74f5c7e8739b6c84692bd65f0bd2a"
+  integrity sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==
   dependencies:
-    acorn "^8.8.2"
+    js-tokens "^9.0.0"
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -4170,42 +4042,33 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+synckit@^0.8.6:
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.8.tgz#fe7fe446518e3d3d49f5e429f443cf08b6edfcd7"
+  integrity sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==
+  dependencies:
+    "@pkgr/core" "^0.1.0"
+    tslib "^2.6.2"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
-time-zone@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
-  integrity sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==
-
-tinybench@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.5.0.tgz#4711c99bbf6f3e986f67eb722fed9cddb3a68ba5"
-  integrity sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==
-
-tinypool@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.5.0.tgz#3861c3069bf71e4f1f5aa2d2e6b3aaacc278961e"
-  integrity sha512-paHQtnrlS1QZYKF/GnLoOM/DN9fqaGOFbCbxzAhwniySnzl9Ebk8w73/dd34DAhe/obUbPAOldTyYXQZxnPBPQ==
+tinybench@^2.5.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.7.0.tgz#d56198a69bead7e240c8f9542484f3eb3c3f749d"
+  integrity sha512-Qgayeb106x2o4hNzNjsZEfFziw8IbKqtbXBjVh7VIZfBxfD5M4gWtpyx5+YTae2gJ6Y6Dz/KLepiv16RFeQWNA==
 
-tinyspy@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.1.1.tgz#9e6371b00c259e5c5b301917ca18c01d40ae558c"
-  integrity sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==
+tinypool@^0.8.3:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.8.4.tgz#e217fe1270d941b39e98c625dcecebb1408c9aa8"
+  integrity sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
+tinyspy@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.2.1.tgz#117b2342f1f38a0dbdcc73a50a454883adf861d1"
+  integrity sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -4219,44 +4082,32 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-tough-cookie@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
-  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
+tough-cookie@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tr46@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
-  integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==
+tr46@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec"
+  integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==
   dependencies:
-    punycode "^2.3.0"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+    punycode "^2.3.1"
 
-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.1.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
-  integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
+ts-api-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
+tslib@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -4265,7 +4116,7 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-detect@^4.0.0, type-detect@^4.0.5:
+type-detect@^4.0.0, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
@@ -4280,10 +4131,10 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-type-fest@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
-  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
+type-fest@^4.9.0:
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.15.0.tgz#21da206b89c15774cc718c4f2d693e13a1a14a43"
+  integrity sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA==
 
 type-is@~1.6.18:
   version "1.6.18"
@@ -4312,6 +4163,11 @@ ufo@^1.1.2:
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"
   integrity sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==
 
+ufo@^1.3.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.3.tgz#3325bd3c977b6c6cd3160bf4ff52989adc9d3344"
+  integrity sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==
+
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -4322,6 +4178,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
@@ -4352,31 +4213,20 @@ url-parse@^1.5.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util@^0.12.3:
-  version "0.12.5"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
-  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    which-typed-array "^1.1.2"
-
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
-  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+uuid@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
@@ -4391,86 +4241,77 @@ vary@^1, vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
-vite-node@0.31.4:
-  version "0.31.4"
-  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.31.4.tgz#0437f76c35fa83f0a868d3fb5896ca9e164291f5"
-  integrity sha512-uzL377GjJtTbuc5KQxVbDu2xfU/x0wVjUtXQR2ihS21q/NK6ROr4oG0rsSkBBddZUVCwzfx22in76/0ZZHXgkQ==
+vite-node@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.5.0.tgz#7f74dadfecb15bca016c5ce5ef85e5cc4b82abf2"
+  integrity sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==
   dependencies:
     cac "^6.7.14"
     debug "^4.3.4"
-    mlly "^1.2.0"
-    pathe "^1.1.0"
+    pathe "^1.1.1"
     picocolors "^1.0.0"
-    vite "^3.0.0 || ^4.0.0"
-
-vite-plugin-rewrite-all@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-rewrite-all/-/vite-plugin-rewrite-all-1.0.1.tgz#ee711a3d114634abb922a0e50e56736d7e9a324a"
-  integrity sha512-W0DAchC8ynuQH0lYLIu5/5+JGfYlUTRD8GGNtHFXRJX4FzzB9MajtqHBp26zq/ly9sDt5BqrfdT08rv3RbB0LQ==
-  dependencies:
-    connect-history-api-fallback "^1.6.0"
+    vite "^5.0.0"
 
-vite-plugin-vuetify@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/vite-plugin-vuetify/-/vite-plugin-vuetify-1.0.2.tgz#d1777c63aa1b3a308756461b3d0299fd101ee8f4"
-  integrity sha512-MubIcKD33O8wtgQXlbEXE7ccTEpHZ8nPpe77y9Wy3my2MWw/PgehP9VqTp92BLqr0R1dSL970Lynvisx3UxBFw==
+vite-plugin-vuetify@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/vite-plugin-vuetify/-/vite-plugin-vuetify-2.0.3.tgz#b65ee4e05cfc6bf2b478a32b6d58b42398519f1e"
+  integrity sha512-HbYajgGgb/noaVKNRhnnXIiQZrNXfNIeanUGAwXgOxL6h/KULS40Uf51Kyz8hNmdegF+DwjgXXI/8J1PNS83xw==
   dependencies:
-    "@vuetify/loader-shared" "^1.7.1"
+    "@vuetify/loader-shared" "^2.0.3"
     debug "^4.3.3"
     upath "^2.0.1"
 
-vite@4.1.1, "vite@^3.0.0 || ^4.0.0":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.1.1.tgz#3b18b81a4e85ce3df5cbdbf4c687d93ebf402e6b"
-  integrity sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==
+vite@5.2.9, vite@^5.0.0:
+  version "5.2.9"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.9.tgz#cd9a356c6ff5f7456c09c5ce74068ffa8df743d9"
+  integrity sha512-uOQWfuZBlc6Y3W/DTuQ1Sr+oIXWvqljLvS881SVmAj00d5RdgShLcuXWxseWPd4HXwiYBFW/vXHfKFeqj9uQnw==
   dependencies:
-    esbuild "^0.16.14"
-    postcss "^8.4.21"
-    resolve "^1.22.1"
-    rollup "^3.10.0"
+    esbuild "^0.20.1"
+    postcss "^8.4.38"
+    rollup "^4.13.0"
   optionalDependencies:
-    fsevents "~2.3.2"
+    fsevents "~2.3.3"
 
-vitest@0.31.4:
-  version "0.31.4"
-  resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.31.4.tgz#5abe02562675262949c10e40811f348a80f6b2a6"
-  integrity sha512-GoV0VQPmWrUFOZSg3RpQAPN+LPmHg2/gxlMNJlyxJihkz6qReHDV6b0pPDcqFLNEPya4tWJ1pgwUNP9MLmUfvQ==
-  dependencies:
-    "@types/chai" "^4.3.5"
-    "@types/chai-subset" "^1.3.3"
-    "@types/node" "*"
-    "@vitest/expect" "0.31.4"
-    "@vitest/runner" "0.31.4"
-    "@vitest/snapshot" "0.31.4"
-    "@vitest/spy" "0.31.4"
-    "@vitest/utils" "0.31.4"
-    acorn "^8.8.2"
-    acorn-walk "^8.2.0"
-    cac "^6.7.14"
-    chai "^4.3.7"
-    concordance "^5.0.4"
+vitest@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.5.0.tgz#6ebb396bd358650011a9c96c18fa614b668365c1"
+  integrity sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==
+  dependencies:
+    "@vitest/expect" "1.5.0"
+    "@vitest/runner" "1.5.0"
+    "@vitest/snapshot" "1.5.0"
+    "@vitest/spy" "1.5.0"
+    "@vitest/utils" "1.5.0"
+    acorn-walk "^8.3.2"
+    chai "^4.3.10"
     debug "^4.3.4"
-    local-pkg "^0.4.3"
-    magic-string "^0.30.0"
-    pathe "^1.1.0"
+    execa "^8.0.1"
+    local-pkg "^0.5.0"
+    magic-string "^0.30.5"
+    pathe "^1.1.1"
     picocolors "^1.0.0"
-    std-env "^3.3.2"
-    strip-literal "^1.0.1"
-    tinybench "^2.5.0"
-    tinypool "^0.5.0"
-    vite "^3.0.0 || ^4.0.0"
-    vite-node "0.31.4"
+    std-env "^3.5.0"
+    strip-literal "^2.0.0"
+    tinybench "^2.5.1"
+    tinypool "^0.8.3"
+    vite "^5.0.0"
+    vite-node "1.5.0"
     why-is-node-running "^2.2.2"
 
+vue-component-type-helpers@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/vue-component-type-helpers/-/vue-component-type-helpers-2.0.13.tgz#4cd08fe6c42a071159664e6c30b7fe1b01e17b68"
+  integrity sha512-xNO5B7DstNWETnoYflLkVgh8dK8h2ZDgxY1M2O0zrqGeBNq5yAZ8a10yCS9+HnixouNGYNX+ggU9MQQq86HTpg==
+
 vue-demi@>=0.14.5:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.5.tgz#676d0463d1a1266d5ab5cba932e043d8f5f2fbd9"
   integrity sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==
 
-vue-eslint-parser@^9.0.0, vue-eslint-parser@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz#0e121d1bb29bd10763c83e3cc583ee03434a9dd5"
-  integrity sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==
+vue-eslint-parser@^9.3.1, vue-eslint-parser@^9.4.2:
+  version "9.4.2"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz#02ffcce82042b082292f2d1672514615f0d95b6d"
+  integrity sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==
   dependencies:
     debug "^4.3.4"
     eslint-scope "^7.1.1"
@@ -4480,22 +4321,21 @@ vue-eslint-parser@^9.0.0, vue-eslint-parser@^9.0.1:
     lodash "^4.17.21"
     semver "^7.3.6"
 
-vue-i18n@9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.2.2.tgz#aeb49d9424923c77e0d6441e3f21dafcecd0e666"
-  integrity sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==
+vue-i18n@9.13.0:
+  version "9.13.0"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.13.0.tgz#bedc0b9c5ebdc299c56296db747d8616db5eebc7"
+  integrity sha512-NlZ+e8rhGSGNk/Vfh4IUvlPRjljPCRslbNYgQmYZY+sLXZgahw8fylQguZU3e8ntJDvitfe40f8p3udOiKMS0A==
   dependencies:
-    "@intlify/core-base" "9.2.2"
-    "@intlify/shared" "9.2.2"
-    "@intlify/vue-devtools" "9.2.2"
-    "@vue/devtools-api" "^6.2.1"
+    "@intlify/core-base" "9.13.0"
+    "@intlify/shared" "9.13.0"
+    "@vue/devtools-api" "^6.5.0"
 
-vue-router@4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.2.2.tgz#b0097b66d89ca81c0986be03da244c7b32a4fd81"
-  integrity sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ==
+vue-router@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.3.2.tgz#08096c7765dacc6832f58e35f7a081a8b34116a7"
+  integrity sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==
   dependencies:
-    "@vue/devtools-api" "^6.5.0"
+    "@vue/devtools-api" "^6.5.1"
 
 vue-template-compiler@^2.7.14:
   version "2.7.14"
@@ -4505,103 +4345,70 @@ vue-template-compiler@^2.7.14:
     de-indent "^1.0.2"
     he "^1.2.0"
 
-vue-tsc@1.0.24:
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.0.24.tgz#c0b270a7c8422408d3b6694fee61b39a4b9e4740"
-  integrity sha512-mmU1s5SAqE1nByQAiQnao9oU4vX+mSdsgI8H57SfKH6UVzq/jP9+Dbi2GaV+0b4Cn361d2ln8m6xeU60ApiEXg==
+vue-tsc@2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.0.13.tgz#6ee557705456442e0f43ec0d1774ebf5ffec54f1"
+  integrity sha512-a3nL3FvguCWVJUQW/jFrUxdeUtiEkbZoQjidqvMeBK//tuE2w6NWQAbdrEpY2+6nSa4kZoKZp8TZUMtHpjt4mQ==
   dependencies:
-    "@volar/vue-language-core" "1.0.24"
-    "@volar/vue-typescript" "1.0.24"
+    "@volar/typescript" "2.2.0-alpha.8"
+    "@vue/language-core" "2.0.13"
+    semver "^7.5.4"
 
-vue3-ace-editor@2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/vue3-ace-editor/-/vue3-ace-editor-2.2.3.tgz#3ce7dad1e00ef2b7bd9f07f29487d04ed040a609"
-  integrity sha512-CkbiZSgIraZCBRa5egRqxDFUow5b949aHMcVgjce09O1n1TIJ8wVR++9mWg6F7lNWH47DkYSu0lwB6OocxUJ7g==
+vue3-ace-editor@2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/vue3-ace-editor/-/vue3-ace-editor-2.2.4.tgz#1f2a787f91cf7979f27fab29e0e0604bb3ee1c17"
+  integrity sha512-FZkEyfpbH068BwjhMyNROxfEI8135Sc+x8ouxkMdCNkuj/Tuw83VP/gStFQqZHqljyX9/VfMTCdTqtOnJZGN8g==
   dependencies:
     resize-observer-polyfill "^1.5.1"
 
-vue@3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6"
-  integrity sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==
-  dependencies:
-    "@vue/compiler-dom" "3.3.4"
-    "@vue/compiler-sfc" "3.3.4"
-    "@vue/runtime-dom" "3.3.4"
-    "@vue/server-renderer" "3.3.4"
-    "@vue/shared" "3.3.4"
-
-vuetify@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.3.2.tgz#8682486eb36b5d9d64c8f1c2bdfe36119f6ffbc6"
-  integrity sha512-m/R42di8FlyMaoktUe6k8JbF+A0vbJMpjQrZK7nH1ptK8VinVVQcaw+9m94wlO74IMR+LubxLh5t9I2ZtVCvjw==
-
-w3c-xmlserializer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
-  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
+vue@3.4.23:
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.23.tgz#9d5a990a71c5bd5446f80377828e6587cfc488d5"
+  integrity sha512-X1y6yyGJ28LMUBJ0k/qIeKHstGd+BlWQEOT40x3auJFTmpIhpbKLgN7EFsqalnJXq1Km5ybDEsp6BhuWKciUDg==
   dependencies:
-    xml-name-validator "^4.0.0"
+    "@vue/compiler-dom" "3.4.23"
+    "@vue/compiler-sfc" "3.4.23"
+    "@vue/runtime-dom" "3.4.23"
+    "@vue/server-renderer" "3.4.23"
+    "@vue/shared" "3.4.23"
 
-wcwidth@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
-  dependencies:
-    defaults "^1.0.3"
+vuetify@3.5.16:
+  version "3.5.16"
+  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.5.16.tgz#5046aab39bfa536f0d99c5be4f9d91a7245c3246"
+  integrity sha512-jyApfATreFMkgjvK0bL7ntZnr+p9TU73+4E3kX6fIvUitdAP9fltG7yj+v3k14HLqZRSNhTL1GhQ95DFx631zw==
 
-web-encoding@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.1.5.tgz#fc810cf7667364a6335c939913f5051d3e0c4864"
-  integrity sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==
+w3c-xmlserializer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
   dependencies:
-    util "^0.12.3"
-  optionalDependencies:
-    "@zxing/text-encoding" "0.9.0"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+    xml-name-validator "^5.0.0"
 
 webidl-conversions@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-well-known-symbols@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/well-known-symbols/-/well-known-symbols-2.0.0.tgz#e9c7c07dbd132b7b84212c8174391ec1f9871ba5"
-  integrity sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==
-
-whatwg-encoding@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
-  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
   dependencies:
     iconv-lite "0.6.3"
 
-whatwg-mimetype@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
-  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
 
-whatwg-url@^12.0.0, whatwg-url@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
-  integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==
+whatwg-url@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.0.0.tgz#00baaa7fd198744910c4b1ef68378f2200e4ceb6"
+  integrity sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==
   dependencies:
-    tr46 "^4.1.1"
+    tr46 "^5.0.0"
     webidl-conversions "^7.0.0"
 
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -4623,7 +4430,7 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.1"
     is-weakset "^2.0.1"
 
-which-typed-array@^1.1.2, which-typed-array@^1.1.9:
+which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
   integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
@@ -4657,10 +4464,23 @@ why-is-node-running@^2.2.2:
     siginfo "^2.0.0"
     stackback "0.0.2"
 
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -4671,21 +4491,35 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@^8.13.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+ws@^8.16.0:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
 
 xml-name-validator@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
+
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
@@ -4696,11 +4530,6 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
-
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
@@ -4724,7 +4553,7 @@ yargs@^17.0.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
-yargs@^17.3.1:
+yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
diff --git a/hermes-consumers/build.gradle b/hermes-consumers/build.gradle
index 44c66d5dc3..37bab685a3 100644
--- a/hermes-consumers/build.gradle
+++ b/hermes-consumers/build.gradle
@@ -17,42 +17,35 @@ dependencies {
 
     api group: 'org.springframework.boot', name: 'spring-boot-starter', version: versions.spring
     api group: 'org.eclipse.jetty', name: 'jetty-alpn-java-client', version: versions.jetty
-    api group: 'org.eclipse.jetty.http2', name: 'http2-http-client-transport', version: versions.jetty
-
-    implementation group: 'org.jctools', name: 'jctools-core', version: '1.2'
-
-    api group: 'javax.jms', name: 'javax.jms-api', version: '2.0'
-    implementation group: 'joda-time', name: 'joda-time', version: '2.5'
-
+    api group: 'org.eclipse.jetty.http2', name: 'jetty-http2-client-transport', version: versions.jetty
+    implementation group: 'org.jctools', name: 'jctools-core', version: '4.0.3'
+    api group: 'jakarta.jms', name: 'jakarta.jms-api', version: '3.1.0'
+    implementation group: 'joda-time', name: 'joda-time', version: '2.12.7'
     implementation(group: 'com.github.rholder', name: 'guava-retrying', version: '2.0.0') {
         exclude module: 'guava'
     }
-
-    implementation group: 'org.agrona', name: 'agrona', version: '1.0.6'
-
+    implementation group: 'org.agrona', name: 'agrona', version: '1.21.1'
+    // TODO: can we update it ? Which version of server our clients use ?
     implementation(group: 'org.hornetq', name: 'hornetq-jms-client', version: '2.4.1.Final') {
         exclude module: 'hornetq-native'
     }
-
-    api(group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.115.1')
+    api group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.128.1'
+    api group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.2.4'
 
     testImplementation project(':hermes-test-helper')
     testImplementation group: 'org.apache.curator', name: 'curator-test', version: versions.curator
-    testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
+    testImplementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.0.0'
 
     testImplementation project(':hermes-common')
 
-    testImplementation(group: 'com.jayway.awaitility', name: 'awaitility', version: '1.6.1') {
-        exclude group: 'com.jayway.jsonpath', module: 'json-path'
-    }
-
+    testImplementation(group: 'org.awaitility', name: 'awaitility-groovy', version: '4.2.1')
     testImplementation group: 'tech.allegro.schema.json2avro', name: 'converter', version: versions.json2avro
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock
     testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: versions.junit_jupiter
 
-    sbeClasspath group: 'uk.co.real-logic', name: 'sbe-all', version: '1.12.8'
+    sbeClasspath group: 'uk.co.real-logic', name: 'sbe-all', version: '1.31.1'
 }
 
 def generatedPath = "${buildDir}/generated/java/"
@@ -90,6 +83,6 @@ sourceSets {
     }
 }
 
-compileJava{
+compileJava {
     dependsOn(generateSbeStubs)
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/CommonConsumerParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/CommonConsumerParameters.java
index 4d5a99f7db..4f6ff03778 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/CommonConsumerParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/CommonConsumerParameters.java
@@ -5,11 +5,11 @@
 
 public interface CommonConsumerParameters {
 
-    SupervisorParameters getBackgroundSupervisor();
+  SupervisorParameters getBackgroundSupervisor();
 
-    SerialConsumerParameters getSerialConsumer();
+  SerialConsumerParameters getSerialConsumer();
 
-    int getSignalProcessingQueueSize();
+  int getSignalProcessingQueueSize();
 
-    boolean isUseTopicMessageSizeEnabled();
+  boolean isUseTopicMessageSizeEnabled();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/ConsumerEndpoint.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/ConsumerEndpoint.java
index f66e1fca9a..9513575a71 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/ConsumerEndpoint.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/ConsumerEndpoint.java
@@ -1,28 +1,26 @@
 package pl.allegro.tech.hermes.consumers;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
-import pl.allegro.tech.hermes.consumers.supervisor.process.RunningSubscriptionStatus;
-
 import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import pl.allegro.tech.hermes.consumers.supervisor.process.RunningSubscriptionStatus;
 
 @Path("status")
 public interface ConsumerEndpoint {
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/subscriptions")
-    List<RunningSubscriptionStatus> listSubscriptions();
-
-    @GET
-    @Path("/subscriptionsCount")
-    Integer countSubscriptions();
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/subscriptions")
+  List<RunningSubscriptionStatus> listSubscriptions();
 
-    @GET
-    @Path("/health")
-    String health();
+  @GET
+  @Path("/subscriptionsCount")
+  Integer countSubscriptions();
 
+  @GET
+  @Path("/health")
+  String health();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/HermesConsumers.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/HermesConsumers.java
index 43ad374ae7..0c0fdf46cc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/HermesConsumers.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/HermesConsumers.java
@@ -7,9 +7,9 @@
 @SpringBootApplication
 public class HermesConsumers {
 
-    public static void main(String[] args) {
-        SpringApplication application = new SpringApplication(HermesConsumers.class);
-        application.setWebApplicationType(WebApplicationType.NONE);
-        application.run(args);
-    }
+  public static void main(String[] args) {
+    SpringApplication application = new SpringApplication(HermesConsumers.class);
+    application.setWebApplicationType(WebApplicationType.NONE);
+    application.run(args);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/BatchProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/BatchProperties.java
index 02a461b7a5..6d8f907a70 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/BatchProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/BatchProperties.java
@@ -2,27 +2,26 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-
 @ConfigurationProperties(prefix = "consumer.batch")
 public class BatchProperties {
 
-    private int poolableSize = 1024;
+  private int poolableSize = 1024;
 
-    private int maxPoolSize = 64 * 1024 * 1024;
+  private int maxPoolSize = 64 * 1024 * 1024;
 
-    public int getPoolableSize() {
-        return poolableSize;
-    }
+  public int getPoolableSize() {
+    return poolableSize;
+  }
 
-    public void setPoolableSize(int poolableSize) {
-        this.poolableSize = poolableSize;
-    }
+  public void setPoolableSize(int poolableSize) {
+    this.poolableSize = poolableSize;
+  }
 
-    public int getMaxPoolSize() {
-        return maxPoolSize;
-    }
+  public int getMaxPoolSize() {
+    return maxPoolSize;
+  }
 
-    public void setMaxPoolSize(int maxPoolSize) {
-        this.maxPoolSize = maxPoolSize;
-    }
+  public void setMaxPoolSize(int maxPoolSize) {
+    this.maxPoolSize = maxPoolSize;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommitOffsetProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommitOffsetProperties.java
index 266dc21bf6..0162051c83 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommitOffsetProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommitOffsetProperties.java
@@ -1,29 +1,28 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "consumer.commit.offset")
 public class CommitOffsetProperties {
 
-    private Duration period = Duration.ofSeconds(60);
+  private Duration period = Duration.ofSeconds(60);
 
-    private int queuesSize = 200_000;
+  private int queuesSize = 200_000;
 
-    public Duration getPeriod() {
-        return period;
-    }
+  public Duration getPeriod() {
+    return period;
+  }
 
-    public void setPeriod(Duration period) {
-        this.period = period;
-    }
+  public void setPeriod(Duration period) {
+    this.period = period;
+  }
 
-    public int getQueuesSize() {
-        return queuesSize;
-    }
+  public int getQueuesSize() {
+    return queuesSize;
+  }
 
-    public void setQueuesSize(int queuesSize) {
-        this.queuesSize = queuesSize;
-    }
+  public void setQueuesSize(int queuesSize) {
+    this.queuesSize = queuesSize;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java
index 260e224196..23a7c78965 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java
@@ -1,12 +1,17 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import com.codahale.metrics.MetricRegistry;
+import static io.micrometer.core.instrument.Clock.SYSTEM;
+import static java.util.Collections.emptyList;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 import io.micrometer.prometheus.PrometheusConfig;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import jakarta.inject.Named;
+import java.time.Clock;
+import java.util.Arrays;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -18,7 +23,6 @@
 import pl.allegro.tech.hermes.common.concurrent.ExecutorServiceFactory;
 import pl.allegro.tech.hermes.common.di.factories.CuratorClientFactory;
 import pl.allegro.tech.hermes.common.di.factories.HermesCuratorClientFactory;
-import pl.allegro.tech.hermes.common.di.factories.MetricRegistryFactory;
 import pl.allegro.tech.hermes.common.di.factories.MicrometerRegistryParameters;
 import pl.allegro.tech.hermes.common.di.factories.ModelAwareZookeeperNotifyingCacheFactory;
 import pl.allegro.tech.hermes.common.di.factories.ObjectMapperFactory;
@@ -35,12 +39,10 @@
 import pl.allegro.tech.hermes.common.message.wrapper.AvroMessageSchemaVersionTruncationContentWrapper;
 import pl.allegro.tech.hermes.common.message.wrapper.CompositeMessageContentWrapper;
 import pl.allegro.tech.hermes.common.message.wrapper.JsonMessageContentWrapper;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.common.metric.counter.CounterStorage;
 import pl.allegro.tech.hermes.common.metric.counter.zookeeper.ZookeeperCounterStorage;
 import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory;
-import pl.allegro.tech.hermes.common.metric.executor.ThreadPoolMetrics;
 import pl.allegro.tech.hermes.common.util.InetAddressInstanceIdResolver;
 import pl.allegro.tech.hermes.common.util.InstanceIdResolver;
 import pl.allegro.tech.hermes.domain.filtering.MessageFilters;
@@ -72,269 +74,274 @@
 import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 
-import java.time.Clock;
-import java.util.Arrays;
-import java.util.List;
-
-import static io.micrometer.core.instrument.Clock.SYSTEM;
-import static java.util.Collections.emptyList;
-
 @Configuration
 @EnableConfigurationProperties({
-        MetricsProperties.class,
-        MicrometerRegistryProperties.class,
-        GraphiteProperties.class,
-        PrometheusProperties.class,
-        SchemaProperties.class,
-        ZookeeperClustersProperties.class,
-        ContentRootProperties.class,
-        DatacenterNameProperties.class
+  MetricsProperties.class,
+  MicrometerRegistryProperties.class,
+  PrometheusProperties.class,
+  SchemaProperties.class,
+  ZookeeperClustersProperties.class,
+  ContentRootProperties.class,
+  DatacenterNameProperties.class
 })
 public class CommonConfiguration {
 
-    @Bean
-    public DatacenterNameProvider dcNameProvider(DatacenterNameProperties datacenterNameProperties) {
-        if (datacenterNameProperties.getSource() == DcNameSource.ENV) {
-            return new EnvironmentVariableDatacenterNameProvider(datacenterNameProperties.getEnv());
-        } else {
-            return new DefaultDatacenterNameProvider();
-        }
-    }
-
-    @Bean
-    public SubscriptionRepository subscriptionRepository(CuratorFramework zookeeper,
-                                                         ZookeeperPaths paths,
-                                                         ObjectMapper mapper,
-                                                         TopicRepository topicRepository) {
-        return new ZookeeperSubscriptionRepository(zookeeper, mapper, paths, topicRepository);
-    }
-
-    @Bean
-    public OAuthProviderRepository oAuthProviderRepository(CuratorFramework zookeeper,
-                                                           ZookeeperPaths paths,
-                                                           ObjectMapper mapper) {
-        return new ZookeeperOAuthProviderRepository(zookeeper, mapper, paths);
-    }
-
-    @Bean
-    public TopicRepository topicRepository(CuratorFramework zookeeper,
-                                           ZookeeperPaths paths,
-                                           ObjectMapper mapper,
-                                           GroupRepository groupRepository) {
-        return new ZookeeperTopicRepository(zookeeper, mapper, paths, groupRepository);
-    }
-
-    @Bean
-    public GroupRepository groupRepository(CuratorFramework zookeeper, ZookeeperPaths paths, ObjectMapper mapper) {
-        return new ZookeeperGroupRepository(zookeeper, mapper, paths);
-    }
-
-    @Bean(destroyMethod = "close")
-    public CuratorFramework hermesCurator(ZookeeperClustersProperties zookeeperClustersProperties,
-                                          CuratorClientFactory curatorClientFactory, DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new HermesCuratorClientFactory(zookeeperProperties, curatorClientFactory).provide();
-    }
-
-    @Bean
-    public CuratorClientFactory curatorClientFactory(ZookeeperClustersProperties zookeeperClustersProperties,
-                                                     DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new CuratorClientFactory(zookeeperProperties);
-    }
-
-    @Bean
-    public InternalNotificationsBus zookeeperInternalNotificationBus(ObjectMapper objectMapper,
-                                                                     ModelAwareZookeeperNotifyingCache modelNotifyingCache) {
-        return new ZookeeperInternalNotificationBus(objectMapper, modelNotifyingCache);
-    }
-
-    @Bean(destroyMethod = "stop")
-    public ModelAwareZookeeperNotifyingCache modelAwareZookeeperNotifyingCache(CuratorFramework curator,
-                                                                               ZookeeperClustersProperties zookeeperClustersProperties,
-                                                                               DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new ModelAwareZookeeperNotifyingCacheFactory(curator, zookeeperProperties).provide();
-    }
-
-    @Bean
-    public UndeliveredMessageLog undeliveredMessageLog(CuratorFramework zookeeper,
-                                                       ZookeeperPaths paths,
-                                                       ObjectMapper mapper,
-                                                       MetricsFacade metricsFacade) {
-        return new ZookeeperUndeliveredMessageLog(zookeeper, paths, mapper, metricsFacade);
-    }
-
-
-    @Bean
-    public ThreadPoolMetrics threadPoolMetrics(MetricsFacade metricsFacade) {
-        return new ThreadPoolMetrics(metricsFacade);
-    }
-
-    @Bean
-    public InstrumentedExecutorServiceFactory instrumentedExecutorServiceFactory(ThreadPoolMetrics threadPoolMetrics) {
-        return new InstrumentedExecutorServiceFactory(threadPoolMetrics);
-    }
-
-    @Bean
-    public ZookeeperAdminCache zookeeperAdminCache(ZookeeperPaths zookeeperPaths,
-                                                   CuratorFramework client,
-                                                   ObjectMapper objectMapper,
-                                                   Clock clock) {
-        return new ZookeeperAdminCache(zookeeperPaths, client, objectMapper, clock);
-    }
-
-    @Bean
-    public ObjectMapper objectMapper(SchemaProperties schemaProperties) {
-        return new ObjectMapperFactory(schemaProperties.isIdSerializationEnabled()).provide();
-    }
-
-
-    @Bean
-    public CompositeMessageContentWrapper messageContentWrapper(ObjectMapper mapper,
-                                                                Clock clock,
-                                                                SchemaRepository schemaRepository,
-                                                                MetricsFacade metricsFacade,
-                                                                SchemaProperties schemaProperties,
-                                                                ContentRootProperties contentRootProperties) {
-        AvroMessageContentWrapper avroMessageContentWrapper = new AvroMessageContentWrapper(clock);
-
-        return new CompositeMessageContentWrapper(
-                new JsonMessageContentWrapper(contentRootProperties.getMessage(), contentRootProperties.getMetadata(), mapper),
-                avroMessageContentWrapper,
-                new AvroMessageSchemaIdAwareContentWrapper(schemaRepository, avroMessageContentWrapper,
-                        metricsFacade),
-                new AvroMessageHeaderSchemaVersionContentWrapper(schemaRepository, avroMessageContentWrapper,
-                        metricsFacade),
-                new AvroMessageHeaderSchemaIdContentWrapper(schemaRepository, avroMessageContentWrapper,
-                        metricsFacade, schemaProperties.isIdHeaderEnabled()),
-                new AvroMessageSchemaVersionTruncationContentWrapper(schemaRepository, avroMessageContentWrapper,
-                        metricsFacade, schemaProperties.isVersionTruncationEnabled())
-        );
-    }
-
-    @Bean
-    public KafkaNamesMapper prodKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
-        return new NamespaceKafkaNamesMapper(kafkaClustersProperties.getNamespace(), kafkaClustersProperties.getNamespaceSeparator());
-    }
-
-    @Bean
-    public Clock clock() {
-        return new ClockFactory().provide();
-    }
-
-    @Bean
-    public ZookeeperPaths zookeeperPaths(ZookeeperClustersProperties zookeeperClustersProperties,
-                                         DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new ZookeeperPaths(zookeeperProperties.getRoot());
-    }
-
-    @Bean
-    public WorkloadConstraintsRepository workloadConstraintsRepository(CuratorFramework curator,
-                                                                       ObjectMapper mapper,
-                                                                       ZookeeperPaths paths) {
-        return new ZookeeperWorkloadConstraintsRepository(curator, mapper, paths);
-    }
-
-    @Bean
-    public HermesMetrics hermesMetrics(MetricRegistry metricRegistry,
-                                       PathsCompiler pathsCompiler) {
-        return new HermesMetrics(metricRegistry, pathsCompiler);
-    }
-
-    @Bean
-    public MetricsFacade metricsFacade(MeterRegistry meterRegistry, HermesMetrics hermesMetrics) {
-        return new MetricsFacade(meterRegistry, hermesMetrics);
-    }
-
-    @Bean
-    public MetricRegistry metricRegistry(MetricsProperties metricsProperties,
-                                         GraphiteProperties graphiteProperties,
-                                         InstanceIdResolver instanceIdResolver,
-                                         @Named("moduleName") String moduleName) {
-        return new MetricRegistryFactory(metricsProperties, graphiteProperties, instanceIdResolver, moduleName)
-                .provide();
-    }
-
-    @Bean
-    PrometheusConfig prometheusConfig(PrometheusProperties properties) {
-        return new PrometheusConfigAdapter(properties);
-    }
-
-    @Bean
-    public PrometheusMeterRegistry micrometerRegistry(MicrometerRegistryParameters micrometerRegistryParameters,
-                                                      PrometheusConfig prometheusConfig,
-                                                      CounterStorage counterStorage) {
-        return new PrometheusMeterRegistryFactory(micrometerRegistryParameters,
-                prometheusConfig, counterStorage, "hermes-consumers").provide();
-    }
-
-    @Bean
-    @Primary
-    public MeterRegistry compositeMeterRegistry(List<MeterRegistry> registries) {
-        return new CompositeMeterRegistry(SYSTEM, registries);
-    }
-
-    @Bean
-    @Named("moduleName")
-    public String moduleName() {
-        return "consumer";
-    }
-
-    @Bean
-    public PathsCompiler pathsCompiler(InstanceIdResolver instanceIdResolver) {
-        return new PathsCompiler(instanceIdResolver.resolve());
-    }
-
-    @Bean
-    public CounterStorage zookeeperCounterStorage(SharedCounter sharedCounter,
-                                                  SubscriptionRepository subscriptionRepository,
-                                                  PathsCompiler pathsCompiler,
-                                                  ZookeeperClustersProperties zookeeperClustersProperties,
-                                                  DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new ZookeeperCounterStorage(sharedCounter, subscriptionRepository, pathsCompiler, zookeeperProperties.getRoot());
-    }
-
-    @Bean
-    public SharedCounter sharedCounter(CuratorFramework zookeeper,
-                                       ZookeeperClustersProperties zookeeperClustersProperties,
-                                       MetricsProperties metricsProperties,
-                                       DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new SharedCounter(zookeeper,
-                metricsProperties.getCounterExpireAfterAccess(),
-                zookeeperProperties.getBaseSleepTime(),
-                zookeeperProperties.getMaxRetries()
-        );
-    }
-
-    @Bean
-    public InstanceIdResolver instanceIdResolver() {
-        return new InetAddressInstanceIdResolver();
-    }
-
-    @Bean
-    public SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicatorFactory(CuratorFramework zookeeper,
-                                                                                      ZookeeperPaths paths,
-                                                                                      SubscriptionRepository subscriptionRepository) {
-        return new ZookeeperSubscriptionOffsetChangeIndicator(zookeeper, paths, subscriptionRepository);
-    }
-
-    @Bean
-    FilterChainFactory filterChainFactory() {
-        List<SubscriptionMessageFilterCompiler> subscriptionFilterCompilers = Arrays.asList(
-                new AvroPathSubscriptionMessageFilterCompiler(),
-                new JsonPathSubscriptionMessageFilterCompiler(),
-                new HeaderSubscriptionMessageFilterCompiler()
-        );
-        MessageFilters messageFilters = new MessageFilters(emptyList(), subscriptionFilterCompilers);
-        return new FilterChainFactory(messageFilters);
-    }
-
-    @Bean
-    public ExecutorServiceFactory executorServiceFactory() {
-        return new DefaultExecutorServiceFactory();
-    }
+  @Bean
+  public DatacenterNameProvider dcNameProvider(DatacenterNameProperties datacenterNameProperties) {
+    if (datacenterNameProperties.getSource() == DcNameSource.ENV) {
+      return new EnvironmentVariableDatacenterNameProvider(datacenterNameProperties.getEnv());
+    } else {
+      return new DefaultDatacenterNameProvider();
+    }
+  }
+
+  @Bean
+  public SubscriptionRepository subscriptionRepository(
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      ObjectMapper mapper,
+      TopicRepository topicRepository) {
+    return new ZookeeperSubscriptionRepository(zookeeper, mapper, paths, topicRepository);
+  }
+
+  @Bean
+  public OAuthProviderRepository oAuthProviderRepository(
+      CuratorFramework zookeeper, ZookeeperPaths paths, ObjectMapper mapper) {
+    return new ZookeeperOAuthProviderRepository(zookeeper, mapper, paths);
+  }
+
+  @Bean
+  public TopicRepository topicRepository(
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      ObjectMapper mapper,
+      GroupRepository groupRepository) {
+    return new ZookeeperTopicRepository(zookeeper, mapper, paths, groupRepository);
+  }
+
+  @Bean
+  public GroupRepository groupRepository(
+      CuratorFramework zookeeper, ZookeeperPaths paths, ObjectMapper mapper) {
+    return new ZookeeperGroupRepository(zookeeper, mapper, paths);
+  }
+
+  @Bean(destroyMethod = "close")
+  public CuratorFramework hermesCurator(
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      CuratorClientFactory curatorClientFactory,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new HermesCuratorClientFactory(zookeeperProperties, curatorClientFactory).provide();
+  }
+
+  @Bean
+  public CuratorClientFactory curatorClientFactory(
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new CuratorClientFactory(zookeeperProperties);
+  }
+
+  @Bean
+  public InternalNotificationsBus zookeeperInternalNotificationBus(
+      ObjectMapper objectMapper, ModelAwareZookeeperNotifyingCache modelNotifyingCache) {
+    return new ZookeeperInternalNotificationBus(objectMapper, modelNotifyingCache);
+  }
+
+  @Bean(destroyMethod = "stop")
+  public ModelAwareZookeeperNotifyingCache modelAwareZookeeperNotifyingCache(
+      CuratorFramework curator,
+      MetricsFacade metricsFacade,
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new ModelAwareZookeeperNotifyingCacheFactory(curator, metricsFacade, zookeeperProperties)
+        .provide();
+  }
+
+  @Bean
+  public UndeliveredMessageLog undeliveredMessageLog(
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      ObjectMapper mapper,
+      MetricsFacade metricsFacade) {
+    return new ZookeeperUndeliveredMessageLog(zookeeper, paths, mapper, metricsFacade);
+  }
+
+  @Bean
+  public InstrumentedExecutorServiceFactory instrumentedExecutorServiceFactory(
+      MetricsFacade metricsFacade) {
+    return new InstrumentedExecutorServiceFactory(metricsFacade);
+  }
+
+  @Bean
+  public ZookeeperAdminCache zookeeperAdminCache(
+      ZookeeperPaths zookeeperPaths,
+      CuratorFramework client,
+      ObjectMapper objectMapper,
+      Clock clock) {
+    return new ZookeeperAdminCache(zookeeperPaths, client, objectMapper, clock);
+  }
+
+  @Bean
+  public ObjectMapper objectMapper(SchemaProperties schemaProperties) {
+    return new ObjectMapperFactory(
+            schemaProperties.isIdSerializationEnabled(),
+            /* fallbackToRemoteDatacenter is frontend specific property, we so don't expose consumer side property for it */
+            false)
+        .provide();
+  }
+
+  @Bean
+  public CompositeMessageContentWrapper messageContentWrapper(
+      ObjectMapper mapper,
+      Clock clock,
+      SchemaRepository schemaRepository,
+      MetricsFacade metricsFacade,
+      SchemaProperties schemaProperties,
+      ContentRootProperties contentRootProperties) {
+    AvroMessageContentWrapper avroMessageContentWrapper = new AvroMessageContentWrapper(clock);
+
+    return new CompositeMessageContentWrapper(
+        new JsonMessageContentWrapper(
+            contentRootProperties.getMessage(), contentRootProperties.getMetadata(), mapper),
+        avroMessageContentWrapper,
+        new AvroMessageSchemaIdAwareContentWrapper(
+            schemaRepository, avroMessageContentWrapper, metricsFacade),
+        new AvroMessageHeaderSchemaVersionContentWrapper(
+            schemaRepository, avroMessageContentWrapper, metricsFacade),
+        new AvroMessageHeaderSchemaIdContentWrapper(
+            schemaRepository,
+            avroMessageContentWrapper,
+            metricsFacade,
+            schemaProperties.isIdHeaderEnabled()),
+        new AvroMessageSchemaVersionTruncationContentWrapper(
+            schemaRepository,
+            avroMessageContentWrapper,
+            metricsFacade,
+            schemaProperties.isVersionTruncationEnabled()));
+  }
+
+  @Bean
+  public KafkaNamesMapper prodKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
+    return new NamespaceKafkaNamesMapper(
+        kafkaClustersProperties.getNamespace(), kafkaClustersProperties.getNamespaceSeparator());
+  }
+
+  @Bean
+  public Clock clock() {
+    return new ClockFactory().provide();
+  }
+
+  @Bean
+  public ZookeeperPaths zookeeperPaths(
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new ZookeeperPaths(zookeeperProperties.getRoot());
+  }
+
+  @Bean
+  public WorkloadConstraintsRepository workloadConstraintsRepository(
+      CuratorFramework curator, ObjectMapper mapper, ZookeeperPaths paths) {
+    return new ZookeeperWorkloadConstraintsRepository(curator, mapper, paths);
+  }
+
+  @Bean
+  public MetricsFacade metricsFacade(MeterRegistry meterRegistry) {
+    return new MetricsFacade(meterRegistry);
+  }
+
+  @Bean
+  PrometheusConfig prometheusConfig(PrometheusProperties properties) {
+    return new PrometheusConfigAdapter(properties);
+  }
+
+  @Bean
+  public PrometheusMeterRegistry micrometerRegistry(
+      MicrometerRegistryParameters micrometerRegistryParameters,
+      PrometheusConfig prometheusConfig,
+      CounterStorage counterStorage) {
+    return new PrometheusMeterRegistryFactory(
+            micrometerRegistryParameters, prometheusConfig, counterStorage, "hermes-consumers")
+        .provide();
+  }
+
+  @Bean
+  @Primary
+  public MeterRegistry compositeMeterRegistry(List<MeterRegistry> registries) {
+    return new CompositeMeterRegistry(SYSTEM, registries);
+  }
+
+  @Bean
+  @Named("moduleName")
+  public String moduleName() {
+    return "consumer";
+  }
+
+  @Bean
+  public PathsCompiler pathsCompiler(InstanceIdResolver instanceIdResolver) {
+    return new PathsCompiler(instanceIdResolver.resolve());
+  }
+
+  @Bean
+  public CounterStorage zookeeperCounterStorage(
+      SharedCounter sharedCounter,
+      SubscriptionRepository subscriptionRepository,
+      PathsCompiler pathsCompiler,
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new ZookeeperCounterStorage(
+        sharedCounter, subscriptionRepository, pathsCompiler, zookeeperProperties.getRoot());
+  }
+
+  @Bean
+  public SharedCounter sharedCounter(
+      CuratorFramework zookeeper,
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      MetricsProperties metricsProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new SharedCounter(
+        zookeeper,
+        metricsProperties.getCounterExpireAfterAccess(),
+        zookeeperProperties.getBaseSleepTime(),
+        zookeeperProperties.getMaxRetries());
+  }
+
+  @Bean
+  public InstanceIdResolver instanceIdResolver() {
+    return new InetAddressInstanceIdResolver();
+  }
+
+  @Bean
+  public SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicatorFactory(
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      SubscriptionRepository subscriptionRepository) {
+    return new ZookeeperSubscriptionOffsetChangeIndicator(zookeeper, paths, subscriptionRepository);
+  }
+
+  @Bean
+  FilterChainFactory filterChainFactory() {
+    List<SubscriptionMessageFilterCompiler> subscriptionFilterCompilers =
+        Arrays.asList(
+            new AvroPathSubscriptionMessageFilterCompiler(),
+            new JsonPathSubscriptionMessageFilterCompiler(),
+            new HeaderSubscriptionMessageFilterCompiler());
+    MessageFilters messageFilters = new MessageFilters(emptyList(), subscriptionFilterCompilers);
+    return new FilterChainFactory(messageFilters);
+  }
+
+  @Bean
+  public ExecutorServiceFactory executorServiceFactory() {
+    return new DefaultExecutorServiceFactory();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConsumerProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConsumerProperties.java
index 2b7df3a2c2..e91544ef26 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConsumerProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConsumerProperties.java
@@ -1,157 +1,158 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.consumers.CommonConsumerParameters;
 import pl.allegro.tech.hermes.consumers.consumer.SerialConsumerParameters;
 import pl.allegro.tech.hermes.consumers.supervisor.SupervisorParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "consumer")
 public class CommonConsumerProperties implements CommonConsumerParameters {
 
-    private int threadPoolSize = 500;
+  private int threadPoolSize = 500;
 
-    private int healthCheckPort = 8000;
+  private int healthCheckPort = 8000;
 
-    private Duration subscriptionIdsCacheRemovedExpireAfterAccess = Duration.ofSeconds(60);
+  private Duration subscriptionIdsCacheRemovedExpireAfterAccess = Duration.ofSeconds(60);
 
-    private SupervisorParameters backgroundSupervisor = new BackgroundSupervisor();
+  private SupervisorParameters backgroundSupervisor = new BackgroundSupervisor();
 
-    private SerialConsumerParameters serialConsumer = new SerialConsumer();
+  private SerialConsumerParameters serialConsumer = new SerialConsumer();
 
-    private int signalProcessingQueueSize = 5_000;
+  private int signalProcessingQueueSize = 5_000;
 
-    private boolean useTopicMessageSizeEnabled = false;
+  private boolean useTopicMessageSizeEnabled = false;
 
-    private Duration undeliveredMessageLogPersistPeriod = Duration.ofSeconds(5);
+  private Duration undeliveredMessageLogPersistPeriod = Duration.ofSeconds(5);
 
-    public int getThreadPoolSize() {
-        return threadPoolSize;
-    }
+  public int getThreadPoolSize() {
+    return threadPoolSize;
+  }
 
-    public void setThreadPoolSize(int threadPoolSize) {
-        this.threadPoolSize = threadPoolSize;
-    }
+  public void setThreadPoolSize(int threadPoolSize) {
+    this.threadPoolSize = threadPoolSize;
+  }
 
-    public int getHealthCheckPort() {
-        return healthCheckPort;
-    }
+  public int getHealthCheckPort() {
+    return healthCheckPort;
+  }
 
-    public void setHealthCheckPort(int healthCheckPort) {
-        this.healthCheckPort = healthCheckPort;
-    }
+  public void setHealthCheckPort(int healthCheckPort) {
+    this.healthCheckPort = healthCheckPort;
+  }
 
-    public Duration getSubscriptionIdsCacheRemovedExpireAfterAccess() {
-        return subscriptionIdsCacheRemovedExpireAfterAccess;
-    }
+  public Duration getSubscriptionIdsCacheRemovedExpireAfterAccess() {
+    return subscriptionIdsCacheRemovedExpireAfterAccess;
+  }
 
-    public void setSubscriptionIdsCacheRemovedExpireAfterAccess(Duration subscriptionIdsCacheRemovedExpireAfterAccess) {
-        this.subscriptionIdsCacheRemovedExpireAfterAccess = subscriptionIdsCacheRemovedExpireAfterAccess;
-    }
+  public void setSubscriptionIdsCacheRemovedExpireAfterAccess(
+      Duration subscriptionIdsCacheRemovedExpireAfterAccess) {
+    this.subscriptionIdsCacheRemovedExpireAfterAccess =
+        subscriptionIdsCacheRemovedExpireAfterAccess;
+  }
 
-    @Override
-    public SupervisorParameters getBackgroundSupervisor() {
-        return backgroundSupervisor;
-    }
+  @Override
+  public SupervisorParameters getBackgroundSupervisor() {
+    return backgroundSupervisor;
+  }
 
-    public void setBackgroundSupervisor(SupervisorParameters backgroundSupervisor) {
-        this.backgroundSupervisor = backgroundSupervisor;
-    }
+  public void setBackgroundSupervisor(SupervisorParameters backgroundSupervisor) {
+    this.backgroundSupervisor = backgroundSupervisor;
+  }
 
-    @Override
-    public SerialConsumerParameters getSerialConsumer() {
-        return serialConsumer;
-    }
+  @Override
+  public SerialConsumerParameters getSerialConsumer() {
+    return serialConsumer;
+  }
 
-    public void setSerialConsumer(SerialConsumerParameters serialConsumer) {
-        this.serialConsumer = serialConsumer;
-    }
+  public void setSerialConsumer(SerialConsumerParameters serialConsumer) {
+    this.serialConsumer = serialConsumer;
+  }
 
-    @Override
-    public int getSignalProcessingQueueSize() {
-        return signalProcessingQueueSize;
-    }
+  @Override
+  public int getSignalProcessingQueueSize() {
+    return signalProcessingQueueSize;
+  }
 
-    public void setSignalProcessingQueueSize(int signalProcessingQueueSize) {
-        this.signalProcessingQueueSize = signalProcessingQueueSize;
-    }
+  public void setSignalProcessingQueueSize(int signalProcessingQueueSize) {
+    this.signalProcessingQueueSize = signalProcessingQueueSize;
+  }
 
-    @Override
-    public boolean isUseTopicMessageSizeEnabled() {
-        return useTopicMessageSizeEnabled;
-    }
+  @Override
+  public boolean isUseTopicMessageSizeEnabled() {
+    return useTopicMessageSizeEnabled;
+  }
 
-    public void setUseTopicMessageSizeEnabled(boolean useTopicMessageSizeEnabled) {
-        this.useTopicMessageSizeEnabled = useTopicMessageSizeEnabled;
-    }
+  public void setUseTopicMessageSizeEnabled(boolean useTopicMessageSizeEnabled) {
+    this.useTopicMessageSizeEnabled = useTopicMessageSizeEnabled;
+  }
 
-    public Duration getUndeliveredMessageLogPersistPeriod() {
-        return undeliveredMessageLogPersistPeriod;
-    }
+  public Duration getUndeliveredMessageLogPersistPeriod() {
+    return undeliveredMessageLogPersistPeriod;
+  }
 
-    public void setUndeliveredMessageLogPersistPeriod(Duration undeliveredMessageLogPersistPeriod) {
-        this.undeliveredMessageLogPersistPeriod = undeliveredMessageLogPersistPeriod;
-    }
+  public void setUndeliveredMessageLogPersistPeriod(Duration undeliveredMessageLogPersistPeriod) {
+    this.undeliveredMessageLogPersistPeriod = undeliveredMessageLogPersistPeriod;
+  }
 
-    public static final class SerialConsumer implements SerialConsumerParameters {
+  public static final class SerialConsumer implements SerialConsumerParameters {
 
-        private Duration signalProcessingInterval = Duration.ofMillis(5_000);
+    private Duration signalProcessingInterval = Duration.ofMillis(5_000);
 
-        private int inflightSize = 100;
+    private int inflightSize = 100;
 
-        @Override
-        public Duration getSignalProcessingInterval() {
-            return signalProcessingInterval;
-        }
+    @Override
+    public Duration getSignalProcessingInterval() {
+      return signalProcessingInterval;
+    }
 
-        public void setSignalProcessingInterval(Duration signalProcessingInterval) {
-            this.signalProcessingInterval = signalProcessingInterval;
-        }
+    public void setSignalProcessingInterval(Duration signalProcessingInterval) {
+      this.signalProcessingInterval = signalProcessingInterval;
+    }
 
-        @Override
-        public int getInflightSize() {
-            return inflightSize;
-        }
+    @Override
+    public int getInflightSize() {
+      return inflightSize;
+    }
 
-        public void setInflightSize(int inflightSize) {
-            this.inflightSize = inflightSize;
-        }
+    public void setInflightSize(int inflightSize) {
+      this.inflightSize = inflightSize;
     }
+  }
 
-    public static final class BackgroundSupervisor implements SupervisorParameters {
+  public static final class BackgroundSupervisor implements SupervisorParameters {
 
-        private Duration interval = Duration.ofMillis(20_000);
+    private Duration interval = Duration.ofMillis(20_000);
 
-        private Duration unhealthyAfter = Duration.ofMillis(600_000);
+    private Duration unhealthyAfter = Duration.ofMillis(600_000);
 
-        private Duration killAfter = Duration.ofMillis(300_000);
+    private Duration killAfter = Duration.ofMillis(300_000);
 
-        @Override
-        public Duration getInterval() {
-            return interval;
-        }
+    @Override
+    public Duration getInterval() {
+      return interval;
+    }
 
-        public void setInterval(Duration interval) {
-            this.interval = interval;
-        }
+    public void setInterval(Duration interval) {
+      this.interval = interval;
+    }
 
-        @Override
-        public Duration getUnhealthyAfter() {
-            return unhealthyAfter;
-        }
+    @Override
+    public Duration getUnhealthyAfter() {
+      return unhealthyAfter;
+    }
 
-        public void setUnhealthyAfter(Duration unhealthyAfter) {
-            this.unhealthyAfter = unhealthyAfter;
-        }
+    public void setUnhealthyAfter(Duration unhealthyAfter) {
+      this.unhealthyAfter = unhealthyAfter;
+    }
 
-        @Override
-        public Duration getKillAfter() {
-            return killAfter;
-        }
+    @Override
+    public Duration getKillAfter() {
+      return killAfter;
+    }
 
-        public void setKillAfter(Duration killAfter) {
-            this.killAfter = killAfter;
-        }
+    public void setKillAfter(Duration killAfter) {
+      this.killAfter = killAfter;
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerConfiguration.java
index 5d912ef791..f4d1c7bb25 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerConfiguration.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import java.time.Clock;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -18,7 +20,6 @@
 import pl.allegro.tech.hermes.consumers.consumer.interpolation.MessageBodyInterpolator;
 import pl.allegro.tech.hermes.consumers.consumer.interpolation.UriInterpolator;
 import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
 import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimitSupervisor;
 import pl.allegro.tech.hermes.consumers.consumer.rate.calculator.OutputRateCalculatorFactory;
 import pl.allegro.tech.hermes.consumers.consumer.rate.maxrate.MaxRatePathSerializer;
@@ -37,158 +38,154 @@
 import pl.allegro.tech.hermes.tracker.consumers.LogRepository;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.time.Clock;
-import java.util.List;
-
 @Configuration
 @EnableConfigurationProperties({
-        CommitOffsetProperties.class,
-        SenderAsyncTimeoutProperties.class,
-        RateProperties.class,
-        BatchProperties.class,
-        KafkaClustersProperties.class,
-        WorkloadProperties.class,
-        MaxRateProperties.class
+  CommitOffsetProperties.class,
+  SenderAsyncTimeoutProperties.class,
+  RateProperties.class,
+  BatchProperties.class,
+  KafkaClustersProperties.class,
+  WorkloadProperties.class,
+  MaxRateProperties.class
 })
 public class ConsumerConfiguration {
 
-    @Bean
-    public MaxRatePathSerializer maxRatePathSerializer() {
-        return new MaxRatePathSerializer();
-    }
-
-    @Bean
-    public NoOperationMessageConverter noOperationMessageConverter() {
-        return new NoOperationMessageConverter();
-    }
-
-    @Bean
-    public ConsumerPartitionAssignmentState consumerPartitionAssignmentState() {
-        return new ConsumerPartitionAssignmentState();
-    }
-
-    @Bean
-    public MaxRateRegistry maxRateRegistry(MaxRateProperties maxRateProperties,
-                                           KafkaClustersProperties kafkaClustersProperties,
-                                           WorkloadProperties workloadProperties,
-                                           CuratorFramework curator,
-                                           ZookeeperPaths zookeeperPaths,
-                                           SubscriptionIds subscriptionIds,
-                                           ConsumerAssignmentCache assignmentCache,
-                                           ClusterAssignmentCache clusterAssignmentCache,
-                                           DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        return new MaxRateRegistry(
-                maxRateProperties.getRegistryBinaryEncoder().getHistoryBufferSizeBytes(),
-                maxRateProperties.getRegistryBinaryEncoder().getMaxRateBufferSizeBytes(),
-                workloadProperties.getNodeId(),
-                kafkaProperties.getClusterName(),
-                clusterAssignmentCache,
-                assignmentCache,
-                curator,
-                zookeeperPaths,
-                subscriptionIds
-        );
-    }
-
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    public MaxRateSupervisor maxRateSupervisor(MaxRateProperties maxRateProperties,
-                                               ClusterAssignmentCache clusterAssignmentCache,
-                                               MaxRateRegistry maxRateRegistry,
-                                               ConsumerNodesRegistry consumerNodesRegistry,
-                                               SubscriptionsCache subscriptionsCache,
-                                               MetricsFacade metrics,
-                                               Clock clock) {
-        return new MaxRateSupervisor(
-                maxRateProperties,
-                clusterAssignmentCache,
-                maxRateRegistry,
-                consumerNodesRegistry,
-                subscriptionsCache,
-                metrics,
-                clock
-        );
-    }
-
-    @Bean
-    public OffsetQueue offsetQueue(MetricsFacade metrics,
-                                   CommitOffsetProperties commitOffsetProperties) {
-        return new OffsetQueue(metrics, commitOffsetProperties.getQueuesSize());
-    }
-
-    @Bean
-    public ConsumerRateLimitSupervisor consumerRateLimitSupervisor(RateProperties rateProperties) {
-        return new ConsumerRateLimitSupervisor(rateProperties.getLimiterSupervisorPeriod());
-    }
-
-    @Bean
-    public MaxRateProviderFactory maxRateProviderFactory(MaxRateProperties maxRateProperties,
-                                                         MaxRateRegistry maxRateRegistry,
-                                                         MaxRateSupervisor maxRateSupervisor,
-                                                         WorkloadProperties workloadProperties) {
-        return new MaxRateProviderFactory(maxRateProperties, workloadProperties.getNodeId(), maxRateRegistry, maxRateSupervisor);
-    }
-
-    @Bean
-    public AvroToJsonMessageConverter avroToJsonMessageConverter() {
-        return new AvroToJsonMessageConverter();
-    }
-
-    @Bean
-    public OutputRateCalculatorFactory outputRateCalculatorFactory(RateProperties rateProperties,
-                                                                   MaxRateProviderFactory maxRateProviderFactory) {
-        return new OutputRateCalculatorFactory(rateProperties, maxRateProviderFactory);
-    }
-
-    @Bean
-    public MessageBatchFactory messageBatchFactory(MetricsFacade metrics,
-                                                   Clock clock,
-                                                   BatchProperties batchProperties) {
-        return new ByteBufferMessageBatchFactory(batchProperties.getPoolableSize(), batchProperties.getMaxPoolSize(), clock, metrics);
-    }
-
-    @Bean
-    public MessageConverterResolver defaultMessageConverterResolver(AvroToJsonMessageConverter avroToJsonMessageConverter,
-                                                                    NoOperationMessageConverter noOperationMessageConverter) {
-        return new DefaultMessageConverterResolver(avroToJsonMessageConverter, noOperationMessageConverter);
-    }
-
-
-
-    @Bean
-    public ConsumerMessageSenderFactory consumerMessageSenderFactory(KafkaClustersProperties kafkaClustersProperties,
-                                                                     MessageSenderFactory messageSenderFactory,
-                                                                     Trackers trackers,
-                                                                     FutureAsyncTimeout futureAsyncTimeout,
-                                                                     UndeliveredMessageLog undeliveredMessageLog, Clock clock,
-                                                                     InstrumentedExecutorServiceFactory instrumentedExecutorServiceFactory,
-                                                                     ConsumerAuthorizationHandler consumerAuthorizationHandler,
-                                                                     SenderAsyncTimeoutProperties senderAsyncTimeoutProperties,
-                                                                     RateProperties rateProperties,
-                                                                     DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        return new ConsumerMessageSenderFactory(
-                kafkaProperties.getClusterName(),
-                messageSenderFactory,
-                trackers,
-                futureAsyncTimeout,
-                undeliveredMessageLog,
-                clock,
-                instrumentedExecutorServiceFactory,
-                consumerAuthorizationHandler,
-                senderAsyncTimeoutProperties.getMilliseconds(),
-                rateProperties.getLimiterReportingThreadPoolSize(),
-                rateProperties.isLimiterReportingThreadMonitoringEnabled()
-        );
-    }
-
-    @Bean
-    public UriInterpolator messageBodyInterpolator() {
-        return new MessageBodyInterpolator();
-    }
-
-    @Bean(destroyMethod = "close")
-    public Trackers trackers(List<LogRepository> repositories) {
-        return new Trackers(repositories);
-    }
+  @Bean
+  public MaxRatePathSerializer maxRatePathSerializer() {
+    return new MaxRatePathSerializer();
+  }
+
+  @Bean
+  public NoOperationMessageConverter noOperationMessageConverter() {
+    return new NoOperationMessageConverter();
+  }
+
+  @Bean
+  public ConsumerPartitionAssignmentState consumerPartitionAssignmentState() {
+    return new ConsumerPartitionAssignmentState();
+  }
+
+  @Bean
+  public MaxRateRegistry maxRateRegistry(
+      MaxRateProperties maxRateProperties,
+      KafkaClustersProperties kafkaClustersProperties,
+      WorkloadProperties workloadProperties,
+      CuratorFramework curator,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionIds subscriptionIds,
+      ConsumerAssignmentCache assignmentCache,
+      ClusterAssignmentCache clusterAssignmentCache,
+      DatacenterNameProvider datacenterNameProvider) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    return new MaxRateRegistry(
+        maxRateProperties.getRegistryBinaryEncoder().getHistoryBufferSizeBytes(),
+        maxRateProperties.getRegistryBinaryEncoder().getMaxRateBufferSizeBytes(),
+        workloadProperties.getNodeId(),
+        kafkaProperties.getClusterName(),
+        clusterAssignmentCache,
+        assignmentCache,
+        curator,
+        zookeeperPaths,
+        subscriptionIds);
+  }
+
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public MaxRateSupervisor maxRateSupervisor(
+      MaxRateProperties maxRateProperties,
+      ClusterAssignmentCache clusterAssignmentCache,
+      MaxRateRegistry maxRateRegistry,
+      ConsumerNodesRegistry consumerNodesRegistry,
+      SubscriptionsCache subscriptionsCache,
+      MetricsFacade metrics,
+      Clock clock) {
+    return new MaxRateSupervisor(
+        maxRateProperties,
+        clusterAssignmentCache,
+        maxRateRegistry,
+        consumerNodesRegistry,
+        subscriptionsCache,
+        metrics,
+        clock);
+  }
+
+  @Bean
+  public ConsumerRateLimitSupervisor consumerRateLimitSupervisor(RateProperties rateProperties) {
+    return new ConsumerRateLimitSupervisor(rateProperties.getLimiterSupervisorPeriod());
+  }
+
+  @Bean
+  public MaxRateProviderFactory maxRateProviderFactory(
+      MaxRateProperties maxRateProperties,
+      MaxRateRegistry maxRateRegistry,
+      MaxRateSupervisor maxRateSupervisor,
+      WorkloadProperties workloadProperties) {
+    return new MaxRateProviderFactory(
+        maxRateProperties, workloadProperties.getNodeId(), maxRateRegistry, maxRateSupervisor);
+  }
+
+  @Bean
+  public AvroToJsonMessageConverter avroToJsonMessageConverter() {
+    return new AvroToJsonMessageConverter();
+  }
+
+  @Bean
+  public OutputRateCalculatorFactory outputRateCalculatorFactory(
+      RateProperties rateProperties, MaxRateProviderFactory maxRateProviderFactory) {
+    return new OutputRateCalculatorFactory(rateProperties, maxRateProviderFactory);
+  }
+
+  @Bean
+  public MessageBatchFactory messageBatchFactory(
+      MetricsFacade metrics, Clock clock, BatchProperties batchProperties) {
+    return new ByteBufferMessageBatchFactory(
+        batchProperties.getPoolableSize(), batchProperties.getMaxPoolSize(), clock, metrics);
+  }
+
+  @Bean
+  public MessageConverterResolver defaultMessageConverterResolver(
+      AvroToJsonMessageConverter avroToJsonMessageConverter,
+      NoOperationMessageConverter noOperationMessageConverter) {
+    return new DefaultMessageConverterResolver(
+        avroToJsonMessageConverter, noOperationMessageConverter);
+  }
+
+  @Bean
+  public ConsumerMessageSenderFactory consumerMessageSenderFactory(
+      KafkaClustersProperties kafkaClustersProperties,
+      MessageSenderFactory messageSenderFactory,
+      Trackers trackers,
+      FutureAsyncTimeout futureAsyncTimeout,
+      UndeliveredMessageLog undeliveredMessageLog,
+      Clock clock,
+      InstrumentedExecutorServiceFactory instrumentedExecutorServiceFactory,
+      ConsumerAuthorizationHandler consumerAuthorizationHandler,
+      SenderAsyncTimeoutProperties senderAsyncTimeoutProperties,
+      RateProperties rateProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    return new ConsumerMessageSenderFactory(
+        kafkaProperties.getClusterName(),
+        messageSenderFactory,
+        trackers,
+        futureAsyncTimeout,
+        undeliveredMessageLog,
+        clock,
+        instrumentedExecutorServiceFactory,
+        consumerAuthorizationHandler,
+        senderAsyncTimeoutProperties.getMilliseconds(),
+        rateProperties.getLimiterReportingThreadPoolSize(),
+        rateProperties.isLimiterReportingThreadMonitoringEnabled());
+  }
+
+  @Bean
+  public UriInterpolator messageBodyInterpolator() {
+    return new MessageBodyInterpolator();
+  }
+
+  @Bean(destroyMethod = "close")
+  public Trackers trackers(List<LogRepository> repositories) {
+    return new Trackers(repositories);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerHTTPHeadersPropagationAsKafkaHeadersProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerHTTPHeadersPropagationAsKafkaHeadersProperties.java
new file mode 100644
index 0000000000..82fab79e87
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerHTTPHeadersPropagationAsKafkaHeadersProperties.java
@@ -0,0 +1,30 @@
+package pl.allegro.tech.hermes.consumers.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.common.kafka.HTTPHeadersPropagationAsKafkaHeadersProperties;
+
+@ConfigurationProperties(prefix = "consumer.http.headers.propagation-as-kafka-headers")
+public class ConsumerHTTPHeadersPropagationAsKafkaHeadersProperties
+    implements HTTPHeadersPropagationAsKafkaHeadersProperties {
+
+  public boolean enabled = true;
+  public String prefix = "h-";
+
+  @Override
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  @Override
+  public String getPrefix() {
+    return prefix;
+  }
+
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public void setPrefix(String prefix) {
+    this.prefix = prefix;
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerReceiverConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerReceiverConfiguration.java
index 3915bdd64a..b4c701d5c3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerReceiverConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerReceiverConfiguration.java
@@ -1,13 +1,14 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import java.time.Clock;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import pl.allegro.tech.hermes.common.kafka.HTTPHeadersPropagationAsKafkaHeadersProperties;
 import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
 import pl.allegro.tech.hermes.common.message.wrapper.CompositeMessageContentWrapper;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.ReceiverFactory;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.kafka.BasicMessageContentReaderFactory;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.kafka.KafkaConsumerRecordToMessageConverterFactory;
@@ -19,66 +20,70 @@
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.time.Clock;
-
 @Configuration
 @EnableConfigurationProperties({
-        ConsumerReceiverProperties.class,
-        KafkaConsumerProperties.class,
-        KafkaClustersProperties.class,
-        CommonConsumerProperties.class,
-        KafkaHeaderNameProperties.class
+  ConsumerReceiverProperties.class,
+  KafkaConsumerProperties.class,
+  KafkaClustersProperties.class,
+  CommonConsumerProperties.class,
+  KafkaHeaderNameProperties.class,
+  ConsumerHTTPHeadersPropagationAsKafkaHeadersProperties.class
 })
 public class ConsumerReceiverConfiguration {
 
-    @Bean
-    public ReceiverFactory kafkaMessageReceiverFactory(CommonConsumerProperties commonConsumerProperties,
-                                                       ConsumerReceiverProperties consumerReceiverProperties,
-                                                       KafkaConsumerProperties kafkaConsumerProperties,
-                                                       KafkaClustersProperties kafkaClustersProperties,
-                                                       KafkaConsumerRecordToMessageConverterFactory messageConverterFactory,
-                                                       MetricsFacade metrics,
-                                                       OffsetQueue offsetQueue,
-                                                       KafkaNamesMapper kafkaNamesMapper,
-                                                       FilterChainFactory filterChainFactory,
-                                                       Trackers trackers,
-                                                       ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
-                                                       DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-
+  @Bean
+  public ReceiverFactory kafkaMessageReceiverFactory(
+      CommonConsumerProperties commonConsumerProperties,
+      ConsumerReceiverProperties consumerReceiverProperties,
+      KafkaConsumerProperties kafkaConsumerProperties,
+      KafkaClustersProperties kafkaClustersProperties,
+      KafkaConsumerRecordToMessageConverterFactory messageConverterFactory,
+      MetricsFacade metrics,
+      KafkaNamesMapper kafkaNamesMapper,
+      FilterChainFactory filterChainFactory,
+      Trackers trackers,
+      ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
+      DatacenterNameProvider datacenterNameProvider) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
 
-        return new KafkaMessageReceiverFactory(
-                commonConsumerProperties,
-                consumerReceiverProperties,
-                kafkaConsumerProperties,
-                kafkaProperties,
-                messageConverterFactory,
-                metrics,
-                offsetQueue,
-                kafkaNamesMapper,
-                filterChainFactory,
-                trackers,
-                consumerPartitionAssignmentState
-        );
-    }
+    return new KafkaMessageReceiverFactory(
+        commonConsumerProperties,
+        consumerReceiverProperties,
+        kafkaConsumerProperties,
+        kafkaProperties,
+        messageConverterFactory,
+        metrics,
+        kafkaNamesMapper,
+        filterChainFactory,
+        trackers,
+        consumerPartitionAssignmentState);
+  }
 
-    @Bean
-    public KafkaConsumerRecordToMessageConverterFactory kafkaMessageConverterFactory(
-            MessageContentReaderFactory messageContentReaderFactory,
-            KafkaHeaderExtractor kafkaHeaderExtractor,
-            Clock clock) {
-        return new KafkaConsumerRecordToMessageConverterFactory(messageContentReaderFactory, kafkaHeaderExtractor, clock);
-    }
+  @Bean
+  public KafkaConsumerRecordToMessageConverterFactory kafkaMessageConverterFactory(
+      MessageContentReaderFactory messageContentReaderFactory,
+      KafkaHeaderExtractor kafkaHeaderExtractor,
+      Clock clock) {
+    return new KafkaConsumerRecordToMessageConverterFactory(
+        messageContentReaderFactory, kafkaHeaderExtractor, clock);
+  }
 
-    @Bean
-    public MessageContentReaderFactory messageContentReaderFactory(CompositeMessageContentWrapper compositeMessageContentWrapper,
-                                                                   KafkaHeaderExtractor kafkaHeaderExtractor,
-                                                                   SchemaRepository schemaRepository) {
-        return new BasicMessageContentReaderFactory(compositeMessageContentWrapper, kafkaHeaderExtractor, schemaRepository);
-    }
+  @Bean
+  public MessageContentReaderFactory messageContentReaderFactory(
+      CompositeMessageContentWrapper compositeMessageContentWrapper,
+      KafkaHeaderExtractor kafkaHeaderExtractor,
+      SchemaRepository schemaRepository) {
+    return new BasicMessageContentReaderFactory(
+        compositeMessageContentWrapper, kafkaHeaderExtractor, schemaRepository);
+  }
 
-    @Bean
-    public KafkaHeaderExtractor kafkaHeaderExtractor(KafkaHeaderNameProperties kafkaHeaderNameProperties) {
-        return new KafkaHeaderExtractor(kafkaHeaderNameProperties);
-    }
+  @Bean
+  public KafkaHeaderExtractor kafkaHeaderExtractor(
+      KafkaHeaderNameProperties kafkaHeaderNameProperties,
+      HTTPHeadersPropagationAsKafkaHeadersProperties
+          httpHeadersPropagationAsKafkaHeadersProperties) {
+    return new KafkaHeaderExtractor(
+        kafkaHeaderNameProperties, httpHeadersPropagationAsKafkaHeadersProperties);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerReceiverProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerReceiverProperties.java
index ea48d0223c..26b38c6d2b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerReceiverProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerReceiverProperties.java
@@ -1,99 +1,98 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.common.util.InetAddressInstanceIdResolver;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.kafka.KafkaReceiverParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "consumer.receiver")
 public class ConsumerReceiverProperties implements KafkaReceiverParameters {
 
-    private Duration poolTimeout = Duration.ofMillis(30);
+  private Duration poolTimeout = Duration.ofMillis(30);
 
-    private int readQueueCapacity = 1000;
+  private int readQueueCapacity = 1000;
 
-    private boolean waitBetweenUnsuccessfulPolls = true;
+  private boolean waitBetweenUnsuccessfulPolls = true;
 
-    private Duration initialIdleTime = Duration.ofMillis(10);
+  private Duration initialIdleTime = Duration.ofMillis(10);
 
-    private Duration maxIdleTime = Duration.ofMillis(1000);
+  private Duration maxIdleTime = Duration.ofMillis(1000);
 
-    private String clientId = new InetAddressInstanceIdResolver().resolve();
+  private String clientId = new InetAddressInstanceIdResolver().resolve();
 
-    private boolean filteringRateLimiterEnabled = true;
+  private boolean filteringRateLimiterEnabled = true;
 
-    private boolean filteringEnabled = true;
+  private boolean filteringEnabled = true;
 
-    @Override
-    public Duration getPoolTimeout() {
-        return poolTimeout;
-    }
+  @Override
+  public Duration getPoolTimeout() {
+    return poolTimeout;
+  }
 
-    public void setPoolTimeout(Duration poolTimeout) {
-        this.poolTimeout = poolTimeout;
-    }
+  public void setPoolTimeout(Duration poolTimeout) {
+    this.poolTimeout = poolTimeout;
+  }
 
-    @Override
-    public int getReadQueueCapacity() {
-        return readQueueCapacity;
-    }
+  @Override
+  public int getReadQueueCapacity() {
+    return readQueueCapacity;
+  }
 
-    public void setReadQueueCapacity(int readQueueCapacity) {
-        this.readQueueCapacity = readQueueCapacity;
-    }
+  public void setReadQueueCapacity(int readQueueCapacity) {
+    this.readQueueCapacity = readQueueCapacity;
+  }
 
-    @Override
-    public boolean isWaitBetweenUnsuccessfulPolls() {
-        return waitBetweenUnsuccessfulPolls;
-    }
+  @Override
+  public boolean isWaitBetweenUnsuccessfulPolls() {
+    return waitBetweenUnsuccessfulPolls;
+  }
 
-    public void setWaitBetweenUnsuccessfulPolls(boolean waitBetweenUnsuccessfulPolls) {
-        this.waitBetweenUnsuccessfulPolls = waitBetweenUnsuccessfulPolls;
-    }
+  public void setWaitBetweenUnsuccessfulPolls(boolean waitBetweenUnsuccessfulPolls) {
+    this.waitBetweenUnsuccessfulPolls = waitBetweenUnsuccessfulPolls;
+  }
 
-    @Override
-    public Duration getInitialIdleTime() {
-        return initialIdleTime;
-    }
+  @Override
+  public Duration getInitialIdleTime() {
+    return initialIdleTime;
+  }
 
-    public void setInitialIdleTime(Duration initialIdleTime) {
-        this.initialIdleTime = initialIdleTime;
-    }
+  public void setInitialIdleTime(Duration initialIdleTime) {
+    this.initialIdleTime = initialIdleTime;
+  }
 
-    @Override
-    public Duration getMaxIdleTime() {
-        return maxIdleTime;
-    }
+  @Override
+  public Duration getMaxIdleTime() {
+    return maxIdleTime;
+  }
 
-    public void setMaxIdleTime(Duration maxIdleTime) {
-        this.maxIdleTime = maxIdleTime;
-    }
+  public void setMaxIdleTime(Duration maxIdleTime) {
+    this.maxIdleTime = maxIdleTime;
+  }
 
-    @Override
-    public String getClientId() {
-        return clientId;
-    }
+  @Override
+  public String getClientId() {
+    return clientId;
+  }
 
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
+  public void setClientId(String clientId) {
+    this.clientId = clientId;
+  }
 
-    @Override
-    public boolean isFilteringRateLimiterEnabled() {
-        return filteringRateLimiterEnabled;
-    }
+  @Override
+  public boolean isFilteringRateLimiterEnabled() {
+    return filteringRateLimiterEnabled;
+  }
 
-    public void setFilteringRateLimiterEnabled(boolean filteringRateLimiterEnabled) {
-        this.filteringRateLimiterEnabled = filteringRateLimiterEnabled;
-    }
+  public void setFilteringRateLimiterEnabled(boolean filteringRateLimiterEnabled) {
+    this.filteringRateLimiterEnabled = filteringRateLimiterEnabled;
+  }
 
-    @Override
-    public boolean isFilteringEnabled() {
-        return filteringEnabled;
-    }
+  @Override
+  public boolean isFilteringEnabled() {
+    return filteringEnabled;
+  }
 
-    public void setFilteringEnabled(boolean filteringEnabled) {
-        this.filteringEnabled = filteringEnabled;
-    }
+  public void setFilteringEnabled(boolean filteringEnabled) {
+    this.filteringEnabled = filteringEnabled;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerSenderConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerSenderConfiguration.java
index 1958e4bff0..499bd0f3aa 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerSenderConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerSenderConfiguration.java
@@ -10,8 +10,13 @@
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.common.collect.ImmutableSet;
 import jakarta.inject.Named;
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ScheduledExecutorService;
+import javax.jms.Message;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -53,220 +58,221 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.timeout.FutureAsyncTimeout;
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ScheduledExecutorService;
-import javax.jms.Message;
-
 @Configuration
 @EnableConfigurationProperties({
-        SslContextProperties.class,
-        HttpClientsMonitoringProperties.class,
-        SenderAsyncTimeoutProperties.class,
-        BatchProperties.class
+  SslContextProperties.class,
+  HttpClientsMonitoringProperties.class,
+  SenderAsyncTimeoutProperties.class,
+  BatchProperties.class
 })
 public class ConsumerSenderConfiguration {
 
-    @Bean(name = "http1-serial-client-parameters")
-    @ConfigurationProperties(prefix = "consumer.http-client.serial.http1")
-    public Http1ClientProperties http1SerialClientProperties() {
-        return new Http1ClientProperties();
-    }
+  @Bean(name = "http1-serial-client-parameters")
+  @ConfigurationProperties(prefix = "consumer.http-client.serial.http1")
+  public Http1ClientProperties http1SerialClientProperties() {
+    return new Http1ClientProperties();
+  }
 
-    @Bean(name = "http1-serial-client")
-    public HttpClient http1SerialClient(
-            HttpClientsFactory httpClientsFactory,
-            @Named("http1-serial-client-parameters") Http1ClientParameters http1ClientParameters) {
-        return httpClientsFactory.createClientForHttp1("jetty-http1-serial-client", http1ClientParameters);
-    }
+  @Bean(name = "http1-serial-client")
+  public HttpClient http1SerialClient(
+      HttpClientsFactory httpClientsFactory,
+      @Named("http1-serial-client-parameters") Http1ClientParameters http1ClientParameters) {
+    return httpClientsFactory.createClientForHttp1(
+        "jetty-http1-serial-client", http1ClientParameters);
+  }
 
-    @Bean(name = "http2-serial-client-parameters")
-    @ConfigurationProperties(prefix = "consumer.http-client.serial.http2")
-    public Http2ClientProperties http2SerialClientProperties() {
-        return new Http2ClientProperties();
-    }
+  @Bean(name = "http2-serial-client-parameters")
+  @ConfigurationProperties(prefix = "consumer.http-client.serial.http2")
+  public Http2ClientProperties http2SerialClientProperties() {
+    return new Http2ClientProperties();
+  }
 
-    @Bean
-    public Http2ClientHolder http2ClientHolder(
-            HttpClientsFactory httpClientsFactory,
-            @Named("http2-serial-client-parameters") Http2ClientProperties http2ClientProperties) {
-        if (!http2ClientProperties.isEnabled()) {
-            return new Http2ClientHolder(null);
-        } else {
-            return new Http2ClientHolder(httpClientsFactory.createClientForHttp2("jetty-http2-serial-client", http2ClientProperties));
-        }
+  @Bean
+  public Http2ClientHolder http2ClientHolder(
+      HttpClientsFactory httpClientsFactory,
+      @Named("http2-serial-client-parameters") Http2ClientProperties http2ClientProperties) {
+    if (!http2ClientProperties.isEnabled()) {
+      return new Http2ClientHolder(null);
+    } else {
+      return new Http2ClientHolder(
+          httpClientsFactory.createClientForHttp2(
+              "jetty-http2-serial-client", http2ClientProperties));
     }
+  }
 
-    @Bean(name = "http1-batch-client-parameters")
-    @ConfigurationProperties(prefix = "consumer.http-client.batch.http1")
-    public Http1ClientProperties http1BatchClientProperties() {
-        return new Http1ClientProperties();
-    }
-
-    @Bean(name = "http1-batch-client")
-    public HttpClient http1BatchClient(
-            HttpClientsFactory httpClientsFactory,
-            @Named("http1-batch-client-parameters") Http1ClientParameters http1ClientParameters) {
-        return httpClientsFactory.createClientForHttp1("jetty-http1-batch-client", http1ClientParameters);
-    }
-
-    @Bean(name = "oauth-http-client")
-    public HttpClient oauthHttpClient(HttpClientsFactory httpClientsFactory,
-                                      @Named("http1-serial-client-parameters") Http1ClientParameters http1ClientParameters) {
-        return httpClientsFactory.createClientForHttp1("jetty-http-oauthclient", http1ClientParameters);
-    }
+  @Bean(name = "http1-batch-client-parameters")
+  @ConfigurationProperties(prefix = "consumer.http-client.batch.http1")
+  public Http1ClientProperties http1BatchClientProperties() {
+    return new Http1ClientProperties();
+  }
 
+  @Bean(name = "http1-batch-client")
+  public HttpClient http1BatchClient(
+      HttpClientsFactory httpClientsFactory,
+      @Named("http1-batch-client-parameters") Http1ClientParameters http1ClientParameters) {
+    return httpClientsFactory.createClientForHttp1(
+        "jetty-http1-batch-client", http1ClientParameters);
+  }
 
-    @Bean(destroyMethod = "stop")
-    public BatchHttpRequestFactory batchHttpRequestFactory(@Named("http1-batch-client") HttpClient httpClient) {
-        return new DefaultBatchHttpRequestFactory(httpClient);
-    }
+  @Bean(name = "oauth-http-client")
+  public HttpClient oauthHttpClient(
+      HttpClientsFactory httpClientsFactory,
+      @Named("http1-serial-client-parameters") Http1ClientParameters http1ClientParameters) {
+    return httpClientsFactory.createClientForHttp1("jetty-http-oauthclient", http1ClientParameters);
+  }
 
-    @Bean
-    public MessageBatchSenderFactory httpMessageBatchSenderFactory(SendingResultHandlers resultHandlers,
-                                                                   BatchHttpRequestFactory batchHttpRequestFactory
-    ) {
-        return new HttpMessageBatchSenderFactory(
-                resultHandlers,
-                batchHttpRequestFactory);
-    }
+  @Bean(destroyMethod = "stop")
+  public BatchHttpRequestFactory batchHttpRequestFactory(
+      @Named("http1-batch-client") HttpClient httpClient) {
+    return new DefaultBatchHttpRequestFactory(httpClient);
+  }
 
-    @Bean(initMethod = "start")
-    public HttpClientsWorkloadReporter httpClientsWorkloadReporter(MetricsFacade metrics,
-                                                                   @Named("http1-serial-client") HttpClient http1SerialClient,
-                                                                   @Named("http1-batch-client") HttpClient http1BatchClient,
-                                                                   Http2ClientHolder http2ClientHolder,
-                                                                   HttpClientsMonitoringProperties monitoringProperties) {
-        return new HttpClientsWorkloadReporter(
-                metrics,
-                http1SerialClient,
-                http1BatchClient,
-                http2ClientHolder,
-                monitoringProperties.isRequestQueueMonitoringEnabled(),
-                monitoringProperties.isConnectionPoolMonitoringEnabled());
-    }
+  @Bean
+  public MessageBatchSenderFactory httpMessageBatchSenderFactory(
+      SendingResultHandlers resultHandlers, BatchHttpRequestFactory batchHttpRequestFactory) {
+    return new HttpMessageBatchSenderFactory(resultHandlers, batchHttpRequestFactory);
+  }
 
-    @Bean(destroyMethod = "closeProviders")
-    public MessageSenderFactory messageSenderFactory(List<ProtocolMessageSenderProvider> providers) {
-        return new MessageSenderFactory(providers);
-    }
+  @Bean(initMethod = "start")
+  public HttpClientsWorkloadReporter httpClientsWorkloadReporter(
+      MetricsFacade metrics,
+      @Named("http1-serial-client") HttpClient http1SerialClient,
+      @Named("http1-batch-client") HttpClient http1BatchClient,
+      Http2ClientHolder http2ClientHolder,
+      HttpClientsMonitoringProperties monitoringProperties) {
+    return new HttpClientsWorkloadReporter(
+        metrics,
+        http1SerialClient,
+        http1BatchClient,
+        http2ClientHolder,
+        monitoringProperties.isRequestQueueMonitoringEnabled(),
+        monitoringProperties.isConnectionPoolMonitoringEnabled());
+  }
 
-    @Bean(name = "defaultHttpMessageSenderProvider")
-    public ProtocolMessageSenderProvider jettyHttpMessageSenderProvider(@Named("http1-serial-client") HttpClient httpClient,
-                                                                        Http2ClientHolder http2ClientHolder,
-                                                                        EndpointAddressResolver endpointAddressResolver,
-                                                                        MetadataAppender<Request> metadataAppender,
-                                                                        HttpAuthorizationProviderFactory authorizationProviderFactory,
-                                                                        HttpHeadersProvidersFactory httpHeadersProviderFactory,
-                                                                        SendingResultHandlers sendingResultHandlers,
-                                                                        HttpRequestFactoryProvider requestFactoryProvider) {
-        return new JettyHttpMessageSenderProvider(
-                httpClient,
-                http2ClientHolder,
-                endpointAddressResolver,
-                metadataAppender,
-                authorizationProviderFactory,
-                httpHeadersProviderFactory,
-                sendingResultHandlers,
-                requestFactoryProvider,
-                ImmutableSet.of("http", "https")
-        );
-    }
+  @Bean(destroyMethod = "closeProviders")
+  public MessageSenderFactory messageSenderFactory(List<ProtocolMessageSenderProvider> providers) {
+    return new MessageSenderFactory(providers);
+  }
 
-    @Bean
-    public MetadataAppender<Request> defaultHttpMetadataAppender() {
-        return new DefaultHttpMetadataAppender();
-    }
+  @Bean(name = "defaultHttpMessageSenderProvider")
+  public ProtocolMessageSenderProvider jettyHttpMessageSenderProvider(
+      @Named("http1-serial-client") HttpClient httpClient,
+      Http2ClientHolder http2ClientHolder,
+      EndpointAddressResolver endpointAddressResolver,
+      MetadataAppender<Request> metadataAppender,
+      HttpAuthorizationProviderFactory authorizationProviderFactory,
+      HttpHeadersProvidersFactory httpHeadersProviderFactory,
+      SendingResultHandlers sendingResultHandlers,
+      HttpRequestFactoryProvider requestFactoryProvider) {
+    return new JettyHttpMessageSenderProvider(
+        httpClient,
+        http2ClientHolder,
+        endpointAddressResolver,
+        metadataAppender,
+        authorizationProviderFactory,
+        httpHeadersProviderFactory,
+        sendingResultHandlers,
+        requestFactoryProvider,
+        ImmutableSet.of("http", "https"));
+  }
 
-    @Bean
-    public HttpRequestFactoryProvider defaultHttpRequestFactoryProvider() {
-        return new DefaultHttpRequestFactoryProvider();
-    }
+  @Bean
+  public MetadataAppender<Request> defaultHttpMetadataAppender() {
+    return new DefaultHttpMetadataAppender();
+  }
 
-    @Bean
-    public SendingResultHandlers defaultSendingResultHandlers() {
-        return new DefaultSendingResultHandlers();
-    }
+  @Bean
+  public HttpRequestFactoryProvider defaultHttpRequestFactoryProvider() {
+    return new DefaultHttpRequestFactoryProvider();
+  }
 
-    @Bean
-    public HttpHeadersProvidersFactory emptyHttpHeadersProvidersFactory() {
-        return new EmptyHttpHeadersProvidersFactory();
-    }
+  @Bean
+  public SendingResultHandlers defaultSendingResultHandlers() {
+    return new DefaultSendingResultHandlers();
+  }
 
+  @Bean
+  public HttpHeadersProvidersFactory emptyHttpHeadersProvidersFactory() {
+    return new EmptyHttpHeadersProvidersFactory();
+  }
 
-    @Bean
-    public HttpClientsFactory httpClientsFactory(InstrumentedExecutorServiceFactory executorFactory,
-                                                 SslContextFactoryProvider sslContextFactoryProvider) {
-        return new HttpClientsFactory(executorFactory, sslContextFactoryProvider);
-    }
+  @Bean
+  public HttpClientsFactory httpClientsFactory(
+      InstrumentedExecutorServiceFactory executorFactory,
+      SslContextFactoryProvider sslContextFactoryProvider) {
+    return new HttpClientsFactory(executorFactory, sslContextFactoryProvider);
+  }
 
-    @Bean
-    public SslContextFactoryProvider sslContextFactoryProvider(Optional<SslContextFactory> sslContextFactory,
-                                                               SslContextProperties sslContextProperties) {
-        return new SslContextFactoryProvider(sslContextFactory.orElse(null), sslContextProperties);
-    }
+  @Bean
+  public SslContextFactoryProvider sslContextFactoryProvider(
+      Optional<SslContextFactory> sslContextFactory, SslContextProperties sslContextProperties) {
+    return new SslContextFactoryProvider(sslContextFactory.orElse(null), sslContextProperties);
+  }
 
-    @Bean
-    public HttpAuthorizationProviderFactory httpAuthorizationProviderFactory(OAuthAccessTokens accessTokens) {
-        return new HttpAuthorizationProviderFactory(accessTokens);
-    }
+  @Bean
+  public HttpAuthorizationProviderFactory httpAuthorizationProviderFactory(
+      OAuthAccessTokens accessTokens) {
+    return new HttpAuthorizationProviderFactory(accessTokens);
+  }
 
-    @Bean(name = "defaultJmsMessageSenderProvider")
-    public ProtocolMessageSenderProvider jmsHornetQMessageSenderProvider(MetadataAppender<Message> metadataAppender) {
-        return new JmsHornetQMessageSenderProvider(metadataAppender);
-    }
+  @Bean(name = "defaultJmsMessageSenderProvider")
+  public ProtocolMessageSenderProvider jmsHornetQMessageSenderProvider(
+      MetadataAppender<Message> metadataAppender) {
+    return new JmsHornetQMessageSenderProvider(metadataAppender);
+  }
 
-    @Bean
-    public MetadataAppender<Message> jmsMetadataAppender() {
-        return new JmsMetadataAppender();
-    }
+  @Bean
+  public MetadataAppender<Message> jmsMetadataAppender() {
+    return new JmsMetadataAppender();
+  }
 
-    @Bean(name = "defaultPubSubMessageSenderProvider")
-    public ProtocolMessageSenderProvider pubSubMessageSenderProvider(
-            GooglePubSubSenderTargetResolver targetResolver,
-            CredentialsProvider credentialsProvider,
-            ExecutorProvider executorProvider,
-            RetrySettings retrySettings,
-            BatchingSettings batchingSettings,
-            GooglePubSubMessageTransformerCreator googlePubSubMessageTransformerCreator,
-            TransportChannelProvider transportChannelProvider) {
-        return new GooglePubSubMessageSenderProvider(
-                targetResolver,
-                credentialsProvider,
-                executorProvider,
-                retrySettings,
-                batchingSettings,
-                transportChannelProvider,
-                googlePubSubMessageTransformerCreator
-        );
-    }
+  @Bean(name = "defaultPubSubMessageSenderProvider")
+  public ProtocolMessageSenderProvider pubSubMessageSenderProvider(
+      GooglePubSubSenderTargetResolver targetResolver,
+      CredentialsProvider credentialsProvider,
+      ExecutorProvider executorProvider,
+      RetrySettings retrySettings,
+      BatchingSettings batchingSettings,
+      GooglePubSubMessageTransformerCreator googlePubSubMessageTransformerCreator,
+      TransportChannelProvider transportChannelProvider) {
+    return new GooglePubSubMessageSenderProvider(
+        targetResolver,
+        credentialsProvider,
+        executorProvider,
+        retrySettings,
+        batchingSettings,
+        transportChannelProvider,
+        googlePubSubMessageTransformerCreator);
+  }
 
-    @Bean
-    @Conditional(OnGoogleDefaultCredentials.class)
-    public CredentialsProvider applicationDefaultCredentialsProvider() throws IOException {
-        return FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
-    }
+  @Bean
+  @Conditional(OnGoogleDefaultCredentials.class)
+  public CredentialsProvider applicationDefaultCredentialsProvider() throws IOException {
+    return FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
+  }
 
-    @Bean
-    @ConditionalOnMissingBean(CredentialsProvider.class)
-    public CredentialsProvider noCredentialsProvider() {
-        return NoCredentialsProvider.create();
-    }
+  @Bean
+  @ConditionalOnMissingBean(CredentialsProvider.class)
+  public CredentialsProvider noCredentialsProvider() {
+    return NoCredentialsProvider.create();
+  }
 
-    @Bean
-    public EndpointAddressResolver interpolatingEndpointAddressResolver(UriInterpolator interpolator) {
-        return new InterpolatingEndpointAddressResolver(interpolator);
-    }
+  @Bean
+  public EndpointAddressResolver interpolatingEndpointAddressResolver(
+      UriInterpolator interpolator) {
+    return new InterpolatingEndpointAddressResolver(interpolator);
+  }
 
-    @Bean
-    public FutureAsyncTimeout futureAsyncTimeoutFactory(InstrumentedExecutorServiceFactory executorFactory,
-                                                        SenderAsyncTimeoutProperties senderAsyncTimeoutProperties) {
-        ScheduledExecutorService timeoutExecutorService = executorFactory.getScheduledExecutorService(
-                "async-timeout",
-                senderAsyncTimeoutProperties.getThreadPoolSize(),
-                senderAsyncTimeoutProperties.isThreadPoolMonitoringEnabled()
-        );
-        return new FutureAsyncTimeout(timeoutExecutorService);
-    }
+  @Bean
+  public FutureAsyncTimeout futureAsyncTimeoutFactory(
+      InstrumentedExecutorServiceFactory executorFactory,
+      SenderAsyncTimeoutProperties senderAsyncTimeoutProperties) {
+    ScheduledExecutorService timeoutExecutorService =
+        executorFactory
+            .scheduledExecutorBuilder(
+                "async-timeout", senderAsyncTimeoutProperties.getThreadPoolSize())
+            .withMonitoringEnabled(senderAsyncTimeoutProperties.isThreadPoolMonitoringEnabled())
+            .create();
+    return new FutureAsyncTimeout(timeoutExecutorService);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ContentRootProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ContentRootProperties.java
index fa45477278..5d4fc6f745 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ContentRootProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ContentRootProperties.java
@@ -5,23 +5,23 @@
 @ConfigurationProperties(prefix = "consumer.content.root")
 public class ContentRootProperties {
 
-    private String message = "message";
+  private String message = "message";
 
-    private String metadata = "metadata";
+  private String metadata = "metadata";
 
-    public String getMessage() {
-        return message;
-    }
+  public String getMessage() {
+    return message;
+  }
 
-    public void setMessage(String message) {
-        this.message = message;
-    }
+  public void setMessage(String message) {
+    this.message = message;
+  }
 
-    public String getMetadata() {
-        return metadata;
-    }
+  public String getMetadata() {
+    return metadata;
+  }
 
-    public void setMetadata(String metadata) {
-        this.metadata = metadata;
-    }
+  public void setMetadata(String metadata) {
+    this.metadata = metadata;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/DatacenterNameProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/DatacenterNameProperties.java
index e3260cd59b..f34c8a5700 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/DatacenterNameProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/DatacenterNameProperties.java
@@ -6,23 +6,23 @@
 @ConfigurationProperties(prefix = "consumer.datacenter.name")
 public class DatacenterNameProperties {
 
-    private DcNameSource source;
+  private DcNameSource source;
 
-    private String env = "DC";
+  private String env = "DC";
 
-    public DcNameSource getSource() {
-        return source;
-    }
+  public DcNameSource getSource() {
+    return source;
+  }
 
-    public void setSource(DcNameSource source) {
-        this.source = source;
-    }
+  public void setSource(DcNameSource source) {
+    this.source = source;
+  }
 
-    public String getEnv() {
-        return env;
-    }
+  public String getEnv() {
+    return env;
+  }
 
-    public void setEnv(String env) {
-        this.env = env;
-    }
+  public void setEnv(String env) {
+    this.env = env;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubCompressorProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubCompressorProperties.java
index 75ca9919ab..44f5545286 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubCompressorProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubCompressorProperties.java
@@ -5,33 +5,33 @@
 @ConfigurationProperties(prefix = "consumer.google.pubsub.compressor")
 public class GooglePubSubCompressorProperties {
 
-    private Boolean enabled = false;
+  private Boolean enabled = false;
 
-    private String compressionLevel = "high";
+  private String compressionLevel = "high";
 
-    private Long compressionThresholdBytes = 400L;
+  private Long compressionThresholdBytes = 400L;
 
-    public Boolean isEnabled() {
-        return enabled;
-    }
+  public Boolean isEnabled() {
+    return enabled;
+  }
 
-    public void setEnabled(Boolean enabled) {
-        this.enabled = enabled;
-    }
+  public void setEnabled(Boolean enabled) {
+    this.enabled = enabled;
+  }
 
-    public String getCompressionLevel() {
-        return compressionLevel;
-    }
+  public String getCompressionLevel() {
+    return compressionLevel;
+  }
 
-    public void setCompressionLevel(String compressionLevel) {
-        this.compressionLevel = compressionLevel;
-    }
+  public void setCompressionLevel(String compressionLevel) {
+    this.compressionLevel = compressionLevel;
+  }
 
-    public Long getCompressionThresholdBytes() {
-        return compressionThresholdBytes;
-    }
+  public Long getCompressionThresholdBytes() {
+    return compressionThresholdBytes;
+  }
 
-    public void setCompressionThresholdBytes(Long compressionThresholdBytes) {
-        this.compressionThresholdBytes = compressionThresholdBytes;
-    }
+  public void setCompressionThresholdBytes(Long compressionThresholdBytes) {
+    this.compressionThresholdBytes = compressionThresholdBytes;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubConfiguration.java
index 038687d981..b533f14969 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubConfiguration.java
@@ -8,6 +8,8 @@
 import com.google.cloud.pubsub.v1.TopicAdminSettings;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import jakarta.inject.Named;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,68 +17,74 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub.GooglePubSubMessageTransformerCreator;
 import pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub.GooglePubSubSenderTargetResolver;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
 @Configuration
 @EnableConfigurationProperties({
-        GooglePubSubSenderProperties.class, GooglePubSubCompressorProperties.class
+  GooglePubSubSenderProperties.class,
+  GooglePubSubCompressorProperties.class
 })
 public class GooglePubSubConfiguration {
 
-    @Bean
-    public TransportChannelProvider transportChannelProvider() {
-        return TopicAdminSettings.defaultGrpcTransportProviderBuilder().setChannelsPerCpu(1).build();
-    }
+  @Bean
+  public TransportChannelProvider transportChannelProvider() {
+    return TopicAdminSettings.defaultGrpcTransportProviderBuilder().setChannelsPerCpu(1).build();
+  }
 
-    @Bean
-    public GooglePubSubMessageTransformerCreator messageTransformerCreator(GooglePubSubCompressorProperties compressorProperties) {
-        return GooglePubSubMessageTransformerCreator.creator()
-                .withCompressionEnabled(compressorProperties.isEnabled())
-                .withCompressionLevel(compressorProperties.getCompressionLevel())
-                .withCompressionThresholdBytes(compressorProperties.getCompressionThresholdBytes());
-    }
+  @Bean
+  public GooglePubSubMessageTransformerCreator messageTransformerCreator(
+      GooglePubSubCompressorProperties compressorProperties) {
+    return GooglePubSubMessageTransformerCreator.creator()
+        .withCompressionEnabled(compressorProperties.isEnabled())
+        .withCompressionLevel(compressorProperties.getCompressionLevel())
+        .withCompressionThresholdBytes(compressorProperties.getCompressionThresholdBytes());
+  }
 
-    @Bean
-    public GooglePubSubSenderTargetResolver pubSubSenderTargetResolver() {
-        return new GooglePubSubSenderTargetResolver();
-    }
+  @Bean
+  public GooglePubSubSenderTargetResolver pubSubSenderTargetResolver() {
+    return new GooglePubSubSenderTargetResolver();
+  }
 
-    @Bean(name = "googlePubSubPublishingExecutor", destroyMethod = "shutdown")
-    public ScheduledExecutorService googlePubSubPublishingExecutor(GooglePubSubSenderProperties googlePubSubSenderProperties) {
-        return Executors.newScheduledThreadPool(googlePubSubSenderProperties.getCorePoolSize(),
-                new ThreadFactoryBuilder().setNameFormat("pubsub-publisher-%d").build());
-    }
+  @Bean(name = "googlePubSubPublishingExecutor", destroyMethod = "shutdown")
+  public ScheduledExecutorService googlePubSubPublishingExecutor(
+      GooglePubSubSenderProperties googlePubSubSenderProperties) {
+    return Executors.newScheduledThreadPool(
+        googlePubSubSenderProperties.getCorePoolSize(),
+        new ThreadFactoryBuilder().setNameFormat("pubsub-publisher-%d").build());
+  }
 
-    @Bean
-    public ExecutorProvider googlePubSubPublishingExecutorProvider(
-            @Named("googlePubSubPublishingExecutor") ScheduledExecutorService googlePubSubPublishingExecutor) {
+  @Bean
+  public ExecutorProvider googlePubSubPublishingExecutorProvider(
+      @Named("googlePubSubPublishingExecutor")
+          ScheduledExecutorService googlePubSubPublishingExecutor) {
 
-        return FixedExecutorProvider.create(googlePubSubPublishingExecutor);
-    }
+    return FixedExecutorProvider.create(googlePubSubPublishingExecutor);
+  }
 
-    @Bean
-    public BatchingSettings batchingSettings(GooglePubSubSenderProperties googlePubSubSenderProperties) {
-        long requestBytesThreshold = googlePubSubSenderProperties.getBatchingRequestBytesThreshold();
-        long messageCountBatchSize = googlePubSubSenderProperties.getBatchingMessageCountBytesSize();
-        Duration publishDelayThreshold = Duration.ofMillis(googlePubSubSenderProperties.getBatchingPublishDelayThreshold().toMillis());
+  @Bean
+  public BatchingSettings batchingSettings(
+      GooglePubSubSenderProperties googlePubSubSenderProperties) {
+    long requestBytesThreshold = googlePubSubSenderProperties.getBatchingRequestBytesThreshold();
+    long messageCountBatchSize = googlePubSubSenderProperties.getBatchingMessageCountBytesSize();
+    Duration publishDelayThreshold =
+        Duration.ofMillis(
+            googlePubSubSenderProperties.getBatchingPublishDelayThreshold().toMillis());
 
-        return BatchingSettings.newBuilder()
-                .setElementCountThreshold(messageCountBatchSize)
-                .setRequestByteThreshold(requestBytesThreshold)
-                .setDelayThreshold(publishDelayThreshold)
-                .build();
-    }
+    return BatchingSettings.newBuilder()
+        .setElementCountThreshold(messageCountBatchSize)
+        .setRequestByteThreshold(requestBytesThreshold)
+        .setDelayThreshold(publishDelayThreshold)
+        .build();
+  }
 
-    @Bean
-    public RetrySettings retrySettings(GooglePubSubSenderProperties googlePubSubSenderProperties) {
-        Duration totalTimeout = Duration.ofMillis(googlePubSubSenderProperties.getTotalTimeout().toMillis());
+  @Bean
+  public RetrySettings retrySettings(GooglePubSubSenderProperties googlePubSubSenderProperties) {
+    Duration totalTimeout =
+        Duration.ofMillis(googlePubSubSenderProperties.getTotalTimeout().toMillis());
 
-        return RetrySettings.newBuilder()
-                .setInitialRpcTimeout(totalTimeout)
-                .setMaxRpcTimeout(totalTimeout)
-                .setTotalTimeout(totalTimeout)
-                .setMaxAttempts(1)
-                .build();
-    }
+    return RetrySettings.newBuilder()
+        .setInitialRpcTimeout(totalTimeout)
+        .setMaxRpcTimeout(totalTimeout)
+        .setTotalTimeout(totalTimeout)
+        .setMaxAttempts(1)
+        .build();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubSenderProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubSenderProperties.java
index ecf6785e4a..35f4c5a76d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubSenderProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubSenderProperties.java
@@ -1,69 +1,68 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "consumer.google.pubsub.sender")
 public class GooglePubSubSenderProperties {
 
-    private int corePoolSize = 4;
+  private int corePoolSize = 4;
 
-    private Duration totalTimeout = Duration.ofMillis(600_000);
+  private Duration totalTimeout = Duration.ofMillis(600_000);
 
-    private long batchingRequestBytesThreshold = 1024L;
+  private long batchingRequestBytesThreshold = 1024L;
 
-    private long batchingMessageCountBytesSize = 1L;
+  private long batchingMessageCountBytesSize = 1L;
 
-    private Duration batchingPublishDelayThreshold = Duration.ofMillis(1);
+  private Duration batchingPublishDelayThreshold = Duration.ofMillis(1);
 
-    private String transportChannelProviderAddress = "integration";
+  private String transportChannelProviderAddress = "integration";
 
-    public int getCorePoolSize() {
-        return corePoolSize;
-    }
+  public int getCorePoolSize() {
+    return corePoolSize;
+  }
 
-    public void setCorePoolSize(int corePoolSize) {
-        this.corePoolSize = corePoolSize;
-    }
+  public void setCorePoolSize(int corePoolSize) {
+    this.corePoolSize = corePoolSize;
+  }
 
-    public Duration getTotalTimeout() {
-        return totalTimeout;
-    }
+  public Duration getTotalTimeout() {
+    return totalTimeout;
+  }
 
-    public void setTotalTimeout(Duration totalTimeout) {
-        this.totalTimeout = totalTimeout;
-    }
+  public void setTotalTimeout(Duration totalTimeout) {
+    this.totalTimeout = totalTimeout;
+  }
 
-    public long getBatchingRequestBytesThreshold() {
-        return batchingRequestBytesThreshold;
-    }
+  public long getBatchingRequestBytesThreshold() {
+    return batchingRequestBytesThreshold;
+  }
 
-    public void setBatchingRequestBytesThreshold(long batchingRequestBytesThreshold) {
-        this.batchingRequestBytesThreshold = batchingRequestBytesThreshold;
-    }
+  public void setBatchingRequestBytesThreshold(long batchingRequestBytesThreshold) {
+    this.batchingRequestBytesThreshold = batchingRequestBytesThreshold;
+  }
 
-    public long getBatchingMessageCountBytesSize() {
-        return batchingMessageCountBytesSize;
-    }
+  public long getBatchingMessageCountBytesSize() {
+    return batchingMessageCountBytesSize;
+  }
 
-    public void setBatchingMessageCountBytesSize(long batchingMessageCountBytesSize) {
-        this.batchingMessageCountBytesSize = batchingMessageCountBytesSize;
-    }
+  public void setBatchingMessageCountBytesSize(long batchingMessageCountBytesSize) {
+    this.batchingMessageCountBytesSize = batchingMessageCountBytesSize;
+  }
 
-    public Duration getBatchingPublishDelayThreshold() {
-        return batchingPublishDelayThreshold;
-    }
+  public Duration getBatchingPublishDelayThreshold() {
+    return batchingPublishDelayThreshold;
+  }
 
-    public void setBatchingPublishDelayThreshold(Duration batchingPublishDelayThreshold) {
-        this.batchingPublishDelayThreshold = batchingPublishDelayThreshold;
-    }
+  public void setBatchingPublishDelayThreshold(Duration batchingPublishDelayThreshold) {
+    this.batchingPublishDelayThreshold = batchingPublishDelayThreshold;
+  }
 
-    public String getTransportChannelProviderAddress() {
-        return transportChannelProviderAddress;
-    }
+  public String getTransportChannelProviderAddress() {
+    return transportChannelProviderAddress;
+  }
 
-    public void setTransportChannelProviderAddress(String transportChannelProviderAddress) {
-        this.transportChannelProviderAddress = transportChannelProviderAddress;
-    }
+  public void setTransportChannelProviderAddress(String transportChannelProviderAddress) {
+    this.transportChannelProviderAddress = transportChannelProviderAddress;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GraphiteProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GraphiteProperties.java
deleted file mode 100644
index 56682552b6..0000000000
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GraphiteProperties.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package pl.allegro.tech.hermes.consumers.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.common.di.factories.GraphiteParameters;
-
-@ConfigurationProperties(prefix = "consumer.graphite")
-public class GraphiteProperties implements GraphiteParameters {
-
-    private String prefix = "stats.tech.hermes";
-
-    private String host = "localhost";
-
-    private int port = 2003;
-
-    @Override
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    @Override
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @Override
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/Http1ClientProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/Http1ClientProperties.java
index 21f2119552..f6948a9ba5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/Http1ClientProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/Http1ClientProperties.java
@@ -1,86 +1,84 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import pl.allegro.tech.hermes.consumers.consumer.sender.http.Http1ClientParameters;
-
 import java.time.Duration;
+import pl.allegro.tech.hermes.consumers.consumer.sender.http.Http1ClientParameters;
 
 public class Http1ClientProperties implements Http1ClientParameters {
 
-    private int threadPoolSize = 30;
-
-    private boolean threadPoolMonitoringEnabled = false;
+  private int threadPoolSize = 30;
 
-    private boolean followRedirectsEnabled = false;
+  private boolean threadPoolMonitoringEnabled = false;
 
-    private int maxConnectionsPerDestination = 100;
+  private boolean followRedirectsEnabled = false;
 
-    private Duration idleTimeout = Duration.ofMillis(0);
+  private int maxConnectionsPerDestination = 100;
 
-    private int maxRequestsQueuedPerDestination = 100;
+  private Duration idleTimeout = Duration.ofMillis(0);
 
-    private Duration connectionTimeout = Duration.ofSeconds(15);
+  private int maxRequestsQueuedPerDestination = 100;
 
+  private Duration connectionTimeout = Duration.ofSeconds(15);
 
-    @Override
-    public int getThreadPoolSize() {
-        return threadPoolSize;
-    }
+  @Override
+  public int getThreadPoolSize() {
+    return threadPoolSize;
+  }
 
-    public void setThreadPoolSize(int threadPoolSize) {
-        this.threadPoolSize = threadPoolSize;
-    }
+  public void setThreadPoolSize(int threadPoolSize) {
+    this.threadPoolSize = threadPoolSize;
+  }
 
-    @Override
-    public boolean isThreadPoolMonitoringEnabled() {
-        return threadPoolMonitoringEnabled;
-    }
+  @Override
+  public boolean isThreadPoolMonitoringEnabled() {
+    return threadPoolMonitoringEnabled;
+  }
 
-    public void setThreadPoolMonitoringEnabled(boolean threadPoolMonitoringEnabled) {
-        this.threadPoolMonitoringEnabled = threadPoolMonitoringEnabled;
-    }
+  public void setThreadPoolMonitoringEnabled(boolean threadPoolMonitoringEnabled) {
+    this.threadPoolMonitoringEnabled = threadPoolMonitoringEnabled;
+  }
 
-    @Override
-    public boolean isFollowRedirectsEnabled() {
-        return followRedirectsEnabled;
-    }
+  @Override
+  public boolean isFollowRedirectsEnabled() {
+    return followRedirectsEnabled;
+  }
 
-    public void setFollowRedirectsEnabled(boolean followRedirectsEnabled) {
-        this.followRedirectsEnabled = followRedirectsEnabled;
-    }
+  public void setFollowRedirectsEnabled(boolean followRedirectsEnabled) {
+    this.followRedirectsEnabled = followRedirectsEnabled;
+  }
 
-    @Override
-    public int getMaxConnectionsPerDestination() {
-        return maxConnectionsPerDestination;
-    }
+  @Override
+  public int getMaxConnectionsPerDestination() {
+    return maxConnectionsPerDestination;
+  }
 
-    public void setMaxConnectionsPerDestination(int maxConnectionsPerDestination) {
-        this.maxConnectionsPerDestination = maxConnectionsPerDestination;
-    }
+  public void setMaxConnectionsPerDestination(int maxConnectionsPerDestination) {
+    this.maxConnectionsPerDestination = maxConnectionsPerDestination;
+  }
 
-    @Override
-    public Duration getIdleTimeout() {
-        return idleTimeout;
-    }
+  @Override
+  public Duration getIdleTimeout() {
+    return idleTimeout;
+  }
 
-    public void setIdleTimeout(Duration idleTimeout) {
-        this.idleTimeout = idleTimeout;
-    }
+  public void setIdleTimeout(Duration idleTimeout) {
+    this.idleTimeout = idleTimeout;
+  }
 
-    @Override
-    public int getMaxRequestsQueuedPerDestination() {
-        return maxRequestsQueuedPerDestination;
-    }
+  @Override
+  public int getMaxRequestsQueuedPerDestination() {
+    return maxRequestsQueuedPerDestination;
+  }
 
-    public void setMaxRequestsQueuedPerDestination(int maxRequestsQueuedPerDestination) {
-        this.maxRequestsQueuedPerDestination = maxRequestsQueuedPerDestination;
-    }
+  public void setMaxRequestsQueuedPerDestination(int maxRequestsQueuedPerDestination) {
+    this.maxRequestsQueuedPerDestination = maxRequestsQueuedPerDestination;
+  }
 
-    @Override
-    public Duration getConnectionTimeout() {
-        return connectionTimeout;
-    }
+  @Override
+  public Duration getConnectionTimeout() {
+    return connectionTimeout;
+  }
 
-    public void setConnectionTimeout(Duration connectionTimeout) {
-        this.connectionTimeout = connectionTimeout;
-    }
+  public void setConnectionTimeout(Duration connectionTimeout) {
+    this.connectionTimeout = connectionTimeout;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/Http2ClientProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/Http2ClientProperties.java
index b4ab115178..14e44e0791 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/Http2ClientProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/Http2ClientProperties.java
@@ -1,84 +1,83 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import pl.allegro.tech.hermes.consumers.consumer.sender.http.Http2ClientParameters;
-
 import java.time.Duration;
+import pl.allegro.tech.hermes.consumers.consumer.sender.http.Http2ClientParameters;
 
 public class Http2ClientProperties implements Http2ClientParameters {
 
-    private boolean enabled = true;
+  private boolean enabled = true;
 
-    private int threadPoolSize = 10;
+  private int threadPoolSize = 10;
 
-    private boolean threadPoolMonitoringEnabled = false;
+  private boolean threadPoolMonitoringEnabled = false;
 
-    private Duration idleTimeout = Duration.ofMillis(0);
+  private Duration idleTimeout = Duration.ofMillis(0);
 
-    private int maxRequestsQueuedPerDestination = 100;
+  private int maxRequestsQueuedPerDestination = 100;
 
-    private boolean followRedirectsEnabled = false;
+  private boolean followRedirectsEnabled = false;
 
-    private Duration connectionTimeout = Duration.ofSeconds(15);
+  private Duration connectionTimeout = Duration.ofSeconds(15);
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
 
-    @Override
-    public int getThreadPoolSize() {
-        return threadPoolSize;
-    }
+  @Override
+  public int getThreadPoolSize() {
+    return threadPoolSize;
+  }
 
-    public void setThreadPoolSize(int threadPoolSize) {
-        this.threadPoolSize = threadPoolSize;
-    }
+  public void setThreadPoolSize(int threadPoolSize) {
+    this.threadPoolSize = threadPoolSize;
+  }
 
-    @Override
-    public boolean isThreadPoolMonitoringEnabled() {
-        return threadPoolMonitoringEnabled;
-    }
+  @Override
+  public boolean isThreadPoolMonitoringEnabled() {
+    return threadPoolMonitoringEnabled;
+  }
 
-    public void setThreadPoolMonitoringEnabled(boolean threadPoolMonitoringEnabled) {
-        this.threadPoolMonitoringEnabled = threadPoolMonitoringEnabled;
-    }
+  public void setThreadPoolMonitoringEnabled(boolean threadPoolMonitoringEnabled) {
+    this.threadPoolMonitoringEnabled = threadPoolMonitoringEnabled;
+  }
 
-    @Override
-    public Duration getIdleTimeout() {
-        return idleTimeout;
-    }
+  @Override
+  public Duration getIdleTimeout() {
+    return idleTimeout;
+  }
 
-    public void setIdleTimeout(Duration idleTimeout) {
-        this.idleTimeout = idleTimeout;
-    }
+  public void setIdleTimeout(Duration idleTimeout) {
+    this.idleTimeout = idleTimeout;
+  }
 
-    @Override
-    public int getMaxRequestsQueuedPerDestination() {
-        return maxRequestsQueuedPerDestination;
-    }
+  @Override
+  public int getMaxRequestsQueuedPerDestination() {
+    return maxRequestsQueuedPerDestination;
+  }
 
-    public void setMaxRequestsQueuedPerDestination(int maxRequestsQueuedPerDestination) {
-        this.maxRequestsQueuedPerDestination = maxRequestsQueuedPerDestination;
-    }
+  public void setMaxRequestsQueuedPerDestination(int maxRequestsQueuedPerDestination) {
+    this.maxRequestsQueuedPerDestination = maxRequestsQueuedPerDestination;
+  }
 
-    @Override
-    public boolean isFollowRedirectsEnabled() {
-        return followRedirectsEnabled;
-    }
+  @Override
+  public boolean isFollowRedirectsEnabled() {
+    return followRedirectsEnabled;
+  }
 
-    public void setFollowRedirectsEnabled(boolean followRedirectsEnabled) {
-        this.followRedirectsEnabled = followRedirectsEnabled;
-    }
+  public void setFollowRedirectsEnabled(boolean followRedirectsEnabled) {
+    this.followRedirectsEnabled = followRedirectsEnabled;
+  }
 
-    @Override
-    public Duration getConnectionTimeout() {
-        return connectionTimeout;
-    }
+  @Override
+  public Duration getConnectionTimeout() {
+    return connectionTimeout;
+  }
 
-    public void setConnectionTimeout(Duration connectionTimeout) {
-        this.connectionTimeout = connectionTimeout;
-    }
+  public void setConnectionTimeout(Duration connectionTimeout) {
+    this.connectionTimeout = connectionTimeout;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/HttpClientsMonitoringProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/HttpClientsMonitoringProperties.java
index b0bb50d2a9..57db022c41 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/HttpClientsMonitoringProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/HttpClientsMonitoringProperties.java
@@ -5,23 +5,23 @@
 @ConfigurationProperties(prefix = "consumer.http-client.monitoring")
 public class HttpClientsMonitoringProperties {
 
-    private boolean connectionPoolMonitoringEnabled = false;
+  private boolean connectionPoolMonitoringEnabled = false;
 
-    private boolean requestQueueMonitoringEnabled = true;
+  private boolean requestQueueMonitoringEnabled = true;
 
-    public boolean isConnectionPoolMonitoringEnabled() {
-        return connectionPoolMonitoringEnabled;
-    }
+  public boolean isConnectionPoolMonitoringEnabled() {
+    return connectionPoolMonitoringEnabled;
+  }
 
-    public void setConnectionPoolMonitoringEnabled(boolean connectionPoolMonitoringEnabled) {
-        this.connectionPoolMonitoringEnabled = connectionPoolMonitoringEnabled;
-    }
+  public void setConnectionPoolMonitoringEnabled(boolean connectionPoolMonitoringEnabled) {
+    this.connectionPoolMonitoringEnabled = connectionPoolMonitoringEnabled;
+  }
 
-    public boolean isRequestQueueMonitoringEnabled() {
-        return requestQueueMonitoringEnabled;
-    }
+  public boolean isRequestQueueMonitoringEnabled() {
+    return requestQueueMonitoringEnabled;
+  }
 
-    public void setRequestQueueMonitoringEnabled(boolean requestQueueMonitoringEnabled) {
-        this.requestQueueMonitoringEnabled = requestQueueMonitoringEnabled;
-    }
+  public void setRequestQueueMonitoringEnabled(boolean requestQueueMonitoringEnabled) {
+    this.requestQueueMonitoringEnabled = requestQueueMonitoringEnabled;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaClustersProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaClustersProperties.java
index 2475f95102..cf4a71dec0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaClustersProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaClustersProperties.java
@@ -1,50 +1,53 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
 
 @ConfigurationProperties(prefix = "consumer.kafka")
 public class KafkaClustersProperties {
 
-    private List<KafkaProperties> clusters = new ArrayList<>();
+  private List<KafkaProperties> clusters = new ArrayList<>();
 
-    private String namespace = "";
+  private String namespace = "";
 
-    private String namespaceSeparator = "_";
+  private String namespaceSeparator = "_";
 
-    public List<KafkaProperties> getClusters() {
-        return clusters;
-    }
+  public List<KafkaProperties> getClusters() {
+    return clusters;
+  }
 
-    public void setClusters(List<KafkaProperties> clusters) {
-        this.clusters = clusters;
-    }
+  public void setClusters(List<KafkaProperties> clusters) {
+    this.clusters = clusters;
+  }
 
-    public String getNamespace() {
-        return namespace;
-    }
+  public String getNamespace() {
+    return namespace;
+  }
 
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
+  public void setNamespace(String namespace) {
+    this.namespace = namespace;
+  }
 
-    public String getNamespaceSeparator() {
-        return namespaceSeparator;
-    }
+  public String getNamespaceSeparator() {
+    return namespaceSeparator;
+  }
 
-    public void setNamespaceSeparator(String namespaceSeparator) {
-        this.namespaceSeparator = namespaceSeparator;
-    }
+  public void setNamespaceSeparator(String namespaceSeparator) {
+    this.namespaceSeparator = namespaceSeparator;
+  }
 
-    public KafkaProperties toKafkaProperties(DatacenterNameProvider datacenterNameProvider) {
-        return this.clusters
-                .stream()
-                .filter(cluster -> cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException(
-                        "No properties for datacenter: " + datacenterNameProvider.getDatacenterName() + " defined."));
-    }
+  public KafkaProperties toKafkaProperties(DatacenterNameProvider datacenterNameProvider) {
+    return this.clusters.stream()
+        .filter(
+            cluster -> cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "No properties for datacenter: "
+                        + datacenterNameProvider.getDatacenterName()
+                        + " defined."));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaConsumerProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaConsumerProperties.java
index 0c2340ec67..a8d1e51e69 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaConsumerProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaConsumerProperties.java
@@ -1,235 +1,235 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import static pl.allegro.tech.hermes.consumers.consumer.receiver.kafka.PartitionAssignmentStrategy.RANGE;
+
+import java.time.Duration;
+import java.util.List;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.kafka.KafkaConsumerParameters;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.kafka.PartitionAssignmentStrategy;
 
-import java.time.Duration;
-import java.util.List;
-
-import static pl.allegro.tech.hermes.consumers.consumer.receiver.kafka.PartitionAssignmentStrategy.RANGE;
-
 @ConfigurationProperties(prefix = "consumer.kafka.consumer")
 public class KafkaConsumerProperties implements KafkaConsumerParameters {
 
-    private int sendBufferBytes = 256 * 1024;
-
-    private int receiveBufferBytes = 256 * 1024;
+  private int sendBufferBytes = 256 * 1024;
 
-    private int fetchMinBytes = 1;
+  private int receiveBufferBytes = 256 * 1024;
 
-    private Duration fetchMaxWait = Duration.ofMillis(500);
+  private int fetchMinBytes = 1;
 
-    private Duration reconnectBackoff = Duration.ofMillis(500);
+  private Duration fetchMaxWait = Duration.ofMillis(500);
 
-    private Duration retryBackoff = Duration.ofMillis(500);
+  private Duration reconnectBackoff = Duration.ofMillis(500);
 
-    private boolean checkCrcs = true;
+  private Duration retryBackoff = Duration.ofMillis(500);
 
-    private Duration metricsSampleWindow = Duration.ofSeconds(30);
+  private boolean checkCrcs = true;
 
-    private int metricsNumSamples = 2;
+  private Duration metricsSampleWindow = Duration.ofSeconds(30);
 
-    private Duration requestTimeout = Duration.ofSeconds(250);
+  private int metricsNumSamples = 2;
 
-    private Duration connectionsMaxIdle = Duration.ofMinutes(9);
+  private Duration requestTimeout = Duration.ofSeconds(250);
 
-    private int maxPollRecords = 1;
+  private Duration connectionsMaxIdle = Duration.ofMinutes(9);
 
-    private Duration maxPollInterval = Duration.ofMillis(Integer.MAX_VALUE);
+  private int maxPollRecords = 1;
 
-    private String autoOffsetReset = "earliest";
+  private Duration maxPollInterval = Duration.ofMillis(Integer.MAX_VALUE);
 
-    private Duration sessionTimeout = Duration.ofSeconds(200);
+  private String autoOffsetReset = "earliest";
 
-    private Duration heartbeatInterval = Duration.ofSeconds(3);
+  private Duration sessionTimeout = Duration.ofSeconds(200);
 
-    private Duration metadataMaxAge = Duration.ofMinutes(5);
+  private Duration heartbeatInterval = Duration.ofSeconds(3);
 
-    private int maxPartitionFetchMin = Topic.MIN_MESSAGE_SIZE;
+  private Duration metadataMaxAge = Duration.ofMinutes(5);
 
-    private int maxPartitionFetchMax = Topic.MAX_MESSAGE_SIZE;
+  private int maxPartitionFetchMin = Topic.MIN_MESSAGE_SIZE;
 
-    private List<PartitionAssignmentStrategy> partitionAssignmentStrategies = List.of(RANGE);
+  private int maxPartitionFetchMax = Topic.MAX_MESSAGE_SIZE;
 
-    @Override
-    public int getSendBufferBytes() {
-        return sendBufferBytes;
-    }
+  private List<PartitionAssignmentStrategy> partitionAssignmentStrategies = List.of(RANGE);
 
-    public void setSendBufferBytes(int sendBufferBytes) {
-        this.sendBufferBytes = sendBufferBytes;
-    }
+  @Override
+  public int getSendBufferBytes() {
+    return sendBufferBytes;
+  }
 
-    @Override
-    public int getReceiveBufferBytes() {
-        return receiveBufferBytes;
-    }
+  public void setSendBufferBytes(int sendBufferBytes) {
+    this.sendBufferBytes = sendBufferBytes;
+  }
 
-    public void setReceiveBufferBytes(int receiveBufferBytes) {
-        this.receiveBufferBytes = receiveBufferBytes;
-    }
+  @Override
+  public int getReceiveBufferBytes() {
+    return receiveBufferBytes;
+  }
 
-    @Override
-    public int getFetchMinBytes() {
-        return fetchMinBytes;
-    }
+  public void setReceiveBufferBytes(int receiveBufferBytes) {
+    this.receiveBufferBytes = receiveBufferBytes;
+  }
 
-    public void setFetchMinBytes(int fetchMinBytes) {
-        this.fetchMinBytes = fetchMinBytes;
-    }
+  @Override
+  public int getFetchMinBytes() {
+    return fetchMinBytes;
+  }
 
-    @Override
-    public Duration getFetchMaxWait() {
-        return fetchMaxWait;
-    }
+  public void setFetchMinBytes(int fetchMinBytes) {
+    this.fetchMinBytes = fetchMinBytes;
+  }
 
-    public void setFetchMaxWait(Duration fetchMaxWait) {
-        this.fetchMaxWait = fetchMaxWait;
-    }
+  @Override
+  public Duration getFetchMaxWait() {
+    return fetchMaxWait;
+  }
 
-    @Override
-    public Duration getReconnectBackoff() {
-        return reconnectBackoff;
-    }
+  public void setFetchMaxWait(Duration fetchMaxWait) {
+    this.fetchMaxWait = fetchMaxWait;
+  }
 
-    public void setReconnectBackoff(Duration reconnectBackoff) {
-        this.reconnectBackoff = reconnectBackoff;
-    }
+  @Override
+  public Duration getReconnectBackoff() {
+    return reconnectBackoff;
+  }
 
-    @Override
-    public Duration getRetryBackoff() {
-        return retryBackoff;
-    }
+  public void setReconnectBackoff(Duration reconnectBackoff) {
+    this.reconnectBackoff = reconnectBackoff;
+  }
 
-    public void setRetryBackoff(Duration retryBackoff) {
-        this.retryBackoff = retryBackoff;
-    }
+  @Override
+  public Duration getRetryBackoff() {
+    return retryBackoff;
+  }
 
-    @Override
-    public boolean isCheckCrcs() {
-        return checkCrcs;
-    }
+  public void setRetryBackoff(Duration retryBackoff) {
+    this.retryBackoff = retryBackoff;
+  }
 
-    public void setCheckCrcs(boolean checkCrcs) {
-        this.checkCrcs = checkCrcs;
-    }
+  @Override
+  public boolean isCheckCrcs() {
+    return checkCrcs;
+  }
 
-    @Override
-    public Duration getMetricsSampleWindow() {
-        return metricsSampleWindow;
-    }
+  public void setCheckCrcs(boolean checkCrcs) {
+    this.checkCrcs = checkCrcs;
+  }
 
-    public void setMetricsSampleWindow(Duration metricsSampleWindow) {
-        this.metricsSampleWindow = metricsSampleWindow;
-    }
+  @Override
+  public Duration getMetricsSampleWindow() {
+    return metricsSampleWindow;
+  }
 
-    @Override
-    public int getMetricsNumSamples() {
-        return metricsNumSamples;
-    }
+  public void setMetricsSampleWindow(Duration metricsSampleWindow) {
+    this.metricsSampleWindow = metricsSampleWindow;
+  }
 
-    public void setMetricsNumSamples(int metricsNumSamples) {
-        this.metricsNumSamples = metricsNumSamples;
-    }
+  @Override
+  public int getMetricsNumSamples() {
+    return metricsNumSamples;
+  }
 
-    @Override
-    public Duration getRequestTimeout() {
-        return requestTimeout;
-    }
-
-    public void setRequestTimeout(Duration requestTimeout) {
-        this.requestTimeout = requestTimeout;
-    }
-
-    @Override
-    public Duration getConnectionsMaxIdle() {
-        return connectionsMaxIdle;
-    }
-
-    public void setConnectionsMaxIdle(Duration connectionsMaxIdle) {
-        this.connectionsMaxIdle = connectionsMaxIdle;
-    }
-
-    @Override
-    public int getMaxPollRecords() {
-        return maxPollRecords;
-    }
-
-    public void setMaxPollRecords(int maxPollRecords) {
-        this.maxPollRecords = maxPollRecords;
-    }
-
-    @Override
-    public Duration getMaxPollInterval() {
-        return maxPollInterval;
-    }
-
-    public void setMaxPollInterval(Duration maxPollInterval) {
-        this.maxPollInterval = maxPollInterval;
-    }
-
-    @Override
-    public String getAutoOffsetReset() {
-        return autoOffsetReset;
-    }
-
-    public void setAutoOffsetReset(String autoOffsetReset) {
-        this.autoOffsetReset = autoOffsetReset;
-    }
-
-    @Override
-    public Duration getSessionTimeout() {
-        return sessionTimeout;
-    }
-
-    public void setSessionTimeout(Duration sessionTimeout) {
-        this.sessionTimeout = sessionTimeout;
-    }
-
-    @Override
-    public Duration getHeartbeatInterval() {
-        return heartbeatInterval;
-    }
-
-    public void setHeartbeatInterval(Duration heartbeatInterval) {
-        this.heartbeatInterval = heartbeatInterval;
-    }
-
-    @Override
-    public Duration getMetadataMaxAge() {
-        return metadataMaxAge;
-    }
-
-    public void setMetadataMaxAge(Duration metadataMaxAge) {
-        this.metadataMaxAge = metadataMaxAge;
-    }
-
-    @Override
-    public int getMaxPartitionFetchMin() {
-        return maxPartitionFetchMin;
-    }
-
-    public void setMaxPartitionFetchMin(int maxPartitionFetchMin) {
-        this.maxPartitionFetchMin = maxPartitionFetchMin;
-    }
-
-    @Override
-    public int getMaxPartitionFetchMax() {
-        return maxPartitionFetchMax;
-    }
-
-    public void setMaxPartitionFetchMax(int maxPartitionFetchMax) {
-        this.maxPartitionFetchMax = maxPartitionFetchMax;
-    }
-
-    @Override
-    public List<PartitionAssignmentStrategy> getPartitionAssignmentStrategies() {
-        return partitionAssignmentStrategies;
-    }
-
-    public void setPartitionAssignmentStrategies(List<PartitionAssignmentStrategy> partitionAssignmentStrategies) {
-        this.partitionAssignmentStrategies = partitionAssignmentStrategies;
-    }
+  public void setMetricsNumSamples(int metricsNumSamples) {
+    this.metricsNumSamples = metricsNumSamples;
+  }
+
+  @Override
+  public Duration getRequestTimeout() {
+    return requestTimeout;
+  }
+
+  public void setRequestTimeout(Duration requestTimeout) {
+    this.requestTimeout = requestTimeout;
+  }
+
+  @Override
+  public Duration getConnectionsMaxIdle() {
+    return connectionsMaxIdle;
+  }
+
+  public void setConnectionsMaxIdle(Duration connectionsMaxIdle) {
+    this.connectionsMaxIdle = connectionsMaxIdle;
+  }
+
+  @Override
+  public int getMaxPollRecords() {
+    return maxPollRecords;
+  }
+
+  public void setMaxPollRecords(int maxPollRecords) {
+    this.maxPollRecords = maxPollRecords;
+  }
+
+  @Override
+  public Duration getMaxPollInterval() {
+    return maxPollInterval;
+  }
+
+  public void setMaxPollInterval(Duration maxPollInterval) {
+    this.maxPollInterval = maxPollInterval;
+  }
+
+  @Override
+  public String getAutoOffsetReset() {
+    return autoOffsetReset;
+  }
+
+  public void setAutoOffsetReset(String autoOffsetReset) {
+    this.autoOffsetReset = autoOffsetReset;
+  }
+
+  @Override
+  public Duration getSessionTimeout() {
+    return sessionTimeout;
+  }
+
+  public void setSessionTimeout(Duration sessionTimeout) {
+    this.sessionTimeout = sessionTimeout;
+  }
+
+  @Override
+  public Duration getHeartbeatInterval() {
+    return heartbeatInterval;
+  }
+
+  public void setHeartbeatInterval(Duration heartbeatInterval) {
+    this.heartbeatInterval = heartbeatInterval;
+  }
+
+  @Override
+  public Duration getMetadataMaxAge() {
+    return metadataMaxAge;
+  }
+
+  public void setMetadataMaxAge(Duration metadataMaxAge) {
+    this.metadataMaxAge = metadataMaxAge;
+  }
+
+  @Override
+  public int getMaxPartitionFetchMin() {
+    return maxPartitionFetchMin;
+  }
+
+  public void setMaxPartitionFetchMin(int maxPartitionFetchMin) {
+    this.maxPartitionFetchMin = maxPartitionFetchMin;
+  }
+
+  @Override
+  public int getMaxPartitionFetchMax() {
+    return maxPartitionFetchMax;
+  }
+
+  public void setMaxPartitionFetchMax(int maxPartitionFetchMax) {
+    this.maxPartitionFetchMax = maxPartitionFetchMax;
+  }
+
+  @Override
+  public List<PartitionAssignmentStrategy> getPartitionAssignmentStrategies() {
+    return partitionAssignmentStrategies;
+  }
+
+  public void setPartitionAssignmentStrategies(
+      List<PartitionAssignmentStrategy> partitionAssignmentStrategies) {
+    this.partitionAssignmentStrategies = partitionAssignmentStrategies;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaHeaderNameProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaHeaderNameProperties.java
index 6e1b9c63da..c0ca77718b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaHeaderNameProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaHeaderNameProperties.java
@@ -6,47 +6,36 @@
 @ConfigurationProperties(prefix = "consumer.kafka.header.name")
 public class KafkaHeaderNameProperties implements KafkaHeaderNameParameters {
 
-    private String schemaVersion = "sv";
+  private String schemaVersion = "sv";
 
-    private String schemaId = "sid";
+  private String schemaId = "sid";
 
-    private String messageId = "id";
+  private String messageId = "id";
 
-    private String timestamp = "ts";
+  @Override
+  public String getSchemaVersion() {
+    return schemaVersion;
+  }
 
-    @Override
-    public String getSchemaVersion() {
-        return schemaVersion;
-    }
+  public void setSchemaVersion(String schemaVersion) {
+    this.schemaVersion = schemaVersion;
+  }
 
-    public void setSchemaVersion(String schemaVersion) {
-        this.schemaVersion = schemaVersion;
-    }
+  @Override
+  public String getSchemaId() {
+    return schemaId;
+  }
 
-    @Override
-    public String getSchemaId() {
-        return schemaId;
-    }
+  public void setSchemaId(String schemaId) {
+    this.schemaId = schemaId;
+  }
 
-    public void setSchemaId(String schemaId) {
-        this.schemaId = schemaId;
-    }
+  @Override
+  public String getMessageId() {
+    return messageId;
+  }
 
-    @Override
-    public String getMessageId() {
-        return messageId;
-    }
-
-    public void setMessageId(String messageId) {
-        this.messageId = messageId;
-    }
-
-    @Override
-    public String getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(String timestamp) {
-        this.timestamp = timestamp;
-    }
+  public void setMessageId(String messageId) {
+    this.messageId = messageId;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaProperties.java
index 83858f4cad..b8efcc00d4 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/KafkaProperties.java
@@ -1,73 +1,73 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import pl.allegro.tech.hermes.common.config.KafkaAuthorizationProperties;
+import pl.allegro.tech.hermes.common.config.KafkaAuthenticationProperties;
 import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
 
 public class KafkaProperties implements KafkaParameters {
 
-    private KafkaAuthorizationProperties authorization = new KafkaAuthorizationProperties();
+  private KafkaAuthenticationProperties authentication = new KafkaAuthenticationProperties();
 
-    private String datacenter = "dc";
+  private String datacenter = "dc";
 
-    private String clusterName = "primary";
+  private String clusterName = "primary";
 
-    private String brokerList = "localhost:9092";
+  private String brokerList = "localhost:9092";
 
-    public KafkaAuthorizationProperties getAuthorization() {
-        return authorization;
-    }
+  public KafkaAuthenticationProperties getAuthentication() {
+    return authentication;
+  }
 
-    public void setAuthorization(KafkaAuthorizationProperties authorization) {
-        this.authorization = authorization;
-    }
+  @Deprecated
+  public void setAuthorization(KafkaAuthenticationProperties authorization) {
+    this.authentication = authorization;
+  }
 
-    public String getDatacenter() {
-        return datacenter;
-    }
+  public void setAuthentication(KafkaAuthenticationProperties authentication) {
+    this.authentication = authentication;
+  }
 
-    public void setDatacenter(String datacenter) {
-        this.datacenter = datacenter;
-    }
+  public String getDatacenter() {
+    return datacenter;
+  }
 
-    public String getClusterName() {
-        return clusterName;
-    }
+  public void setDatacenter(String datacenter) {
+    this.datacenter = datacenter;
+  }
 
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
+  public String getClusterName() {
+    return clusterName;
+  }
 
-    @Override
-    public boolean isEnabled() {
-        return authorization.isEnabled();
-    }
+  public void setClusterName(String clusterName) {
+    this.clusterName = clusterName;
+  }
 
-    @Override
-    public String getMechanism() {
-        return authorization.getMechanism();
-    }
+  @Override
+  public boolean isAuthenticationEnabled() {
+    return authentication.isEnabled();
+  }
 
-    @Override
-    public String getProtocol() {
-        return authorization.getProtocol();
-    }
+  @Override
+  public String getAuthenticationMechanism() {
+    return authentication.getMechanism();
+  }
 
-    @Override
-    public String getUsername() {
-        return authorization.getUsername();
-    }
+  @Override
+  public String getAuthenticationProtocol() {
+    return authentication.getProtocol();
+  }
 
-    @Override
-    public String getPassword() {
-        return authorization.getPassword();
-    }
+  @Override
+  public String getBrokerList() {
+    return brokerList;
+  }
 
-    @Override
-    public String getBrokerList() {
-        return brokerList;
-    }
+  public void setBrokerList(String brokerList) {
+    this.brokerList = brokerList;
+  }
 
-    public void setBrokerList(String brokerList) {
-        this.brokerList = brokerList;
-    }
+  @Override
+  public String getJaasConfig() {
+    return authentication.getJaasConfig();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MaxRateProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MaxRateProperties.java
index 227739f7a7..3817342acc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MaxRateProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MaxRateProperties.java
@@ -1,97 +1,97 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.consumers.consumer.rate.maxrate.MaxRateParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "consumer.maxrate")
 public class MaxRateProperties implements MaxRateParameters {
 
-    private RegistryBinaryEncoderProperties registryBinaryEncoder = new RegistryBinaryEncoderProperties();
+  private RegistryBinaryEncoderProperties registryBinaryEncoder =
+      new RegistryBinaryEncoderProperties();
 
-    private Duration balanceInterval = Duration.ofSeconds(30);
+  private Duration balanceInterval = Duration.ofSeconds(30);
 
-    private Duration updateInterval = Duration.ofSeconds(15);
+  private Duration updateInterval = Duration.ofSeconds(15);
 
-    private int historySize = 1;
+  private int historySize = 1;
 
-    private double busyTolerance = 0.1;
+  private double busyTolerance = 0.1;
 
-    private double minMaxRate = 1.0;
+  private double minMaxRate = 1.0;
 
-    private double minAllowedChangePercent = 1.0;
+  private double minAllowedChangePercent = 1.0;
 
-    private double minSignificantUpdatePercent = 9.0;
+  private double minSignificantUpdatePercent = 9.0;
 
-    public RegistryBinaryEncoderProperties getRegistryBinaryEncoder() {
-        return registryBinaryEncoder;
-    }
+  public RegistryBinaryEncoderProperties getRegistryBinaryEncoder() {
+    return registryBinaryEncoder;
+  }
 
-    public void setRegistryBinaryEncoder(RegistryBinaryEncoderProperties registryBinaryEncoder) {
-        this.registryBinaryEncoder = registryBinaryEncoder;
-    }
+  public void setRegistryBinaryEncoder(RegistryBinaryEncoderProperties registryBinaryEncoder) {
+    this.registryBinaryEncoder = registryBinaryEncoder;
+  }
 
-    @Override
-    public Duration getBalanceInterval() {
-        return balanceInterval;
-    }
+  @Override
+  public Duration getBalanceInterval() {
+    return balanceInterval;
+  }
 
-    public void setBalanceInterval(Duration balanceInterval) {
-        this.balanceInterval = balanceInterval;
-    }
+  public void setBalanceInterval(Duration balanceInterval) {
+    this.balanceInterval = balanceInterval;
+  }
 
-    @Override
-    public Duration getUpdateInterval() {
-        return updateInterval;
-    }
+  @Override
+  public Duration getUpdateInterval() {
+    return updateInterval;
+  }
 
-    public void setUpdateInterval(Duration updateInterval) {
-        this.updateInterval = updateInterval;
-    }
+  public void setUpdateInterval(Duration updateInterval) {
+    this.updateInterval = updateInterval;
+  }
 
-    @Override
-    public int getHistorySize() {
-        return historySize;
-    }
+  @Override
+  public int getHistorySize() {
+    return historySize;
+  }
 
-    public void setHistorySize(int historySize) {
-        this.historySize = historySize;
-    }
+  public void setHistorySize(int historySize) {
+    this.historySize = historySize;
+  }
 
-    @Override
-    public double getBusyTolerance() {
-        return busyTolerance;
-    }
+  @Override
+  public double getBusyTolerance() {
+    return busyTolerance;
+  }
 
-    public void setBusyTolerance(double busyTolerance) {
-        this.busyTolerance = busyTolerance;
-    }
+  public void setBusyTolerance(double busyTolerance) {
+    this.busyTolerance = busyTolerance;
+  }
 
-    @Override
-    public double getMinMaxRate() {
-        return minMaxRate;
-    }
+  @Override
+  public double getMinMaxRate() {
+    return minMaxRate;
+  }
 
-    public void setMinMaxRate(double minMaxRate) {
-        this.minMaxRate = minMaxRate;
-    }
+  public void setMinMaxRate(double minMaxRate) {
+    this.minMaxRate = minMaxRate;
+  }
 
-    @Override
-    public double getMinAllowedChangePercent() {
-        return minAllowedChangePercent;
-    }
+  @Override
+  public double getMinAllowedChangePercent() {
+    return minAllowedChangePercent;
+  }
 
-    public void setMinAllowedChangePercent(double minAllowedChangePercent) {
-        this.minAllowedChangePercent = minAllowedChangePercent;
-    }
+  public void setMinAllowedChangePercent(double minAllowedChangePercent) {
+    this.minAllowedChangePercent = minAllowedChangePercent;
+  }
 
-    @Override
-    public double getMinSignificantUpdatePercent() {
-        return minSignificantUpdatePercent;
-    }
+  @Override
+  public double getMinSignificantUpdatePercent() {
+    return minSignificantUpdatePercent;
+  }
 
-    public void setMinSignificantUpdatePercent(double minSignificantUpdatePercent) {
-        this.minSignificantUpdatePercent = minSignificantUpdatePercent;
-    }
+  public void setMinSignificantUpdatePercent(double minSignificantUpdatePercent) {
+    this.minSignificantUpdatePercent = minSignificantUpdatePercent;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MessageConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MessageConfiguration.java
index acd9db4186..253d89f1b8 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MessageConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MessageConfiguration.java
@@ -10,9 +10,11 @@
 @EnableConfigurationProperties(CommonConsumerProperties.class)
 public class MessageConfiguration {
 
-    @Bean
-    public UndeliveredMessageLogPersister undeliveredMessageLogPersister(UndeliveredMessageLog undeliveredMessageLog,
-                                                                         CommonConsumerProperties commonConsumerProperties) {
-        return new UndeliveredMessageLogPersister(undeliveredMessageLog, commonConsumerProperties.getUndeliveredMessageLogPersistPeriod());
-    }
+  @Bean
+  public UndeliveredMessageLogPersister undeliveredMessageLogPersister(
+      UndeliveredMessageLog undeliveredMessageLog,
+      CommonConsumerProperties commonConsumerProperties) {
+    return new UndeliveredMessageLogPersister(
+        undeliveredMessageLog, commonConsumerProperties.getUndeliveredMessageLogPersistPeriod());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MetricsProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MetricsProperties.java
index b03087193b..46977a3bd8 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MetricsProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MetricsProperties.java
@@ -1,75 +1,18 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.common.di.factories.MetricRegistryParameters;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "consumer.metrics.metric-registry")
-public class MetricsProperties implements MetricRegistryParameters {
-
-    private boolean zookeeperReporterEnabled = true;
-
-    private boolean graphiteReporterEnabled = false;
-
-    private boolean consoleReporterEnabled = false;
-
-    private Duration counterExpireAfterAccess = Duration.ofHours(72);
-
-    private String disabledAttributes = "M15_RATE, M5_RATE, MEAN, MEAN_RATE, MIN, STDDEV";
-
-    private Duration reportPeriod = Duration.ofSeconds(20);
-
-    @Override
-    public boolean isZookeeperReporterEnabled() {
-        return zookeeperReporterEnabled;
-    }
-
-    public void setZookeeperReporterEnabled(boolean zookeeperReporterEnabled) {
-        this.zookeeperReporterEnabled = zookeeperReporterEnabled;
-    }
-
-    @Override
-    public boolean isGraphiteReporterEnabled() {
-        return graphiteReporterEnabled;
-    }
-
-    public void setGraphiteReporterEnabled(boolean graphiteReporterEnabled) {
-        this.graphiteReporterEnabled = graphiteReporterEnabled;
-    }
-
-    @Override
-    public boolean isConsoleReporterEnabled() {
-        return consoleReporterEnabled;
-    }
-
-    public void setConsoleReporterEnabled(boolean consoleReporterEnabled) {
-        this.consoleReporterEnabled = consoleReporterEnabled;
-    }
-
-    public Duration getCounterExpireAfterAccess() {
-        return counterExpireAfterAccess;
-    }
-
-    public void setCounterExpireAfterAccess(Duration counterExpireAfterAccess) {
-        this.counterExpireAfterAccess = counterExpireAfterAccess;
-    }
-
-    @Override
-    public String getDisabledAttributes() {
-        return disabledAttributes;
-    }
+public class MetricsProperties {
 
-    public void setDisabledAttributes(String disabledAttributes) {
-        this.disabledAttributes = disabledAttributes;
-    }
+  private Duration counterExpireAfterAccess = Duration.ofHours(72);
 
-    @Override
-    public Duration getReportPeriod() {
-        return reportPeriod;
-    }
+  public Duration getCounterExpireAfterAccess() {
+    return counterExpireAfterAccess;
+  }
 
-    public void setReportPeriod(Duration reportPeriod) {
-        this.reportPeriod = reportPeriod;
-    }
+  public void setCounterExpireAfterAccess(Duration counterExpireAfterAccess) {
+    this.counterExpireAfterAccess = counterExpireAfterAccess;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MicrometerRegistryProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MicrometerRegistryProperties.java
index d5431b7de1..833084e2d7 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MicrometerRegistryProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/MicrometerRegistryProperties.java
@@ -1,50 +1,49 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.common.di.factories.MicrometerRegistryParameters;
-
 import java.time.Duration;
 import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.common.di.factories.MicrometerRegistryParameters;
 
 @ConfigurationProperties(prefix = "consumer.metrics.micrometer")
 public class MicrometerRegistryProperties implements MicrometerRegistryParameters {
 
-    private List<Double> percentiles = List.of(0.5, 0.99, 0.999);
-    private boolean zookeeperReporterEnabled = true;
-    private Duration reportPeriod = Duration.ofSeconds(20);
+  private List<Double> percentiles = List.of(0.5, 0.99, 0.999);
+  private boolean zookeeperReporterEnabled = true;
+  private Duration reportPeriod = Duration.ofSeconds(20);
 
-    @Override
-    public List<Double> getPercentiles() {
-        return percentiles;
-    }
+  @Override
+  public List<Double> getPercentiles() {
+    return percentiles;
+  }
 
-    @Override
-    public boolean zookeeperReporterEnabled() {
-        return zookeeperReporterEnabled;
-    }
+  @Override
+  public boolean zookeeperReporterEnabled() {
+    return zookeeperReporterEnabled;
+  }
 
-    @Override
-    public Duration zookeeperReportPeriod() {
-        return reportPeriod;
-    }
+  @Override
+  public Duration zookeeperReportPeriod() {
+    return reportPeriod;
+  }
 
-    public void setPercentiles(List<Double> percentiles) {
-        this.percentiles = percentiles;
-    }
+  public void setPercentiles(List<Double> percentiles) {
+    this.percentiles = percentiles;
+  }
 
-    public boolean isZookeeperReporterEnabled() {
-        return zookeeperReporterEnabled;
-    }
+  public boolean isZookeeperReporterEnabled() {
+    return zookeeperReporterEnabled;
+  }
 
-    public void setZookeeperReporterEnabled(boolean zookeeperReporterEnabled) {
-        this.zookeeperReporterEnabled = zookeeperReporterEnabled;
-    }
+  public void setZookeeperReporterEnabled(boolean zookeeperReporterEnabled) {
+    this.zookeeperReporterEnabled = zookeeperReporterEnabled;
+  }
 
-    public Duration getReportPeriod() {
-        return reportPeriod;
-    }
+  public Duration getReportPeriod() {
+    return reportPeriod;
+  }
 
-    public void setReportPeriod(Duration reportPeriod) {
-        this.reportPeriod = reportPeriod;
-    }
+  public void setReportPeriod(Duration reportPeriod) {
+    this.reportPeriod = reportPeriod;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthConfiguration.java
index 82c55cea79..1ddfab771c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthConfiguration.java
@@ -3,6 +3,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import jakarta.inject.Named;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import org.apache.curator.framework.CuratorFramework;
 import org.eclipse.jetty.client.HttpClient;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -23,69 +26,75 @@
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
 @Configuration
 @EnableConfigurationProperties(OAuthProperties.class)
 public class OAuthConfiguration {
 
-    @Bean
-    public OAuthTokenRequestRateLimiterFactory oAuthTokenRequestRateLimiterFactory(OAuthProviderRepository oAuthProviderRepository,
-                                                                                   OAuthProperties oAuthProperties) {
-        return new OAuthTokenRequestRateLimiterFactory(oAuthProviderRepository,
-                oAuthProperties.getProvidersTokenRequestRateLimiterRateReductionFactor());
-    }
+  @Bean
+  public OAuthTokenRequestRateLimiterFactory oAuthTokenRequestRateLimiterFactory(
+      OAuthProviderRepository oAuthProviderRepository, OAuthProperties oAuthProperties) {
+    return new OAuthTokenRequestRateLimiterFactory(
+        oAuthProviderRepository,
+        oAuthProperties.getProvidersTokenRequestRateLimiterRateReductionFactor());
+  }
 
-    @Bean
-    public OAuthAccessTokens oAuthSubscriptionAccessTokens(OAuthAccessTokensLoader tokenLoader,
-                                                           OAuthProperties oAuthProperties) {
-        return new OAuthSubscriptionAccessTokens(tokenLoader, oAuthProperties.getSubscriptionTokensCacheMaxSize());
-    }
+  @Bean
+  public OAuthAccessTokens oAuthSubscriptionAccessTokens(
+      OAuthAccessTokensLoader tokenLoader, OAuthProperties oAuthProperties) {
+    return new OAuthSubscriptionAccessTokens(
+        tokenLoader, oAuthProperties.getSubscriptionTokensCacheMaxSize());
+  }
 
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    public OAuthClient oAuthHttpClient(@Named("oauth-http-client") HttpClient httpClient,
-                                       ObjectMapper objectMapper) {
-        return new OAuthHttpClient(httpClient, objectMapper);
-    }
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public OAuthClient oAuthHttpClient(
+      @Named("oauth-http-client") HttpClient httpClient, ObjectMapper objectMapper) {
+    return new OAuthHttpClient(httpClient, objectMapper);
+  }
 
-    @Bean
-    public OAuthSubscriptionHandlerFactory oAuthSubscriptionHandlerFactory(SubscriptionRepository subscriptionRepository,
-                                                                           OAuthAccessTokens accessTokens,
-                                                                           OAuthTokenRequestRateLimiterFactory rateLimiterLoader) {
-        return new OAuthSubscriptionHandlerFactory(subscriptionRepository, accessTokens, rateLimiterLoader);
-    }
+  @Bean
+  public OAuthSubscriptionHandlerFactory oAuthSubscriptionHandlerFactory(
+      SubscriptionRepository subscriptionRepository,
+      OAuthAccessTokens accessTokens,
+      OAuthTokenRequestRateLimiterFactory rateLimiterLoader) {
+    return new OAuthSubscriptionHandlerFactory(
+        subscriptionRepository, accessTokens, rateLimiterLoader);
+  }
 
-    @Bean
-    public OAuthAccessTokensLoader oAuthAccessTokensLoader(SubscriptionRepository subscriptionRepository,
-                                                           OAuthProviderRepository oAuthProviderRepository,
-                                                           OAuthClient oAuthClient,
-                                                           MetricsFacade metrics) {
-        return new OAuthAccessTokensLoader(subscriptionRepository, oAuthProviderRepository, oAuthClient, metrics);
-    }
+  @Bean
+  public OAuthAccessTokensLoader oAuthAccessTokensLoader(
+      SubscriptionRepository subscriptionRepository,
+      OAuthProviderRepository oAuthProviderRepository,
+      OAuthClient oAuthClient,
+      MetricsFacade metrics) {
+    return new OAuthAccessTokensLoader(
+        subscriptionRepository, oAuthProviderRepository, oAuthClient, metrics);
+  }
 
-    @Bean
-    public OAuthProvidersNotifyingCache oAuthProvidersNotifyingCache(CuratorFramework curator,
-                                                                     ZookeeperPaths paths,
-                                                                     ObjectMapper objectMapper) {
-        String path = paths.oAuthProvidersPath();
-        ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("oauth-providers-notifying-cache-%d").build();
-        ExecutorService executorService = Executors.newSingleThreadExecutor(threadFactory);
-        OAuthProvidersNotifyingCache cache = new OAuthProvidersNotifyingCache(curator, path, executorService, objectMapper);
-        try {
-            cache.start();
-        } catch (Exception e) {
-            throw new IllegalStateException("Unable to start Zookeeper cache for path " + path, e);
-        }
-        return cache;
+  @Bean
+  public OAuthProvidersNotifyingCache oAuthProvidersNotifyingCache(
+      CuratorFramework curator, ZookeeperPaths paths, ObjectMapper objectMapper) {
+    String path = paths.oAuthProvidersPath();
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat("oauth-providers-notifying-cache-%d").build();
+    ExecutorService executorService = Executors.newSingleThreadExecutor(threadFactory);
+    OAuthProvidersNotifyingCache cache =
+        new OAuthProvidersNotifyingCache(curator, path, executorService, objectMapper);
+    try {
+      cache.start();
+    } catch (Exception e) {
+      throw new IllegalStateException("Unable to start Zookeeper cache for path " + path, e);
     }
+    return cache;
+  }
 
-    @Bean
-    public ConsumerAuthorizationHandler oAuthConsumerAuthorizationHandler(OAuthSubscriptionHandlerFactory handlerFactory,
-                                                                          OAuthProperties oAuthProperties,
-                                                                          OAuthProvidersNotifyingCache oAuthProvidersCache) {
-        return new OAuthConsumerAuthorizationHandler(handlerFactory, oAuthProperties.getMissingSubscriptionHandlersCreationDelay(),
-                oAuthProvidersCache);
-    }
+  @Bean
+  public ConsumerAuthorizationHandler oAuthConsumerAuthorizationHandler(
+      OAuthSubscriptionHandlerFactory handlerFactory,
+      OAuthProperties oAuthProperties,
+      OAuthProvidersNotifyingCache oAuthProvidersCache) {
+    return new OAuthConsumerAuthorizationHandler(
+        handlerFactory,
+        oAuthProperties.getMissingSubscriptionHandlersCreationDelay(),
+        oAuthProvidersCache);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthProperties.java
index bd895c0a22..49244692eb 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthProperties.java
@@ -1,39 +1,41 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "consumer.oauth")
 public class OAuthProperties {
 
-    private Duration missingSubscriptionHandlersCreationDelay = Duration.ofSeconds(10);
+  private Duration missingSubscriptionHandlersCreationDelay = Duration.ofSeconds(10);
 
-    private long subscriptionTokensCacheMaxSize = 1000L;
+  private long subscriptionTokensCacheMaxSize = 1000L;
 
-    private double providersTokenRequestRateLimiterRateReductionFactor = 2.0;
+  private double providersTokenRequestRateLimiterRateReductionFactor = 2.0;
 
-    public Duration getMissingSubscriptionHandlersCreationDelay() {
-        return missingSubscriptionHandlersCreationDelay;
-    }
+  public Duration getMissingSubscriptionHandlersCreationDelay() {
+    return missingSubscriptionHandlersCreationDelay;
+  }
 
-    public void setMissingSubscriptionHandlersCreationDelay(Duration missingSubscriptionHandlersCreationDelay) {
-        this.missingSubscriptionHandlersCreationDelay = missingSubscriptionHandlersCreationDelay;
-    }
+  public void setMissingSubscriptionHandlersCreationDelay(
+      Duration missingSubscriptionHandlersCreationDelay) {
+    this.missingSubscriptionHandlersCreationDelay = missingSubscriptionHandlersCreationDelay;
+  }
 
-    public long getSubscriptionTokensCacheMaxSize() {
-        return subscriptionTokensCacheMaxSize;
-    }
+  public long getSubscriptionTokensCacheMaxSize() {
+    return subscriptionTokensCacheMaxSize;
+  }
 
-    public void setSubscriptionTokensCacheMaxSize(long subscriptionTokensCacheMaxSize) {
-        this.subscriptionTokensCacheMaxSize = subscriptionTokensCacheMaxSize;
-    }
+  public void setSubscriptionTokensCacheMaxSize(long subscriptionTokensCacheMaxSize) {
+    this.subscriptionTokensCacheMaxSize = subscriptionTokensCacheMaxSize;
+  }
 
-    public double getProvidersTokenRequestRateLimiterRateReductionFactor() {
-        return providersTokenRequestRateLimiterRateReductionFactor;
-    }
+  public double getProvidersTokenRequestRateLimiterRateReductionFactor() {
+    return providersTokenRequestRateLimiterRateReductionFactor;
+  }
 
-    public void setProvidersTokenRequestRateLimiterRateReductionFactor(double providersTokenRequestRateLimiterRateReductionFactor) {
-        this.providersTokenRequestRateLimiterRateReductionFactor = providersTokenRequestRateLimiterRateReductionFactor;
-    }
+  public void setProvidersTokenRequestRateLimiterRateReductionFactor(
+      double providersTokenRequestRateLimiterRateReductionFactor) {
+    this.providersTokenRequestRateLimiterRateReductionFactor =
+        providersTokenRequestRateLimiterRateReductionFactor;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OnGoogleDefaultCredentials.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OnGoogleDefaultCredentials.java
index 95b98ce6f0..1735d8d108 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OnGoogleDefaultCredentials.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OnGoogleDefaultCredentials.java
@@ -1,20 +1,19 @@
 package pl.allegro.tech.hermes.consumers.config;
 
 import com.google.auth.oauth2.GoogleCredentials;
+import java.io.IOException;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
-import java.io.IOException;
-
 public class OnGoogleDefaultCredentials implements Condition {
-    @Override
-    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-        try {
-            GoogleCredentials.getApplicationDefault();
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
+  @Override
+  public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+    try {
+      GoogleCredentials.getApplicationDefault();
+      return true;
+    } catch (IOException e) {
+      return false;
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusConfigAdapter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusConfigAdapter.java
index eb71f796c2..43c1e2d9e8 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusConfigAdapter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusConfigAdapter.java
@@ -1,32 +1,29 @@
 package pl.allegro.tech.hermes.consumers.config;
 
 import io.micrometer.prometheus.PrometheusConfig;
-
 import java.time.Duration;
 
 public class PrometheusConfigAdapter implements PrometheusConfig {
 
-    private final PrometheusProperties prometheusReporterProperties;
+  private final PrometheusProperties prometheusReporterProperties;
 
-    public PrometheusConfigAdapter(PrometheusProperties prometheusReporterProperties) {
-        this.prometheusReporterProperties = prometheusReporterProperties;
-    }
+  public PrometheusConfigAdapter(PrometheusProperties prometheusReporterProperties) {
+    this.prometheusReporterProperties = prometheusReporterProperties;
+  }
 
-    @Override
-    public boolean descriptions() {
-        return prometheusReporterProperties.isDescriptions();
-    }
+  @Override
+  public boolean descriptions() {
+    return prometheusReporterProperties.isDescriptions();
+  }
 
-    @Override
-    public Duration step() {
-        return prometheusReporterProperties.getStep();
-    }
+  @Override
+  public Duration step() {
+    return prometheusReporterProperties.getStep();
+  }
 
-    /**
-     * Returning null is fine since we override all the methods from PrometheusConfig.
-     */
-    @Override
-    public String get(String key) {
-        return null;  // Nothing to see here, move along.
-    }
+  /** Returning null is fine since we override all the methods from PrometheusConfig. */
+  @Override
+  public String get(String key) {
+    return null; // Nothing to see here, move along.
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusProperties.java
index 6455a38fd1..dca0531075 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusProperties.java
@@ -1,28 +1,27 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "consumer.prometheus")
 public class PrometheusProperties {
 
-    private Duration step = Duration.ofMinutes(1);
-    private boolean descriptions = true;
+  private Duration step = Duration.ofMinutes(1);
+  private boolean descriptions = true;
 
-    public Duration getStep() {
-        return this.step;
-    }
+  public Duration getStep() {
+    return this.step;
+  }
 
-    public void setStep(Duration step) {
-        this.step = step;
-    }
+  public void setStep(Duration step) {
+    this.step = step;
+  }
 
-    public boolean isDescriptions() {
-        return this.descriptions;
-    }
+  public boolean isDescriptions() {
+    return this.descriptions;
+  }
 
-    public void setDescriptions(boolean descriptions) {
-        this.descriptions = descriptions;
-    }
+  public void setDescriptions(boolean descriptions) {
+    this.descriptions = descriptions;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RateProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RateProperties.java
index b27a94bbdd..33ccce3056 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RateProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RateProperties.java
@@ -1,95 +1,95 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.consumers.consumer.rate.calculator.RateCalculatorParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "consumer.rate")
 public class RateProperties implements RateCalculatorParameters {
 
-    private Duration limiterSupervisorPeriod = Duration.ofSeconds(30);
+  private Duration limiterSupervisorPeriod = Duration.ofSeconds(30);
 
-    private int limiterReportingThreadPoolSize = 30;
+  private int limiterReportingThreadPoolSize = 30;
 
-    private boolean limiterReportingThreadMonitoringEnabled = false;
+  private boolean limiterReportingThreadMonitoringEnabled = false;
 
-    private Duration limiterHeartbeatModeDelay = Duration.ofMinutes(1);
+  private Duration limiterHeartbeatModeDelay = Duration.ofMinutes(1);
 
-    private Duration limiterSlowModeDelay = Duration.ofSeconds(1);
+  private Duration limiterSlowModeDelay = Duration.ofSeconds(1);
 
-    private double convergenceFactor = 0.2;
+  private double convergenceFactor = 0.2;
 
-    private double failuresNoChangeToleranceRatio = 0.05;
+  private double failuresNoChangeToleranceRatio = 0.05;
 
-    private double failuresSpeedUpToleranceRatio = 0.01;
+  private double failuresSpeedUpToleranceRatio = 0.01;
 
-    public Duration getLimiterSupervisorPeriod() {
-        return limiterSupervisorPeriod;
-    }
+  public Duration getLimiterSupervisorPeriod() {
+    return limiterSupervisorPeriod;
+  }
 
-    public void setLimiterSupervisorPeriod(Duration limiterSupervisorPeriod) {
-        this.limiterSupervisorPeriod = limiterSupervisorPeriod;
-    }
+  public void setLimiterSupervisorPeriod(Duration limiterSupervisorPeriod) {
+    this.limiterSupervisorPeriod = limiterSupervisorPeriod;
+  }
 
-    public int getLimiterReportingThreadPoolSize() {
-        return limiterReportingThreadPoolSize;
-    }
+  public int getLimiterReportingThreadPoolSize() {
+    return limiterReportingThreadPoolSize;
+  }
 
-    public void setLimiterReportingThreadPoolSize(int limiterReportingThreadPoolSize) {
-        this.limiterReportingThreadPoolSize = limiterReportingThreadPoolSize;
-    }
+  public void setLimiterReportingThreadPoolSize(int limiterReportingThreadPoolSize) {
+    this.limiterReportingThreadPoolSize = limiterReportingThreadPoolSize;
+  }
 
-    public boolean isLimiterReportingThreadMonitoringEnabled() {
-        return limiterReportingThreadMonitoringEnabled;
-    }
+  public boolean isLimiterReportingThreadMonitoringEnabled() {
+    return limiterReportingThreadMonitoringEnabled;
+  }
 
-    public void setLimiterReportingThreadMonitoringEnabled(boolean limiterReportingThreadMonitoringEnabled) {
-        this.limiterReportingThreadMonitoringEnabled = limiterReportingThreadMonitoringEnabled;
-    }
+  public void setLimiterReportingThreadMonitoringEnabled(
+      boolean limiterReportingThreadMonitoringEnabled) {
+    this.limiterReportingThreadMonitoringEnabled = limiterReportingThreadMonitoringEnabled;
+  }
 
-    @Override
-    public Duration getLimiterHeartbeatModeDelay() {
-        return limiterHeartbeatModeDelay;
-    }
+  @Override
+  public Duration getLimiterHeartbeatModeDelay() {
+    return limiterHeartbeatModeDelay;
+  }
 
-    public void setLimiterHeartbeatModeDelay(Duration limiterHeartbeatModeDelay) {
-        this.limiterHeartbeatModeDelay = limiterHeartbeatModeDelay;
-    }
+  public void setLimiterHeartbeatModeDelay(Duration limiterHeartbeatModeDelay) {
+    this.limiterHeartbeatModeDelay = limiterHeartbeatModeDelay;
+  }
 
-    @Override
-    public Duration getLimiterSlowModeDelay() {
-        return limiterSlowModeDelay;
-    }
+  @Override
+  public Duration getLimiterSlowModeDelay() {
+    return limiterSlowModeDelay;
+  }
 
-    public void setLimiterSlowModeDelay(Duration limiterSlowModeDelay) {
-        this.limiterSlowModeDelay = limiterSlowModeDelay;
-    }
+  public void setLimiterSlowModeDelay(Duration limiterSlowModeDelay) {
+    this.limiterSlowModeDelay = limiterSlowModeDelay;
+  }
 
-    @Override
-    public double getConvergenceFactor() {
-        return convergenceFactor;
-    }
+  @Override
+  public double getConvergenceFactor() {
+    return convergenceFactor;
+  }
 
-    public void setConvergenceFactor(double convergenceFactor) {
-        this.convergenceFactor = convergenceFactor;
-    }
+  public void setConvergenceFactor(double convergenceFactor) {
+    this.convergenceFactor = convergenceFactor;
+  }
 
-    @Override
-    public double getFailuresNoChangeToleranceRatio() {
-        return failuresNoChangeToleranceRatio;
-    }
+  @Override
+  public double getFailuresNoChangeToleranceRatio() {
+    return failuresNoChangeToleranceRatio;
+  }
 
-    public void setFailuresNoChangeToleranceRatio(double failuresNoChangeToleranceRatio) {
-        this.failuresNoChangeToleranceRatio = failuresNoChangeToleranceRatio;
-    }
+  public void setFailuresNoChangeToleranceRatio(double failuresNoChangeToleranceRatio) {
+    this.failuresNoChangeToleranceRatio = failuresNoChangeToleranceRatio;
+  }
 
-    @Override
-    public double getFailuresSpeedUpToleranceRatio() {
-        return failuresSpeedUpToleranceRatio;
-    }
+  @Override
+  public double getFailuresSpeedUpToleranceRatio() {
+    return failuresSpeedUpToleranceRatio;
+  }
 
-    public void setFailuresSpeedUpToleranceRatio(double failuresSpeedUpToleranceRatio) {
-        this.failuresSpeedUpToleranceRatio = failuresSpeedUpToleranceRatio;
-    }
+  public void setFailuresSpeedUpToleranceRatio(double failuresSpeedUpToleranceRatio) {
+    this.failuresSpeedUpToleranceRatio = failuresSpeedUpToleranceRatio;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RegistryBinaryEncoderProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RegistryBinaryEncoderProperties.java
index cbb65ac065..7e9ca21627 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RegistryBinaryEncoderProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RegistryBinaryEncoderProperties.java
@@ -2,23 +2,23 @@
 
 public class RegistryBinaryEncoderProperties {
 
-    private int maxRateBufferSizeBytes = 100_000;
+  private int maxRateBufferSizeBytes = 100_000;
 
-    private int historyBufferSizeBytes = 100_000;
+  private int historyBufferSizeBytes = 100_000;
 
-    public int getMaxRateBufferSizeBytes() {
-        return maxRateBufferSizeBytes;
-    }
+  public int getMaxRateBufferSizeBytes() {
+    return maxRateBufferSizeBytes;
+  }
 
-    public void setMaxRateBufferSizeBytes(int maxRateBufferSizeBytes) {
-        this.maxRateBufferSizeBytes = maxRateBufferSizeBytes;
-    }
+  public void setMaxRateBufferSizeBytes(int maxRateBufferSizeBytes) {
+    this.maxRateBufferSizeBytes = maxRateBufferSizeBytes;
+  }
 
-    public int getHistoryBufferSizeBytes() {
-        return historyBufferSizeBytes;
-    }
+  public int getHistoryBufferSizeBytes() {
+    return historyBufferSizeBytes;
+  }
 
-    public void setHistoryBufferSizeBytes(int historyBufferSizeBytes) {
-        this.historyBufferSizeBytes = historyBufferSizeBytes;
-    }
+  public void setHistoryBufferSizeBytes(int historyBufferSizeBytes) {
+    this.historyBufferSizeBytes = historyBufferSizeBytes;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RegistryConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RegistryConfiguration.java
index b4e1d6a55d..9b74cf5fe6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RegistryConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/RegistryConfiguration.java
@@ -1,6 +1,10 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.time.Clock;
+import java.util.concurrent.ThreadFactory;
 import org.apache.curator.framework.CuratorFramework;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -10,34 +14,34 @@
 import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.time.Clock;
-import java.util.concurrent.ThreadFactory;
-
-import static java.util.concurrent.Executors.newSingleThreadExecutor;
-
 @Configuration
-@EnableConfigurationProperties({
-        KafkaClustersProperties.class,
-        WorkloadProperties.class
-})
+@EnableConfigurationProperties({KafkaClustersProperties.class, WorkloadProperties.class})
 public class RegistryConfiguration {
 
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    public ConsumerNodesRegistry consumerNodesRegistry(CuratorFramework curatorFramework,
-                                                       KafkaClustersProperties kafkaClustersProperties,
-                                                       WorkloadProperties workloadProperties,
-                                                       ZookeeperPaths zookeeperPaths,
-                                                       Clock clock,
-                                                       DatacenterNameProvider datacenterNameProvider) {
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("ConsumerRegistryExecutor-%d").build();
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public ConsumerNodesRegistry consumerNodesRegistry(
+      CuratorFramework curatorFramework,
+      KafkaClustersProperties kafkaClustersProperties,
+      WorkloadProperties workloadProperties,
+      ZookeeperPaths zookeeperPaths,
+      Clock clock,
+      DatacenterNameProvider datacenterNameProvider) {
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat("ConsumerRegistryExecutor-%d").build();
 
-        String consumerNodeId = workloadProperties.getNodeId();
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        long deadAfterSeconds = workloadProperties.getDeadAfter().toSeconds();
-        ConsumerNodesRegistryPaths registryPaths = new ConsumerNodesRegistryPaths(zookeeperPaths, kafkaProperties.getClusterName());
+    String consumerNodeId = workloadProperties.getNodeId();
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    long deadAfterSeconds = workloadProperties.getDeadAfter().toSeconds();
+    ConsumerNodesRegistryPaths registryPaths =
+        new ConsumerNodesRegistryPaths(zookeeperPaths, kafkaProperties.getClusterName());
 
-        return new ConsumerNodesRegistry(curatorFramework, newSingleThreadExecutor(threadFactory),
-                registryPaths, consumerNodeId, deadAfterSeconds, clock);
-    }
+    return new ConsumerNodesRegistry(
+        curatorFramework,
+        newSingleThreadExecutor(threadFactory),
+        registryPaths,
+        consumerNodeId,
+        deadAfterSeconds,
+        clock);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaConfiguration.java
index fb3bcc9c82..5bd89dd14f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaConfiguration.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
+import java.net.URI;
 import org.apache.avro.Schema;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
@@ -23,64 +24,80 @@
 import pl.allegro.tech.hermes.schema.resolver.DefaultSchemaRepositoryInstanceResolver;
 import pl.allegro.tech.hermes.schema.resolver.SchemaRepositoryInstanceResolver;
 
-import java.net.URI;
-
 @Configuration
-@EnableConfigurationProperties({
-        SchemaProperties.class,
-        KafkaClustersProperties.class
-})
+@EnableConfigurationProperties({SchemaProperties.class, KafkaClustersProperties.class})
 public class SchemaConfiguration {
 
-    @Bean
-    public SchemaRepository schemaRepository(SchemaVersionsRepository schemaVersionsRepository,
-                                             CompiledSchemaRepository<Schema> compiledAvroSchemaRepository) {
-        return new SchemaRepositoryFactory(schemaVersionsRepository, compiledAvroSchemaRepository).provide();
-    }
+  @Bean
+  public SchemaRepository schemaRepository(
+      SchemaVersionsRepository schemaVersionsRepository,
+      CompiledSchemaRepository<Schema> compiledAvroSchemaRepository) {
+    return new SchemaRepositoryFactory(schemaVersionsRepository, compiledAvroSchemaRepository)
+        .provide();
+  }
 
-    @Bean
-    public CompiledSchemaRepository<Schema> avroCompiledSchemaRepository(RawSchemaClient rawSchemaClient,
-                                                                         SchemaProperties schemaProperties) {
-        return new AvroCompiledSchemaRepositoryFactory(
-                rawSchemaClient, schemaProperties.getCache().getCompiledMaximumSize(),
-                schemaProperties.getCache().getCompiledExpireAfterAccess(), schemaProperties.getCache().isEnabled()
-        ).provide();
-    }
+  @Bean
+  public CompiledSchemaRepository<Schema> avroCompiledSchemaRepository(
+      RawSchemaClient rawSchemaClient, SchemaProperties schemaProperties) {
+    return new AvroCompiledSchemaRepositoryFactory(
+            rawSchemaClient,
+            schemaProperties.getCache().getCompiledMaximumSize(),
+            schemaProperties.getCache().getCompiledExpireAfterAccess(),
+            schemaProperties.getCache().isEnabled())
+        .provide();
+  }
 
-    @Bean
-    public RawSchemaClient rawSchemaClient(MetricsFacade metricsFacade,
-                                           ObjectMapper objectMapper,
-                                           SchemaRepositoryInstanceResolver resolver,
-                                           SchemaProperties schemaProperties,
-                                           KafkaClustersProperties kafkaProperties) {
-        return new RawSchemaClientFactory(kafkaProperties.getNamespace(), kafkaProperties.getNamespaceSeparator(), metricsFacade,
-                objectMapper, resolver,
-                schemaProperties.getRepository().isSubjectSuffixEnabled(),
-                schemaProperties.getRepository().isSubjectNamespaceEnabled()).provide();
-    }
+  @Bean
+  public RawSchemaClient rawSchemaClient(
+      MetricsFacade metricsFacade,
+      ObjectMapper objectMapper,
+      SchemaRepositoryInstanceResolver resolver,
+      SchemaProperties schemaProperties,
+      KafkaClustersProperties kafkaProperties) {
+    return new RawSchemaClientFactory(
+            kafkaProperties.getNamespace(),
+            kafkaProperties.getNamespaceSeparator(),
+            metricsFacade,
+            objectMapper,
+            resolver,
+            schemaProperties.getRepository().isSubjectSuffixEnabled(),
+            schemaProperties.getRepository().isSubjectNamespaceEnabled())
+        .provide();
+  }
 
-    @Bean
-    public SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver(SchemaProperties schemaProperties, Client client) {
-        URI schemaRepositoryServerUri = URI.create(schemaProperties.getRepository().getServerUrl());
-        return new DefaultSchemaRepositoryInstanceResolver(client, schemaRepositoryServerUri);
-    }
+  @Bean
+  public SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver(
+      SchemaProperties schemaProperties, Client client) {
+    URI schemaRepositoryServerUri = URI.create(schemaProperties.getRepository().getServerUrl());
+    return new DefaultSchemaRepositoryInstanceResolver(client, schemaRepositoryServerUri);
+  }
 
-    @Bean
-    public Client schemaRepositoryClient(ObjectMapper mapper, SchemaProperties schemaProperties) {
-        ClientConfig config = new ClientConfig()
-                .property(ClientProperties.READ_TIMEOUT, (int) schemaProperties.getRepository().getHttpReadTimeout().toMillis())
-                .property(ClientProperties.CONNECT_TIMEOUT, (int) schemaProperties.getRepository().getHttpConnectTimeout().toMillis())
-                .register(new JacksonJsonProvider(mapper));
+  @Bean
+  public Client schemaRepositoryClient(ObjectMapper mapper, SchemaProperties schemaProperties) {
+    ClientConfig config =
+        new ClientConfig()
+            .property(
+                ClientProperties.READ_TIMEOUT,
+                (int) schemaProperties.getRepository().getHttpReadTimeout().toMillis())
+            .property(
+                ClientProperties.CONNECT_TIMEOUT,
+                (int) schemaProperties.getRepository().getHttpConnectTimeout().toMillis())
+            .register(new JacksonJsonProvider(mapper));
 
-        return ClientBuilder.newClient(config);
-    }
+    return ClientBuilder.newClient(config);
+  }
 
-    @Bean
-    public SchemaVersionsRepository schemaVersionsRepositoryFactory(RawSchemaClient rawSchemaClient,
-                                                                    SchemaProperties schemaProperties,
-                                                                    InternalNotificationsBus notificationsBus,
-                                                                    CompiledSchemaRepository<?> compiledSchemaRepository) {
-        return new SchemaVersionsRepositoryFactory(rawSchemaClient, schemaProperties.getCache(), notificationsBus, compiledSchemaRepository)
-                .provide();
-    }
+  @Bean
+  public SchemaVersionsRepository schemaVersionsRepositoryFactory(
+      RawSchemaClient rawSchemaClient,
+      SchemaProperties schemaProperties,
+      InternalNotificationsBus notificationsBus,
+      CompiledSchemaRepository<?> compiledSchemaRepository) {
+    return new SchemaVersionsRepositoryFactory(
+            rawSchemaClient,
+            schemaProperties.getCache(),
+            notificationsBus,
+            compiledSchemaRepository)
+        .provide();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaProperties.java
index 9f7986736d..8113776008 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaProperties.java
@@ -7,53 +7,53 @@
 @ConfigurationProperties(prefix = "consumer.schema")
 public class SchemaProperties {
 
-    private SchemaCacheProperties cache = new SchemaCacheProperties();
+  private SchemaCacheProperties cache = new SchemaCacheProperties();
 
-    private SchemaRepositoryProperties repository = new SchemaRepositoryProperties();
+  private SchemaRepositoryProperties repository = new SchemaRepositoryProperties();
 
-    private boolean idHeaderEnabled = false;
+  private boolean idHeaderEnabled = false;
 
-    private boolean idSerializationEnabled = false;
+  private boolean idSerializationEnabled = false;
 
-    private boolean versionTruncationEnabled = false;
+  private boolean versionTruncationEnabled = false;
 
-    public SchemaCacheProperties getCache() {
-        return cache;
-    }
+  public SchemaCacheProperties getCache() {
+    return cache;
+  }
 
-    public void setCache(SchemaCacheProperties cache) {
-        this.cache = cache;
-    }
+  public void setCache(SchemaCacheProperties cache) {
+    this.cache = cache;
+  }
 
-    public SchemaRepositoryProperties getRepository() {
-        return repository;
-    }
+  public SchemaRepositoryProperties getRepository() {
+    return repository;
+  }
 
-    public void setRepository(SchemaRepositoryProperties repository) {
-        this.repository = repository;
-    }
+  public void setRepository(SchemaRepositoryProperties repository) {
+    this.repository = repository;
+  }
 
-    public boolean isIdHeaderEnabled() {
-        return idHeaderEnabled;
-    }
+  public boolean isIdHeaderEnabled() {
+    return idHeaderEnabled;
+  }
 
-    public void setIdHeaderEnabled(boolean idHeaderEnabled) {
-        this.idHeaderEnabled = idHeaderEnabled;
-    }
+  public void setIdHeaderEnabled(boolean idHeaderEnabled) {
+    this.idHeaderEnabled = idHeaderEnabled;
+  }
 
-    public boolean isIdSerializationEnabled() {
-        return idSerializationEnabled;
-    }
+  public boolean isIdSerializationEnabled() {
+    return idSerializationEnabled;
+  }
 
-    public void setIdSerializationEnabled(boolean idSerializationEnabled) {
-        this.idSerializationEnabled = idSerializationEnabled;
-    }
+  public void setIdSerializationEnabled(boolean idSerializationEnabled) {
+    this.idSerializationEnabled = idSerializationEnabled;
+  }
 
-    public boolean isVersionTruncationEnabled() {
-        return versionTruncationEnabled;
-    }
+  public boolean isVersionTruncationEnabled() {
+    return versionTruncationEnabled;
+  }
 
-    public void setVersionTruncationEnabled(boolean versionTruncationEnabled) {
-        this.versionTruncationEnabled = versionTruncationEnabled;
-    }
+  public void setVersionTruncationEnabled(boolean versionTruncationEnabled) {
+    this.versionTruncationEnabled = versionTruncationEnabled;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SenderAsyncTimeoutProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SenderAsyncTimeoutProperties.java
index a038232262..2ec89879cc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SenderAsyncTimeoutProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SenderAsyncTimeoutProperties.java
@@ -5,33 +5,33 @@
 @ConfigurationProperties(prefix = "consumer.sender.async.timeout")
 public class SenderAsyncTimeoutProperties {
 
-    private int milliseconds = 5_000;
+  private int milliseconds = 5_000;
 
-    private int threadPoolSize = 32;
+  private int threadPoolSize = 32;
 
-    private boolean threadPoolMonitoringEnabled = false;
+  private boolean threadPoolMonitoringEnabled = false;
 
-    public int getMilliseconds() {
-        return milliseconds;
-    }
+  public int getMilliseconds() {
+    return milliseconds;
+  }
 
-    public void setMilliseconds(int milliseconds) {
-        this.milliseconds = milliseconds;
-    }
+  public void setMilliseconds(int milliseconds) {
+    this.milliseconds = milliseconds;
+  }
 
-    public int getThreadPoolSize() {
-        return threadPoolSize;
-    }
+  public int getThreadPoolSize() {
+    return threadPoolSize;
+  }
 
-    public void setThreadPoolSize(int threadPoolSize) {
-        this.threadPoolSize = threadPoolSize;
-    }
+  public void setThreadPoolSize(int threadPoolSize) {
+    this.threadPoolSize = threadPoolSize;
+  }
 
-    public boolean isThreadPoolMonitoringEnabled() {
-        return threadPoolMonitoringEnabled;
-    }
+  public boolean isThreadPoolMonitoringEnabled() {
+    return threadPoolMonitoringEnabled;
+  }
 
-    public void setThreadPoolMonitoringEnabled(boolean threadPoolMonitoringEnabled) {
-        this.threadPoolMonitoringEnabled = threadPoolMonitoringEnabled;
-    }
+  public void setThreadPoolMonitoringEnabled(boolean threadPoolMonitoringEnabled) {
+    this.threadPoolMonitoringEnabled = threadPoolMonitoringEnabled;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ServerConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ServerConfiguration.java
index e78237a450..8e2bfbfc0c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ServerConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ServerConfiguration.java
@@ -2,28 +2,30 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
+import java.io.IOException;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import pl.allegro.tech.hermes.consumers.health.ConsumerMonitor;
 import pl.allegro.tech.hermes.consumers.server.ConsumerHttpServer;
 
-import java.io.IOException;
-
 @Configuration
 @EnableConfigurationProperties(CommonConsumerProperties.class)
 public class ServerConfiguration {
 
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    public ConsumerHttpServer consumerHttpServer(CommonConsumerProperties commonConsumerProperties,
-                                                 ConsumerMonitor monitor,
-                                                 ObjectMapper mapper,
-                                                 PrometheusMeterRegistry meterRegistry) throws IOException {
-        return new ConsumerHttpServer(commonConsumerProperties.getHealthCheckPort(), monitor, mapper, meterRegistry);
-    }
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public ConsumerHttpServer consumerHttpServer(
+      CommonConsumerProperties commonConsumerProperties,
+      ConsumerMonitor monitor,
+      ObjectMapper mapper,
+      PrometheusMeterRegistry meterRegistry)
+      throws IOException {
+    return new ConsumerHttpServer(
+        commonConsumerProperties.getHealthCheckPort(), monitor, mapper, meterRegistry);
+  }
 
-    @Bean
-    public ConsumerMonitor consumerMonitor() {
-        return new ConsumerMonitor();
-    }
+  @Bean
+  public ConsumerMonitor consumerMonitor() {
+    return new ConsumerMonitor();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SslContextProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SslContextProperties.java
index 3efa6cffea..7413d8056e 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SslContextProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SslContextProperties.java
@@ -6,113 +6,113 @@
 @ConfigurationProperties(prefix = "consumer.ssl")
 public class SslContextProperties implements SslContextParameters {
 
-    private boolean enabled = true;
+  private boolean enabled = true;
 
-    private String protocol = "TLS";
+  private String protocol = "TLS";
 
-    private String keystoreSource = "jre";
+  private String keystoreSource = "jre";
 
-    private String keystoreLocation = "classpath:client.keystore";
+  private String keystoreLocation = "classpath:client.keystore";
 
-    private String keystorePassword = "password";
+  private String keystorePassword = "password";
 
-    private String keystoreFormat = "JKS";
+  private String keystoreFormat = "JKS";
 
-    private String truststoreSource = "jre";
+  private String truststoreSource = "jre";
 
-    private String truststoreLocation = "classpath:client.truststore";
+  private String truststoreLocation = "classpath:client.truststore";
 
-    private String truststorePassword = "password";
+  private String truststorePassword = "password";
 
-    private String truststoreFormat = "JKS";
+  private String truststoreFormat = "JKS";
 
-    @Override
-    public boolean isEnabled() {
-        return enabled;
-    }
+  @Override
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
 
-    @Override
-    public String getProtocol() {
-        return protocol;
-    }
+  @Override
+  public String getProtocol() {
+    return protocol;
+  }
 
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
+  public void setProtocol(String protocol) {
+    this.protocol = protocol;
+  }
 
-    @Override
-    public String getKeystoreSource() {
-        return keystoreSource;
-    }
+  @Override
+  public String getKeystoreSource() {
+    return keystoreSource;
+  }
 
-    public void setKeystoreSource(String keystoreSource) {
-        this.keystoreSource = keystoreSource;
-    }
+  public void setKeystoreSource(String keystoreSource) {
+    this.keystoreSource = keystoreSource;
+  }
 
-    @Override
-    public String getKeystoreLocation() {
-        return keystoreLocation;
-    }
+  @Override
+  public String getKeystoreLocation() {
+    return keystoreLocation;
+  }
 
-    public void setKeystoreLocation(String keystoreLocation) {
-        this.keystoreLocation = keystoreLocation;
-    }
+  public void setKeystoreLocation(String keystoreLocation) {
+    this.keystoreLocation = keystoreLocation;
+  }
 
-    @Override
-    public String getKeystorePassword() {
-        return keystorePassword;
-    }
+  @Override
+  public String getKeystorePassword() {
+    return keystorePassword;
+  }
 
-    public void setKeystorePassword(String keystorePassword) {
-        this.keystorePassword = keystorePassword;
-    }
+  public void setKeystorePassword(String keystorePassword) {
+    this.keystorePassword = keystorePassword;
+  }
 
-    @Override
-    public String getKeystoreFormat() {
-        return keystoreFormat;
-    }
+  @Override
+  public String getKeystoreFormat() {
+    return keystoreFormat;
+  }
 
-    public void setKeystoreFormat(String keystoreFormat) {
-        this.keystoreFormat = keystoreFormat;
-    }
+  public void setKeystoreFormat(String keystoreFormat) {
+    this.keystoreFormat = keystoreFormat;
+  }
 
-    @Override
-    public String getTruststoreSource() {
-        return truststoreSource;
-    }
+  @Override
+  public String getTruststoreSource() {
+    return truststoreSource;
+  }
 
-    public void setTruststoreSource(String truststoreSource) {
-        this.truststoreSource = truststoreSource;
-    }
+  public void setTruststoreSource(String truststoreSource) {
+    this.truststoreSource = truststoreSource;
+  }
 
-    @Override
-    public String getTruststoreLocation() {
-        return truststoreLocation;
-    }
+  @Override
+  public String getTruststoreLocation() {
+    return truststoreLocation;
+  }
 
-    public void setTruststoreLocation(String truststoreLocation) {
-        this.truststoreLocation = truststoreLocation;
-    }
+  public void setTruststoreLocation(String truststoreLocation) {
+    this.truststoreLocation = truststoreLocation;
+  }
 
-    @Override
-    public String getTruststorePassword() {
-        return truststorePassword;
-    }
+  @Override
+  public String getTruststorePassword() {
+    return truststorePassword;
+  }
 
-    public void setTruststorePassword(String truststorePassword) {
-        this.truststorePassword = truststorePassword;
-    }
+  public void setTruststorePassword(String truststorePassword) {
+    this.truststorePassword = truststorePassword;
+  }
 
-    @Override
-    public String getTruststoreFormat() {
-        return truststoreFormat;
-    }
+  @Override
+  public String getTruststoreFormat() {
+    return truststoreFormat;
+  }
 
-    public void setTruststoreFormat(String truststoreFormat) {
-        this.truststoreFormat = truststoreFormat;
-    }
+  public void setTruststoreFormat(String truststoreFormat) {
+    this.truststoreFormat = truststoreFormat;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SubscriptionConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SubscriptionConfiguration.java
index 5641600fd9..b712138cfe 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SubscriptionConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SubscriptionConfiguration.java
@@ -21,39 +21,39 @@
 @EnableConfigurationProperties(CommonConsumerProperties.class)
 public class SubscriptionConfiguration {
 
-    @Bean
-    public SubscriptionIdProvider subscriptionIdProvider(CuratorFramework curatorFramework, ZookeeperPaths zookeeperPaths) {
-        return new ZookeeperSubscriptionIdProvider(curatorFramework, zookeeperPaths);
-    }
+  @Bean
+  public SubscriptionIdProvider subscriptionIdProvider(
+      CuratorFramework curatorFramework, ZookeeperPaths zookeeperPaths) {
+    return new ZookeeperSubscriptionIdProvider(curatorFramework, zookeeperPaths);
+  }
 
-    @Bean
-    public SubscriptionIds subscriptionIds(InternalNotificationsBus internalNotificationsBus,
-                                           SubscriptionsCache subscriptionsCache,
-                                           SubscriptionIdProvider subscriptionIdProvider,
-                                           CommonConsumerProperties commonConsumerProperties) {
-        NotificationAwareSubscriptionIdsCache cache = new NotificationAwareSubscriptionIdsCache(
-                internalNotificationsBus,
-                subscriptionsCache,
-                subscriptionIdProvider,
-                commonConsumerProperties.getSubscriptionIdsCacheRemovedExpireAfterAccess().toSeconds(),
-                Ticker.systemTicker()
-        );
-        cache.start();
-        return cache;
-    }
+  @Bean
+  public SubscriptionIds subscriptionIds(
+      InternalNotificationsBus internalNotificationsBus,
+      SubscriptionsCache subscriptionsCache,
+      SubscriptionIdProvider subscriptionIdProvider,
+      CommonConsumerProperties commonConsumerProperties) {
+    NotificationAwareSubscriptionIdsCache cache =
+        new NotificationAwareSubscriptionIdsCache(
+            internalNotificationsBus,
+            subscriptionsCache,
+            subscriptionIdProvider,
+            commonConsumerProperties.getSubscriptionIdsCacheRemovedExpireAfterAccess().toSeconds(),
+            Ticker.systemTicker());
+    cache.start();
+    return cache;
+  }
 
-    @Bean
-    public SubscriptionsCache subscriptionsCache(InternalNotificationsBus notificationsBus,
-                                                 GroupRepository groupRepository,
-                                                 TopicRepository topicRepository,
-                                                 SubscriptionRepository subscriptionRepository) {
-        SubscriptionsCache cache = new NotificationsBasedSubscriptionCache(
-                notificationsBus,
-                groupRepository,
-                topicRepository,
-                subscriptionRepository
-        );
-        cache.start();
-        return cache;
-    }
+  @Bean
+  public SubscriptionsCache subscriptionsCache(
+      InternalNotificationsBus notificationsBus,
+      GroupRepository groupRepository,
+      TopicRepository topicRepository,
+      SubscriptionRepository subscriptionRepository) {
+    SubscriptionsCache cache =
+        new NotificationsBasedSubscriptionCache(
+            notificationsBus, groupRepository, topicRepository, subscriptionRepository);
+    cache.start();
+    return cache;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SupervisorConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SupervisorConfiguration.java
index 055f3d34d3..964ca439f7 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SupervisorConfiguration.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SupervisorConfiguration.java
@@ -1,6 +1,12 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import static java.util.concurrent.Executors.newFixedThreadPool;
+import static org.slf4j.LoggerFactory.getLogger;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.time.Clock;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
 import org.apache.curator.framework.CuratorFramework;
 import org.slf4j.Logger;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -20,7 +26,6 @@
 import pl.allegro.tech.hermes.consumers.consumer.converter.MessageConverterResolver;
 import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecordersRegistry;
 import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
 import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimitSupervisor;
 import pl.allegro.tech.hermes.consumers.consumer.rate.calculator.OutputRateCalculatorFactory;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.ReceiverFactory;
@@ -64,320 +69,343 @@
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.time.Clock;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadFactory;
-
-import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.slf4j.LoggerFactory.getLogger;
-
 @Configuration
 @EnableConfigurationProperties({
-        CommitOffsetProperties.class,
-        KafkaClustersProperties.class,
-        WorkloadProperties.class,
-        CommonConsumerProperties.class
+  CommitOffsetProperties.class,
+  KafkaClustersProperties.class,
+  WorkloadProperties.class,
+  CommonConsumerProperties.class
 })
 public class SupervisorConfiguration {
-    private static final Logger logger = getLogger(SupervisorConfiguration.class);
+  private static final Logger logger = getLogger(SupervisorConfiguration.class);
 
-    @Bean(initMethod = "start", destroyMethod = "shutdown")
-    public WorkloadSupervisor workloadSupervisor(InternalNotificationsBus notificationsBus,
-                                                 ConsumerNodesRegistry consumerNodesRegistry,
-                                                 ConsumerAssignmentRegistry assignmentRegistry,
-                                                 ConsumerAssignmentCache consumerAssignmentCache,
-                                                 ClusterAssignmentCache clusterAssignmentCache,
-                                                 SubscriptionsCache subscriptionsCache,
-                                                 ConsumersSupervisor supervisor,
-                                                 ZookeeperAdminCache adminCache,
-                                                 MetricsFacade metrics,
-                                                 WorkloadProperties workloadProperties,
-                                                 KafkaClustersProperties kafkaClustersProperties,
-                                                 WorkloadConstraintsRepository workloadConstraintsRepository,
-                                                 DatacenterNameProvider datacenterNameProvider,
-                                                 WorkBalancer workBalancer,
-                                                 BalancingListener balancingListener) {
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("AssignmentExecutor-%d")
-                .setUncaughtExceptionHandler((t, e) -> logger.error("AssignmentExecutor failed {}", t.getName(), e)).build();
-        ExecutorService assignmentExecutor = newFixedThreadPool(workloadProperties.getAssignmentProcessingThreadPoolSize(), threadFactory);
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        return new WorkloadSupervisor(
-                supervisor,
-                notificationsBus,
-                subscriptionsCache,
-                consumerAssignmentCache,
-                assignmentRegistry,
-                clusterAssignmentCache,
-                consumerNodesRegistry,
-                adminCache,
-                assignmentExecutor,
-                workloadProperties,
-                kafkaProperties.getClusterName(),
-                metrics,
-                workloadConstraintsRepository,
-                workBalancer,
-                balancingListener
-        );
-    }
+  @Bean(initMethod = "start", destroyMethod = "shutdown")
+  public WorkloadSupervisor workloadSupervisor(
+      InternalNotificationsBus notificationsBus,
+      ConsumerNodesRegistry consumerNodesRegistry,
+      ConsumerAssignmentRegistry assignmentRegistry,
+      ConsumerAssignmentCache consumerAssignmentCache,
+      ClusterAssignmentCache clusterAssignmentCache,
+      SubscriptionsCache subscriptionsCache,
+      ConsumersSupervisor supervisor,
+      ZookeeperAdminCache adminCache,
+      MetricsFacade metrics,
+      WorkloadProperties workloadProperties,
+      KafkaClustersProperties kafkaClustersProperties,
+      WorkloadConstraintsRepository workloadConstraintsRepository,
+      DatacenterNameProvider datacenterNameProvider,
+      WorkBalancer workBalancer,
+      BalancingListener balancingListener) {
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder()
+            .setNameFormat("AssignmentExecutor-%d")
+            .setUncaughtExceptionHandler(
+                (t, e) -> logger.error("AssignmentExecutor failed {}", t.getName(), e))
+            .build();
+    ExecutorService assignmentExecutor =
+        newFixedThreadPool(
+            workloadProperties.getAssignmentProcessingThreadPoolSize(), threadFactory);
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    return new WorkloadSupervisor(
+        supervisor,
+        notificationsBus,
+        subscriptionsCache,
+        consumerAssignmentCache,
+        assignmentRegistry,
+        clusterAssignmentCache,
+        consumerNodesRegistry,
+        adminCache,
+        assignmentExecutor,
+        workloadProperties,
+        kafkaProperties.getClusterName(),
+        metrics,
+        workloadConstraintsRepository,
+        workBalancer,
+        balancingListener);
+  }
 
-    @Bean
-    public WorkBalancer workBalancer(WorkloadProperties workloadProperties,
-                                     Clock clock,
-                                     CurrentLoadProvider currentLoadProvider,
-                                     TargetWeightCalculator targetWeightCalculator) {
-        switch (workloadProperties.getWorkBalancingStrategy()) {
-            case SELECTIVE:
-                return new SelectiveWorkBalancer();
-            case WEIGHTED:
-                WeightedWorkBalancingProperties weightedWorkBalancingProperties = workloadProperties.getWeightedWorkBalancing();
-                return new WeightedWorkBalancer(
-                        clock,
-                        weightedWorkBalancingProperties.getStabilizationWindowSize(),
-                        weightedWorkBalancingProperties.getMinSignificantChangePercent(),
-                        currentLoadProvider,
-                        targetWeightCalculator
-                );
-            default:
-                throw new UnknownWorkBalancingStrategyException();
-        }
+  @Bean
+  public WorkBalancer workBalancer(
+      WorkloadProperties workloadProperties,
+      Clock clock,
+      CurrentLoadProvider currentLoadProvider,
+      TargetWeightCalculator targetWeightCalculator) {
+    switch (workloadProperties.getWorkBalancingStrategy()) {
+      case SELECTIVE:
+        return new SelectiveWorkBalancer();
+      case WEIGHTED:
+        WeightedWorkBalancingProperties weightedWorkBalancingProperties =
+            workloadProperties.getWeightedWorkBalancing();
+        return new WeightedWorkBalancer(
+            clock,
+            weightedWorkBalancingProperties.getStabilizationWindowSize(),
+            weightedWorkBalancingProperties.getMinSignificantChangePercent(),
+            currentLoadProvider,
+            targetWeightCalculator);
+      default:
+        throw new UnknownWorkBalancingStrategyException();
     }
+  }
 
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    public ConsumerNodeLoadRegistry consumerNodeLoadRegistry(CuratorFramework curator,
-                                                             SubscriptionIds subscriptionIds,
-                                                             ZookeeperPaths zookeeperPaths,
-                                                             WorkloadProperties workloadProperties,
-                                                             KafkaClustersProperties kafkaClustersProperties,
-                                                             DatacenterNameProvider datacenterNameProvider,
-                                                             ExecutorServiceFactory executorServiceFactory,
-                                                             Clock clock,
-                                                             MetricsFacade metrics) {
-        switch (workloadProperties.getWorkBalancingStrategy()) {
-            case SELECTIVE:
-                return new NoOpConsumerNodeLoadRegistry();
-            case WEIGHTED:
-                KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-                WeightedWorkBalancingProperties weightedWorkBalancing = workloadProperties.getWeightedWorkBalancing();
-                return new ZookeeperConsumerNodeLoadRegistry(
-                        curator,
-                        subscriptionIds,
-                        zookeeperPaths,
-                        workloadProperties.getNodeId(),
-                        kafkaProperties.getClusterName(),
-                        weightedWorkBalancing.getLoadReportingInterval(),
-                        executorServiceFactory,
-                        clock,
-                        metrics,
-                        weightedWorkBalancing.getConsumerLoadEncoderBufferSizeBytes()
-                );
-            default:
-                throw new UnknownWorkBalancingStrategyException();
-        }
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public ConsumerNodeLoadRegistry consumerNodeLoadRegistry(
+      CuratorFramework curator,
+      SubscriptionIds subscriptionIds,
+      ZookeeperPaths zookeeperPaths,
+      WorkloadProperties workloadProperties,
+      KafkaClustersProperties kafkaClustersProperties,
+      DatacenterNameProvider datacenterNameProvider,
+      ExecutorServiceFactory executorServiceFactory,
+      Clock clock,
+      MetricsFacade metrics) {
+    switch (workloadProperties.getWorkBalancingStrategy()) {
+      case SELECTIVE:
+        return new NoOpConsumerNodeLoadRegistry();
+      case WEIGHTED:
+        KafkaProperties kafkaProperties =
+            kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+        WeightedWorkBalancingProperties weightedWorkBalancing =
+            workloadProperties.getWeightedWorkBalancing();
+        return new ZookeeperConsumerNodeLoadRegistry(
+            curator,
+            subscriptionIds,
+            zookeeperPaths,
+            workloadProperties.getNodeId(),
+            kafkaProperties.getClusterName(),
+            weightedWorkBalancing.getLoadReportingInterval(),
+            executorServiceFactory,
+            clock,
+            metrics,
+            weightedWorkBalancing.getConsumerLoadEncoderBufferSizeBytes());
+      default:
+        throw new UnknownWorkBalancingStrategyException();
     }
+  }
 
-    @Bean
-    public TargetWeightCalculator targetWeightCalculator(WorkloadProperties workloadProperties,
-                                                         WeightedWorkloadMetricsReporter metricsReporter,
-                                                         Clock clock) {
-        WeightedWorkBalancingProperties weightedWorkBalancing = workloadProperties.getWeightedWorkBalancing();
-        switch (weightedWorkBalancing.getTargetWeightCalculationStrategy()) {
-            case AVG:
-                return new AvgTargetWeightCalculator(metricsReporter);
-            case SCORING:
-                return new ScoringTargetWeightCalculator(
-                        metricsReporter,
-                        clock,
-                        weightedWorkBalancing.getWeightWindowSize(),
-                        weightedWorkBalancing.getScoringGain()
-                );
-            default:
-                throw new UnknownTargetWeightCalculationStrategyException();
-        }
+  @Bean
+  public TargetWeightCalculator targetWeightCalculator(
+      WorkloadProperties workloadProperties,
+      WeightedWorkloadMetricsReporter metricsReporter,
+      Clock clock) {
+    WeightedWorkBalancingProperties weightedWorkBalancing =
+        workloadProperties.getWeightedWorkBalancing();
+    switch (weightedWorkBalancing.getTargetWeightCalculationStrategy()) {
+      case AVG:
+        return new AvgTargetWeightCalculator(metricsReporter);
+      case SCORING:
+        return new ScoringTargetWeightCalculator(
+            metricsReporter,
+            clock,
+            weightedWorkBalancing.getWeightWindowSize(),
+            weightedWorkBalancing.getScoringGain());
+      default:
+        throw new UnknownTargetWeightCalculationStrategyException();
     }
+  }
 
-    @Bean
-    public BalancingListener balancingListener(ConsumerNodeLoadRegistry consumerNodeLoadRegistry,
-                                               SubscriptionProfileRegistry subscriptionProfileRegistry,
-                                               WorkloadProperties workloadProperties,
-                                               CurrentLoadProvider currentLoadProvider,
-                                               WeightedWorkloadMetricsReporter weightedWorkloadMetrics,
-                                               Clock clock) {
-        switch (workloadProperties.getWorkBalancingStrategy()) {
-            case SELECTIVE:
-                return new NoOpBalancingListener();
-            case WEIGHTED:
-                return new WeightedWorkBalancingListener(
-                        consumerNodeLoadRegistry,
-                        subscriptionProfileRegistry,
-                        currentLoadProvider,
-                        weightedWorkloadMetrics,
-                        clock,
-                        workloadProperties.getWeightedWorkBalancing().getWeightWindowSize()
-                );
-            default:
-                throw new UnknownWorkBalancingStrategyException();
-        }
+  @Bean
+  public BalancingListener balancingListener(
+      ConsumerNodeLoadRegistry consumerNodeLoadRegistry,
+      SubscriptionProfileRegistry subscriptionProfileRegistry,
+      WorkloadProperties workloadProperties,
+      CurrentLoadProvider currentLoadProvider,
+      WeightedWorkloadMetricsReporter weightedWorkloadMetrics,
+      Clock clock) {
+    switch (workloadProperties.getWorkBalancingStrategy()) {
+      case SELECTIVE:
+        return new NoOpBalancingListener();
+      case WEIGHTED:
+        return new WeightedWorkBalancingListener(
+            consumerNodeLoadRegistry,
+            subscriptionProfileRegistry,
+            currentLoadProvider,
+            weightedWorkloadMetrics,
+            clock,
+            workloadProperties.getWeightedWorkBalancing().getWeightWindowSize());
+      default:
+        throw new UnknownWorkBalancingStrategyException();
     }
+  }
 
-    @Bean
-    public CurrentLoadProvider currentLoadProvider() {
-        return new CurrentLoadProvider();
-    }
+  @Bean
+  public CurrentLoadProvider currentLoadProvider() {
+    return new CurrentLoadProvider();
+  }
 
-    @Bean
-    public WeightedWorkloadMetricsReporter weightedWorkloadMetrics(MetricsFacade metrics) {
-        return new WeightedWorkloadMetricsReporter(metrics);
-    }
+  @Bean
+  public WeightedWorkloadMetricsReporter weightedWorkloadMetrics(MetricsFacade metrics) {
+    return new WeightedWorkloadMetricsReporter(metrics);
+  }
 
-    @Bean
-    public SubscriptionProfileRegistry subscriptionProfileRegistry(CuratorFramework curator,
-                                                                   SubscriptionIds subscriptionIds,
-                                                                   ZookeeperPaths zookeeperPaths,
-                                                                   WorkloadProperties workloadProperties,
-                                                                   KafkaClustersProperties kafkaClustersProperties,
-                                                                   DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        WeightedWorkBalancingProperties weightedWorkBalancing = workloadProperties.getWeightedWorkBalancing();
-        return new ZookeeperSubscriptionProfileRegistry(
-                curator,
-                subscriptionIds,
-                zookeeperPaths,
-                kafkaProperties.getClusterName(),
-                weightedWorkBalancing.getSubscriptionProfilesEncoderBufferSizeBytes()
-        );
-    }
+  @Bean
+  public SubscriptionProfileRegistry subscriptionProfileRegistry(
+      CuratorFramework curator,
+      SubscriptionIds subscriptionIds,
+      ZookeeperPaths zookeeperPaths,
+      WorkloadProperties workloadProperties,
+      KafkaClustersProperties kafkaClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    WeightedWorkBalancingProperties weightedWorkBalancing =
+        workloadProperties.getWeightedWorkBalancing();
+    return new ZookeeperSubscriptionProfileRegistry(
+        curator,
+        subscriptionIds,
+        zookeeperPaths,
+        kafkaProperties.getClusterName(),
+        weightedWorkBalancing.getSubscriptionProfilesEncoderBufferSizeBytes());
+  }
 
-    @Bean
-    public Retransmitter retransmitter(SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicator,
-                                       KafkaClustersProperties kafkaClustersProperties,
-                                       DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+  @Bean
+  public Retransmitter retransmitter(
+      SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicator,
+      KafkaClustersProperties kafkaClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
 
-        return new Retransmitter(subscriptionOffsetChangeIndicator, kafkaProperties.getClusterName());
-    }
+    return new Retransmitter(subscriptionOffsetChangeIndicator, kafkaProperties.getClusterName());
+  }
 
-    @Bean
-    public ConsumerFactory consumerFactory(ReceiverFactory messageReceiverFactory,
-                                           MetricsFacade metrics,
-                                           CommonConsumerProperties commonConsumerProperties,
-                                           ConsumerRateLimitSupervisor consumerRateLimitSupervisor,
-                                           OutputRateCalculatorFactory outputRateCalculatorFactory,
-                                           Trackers trackers,
-                                           OffsetQueue offsetQueue,
-                                           ConsumerMessageSenderFactory consumerMessageSenderFactory,
-                                           TopicRepository topicRepository,
-                                           MessageConverterResolver messageConverterResolver,
-                                           MessageBatchFactory byteBufferMessageBatchFactory,
-                                           CompositeMessageContentWrapper compositeMessageContentWrapper,
-                                           MessageBatchSenderFactory batchSenderFactory,
-                                           ConsumerAuthorizationHandler consumerAuthorizationHandler,
-                                           Clock clock,
-                                           SubscriptionLoadRecordersRegistry subscriptionLoadRecordersRegistry) {
-        return new ConsumerFactory(
-                messageReceiverFactory,
-                metrics,
-                commonConsumerProperties,
-                consumerRateLimitSupervisor,
-                outputRateCalculatorFactory,
-                trackers,
-                offsetQueue,
-                consumerMessageSenderFactory,
-                topicRepository,
-                messageConverterResolver,
-                byteBufferMessageBatchFactory,
-                compositeMessageContentWrapper,
-                batchSenderFactory,
-                consumerAuthorizationHandler,
-                clock,
-                subscriptionLoadRecordersRegistry
-        );
-    }
+  @Bean
+  public ConsumerFactory consumerFactory(
+      ReceiverFactory messageReceiverFactory,
+      MetricsFacade metrics,
+      CommonConsumerProperties commonConsumerProperties,
+      ConsumerRateLimitSupervisor consumerRateLimitSupervisor,
+      OutputRateCalculatorFactory outputRateCalculatorFactory,
+      Trackers trackers,
+      ConsumerMessageSenderFactory consumerMessageSenderFactory,
+      TopicRepository topicRepository,
+      MessageConverterResolver messageConverterResolver,
+      MessageBatchFactory byteBufferMessageBatchFactory,
+      CompositeMessageContentWrapper compositeMessageContentWrapper,
+      MessageBatchSenderFactory batchSenderFactory,
+      ConsumerAuthorizationHandler consumerAuthorizationHandler,
+      Clock clock,
+      SubscriptionLoadRecordersRegistry subscriptionLoadRecordersRegistry,
+      ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
+      CommitOffsetProperties commitOffsetProperties) {
+    return new ConsumerFactory(
+        messageReceiverFactory,
+        metrics,
+        commonConsumerProperties,
+        consumerRateLimitSupervisor,
+        outputRateCalculatorFactory,
+        trackers,
+        consumerMessageSenderFactory,
+        topicRepository,
+        messageConverterResolver,
+        byteBufferMessageBatchFactory,
+        compositeMessageContentWrapper,
+        batchSenderFactory,
+        consumerAuthorizationHandler,
+        clock,
+        subscriptionLoadRecordersRegistry,
+        consumerPartitionAssignmentState,
+        commitOffsetProperties.getPeriod(),
+        commitOffsetProperties.getQueuesSize());
+  }
 
-    @Bean
-    public ConsumersExecutorService consumersExecutorService(CommonConsumerProperties commonConsumerProperties,
-                                                             MetricsFacade metrics) {
-        return new ConsumersExecutorService(commonConsumerProperties.getThreadPoolSize(), metrics);
-    }
+  @Bean
+  public ConsumersExecutorService consumersExecutorService(
+      CommonConsumerProperties commonConsumerProperties, MetricsFacade metrics) {
+    return new ConsumersExecutorService(commonConsumerProperties.getThreadPoolSize(), metrics);
+  }
 
-    @Bean
-    public ConsumersSupervisor nonblockingConsumersSupervisor(CommonConsumerProperties commonConsumerProperties,
-                                                              ConsumersExecutorService executor,
-                                                              ConsumerFactory consumerFactory,
-                                                              OffsetQueue offsetQueue,
-                                                              ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
-                                                              Retransmitter retransmitter,
-                                                              UndeliveredMessageLogPersister undeliveredMessageLogPersister,
-                                                              SubscriptionRepository subscriptionRepository,
-                                                              MetricsFacade metrics,
-                                                              ConsumerMonitor monitor,
-                                                              Clock clock,
-                                                              CommitOffsetProperties commitOffsetProperties) {
-        return new NonblockingConsumersSupervisor(commonConsumerProperties, executor, consumerFactory, offsetQueue,
-                consumerPartitionAssignmentState, retransmitter, undeliveredMessageLogPersister,
-                subscriptionRepository, metrics, monitor, clock, commitOffsetProperties.getPeriod());
-    }
+  @Bean
+  public ConsumersSupervisor nonblockingConsumersSupervisor(
+      CommonConsumerProperties commonConsumerProperties,
+      ConsumersExecutorService executor,
+      ConsumerFactory consumerFactory,
+      ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
+      Retransmitter retransmitter,
+      UndeliveredMessageLogPersister undeliveredMessageLogPersister,
+      SubscriptionRepository subscriptionRepository,
+      MetricsFacade metrics,
+      ConsumerMonitor monitor,
+      Clock clock) {
+    return new NonblockingConsumersSupervisor(
+        commonConsumerProperties,
+        executor,
+        consumerFactory,
+        consumerPartitionAssignmentState,
+        retransmitter,
+        undeliveredMessageLogPersister,
+        subscriptionRepository,
+        metrics,
+        monitor,
+        clock);
+  }
 
-    @Bean(initMethod = "start", destroyMethod = "shutdown")
-    public ConsumersRuntimeMonitor consumersRuntimeMonitor(ConsumersSupervisor consumerSupervisor,
-                                                           WorkloadSupervisor workloadSupervisor,
-                                                           MetricsFacade metrics,
-                                                           SubscriptionsCache subscriptionsCache,
-                                                           WorkloadProperties workloadProperties) {
-        return new ConsumersRuntimeMonitor(
-                consumerSupervisor,
-                workloadSupervisor,
-                metrics,
-                subscriptionsCache,
-                workloadProperties.getMonitorScanInterval()
-        );
-    }
+  @Bean(initMethod = "start", destroyMethod = "shutdown")
+  public ConsumersRuntimeMonitor consumersRuntimeMonitor(
+      ConsumersSupervisor consumerSupervisor,
+      WorkloadSupervisor workloadSupervisor,
+      MetricsFacade metrics,
+      SubscriptionsCache subscriptionsCache,
+      WorkloadProperties workloadProperties) {
+    return new ConsumersRuntimeMonitor(
+        consumerSupervisor,
+        workloadSupervisor,
+        metrics,
+        subscriptionsCache,
+        workloadProperties.getMonitorScanInterval());
+  }
 
-    @Bean
-    public ConsumerAssignmentRegistry consumerAssignmentRegistry(CuratorFramework curator,
-                                                                 WorkloadProperties workloadProperties,
-                                                                 KafkaClustersProperties kafkaClustersProperties,
-                                                                 ZookeeperPaths zookeeperPaths,
-                                                                 SubscriptionIds subscriptionIds,
-                                                                 DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        return new ConsumerAssignmentRegistry(
-                curator,
-                workloadProperties.getRegistryBinaryEncoderAssignmentsBufferSizeBytes(),
-                kafkaProperties.getClusterName(),
-                zookeeperPaths,
-                subscriptionIds);
-    }
+  @Bean
+  public ConsumerAssignmentRegistry consumerAssignmentRegistry(
+      CuratorFramework curator,
+      WorkloadProperties workloadProperties,
+      KafkaClustersProperties kafkaClustersProperties,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionIds subscriptionIds,
+      DatacenterNameProvider datacenterNameProvider) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    return new ConsumerAssignmentRegistry(
+        curator,
+        workloadProperties.getRegistryBinaryEncoderAssignmentsBufferSizeBytes(),
+        kafkaProperties.getClusterName(),
+        zookeeperPaths,
+        subscriptionIds);
+  }
 
-    @Bean
-    public ClusterAssignmentCache clusterAssignmentCache(CuratorFramework curator,
-                                                         KafkaClustersProperties kafkaClustersProperties,
-                                                         ZookeeperPaths zookeeperPaths,
-                                                         SubscriptionIds subscriptionIds,
-                                                         ConsumerNodesRegistry consumerNodesRegistry,
-                                                         DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        return new ClusterAssignmentCache(
-                curator,
-                kafkaProperties.getClusterName(),
-                zookeeperPaths,
-                subscriptionIds,
-                consumerNodesRegistry);
-    }
+  @Bean
+  public ClusterAssignmentCache clusterAssignmentCache(
+      CuratorFramework curator,
+      KafkaClustersProperties kafkaClustersProperties,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionIds subscriptionIds,
+      ConsumerNodesRegistry consumerNodesRegistry,
+      DatacenterNameProvider datacenterNameProvider) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    return new ClusterAssignmentCache(
+        curator,
+        kafkaProperties.getClusterName(),
+        zookeeperPaths,
+        subscriptionIds,
+        consumerNodesRegistry);
+  }
 
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    public ConsumerAssignmentCache consumerAssignmentCache(CuratorFramework curator,
-                                                           WorkloadProperties workloadProperties,
-                                                           KafkaClustersProperties kafkaClustersProperties,
-                                                           ZookeeperPaths zookeeperPaths,
-                                                           SubscriptionIds subscriptionIds,
-                                                           DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        return new ConsumerAssignmentCache(
-                curator,
-                workloadProperties.getNodeId(),
-                kafkaProperties.getClusterName(),
-                zookeeperPaths,
-                subscriptionIds);
-    }
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public ConsumerAssignmentCache consumerAssignmentCache(
+      CuratorFramework curator,
+      WorkloadProperties workloadProperties,
+      KafkaClustersProperties kafkaClustersProperties,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionIds subscriptionIds,
+      DatacenterNameProvider datacenterNameProvider) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    return new ConsumerAssignmentCache(
+        curator,
+        workloadProperties.getNodeId(),
+        kafkaProperties.getClusterName(),
+        zookeeperPaths,
+        subscriptionIds);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/WorkloadProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/WorkloadProperties.java
index 948bd932cb..559dbbfd6c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/WorkloadProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/WorkloadProperties.java
@@ -1,240 +1,249 @@
 package pl.allegro.tech.hermes.consumers.config;
 
+import static java.lang.Math.abs;
+import static java.util.UUID.randomUUID;
+
+import java.time.Duration;
+import java.util.Arrays;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 import pl.allegro.tech.hermes.common.util.InetAddressInstanceIdResolver;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkBalancingParameters;
 
-import java.time.Duration;
-import java.util.Arrays;
-
-import static java.lang.Math.abs;
-import static java.util.UUID.randomUUID;
-
 @ConfigurationProperties(prefix = "consumer.workload")
 public class WorkloadProperties implements WorkBalancingParameters {
 
-    private int registryBinaryEncoderAssignmentsBufferSizeBytes = 100_000;
+  private int registryBinaryEncoderAssignmentsBufferSizeBytes = 100_000;
 
-    private Duration rebalanceInterval = Duration.ofSeconds(30);
+  private Duration rebalanceInterval = Duration.ofSeconds(30);
 
-    private int consumersPerSubscription = 2;
+  private int consumersPerSubscription = 2;
 
-    private int maxSubscriptionsPerConsumer = 200;
+  private int maxSubscriptionsPerConsumer = 200;
 
-    private int assignmentProcessingThreadPoolSize = 5;
+  private int assignmentProcessingThreadPoolSize = 5;
 
-    private String nodeId =
-            new InetAddressInstanceIdResolver().resolve().replaceAll("\\.", "_") + "$" + abs(randomUUID().getMostSignificantBits());
+  private String nodeId =
+      new InetAddressInstanceIdResolver().resolve().replaceAll("\\.", "_")
+          + "$"
+          + abs(randomUUID().getMostSignificantBits());
 
-    private Duration monitorScanInterval = Duration.ofSeconds(120);
+  private Duration monitorScanInterval = Duration.ofSeconds(120);
 
-    private boolean autoRebalance = true;
+  private boolean autoRebalance = true;
 
-    private Duration deadAfter = Duration.ofSeconds(120);
+  private Duration deadAfter = Duration.ofSeconds(120);
 
-    private WorkBalancingStrategy workBalancingStrategy = WorkBalancingStrategy.SELECTIVE;
+  private WorkBalancingStrategy workBalancingStrategy = WorkBalancingStrategy.SELECTIVE;
 
-    @NestedConfigurationProperty
-    private WeightedWorkBalancingProperties weightedWorkBalancing = new WeightedWorkBalancingProperties();
+  @NestedConfigurationProperty
+  private WeightedWorkBalancingProperties weightedWorkBalancing =
+      new WeightedWorkBalancingProperties();
 
-    public int getRegistryBinaryEncoderAssignmentsBufferSizeBytes() {
-        return registryBinaryEncoderAssignmentsBufferSizeBytes;
-    }
+  public int getRegistryBinaryEncoderAssignmentsBufferSizeBytes() {
+    return registryBinaryEncoderAssignmentsBufferSizeBytes;
+  }
 
-    public void setRegistryBinaryEncoderAssignmentsBufferSizeBytes(int registryBinaryEncoderAssignmentsBufferSizeBytes) {
-        this.registryBinaryEncoderAssignmentsBufferSizeBytes = registryBinaryEncoderAssignmentsBufferSizeBytes;
-    }
+  public void setRegistryBinaryEncoderAssignmentsBufferSizeBytes(
+      int registryBinaryEncoderAssignmentsBufferSizeBytes) {
+    this.registryBinaryEncoderAssignmentsBufferSizeBytes =
+        registryBinaryEncoderAssignmentsBufferSizeBytes;
+  }
 
-    @Override
-    public Duration getRebalanceInterval() {
-        return rebalanceInterval;
-    }
+  @Override
+  public Duration getRebalanceInterval() {
+    return rebalanceInterval;
+  }
 
-    public void setRebalanceInterval(Duration rebalanceInterval) {
-        this.rebalanceInterval = rebalanceInterval;
-    }
+  public void setRebalanceInterval(Duration rebalanceInterval) {
+    this.rebalanceInterval = rebalanceInterval;
+  }
 
-    @Override
-    public int getConsumersPerSubscription() {
-        return consumersPerSubscription;
-    }
+  @Override
+  public int getConsumersPerSubscription() {
+    return consumersPerSubscription;
+  }
 
-    public void setConsumersPerSubscription(int consumersPerSubscription) {
-        this.consumersPerSubscription = consumersPerSubscription;
-    }
+  public void setConsumersPerSubscription(int consumersPerSubscription) {
+    this.consumersPerSubscription = consumersPerSubscription;
+  }
 
-    @Override
-    public int getMaxSubscriptionsPerConsumer() {
-        return maxSubscriptionsPerConsumer;
-    }
+  @Override
+  public int getMaxSubscriptionsPerConsumer() {
+    return maxSubscriptionsPerConsumer;
+  }
 
-    public void setMaxSubscriptionsPerConsumer(int maxSubscriptionsPerConsumer) {
-        this.maxSubscriptionsPerConsumer = maxSubscriptionsPerConsumer;
-    }
+  public void setMaxSubscriptionsPerConsumer(int maxSubscriptionsPerConsumer) {
+    this.maxSubscriptionsPerConsumer = maxSubscriptionsPerConsumer;
+  }
 
-    public int getAssignmentProcessingThreadPoolSize() {
-        return assignmentProcessingThreadPoolSize;
-    }
+  public int getAssignmentProcessingThreadPoolSize() {
+    return assignmentProcessingThreadPoolSize;
+  }
 
-    public void setAssignmentProcessingThreadPoolSize(int assignmentProcessingThreadPoolSize) {
-        this.assignmentProcessingThreadPoolSize = assignmentProcessingThreadPoolSize;
-    }
+  public void setAssignmentProcessingThreadPoolSize(int assignmentProcessingThreadPoolSize) {
+    this.assignmentProcessingThreadPoolSize = assignmentProcessingThreadPoolSize;
+  }
 
-    public String getNodeId() {
-        return nodeId;
-    }
+  public String getNodeId() {
+    return nodeId;
+  }
 
-    public void setNodeId(String nodeId) {
-        this.nodeId = nodeId;
-    }
+  public void setNodeId(String nodeId) {
+    this.nodeId = nodeId;
+  }
 
-    public Duration getMonitorScanInterval() {
-        return monitorScanInterval;
-    }
+  public Duration getMonitorScanInterval() {
+    return monitorScanInterval;
+  }
 
-    public void setMonitorScanInterval(Duration monitorScanInterval) {
-        this.monitorScanInterval = monitorScanInterval;
-    }
+  public void setMonitorScanInterval(Duration monitorScanInterval) {
+    this.monitorScanInterval = monitorScanInterval;
+  }
 
-    @Override
-    public boolean isAutoRebalance() {
-        return autoRebalance;
-    }
+  @Override
+  public boolean isAutoRebalance() {
+    return autoRebalance;
+  }
 
-    public void setAutoRebalance(boolean autoRebalance) {
-        this.autoRebalance = autoRebalance;
-    }
+  public void setAutoRebalance(boolean autoRebalance) {
+    this.autoRebalance = autoRebalance;
+  }
 
-    public Duration getDeadAfter() {
-        return deadAfter;
-    }
+  public Duration getDeadAfter() {
+    return deadAfter;
+  }
 
-    public void setDeadAfter(Duration deadAfter) {
-        this.deadAfter = deadAfter;
-    }
+  public void setDeadAfter(Duration deadAfter) {
+    this.deadAfter = deadAfter;
+  }
 
-    public WorkBalancingStrategy getWorkBalancingStrategy() {
-        return workBalancingStrategy;
-    }
+  public WorkBalancingStrategy getWorkBalancingStrategy() {
+    return workBalancingStrategy;
+  }
 
-    public void setWorkBalancingStrategy(WorkBalancingStrategy workBalancingStrategy) {
-        this.workBalancingStrategy = workBalancingStrategy;
-    }
+  public void setWorkBalancingStrategy(WorkBalancingStrategy workBalancingStrategy) {
+    this.workBalancingStrategy = workBalancingStrategy;
+  }
 
-    public WeightedWorkBalancingProperties getWeightedWorkBalancing() {
-        return weightedWorkBalancing;
-    }
+  public WeightedWorkBalancingProperties getWeightedWorkBalancing() {
+    return weightedWorkBalancing;
+  }
 
-    public void setWeightedWorkBalancing(WeightedWorkBalancingProperties weightedWorkBalancing) {
-        this.weightedWorkBalancing = weightedWorkBalancing;
-    }
+  public void setWeightedWorkBalancing(WeightedWorkBalancingProperties weightedWorkBalancing) {
+    this.weightedWorkBalancing = weightedWorkBalancing;
+  }
 
-    public static class WeightedWorkBalancingProperties {
+  public static class WeightedWorkBalancingProperties {
 
-        private int consumerLoadEncoderBufferSizeBytes = 100_000;
+    private int consumerLoadEncoderBufferSizeBytes = 100_000;
 
-        private int subscriptionProfilesEncoderBufferSizeBytes = 100_000;
+    private int subscriptionProfilesEncoderBufferSizeBytes = 100_000;
 
-        private Duration loadReportingInterval = Duration.ofMinutes(1);
+    private Duration loadReportingInterval = Duration.ofMinutes(1);
 
-        private Duration stabilizationWindowSize = Duration.ofMinutes(30);
+    private Duration stabilizationWindowSize = Duration.ofMinutes(30);
 
-        private double minSignificantChangePercent = 5;
+    private double minSignificantChangePercent = 5;
 
-        private Duration weightWindowSize = Duration.ofMinutes(15);
+    private Duration weightWindowSize = Duration.ofMinutes(15);
 
-        private TargetWeightCalculationStrategy targetWeightCalculationStrategy = TargetWeightCalculationStrategy.AVG;
+    private TargetWeightCalculationStrategy targetWeightCalculationStrategy =
+        TargetWeightCalculationStrategy.AVG;
 
-        private double scoringGain = 1.0d;
+    private double scoringGain = 1.0d;
 
-        public int getConsumerLoadEncoderBufferSizeBytes() {
-            return consumerLoadEncoderBufferSizeBytes;
-        }
+    public int getConsumerLoadEncoderBufferSizeBytes() {
+      return consumerLoadEncoderBufferSizeBytes;
+    }
 
-        public void setConsumerLoadEncoderBufferSizeBytes(int consumerLoadEncoderBufferSizeBytes) {
-            this.consumerLoadEncoderBufferSizeBytes = consumerLoadEncoderBufferSizeBytes;
-        }
+    public void setConsumerLoadEncoderBufferSizeBytes(int consumerLoadEncoderBufferSizeBytes) {
+      this.consumerLoadEncoderBufferSizeBytes = consumerLoadEncoderBufferSizeBytes;
+    }
 
-        public int getSubscriptionProfilesEncoderBufferSizeBytes() {
-            return subscriptionProfilesEncoderBufferSizeBytes;
-        }
+    public int getSubscriptionProfilesEncoderBufferSizeBytes() {
+      return subscriptionProfilesEncoderBufferSizeBytes;
+    }
 
-        public void setSubscriptionProfilesEncoderBufferSizeBytes(int subscriptionProfilesEncoderBufferSizeBytes) {
-            this.subscriptionProfilesEncoderBufferSizeBytes = subscriptionProfilesEncoderBufferSizeBytes;
-        }
+    public void setSubscriptionProfilesEncoderBufferSizeBytes(
+        int subscriptionProfilesEncoderBufferSizeBytes) {
+      this.subscriptionProfilesEncoderBufferSizeBytes = subscriptionProfilesEncoderBufferSizeBytes;
+    }
 
-        public Duration getLoadReportingInterval() {
-            return loadReportingInterval;
-        }
+    public Duration getLoadReportingInterval() {
+      return loadReportingInterval;
+    }
 
-        public void setLoadReportingInterval(Duration loadReportingInterval) {
-            this.loadReportingInterval = loadReportingInterval;
-        }
+    public void setLoadReportingInterval(Duration loadReportingInterval) {
+      this.loadReportingInterval = loadReportingInterval;
+    }
 
-        public Duration getStabilizationWindowSize() {
-            return stabilizationWindowSize;
-        }
+    public Duration getStabilizationWindowSize() {
+      return stabilizationWindowSize;
+    }
 
-        public void setStabilizationWindowSize(Duration stabilizationWindowSize) {
-            this.stabilizationWindowSize = stabilizationWindowSize;
-        }
+    public void setStabilizationWindowSize(Duration stabilizationWindowSize) {
+      this.stabilizationWindowSize = stabilizationWindowSize;
+    }
 
-        public double getMinSignificantChangePercent() {
-            return minSignificantChangePercent;
-        }
+    public double getMinSignificantChangePercent() {
+      return minSignificantChangePercent;
+    }
 
-        public void setMinSignificantChangePercent(double minSignificantChangePercent) {
-            this.minSignificantChangePercent = minSignificantChangePercent;
-        }
+    public void setMinSignificantChangePercent(double minSignificantChangePercent) {
+      this.minSignificantChangePercent = minSignificantChangePercent;
+    }
 
-        public Duration getWeightWindowSize() {
-            return weightWindowSize;
-        }
+    public Duration getWeightWindowSize() {
+      return weightWindowSize;
+    }
 
-        public void setWeightWindowSize(Duration weightWindowSize) {
-            this.weightWindowSize = weightWindowSize;
-        }
+    public void setWeightWindowSize(Duration weightWindowSize) {
+      this.weightWindowSize = weightWindowSize;
+    }
 
-        public TargetWeightCalculationStrategy getTargetWeightCalculationStrategy() {
-            return targetWeightCalculationStrategy;
-        }
+    public TargetWeightCalculationStrategy getTargetWeightCalculationStrategy() {
+      return targetWeightCalculationStrategy;
+    }
 
-        public void setTargetWeightCalculationStrategy(TargetWeightCalculationStrategy targetWeightCalculationStrategy) {
-            this.targetWeightCalculationStrategy = targetWeightCalculationStrategy;
-        }
+    public void setTargetWeightCalculationStrategy(
+        TargetWeightCalculationStrategy targetWeightCalculationStrategy) {
+      this.targetWeightCalculationStrategy = targetWeightCalculationStrategy;
+    }
 
-        public double getScoringGain() {
-            return scoringGain;
-        }
+    public double getScoringGain() {
+      return scoringGain;
+    }
 
-        public void setScoringGain(double scoringGain) {
-            this.scoringGain = scoringGain;
-        }
+    public void setScoringGain(double scoringGain) {
+      this.scoringGain = scoringGain;
     }
+  }
 
-    public enum WorkBalancingStrategy {
-        SELECTIVE,
-        WEIGHTED;
+  public enum WorkBalancingStrategy {
+    SELECTIVE,
+    WEIGHTED;
 
-        public static class UnknownWorkBalancingStrategyException extends InternalProcessingException {
+    public static class UnknownWorkBalancingStrategyException extends InternalProcessingException {
 
-            public UnknownWorkBalancingStrategyException() {
-                super("Unknown work balancing strategy. Use one of: " + Arrays.toString(values()));
-            }
-        }
+      public UnknownWorkBalancingStrategyException() {
+        super("Unknown work balancing strategy. Use one of: " + Arrays.toString(values()));
+      }
     }
+  }
 
-    public enum TargetWeightCalculationStrategy {
-        AVG,
-        SCORING;
+  public enum TargetWeightCalculationStrategy {
+    AVG,
+    SCORING;
 
-        public static class UnknownTargetWeightCalculationStrategyException extends InternalProcessingException {
+    public static class UnknownTargetWeightCalculationStrategyException
+        extends InternalProcessingException {
 
-            public UnknownTargetWeightCalculationStrategyException() {
-                super("Unknown target weight calculation strategy. Use one of: " + Arrays.toString(values()));
-            }
-        }
+      public UnknownTargetWeightCalculationStrategyException() {
+        super(
+            "Unknown target weight calculation strategy. Use one of: " + Arrays.toString(values()));
+      }
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ZookeeperClustersProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ZookeeperClustersProperties.java
index f79f48e8d0..7e0f2d8019 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ZookeeperClustersProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ZookeeperClustersProperties.java
@@ -1,30 +1,33 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
 
 @ConfigurationProperties(prefix = "consumer.zookeeper")
 public class ZookeeperClustersProperties {
 
-    private List<ZookeeperProperties> clusters = new ArrayList<>();
+  private List<ZookeeperProperties> clusters = new ArrayList<>();
 
-    public List<ZookeeperProperties> getClusters() {
-        return clusters;
-    }
+  public List<ZookeeperProperties> getClusters() {
+    return clusters;
+  }
 
-    public void setClusters(List<ZookeeperProperties> clusters) {
-        this.clusters = clusters;
-    }
+  public void setClusters(List<ZookeeperProperties> clusters) {
+    this.clusters = clusters;
+  }
 
-    public ZookeeperProperties toZookeeperProperties(DatacenterNameProvider datacenterNameProvider) {
-        return this.clusters
-                .stream()
-                .filter(cluster -> cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException(
-                        "No properties for datacenter: " + datacenterNameProvider.getDatacenterName() + " defined."));
-    }
+  public ZookeeperProperties toZookeeperProperties(DatacenterNameProvider datacenterNameProvider) {
+    return this.clusters.stream()
+        .filter(
+            cluster -> cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "No properties for datacenter: "
+                        + datacenterNameProvider.getDatacenterName()
+                        + " defined."));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ZookeeperProperties.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ZookeeperProperties.java
index cbeabac595..5fb8b2f714 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ZookeeperProperties.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ZookeeperProperties.java
@@ -1,179 +1,178 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import pl.allegro.tech.hermes.common.di.factories.ZookeeperParameters;
-
 import java.time.Duration;
+import pl.allegro.tech.hermes.common.di.factories.ZookeeperParameters;
 
 public class ZookeeperProperties implements ZookeeperParameters {
 
-    private String connectionString = "localhost:2181";
+  private String connectionString = "localhost:2181";
 
-    private String datacenter = "dc";
+  private String datacenter = "dc";
 
-    private Duration baseSleepTime = Duration.ofSeconds(1000);
+  private Duration baseSleepTime = Duration.ofSeconds(1000);
 
-    private Duration maxSleepTime = Duration.ofSeconds(30);
+  private Duration maxSleepTime = Duration.ofSeconds(30);
 
-    private int maxRetries = 29;
+  private int maxRetries = 29;
 
-    private Duration connectionTimeout = Duration.ofSeconds(10);
+  private Duration connectionTimeout = Duration.ofSeconds(10);
 
-    private Duration sessionTimeout = Duration.ofSeconds(10);
+  private Duration sessionTimeout = Duration.ofSeconds(10);
 
-    private String root = "/hermes";
+  private String root = "/hermes";
 
-    private int processingThreadPoolSize = 5;
+  private int processingThreadPoolSize = 5;
 
-    private ZookeeperAuthorizationProperties authorization = new ZookeeperAuthorizationProperties();
+  private ZookeeperAuthorizationProperties authorization = new ZookeeperAuthorizationProperties();
 
-    @Override
-    public String getConnectionString() {
-        return connectionString;
-    }
+  @Override
+  public String getConnectionString() {
+    return connectionString;
+  }
 
-    public void setConnectionString(String connectionString) {
-        this.connectionString = connectionString;
-    }
+  public void setConnectionString(String connectionString) {
+    this.connectionString = connectionString;
+  }
 
-    public String getDatacenter() {
-        return datacenter;
-    }
+  public String getDatacenter() {
+    return datacenter;
+  }
 
-    public void setDatacenter(String datacenter) {
-        this.datacenter = datacenter;
-    }
+  public void setDatacenter(String datacenter) {
+    this.datacenter = datacenter;
+  }
 
-    @Override
-    public Duration getBaseSleepTime() {
-        return baseSleepTime;
-    }
+  @Override
+  public Duration getBaseSleepTime() {
+    return baseSleepTime;
+  }
 
-    public void setBaseSleepTime(Duration baseSleepTime) {
-        this.baseSleepTime = baseSleepTime;
-    }
+  public void setBaseSleepTime(Duration baseSleepTime) {
+    this.baseSleepTime = baseSleepTime;
+  }
 
-    @Override
-    public Duration getMaxSleepTime() {
-        return maxSleepTime;
-    }
+  @Override
+  public Duration getMaxSleepTime() {
+    return maxSleepTime;
+  }
 
-    public void setMaxSleepTime(Duration maxSleepTime) {
-        this.maxSleepTime = maxSleepTime;
-    }
+  public void setMaxSleepTime(Duration maxSleepTime) {
+    this.maxSleepTime = maxSleepTime;
+  }
 
-    @Override
-    public int getMaxRetries() {
-        return maxRetries;
-    }
+  @Override
+  public int getMaxRetries() {
+    return maxRetries;
+  }
 
-    public void setMaxRetries(int maxRetries) {
-        this.maxRetries = maxRetries;
-    }
+  public void setMaxRetries(int maxRetries) {
+    this.maxRetries = maxRetries;
+  }
 
-    @Override
-    public Duration getConnectionTimeout() {
-        return connectionTimeout;
-    }
+  @Override
+  public Duration getConnectionTimeout() {
+    return connectionTimeout;
+  }
 
-    public void setConnectionTimeout(Duration connectionTimeout) {
-        this.connectionTimeout = connectionTimeout;
-    }
+  public void setConnectionTimeout(Duration connectionTimeout) {
+    this.connectionTimeout = connectionTimeout;
+  }
 
-    @Override
-    public Duration getSessionTimeout() {
-        return sessionTimeout;
-    }
+  @Override
+  public Duration getSessionTimeout() {
+    return sessionTimeout;
+  }
 
-    public void setSessionTimeout(Duration sessionTimeout) {
-        this.sessionTimeout = sessionTimeout;
-    }
+  public void setSessionTimeout(Duration sessionTimeout) {
+    this.sessionTimeout = sessionTimeout;
+  }
 
-    @Override
-    public String getRoot() {
-        return root;
-    }
+  @Override
+  public String getRoot() {
+    return root;
+  }
 
-    public void setRoot(String root) {
-        this.root = root;
-    }
+  public void setRoot(String root) {
+    this.root = root;
+  }
 
-    @Override
-    public int getProcessingThreadPoolSize() {
-        return processingThreadPoolSize;
-    }
+  @Override
+  public int getProcessingThreadPoolSize() {
+    return processingThreadPoolSize;
+  }
 
-    @Override
-    public boolean isAuthorizationEnabled() {
-        return authorization.enabled;
-    }
+  @Override
+  public boolean isAuthorizationEnabled() {
+    return authorization.enabled;
+  }
 
-    @Override
-    public String getScheme() {
-        return authorization.scheme;
-    }
+  @Override
+  public String getScheme() {
+    return authorization.scheme;
+  }
 
-    @Override
-    public String getUser() {
-        return authorization.user;
-    }
+  @Override
+  public String getUser() {
+    return authorization.user;
+  }
 
-    @Override
-    public String getPassword() {
-        return authorization.password;
-    }
+  @Override
+  public String getPassword() {
+    return authorization.password;
+  }
 
-    public void setProcessingThreadPoolSize(int processingThreadPoolSize) {
-        this.processingThreadPoolSize = processingThreadPoolSize;
-    }
+  public void setProcessingThreadPoolSize(int processingThreadPoolSize) {
+    this.processingThreadPoolSize = processingThreadPoolSize;
+  }
 
-    public ZookeeperAuthorizationProperties getAuthorization() {
-        return authorization;
-    }
+  public ZookeeperAuthorizationProperties getAuthorization() {
+    return authorization;
+  }
 
-    public void setAuthorization(ZookeeperAuthorizationProperties authorization) {
-        this.authorization = authorization;
-    }
+  public void setAuthorization(ZookeeperAuthorizationProperties authorization) {
+    this.authorization = authorization;
+  }
 
-    public static class ZookeeperAuthorizationProperties {
+  public static class ZookeeperAuthorizationProperties {
 
-        private boolean enabled = false;
+    private boolean enabled = false;
 
-        private String scheme = "digest";
+    private String scheme = "digest";
 
-        private String user = "user";
+    private String user = "user";
 
-        private String password = "password";
+    private String password = "password";
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+    public boolean isEnabled() {
+      return enabled;
+    }
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
 
-        public String getScheme() {
-            return scheme;
-        }
+    public String getScheme() {
+      return scheme;
+    }
 
-        public void setScheme(String scheme) {
-            this.scheme = scheme;
-        }
+    public void setScheme(String scheme) {
+      this.scheme = scheme;
+    }
 
-        public String getUser() {
-            return user;
-        }
+    public String getUser() {
+      return user;
+    }
 
-        public void setUser(String user) {
-            this.user = user;
-        }
+    public void setUser(String user) {
+      this.user = user;
+    }
 
-        public String getPassword() {
-            return password;
-        }
+    public String getPassword() {
+      return password;
+    }
 
-        public void setPassword(String password) {
-            this.password = password;
-        }
+    public void setPassword(String password) {
+      this.password = password;
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/BatchConsumer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/BatchConsumer.java
index 9ef73b023b..9f73598e31 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/BatchConsumer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/BatchConsumer.java
@@ -1,9 +1,22 @@
 package pl.allegro.tech.hermes.consumers.consumer;
 
+import static com.github.rholder.retry.WaitStrategies.fixedWait;
+import static java.util.Optional.of;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import com.github.rholder.retry.Attempt;
 import com.github.rholder.retry.RetryListener;
 import com.github.rholder.retry.Retryer;
 import com.github.rholder.retry.RetryerBuilder;
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.BatchSubscriptionPolicy;
@@ -18,7 +31,7 @@
 import pl.allegro.tech.hermes.consumers.consumer.batch.MessageBatchingResult;
 import pl.allegro.tech.hermes.consumers.consumer.converter.MessageConverterResolver;
 import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecorder;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
+import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartition;
 import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
 import pl.allegro.tech.hermes.consumers.consumer.rate.BatchConsumerRateLimiter;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.MessageReceiver;
@@ -28,260 +41,318 @@
 import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.io.IOException;
-import java.util.Optional;
-import java.util.Set;
-
-import static com.github.rholder.retry.WaitStrategies.fixedWait;
-import static java.util.Optional.of;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 public class BatchConsumer implements Consumer {
 
-    private static final Logger logger = LoggerFactory.getLogger(BatchConsumer.class);
-
-    private final ReceiverFactory messageReceiverFactory;
-    private final MessageBatchSender sender;
-    private final MessageBatchFactory batchFactory;
-    private final boolean useTopicMessageSize;
-    private final MessageConverterResolver messageConverterResolver;
-    private final CompositeMessageContentWrapper compositeMessageContentWrapper;
-    private final Trackers trackers;
-    private final SubscriptionLoadRecorder loadRecorder;
-
-    private Topic topic;
-    private final OffsetQueue offsetQueue;
-    private Subscription subscription;
-
-    private volatile boolean consuming = true;
-
-    private final MetricsFacade metricsFacade;
-    private final BatchConsumerMetrics metrics;
-    private MessageBatchReceiver receiver;
-
-    public BatchConsumer(ReceiverFactory messageReceiverFactory,
-                         MessageBatchSender sender,
-                         MessageBatchFactory batchFactory,
-                         OffsetQueue offsetQueue,
-                         MessageConverterResolver messageConverterResolver,
-                         CompositeMessageContentWrapper compositeMessageContentWrapper,
-                         MetricsFacade metricsFacade,
-                         Trackers trackers,
-                         Subscription subscription,
-                         Topic topic,
-                         boolean useTopicMessageSize,
-                         SubscriptionLoadRecorder loadRecorder) {
-        this.messageReceiverFactory = messageReceiverFactory;
-        this.sender = sender;
-        this.batchFactory = batchFactory;
-        this.offsetQueue = offsetQueue;
-        this.subscription = subscription;
-        this.useTopicMessageSize = useTopicMessageSize;
-        this.loadRecorder = loadRecorder;
-        this.metricsFacade = metricsFacade;
-        this.metrics = new BatchConsumerMetrics(metricsFacade, subscription.getQualifiedName());
-        this.messageConverterResolver = messageConverterResolver;
-        this.compositeMessageContentWrapper = compositeMessageContentWrapper;
-        this.topic = topic;
-        this.trackers = trackers;
-    }
-
-    @Override
-    public void consume(Runnable signalsInterrupt) {
-        Optional<MessageBatch> inflight = Optional.empty();
-        try {
-            logger.debug("Trying to create new batch [subscription={}].", subscription.getQualifiedName());
-
-            signalsInterrupt.run();
-
-            MessageBatchingResult result = receiver.next(subscription, signalsInterrupt);
-            inflight = of(result.getBatch());
-
-            inflight.ifPresent(batch -> {
-                logger.debug("Delivering batch [subscription={}].", subscription.getQualifiedName());
-                offerInflightOffsets(batch);
-
-                deliver(signalsInterrupt, batch, createRetryer(batch, subscription.getBatchSubscriptionPolicy()));
-
-                offerCommittedOffsets(batch);
-                logger.debug("Finished delivering batch [subscription={}]", subscription.getQualifiedName());
-            });
-
-            result.getDiscarded().forEach(m -> {
+  private static final Logger logger = LoggerFactory.getLogger(BatchConsumer.class);
+
+  private final ReceiverFactory messageReceiverFactory;
+  private final MessageBatchSender sender;
+  private final MessageBatchFactory batchFactory;
+  private final boolean useTopicMessageSize;
+  private final MessageConverterResolver messageConverterResolver;
+  private final CompositeMessageContentWrapper compositeMessageContentWrapper;
+  private final Trackers trackers;
+  private final SubscriptionLoadRecorder loadRecorder;
+  private final Duration commitPeriod;
+
+  private Topic topic;
+  private Subscription subscription;
+
+  private volatile boolean consuming = true;
+
+  private final MetricsFacade metricsFacade;
+  private final BatchConsumerMetrics metrics;
+  private MessageBatchReceiver receiver;
+
+  private final Map<SubscriptionPartition, Long> maxPendingOffsets = new HashMap<>();
+
+  private Instant lastCommitTime;
+
+  public BatchConsumer(
+      ReceiverFactory messageReceiverFactory,
+      MessageBatchSender sender,
+      MessageBatchFactory batchFactory,
+      MessageConverterResolver messageConverterResolver,
+      CompositeMessageContentWrapper compositeMessageContentWrapper,
+      MetricsFacade metricsFacade,
+      Trackers trackers,
+      Subscription subscription,
+      Topic topic,
+      boolean useTopicMessageSize,
+      SubscriptionLoadRecorder loadRecorder,
+      Duration commitPeriod) {
+    this.messageReceiverFactory = messageReceiverFactory;
+    this.sender = sender;
+    this.batchFactory = batchFactory;
+    this.subscription = subscription;
+    this.useTopicMessageSize = useTopicMessageSize;
+    this.loadRecorder = loadRecorder;
+    this.metricsFacade = metricsFacade;
+    this.metrics = new BatchConsumerMetrics(metricsFacade, subscription.getQualifiedName());
+    this.messageConverterResolver = messageConverterResolver;
+    this.compositeMessageContentWrapper = compositeMessageContentWrapper;
+    this.topic = topic;
+    this.trackers = trackers;
+    this.commitPeriod = commitPeriod;
+    this.lastCommitTime = Instant.now();
+  }
+
+  @Override
+  public void consume(Runnable signalsInterrupt) {
+    Optional<MessageBatch> inflight = Optional.empty();
+    try {
+      logger.debug(
+          "Trying to create new batch [subscription={}].", subscription.getQualifiedName());
+
+      signalsInterrupt.run();
+      commitIfReady();
+
+      MessageBatchingResult result = receiver.next(subscription, signalsInterrupt);
+      inflight = of(result.getBatch());
+
+      inflight.ifPresent(
+          batch -> {
+            logger.debug("Delivering batch [subscription={}].", subscription.getQualifiedName());
+
+            deliver(
+                signalsInterrupt,
+                batch,
+                createRetryer(batch, subscription.getBatchSubscriptionPolicy()));
+
+            offerProcessedOffsets(batch);
+            logger.debug(
+                "Finished delivering batch [subscription={}]", subscription.getQualifiedName());
+          });
+
+      result
+          .getDiscarded()
+          .forEach(
+              m -> {
                 metrics.markDiscarded();
                 trackers.get(subscription).logDiscarded(m, "too large");
-            });
-        } finally {
-            logger.debug("Cleaning batch [subscription={}]", subscription.getQualifiedName());
-            inflight.ifPresent(this::clean);
-        }
+              });
+    } finally {
+      logger.debug("Cleaning batch [subscription={}]", subscription.getQualifiedName());
+      inflight.ifPresent(this::clean);
     }
+  }
 
-    private void offerInflightOffsets(MessageBatch batch) {
-        batch.getPartitionOffsets().forEach(offsetQueue::offerInflightOffset);
-    }
+  private void commitIfReady() {
+    if (isReadyToCommit()) {
+      Set<SubscriptionPartitionOffset> offsetsToCommit = new HashSet<>();
 
-    private void offerCommittedOffsets(MessageBatch batch) {
-        batch.getPartitionOffsets().forEach(offsetQueue::offerCommittedOffset);
-    }
+      for (Map.Entry<SubscriptionPartition, Long> entry : maxPendingOffsets.entrySet()) {
+        offsetsToCommit.add(new SubscriptionPartitionOffset(entry.getKey(), entry.getValue()));
+      }
 
-    @Override
-    public void initialize() {
-        loadRecorder.initialize();
-        logger.debug("Consumer: preparing receiver for subscription {}", subscription.getQualifiedName());
-        MessageReceiver receiver = messageReceiverFactory.createMessageReceiver(
-                topic,
-                subscription,
-                new BatchConsumerRateLimiter(),
-                loadRecorder,
-                metricsFacade
-        );
-
-        logger.debug("Consumer: preparing batch receiver for subscription {}", subscription.getQualifiedName());
-        this.receiver = new MessageBatchReceiver(
-                receiver,
-                batchFactory,
-                messageConverterResolver,
-                compositeMessageContentWrapper,
-                topic,
-                trackers,
-                loadRecorder
-        );
-        metrics.initialize();
+      if (!offsetsToCommit.isEmpty()) {
+        commit(offsetsToCommit);
+      }
+      maxPendingOffsets.clear();
+      lastCommitTime = Instant.now();
     }
+  }
 
-    @Override
-    public void tearDown() {
-        consuming = false;
-        if (receiver != null) {
-            receiver.stop();
-        } else {
-            logger.info("No batch receiver to stop [subscription={}].", subscription.getQualifiedName());
-        }
-        loadRecorder.shutdown();
-        metrics.shutdown();
-    }
-
-    @Override
-    public void updateSubscription(Subscription subscription) {
-        this.subscription = subscription;
-    }
+  private boolean isReadyToCommit() {
+    return Duration.between(lastCommitTime, Instant.now()).toMillis() > commitPeriod.toMillis();
+  }
 
-    @Override
-    public void updateTopic(Topic newTopic) {
-        if (this.topic.getContentType() != newTopic.getContentType() || messageSizeChanged(newTopic)) {
-            logger.info("Reinitializing message receiver, contentType or messageSize changed.");
-            this.topic = newTopic;
-            tearDown();
-            initialize();
-        }
+  private void offerProcessedOffsets(MessageBatch batch) {
+    for (SubscriptionPartitionOffset offset : batch.getPartitionOffsets()) {
+      putOffset(offset);
     }
-
-    private boolean messageSizeChanged(Topic newTopic) {
-        return this.topic.getMaxMessageSize() != newTopic.getMaxMessageSize()
-                && useTopicMessageSize;
+  }
+
+  private void putOffset(SubscriptionPartitionOffset offset) {
+    maxPendingOffsets.compute(
+        offset.getSubscriptionPartition(),
+        (subscriptionPartition, maxOffset) ->
+            maxOffset == null ? offset.getOffset() : Math.max(maxOffset, offset.getOffset()));
+  }
+
+  @Override
+  public void initialize() {
+    loadRecorder.initialize();
+    logger.debug(
+        "Consumer: preparing receiver for subscription {}", subscription.getQualifiedName());
+    MessageReceiver receiver =
+        messageReceiverFactory.createMessageReceiver(
+            topic,
+            subscription,
+            new BatchConsumerRateLimiter(),
+            loadRecorder,
+            metricsFacade,
+            this::putOffset);
+
+    logger.debug(
+        "Consumer: preparing batch receiver for subscription {}", subscription.getQualifiedName());
+    this.receiver =
+        new MessageBatchReceiver(
+            receiver,
+            batchFactory,
+            messageConverterResolver,
+            compositeMessageContentWrapper,
+            topic,
+            trackers,
+            loadRecorder,
+            this::commitIfReady);
+    metrics.initialize();
+  }
+
+  @Override
+  public void tearDown() {
+    consuming = false;
+    if (receiver != null) {
+      receiver.stop();
+    } else {
+      logger.info("No batch receiver to stop [subscription={}].", subscription.getQualifiedName());
     }
-
-    @Override
-    public void commit(Set<SubscriptionPartitionOffset> offsetsToCommit) {
-        if (receiver != null) {
-            receiver.commit(offsetsToCommit);
-        }
+    loadRecorder.shutdown();
+    metrics.shutdown();
+  }
+
+  @Override
+  public void updateSubscription(Subscription subscription) {
+    this.subscription = subscription;
+    receiver.updateSubscription(subscription);
+  }
+
+  @Override
+  public void updateTopic(Topic newTopic) {
+    if (this.topic.getContentType() != newTopic.getContentType() || messageSizeChanged(newTopic)) {
+      logger.info("Reinitializing message receiver, contentType or messageSize changed.");
+      this.topic = newTopic;
+      tearDown();
+      initialize();
     }
+  }
 
-    @Override
-    public boolean moveOffset(PartitionOffset partitionOffset) {
-        if (receiver != null) {
-            return receiver.moveOffset(partitionOffset);
-        }
-        return false;
-    }
+  private boolean messageSizeChanged(Topic newTopic) {
+    return this.topic.getMaxMessageSize() != newTopic.getMaxMessageSize() && useTopicMessageSize;
+  }
 
-    @Override
-    public Subscription getSubscription() {
-        return subscription;
+  @Override
+  public void commit(Set<SubscriptionPartitionOffset> offsetsToCommit) {
+    if (receiver != null) {
+      receiver.commit(offsetsToCommit);
     }
+  }
 
-    private Retryer<MessageSendingResult> createRetryer(MessageBatch batch, BatchSubscriptionPolicy policy) {
-        return createRetryer(batch,
-                policy.getMessageBackoff(),
-                SECONDS.toMillis(policy.getMessageTtl()),
-                policy.isRetryClientErrors());
+  @Override
+  public boolean moveOffset(PartitionOffset partitionOffset) {
+    if (receiver != null) {
+      return receiver.moveOffset(partitionOffset);
     }
-
-    private Retryer<MessageSendingResult> createRetryer(final MessageBatch batch,
-                                                        int messageBackoff,
-                                                        long messageTtlMillis,
-                                                        boolean retryClientErrors) {
-        return RetryerBuilder.<MessageSendingResult>newBuilder()
-                .retryIfExceptionOfType(IOException.class)
-                .retryIfRuntimeException()
-                .retryIfResult(result -> consuming && !result.succeeded() && shouldRetryOnClientError(retryClientErrors, result))
-                .withWaitStrategy(fixedWait(messageBackoff, MILLISECONDS))
-                .withStopStrategy(attempt -> attempt.getDelaySinceFirstAttempt() > messageTtlMillis
-                        || Thread.currentThread().isInterrupted())
-                .withRetryListener(getRetryListener(result -> {
-                    batch.incrementRetryCounter();
-                    markSendingResult(batch, result);
+    return false;
+  }
+
+  @Override
+  public Subscription getSubscription() {
+    return subscription;
+  }
+
+  private Retryer<MessageSendingResult> createRetryer(
+      MessageBatch batch, BatchSubscriptionPolicy policy) {
+    return createRetryer(
+        batch,
+        policy.getMessageBackoff(),
+        SECONDS.toMillis(policy.getMessageTtl()),
+        policy.isRetryClientErrors());
+  }
+
+  private Retryer<MessageSendingResult> createRetryer(
+      final MessageBatch batch,
+      int messageBackoff,
+      long messageTtlMillis,
+      boolean retryClientErrors) {
+    return RetryerBuilder.<MessageSendingResult>newBuilder()
+        .retryIfExceptionOfType(IOException.class)
+        .retryIfRuntimeException()
+        .retryIfResult(
+            result ->
+                consuming
+                    && !result.succeeded()
+                    && shouldRetryOnClientError(retryClientErrors, result))
+        .withWaitStrategy(fixedWait(messageBackoff, MILLISECONDS))
+        .withStopStrategy(
+            attempt ->
+                attempt.getDelaySinceFirstAttempt() > messageTtlMillis
+                    || Thread.currentThread().isInterrupted())
+        .withRetryListener(
+            getRetryListener(
+                result -> {
+                  batch.incrementRetryCounter();
+                  markSendingResult(batch, result);
                 }))
-                .build();
+        .build();
+  }
+
+  private void markSendingResult(MessageBatch batch, MessageSendingResult result) {
+    if (result.succeeded()) {
+      metrics.recordAttemptAsFinished(batch.getMessageCount());
+      metrics.markSuccess(batch, result);
+      batch
+          .getMessagesMetadata()
+          .forEach(m -> trackers.get(subscription).logSent(m, result.getHostname()));
+    } else {
+      metrics.markFailure(batch, result);
+      batch
+          .getMessagesMetadata()
+          .forEach(
+              m ->
+                  trackers
+                      .get(subscription)
+                      .logFailed(m, result.getRootCause(), result.getHostname()));
     }
-
-    private void markSendingResult(MessageBatch batch, MessageSendingResult result) {
-        if (result.succeeded()) {
-            metrics.recordAttemptAsFinished(batch.getMessageCount());
-            metrics.markSuccess(batch, result);
-            batch.getMessagesMetadata().forEach(
-                    m -> trackers.get(subscription).logSent(m, result.getHostname())
-            );
-        } else {
-            metrics.markFailure(batch, result);
-            batch.getMessagesMetadata().forEach(
-                    m -> trackers.get(subscription).logFailed(m, result.getRootCause(), result.getHostname())
-            );
-        }
-    }
-
-    private boolean shouldRetryOnClientError(boolean retryClientErrors, MessageSendingResult result) {
-        return !result.isClientError() || retryClientErrors;
+  }
+
+  private boolean shouldRetryOnClientError(boolean retryClientErrors, MessageSendingResult result) {
+    return !result.isClientError() || retryClientErrors;
+  }
+
+  private void deliver(
+      Runnable signalsInterrupt, MessageBatch batch, Retryer<MessageSendingResult> retryer) {
+    metrics.recordAttempt(batch.getMessageCount());
+    try (HermesTimerContext ignored = metrics.latencyTimer().time()) {
+      retryer.call(
+          () -> {
+            loadRecorder.recordSingleOperation();
+            signalsInterrupt.run();
+            return sender.send(
+                batch,
+                subscription.getEndpoint(),
+                subscription.getEndpointAddressResolverMetadata(),
+                subscription.getBatchSubscriptionPolicy().getRequestTimeout());
+          });
+    } catch (Exception e) {
+      logger.error(
+          "Batch was rejected [batch_id={}, subscription={}].",
+          batch.getId(),
+          subscription.getQualifiedName(),
+          e);
+      metrics.recordAttemptAsFinished(batch.getMessageCount());
+      metrics.markDiscarded(batch);
+      batch
+          .getMessagesMetadata()
+          .forEach(m -> trackers.get(subscription).logDiscarded(m, e.getMessage()));
     }
-
-    private void deliver(Runnable signalsInterrupt, MessageBatch batch, Retryer<MessageSendingResult> retryer) {
-        metrics.recordAttempt(batch.getMessageCount());
-        try (HermesTimerContext ignored = metrics.latencyTimer().time()) {
-            retryer.call(() -> {
-                loadRecorder.recordSingleOperation();
-                signalsInterrupt.run();
-                return sender.send(
-                        batch,
-                        subscription.getEndpoint(),
-                        subscription.getEndpointAddressResolverMetadata(),
-                        subscription.getBatchSubscriptionPolicy().getRequestTimeout()
-                );
-            });
-        } catch (Exception e) {
-            logger.error("Batch was rejected [batch_id={}, subscription={}].", batch.getId(), subscription.getQualifiedName(), e);
-            metrics.recordAttemptAsFinished(batch.getMessageCount());
-            metrics.markDiscarded(batch);
-            batch.getMessagesMetadata().forEach(m -> trackers.get(subscription).logDiscarded(m, e.getMessage()));
+  }
+
+  private void clean(MessageBatch batch) {
+    batchFactory.destroyBatch(batch);
+  }
+
+  private RetryListener getRetryListener(
+      java.util.function.Consumer<MessageSendingResult> consumer) {
+    return new RetryListener() {
+      @Override
+      public <V> void onRetry(Attempt<V> attempt) {
+        if (attempt.hasException()) {
+          consumer.accept(MessageSendingResult.failedResult(attempt.getExceptionCause()));
+        } else {
+          consumer.accept((MessageSendingResult) attempt.getResult());
         }
-    }
-
-    private void clean(MessageBatch batch) {
-        batchFactory.destroyBatch(batch);
-    }
-
-    private RetryListener getRetryListener(java.util.function.Consumer<MessageSendingResult> consumer) {
-        return new RetryListener() {
-            @Override
-            public <V> void onRetry(Attempt<V> attempt) {
-                if (attempt.hasException()) {
-                    consumer.accept(MessageSendingResult.failedResult(attempt.getExceptionCause()));
-                } else {
-                    consumer.accept((MessageSendingResult) attempt.getResult());
-                }
-            }
-        };
-    }
+      }
+    };
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/BatchConsumerMetrics.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/BatchConsumerMetrics.java
index d75c9418bf..534623ba5a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/BatchConsumerMetrics.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/BatchConsumerMetrics.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.consumers.consumer;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.LongAdder;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.consumer.batch.MessageBatch;
@@ -7,96 +10,94 @@
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.HermesHistogram;
 import pl.allegro.tech.hermes.metrics.HermesTimer;
-import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.LongAdder;
 
 class BatchConsumerMetrics {
 
-    private final MetricsFacade metrics;
-    private final SubscriptionName subscriptionName;
-    private final LongAdder inflightCount = new LongAdder();
-    private final HermesCounter failures;
-    private final HermesCounter timeouts;
-    private final HermesCounter otherErrors;
-    private final HermesCounter discarded;
-    private final HermesHistogram inflightTime;
-    private final HermesCounter throughputInBytes;
-    private final HermesCounter successes;
-    private final HermesCounter batchSuccesses;
-    private final HermesTimer latency;
-    private final Map<Integer, HermesCounter> httpStatusCodes = new ConcurrentHashMap<>();
+  private final MetricsFacade metrics;
+  private final SubscriptionName subscriptionName;
+  private final LongAdder inflightCount = new LongAdder();
+  private final HermesCounter failures;
+  private final HermesCounter timeouts;
+  private final HermesCounter otherErrors;
+  private final HermesCounter discarded;
+  private final HermesHistogram inflightTime;
+  private final HermesCounter throughputInBytes;
+  private final HermesCounter successes;
+  private final HermesCounter batchSuccesses;
+  private final HermesTimer latency;
+  private final Map<Integer, HermesCounter> httpStatusCodes = new ConcurrentHashMap<>();
 
-    BatchConsumerMetrics(MetricsFacade metrics, SubscriptionName subscriptionName) {
-        this.metrics = metrics;
-        this.subscriptionName = subscriptionName;
-        this.failures = metrics.subscriptions().failuresCounter(subscriptionName);
-        this.timeouts = metrics.subscriptions().timeoutsCounter(subscriptionName);
-        this.otherErrors = metrics.subscriptions().otherErrorsCounter(subscriptionName);
-        this.discarded = metrics.subscriptions().discarded(subscriptionName);
-        this.inflightTime = metrics.subscriptions().inflightTimeInMillisHistogram(subscriptionName);
-        this.throughputInBytes = metrics.subscriptions().throughputInBytes(subscriptionName);
-        this.successes = metrics.subscriptions().successes(subscriptionName);
-        this.batchSuccesses = metrics.subscriptions().batchSuccesses(subscriptionName);
-        this.latency = metrics.subscriptions().latency(subscriptionName);
-    }
+  BatchConsumerMetrics(MetricsFacade metrics, SubscriptionName subscriptionName) {
+    this.metrics = metrics;
+    this.subscriptionName = subscriptionName;
+    this.failures = metrics.subscriptions().failuresCounter(subscriptionName);
+    this.timeouts = metrics.subscriptions().timeoutsCounter(subscriptionName);
+    this.otherErrors = metrics.subscriptions().otherErrorsCounter(subscriptionName);
+    this.discarded = metrics.subscriptions().discarded(subscriptionName);
+    this.inflightTime = metrics.subscriptions().inflightTimeInMillisHistogram(subscriptionName);
+    this.throughputInBytes = metrics.subscriptions().throughputInBytes(subscriptionName);
+    this.successes = metrics.subscriptions().successes(subscriptionName);
+    this.batchSuccesses = metrics.subscriptions().batchSuccesses(subscriptionName);
+    this.latency = metrics.subscriptions().latency(subscriptionName);
+  }
 
-    void recordAttempt(int messageCount) {
-        inflightCount.add(messageCount);
-    }
+  void recordAttempt(int messageCount) {
+    inflightCount.add(messageCount);
+  }
 
-    void recordAttemptAsFinished(int messageCount) {
-        inflightCount.add(-1 * messageCount);
-    }
+  void recordAttemptAsFinished(int messageCount) {
+    inflightCount.add(-1 * messageCount);
+  }
 
-    void markFailure(MessageBatch batch, MessageSendingResult result) {
-        failures.increment();
-        if (result.hasHttpAnswer()) {
-            markHttpStatusCode(result.getStatusCode());
-        } else if (result.isTimeout()) {
-            timeouts.increment();
-        } else {
-            otherErrors.increment();
-        }
-        throughputInBytes.increment(batch.getSize());
+  void markFailure(MessageBatch batch, MessageSendingResult result) {
+    failures.increment();
+    if (result.hasHttpAnswer()) {
+      markHttpStatusCode(result.getStatusCode());
+    } else if (result.isTimeout()) {
+      timeouts.increment();
+    } else {
+      otherErrors.increment();
     }
+    throughputInBytes.increment(batch.getSize());
+  }
 
-    void markSuccess(MessageBatch batch, MessageSendingResult result) {
-        successes.increment(batch.getMessageCount());
-        batchSuccesses.increment();
-        throughputInBytes.increment(batch.getSize());
-        markHttpStatusCode(result.getStatusCode());
-        inflightTime.record(batch.getLifetime());
-    }
+  void markSuccess(MessageBatch batch, MessageSendingResult result) {
+    successes.increment(batch.getMessageCount());
+    batchSuccesses.increment();
+    throughputInBytes.increment(batch.getSize());
+    markHttpStatusCode(result.getStatusCode());
+    inflightTime.record(batch.getLifetime());
+  }
 
-    private void markHttpStatusCode(int statusCode) {
-        httpStatusCodes.computeIfAbsent(
-                statusCode,
-                integer -> metrics.subscriptions().httpAnswerCounter(subscriptionName, statusCode)
-        ).increment();
-    }
+  private void markHttpStatusCode(int statusCode) {
+    httpStatusCodes
+        .computeIfAbsent(
+            statusCode,
+            integer -> metrics.subscriptions().httpAnswerCounter(subscriptionName, statusCode))
+        .increment();
+  }
 
-    void shutdown() {
-        metrics.unregisterAllMetricsRelatedTo(subscriptionName);
-    }
+  void shutdown() {
+    metrics.unregisterAllMetricsRelatedTo(subscriptionName);
+  }
 
-    void initialize() {
-        metrics.subscriptions()
-                .registerInflightGauge(subscriptionName, this, metrics -> metrics.inflightCount.doubleValue());
-    }
+  void initialize() {
+    metrics
+        .subscriptions()
+        .registerInflightGauge(
+            subscriptionName, this, metrics -> metrics.inflightCount.doubleValue());
+  }
 
-    void markDiscarded() {
-        discarded.increment();
-    }
+  void markDiscarded() {
+    discarded.increment();
+  }
 
-    void markDiscarded(MessageBatch batch) {
-        discarded.increment(batch.getMessageCount());
-        inflightTime.record(batch.getLifetime());
-    }
+  void markDiscarded(MessageBatch batch) {
+    discarded.increment(batch.getMessageCount());
+    inflightTime.record(batch.getLifetime());
+  }
 
-    HermesTimer latencyTimer() {
-        return latency;
-    }
+  HermesTimer latencyTimer() {
+    return latency;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/Consumer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/Consumer.java
index 996157ced2..5e88be3da4 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/Consumer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/Consumer.java
@@ -1,32 +1,32 @@
 package pl.allegro.tech.hermes.consumers.consumer;
 
+import java.util.Set;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
 import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
 
-import java.util.Set;
-
 public interface Consumer {
 
-    /**
-     * Consume **must** make sure that interrupted status is restored as it is needed for stopping unhealthy consumers.
-     * Swallowing the interrupt by consume or any of its dependencies will result in consumer being marked
-     * as unhealthy and will prevent commits despite messages being sent to subscribers.
-     */
-    void consume(Runnable signalsInterrupt);
+  /**
+   * Consume **must** make sure that interrupted status is restored as it is needed for stopping
+   * unhealthy consumers. Swallowing the interrupt by consume or any of its dependencies will result
+   * in consumer being marked as unhealthy and will prevent commits despite messages being sent to
+   * subscribers.
+   */
+  void consume(Runnable signalsInterrupt);
 
-    void initialize();
+  void initialize();
 
-    void tearDown();
+  void tearDown();
 
-    void updateSubscription(Subscription subscription);
+  void updateSubscription(Subscription subscription);
 
-    void updateTopic(Topic topic);
+  void updateTopic(Topic topic);
 
-    void commit(Set<SubscriptionPartitionOffset> offsets);
+  void commit(Set<SubscriptionPartitionOffset> offsets);
 
-    boolean moveOffset(PartitionOffset subscriptionPartitionOffset);
+  boolean moveOffset(PartitionOffset subscriptionPartitionOffset);
 
-    Subscription getSubscription();
+  Subscription getSubscription();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerAuthorizationHandler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerAuthorizationHandler.java
index e291fa64df..170049a52b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerAuthorizationHandler.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerAuthorizationHandler.java
@@ -6,9 +6,9 @@
 
 public interface ConsumerAuthorizationHandler extends SuccessHandler, ErrorHandler {
 
-    void createSubscriptionHandler(SubscriptionName subscriptionName);
+  void createSubscriptionHandler(SubscriptionName subscriptionName);
 
-    void removeSubscriptionHandler(SubscriptionName subscriptionName);
+  void removeSubscriptionHandler(SubscriptionName subscriptionName);
 
-    void updateSubscription(SubscriptionName subscriptionName);
+  void updateSubscription(SubscriptionName subscriptionName);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSender.java
index 7172e944fd..3d644776b1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSender.java
@@ -1,13 +1,33 @@
 package pl.allegro.tech.hermes.consumers.consumer;
 
+import static java.lang.String.format;
+import static org.apache.commons.lang3.math.NumberUtils.INTEGER_ZERO;
+import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.net.URI;
+import java.time.Clock;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.LongAdder;
 import org.eclipse.jetty.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecorder;
-import pl.allegro.tech.hermes.consumers.consumer.rate.InflightsPool;
+import pl.allegro.tech.hermes.consumers.consumer.offset.PendingOffsets;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.ConsumerProfiler;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.ConsumerRun;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.DefaultConsumerProfiler;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.Measurement;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.NoOpConsumerProfiler;
 import pl.allegro.tech.hermes.consumers.consumer.rate.SerialConsumerRateLimiter;
 import pl.allegro.tech.hermes.consumers.consumer.result.ErrorHandler;
 import pl.allegro.tech.hermes.consumers.consumer.result.SuccessHandler;
@@ -16,276 +36,333 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResultLogInfo;
 import pl.allegro.tech.hermes.consumers.consumer.sender.timeout.FutureAsyncTimeout;
+import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.HermesTimer;
 import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 
-import java.net.URI;
-import java.time.Clock;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.LongAdder;
-
-import static java.lang.String.format;
-import static org.apache.commons.lang3.math.NumberUtils.INTEGER_ZERO;
-
 public class ConsumerMessageSender {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConsumerMessageSender.class);
-    private final ExecutorService deliveryReportingExecutor;
-    private final List<SuccessHandler> successHandlers;
-    private final List<ErrorHandler> errorHandlers;
-    private final MessageSenderFactory messageSenderFactory;
-    private final Clock clock;
-    private final InflightsPool inflight;
-    private final SubscriptionLoadRecorder loadRecorder;
-    private final HermesTimer consumerLatencyTimer;
-    private final SerialConsumerRateLimiter rateLimiter;
-    private final FutureAsyncTimeout async;
-    private final int asyncTimeoutMs;
-    private final LongAdder inflightCount = new LongAdder();
-
-    private MessageSender messageSender;
-    private Subscription subscription;
-
-    private ScheduledExecutorService retrySingleThreadExecutor;
-    private volatile boolean running = true;
-
-    public ConsumerMessageSender(Subscription subscription,
-                                 MessageSenderFactory messageSenderFactory,
-                                 List<SuccessHandler> successHandlers,
-                                 List<ErrorHandler> errorHandlers,
-                                 SerialConsumerRateLimiter rateLimiter,
-                                 ExecutorService deliveryReportingExecutor,
-                                 InflightsPool inflight,
-                                 MetricsFacade metrics,
-                                 int asyncTimeoutMs,
-                                 FutureAsyncTimeout futureAsyncTimeout,
-                                 Clock clock,
-                                 SubscriptionLoadRecorder loadRecorder) {
-        this.deliveryReportingExecutor = deliveryReportingExecutor;
-        this.successHandlers = successHandlers;
-        this.errorHandlers = errorHandlers;
-        this.messageSenderFactory = messageSenderFactory;
-        this.clock = clock;
-        this.loadRecorder = loadRecorder;
-        this.async = futureAsyncTimeout;
-        this.rateLimiter = rateLimiter;
-        this.asyncTimeoutMs = asyncTimeoutMs;
-        this.messageSender = messageSender(subscription);
-        this.subscription = subscription;
-        this.inflight = inflight;
-        this.consumerLatencyTimer = metrics.subscriptions().latency(subscription.getQualifiedName());
-        metrics.subscriptions().registerInflightGauge(subscription.getQualifiedName(), this, sender -> sender.inflightCount.doubleValue());
+  private static final Logger logger = LoggerFactory.getLogger(ConsumerMessageSender.class);
+  private final ExecutorService deliveryReportingExecutor;
+  private final List<SuccessHandler> successHandlers;
+  private final List<ErrorHandler> errorHandlers;
+  private final MessageSenderFactory messageSenderFactory;
+  private final Clock clock;
+  private final PendingOffsets pendingOffsets;
+  private final SubscriptionLoadRecorder loadRecorder;
+  private final HermesTimer consumerLatencyTimer;
+  private final HermesCounter retries;
+  private final SerialConsumerRateLimiter rateLimiter;
+  private final HermesTimer rateLimiterAcquireTimer;
+  private final FutureAsyncTimeout async;
+  private final int asyncTimeoutMs;
+  private final LongAdder inflightCount = new LongAdder();
+
+  private MessageSender messageSender;
+  private Subscription subscription;
+
+  private ScheduledExecutorService retrySingleThreadExecutor;
+  private volatile boolean running = true;
+
+  public ConsumerMessageSender(
+      Subscription subscription,
+      MessageSenderFactory messageSenderFactory,
+      List<SuccessHandler> successHandlers,
+      List<ErrorHandler> errorHandlers,
+      SerialConsumerRateLimiter rateLimiter,
+      ExecutorService deliveryReportingExecutor,
+      PendingOffsets pendingOffsets,
+      MetricsFacade metrics,
+      int asyncTimeoutMs,
+      FutureAsyncTimeout futureAsyncTimeout,
+      Clock clock,
+      SubscriptionLoadRecorder loadRecorder) {
+    this.deliveryReportingExecutor = deliveryReportingExecutor;
+    this.successHandlers = successHandlers;
+    this.errorHandlers = errorHandlers;
+    this.messageSenderFactory = messageSenderFactory;
+    this.clock = clock;
+    this.loadRecorder = loadRecorder;
+    this.async = futureAsyncTimeout;
+    this.rateLimiter = rateLimiter;
+    this.asyncTimeoutMs = asyncTimeoutMs;
+    this.messageSender = messageSender(subscription);
+    this.subscription = subscription;
+    this.pendingOffsets = pendingOffsets;
+    this.consumerLatencyTimer = metrics.subscriptions().latency(subscription.getQualifiedName());
+    metrics
+        .subscriptions()
+        .registerInflightGauge(
+            subscription.getQualifiedName(), this, sender -> sender.inflightCount.doubleValue());
+    this.retries = metrics.subscriptions().retries(subscription.getQualifiedName());
+    this.rateLimiterAcquireTimer =
+        metrics.subscriptions().rateLimiterAcquire(subscription.getQualifiedName());
+  }
+
+  public void initialize() {
+    running = true;
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder()
+            .setNameFormat(subscription.getQualifiedName() + "-retry-executor-%d")
+            .build();
+    this.retrySingleThreadExecutor = Executors.newScheduledThreadPool(1, threadFactory);
+  }
+
+  public void shutdown() {
+    running = false;
+    messageSender.stop();
+    retrySingleThreadExecutor.shutdownNow();
+    try {
+      retrySingleThreadExecutor.awaitTermination(1, TimeUnit.MINUTES);
+    } catch (InterruptedException e) {
+      logger.warn("Failed to stop retry executor within one minute with following exception", e);
     }
-
-    public void initialize() {
-        running = true;
-        ThreadFactory threadFactory =
-                new ThreadFactoryBuilder().setNameFormat(subscription.getQualifiedName() + "-retry-executor-%d").build();
-        this.retrySingleThreadExecutor = Executors.newScheduledThreadPool(1, threadFactory);
+  }
+
+  public void sendAsync(Message message, ConsumerProfiler profiler) {
+    inflightCount.increment();
+    sendAsync(message, calculateMessageDelay(message.getPublishingTimestamp()), profiler);
+  }
+
+  private void sendAsync(Message message, int delayMillis, ConsumerProfiler profiler) {
+    profiler.measure(Measurement.SCHEDULE_MESSAGE_SENDING);
+    retrySingleThreadExecutor.schedule(
+        () -> sendMessage(message, profiler), delayMillis, TimeUnit.MILLISECONDS);
+  }
+
+  private int calculateMessageDelay(long publishingMessageTimestamp) {
+    Integer delay = subscription.getSerialSubscriptionPolicy().getSendingDelay();
+    if (INTEGER_ZERO.equals(delay)) {
+      return delay;
     }
 
-    public void shutdown() {
-        running = false;
-        messageSender.stop();
-        retrySingleThreadExecutor.shutdownNow();
-        try {
-            retrySingleThreadExecutor.awaitTermination(1, TimeUnit.MINUTES);
-        } catch (InterruptedException e) {
-            logger.warn("Failed to stop retry executor within one minute with following exception", e);
-        }
+    long messageAgeAtThisPoint = clock.millis() - publishingMessageTimestamp;
+
+    delay = delay - (int) messageAgeAtThisPoint;
+
+    return Math.max(delay, INTEGER_ZERO);
+  }
+
+  /**
+   * Method is calling MessageSender and is registering listeners to handle response. Main
+   * responsibility of this method is that no message will be fully processed or rejected without
+   * release on semaphore.
+   */
+  private void sendMessage(final Message message, ConsumerProfiler profiler) {
+    loadRecorder.recordSingleOperation();
+    profiler.measure(Measurement.ACQUIRE_RATE_LIMITER);
+    acquireRateLimiterWithTimer();
+    HermesTimerContext timer = consumerLatencyTimer.time();
+    profiler.measure(Measurement.MESSAGE_SENDER_SEND);
+    CompletableFuture<MessageSendingResult> response = messageSender.send(message);
+
+    response
+        .thenAcceptAsync(
+            new ResponseHandlingListener(message, timer, profiler), deliveryReportingExecutor)
+        .exceptionally(
+            e -> {
+              logger.error(
+                  "An error occurred while handling message sending response of subscription {} [partition={}, offset={}, id={}]",
+                  subscription.getQualifiedName(),
+                  message.getPartition(),
+                  message.getOffset(),
+                  message.getId(),
+                  e);
+              return null;
+            });
+  }
+
+  private void acquireRateLimiterWithTimer() {
+    HermesTimerContext acquireTimer = rateLimiterAcquireTimer.time();
+    rateLimiter.acquire();
+    acquireTimer.close();
+  }
+
+  private MessageSender messageSender(Subscription subscription) {
+    Integer requestTimeoutMs = subscription.getSerialSubscriptionPolicy().getRequestTimeout();
+    ResilientMessageSender resilientMessageSender =
+        new ResilientMessageSender(
+            this.rateLimiter, subscription, this.async, requestTimeoutMs, this.asyncTimeoutMs);
+
+    return this.messageSenderFactory.create(subscription, resilientMessageSender);
+  }
+
+  public void updateSubscription(Subscription newSubscription) {
+    boolean endpointUpdated =
+        !this.subscription.getEndpoint().equals(newSubscription.getEndpoint());
+    boolean subscriptionPolicyUpdated =
+        !Objects.equals(
+            this.subscription.getSerialSubscriptionPolicy(),
+            newSubscription.getSerialSubscriptionPolicy());
+    boolean endpointAddressResolverMetadataChanged =
+        !Objects.equals(
+            this.subscription.getEndpointAddressResolverMetadata(),
+            newSubscription.getEndpointAddressResolverMetadata());
+    boolean oAuthPolicyChanged =
+        !Objects.equals(this.subscription.getOAuthPolicy(), newSubscription.getOAuthPolicy());
+
+    this.subscription = newSubscription;
+
+    boolean httpClientChanged =
+        this.subscription.isHttp2Enabled() != newSubscription.isHttp2Enabled();
+
+    if (endpointUpdated
+        || subscriptionPolicyUpdated
+        || endpointAddressResolverMetadataChanged
+        || oAuthPolicyChanged
+        || httpClientChanged) {
+      this.messageSender.stop();
+      this.messageSender = messageSender(newSubscription);
     }
-
-    public void sendAsync(Message message) {
-        inflightCount.increment();
-        sendAsync(message, calculateMessageDelay(message.getPublishingTimestamp()));
+  }
+
+  private boolean willExceedTtl(Message message, long delay) {
+    long ttl =
+        TimeUnit.SECONDS.toMillis(subscription.getSerialSubscriptionPolicy().getMessageTtl());
+    long remainingTtl = Math.max(ttl - delay, 0);
+    return message.isTtlExceeded(remainingTtl);
+  }
+
+  private void handleFailedSending(
+      Message message, MessageSendingResult result, ConsumerProfiler profiler) {
+    errorHandlers.forEach(h -> h.handleFailed(message, subscription, result));
+    retrySendingOrDiscard(message, result, profiler);
+  }
+
+  private void retrySendingOrDiscard(
+      Message message, MessageSendingResult result, ConsumerProfiler profiler) {
+    List<URI> succeededUris =
+        result.getSucceededUris(ConsumerMessageSender.this::messageSentSucceeded);
+    message.incrementRetryCounter(succeededUris);
+
+    long retryDelay = extractRetryDelay(message, result);
+    if (shouldAttemptResending(message, result, retryDelay)) {
+      retries.increment();
+      profiler.flushMeasurements(ConsumerRun.RETRIED);
+      ConsumerProfiler resendProfiler =
+          subscription.isProfilingEnabled()
+              ? new DefaultConsumerProfiler(
+                  subscription.getQualifiedName(), subscription.getProfilingThresholdMs())
+              : new NoOpConsumerProfiler();
+      resendProfiler.startMeasurements(Measurement.SCHEDULE_RESEND);
+      resendProfiler.saveRetryDelay(retryDelay);
+      retrySingleThreadExecutor.schedule(
+          () -> resend(message, result, resendProfiler), retryDelay, TimeUnit.MILLISECONDS);
+    } else {
+      handleMessageDiscarding(message, result, profiler);
     }
-
-    private void sendAsync(Message message, int delayMillis) {
-        retrySingleThreadExecutor.schedule(() -> sendMessage(message), delayMillis, TimeUnit.MILLISECONDS);
+  }
+
+  private boolean shouldAttemptResending(
+      Message message, MessageSendingResult result, long retryDelay) {
+    return !willExceedTtl(message, retryDelay) && shouldResendMessage(result);
+  }
+
+  private long extractRetryDelay(Message message, MessageSendingResult result) {
+    long defaultBackoff =
+        message.updateAndGetCurrentMessageBackoff(subscription.getSerialSubscriptionPolicy());
+    long ttl =
+        TimeUnit.SECONDS.toMillis(subscription.getSerialSubscriptionPolicy().getMessageTtl());
+    return result.getRetryAfterMillis().map(delay -> Math.min(delay, ttl)).orElse(defaultBackoff);
+  }
+
+  private void resend(Message message, MessageSendingResult result, ConsumerProfiler profiler) {
+    if (result.isLoggable()) {
+      result.getLogInfo().forEach(logInfo -> logResultInfo(message, logInfo));
     }
-
-    private int calculateMessageDelay(long publishingMessageTimestamp) {
-        Integer delay = subscription.getSerialSubscriptionPolicy().getSendingDelay();
-        if (INTEGER_ZERO.equals(delay)) {
-            return delay;
-        }
-
-        long messageAgeAtThisPoint = clock.millis() - publishingMessageTimestamp;
-
-        delay = delay - (int) messageAgeAtThisPoint;
-
-        return Math.max(delay, INTEGER_ZERO);
+    sendMessage(message, profiler);
+  }
+
+  private void logResultInfo(Message message, MessageSendingResultLogInfo logInfo) {
+    logger.debug(
+        format(
+            "Retrying message send to endpoint %s; messageId %s; offset: %s; partition: %s; sub id: %s; rootCause: %s",
+            logInfo.getUrlString(),
+            message.getId(),
+            message.getOffset(),
+            message.getPartition(),
+            subscription.getQualifiedName(),
+            logInfo.getRootCause()),
+        logInfo.getFailure());
+  }
+
+  private void handleMessageDiscarding(
+      Message message, MessageSendingResult result, ConsumerProfiler profiler) {
+    pendingOffsets.markAsProcessed(
+        subscriptionPartitionOffset(
+            subscription.getQualifiedName(),
+            message.getPartitionOffset(),
+            message.getPartitionAssignmentTerm()));
+    inflightCount.decrement();
+    errorHandlers.forEach(h -> h.handleDiscarded(message, subscription, result));
+    profiler.flushMeasurements(ConsumerRun.DISCARDED);
+  }
+
+  private void handleMessageSendingSuccess(
+      Message message, MessageSendingResult result, ConsumerProfiler profiler) {
+    pendingOffsets.markAsProcessed(
+        subscriptionPartitionOffset(
+            subscription.getQualifiedName(),
+            message.getPartitionOffset(),
+            message.getPartitionAssignmentTerm()));
+    inflightCount.decrement();
+    successHandlers.forEach(h -> h.handleSuccess(message, subscription, result));
+    profiler.flushMeasurements(ConsumerRun.DELIVERED);
+  }
+
+  private boolean messageSentSucceeded(MessageSendingResult result) {
+    return result.succeeded() || (result.isClientError() && !shouldRetryOnClientError());
+  }
+
+  private boolean shouldResendMessage(MessageSendingResult result) {
+    return !result.succeeded()
+        && (!result.isClientError()
+            || shouldRetryOnClientError()
+            || isUnauthorizedForOAuthSecuredSubscription(result));
+  }
+
+  private boolean shouldRetryOnClientError() {
+    return subscription.getSerialSubscriptionPolicy().isRetryClientErrors();
+  }
+
+  private boolean isUnauthorizedForOAuthSecuredSubscription(MessageSendingResult result) {
+    return subscription.hasOAuthPolicy() && result.getStatusCode() == HttpStatus.UNAUTHORIZED_401;
+  }
+
+  class ResponseHandlingListener implements java.util.function.Consumer<MessageSendingResult> {
+
+    private final Message message;
+    private final HermesTimerContext timer;
+    private final ConsumerProfiler profiler;
+
+    public ResponseHandlingListener(
+        Message message, HermesTimerContext timer, ConsumerProfiler profiler) {
+      this.message = message;
+      this.timer = timer;
+      this.profiler = profiler;
     }
 
-
-    /**
-     * Method is calling MessageSender and is registering listeners to handle response.
-     * Main responsibility of this method is that no message will be fully processed or rejected without release on semaphore.
-     */
-    private void sendMessage(final Message message) {
-        loadRecorder.recordSingleOperation();
-        HermesTimerContext timer = consumerLatencyTimer.time();
-        CompletableFuture<MessageSendingResult> response = messageSender.send(message);
-
-        response.thenAcceptAsync(new ResponseHandlingListener(message, timer), deliveryReportingExecutor)
-                .exceptionally(e -> {
-                    logger.error(
-                            "An error occurred while handling message sending response of subscription {} [partition={}, offset={}, id={}]",
-                            subscription.getQualifiedName(), message.getPartition(), message.getOffset(), message.getId(), e);
-                    return null;
-                });
-    }
-
-    private MessageSender messageSender(Subscription subscription) {
-        Integer requestTimeoutMs = subscription.getSerialSubscriptionPolicy().getRequestTimeout();
-        ResilientMessageSender resilientMessageSender = new ResilientMessageSender(
-                this.rateLimiter,
-                subscription,
-                this.async,
-                requestTimeoutMs,
-                this.asyncTimeoutMs
-        );
-
-        return this.messageSenderFactory.create(
-                subscription, resilientMessageSender
-        );
-    }
-
-    public void updateSubscription(Subscription newSubscription) {
-        boolean endpointUpdated = !this.subscription.getEndpoint().equals(newSubscription.getEndpoint());
-        boolean subscriptionPolicyUpdated = !Objects.equals(
-                this.subscription.getSerialSubscriptionPolicy(),
-                newSubscription.getSerialSubscriptionPolicy()
-        );
-        boolean endpointAddressResolverMetadataChanged = !Objects.equals(
-                this.subscription.getEndpointAddressResolverMetadata(),
-                newSubscription.getEndpointAddressResolverMetadata()
-        );
-        boolean oAuthPolicyChanged = !Objects.equals(
-                this.subscription.getOAuthPolicy(), newSubscription.getOAuthPolicy()
-        );
-
-        this.subscription = newSubscription;
-
-        boolean httpClientChanged = this.subscription.isHttp2Enabled() != newSubscription.isHttp2Enabled();
-
-        if (endpointUpdated || subscriptionPolicyUpdated || endpointAddressResolverMetadataChanged
-                || oAuthPolicyChanged || httpClientChanged) {
-            this.messageSender.stop();
-            this.messageSender = messageSender(newSubscription);
-        }
-    }
-
-    private boolean willExceedTtl(Message message, long delay) {
-        long ttl = TimeUnit.SECONDS.toMillis(subscription.getSerialSubscriptionPolicy().getMessageTtl());
-        long remainingTtl = Math.max(ttl - delay, 0);
-        return message.isTtlExceeded(remainingTtl);
-    }
-
-    private void handleFailedSending(Message message, MessageSendingResult result) {
-        retrySending(message, result);
-        errorHandlers.forEach(h -> h.handleFailed(message, subscription, result));
-    }
-
-    private void retrySending(Message message, MessageSendingResult result) {
-        List<URI> succeededUris = result.getSucceededUris(ConsumerMessageSender.this::messageSentSucceeded);
-        message.incrementRetryCounter(succeededUris);
-
-        long retryDelay = extractRetryDelay(message, result);
-        if (shouldAttemptResending(message, result, retryDelay)) {
-            retrySingleThreadExecutor.schedule(() -> resend(message, result), retryDelay, TimeUnit.MILLISECONDS);
+    @Override
+    public void accept(MessageSendingResult result) {
+      timer.close();
+      loadRecorder.recordSingleOperation();
+      profiler.measure(Measurement.HANDLERS);
+      if (running) {
+        if (result.succeeded()) {
+          handleMessageSendingSuccess(message, result, profiler);
         } else {
-            handleMessageDiscarding(message, result);
-        }
-    }
-
-    private boolean shouldAttemptResending(Message message, MessageSendingResult result, long retryDelay) {
-        return !willExceedTtl(message, retryDelay) && shouldResendMessage(result);
-    }
-
-    private long extractRetryDelay(Message message, MessageSendingResult result) {
-        long defaultBackoff = message.updateAndGetCurrentMessageBackoff(subscription.getSerialSubscriptionPolicy());
-        long ttl = TimeUnit.SECONDS.toMillis(subscription.getSerialSubscriptionPolicy().getMessageTtl());
-        return result.getRetryAfterMillis().map(delay -> Math.min(delay, ttl)).orElse(defaultBackoff);
-    }
-
-    private void resend(Message message, MessageSendingResult result) {
-        if (result.isLoggable()) {
-            result.getLogInfo().forEach(logInfo -> logResultInfo(message, logInfo));
-        }
-        sendMessage(message);
-    }
-
-    private void logResultInfo(Message message, MessageSendingResultLogInfo logInfo) {
-        logger.debug(
-                format("Retrying message send to endpoint %s; messageId %s; offset: %s; partition: %s; sub id: %s; rootCause: %s",
-                        logInfo.getUrlString(), message.getId(), message.getOffset(), message.getPartition(),
-                        subscription.getQualifiedName(), logInfo.getRootCause()),
-                logInfo.getFailure());
-    }
-
-    private void handleMessageDiscarding(Message message, MessageSendingResult result) {
-        inflight.release();
-        inflightCount.decrement();
-        errorHandlers.forEach(h -> h.handleDiscarded(message, subscription, result));
-    }
-
-    private void handleMessageSendingSuccess(Message message, MessageSendingResult result) {
-        inflight.release();
-        inflightCount.decrement();
-        successHandlers.forEach(h -> h.handleSuccess(message, subscription, result));
-    }
-
-    private boolean messageSentSucceeded(MessageSendingResult result) {
-        return result.succeeded() || (result.isClientError() && !shouldRetryOnClientError());
-    }
-
-    private boolean shouldResendMessage(MessageSendingResult result) {
-        return !result.succeeded() && (!result.isClientError() || shouldRetryOnClientError()
-                || isUnauthorizedForOAuthSecuredSubscription(result));
-    }
-
-    private boolean shouldRetryOnClientError() {
-        return subscription.getSerialSubscriptionPolicy().isRetryClientErrors();
-    }
-
-    private boolean isUnauthorizedForOAuthSecuredSubscription(MessageSendingResult result) {
-        return subscription.hasOAuthPolicy() && result.getStatusCode() == HttpStatus.UNAUTHORIZED_401;
-    }
-
-    class ResponseHandlingListener implements java.util.function.Consumer<MessageSendingResult> {
-
-        private final Message message;
-        private final HermesTimerContext timer;
-
-        public ResponseHandlingListener(Message message, HermesTimerContext timer) {
-            this.message = message;
-            this.timer = timer;
-        }
-
-        @Override
-        public void accept(MessageSendingResult result) {
-            timer.close();
-            loadRecorder.recordSingleOperation();
-            if (running) {
-                if (result.succeeded()) {
-                    handleMessageSendingSuccess(message, result);
-                } else {
-                    handleFailedSending(message, result);
-                }
-            } else {
-                logger.warn("Process of subscription {} is not running. "
-                                + "Ignoring sending message result [successful={}, partition={}, offset={}, id={}]",
-                        subscription.getQualifiedName(), result.succeeded(), message.getPartition(),
-                        message.getOffset(), message.getId());
-            }
+          handleFailedSending(message, result, profiler);
         }
+      } else {
+        logger.warn(
+            "Process of subscription {} is not running. "
+                + "Ignoring sending message result [successful={}, partition={}, offset={}, id={}]",
+            subscription.getQualifiedName(),
+            result.succeeded(),
+            message.getPartition(),
+            message.getOffset(),
+            message.getId());
+      }
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSenderFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSenderFactory.java
index c47557bcf7..7e73192f47 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSenderFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSenderFactory.java
@@ -1,12 +1,15 @@
 package pl.allegro.tech.hermes.consumers.consumer;
 
+import java.time.Clock;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.common.message.undelivered.UndeliveredMessageLog;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory;
 import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecorder;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
-import pl.allegro.tech.hermes.consumers.consumer.rate.InflightsPool;
+import pl.allegro.tech.hermes.consumers.consumer.offset.PendingOffsets;
 import pl.allegro.tech.hermes.consumers.consumer.rate.SerialConsumerRateLimiter;
 import pl.allegro.tech.hermes.consumers.consumer.result.DefaultErrorHandler;
 import pl.allegro.tech.hermes.consumers.consumer.result.DefaultSuccessHandler;
@@ -16,82 +19,81 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.timeout.FutureAsyncTimeout;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.time.Clock;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-
 public class ConsumerMessageSenderFactory {
 
-    private final String kafkaClusterName;
-    private final MessageSenderFactory messageSenderFactory;
-    private final Trackers trackers;
-    private final FutureAsyncTimeout futureAsyncTimeout;
-    private final UndeliveredMessageLog undeliveredMessageLog;
-    private final Clock clock;
-    private final ConsumerAuthorizationHandler consumerAuthorizationHandler;
-    private final ExecutorService rateLimiterReportingExecutor;
-    private final int senderAsyncTimeoutMs;
-
-    public ConsumerMessageSenderFactory(String kafkaClusterName, MessageSenderFactory messageSenderFactory,
-                                        Trackers trackers, FutureAsyncTimeout futureAsyncTimeout,
-                                        UndeliveredMessageLog undeliveredMessageLog, Clock clock,
-                                        InstrumentedExecutorServiceFactory instrumentedExecutorServiceFactory,
-                                        ConsumerAuthorizationHandler consumerAuthorizationHandler,
-                                        int senderAsyncTimeoutMs,
-                                        int rateLimiterReportingThreadPoolSize,
-                                        boolean rateLimiterReportingThreadMonitoringEnabled) {
+  private final String kafkaClusterName;
+  private final MessageSenderFactory messageSenderFactory;
+  private final Trackers trackers;
+  private final FutureAsyncTimeout futureAsyncTimeout;
+  private final UndeliveredMessageLog undeliveredMessageLog;
+  private final Clock clock;
+  private final ConsumerAuthorizationHandler consumerAuthorizationHandler;
+  private final ExecutorService rateLimiterReportingExecutor;
+  private final int senderAsyncTimeoutMs;
 
-        this.kafkaClusterName = kafkaClusterName;
-        this.messageSenderFactory = messageSenderFactory;
-        this.trackers = trackers;
-        this.futureAsyncTimeout = futureAsyncTimeout;
-        this.undeliveredMessageLog = undeliveredMessageLog;
-        this.clock = clock;
-        this.consumerAuthorizationHandler = consumerAuthorizationHandler;
-        this.rateLimiterReportingExecutor = instrumentedExecutorServiceFactory.getExecutorService(
-                "rate-limiter-reporter", rateLimiterReportingThreadPoolSize,
-                rateLimiterReportingThreadMonitoringEnabled);
-        this.senderAsyncTimeoutMs = senderAsyncTimeoutMs;
-    }
+  public ConsumerMessageSenderFactory(
+      String kafkaClusterName,
+      MessageSenderFactory messageSenderFactory,
+      Trackers trackers,
+      FutureAsyncTimeout futureAsyncTimeout,
+      UndeliveredMessageLog undeliveredMessageLog,
+      Clock clock,
+      InstrumentedExecutorServiceFactory instrumentedExecutorServiceFactory,
+      ConsumerAuthorizationHandler consumerAuthorizationHandler,
+      int senderAsyncTimeoutMs,
+      int rateLimiterReportingThreadPoolSize,
+      boolean rateLimiterReportingThreadMonitoringEnabled) {
 
-    public ConsumerMessageSender create(Subscription subscription,
-                                        SerialConsumerRateLimiter consumerRateLimiter,
-                                        OffsetQueue offsetQueue,
-                                        InflightsPool inflight,
-                                        SubscriptionLoadRecorder subscriptionLoadRecorder,
-                                        MetricsFacade metrics) {
+    this.kafkaClusterName = kafkaClusterName;
+    this.messageSenderFactory = messageSenderFactory;
+    this.trackers = trackers;
+    this.futureAsyncTimeout = futureAsyncTimeout;
+    this.undeliveredMessageLog = undeliveredMessageLog;
+    this.clock = clock;
+    this.consumerAuthorizationHandler = consumerAuthorizationHandler;
+    this.rateLimiterReportingExecutor =
+        instrumentedExecutorServiceFactory.getExecutorService(
+            "rate-limiter-reporter",
+            rateLimiterReportingThreadPoolSize,
+            rateLimiterReportingThreadMonitoringEnabled);
+    this.senderAsyncTimeoutMs = senderAsyncTimeoutMs;
+  }
 
-        List<SuccessHandler> successHandlers = Arrays.asList(
-                consumerAuthorizationHandler,
-                new DefaultSuccessHandler(offsetQueue, metrics, trackers, subscription.getQualifiedName()));
+  public ConsumerMessageSender create(
+      Subscription subscription,
+      SerialConsumerRateLimiter consumerRateLimiter,
+      PendingOffsets pendingOffsets,
+      SubscriptionLoadRecorder subscriptionLoadRecorder,
+      MetricsFacade metrics) {
 
-        List<ErrorHandler> errorHandlers = Arrays.asList(
-                consumerAuthorizationHandler,
-                new DefaultErrorHandler(
-                        offsetQueue,
-                        metrics,
-                        undeliveredMessageLog,
-                        clock,
-                        trackers,
-                        kafkaClusterName,
-                        subscription.getQualifiedName()
-                )
-        );
+    List<SuccessHandler> successHandlers =
+        Arrays.asList(
+            consumerAuthorizationHandler,
+            new DefaultSuccessHandler(metrics, trackers, subscription.getQualifiedName()));
 
-        return new ConsumerMessageSender(subscription,
-                messageSenderFactory,
-                successHandlers,
-                errorHandlers,
-                consumerRateLimiter,
-                rateLimiterReportingExecutor,
-                inflight,
+    List<ErrorHandler> errorHandlers =
+        Arrays.asList(
+            consumerAuthorizationHandler,
+            new DefaultErrorHandler(
                 metrics,
-                senderAsyncTimeoutMs,
-                futureAsyncTimeout,
+                undeliveredMessageLog,
                 clock,
-                subscriptionLoadRecorder
-        );
-    }
+                trackers,
+                kafkaClusterName,
+                subscription.getQualifiedName()));
 
+    return new ConsumerMessageSender(
+        subscription,
+        messageSenderFactory,
+        successHandlers,
+        errorHandlers,
+        consumerRateLimiter,
+        rateLimiterReportingExecutor,
+        pendingOffsets,
+        metrics,
+        senderAsyncTimeoutMs,
+        futureAsyncTimeout,
+        clock,
+        subscriptionLoadRecorder);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/Message.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/Message.java
index 973fdd4d5c..ebb2002ae0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/Message.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/Message.java
@@ -3,8 +3,16 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import org.apache.avro.Schema;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.Header;
 import pl.allegro.tech.hermes.api.SubscriptionPolicy;
@@ -13,19 +21,203 @@
 import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.net.URI;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+/**
+ * Implementation note: this class is partially mutable and may be accessed from multiple threads
+ * involved in message lifecycle, it must be thread safe.
+ */
+public class Message implements FilterableMessage {
 
-import static java.util.stream.Collectors.toList;
+  private final String id;
+  private final PartitionOffset partitionOffset;
+
+  private final String topic;
+  private final String subscription;
+  private final boolean hasSubscriptionIdentityHeaders;
+  private final ContentType contentType;
+  private final Optional<CompiledSchema<Schema>> schema;
+
+  private final long publishingTimestamp;
+  private final long readingTimestamp;
+  private final byte[] data;
+
+  private int retryCounter = 0;
+  private final long partitionAssignmentTerm;
+  private final Map<String, String> externalMetadata;
+
+  private final List<Header> additionalHeaders;
+
+  private final Set<String> succeededUris = Sets.newHashSet();
+
+  private long currentMessageBackoff = -1;
+
+  private boolean isFiltered = false;
+
+  public Message(
+      String id,
+      String topic,
+      byte[] content,
+      ContentType contentType,
+      Optional<CompiledSchema<Schema>> schema,
+      long publishingTimestamp,
+      long readingTimestamp,
+      PartitionOffset partitionOffset,
+      long partitionAssignmentTerm,
+      Map<String, String> externalMetadata,
+      List<Header> additionalHeaders,
+      String subscription,
+      boolean hasSubscriptionIdentityHeaders) {
+    this.id = id;
+    this.data = content;
+    this.topic = topic;
+    this.contentType = contentType;
+    this.schema = schema;
+    this.publishingTimestamp = publishingTimestamp;
+    this.readingTimestamp = readingTimestamp;
+    this.partitionOffset = partitionOffset;
+    this.partitionAssignmentTerm = partitionAssignmentTerm;
+    this.externalMetadata = ImmutableMap.copyOf(externalMetadata);
+    this.additionalHeaders = ImmutableList.copyOf(additionalHeaders);
+    this.subscription = subscription;
+    this.hasSubscriptionIdentityHeaders = hasSubscriptionIdentityHeaders;
+  }
+
+  public long getPublishingTimestamp() {
+    return publishingTimestamp;
+  }
+
+  public long getReadingTimestamp() {
+    return readingTimestamp;
+  }
+
+  public long getOffset() {
+    return partitionOffset.getOffset();
+  }
+
+  public long getPartitionAssignmentTerm() {
+    return partitionAssignmentTerm;
+  }
+
+  @Override
+  public byte[] getData() {
+    return data;
+  }
+
+  @Override
+  public ContentType getContentType() {
+    return contentType;
+  }
+
+  public int getPartition() {
+    return partitionOffset.getPartition();
+  }
+
+  public String getTopic() {
+    return topic;
+  }
+
+  public boolean isTtlExceeded(long ttlMillis) {
+    long currentTimestamp = System.currentTimeMillis();
+    return currentTimestamp > readingTimestamp + ttlMillis;
+  }
+
+  public synchronized void incrementRetryCounter(Collection<URI> succeededUris) {
+    this.retryCounter++;
+    this.succeededUris.addAll(succeededUris.stream().map(URI::toString).toList());
+  }
+
+  public synchronized int getRetryCounter() {
+    return retryCounter;
+  }
+
+  @Override
+  public Optional<CompiledSchema<Schema>> getSchema() {
+    return schema;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public synchronized Set<String> getSucceededUris() {
+    return succeededUris;
+  }
+
+  @Override
+  public Map<String, String> getExternalMetadata() {
+    return externalMetadata;
+  }
+
+  public List<Header> getAdditionalHeaders() {
+    return additionalHeaders;
+  }
+
+  public synchronized long updateAndGetCurrentMessageBackoff(
+      SubscriptionPolicy subscriptionPolicy) {
+    if (currentMessageBackoff == -1) {
+      currentMessageBackoff = subscriptionPolicy.getMessageBackoff();
+    } else {
+      currentMessageBackoff =
+          Math.min(
+              subscriptionPolicy.getBackoffMaxIntervalMillis(),
+              (long) (currentMessageBackoff * subscriptionPolicy.getBackoffMultiplier()));
+    }
+    return currentMessageBackoff;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    final Message other = (Message) obj;
+    return Objects.equals(this.id, other.id);
+  }
 
-public class Message implements FilterableMessage {
+  public static Builder message() {
+    return new Builder();
+  }
+
+  public KafkaTopicName getKafkaTopic() {
+    return partitionOffset.getTopic();
+  }
+
+  public PartitionOffset getPartitionOffset() {
+    return partitionOffset;
+  }
+
+  public synchronized boolean hasNotBeenSentTo(String uri) {
+    return !succeededUris.contains(uri);
+  }
+
+  public long getSize() {
+    return ArrayUtils.getLength(data);
+  }
 
+  public boolean hasSubscriptionIdentityHeaders() {
+    return hasSubscriptionIdentityHeaders;
+  }
+
+  public String getSubscription() {
+    return subscription;
+  }
+
+  public synchronized boolean isFiltered() {
+    return isFiltered;
+  }
+
+  public synchronized void setFiltered(boolean filtered) {
+    isFiltered = filtered;
+  }
+
+  public static class Builder {
     private String id;
     private PartitionOffset partitionOffset;
 
@@ -39,226 +231,77 @@ public class Message implements FilterableMessage {
     private long readingTimestamp;
     private byte[] data;
 
-    private int retryCounter = 0;
     private long partitionAssignmentTerm = -1;
     private Map<String, String> externalMetadata = Collections.emptyMap();
 
     private List<Header> additionalHeaders = Collections.emptyList();
 
-    private Set<String> succeededUris = Sets.newHashSet();
-
-    private long currentMessageBackoff = -1;
-
-    private Message() {}
-
-    public Message(String id,
-                   String topic,
-                   byte[] content,
-                   ContentType contentType,
-                   Optional<CompiledSchema<Schema>> schema,
-                   long publishingTimestamp,
-                   long readingTimestamp,
-                   PartitionOffset partitionOffset,
-                   long partitionAssignmentTerm,
-                   Map<String, String> externalMetadata,
-                   List<Header> additionalHeaders,
-                   String subscription,
-                   boolean hasSubscriptionIdentityHeaders) {
-        this.id = id;
-        this.data = content;
-        this.topic = topic;
-        this.contentType = contentType;
-        this.schema = schema;
-        this.publishingTimestamp = publishingTimestamp;
-        this.readingTimestamp = readingTimestamp;
-        this.partitionOffset = partitionOffset;
-        this.partitionAssignmentTerm = partitionAssignmentTerm;
-        this.externalMetadata = ImmutableMap.copyOf(externalMetadata);
-        this.additionalHeaders = ImmutableList.copyOf(additionalHeaders);
-        this.subscription = subscription;
-        this.hasSubscriptionIdentityHeaders = hasSubscriptionIdentityHeaders;
-    }
-
-    public long getPublishingTimestamp() {
-        return publishingTimestamp;
-    }
-
-    public long getReadingTimestamp() {
-        return readingTimestamp;
+    public Builder() {}
+
+    public Builder fromMessage(Message message) {
+      this.id = message.getId();
+      this.data = message.getData();
+      this.contentType = message.getContentType();
+      this.topic = message.getTopic();
+      this.subscription = message.getSubscription();
+      this.hasSubscriptionIdentityHeaders = message.hasSubscriptionIdentityHeaders();
+      this.publishingTimestamp = message.getPublishingTimestamp();
+      this.readingTimestamp = message.getReadingTimestamp();
+      this.partitionOffset = message.partitionOffset;
+      this.partitionAssignmentTerm = message.partitionAssignmentTerm;
+      this.externalMetadata = message.getExternalMetadata();
+      this.additionalHeaders = message.getAdditionalHeaders();
+      this.schema = message.getSchema();
+
+      return this;
     }
 
-    public long getOffset() {
-        return partitionOffset.getOffset();
+    public Builder withData(byte[] data) {
+      this.data = data;
+      return this;
     }
 
-    public long getPartitionAssignmentTerm() {
-        return partitionAssignmentTerm;
+    public Builder withSchema(CompiledSchema<Schema> schema) {
+      this.schema = Optional.of(schema);
+      return this;
     }
 
-    @Override
-    public byte[] getData() {
-        return data;
+    public Builder withExternalMetadata(Map<String, String> externalMetadata) {
+      this.externalMetadata = ImmutableMap.copyOf(externalMetadata);
+      return this;
     }
 
-    @Override
-    public ContentType getContentType() {
-        return contentType;
+    public Builder withAdditionalHeaders(List<Header> additionalHeaders) {
+      this.additionalHeaders = ImmutableList.copyOf(additionalHeaders);
+      return this;
     }
 
-    public int getPartition() {
-        return partitionOffset.getPartition();
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public boolean isTtlExceeded(long ttlMillis) {
-        long currentTimestamp = System.currentTimeMillis();
-        return currentTimestamp > readingTimestamp + ttlMillis;
-    }
-
-    public void incrementRetryCounter(Collection<URI> succeededUris) {
-        this.retryCounter++;
-        this.succeededUris.addAll(succeededUris.stream().map(URI::toString).collect(toList()));
-    }
-
-    public int getRetryCounter() {
-        return retryCounter;
-    }
-
-    @Override
-    public Optional<CompiledSchema<Schema>> getSchema() {
-        return schema;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public Map<String, String> getExternalMetadata() {
-        return Collections.unmodifiableMap(externalMetadata);
-    }
-
-    public List<Header> getAdditionalHeaders() {
-        return Collections.unmodifiableList(additionalHeaders);
-    }
-
-    public long updateAndGetCurrentMessageBackoff(SubscriptionPolicy subscriptionPolicy) {
-        if (currentMessageBackoff == -1) {
-            currentMessageBackoff = subscriptionPolicy.getMessageBackoff();
-        } else {
-            currentMessageBackoff = Math.min(subscriptionPolicy.getBackoffMaxIntervalMillis(),
-                    (long) (currentMessageBackoff * subscriptionPolicy.getBackoffMultiplier()));
-        }
-        return currentMessageBackoff;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final Message other = (Message) obj;
-        return Objects.equals(this.id, other.id);
-    }
-
-    public static Builder message() {
-        return new Builder();
-    }
-
-    public KafkaTopicName getKafkaTopic() {
-        return partitionOffset.getTopic();
-    }
-
-    public PartitionOffset getPartitionOffset() {
-        return partitionOffset;
-    }
-
-    public boolean hasNotBeenSentTo(String uri) {
-        return !succeededUris.contains(uri);
-    }
-
-    public long getSize() {
-        return ArrayUtils.getLength(data);
-    }
+    public Builder withContentType(ContentType contentType) {
+      this.contentType = contentType;
 
-    public boolean hasSubscriptionIdentityHeaders() {
-        return hasSubscriptionIdentityHeaders;
+      return this;
     }
 
-    public String getSubscription() {
-        return subscription;
+    public Builder withNoSchema() {
+      this.schema = Optional.empty();
+      return this;
     }
 
-    public static class Builder {
-
-        private final Message message;
-
-        public Builder() {
-            message = new Message();
-        }
-
-        public Builder fromMessage(Message message) {
-            this.message.id = message.getId();
-            this.message.data = message.getData();
-            this.message.contentType = message.getContentType();
-            this.message.topic = message.getTopic();
-            this.message.subscription = message.getSubscription();
-            this.message.hasSubscriptionIdentityHeaders = message.hasSubscriptionIdentityHeaders();
-            this.message.publishingTimestamp = message.getPublishingTimestamp();
-            this.message.readingTimestamp = message.getReadingTimestamp();
-            this.message.partitionOffset = message.partitionOffset;
-            this.message.partitionAssignmentTerm = message.partitionAssignmentTerm;
-            this.message.externalMetadata = message.getExternalMetadata();
-            this.message.additionalHeaders = message.getAdditionalHeaders();
-            this.message.schema = message.getSchema();
-
-            return this;
-        }
-
-        public Builder withData(byte [] data) {
-            this.message.data = data;
-            return this;
-        }
-
-        public Builder withSchema(CompiledSchema<Schema> schema) {
-            this.message.schema = Optional.of(schema);
-            return this;
-        }
-
-        public Builder withExternalMetadata(Map<String, String> externalMetadata) {
-            this.message.externalMetadata = ImmutableMap.copyOf(externalMetadata);
-            return this;
-        }
-
-        public Builder withAdditionalHeaders(List<Header> additionalHeaders) {
-            this.message.additionalHeaders = ImmutableList.copyOf(additionalHeaders);
-            return this;
-        }
-
-        public Builder withContentType(ContentType contentType) {
-            this.message.contentType = contentType;
-
-            return this;
-        }
-
-        public Builder withNoSchema() {
-            this.message.schema = Optional.empty();
-            return this;
-        }
-
-        public Message build() {
-            return message;
-        }
+    public Message build() {
+      return new Message(
+          id,
+          topic,
+          data,
+          contentType,
+          schema,
+          publishingTimestamp,
+          readingTimestamp,
+          partitionOffset,
+          partitionAssignmentTerm,
+          externalMetadata,
+          additionalHeaders,
+          subscription,
+          hasSubscriptionIdentityHeaders);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ResilientMessageSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ResilientMessageSender.java
index 672a141eb7..f53149bd09 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ResilientMessageSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/ResilientMessageSender.java
@@ -1,10 +1,5 @@
 package pl.allegro.tech.hermes.consumers.consumer;
 
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimiter;
-import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
-import pl.allegro.tech.hermes.consumers.consumer.sender.timeout.FutureAsyncTimeout;
-
 import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
@@ -12,79 +7,78 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimiter;
+import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
+import pl.allegro.tech.hermes.consumers.consumer.sender.timeout.FutureAsyncTimeout;
 
 public class ResilientMessageSender {
-    private final ConsumerRateLimiter rateLimiter;
-    private final List<Predicate<MessageSendingResult>> ignore;
-    private final FutureAsyncTimeout async;
-    private final int requestTimeoutMs;
-    private final int asyncTimeoutMs;
+  private final ConsumerRateLimiter rateLimiter;
+  private final List<Predicate<MessageSendingResult>> ignore;
+  private final FutureAsyncTimeout async;
+  private final int requestTimeoutMs;
+  private final int asyncTimeoutMs;
 
-    public ResilientMessageSender(ConsumerRateLimiter rateLimiter,
-                                  Subscription subscription,
-                                  FutureAsyncTimeout async,
-                                  int requestTimeoutMs,
-                                  int asyncTimeoutMs) {
-        this.rateLimiter = rateLimiter;
-        this.ignore = ignorableErrors(subscription);
-        this.async = async;
-        this.requestTimeoutMs = requestTimeoutMs;
-        this.asyncTimeoutMs = asyncTimeoutMs;
-    }
+  public ResilientMessageSender(
+      ConsumerRateLimiter rateLimiter,
+      Subscription subscription,
+      FutureAsyncTimeout async,
+      int requestTimeoutMs,
+      int asyncTimeoutMs) {
+    this.rateLimiter = rateLimiter;
+    this.ignore = ignorableErrors(subscription);
+    this.async = async;
+    this.requestTimeoutMs = requestTimeoutMs;
+    this.asyncTimeoutMs = asyncTimeoutMs;
+  }
 
-    private static List<Predicate<MessageSendingResult>> ignorableErrors(Subscription subscription) {
-        Predicate<MessageSendingResult> ignore =
-                result -> result.ignoreInRateCalculation(
-                        subscription.getSerialSubscriptionPolicy().isRetryClientErrors(),
-                        subscription.hasOAuthPolicy()
-                );
-        return Collections.singletonList(ignore);
-    }
+  private static List<Predicate<MessageSendingResult>> ignorableErrors(Subscription subscription) {
+    Predicate<MessageSendingResult> ignore =
+        result ->
+            result.ignoreInRateCalculation(
+                subscription.getSerialSubscriptionPolicy().isRetryClientErrors(),
+                subscription.hasOAuthPolicy());
+    return Collections.singletonList(ignore);
+  }
 
-    public <T extends MessageSendingResult> CompletableFuture<T> send(
-            Consumer<CompletableFuture<T>> resultFutureConsumer,
-            Function<Throwable, T> exceptionMapper
-    ) {
-        try {
-            rateLimiter.acquire();
-            CompletableFuture<T> resultFuture = new CompletableFuture<>();
-            resultFutureConsumer.accept(resultFuture);
-            CompletableFuture<T> timeoutGuardedResultFuture = async.within(
-                    resultFuture,
-                    Duration.ofMillis(asyncTimeoutMs + requestTimeoutMs),
-                    exceptionMapper);
-            return withCompletionHandle(timeoutGuardedResultFuture, exceptionMapper);
-        } catch (Exception e) {
-            rateLimiter.registerFailedSending();
-            return CompletableFuture.completedFuture(exceptionMapper.apply(e));
-        }
+  public <T extends MessageSendingResult> CompletableFuture<T> send(
+      Consumer<CompletableFuture<T>> resultFutureConsumer, Function<Throwable, T> exceptionMapper) {
+    try {
+      CompletableFuture<T> resultFuture = new CompletableFuture<>();
+      resultFutureConsumer.accept(resultFuture);
+      CompletableFuture<T> timeoutGuardedResultFuture =
+          async.within(
+              resultFuture, Duration.ofMillis(asyncTimeoutMs + requestTimeoutMs), exceptionMapper);
+      return withCompletionHandle(timeoutGuardedResultFuture, exceptionMapper);
+    } catch (Exception e) {
+      rateLimiter.registerFailedSending();
+      return CompletableFuture.completedFuture(exceptionMapper.apply(e));
     }
+  }
 
-    private <T extends MessageSendingResult> CompletableFuture<T> withCompletionHandle(
-            CompletableFuture<T> future,
-            Function<Throwable, T> exceptionMapper
-    ) {
-        return future.handle((result, throwable) -> {
-            if (throwable != null) {
-                rateLimiter.registerFailedSending();
-                return exceptionMapper.apply(throwable);
+  private <T extends MessageSendingResult> CompletableFuture<T> withCompletionHandle(
+      CompletableFuture<T> future, Function<Throwable, T> exceptionMapper) {
+    return future.handle(
+        (result, throwable) -> {
+          if (throwable != null) {
+            rateLimiter.registerFailedSending();
+            return exceptionMapper.apply(throwable);
+          } else {
+            if (result.succeeded()) {
+              rateLimiter.registerSuccessfulSending();
             } else {
-                if (result.succeeded()) {
-                    rateLimiter.registerSuccessfulSending();
-                } else {
-                    registerResultInRateLimiter(result);
-                }
-                return result;
+              registerResultInRateLimiter(result);
             }
+            return result;
+          }
         });
-    }
+  }
 
-    private void registerResultInRateLimiter(MessageSendingResult result) {
-        if (ignore.stream().anyMatch(p -> p.test(result))) {
-            rateLimiter.registerSuccessfulSending();
-        } else {
-            rateLimiter.registerFailedSending();
-        }
+  private void registerResultInRateLimiter(MessageSendingResult result) {
+    if (ignore.stream().anyMatch(p -> p.test(result))) {
+      rateLimiter.registerSuccessfulSending();
+    } else {
+      rateLimiter.registerFailedSending();
     }
-
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/SerialConsumer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/SerialConsumer.java
index eadc260ba6..0897a48e34 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/SerialConsumer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/SerialConsumer.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.consumers.consumer;
 
+import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
+import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -9,203 +16,258 @@
 import pl.allegro.tech.hermes.consumers.CommonConsumerParameters;
 import pl.allegro.tech.hermes.consumers.consumer.converter.MessageConverterResolver;
 import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecorder;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
+import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
+import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetCommitter;
+import pl.allegro.tech.hermes.consumers.consumer.offset.PendingOffsets;
 import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
-import pl.allegro.tech.hermes.consumers.consumer.rate.AdjustableSemaphore;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.ConsumerProfiler;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.ConsumerRun;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.DefaultConsumerProfiler;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.Measurement;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.NoOpConsumerProfiler;
 import pl.allegro.tech.hermes.consumers.consumer.rate.SerialConsumerRateLimiter;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.MessageReceiver;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.ReceiverFactory;
 import pl.allegro.tech.hermes.consumers.consumer.receiver.UninitializedMessageReceiver;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.time.Duration;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
-import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
-
 public class SerialConsumer implements Consumer {
 
-    private static final Logger logger = LoggerFactory.getLogger(SerialConsumer.class);
-
-    private final ReceiverFactory messageReceiverFactory;
-    private final MetricsFacade metrics;
-    private final SerialConsumerRateLimiter rateLimiter;
-    private final Trackers trackers;
-    private final MessageConverterResolver messageConverterResolver;
-    private final ConsumerMessageSender sender;
-    private final boolean useTopicMessageSizeEnabled;
-    private final OffsetQueue offsetQueue;
-    private final ConsumerAuthorizationHandler consumerAuthorizationHandler;
-    private final AdjustableSemaphore inflightSemaphore;
-    private final SubscriptionLoadRecorder loadRecorder;
-
-    private final int defaultInflight;
-    private final Duration signalProcessingInterval;
-
-    private Topic topic;
-    private Subscription subscription;
-
-    private MessageReceiver messageReceiver;
-
-    public SerialConsumer(ReceiverFactory messageReceiverFactory,
-                          MetricsFacade metrics,
-                          Subscription subscription,
-                          SerialConsumerRateLimiter rateLimiter,
-                          ConsumerMessageSenderFactory consumerMessageSenderFactory,
-                          Trackers trackers,
-                          MessageConverterResolver messageConverterResolver,
-                          Topic topic,
-                          CommonConsumerParameters commonConsumerParameters,
-                          OffsetQueue offsetQueue,
-                          ConsumerAuthorizationHandler consumerAuthorizationHandler,
-                          SubscriptionLoadRecorder loadRecorder) {
-
-        this.defaultInflight = commonConsumerParameters.getSerialConsumer().getInflightSize();
-        this.signalProcessingInterval = commonConsumerParameters.getSerialConsumer().getSignalProcessingInterval();
-        this.inflightSemaphore = new AdjustableSemaphore(calculateInflightSize(subscription));
-        this.messageReceiverFactory = messageReceiverFactory;
-        this.metrics = metrics;
-        this.subscription = subscription;
-        this.rateLimiter = rateLimiter;
-        this.useTopicMessageSizeEnabled = commonConsumerParameters.isUseTopicMessageSizeEnabled();
-        this.offsetQueue = offsetQueue;
-        this.consumerAuthorizationHandler = consumerAuthorizationHandler;
-        this.trackers = trackers;
-        this.messageConverterResolver = messageConverterResolver;
-        this.loadRecorder = loadRecorder;
-        this.messageReceiver = new UninitializedMessageReceiver();
-        this.topic = topic;
-        this.sender = consumerMessageSenderFactory.create(
-                subscription,
-                rateLimiter,
-                offsetQueue,
-                inflightSemaphore::release,
-                loadRecorder,
-                metrics
-        );
-    }
+  private static final Logger logger = LoggerFactory.getLogger(SerialConsumer.class);
 
-    private int calculateInflightSize(Subscription subscription) {
-        Optional<Integer> subscriptionInflight = Optional.ofNullable(subscription.getSerialSubscriptionPolicy().getInflightSize());
-        return subscriptionInflight.orElse(defaultInflight);
-    }
+  private final ReceiverFactory messageReceiverFactory;
+  private final MetricsFacade metrics;
+  private final SerialConsumerRateLimiter rateLimiter;
+  private final Trackers trackers;
+  private final MessageConverterResolver messageConverterResolver;
+  private final ConsumerMessageSender sender;
+  private final boolean useTopicMessageSizeEnabled;
+  private final PendingOffsets pendingOffsets;
+  private final ConsumerAuthorizationHandler consumerAuthorizationHandler;
+  private final SubscriptionLoadRecorder loadRecorder;
+  private final OffsetCommitter offsetCommitter;
+  private final Duration commitPeriod;
 
-    @Override
-    public void consume(Runnable signalsInterrupt) {
-        try {
-            do {
-                loadRecorder.recordSingleOperation();
-                signalsInterrupt.run();
-            } while (!inflightSemaphore.tryAcquire(signalProcessingInterval.toMillis(), TimeUnit.MILLISECONDS));
-
-            Optional<Message> maybeMessage = messageReceiver.next();
-
-            if (maybeMessage.isPresent()) {
-                Message message = maybeMessage.get();
-
-                if (logger.isDebugEnabled()) {
-                    logger.debug(
-                            "Read message {} partition {} offset {}",
-                            message.getContentType(), message.getPartition(), message.getOffset()
-                    );
-                }
-
-                Message convertedMessage = messageConverterResolver.converterFor(message, subscription).convert(message, topic);
-                sendMessage(convertedMessage);
-            } else {
-                inflightSemaphore.release();
-            }
-        } catch (InterruptedException e) {
-            logger.info("Restoring interrupted status {}", subscription.getQualifiedName(), e);
-            Thread.currentThread().interrupt();
-        } catch (Exception e) {
-            logger.error("Consumer loop failed for {}", subscription.getQualifiedName(), e);
-        }
-    }
+  private final int defaultInflight;
+  private final Duration signalProcessingInterval;
 
-    private void sendMessage(Message message) {
-        offsetQueue.offerInflightOffset(
-                subscriptionPartitionOffset(subscription.getQualifiedName(),
-                message.getPartitionOffset(),
-                message.getPartitionAssignmentTerm())
-        );
+  private Topic topic;
+  private Subscription subscription;
 
-        trackers.get(subscription).logInflight(toMessageMetadata(message, subscription));
+  private MessageReceiver messageReceiver;
 
-        sender.sendAsync(message);
-    }
+  private Instant lastCommitTime;
 
-    @Override
-    public void initialize() {
-        logger.info("Consumer: preparing message receiver for subscription {}", subscription.getQualifiedName());
-        initializeMessageReceiver();
-        sender.initialize();
-        rateLimiter.initialize();
-        loadRecorder.initialize();
-        consumerAuthorizationHandler.createSubscriptionHandler(subscription.getQualifiedName());
-    }
+  public SerialConsumer(
+      ReceiverFactory messageReceiverFactory,
+      MetricsFacade metrics,
+      Subscription subscription,
+      SerialConsumerRateLimiter rateLimiter,
+      ConsumerMessageSenderFactory consumerMessageSenderFactory,
+      Trackers trackers,
+      MessageConverterResolver messageConverterResolver,
+      Topic topic,
+      CommonConsumerParameters commonConsumerParameters,
+      ConsumerAuthorizationHandler consumerAuthorizationHandler,
+      SubscriptionLoadRecorder loadRecorder,
+      ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
+      Duration commitPeriod,
+      int offsetQueueSize) {
+    this.defaultInflight = commonConsumerParameters.getSerialConsumer().getInflightSize();
+    this.signalProcessingInterval =
+        commonConsumerParameters.getSerialConsumer().getSignalProcessingInterval();
+    this.messageReceiverFactory = messageReceiverFactory;
+    this.metrics = metrics;
+    this.subscription = subscription;
+    this.rateLimiter = rateLimiter;
+    this.useTopicMessageSizeEnabled = commonConsumerParameters.isUseTopicMessageSizeEnabled();
+    this.pendingOffsets =
+        new PendingOffsets(
+            subscription.getQualifiedName(),
+            metrics,
+            calculateInflightSize(subscription),
+            offsetQueueSize);
+    this.consumerAuthorizationHandler = consumerAuthorizationHandler;
+    this.trackers = trackers;
+    this.messageConverterResolver = messageConverterResolver;
+    this.loadRecorder = loadRecorder;
+    this.messageReceiver = new UninitializedMessageReceiver();
+    this.topic = topic;
+    this.offsetCommitter = new OffsetCommitter(consumerPartitionAssignmentState, metrics);
+    this.sender =
+        consumerMessageSenderFactory.create(
+            subscription, rateLimiter, pendingOffsets, loadRecorder, metrics);
+    this.commitPeriod = commitPeriod;
+    this.lastCommitTime = Instant.now();
+  }
 
-    private void initializeMessageReceiver() {
-        this.messageReceiver = messageReceiverFactory.createMessageReceiver(topic, subscription, rateLimiter, loadRecorder, metrics);
-    }
+  private int calculateInflightSize(Subscription subscription) {
+    Optional<Integer> subscriptionInflight =
+        Optional.ofNullable(subscription.getSerialSubscriptionPolicy().getInflightSize());
+    return subscriptionInflight.orElse(defaultInflight);
+  }
 
-    /**
-     * Try to keep shutdown order the same as initialization so nothing will left to clean up when error occurs during initialization.
-     */
-    @Override
-    public void tearDown() {
-        messageReceiver.stop();
-        sender.shutdown();
-        rateLimiter.shutdown();
-        loadRecorder.shutdown();
-        consumerAuthorizationHandler.removeSubscriptionHandler(subscription.getQualifiedName());
-        metrics.unregisterAllMetricsRelatedTo(subscription.getQualifiedName());
-    }
+  @Override
+  public void consume(Runnable signalsInterrupt) {
+    try {
+      ConsumerProfiler profiler =
+          subscription.isProfilingEnabled()
+              ? new DefaultConsumerProfiler(
+                  subscription.getQualifiedName(), subscription.getProfilingThresholdMs())
+              : new NoOpConsumerProfiler();
+      profiler.startMeasurements(Measurement.SIGNALS_AND_SEMAPHORE_ACQUIRE);
+      do {
+        loadRecorder.recordSingleOperation();
+        profiler.startPartialMeasurement(Measurement.SIGNALS_INTERRUPT_RUN);
+        signalsInterrupt.run();
+        commitIfReady();
+        profiler.stopPartialMeasurement();
+      } while (!pendingOffsets.tryAcquireSlot(signalProcessingInterval));
 
-    @Override
-    public void updateSubscription(Subscription newSubscription) {
-        logger.info("Updating consumer for subscription {}", subscription.getQualifiedName());
-        inflightSemaphore.setMaxPermits(calculateInflightSize(newSubscription));
-        rateLimiter.updateSubscription(newSubscription);
-        sender.updateSubscription(newSubscription);
-        messageReceiver.update(newSubscription);
-        consumerAuthorizationHandler.updateSubscription(newSubscription.getQualifiedName());
-        this.subscription = newSubscription;
-    }
+      profiler.measure(Measurement.MESSAGE_RECEIVER_NEXT);
+      Optional<Message> maybeMessage = messageReceiver.next();
+
+      profiler.measure(Measurement.MESSAGE_CONVERSION);
+      if (maybeMessage.isPresent()) {
+        Message message = maybeMessage.get();
 
-    @Override
-    public void updateTopic(Topic newTopic) {
-        if (this.topic.getContentType() != newTopic.getContentType()
-                || messageSizeChanged(newTopic)
-                || this.topic.isSchemaIdAwareSerializationEnabled() != newTopic.isSchemaIdAwareSerializationEnabled()) {
-            logger.info("Reinitializing message receiver, contentType, messageSize or schemaIdAwareSerialization changed.");
-            this.topic = newTopic;
+        if (message.isFiltered()) {
+          profiler.flushMeasurements(ConsumerRun.FILTERED);
+        } else {
+          if (logger.isDebugEnabled()) {
+            logger.debug(
+                "Read message {} partition {} offset {}",
+                message.getContentType(),
+                message.getPartition(),
+                message.getOffset());
+          }
 
-            messageReceiver.stop();
-            initializeMessageReceiver();
+          Message convertedMessage =
+              messageConverterResolver.converterFor(message, subscription).convert(message, topic);
+          sendMessage(convertedMessage, profiler);
         }
+      } else {
+        pendingOffsets.releaseSlot();
+        profiler.flushMeasurements(ConsumerRun.EMPTY);
+      }
+    } catch (InterruptedException e) {
+      logger.info("Restoring interrupted status {}", subscription.getQualifiedName(), e);
+      Thread.currentThread().interrupt();
+    } catch (Exception e) {
+      logger.error("Consumer loop failed for {}", subscription.getQualifiedName(), e);
     }
+  }
 
-    private boolean messageSizeChanged(Topic newTopic) {
-        return this.topic.getMaxMessageSize() != newTopic.getMaxMessageSize()
-                && useTopicMessageSizeEnabled;
+  private void commitIfReady() {
+    if (isReadyToCommit()) {
+      Set<SubscriptionPartitionOffset> offsetsToCommit =
+          offsetCommitter.calculateOffsetsToBeCommitted(
+              pendingOffsets.getOffsetsSnapshotAndReleaseProcessedSlots());
+      if (!offsetsToCommit.isEmpty()) {
+        commit(offsetsToCommit);
+      }
+      lastCommitTime = Instant.now();
     }
+  }
 
-    @Override
-    public void commit(Set<SubscriptionPartitionOffset> offsets) {
-        messageReceiver.commit(offsets);
-    }
+  private boolean isReadyToCommit() {
+    return Duration.between(lastCommitTime, Instant.now()).toMillis() > commitPeriod.toMillis();
+  }
 
-    @Override
-    public boolean moveOffset(PartitionOffset offset) {
-        return messageReceiver.moveOffset(offset);
-    }
+  private void sendMessage(Message message, ConsumerProfiler profiler) throws InterruptedException {
+    profiler.measure(Measurement.OFFER_INFLIGHT_OFFSET);
+    pendingOffsets.markAsInflight(
+        subscriptionPartitionOffset(
+            subscription.getQualifiedName(),
+            message.getPartitionOffset(),
+            message.getPartitionAssignmentTerm()));
+
+    profiler.measure(Measurement.TRACKERS_LOG_INFLIGHT);
+    trackers.get(subscription).logInflight(toMessageMetadata(message, subscription));
+
+    sender.sendAsync(message, profiler);
+  }
 
-    @Override
-    public Subscription getSubscription() {
-        return subscription;
+  @Override
+  public void initialize() {
+    logger.info(
+        "Consumer: preparing message receiver for subscription {}",
+        subscription.getQualifiedName());
+    initializeMessageReceiver();
+    sender.initialize();
+    rateLimiter.initialize();
+    loadRecorder.initialize();
+    consumerAuthorizationHandler.createSubscriptionHandler(subscription.getQualifiedName());
+  }
+
+  private void initializeMessageReceiver() {
+    this.messageReceiver =
+        messageReceiverFactory.createMessageReceiver(
+            topic,
+            subscription,
+            rateLimiter,
+            loadRecorder,
+            metrics,
+            pendingOffsets::markAsProcessed);
+  }
+
+  /**
+   * Try to keep shutdown order the same as initialization so nothing will left to clean up when
+   * error occurs during initialization.
+   */
+  @Override
+  public void tearDown() {
+    messageReceiver.stop();
+    sender.shutdown();
+    rateLimiter.shutdown();
+    loadRecorder.shutdown();
+    consumerAuthorizationHandler.removeSubscriptionHandler(subscription.getQualifiedName());
+    metrics.unregisterAllMetricsRelatedTo(subscription.getQualifiedName());
+  }
+
+  @Override
+  public void updateSubscription(Subscription newSubscription) {
+    logger.info("Updating consumer for subscription {}", subscription.getQualifiedName());
+    pendingOffsets.setInflightSize(calculateInflightSize(newSubscription));
+    rateLimiter.updateSubscription(newSubscription);
+    sender.updateSubscription(newSubscription);
+    messageReceiver.update(newSubscription);
+    consumerAuthorizationHandler.updateSubscription(newSubscription.getQualifiedName());
+    this.subscription = newSubscription;
+  }
+
+  @Override
+  public void updateTopic(Topic newTopic) {
+    if (this.topic.getContentType() != newTopic.getContentType()
+        || messageSizeChanged(newTopic)
+        || this.topic.isSchemaIdAwareSerializationEnabled()
+            != newTopic.isSchemaIdAwareSerializationEnabled()) {
+      logger.info(
+          "Reinitializing message receiver, contentType, messageSize or schemaIdAwareSerialization changed.");
+      this.topic = newTopic;
+
+      messageReceiver.stop();
+      initializeMessageReceiver();
     }
+  }
+
+  private boolean messageSizeChanged(Topic newTopic) {
+    return this.topic.getMaxMessageSize() != newTopic.getMaxMessageSize()
+        && useTopicMessageSizeEnabled;
+  }
+
+  @Override
+  public void commit(Set<SubscriptionPartitionOffset> offsets) {
+    messageReceiver.commit(offsets);
+  }
+
+  @Override
+  public boolean moveOffset(PartitionOffset offset) {
+    return messageReceiver.moveOffset(offset);
+  }
+
+  @Override
+  public Subscription getSubscription() {
+    return subscription;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/SerialConsumerParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/SerialConsumerParameters.java
index 4b2a3be9ac..6cb077ff17 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/SerialConsumerParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/SerialConsumerParameters.java
@@ -4,7 +4,7 @@
 
 public interface SerialConsumerParameters {
 
-    Duration getSignalProcessingInterval();
+  Duration getSignalProcessingInterval();
 
-    int getInflightSize();
+  int getInflightSize();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/ByteBufferMessageBatchFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/ByteBufferMessageBatchFactory.java
index 09ecbfc037..ddee065f08 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/ByteBufferMessageBatchFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/ByteBufferMessageBatchFactory.java
@@ -1,46 +1,51 @@
 package pl.allegro.tech.hermes.consumers.consumer.batch;
 
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.UUID.randomUUID;
 
 import java.nio.ByteBuffer;
 import java.time.Clock;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.UUID.randomUUID;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 
 public class ByteBufferMessageBatchFactory implements MessageBatchFactory {
-    private final DirectBufferPool bufferPool;
-    private final Clock clock;
+  private final DirectBufferPool bufferPool;
+  private final Clock clock;
 
-    public ByteBufferMessageBatchFactory(int poolableSize, int maxPoolSize, Clock clock, MetricsFacade metrics) {
-        this.clock = clock;
-        this.bufferPool = new DirectBufferPool(maxPoolSize, poolableSize, true);
-        metrics.consumer().registerBatchBufferTotalBytesGauge(bufferPool, DirectBufferPool::totalMemory);
-        metrics.consumer().registerBatchBufferAvailableBytesGauge(bufferPool, DirectBufferPool::availableMemory);
-    }
+  public ByteBufferMessageBatchFactory(
+      int poolableSize, int maxPoolSize, Clock clock, MetricsFacade metrics) {
+    this.clock = clock;
+    this.bufferPool = new DirectBufferPool(maxPoolSize, poolableSize, true);
+    metrics
+        .consumer()
+        .registerBatchBufferTotalBytesGauge(bufferPool, DirectBufferPool::totalMemory);
+    metrics
+        .consumer()
+        .registerBatchBufferAvailableBytesGauge(bufferPool, DirectBufferPool::availableMemory);
+  }
 
-    @Override
-    public MessageBatch createBatch(Subscription subscription) {
-        try {
-            ByteBuffer buffer = bufferPool.allocate(subscription.getBatchSubscriptionPolicy().getBatchVolume());
-            switch (subscription.getContentType()) {
-                case JSON:
-                    return new JsonMessageBatch(randomUUID().toString(), buffer, subscription, clock);
-                case AVRO:
-                default:
-                    throw new UnsupportedOperationException(
-                            "Batching is not supported yet for contentType " + subscription.getContentType());
-            }
-        } catch (InterruptedException e) {
-            throw new InternalProcessingException(e);
-        }
+  @Override
+  public MessageBatch createBatch(Subscription subscription) {
+    try {
+      ByteBuffer buffer =
+          bufferPool.allocate(subscription.getBatchSubscriptionPolicy().getBatchVolume());
+      switch (subscription.getContentType()) {
+        case JSON:
+          return new JsonMessageBatch(randomUUID().toString(), buffer, subscription, clock);
+        case AVRO:
+        default:
+          throw new UnsupportedOperationException(
+              "Batching is not supported yet for contentType " + subscription.getContentType());
+      }
+    } catch (InterruptedException e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    @Override
-    public void destroyBatch(MessageBatch batch) {
-        checkNotNull(batch);
-        bufferPool.deallocate(batch.getContent());
-    }
+  @Override
+  public void destroyBatch(MessageBatch batch) {
+    checkNotNull(batch);
+    bufferPool.deallocate(batch.getContent());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferPool.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferPool.java
index 4db98100bc..f0544db6cf 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferPool.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferPool.java
@@ -1,17 +1,15 @@
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * <p>Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 package pl.allegro.tech.hermes.consumers.consumer.batch;
@@ -35,221 +33,210 @@
  *
  * */
 
-
 /**
- * A pool of ByteBuffers kept under a given memory limit. This class is fairly specific to the needs of the producer. In
- * particular it has the following properties:
+ * A pool of ByteBuffers kept under a given memory limit. This class is fairly specific to the needs
+ * of the producer. In particular it has the following properties:
+ *
  * <ol>
- * <li>There is a special "poolable size" and buffers of this size are kept in a free list and recycled
- * <li>It is fair. That is all memory is given to the longest waiting thread until it has sufficient memory. This
- * prevents starvation or deadlock when a thread asks for a large chunk of memory and needs to block until multiple
- * buffers are deallocated.
+ *   <li>There is a special "poolable size" and buffers of this size are kept in a free list and
+ *       recycled
+ *   <li>It is fair. That is all memory is given to the longest waiting thread until it has
+ *       sufficient memory. This prevents starvation or deadlock when a thread asks for a large
+ *       chunk of memory and needs to block until multiple buffers are deallocated.
  * </ol>
  */
 public final class DirectBufferPool {
 
-    private final long totalMemory;
-    private final int poolableSize;
-    private final boolean blockOnExhaustion;
-    private final ReentrantLock lock;
-    private final Deque<ByteBuffer> free;
-    private final Deque<Condition> waiters;
-    private long availableMemory;
-
-    /**
-     * Create a new buffer pool
-     *
-     * @param memory The maximum amount of memory that this buffer pool can allocate
-     * @param poolableSize The buffer size to cache in the free list rather than deallocating
-     * @param blockOnExhaustion This controls the behavior when the buffer pool is out of memory. If true the
-     *        {@link #allocate(int)} call will block and wait for memory to be returned to the pool. If false
-     *        {@link #allocate(int)} will throw an exception if the buffer is out of memory.
-     */
-    public DirectBufferPool(long memory, int poolableSize, boolean blockOnExhaustion) {
-        this.poolableSize = poolableSize;
-        this.blockOnExhaustion = blockOnExhaustion;
-        this.lock = new ReentrantLock();
-        this.free = new ArrayDeque<>();
-        this.waiters = new ArrayDeque<>();
-        this.totalMemory = memory;
-        this.availableMemory = memory;
-    }
-
-    /**
-     * Allocate a buffer of the given size. This method blocks if there is not enough memory and the buffer pool
-     * is configured with blocking mode.
-     *
-     * @param size The buffer size to allocate in bytes
-     * @return The buffer
-     * @throws InterruptedException If the thread is interrupted while blocked
-     * @throws IllegalArgumentException if size is larger than the total memory controlled by the pool (and hence we would block
-     *         forever)
-     * @throws BufferOverflowException if the pool is in non-blocking mode and size exceeds the free memory in the pool
-     */
-    public ByteBuffer allocate(int size) throws InterruptedException {
-        if (size > this.totalMemory)
-            throw new IllegalArgumentException("Attempt to allocate " + size
-                    + " bytes, but there is a hard limit of "
-                    + this.totalMemory
-                    + " on memory allocations.");
-
-        this.lock.lock();
-        try {
-            // check if we have a free buffer of the right size pooled
-            if (size == poolableSize && !this.free.isEmpty())
-                return this.free.pollFirst();
-
-            // now check if the request is immediately satisfiable with the
-            // memory on hand or if we need to block
-            int freeListSize = this.free.size() * this.poolableSize;
-            if (this.availableMemory + freeListSize >= size) {
-                // we have enough unallocated or pooled memory to immediately
-                // satisfy the request
-                freeUp(size);
-                this.availableMemory -= size;
-                lock.unlock();
-                return ByteBuffer.allocateDirect(size);
-            } else if (!blockOnExhaustion) {
-                throw new BufferOverflowException();
-            } else {
-                // we are out of memory and will have to block
-                int accumulated = 0;
-                ByteBuffer buffer = null;
-                Condition moreMemory = this.lock.newCondition();
-                this.waiters.addLast(moreMemory);
-                // loop over and over until we have a buffer or have reserved
-                // enough memory to allocate one
-                while (accumulated < size) {
-                    moreMemory.await();
-
-                    // check if we can satisfy this request from the free list,
-                    // otherwise allocate memory
-                    if (accumulated == 0 && size == this.poolableSize && !this.free.isEmpty()) {
-                        // just grab a buffer from the free list
-                        buffer = this.free.pollFirst();
-                        accumulated = size;
-                    } else {
-                        // we'll need to allocate memory, but we may only get
-                        // part of what we need on this iteration
-                        freeUp(size - accumulated);
-                        int got = (int) Math.min(size - accumulated, this.availableMemory);
-                        this.availableMemory -= got;
-                        accumulated += got;
-                    }
-                }
-
-                // remove the condition for this thread to let the next thread
-                // in line start getting memory
-                Condition removed = this.waiters.removeFirst();
-                if (removed != moreMemory)
-                    throw new IllegalStateException("Wrong condition: this shouldn't happen.");
-
-                // signal any additional waiters if there is more memory left
-                // over for them
-                if (this.availableMemory > 0 || !this.free.isEmpty()) {
-                    if (!this.waiters.isEmpty())
-                        this.waiters.peekFirst().signal();
-                }
-
-                // unlock and return the buffer
-                lock.unlock();
-                if (buffer == null)
-                    return ByteBuffer.allocateDirect(size);
-                else
-                    return buffer;
-            }
-        } finally {
-            if (lock.isHeldByCurrentThread())
-                lock.unlock();
+  private final long totalMemory;
+  private final int poolableSize;
+  private final boolean blockOnExhaustion;
+  private final ReentrantLock lock;
+  private final Deque<ByteBuffer> free;
+  private final Deque<Condition> waiters;
+  private long availableMemory;
+
+  /**
+   * Create a new buffer pool
+   *
+   * @param memory The maximum amount of memory that this buffer pool can allocate
+   * @param poolableSize The buffer size to cache in the free list rather than deallocating
+   * @param blockOnExhaustion This controls the behavior when the buffer pool is out of memory. If
+   *     true the {@link #allocate(int)} call will block and wait for memory to be returned to the
+   *     pool. If false {@link #allocate(int)} will throw an exception if the buffer is out of
+   *     memory.
+   */
+  public DirectBufferPool(long memory, int poolableSize, boolean blockOnExhaustion) {
+    this.poolableSize = poolableSize;
+    this.blockOnExhaustion = blockOnExhaustion;
+    this.lock = new ReentrantLock();
+    this.free = new ArrayDeque<>();
+    this.waiters = new ArrayDeque<>();
+    this.totalMemory = memory;
+    this.availableMemory = memory;
+  }
+
+  /**
+   * Allocate a buffer of the given size. This method blocks if there is not enough memory and the
+   * buffer pool is configured with blocking mode.
+   *
+   * @param size The buffer size to allocate in bytes
+   * @return The buffer
+   * @throws InterruptedException If the thread is interrupted while blocked
+   * @throws IllegalArgumentException if size is larger than the total memory controlled by the pool
+   *     (and hence we would block forever)
+   * @throws BufferOverflowException if the pool is in non-blocking mode and size exceeds the free
+   *     memory in the pool
+   */
+  public ByteBuffer allocate(int size) throws InterruptedException {
+    if (size > this.totalMemory)
+      throw new IllegalArgumentException(
+          "Attempt to allocate "
+              + size
+              + " bytes, but there is a hard limit of "
+              + this.totalMemory
+              + " on memory allocations.");
+
+    this.lock.lock();
+    try {
+      // check if we have a free buffer of the right size pooled
+      if (size == poolableSize && !this.free.isEmpty()) return this.free.pollFirst();
+
+      // now check if the request is immediately satisfiable with the
+      // memory on hand or if we need to block
+      int freeListSize = this.free.size() * this.poolableSize;
+      if (this.availableMemory + freeListSize >= size) {
+        // we have enough unallocated or pooled memory to immediately
+        // satisfy the request
+        freeUp(size);
+        this.availableMemory -= size;
+        lock.unlock();
+        return ByteBuffer.allocateDirect(size);
+      } else if (!blockOnExhaustion) {
+        throw new BufferOverflowException();
+      } else {
+        // we are out of memory and will have to block
+        int accumulated = 0;
+        ByteBuffer buffer = null;
+        Condition moreMemory = this.lock.newCondition();
+        this.waiters.addLast(moreMemory);
+        // loop over and over until we have a buffer or have reserved
+        // enough memory to allocate one
+        while (accumulated < size) {
+          moreMemory.await();
+
+          // check if we can satisfy this request from the free list,
+          // otherwise allocate memory
+          if (accumulated == 0 && size == this.poolableSize && !this.free.isEmpty()) {
+            // just grab a buffer from the free list
+            buffer = this.free.pollFirst();
+            accumulated = size;
+          } else {
+            // we'll need to allocate memory, but we may only get
+            // part of what we need on this iteration
+            freeUp(size - accumulated);
+            int got = (int) Math.min(size - accumulated, this.availableMemory);
+            this.availableMemory -= got;
+            accumulated += got;
+          }
         }
-    }
 
-    /**
-     * Attempt to ensure we have at least the requested number of bytes of memory for allocation by deallocating pooled
-     * buffers (if needed)
-     */
-    private void freeUp(int size) {
-        while (!this.free.isEmpty() && this.availableMemory < size)
-            this.availableMemory += this.free.pollLast().capacity();
-    }
+        // remove the condition for this thread to let the next thread
+        // in line start getting memory
+        Condition removed = this.waiters.removeFirst();
+        if (removed != moreMemory)
+          throw new IllegalStateException("Wrong condition: this shouldn't happen.");
 
-    /**
-     * Return buffers to the pool. If they are of the poolable size add them to the free list, otherwise just mark the
-     * memory as free.
-     *
-     * @param buffer The buffer to return
-     * @param size The size of the buffer to mark as deallocated, note that this maybe smaller than buffer.capacity
-     *             since the buffer may re-allocate itself during in-place compression
-     */
-    public void deallocate(ByteBuffer buffer, int size) {
-        lock.lock();
-        try {
-            if (size == this.poolableSize && size == buffer.capacity()) {
-                buffer.clear();
-                this.free.add(buffer);
-            } else {
-                DirectBufferUtils.release(buffer);
-                this.availableMemory += size;
-            }
-            Condition moreMem = this.waiters.peekFirst();
-            if (moreMem != null)
-                moreMem.signal();
-        } finally {
-            lock.unlock();
+        // signal any additional waiters if there is more memory left
+        // over for them
+        if (this.availableMemory > 0 || !this.free.isEmpty()) {
+          if (!this.waiters.isEmpty()) this.waiters.peekFirst().signal();
         }
-    }
 
-    public void deallocate(ByteBuffer buffer) {
-        deallocate(buffer, buffer.capacity());
+        // unlock and return the buffer
+        lock.unlock();
+        if (buffer == null) return ByteBuffer.allocateDirect(size);
+        else return buffer;
+      }
+    } finally {
+      if (lock.isHeldByCurrentThread()) lock.unlock();
     }
-
-    /**
-     * the total free memory both unallocated and in the free list
-     */
-    public long availableMemory() {
-        lock.lock();
-        try {
-            return this.availableMemory + this.free.size() * this.poolableSize;
-        } finally {
-            lock.unlock();
-        }
+  }
+
+  /**
+   * Attempt to ensure we have at least the requested number of bytes of memory for allocation by
+   * deallocating pooled buffers (if needed)
+   */
+  private void freeUp(int size) {
+    while (!this.free.isEmpty() && this.availableMemory < size)
+      this.availableMemory += this.free.pollLast().capacity();
+  }
+
+  /**
+   * Return buffers to the pool. If they are of the poolable size add them to the free list,
+   * otherwise just mark the memory as free.
+   *
+   * @param buffer The buffer to return
+   * @param size The size of the buffer to mark as deallocated, note that this maybe smaller than
+   *     buffer.capacity since the buffer may re-allocate itself during in-place compression
+   */
+  public void deallocate(ByteBuffer buffer, int size) {
+    lock.lock();
+    try {
+      if (size == this.poolableSize && size == buffer.capacity()) {
+        buffer.clear();
+        this.free.add(buffer);
+      } else {
+        DirectBufferUtils.release(buffer);
+        this.availableMemory += size;
+      }
+      Condition moreMem = this.waiters.peekFirst();
+      if (moreMem != null) moreMem.signal();
+    } finally {
+      lock.unlock();
     }
-
-    /**
-     * Get the unallocated memory (not in the free list or in use)
-     */
-    public long unallocatedMemory() {
-        lock.lock();
-        try {
-            return this.availableMemory;
-        } finally {
-            lock.unlock();
-        }
+  }
+
+  public void deallocate(ByteBuffer buffer) {
+    deallocate(buffer, buffer.capacity());
+  }
+
+  /** the total free memory both unallocated and in the free list */
+  public long availableMemory() {
+    lock.lock();
+    try {
+      return this.availableMemory + this.free.size() * this.poolableSize;
+    } finally {
+      lock.unlock();
     }
-
-    /**
-     * The number of threads blocked waiting on memory
-     */
-    public int queued() {
-        lock.lock();
-        try {
-            return this.waiters.size();
-        } finally {
-            lock.unlock();
-        }
+  }
+
+  /** Get the unallocated memory (not in the free list or in use) */
+  public long unallocatedMemory() {
+    lock.lock();
+    try {
+      return this.availableMemory;
+    } finally {
+      lock.unlock();
     }
-
-    /**
-     * The buffer size that will be retained in the free list after use
-     */
-    public int poolableSize() {
-        return this.poolableSize;
+  }
+
+  /** The number of threads blocked waiting on memory */
+  public int queued() {
+    lock.lock();
+    try {
+      return this.waiters.size();
+    } finally {
+      lock.unlock();
     }
+  }
 
-    /**
-     * The total memory managed by this pool
-     */
-    public long totalMemory() {
-        return this.totalMemory;
-    }
+  /** The buffer size that will be retained in the free list after use */
+  public int poolableSize() {
+    return this.poolableSize;
+  }
+
+  /** The total memory managed by this pool */
+  public long totalMemory() {
+    return this.totalMemory;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferUtils.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferUtils.java
index 96dfa34ec2..81a15e92d0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferUtils.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferUtils.java
@@ -1,56 +1,54 @@
 package pl.allegro.tech.hermes.consumers.consumer.batch;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class DirectBufferUtils {
-    private static final Logger logger = LoggerFactory.getLogger(DirectBufferUtils.class);
-
-    private static final DirectBufferCleaner CLEANER;
-
-    static {
-        DirectBufferCleaner cleaner;
-        try {
-            cleaner = new DirectBufferCleaner();
-        } catch (ReflectiveOperationException e) {
-            cleaner = null;
-        }
-        CLEANER = cleaner;
-    }
-
-    static boolean supportsReleasing() {
-        return CLEANER != null;
-    }
+  private static final Logger logger = LoggerFactory.getLogger(DirectBufferUtils.class);
 
+  private static final DirectBufferCleaner CLEANER;
 
-    static void release(ByteBuffer buffer) {
-        try {
-            if (supportsReleasing() && buffer.isDirect()) {
-                CLEANER.clean(buffer);
-            }
-        } catch (ReflectiveOperationException e) {
-            logger.warn("Releasing ByteBuffer failed", e);
-        }
+  static {
+    DirectBufferCleaner cleaner;
+    try {
+      cleaner = new DirectBufferCleaner();
+    } catch (ReflectiveOperationException e) {
+      cleaner = null;
+    }
+    CLEANER = cleaner;
+  }
+
+  static boolean supportsReleasing() {
+    return CLEANER != null;
+  }
+
+  static void release(ByteBuffer buffer) {
+    try {
+      if (supportsReleasing() && buffer.isDirect()) {
+        CLEANER.clean(buffer);
+      }
+    } catch (ReflectiveOperationException e) {
+      logger.warn("Releasing ByteBuffer failed", e);
+    }
+  }
+
+  static class DirectBufferCleaner {
+    private final Object unsafe;
+    private final Method invokeCleaner;
+
+    DirectBufferCleaner() throws ReflectiveOperationException {
+      Class<?> clazz = Class.forName("sun.misc.Unsafe");
+      Field field = clazz.getDeclaredField("theUnsafe");
+      field.setAccessible(true);
+      unsafe = field.get(null);
+      invokeCleaner = clazz.getMethod("invokeCleaner", ByteBuffer.class);
     }
 
-    static class DirectBufferCleaner {
-        private final Object unsafe;
-        private final Method invokeCleaner;
-
-        DirectBufferCleaner() throws ReflectiveOperationException {
-            Class<?> clazz = Class.forName("sun.misc.Unsafe");
-            Field field = clazz.getDeclaredField("theUnsafe");
-            field.setAccessible(true);
-            unsafe = field.get(null);
-            invokeCleaner = clazz.getMethod("invokeCleaner", ByteBuffer.class);
-        }
-
-        public void clean(ByteBuffer buffer) throws ReflectiveOperationException {
-            invokeCleaner.invoke(unsafe, buffer);
-        }
+    public void clean(ByteBuffer buffer) throws ReflectiveOperationException {
+      invokeCleaner.invoke(unsafe, buffer);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/JsonMessageBatch.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/JsonMessageBatch.java
index 794f40a939..5e0ee0cebd 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/JsonMessageBatch.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/JsonMessageBatch.java
@@ -1,13 +1,7 @@
 package pl.allegro.tech.hermes.consumers.consumer.batch;
 
-import pl.allegro.tech.hermes.api.ContentType;
-import pl.allegro.tech.hermes.api.Header;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
-import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
-import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
-import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
+import static com.google.common.base.Preconditions.checkState;
+import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
@@ -17,186 +11,195 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.annotation.concurrent.NotThreadSafe;
-
-import static com.google.common.base.Preconditions.checkState;
-import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
+import pl.allegro.tech.hermes.api.ContentType;
+import pl.allegro.tech.hermes.api.Header;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
+import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
+import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
+import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
 
 @NotThreadSafe
 public class JsonMessageBatch implements MessageBatch {
 
-    private final Clock clock;
-
-    private final int maxBatchTime;
-    private final int batchSize;
-
-    private final String id;
-    private final String topic;
-    private final SubscriptionName subscription;
-    private final boolean hasSubscriptionIdentityHeaders;
-    private final ByteBuffer byteBuffer;
-    private final List<MessageMetadata> metadata = new ArrayList<>();
-    private final List<Header> additionalHeaders;
-
-    private int elements = 0;
-    private long batchStart;
-    private boolean closed = false;
-    private int retryCounter = 0;
-
-    JsonMessageBatch(String id, ByteBuffer buffer, Subscription subscription, Clock clock) {
-        this.id = id;
-        this.clock = clock;
-        this.maxBatchTime = subscription.getBatchSubscriptionPolicy().getBatchTime();
-        this.batchSize = subscription.getBatchSubscriptionPolicy().getBatchSize();
-        this.byteBuffer = buffer;
-        this.additionalHeaders = subscription.getHeaders();
-        this.topic = subscription.getQualifiedTopicName();
-        this.subscription = subscription.getQualifiedName();
-        this.hasSubscriptionIdentityHeaders = subscription.isSubscriptionIdentityHeadersEnabled();
-    }
-
-    @Override
-    public boolean isFull() {
-        return elements >= batchSize || byteBuffer.remaining() < 2;
-    }
-
-    @Override
-    public void append(byte[] data, MessageMetadata metadata) {
-        checkState(!closed, "Batch already closed.");
-        if (!canFit(data)) {
-            throw new BufferOverflowException();
-        }
-        if (isEmpty()) {
-            batchStart = clock.millis();
-        }
-
-        byteBuffer.put((byte) (isEmpty() ? '[' : ',')).put(data);
-        this.metadata.add(metadata);
-        elements++;
-    }
-
-    @Override
-    public boolean canFit(byte[] data) {
-        return byteBuffer.remaining() >= requiredFreeSpace(data);
-    }
-
-    private int requiredFreeSpace(byte[] data) {
-        return data.length + 2;
-    }
-
-    @Override
-    public boolean isExpired() {
-        return !isEmpty() && getLifetime() > maxBatchTime;
-    }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public ContentType getContentType() {
-        return ContentType.JSON;
-    }
-
-    @Override
-    public MessageBatch close() {
-        if (!isEmpty()) {
-            byteBuffer.put((byte) ']');
-        }
-        int position = byteBuffer.position();
-        byteBuffer.position(0);
-        byteBuffer.limit(position);
-        this.closed = true;
-        return this;
-    }
-
-    @Override
-    public ByteBuffer getContent() {
-        if (closed) {
-            byteBuffer.position(0);
-        }
-        return byteBuffer;
-    }
-
-    @Override
-    public List<SubscriptionPartitionOffset> getPartitionOffsets() {
-        return metadata.stream()
-                .map(m -> subscriptionPartitionOffset(this.subscription,
-                        new PartitionOffset(KafkaTopicName.valueOf(m.getKafkaTopic()), m.getOffset(), m.getPartition()),
-                        m.getPartitionAssignmentTerm()))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<MessageMetadata> getMessagesMetadata() {
-        return Collections.unmodifiableList(metadata);
-    }
-
-    @Override
-    public List<Header> getAdditionalHeaders() {
-        return Collections.unmodifiableList(additionalHeaders);
-    }
-
-    @Override
-    public int getMessageCount() {
-        return elements;
-    }
-
-    @Override
-    public long getLifetime() {
-        return clock.millis() - batchStart;
-    }
-
-    @Override
-    public boolean isClosed() {
-        return closed;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return elements == 0;
-    }
-
-    @Override
-    public boolean isBiggerThanTotalCapacity(byte[] data) {
-        return requiredFreeSpace(data) > getCapacity();
-    }
-
-    @Override
-    public int getCapacity() {
-        return byteBuffer.capacity();
-    }
-
-    @Override
-    public int getSize() {
-        if (closed) {
-            return byteBuffer.limit();
-        }
-        return byteBuffer.position();
-    }
-
-    @Override
-    public void incrementRetryCounter() {
-        this.retryCounter++;
-    }
-
-    @Override
-    public int getRetryCounter() {
-        return retryCounter;
-    }
-
-    @Override
-    public boolean hasSubscriptionIdentityHeaders() {
-        return hasSubscriptionIdentityHeaders;
-    }
-
-    @Override
-    public String getTopic() {
-        return topic;
-    }
-
-    @Override
-    public SubscriptionName getSubscription() {
-        return subscription;
-    }
+  private final Clock clock;
+
+  private final int maxBatchTime;
+  private final int batchSize;
+
+  private final String id;
+  private final String topic;
+  private final SubscriptionName subscription;
+  private final boolean hasSubscriptionIdentityHeaders;
+  private final ByteBuffer byteBuffer;
+  private final List<MessageMetadata> metadata = new ArrayList<>();
+  private final List<Header> additionalHeaders;
+
+  private int elements = 0;
+  private long batchStart;
+  private boolean closed = false;
+  private int retryCounter = 0;
+
+  JsonMessageBatch(String id, ByteBuffer buffer, Subscription subscription, Clock clock) {
+    this.id = id;
+    this.clock = clock;
+    this.maxBatchTime = subscription.getBatchSubscriptionPolicy().getBatchTime();
+    this.batchSize = subscription.getBatchSubscriptionPolicy().getBatchSize();
+    this.byteBuffer = buffer;
+    this.additionalHeaders = subscription.getHeaders();
+    this.topic = subscription.getQualifiedTopicName();
+    this.subscription = subscription.getQualifiedName();
+    this.hasSubscriptionIdentityHeaders = subscription.isSubscriptionIdentityHeadersEnabled();
+  }
+
+  @Override
+  public boolean isFull() {
+    return elements >= batchSize || byteBuffer.remaining() < 2;
+  }
+
+  @Override
+  public void append(byte[] data, MessageMetadata metadata) {
+    checkState(!closed, "Batch already closed.");
+    if (!canFit(data)) {
+      throw new BufferOverflowException();
+    }
+    if (isEmpty()) {
+      batchStart = clock.millis();
+    }
+
+    byteBuffer.put((byte) (isEmpty() ? '[' : ',')).put(data);
+    this.metadata.add(metadata);
+    elements++;
+  }
+
+  @Override
+  public boolean canFit(byte[] data) {
+    return byteBuffer.remaining() >= requiredFreeSpace(data);
+  }
+
+  private int requiredFreeSpace(byte[] data) {
+    return data.length + 2;
+  }
+
+  @Override
+  public boolean isExpired() {
+    return !isEmpty() && getLifetime() > maxBatchTime;
+  }
+
+  @Override
+  public String getId() {
+    return id;
+  }
+
+  @Override
+  public ContentType getContentType() {
+    return ContentType.JSON;
+  }
+
+  @Override
+  public MessageBatch close() {
+    if (!isEmpty()) {
+      byteBuffer.put((byte) ']');
+    }
+    int position = byteBuffer.position();
+    byteBuffer.position(0);
+    byteBuffer.limit(position);
+    this.closed = true;
+    return this;
+  }
+
+  @Override
+  public ByteBuffer getContent() {
+    if (closed) {
+      byteBuffer.position(0);
+    }
+    return byteBuffer;
+  }
+
+  @Override
+  public List<SubscriptionPartitionOffset> getPartitionOffsets() {
+    return metadata.stream()
+        .map(
+            m ->
+                subscriptionPartitionOffset(
+                    this.subscription,
+                    new PartitionOffset(
+                        KafkaTopicName.valueOf(m.getKafkaTopic()), m.getOffset(), m.getPartition()),
+                    m.getPartitionAssignmentTerm()))
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public List<MessageMetadata> getMessagesMetadata() {
+    return Collections.unmodifiableList(metadata);
+  }
+
+  @Override
+  public List<Header> getAdditionalHeaders() {
+    return Collections.unmodifiableList(additionalHeaders);
+  }
+
+  @Override
+  public int getMessageCount() {
+    return elements;
+  }
+
+  @Override
+  public long getLifetime() {
+    return clock.millis() - batchStart;
+  }
+
+  @Override
+  public boolean isClosed() {
+    return closed;
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return elements == 0;
+  }
+
+  @Override
+  public boolean isBiggerThanTotalCapacity(byte[] data) {
+    return requiredFreeSpace(data) > getCapacity();
+  }
+
+  @Override
+  public int getCapacity() {
+    return byteBuffer.capacity();
+  }
+
+  @Override
+  public int getSize() {
+    if (closed) {
+      return byteBuffer.limit();
+    }
+    return byteBuffer.position();
+  }
+
+  @Override
+  public void incrementRetryCounter() {
+    this.retryCounter++;
+  }
+
+  @Override
+  public int getRetryCounter() {
+    return retryCounter;
+  }
+
+  @Override
+  public boolean hasSubscriptionIdentityHeaders() {
+    return hasSubscriptionIdentityHeaders;
+  }
+
+  @Override
+  public String getTopic() {
+    return topic;
+  }
+
+  @Override
+  public SubscriptionName getSubscription() {
+    return subscription;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatch.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatch.java
index ca43d73998..bb33c9303c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatch.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatch.java
@@ -1,64 +1,63 @@
 package pl.allegro.tech.hermes.consumers.consumer.batch;
 
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.util.List;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.Header;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
 import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
 
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.util.List;
-
 public interface MessageBatch {
 
-    default boolean isReadyForDelivery() {
-        return isClosed() || isFull() || isExpired();
-    }
+  default boolean isReadyForDelivery() {
+    return isClosed() || isFull() || isExpired();
+  }
 
-    void append(byte[] data, MessageMetadata batchMessageMetadata) throws BufferOverflowException;
+  void append(byte[] data, MessageMetadata batchMessageMetadata) throws BufferOverflowException;
 
-    boolean canFit(byte[] data);
+  boolean canFit(byte[] data);
 
-    boolean isExpired();
+  boolean isExpired();
 
-    boolean isClosed();
+  boolean isClosed();
 
-    boolean isFull();
+  boolean isFull();
 
-    String getId();
+  String getId();
 
-    ContentType getContentType();
+  ContentType getContentType();
 
-    ByteBuffer getContent();
+  ByteBuffer getContent();
 
-    List<SubscriptionPartitionOffset> getPartitionOffsets();
+  List<SubscriptionPartitionOffset> getPartitionOffsets();
 
-    List<MessageMetadata> getMessagesMetadata();
+  List<MessageMetadata> getMessagesMetadata();
 
-    List<Header> getAdditionalHeaders();
+  List<Header> getAdditionalHeaders();
 
-    long getLifetime();
+  long getLifetime();
 
-    int getMessageCount();
+  int getMessageCount();
 
-    MessageBatch close();
+  MessageBatch close();
 
-    boolean isEmpty();
+  boolean isEmpty();
 
-    boolean isBiggerThanTotalCapacity(byte[] data);
+  boolean isBiggerThanTotalCapacity(byte[] data);
 
-    int getCapacity();
+  int getCapacity();
 
-    int getSize();
+  int getSize();
 
-    void incrementRetryCounter();
+  void incrementRetryCounter();
 
-    int getRetryCounter();
+  int getRetryCounter();
 
-    boolean hasSubscriptionIdentityHeaders();
+  boolean hasSubscriptionIdentityHeaders();
 
-    String getTopic();
+  String getTopic();
 
-    SubscriptionName getSubscription();
+  SubscriptionName getSubscription();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchFactory.java
index da39eedf45..d271cf61c6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchFactory.java
@@ -4,7 +4,7 @@
 
 public interface MessageBatchFactory {
 
-    MessageBatch createBatch(Subscription subscription);
+  MessageBatch createBatch(Subscription subscription);
 
-    void destroyBatch(MessageBatch batch);
+  void destroyBatch(MessageBatch batch);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchReceiver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchReceiver.java
index efbdc09f77..1011bf9b14 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchReceiver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchReceiver.java
@@ -1,5 +1,16 @@
 package pl.allegro.tech.hermes.consumers.consumer.batch;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static pl.allegro.tech.hermes.consumers.consumer.Message.message;
+import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.Set;
+import javax.annotation.concurrent.NotThreadSafe;
 import org.apache.avro.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,140 +27,160 @@
 import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.Set;
-import javax.annotation.concurrent.NotThreadSafe;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static pl.allegro.tech.hermes.consumers.consumer.Message.message;
-import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
-
 @NotThreadSafe
 public class MessageBatchReceiver {
 
-    private static final Logger logger = LoggerFactory.getLogger(MessageBatchReceiver.class);
-
-    private final MessageReceiver receiver;
-    private final MessageBatchFactory batchFactory;
-    private final MessageConverterResolver messageConverterResolver;
-    private final CompositeMessageContentWrapper compositeMessageContentWrapper;
-    private final Trackers trackers;
-    private final Queue<Message> inflight;
-    private final Topic topic;
-    private final SubscriptionLoadRecorder loadRecorder;
-    private boolean receiving = true;
-
-    public MessageBatchReceiver(MessageReceiver receiver,
-                                MessageBatchFactory batchFactory,
-                                MessageConverterResolver messageConverterResolver,
-                                CompositeMessageContentWrapper compositeMessageContentWrapper,
-                                Topic topic,
-                                Trackers trackers,
-                                SubscriptionLoadRecorder loadRecorder) {
-        this.receiver = receiver;
-        this.batchFactory = batchFactory;
-        this.messageConverterResolver = messageConverterResolver;
-        this.compositeMessageContentWrapper = compositeMessageContentWrapper;
-        this.topic = topic;
-        this.trackers = trackers;
-        this.loadRecorder = loadRecorder;
-        this.inflight = new ArrayDeque<>(1);
+  private static final Logger logger = LoggerFactory.getLogger(MessageBatchReceiver.class);
+
+  private final MessageReceiver receiver;
+  private final MessageBatchFactory batchFactory;
+  private final MessageConverterResolver messageConverterResolver;
+  private final CompositeMessageContentWrapper compositeMessageContentWrapper;
+  private final Trackers trackers;
+  private final Queue<Message> inflight;
+  private final Topic topic;
+  private final SubscriptionLoadRecorder loadRecorder;
+  private boolean receiving = true;
+  private final Runnable commitIfReady;
+
+  public MessageBatchReceiver(
+      MessageReceiver receiver,
+      MessageBatchFactory batchFactory,
+      MessageConverterResolver messageConverterResolver,
+      CompositeMessageContentWrapper compositeMessageContentWrapper,
+      Topic topic,
+      Trackers trackers,
+      SubscriptionLoadRecorder loadRecorder,
+      Runnable commitIfReady) {
+    this.receiver = receiver;
+    this.batchFactory = batchFactory;
+    this.messageConverterResolver = messageConverterResolver;
+    this.compositeMessageContentWrapper = compositeMessageContentWrapper;
+    this.topic = topic;
+    this.trackers = trackers;
+    this.loadRecorder = loadRecorder;
+    this.inflight = new ArrayDeque<>(1);
+    this.commitIfReady = commitIfReady;
+  }
+
+  public MessageBatchingResult next(Subscription subscription, Runnable signalsInterrupt) {
+    if (logger.isDebugEnabled()) {
+      logger.debug(
+          "Trying to allocate memory for new batch [subscription={}]",
+          subscription.getQualifiedName());
     }
 
-    public MessageBatchingResult next(Subscription subscription, Runnable signalsInterrupt) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Trying to allocate memory for new batch [subscription={}]", subscription.getQualifiedName());
-        }
-
-        MessageBatch batch = batchFactory.createBatch(subscription);
-        if (logger.isDebugEnabled()) {
-            logger.debug("New batch allocated [subscription={}]", subscription.getQualifiedName());
-        }
-        List<MessageMetadata> discarded = new ArrayList<>();
-
-        while (isReceiving() && !batch.isReadyForDelivery() && !Thread.currentThread().isInterrupted()) {
-            loadRecorder.recordSingleOperation();
-            signalsInterrupt.run();
-            Optional<Message> maybeMessage = inflight.isEmpty()
-                    ? readAndTransform(subscription, batch.getId())
-                    : Optional.ofNullable(inflight.poll());
-
-            if (maybeMessage.isPresent()) {
-                Message message = maybeMessage.get();
-
-                if (batch.canFit(message.getData())) {
-                    batch.append(message.getData(), toMessageMetadata(message, subscription, batch.getId()));
-                } else if (batch.isBiggerThanTotalCapacity(message.getData())) {
-                    logger.error("Message size exceeds buffer total capacity [size={}, capacity={}, subscription={}]",
-                            message.getData().length, batch.getCapacity(), subscription.getQualifiedName());
-                    discarded.add(toMessageMetadata(message, subscription));
-                } else {
-                    logger.debug(
-                            "Message too large for current batch [message_size={}, subscription={}]",
-                            message.getData().length, subscription.getQualifiedName()
-                    );
-                    checkArgument(inflight.offer(message));
-                    break;
-                }
-            }
-        }
-        if (logger.isDebugEnabled()) {
-            logger.debug("Batch is ready for delivery [subscription={}]", subscription.getQualifiedName());
+    MessageBatch batch = batchFactory.createBatch(subscription);
+    if (logger.isDebugEnabled()) {
+      logger.debug("New batch allocated [subscription={}]", subscription.getQualifiedName());
+    }
+    List<MessageMetadata> discarded = new ArrayList<>();
+
+    while (isReceiving()
+        && !batch.isReadyForDelivery()
+        && !Thread.currentThread().isInterrupted()) {
+      loadRecorder.recordSingleOperation();
+      signalsInterrupt.run();
+      // We need a commit function call here to prevent cases where it takes a long time to create a
+      // batch and messages are filtered at the same time.
+      // Otherwise, this would lead to ever-increasing lag despite the processing and filtering of
+      // current messages.
+      commitIfReady.run();
+      Optional<Message> maybeMessage =
+          inflight.isEmpty()
+              ? readAndTransform(subscription, batch.getId())
+              : Optional.ofNullable(inflight.poll());
+
+      if (maybeMessage.isPresent()) {
+        Message message = maybeMessage.get();
+
+        if (batch.canFit(message.getData())) {
+          batch.append(message.getData(), toMessageMetadata(message, subscription, batch.getId()));
+        } else if (batch.isBiggerThanTotalCapacity(message.getData())) {
+          logger.error(
+              "Message size exceeds buffer total capacity [size={}, capacity={}, subscription={}]",
+              message.getData().length,
+              batch.getCapacity(),
+              subscription.getQualifiedName());
+          discarded.add(toMessageMetadata(message, subscription));
+        } else {
+          logger.debug(
+              "Message too large for current batch [message_size={}, subscription={}]",
+              message.getData().length,
+              subscription.getQualifiedName());
+          checkArgument(inflight.offer(message));
+          break;
         }
-        return new MessageBatchingResult(batch.close(), discarded);
+      }
     }
+    if (logger.isDebugEnabled()) {
+      logger.debug(
+          "Batch is ready for delivery [subscription={}]", subscription.getQualifiedName());
+    }
+    return new MessageBatchingResult(batch.close(), discarded);
+  }
 
-    private Optional<Message> readAndTransform(Subscription subscription, String batchId) {
-        Optional<Message> maybeMessage = receiver.next();
+  private Optional<Message> readAndTransform(Subscription subscription, String batchId) {
+    Optional<Message> maybeMessage = receiver.next();
 
-        if (maybeMessage.isPresent()) {
-            Message message = maybeMessage.get();
+    if (maybeMessage.isPresent()) {
+      Message message = maybeMessage.get();
 
-            Message transformed = messageConverterResolver.converterFor(message, subscription).convert(message, topic);
-            transformed = message().fromMessage(transformed).withData(wrap(subscription, transformed)).build();
+      if (!message.isFiltered()) {
+        Message transformed =
+            messageConverterResolver.converterFor(message, subscription).convert(message, topic);
+        transformed =
+            message().fromMessage(transformed).withData(wrap(subscription, transformed)).build();
 
-            trackers.get(subscription).logInflight(toMessageMetadata(transformed, subscription, batchId));
+        trackers
+            .get(subscription)
+            .logInflight(toMessageMetadata(transformed, subscription, batchId));
 
-            return Optional.of(transformed);
-        }
-        return Optional.empty();
+        return Optional.of(transformed);
+      }
     }
-
-    private byte[] wrap(Subscription subscription, Message next) {
-        switch (subscription.getContentType()) {
-            case AVRO:
-                return compositeMessageContentWrapper.wrapAvro(next.getData(), next.getId(), next.getPublishingTimestamp(), topic,
-                        next.<Schema>getSchema().get(), next.getExternalMetadata());
-            case JSON:
-                return compositeMessageContentWrapper.wrapJson(next.getData(), next.getId(), next.getPublishingTimestamp(),
-                        next.getExternalMetadata());
-            default:
-                throw new UnsupportedContentTypeException(subscription);
-        }
+    return Optional.empty();
+  }
+
+  private byte[] wrap(Subscription subscription, Message next) {
+    switch (subscription.getContentType()) {
+      case AVRO:
+        return compositeMessageContentWrapper.wrapAvro(
+            next.getData(),
+            next.getId(),
+            next.getPublishingTimestamp(),
+            topic,
+            next.<Schema>getSchema().get(),
+            next.getExternalMetadata());
+      case JSON:
+        return compositeMessageContentWrapper.wrapJson(
+            next.getData(),
+            next.getId(),
+            next.getPublishingTimestamp(),
+            next.getExternalMetadata());
+      default:
+        throw new UnsupportedContentTypeException(subscription);
     }
+  }
 
-    private boolean isReceiving() {
-        return receiving;
-    }
+  private boolean isReceiving() {
+    return receiving;
+  }
 
-    public void stop() {
-        receiving = false;
-        receiver.stop();
-    }
+  public void stop() {
+    receiving = false;
+    receiver.stop();
+  }
 
-    public void updateSubscription(Subscription modifiedSubscription) {
-        receiver.update(modifiedSubscription);
-    }
+  public void updateSubscription(Subscription modifiedSubscription) {
+    receiver.update(modifiedSubscription);
+  }
 
-    public void commit(Set<SubscriptionPartitionOffset> offsets) {
-        receiver.commit(offsets);
-    }
+  public void commit(Set<SubscriptionPartitionOffset> offsets) {
+    receiver.commit(offsets);
+  }
 
-    public boolean moveOffset(PartitionOffset offset) {
-        return receiver.moveOffset(offset);
-    }
+  public boolean moveOffset(PartitionOffset offset) {
+    return receiver.moveOffset(offset);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchingResult.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchingResult.java
index 8a602604df..6292311260 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchingResult.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/batch/MessageBatchingResult.java
@@ -1,23 +1,22 @@
 package pl.allegro.tech.hermes.consumers.consumer.batch;
 
-import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
-
 import java.util.List;
+import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
 
 public class MessageBatchingResult {
-    private final MessageBatch batch;
-    private final List<MessageMetadata> discarded;
+  private final MessageBatch batch;
+  private final List<MessageMetadata> discarded;
 
-    public MessageBatchingResult(MessageBatch batch, List<MessageMetadata> discarded) {
-        this.batch = batch;
-        this.discarded = discarded;
-    }
+  public MessageBatchingResult(MessageBatch batch, List<MessageMetadata> discarded) {
+    this.batch = batch;
+    this.discarded = discarded;
+  }
 
-    public MessageBatch getBatch() {
-        return batch;
-    }
+  public MessageBatch getBatch() {
+    return batch;
+  }
 
-    public List<MessageMetadata> getDiscarded() {
-        return discarded;
-    }
+  public List<MessageMetadata> getDiscarded() {
+    return discarded;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/AvroToJsonMessageConverter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/AvroToJsonMessageConverter.java
index 9f601733b9..fe9e4345c5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/AvroToJsonMessageConverter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/AvroToJsonMessageConverter.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.consumers.consumer.converter;
 
+import static java.util.stream.Collectors.toList;
+import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
+import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MARKER;
+import static pl.allegro.tech.hermes.consumers.consumer.Message.message;
+
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.generic.GenericRecordBuilder;
@@ -8,42 +13,44 @@
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import tech.allegro.schema.json2avro.converter.JsonAvroConverter;
 
-import static java.util.stream.Collectors.toList;
-import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
-import static pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker.METADATA_MARKER;
-import static pl.allegro.tech.hermes.consumers.consumer.Message.message;
-
 public class AvroToJsonMessageConverter implements MessageConverter {
 
-    private final JsonAvroConverter converter;
-
-    public AvroToJsonMessageConverter() {
-        this.converter = new JsonAvroConverter();
-    }
-
-    @Override
-    public Message convert(Message message, Topic topic) {
-        return message()
-                .fromMessage(message)
-                .withContentType(ContentType.JSON)
-                .withData(converter.convertToJson(recordWithoutMetadata(message.getData(), message.<Schema>getSchema().get().getSchema())))
-                .withNoSchema()
-                .build();
-    }
-
-    private GenericRecord recordWithoutMetadata(byte [] data, Schema schema) {
-        GenericRecord original = bytesToRecord(data, schema);
-        Schema schemaWithoutMetadata = removeMetadataField(schema);
-        GenericRecordBuilder builder = new GenericRecordBuilder(schemaWithoutMetadata);
-        schemaWithoutMetadata.getFields().forEach(field -> builder.set(field, original.get(field.name())));
-        return builder.build();
-    }
-
-    private Schema removeMetadataField(Schema schema) {
-        return Schema.createRecord(
-                schema.getFields().stream()
-                        .filter(field -> !METADATA_MARKER.equals(field.name()))
-                        .map(field -> new Schema.Field(field.name(), field.schema(), field.doc(), field.defaultVal()))
-                        .collect(toList()));
-    }
+  private final JsonAvroConverter converter;
+
+  public AvroToJsonMessageConverter() {
+    this.converter = new JsonAvroConverter();
+  }
+
+  @Override
+  public Message convert(Message message, Topic topic) {
+    return message()
+        .fromMessage(message)
+        .withContentType(ContentType.JSON)
+        .withData(
+            converter.convertToJson(
+                recordWithoutMetadata(
+                    message.getData(), message.<Schema>getSchema().get().getSchema())))
+        .withNoSchema()
+        .build();
+  }
+
+  private GenericRecord recordWithoutMetadata(byte[] data, Schema schema) {
+    GenericRecord original = bytesToRecord(data, schema);
+    Schema schemaWithoutMetadata = removeMetadataField(schema);
+    GenericRecordBuilder builder = new GenericRecordBuilder(schemaWithoutMetadata);
+    schemaWithoutMetadata
+        .getFields()
+        .forEach(field -> builder.set(field, original.get(field.name())));
+    return builder.build();
+  }
+
+  private Schema removeMetadataField(Schema schema) {
+    return Schema.createRecord(
+        schema.getFields().stream()
+            .filter(field -> !METADATA_MARKER.equals(field.name()))
+            .map(
+                field ->
+                    new Schema.Field(field.name(), field.schema(), field.doc(), field.defaultVal()))
+            .collect(toList()));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/DefaultMessageConverterResolver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/DefaultMessageConverterResolver.java
index 6fe140fd11..c66ead004b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/DefaultMessageConverterResolver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/DefaultMessageConverterResolver.java
@@ -6,21 +6,23 @@
 
 public class DefaultMessageConverterResolver implements MessageConverterResolver {
 
-    private final AvroToJsonMessageConverter avroToJsonMessageConverter;
-    private final NoOperationMessageConverter noOperationMessageConverter;
+  private final AvroToJsonMessageConverter avroToJsonMessageConverter;
+  private final NoOperationMessageConverter noOperationMessageConverter;
 
-    public DefaultMessageConverterResolver(AvroToJsonMessageConverter avroToJsonMessageConverter,
-                                           NoOperationMessageConverter noOperationMessageConverter) {
-        this.avroToJsonMessageConverter = avroToJsonMessageConverter;
-        this.noOperationMessageConverter = noOperationMessageConverter;
-    }
-
-    @Override
-    public MessageConverter converterFor(Message message, Subscription subscription) {
-        if (message.getContentType() == ContentType.AVRO && subscription.getContentType() == ContentType.JSON) {
-            return avroToJsonMessageConverter;
-        }
+  public DefaultMessageConverterResolver(
+      AvroToJsonMessageConverter avroToJsonMessageConverter,
+      NoOperationMessageConverter noOperationMessageConverter) {
+    this.avroToJsonMessageConverter = avroToJsonMessageConverter;
+    this.noOperationMessageConverter = noOperationMessageConverter;
+  }
 
-        return noOperationMessageConverter;
+  @Override
+  public MessageConverter converterFor(Message message, Subscription subscription) {
+    if (message.getContentType() == ContentType.AVRO
+        && subscription.getContentType() == ContentType.JSON) {
+      return avroToJsonMessageConverter;
     }
+
+    return noOperationMessageConverter;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/MessageConverter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/MessageConverter.java
index 4df96cfef8..769e99a9c2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/MessageConverter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/MessageConverter.java
@@ -5,6 +5,5 @@
 
 public interface MessageConverter {
 
-    Message convert(Message message, Topic topic);
-
+  Message convert(Message message, Topic topic);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/MessageConverterResolver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/MessageConverterResolver.java
index 4d8e2b20b5..e48674a233 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/MessageConverterResolver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/MessageConverterResolver.java
@@ -4,5 +4,5 @@
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 
 public interface MessageConverterResolver {
-    MessageConverter converterFor(Message message, Subscription subscription);
+  MessageConverter converterFor(Message message, Subscription subscription);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/NoOperationMessageConverter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/NoOperationMessageConverter.java
index 925d8746cb..a5a93e3c97 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/NoOperationMessageConverter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/converter/NoOperationMessageConverter.java
@@ -4,8 +4,8 @@
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 
 public class NoOperationMessageConverter implements MessageConverter {
-    @Override
-    public Message convert(Message message, Topic topic) {
-        return message;
-    }
+  @Override
+  public Message convert(Message message, Topic topic) {
+    return message;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/filtering/FilteredMessageHandler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/filtering/FilteredMessageHandler.java
index 12063eb085..0d7eac9a00 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/filtering/FilteredMessageHandler.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/filtering/FilteredMessageHandler.java
@@ -1,58 +1,64 @@
 package pl.allegro.tech.hermes.consumers.consumer.filtering;
 
+import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
+import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
+
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
+import pl.allegro.tech.hermes.consumers.consumer.offset.PendingOffsetsAppender;
 import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimiter;
 import pl.allegro.tech.hermes.domain.filtering.chain.FilterResult;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.util.Optional;
+public class FilteredMessageHandler {
 
-import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
-import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
+  private final PendingOffsetsAppender pendingOffsets;
+  private final Optional<ConsumerRateLimiter> consumerRateLimiter;
+  private final Trackers trackers;
+  private final HermesCounter filteredOutCounter;
 
-public class FilteredMessageHandler {
+  private static final Logger logger = LoggerFactory.getLogger(FilteredMessageHandler.class);
 
-    private final OffsetQueue offsetQueue;
-    private final Optional<ConsumerRateLimiter> consumerRateLimiter;
-    private final Trackers trackers;
-    private final HermesCounter filteredOutCounter;
-
-    private static final Logger logger = LoggerFactory.getLogger(FilteredMessageHandler.class);
-
-    public FilteredMessageHandler(OffsetQueue offsetQueue,
-                                  ConsumerRateLimiter consumerRateLimiter,
-                                  Trackers trackers,
-                                  MetricsFacade metrics,
-                                  SubscriptionName subscriptionName) {
-        this.offsetQueue = offsetQueue;
-        this.consumerRateLimiter = Optional.ofNullable(consumerRateLimiter);
-        this.trackers = trackers;
-        this.filteredOutCounter = metrics.subscriptions().filteredOutCounter(subscriptionName);
-    }
+  public FilteredMessageHandler(
+      ConsumerRateLimiter consumerRateLimiter,
+      PendingOffsetsAppender pendingOffsetsAppender,
+      Trackers trackers,
+      MetricsFacade metrics,
+      SubscriptionName subscriptionName) {
+    this.consumerRateLimiter = Optional.ofNullable(consumerRateLimiter);
+    this.pendingOffsets = pendingOffsetsAppender;
+    this.trackers = trackers;
+    this.filteredOutCounter = metrics.subscriptions().filteredOutCounter(subscriptionName);
+  }
 
-    public void handle(FilterResult result, Message message, Subscription subscription) {
-        if (result.isFiltered()) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Message filtered for subscription {} {}", subscription.getQualifiedName(), result);
-            }
+  public void handle(FilterResult result, Message message, Subscription subscription) {
+    if (result.isFiltered()) {
+      if (logger.isDebugEnabled()) {
+        logger.debug(
+            "Message filtered for subscription {} {}", subscription.getQualifiedName(), result);
+      }
 
-            offsetQueue.offerCommittedOffset(subscriptionPartitionOffset(subscription.getQualifiedName(),
-                    message.getPartitionOffset(), message.getPartitionAssignmentTerm()));
+      pendingOffsets.markAsProcessed(
+          subscriptionPartitionOffset(
+              subscription.getQualifiedName(),
+              message.getPartitionOffset(),
+              message.getPartitionAssignmentTerm()));
 
-            filteredOutCounter.increment();
+      filteredOutCounter.increment();
 
-            if (subscription.isTrackingEnabled()) {
-                trackers.get(subscription).logFiltered(toMessageMetadata(message, subscription), result.getFilterType().get());
-            }
+      if (subscription.isTrackingEnabled()) {
+        trackers
+            .get(subscription)
+            .logFiltered(toMessageMetadata(message, subscription), result.getFilterType().get());
+      }
 
-            consumerRateLimiter.ifPresent(ConsumerRateLimiter::acquireFiltered);
-        }
+      consumerRateLimiter.ifPresent(ConsumerRateLimiter::acquireFiltered);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/idletime/ExponentiallyGrowingIdleTimeCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/idletime/ExponentiallyGrowingIdleTimeCalculator.java
index 5bb2b543db..3b11b5b6a8 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/idletime/ExponentiallyGrowingIdleTimeCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/idletime/ExponentiallyGrowingIdleTimeCalculator.java
@@ -5,41 +5,44 @@
 
 public class ExponentiallyGrowingIdleTimeCalculator implements IdleTimeCalculator {
 
-    private final long base;
-    private final long initialIdleTimeMs;
-    private final long maxIdleTimeMs;
-    private long currentIdleTimeMs;
-
-    public ExponentiallyGrowingIdleTimeCalculator(long initialIdleTimeMs, long maxIdleTimeMs) {
-        this(2, initialIdleTimeMs, maxIdleTimeMs);
-    }
-
-    public ExponentiallyGrowingIdleTimeCalculator(long base, long initialIdleTime, long maxIdleTimeMs) {
-        checkArgument(base > 0, "base should be greater than zero");
-        checkArgument(initialIdleTime > 0, "initialIdleTimeMs should be greater than zero");
-        checkArgument(maxIdleTimeMs > 0, "maxIdleTimeMs should be greater than zero");
-        checkArgument(initialIdleTime <= maxIdleTimeMs, "maxIdleTimeMs should be grater or equal initialIdleTimeMs");
-
-        this.base = base;
-        this.initialIdleTimeMs = initialIdleTime;
-        this.maxIdleTimeMs = maxIdleTimeMs;
-        this.currentIdleTimeMs = initialIdleTime;
-    }
-
-    @Override
-    public long increaseIdleTime() {
-        long previousIdleTime = this.currentIdleTimeMs;
-        this.currentIdleTimeMs = min(this.currentIdleTimeMs * base, maxIdleTimeMs);
-        return previousIdleTime;
-    }
-
-    @Override
-    public long getIdleTime() {
-        return currentIdleTimeMs;
-    }
-
-    @Override
-    public void reset() {
-        this.currentIdleTimeMs = initialIdleTimeMs;
-    }
+  private final long base;
+  private final long initialIdleTimeMs;
+  private final long maxIdleTimeMs;
+  private long currentIdleTimeMs;
+
+  public ExponentiallyGrowingIdleTimeCalculator(long initialIdleTimeMs, long maxIdleTimeMs) {
+    this(2, initialIdleTimeMs, maxIdleTimeMs);
+  }
+
+  public ExponentiallyGrowingIdleTimeCalculator(
+      long base, long initialIdleTime, long maxIdleTimeMs) {
+    checkArgument(base > 0, "base should be greater than zero");
+    checkArgument(initialIdleTime > 0, "initialIdleTimeMs should be greater than zero");
+    checkArgument(maxIdleTimeMs > 0, "maxIdleTimeMs should be greater than zero");
+    checkArgument(
+        initialIdleTime <= maxIdleTimeMs,
+        "maxIdleTimeMs should be grater or equal initialIdleTimeMs");
+
+    this.base = base;
+    this.initialIdleTimeMs = initialIdleTime;
+    this.maxIdleTimeMs = maxIdleTimeMs;
+    this.currentIdleTimeMs = initialIdleTime;
+  }
+
+  @Override
+  public long increaseIdleTime() {
+    long previousIdleTime = this.currentIdleTimeMs;
+    this.currentIdleTimeMs = min(this.currentIdleTimeMs * base, maxIdleTimeMs);
+    return previousIdleTime;
+  }
+
+  @Override
+  public long getIdleTime() {
+    return currentIdleTimeMs;
+  }
+
+  @Override
+  public void reset() {
+    this.currentIdleTimeMs = initialIdleTimeMs;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/idletime/IdleTimeCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/idletime/IdleTimeCalculator.java
index aedc53f69a..c057dfa06b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/idletime/IdleTimeCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/idletime/IdleTimeCalculator.java
@@ -1,9 +1,9 @@
 package pl.allegro.tech.hermes.consumers.consumer.idletime;
 
 public interface IdleTimeCalculator {
-    long increaseIdleTime();
+  long increaseIdleTime();
 
-    long getIdleTime();
+  long getIdleTime();
 
-    void reset();
+  void reset();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/InterpolationException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/InterpolationException.java
index 016de70fe5..670a281e4a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/InterpolationException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/InterpolationException.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.consumers.consumer.interpolation;
 
 public class InterpolationException extends Exception {
-    public InterpolationException(String format, Throwable t) {
-        super(format, t);
-    }
+  public InterpolationException(String format, Throwable t) {
+    super(format, t);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/MessageBodyInterpolator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/MessageBodyInterpolator.java
index 64cc0fb6df..cc0dc4c822 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/MessageBodyInterpolator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/MessageBodyInterpolator.java
@@ -9,72 +9,66 @@
 import com.google.common.collect.Maps;
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.JsonPath;
-import pl.allegro.tech.hermes.api.EndpointAddress;
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-
 import java.net.URI;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.EndpointAddress;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
 
 public class MessageBodyInterpolator implements UriInterpolator {
 
-    private static final int MAX_CACHE_SIZE = 1000;
-
-    private final LoadingCache<String, UriTemplate> templateCache = CacheBuilder
-            .newBuilder()
-            .maximumSize(MAX_CACHE_SIZE)
-            .build(new TemplateLoader());
+  private static final int MAX_CACHE_SIZE = 1000;
 
-    private final LoadingCache<String, JsonPath> variableCompiler = CacheBuilder
-            .newBuilder()
-            .maximumSize(MAX_CACHE_SIZE)
-            .build(new JsonPathLoader());
+  private final LoadingCache<String, UriTemplate> templateCache =
+      CacheBuilder.newBuilder().maximumSize(MAX_CACHE_SIZE).build(new TemplateLoader());
 
-    public URI interpolate(EndpointAddress endpoint, Message message) throws InterpolationException {
-        UriTemplate template = templateCache.getUnchecked(endpoint.getEndpoint());
-        String[] variables = template.getVariables();
+  private final LoadingCache<String, JsonPath> variableCompiler =
+      CacheBuilder.newBuilder().maximumSize(MAX_CACHE_SIZE).build(new JsonPathLoader());
 
-        if (variables.length > 0) {
-            Map<String, Object> values = Maps.newHashMap();
-            String payload = new String(message.getData(), Charsets.UTF_8);
+  public URI interpolate(EndpointAddress endpoint, Message message) throws InterpolationException {
+    UriTemplate template = templateCache.getUnchecked(endpoint.getEndpoint());
+    String[] variables = template.getVariables();
 
-            for (String variable : variables) {
+    if (variables.length > 0) {
+      Map<String, Object> values = Maps.newHashMap();
+      String payload = new String(message.getData(), Charsets.UTF_8);
 
-                JsonPath path = variableCompiler.getUnchecked(variable);
+      for (String variable : variables) {
 
-                try {
-                    values.put(variable, path.read(payload));
-                } catch (InvalidPathException e) {
-                    throw new InterpolationException(String.format("Missing variable on path %s", path.getPath()), e);
-                }
-            }
+        JsonPath path = variableCompiler.getUnchecked(variable);
 
-            try {
-                return URI.create(template.expand(values));
-            } catch (VariableExpansionException e) {
-                throw new InterpolationException("Cannot expand template", e);
-            }
+        try {
+          values.put(variable, path.read(payload));
+        } catch (InvalidPathException e) {
+          throw new InterpolationException(
+              String.format("Missing variable on path %s", path.getPath()), e);
         }
+      }
 
-        return endpoint.getUri();
-
+      try {
+        return URI.create(template.expand(values));
+      } catch (VariableExpansionException e) {
+        throw new InterpolationException("Cannot expand template", e);
+      }
     }
 
-    private static class TemplateLoader extends CacheLoader<String, UriTemplate> {
+    return endpoint.getUri();
+  }
 
-        @Override
-        public UriTemplate load(String url) throws Exception {
-            return UriTemplate.fromTemplate(url);
-        }
+  private static class TemplateLoader extends CacheLoader<String, UriTemplate> {
+
+    @Override
+    public UriTemplate load(String url) throws Exception {
+      return UriTemplate.fromTemplate(url);
     }
+  }
 
-    private static class JsonPathLoader extends CacheLoader<String, JsonPath> {
+  private static class JsonPathLoader extends CacheLoader<String, JsonPath> {
 
-        private static final String ROOT_PREFIX = "$.";
+    private static final String ROOT_PREFIX = "$.";
 
-        @Override
-        public JsonPath load(String key) throws Exception {
-            return JsonPath.compile(ROOT_PREFIX + key);
-        }
+    @Override
+    public JsonPath load(String key) throws Exception {
+      return JsonPath.compile(ROOT_PREFIX + key);
     }
-
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/UriInterpolator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/UriInterpolator.java
index f284e924e3..57a2e354cd 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/UriInterpolator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/UriInterpolator.java
@@ -1,10 +1,9 @@
 package pl.allegro.tech.hermes.consumers.consumer.interpolation;
 
+import java.net.URI;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 
-import java.net.URI;
-
 public interface UriInterpolator {
-    URI interpolate(EndpointAddress endpoint, Message message) throws InterpolationException;
+  URI interpolate(EndpointAddress endpoint, Message message) throws InterpolationException;
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/load/SubscriptionLoadRecorder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/load/SubscriptionLoadRecorder.java
index 95cbb53c33..4d05e7d213 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/load/SubscriptionLoadRecorder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/load/SubscriptionLoadRecorder.java
@@ -2,9 +2,9 @@
 
 public interface SubscriptionLoadRecorder {
 
-    void initialize();
+  void initialize();
 
-    void recordSingleOperation();
+  void recordSingleOperation();
 
-    void shutdown();
+  void shutdown();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/load/SubscriptionLoadRecordersRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/load/SubscriptionLoadRecordersRegistry.java
index 62361821c9..05d29b6560 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/load/SubscriptionLoadRecordersRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/load/SubscriptionLoadRecordersRegistry.java
@@ -4,5 +4,5 @@
 
 public interface SubscriptionLoadRecordersRegistry {
 
-    SubscriptionLoadRecorder register(SubscriptionName subscriptionName);
+  SubscriptionLoadRecorder register(SubscriptionName subscriptionName);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/message/MessageConverter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/message/MessageConverter.java
index 92c94dd2ce..fd723f8917 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/message/MessageConverter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/message/MessageConverter.java
@@ -6,28 +6,31 @@
 
 public class MessageConverter {
 
-    public static MessageMetadata toMessageMetadata(Message message, Subscription subscription) {
-        return new MessageMetadata(message.getId(),
-                message.getOffset(),
-                message.getPartition(),
-                message.getPartitionAssignmentTerm(),
-                message.getTopic(),
-                subscription.getName(),
-                message.getKafkaTopic().asString(),
-                message.getPublishingTimestamp(),
-                message.getReadingTimestamp());
-    }
+  public static MessageMetadata toMessageMetadata(Message message, Subscription subscription) {
+    return new MessageMetadata(
+        message.getId(),
+        message.getOffset(),
+        message.getPartition(),
+        message.getPartitionAssignmentTerm(),
+        message.getTopic(),
+        subscription.getName(),
+        message.getKafkaTopic().asString(),
+        message.getPublishingTimestamp(),
+        message.getReadingTimestamp());
+  }
 
-    public static MessageMetadata toMessageMetadata(Message message, Subscription subscription, String batchId) {
-        return new MessageMetadata(message.getId(),
-                batchId,
-                message.getOffset(),
-                message.getPartition(),
-                message.getPartitionAssignmentTerm(),
-                subscription.getQualifiedTopicName(),
-                subscription.getName(),
-                message.getKafkaTopic().asString(),
-                message.getPublishingTimestamp(),
-                message.getReadingTimestamp());
-    }
+  public static MessageMetadata toMessageMetadata(
+      Message message, Subscription subscription, String batchId) {
+    return new MessageMetadata(
+        message.getId(),
+        batchId,
+        message.getOffset(),
+        message.getPartition(),
+        message.getPartitionAssignmentTerm(),
+        subscription.getQualifiedTopicName(),
+        subscription.getName(),
+        message.getKafkaTopic().asString(),
+        message.getPublishingTimestamp(),
+        message.getReadingTimestamp());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessToken.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessToken.java
index 481bf49b8a..f4d082f517 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessToken.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessToken.java
@@ -4,38 +4,37 @@
 
 public class OAuthAccessToken {
 
-    private final String tokenValue;
+  private final String tokenValue;
 
-    private final Integer expiresIn;
+  private final Integer expiresIn;
 
-    public OAuthAccessToken(String tokenValue, Integer expiresIn) {
-        this.tokenValue = tokenValue;
-        this.expiresIn = expiresIn;
-    }
+  public OAuthAccessToken(String tokenValue, Integer expiresIn) {
+    this.tokenValue = tokenValue;
+    this.expiresIn = expiresIn;
+  }
 
-    public String getTokenValue() {
-        return tokenValue;
-    }
+  public String getTokenValue() {
+    return tokenValue;
+  }
 
-    public Integer getExpiresIn() {
-        return expiresIn;
-    }
+  public Integer getExpiresIn() {
+    return expiresIn;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        OAuthAccessToken that = (OAuthAccessToken) o;
-        return Objects.equals(tokenValue, that.tokenValue)
-                && Objects.equals(expiresIn, that.expiresIn);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(tokenValue, expiresIn);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    OAuthAccessToken that = (OAuthAccessToken) o;
+    return Objects.equals(tokenValue, that.tokenValue) && Objects.equals(expiresIn, that.expiresIn);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tokenValue, expiresIn);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessTokens.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessTokens.java
index 444a937f45..bd3f067615 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessTokens.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessTokens.java
@@ -1,16 +1,15 @@
 package pl.allegro.tech.hermes.consumers.consumer.oauth;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Optional;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public interface OAuthAccessTokens {
 
-    Optional<OAuthAccessToken> loadToken(SubscriptionName subscription);
+  Optional<OAuthAccessToken> loadToken(SubscriptionName subscription);
 
-    Optional<OAuthAccessToken> getTokenIfPresent(SubscriptionName subscription);
+  Optional<OAuthAccessToken> getTokenIfPresent(SubscriptionName subscription);
 
-    void refreshToken(SubscriptionName subscription);
+  void refreshToken(SubscriptionName subscription);
 
-    boolean tokenExists(SubscriptionName subscription);
+  boolean tokenExists(SubscriptionName subscription);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessTokensLoader.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessTokensLoader.java
index 40fd06cd0a..649220ec62 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessTokensLoader.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthAccessTokensLoader.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.consumers.consumer.oauth;
 
+import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.GrantType.USERNAME_PASSWORD;
+import static pl.allegro.tech.hermes.consumers.consumer.oauth.client.OAuthTokenRequest.oAuthTokenRequest;
+
 import com.google.common.cache.CacheLoader;
 import pl.allegro.tech.hermes.api.OAuthProvider;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -12,71 +15,72 @@
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 
-import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.GrantType.USERNAME_PASSWORD;
-import static pl.allegro.tech.hermes.consumers.consumer.oauth.client.OAuthTokenRequest.oAuthTokenRequest;
-
 public class OAuthAccessTokensLoader extends CacheLoader<SubscriptionName, OAuthAccessToken> {
 
-    private final SubscriptionRepository subscriptionRepository;
-
-    private final OAuthProviderRepository oAuthProviderRepository;
+  private final SubscriptionRepository subscriptionRepository;
 
-    private final OAuthClient oAuthClient;
+  private final OAuthProviderRepository oAuthProviderRepository;
 
-    private final MetricsFacade metrics;
+  private final OAuthClient oAuthClient;
 
-    public OAuthAccessTokensLoader(SubscriptionRepository subscriptionRepository,
-                                   OAuthProviderRepository oAuthProviderRepository,
-                                   OAuthClient oAuthClient,
-                                   MetricsFacade metrics) {
-        this.subscriptionRepository = subscriptionRepository;
-        this.oAuthProviderRepository = oAuthProviderRepository;
-        this.oAuthClient = oAuthClient;
-        this.metrics = metrics;
-    }
+  private final MetricsFacade metrics;
 
-    @Override
-    public OAuthAccessToken load(SubscriptionName subscriptionName) throws Exception {
-        Subscription subscription = subscriptionRepository.getSubscriptionDetails(subscriptionName);
-        SubscriptionOAuthPolicy oAuthPolicy = subscription.getOAuthPolicy();
-        String providerName = oAuthPolicy.getProviderName();
-        OAuthProvider oAuthProvider = oAuthProviderRepository.getOAuthProviderDetails(providerName);
-        OAuthTokenRequest request;
-        if (USERNAME_PASSWORD.equals(oAuthPolicy.getGrantType())) {
-            request = getOAuthUsernamePasswordGrantTokenRequest(oAuthPolicy, oAuthProvider);
-        } else {
-            request = getOAuthClientCredentialsGrantTokenRequest(oAuthPolicy, oAuthProvider);
-        }
+  public OAuthAccessTokensLoader(
+      SubscriptionRepository subscriptionRepository,
+      OAuthProviderRepository oAuthProviderRepository,
+      OAuthClient oAuthClient,
+      MetricsFacade metrics) {
+    this.subscriptionRepository = subscriptionRepository;
+    this.oAuthProviderRepository = oAuthProviderRepository;
+    this.oAuthClient = oAuthClient;
+    this.metrics = metrics;
+  }
 
-        metrics.consumer().oAuthSubscriptionTokenRequestCounter(subscription, providerName).increment();
-        try (HermesTimerContext ignored = metrics.consumer().oAuthProviderLatencyTimer(providerName).time()) {
-            return oAuthClient.getToken(request);
-        }
+  @Override
+  public OAuthAccessToken load(SubscriptionName subscriptionName) throws Exception {
+    Subscription subscription = subscriptionRepository.getSubscriptionDetails(subscriptionName);
+    SubscriptionOAuthPolicy oAuthPolicy = subscription.getOAuthPolicy();
+    String providerName = oAuthPolicy.getProviderName();
+    OAuthProvider oAuthProvider = oAuthProviderRepository.getOAuthProviderDetails(providerName);
+    OAuthTokenRequest request;
+    if (USERNAME_PASSWORD.equals(oAuthPolicy.getGrantType())) {
+      request = getOAuthUsernamePasswordGrantTokenRequest(oAuthPolicy, oAuthProvider);
+    } else {
+      request = getOAuthClientCredentialsGrantTokenRequest(oAuthPolicy, oAuthProvider);
     }
 
-    private OAuthTokenRequest getOAuthUsernamePasswordGrantTokenRequest(SubscriptionOAuthPolicy policy, OAuthProvider provider) {
-        return oAuthTokenRequest()
-                .withUrl(provider.getTokenEndpoint())
-                .withGrantType(OAuthTokenRequest.GrantTypeValue.RESOURCE_OWNER_USERNAME_PASSWORD)
-                .withScope(policy.getScope())
-                .withClientId(provider.getClientId())
-                .withClientSecret(provider.getClientSecret())
-                .withUsername(policy.getUsername())
-                .withPassword(policy.getPassword())
-                .withRequestTimeout(provider.getRequestTimeout())
-                .withSocketTimeout(provider.getSocketTimeout())
-                .build();
+    metrics.consumer().oAuthSubscriptionTokenRequestCounter(subscription, providerName).increment();
+    try (HermesTimerContext ignored =
+        metrics.consumer().oAuthProviderLatencyTimer(providerName).time()) {
+      return oAuthClient.getToken(request);
     }
+  }
 
-    private OAuthTokenRequest getOAuthClientCredentialsGrantTokenRequest(SubscriptionOAuthPolicy policy, OAuthProvider provider) {
-        return oAuthTokenRequest()
-                .withUrl(provider.getTokenEndpoint())
-                .withGrantType(OAuthTokenRequest.GrantTypeValue.CLIENT_CREDENTIALS)
-                .withScope(policy.getScope())
-                .withClientId(provider.getClientId())
-                .withClientSecret(provider.getClientSecret())
-                .withRequestTimeout(provider.getRequestTimeout())
-                .withSocketTimeout(provider.getSocketTimeout())
-                .build();
-    }
+  private OAuthTokenRequest getOAuthUsernamePasswordGrantTokenRequest(
+      SubscriptionOAuthPolicy policy, OAuthProvider provider) {
+    return oAuthTokenRequest()
+        .withUrl(provider.getTokenEndpoint())
+        .withGrantType(OAuthTokenRequest.GrantTypeValue.RESOURCE_OWNER_USERNAME_PASSWORD)
+        .withScope(policy.getScope())
+        .withClientId(provider.getClientId())
+        .withClientSecret(provider.getClientSecret())
+        .withUsername(policy.getUsername())
+        .withPassword(policy.getPassword())
+        .withRequestTimeout(provider.getRequestTimeout())
+        .withSocketTimeout(provider.getSocketTimeout())
+        .build();
+  }
+
+  private OAuthTokenRequest getOAuthClientCredentialsGrantTokenRequest(
+      SubscriptionOAuthPolicy policy, OAuthProvider provider) {
+    return oAuthTokenRequest()
+        .withUrl(provider.getTokenEndpoint())
+        .withGrantType(OAuthTokenRequest.GrantTypeValue.CLIENT_CREDENTIALS)
+        .withScope(policy.getScope())
+        .withClientId(provider.getClientId())
+        .withClientSecret(provider.getClientSecret())
+        .withRequestTimeout(provider.getRequestTimeout())
+        .withSocketTimeout(provider.getSocketTimeout())
+        .build();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthConsumerAuthorizationHandler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthConsumerAuthorizationHandler.java
index 4319e181af..988437450d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthConsumerAuthorizationHandler.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthConsumerAuthorizationHandler.java
@@ -1,6 +1,12 @@
 package pl.allegro.tech.hermes.consumers.consumer.oauth;
 
 import com.google.common.util.concurrent.RateLimiter;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.OAuthProvider;
@@ -10,98 +16,106 @@
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-public class OAuthConsumerAuthorizationHandler implements ConsumerAuthorizationHandler, OAuthProviderCacheListener {
-
-    private static final Logger logger = LoggerFactory.getLogger(OAuthConsumerAuthorizationHandler.class);
-
-    private final OAuthSubscriptionHandlerFactory handlerFactory;
-
-    private final Map<SubscriptionName, OAuthSubscriptionHandler> handlers = new ConcurrentHashMap<>();
-
-    private final RateLimiter missingHandlersCreationRateLimiter;
-
-    public OAuthConsumerAuthorizationHandler(OAuthSubscriptionHandlerFactory handlerFactory,
-                                             Duration missingSubscriptionHandlersCreationDelay,
-                                             OAuthProvidersNotifyingCache oAuthProvidersCache) {
-        this.handlerFactory = handlerFactory;
-        this.missingHandlersCreationRateLimiter = RateLimiter.create(missingSubscriptionHandlersCreationDelay.toSeconds());
-        oAuthProvidersCache.setListener(this);
-    }
-
-    @Override
-    public void createSubscriptionHandler(SubscriptionName subscriptionName) {
-        handlerFactory.create(subscriptionName).ifPresent(handler -> {
-            logger.info("OAuth handler for subscription {} created", subscriptionName);
-            handlers.put(subscriptionName, handler);
-            handler.initialize();
-        });
-    }
-
-    @Override
-    public void removeSubscriptionHandler(SubscriptionName subscriptionName) {
-        if (handlers.remove(subscriptionName) != null) {
-            logger.info("OAuth handler for subscription {} removed", subscriptionName);
-        }
-    }
-
-    @Override
-    public void updateSubscription(SubscriptionName subscriptionName) {
-        removeSubscriptionHandler(subscriptionName);
-        createSubscriptionHandler(subscriptionName);
+public class OAuthConsumerAuthorizationHandler
+    implements ConsumerAuthorizationHandler, OAuthProviderCacheListener {
+
+  private static final Logger logger =
+      LoggerFactory.getLogger(OAuthConsumerAuthorizationHandler.class);
+
+  private final OAuthSubscriptionHandlerFactory handlerFactory;
+
+  private final Map<SubscriptionName, OAuthSubscriptionHandler> handlers =
+      new ConcurrentHashMap<>();
+
+  private final RateLimiter missingHandlersCreationRateLimiter;
+
+  public OAuthConsumerAuthorizationHandler(
+      OAuthSubscriptionHandlerFactory handlerFactory,
+      Duration missingSubscriptionHandlersCreationDelay,
+      OAuthProvidersNotifyingCache oAuthProvidersCache) {
+    this.handlerFactory = handlerFactory;
+    this.missingHandlersCreationRateLimiter =
+        RateLimiter.create(missingSubscriptionHandlersCreationDelay.toSeconds());
+    oAuthProvidersCache.setListener(this);
+  }
+
+  @Override
+  public void createSubscriptionHandler(SubscriptionName subscriptionName) {
+    handlerFactory
+        .create(subscriptionName)
+        .ifPresent(
+            handler -> {
+              logger.info("OAuth handler for subscription {} created", subscriptionName);
+              handlers.put(subscriptionName, handler);
+              handler.initialize();
+            });
+  }
+
+  @Override
+  public void removeSubscriptionHandler(SubscriptionName subscriptionName) {
+    if (handlers.remove(subscriptionName) != null) {
+      logger.info("OAuth handler for subscription {} removed", subscriptionName);
     }
-
-    @Override
-    public void oAuthProviderUpdate(OAuthProvider oAuthProvider) {
-        logger.info("Updated OAuth provider {}", oAuthProvider.getName());
-        List<SubscriptionName> subscriptions = handlers.entrySet().stream()
-                .filter(entry -> entry.getValue().getProviderName().equals(oAuthProvider.getName()))
-                .map(Map.Entry::getKey)
-                .collect(Collectors.toList());
-
-        subscriptions.forEach(this::updateSubscription);
-    }
-
-    @Override
-    public void handleSuccess(Message message, Subscription subscription, MessageSendingResult result) {
-        if (shouldHandle(subscription)) {
-            getSubscriptionHandler(subscription.getQualifiedName()).ifPresent(OAuthSubscriptionHandler::handleSuccess);
-        }
+  }
+
+  @Override
+  public void updateSubscription(SubscriptionName subscriptionName) {
+    removeSubscriptionHandler(subscriptionName);
+    createSubscriptionHandler(subscriptionName);
+  }
+
+  @Override
+  public void oAuthProviderUpdate(OAuthProvider oAuthProvider) {
+    logger.info("Updated OAuth provider {}", oAuthProvider.getName());
+    List<SubscriptionName> subscriptions =
+        handlers.entrySet().stream()
+            .filter(entry -> entry.getValue().getProviderName().equals(oAuthProvider.getName()))
+            .map(Map.Entry::getKey)
+            .collect(Collectors.toList());
+
+    subscriptions.forEach(this::updateSubscription);
+  }
+
+  @Override
+  public void handleSuccess(
+      Message message, Subscription subscription, MessageSendingResult result) {
+    if (shouldHandle(subscription)) {
+      getSubscriptionHandler(subscription.getQualifiedName())
+          .ifPresent(OAuthSubscriptionHandler::handleSuccess);
     }
-
-    @Override
-    public void handleFailed(Message message, Subscription subscription, MessageSendingResult result) {
-        if (shouldHandle(subscription)) {
-            getSubscriptionHandler(subscription.getQualifiedName()).ifPresent(h -> h.handleFailed(subscription, result));
-        }
+  }
+
+  @Override
+  public void handleFailed(
+      Message message, Subscription subscription, MessageSendingResult result) {
+    if (shouldHandle(subscription)) {
+      getSubscriptionHandler(subscription.getQualifiedName())
+          .ifPresent(h -> h.handleFailed(subscription, result));
     }
+  }
 
-    @Override
-    public void handleDiscarded(Message message, Subscription subscription, MessageSendingResult result) {
-    }
+  @Override
+  public void handleDiscarded(
+      Message message, Subscription subscription, MessageSendingResult result) {}
 
-    private boolean shouldHandle(Subscription subscription) {
-        return subscription.hasOAuthPolicy();
-    }
+  private boolean shouldHandle(Subscription subscription) {
+    return subscription.hasOAuthPolicy();
+  }
 
-    private Optional<OAuthSubscriptionHandler> getSubscriptionHandler(SubscriptionName subscriptionName) {
-        if (handlers.containsKey(subscriptionName)) {
-            return Optional.of(handlers.get(subscriptionName));
-        }
-        return tryCreatingMissingHandler(subscriptionName);
+  private Optional<OAuthSubscriptionHandler> getSubscriptionHandler(
+      SubscriptionName subscriptionName) {
+    if (handlers.containsKey(subscriptionName)) {
+      return Optional.of(handlers.get(subscriptionName));
     }
-
-    private Optional<OAuthSubscriptionHandler> tryCreatingMissingHandler(SubscriptionName subscriptionName) {
-        if (missingHandlersCreationRateLimiter.tryAcquire()) {
-            createSubscriptionHandler(subscriptionName);
-            return Optional.ofNullable(handlers.get(subscriptionName));
-        }
-        return Optional.empty();
+    return tryCreatingMissingHandler(subscriptionName);
+  }
+
+  private Optional<OAuthSubscriptionHandler> tryCreatingMissingHandler(
+      SubscriptionName subscriptionName) {
+    if (missingHandlersCreationRateLimiter.tryAcquire()) {
+      createSubscriptionHandler(subscriptionName);
+      return Optional.ofNullable(handlers.get(subscriptionName));
     }
+    return Optional.empty();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthProviderCacheListener.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthProviderCacheListener.java
index 53de439970..872de43813 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthProviderCacheListener.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthProviderCacheListener.java
@@ -4,5 +4,5 @@
 
 public interface OAuthProviderCacheListener {
 
-    void oAuthProviderUpdate(OAuthProvider oAuthProvider);
+  void oAuthProviderUpdate(OAuthProvider oAuthProvider);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthProvidersNotifyingCache.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthProvidersNotifyingCache.java
index bcbf22958c..d8019e4b82 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthProvidersNotifyingCache.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthProvidersNotifyingCache.java
@@ -1,6 +1,9 @@
 package pl.allegro.tech.hermes.consumers.consumer.oauth;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
@@ -9,50 +12,51 @@
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.OAuthProvider;
 
-import java.io.IOException;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
+public class OAuthProvidersNotifyingCache extends PathChildrenCache
+    implements PathChildrenCacheListener {
 
-public class OAuthProvidersNotifyingCache extends PathChildrenCache implements PathChildrenCacheListener {
+  private static final Logger logger = LoggerFactory.getLogger(OAuthProvidersNotifyingCache.class);
 
-    private static final Logger logger = LoggerFactory.getLogger(OAuthProvidersNotifyingCache.class);
+  private final ObjectMapper objectMapper;
 
-    private final ObjectMapper objectMapper;
+  private OAuthProviderCacheListener listener;
 
-    private OAuthProviderCacheListener listener;
+  public OAuthProvidersNotifyingCache(
+      CuratorFramework curator,
+      String path,
+      ExecutorService executorService,
+      ObjectMapper objectMapper) {
+    super(curator, path, true, false, executorService);
+    this.objectMapper = objectMapper;
+    getListenable().addListener(this);
+  }
 
-    public OAuthProvidersNotifyingCache(CuratorFramework curator, String path, ExecutorService executorService,
-                                        ObjectMapper objectMapper) {
-        super(curator, path, true, false, executorService);
-        this.objectMapper = objectMapper;
-        getListenable().addListener(this);
-    }
+  @Override
+  public void start() throws Exception {
+    super.start();
+  }
 
-    @Override
-    public void start() throws Exception {
-        super.start();
-    }
+  public void setListener(OAuthProviderCacheListener listener) {
+    this.listener = listener;
+  }
 
-    public void setListener(OAuthProviderCacheListener listener) {
-        this.listener = listener;
+  @Override
+  public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
+    if (event.getData() == null || event.getData().getData() == null) {
+      return;
     }
-
-    @Override
-    public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
-        if (event.getData() == null || event.getData().getData() == null) {
-            return;
-        }
-        if (event.getType() == PathChildrenCacheEvent.Type.CHILD_UPDATED) {
-            parseEvent(event.getData().getPath(), event.getData().getData()).ifPresent(listener::oAuthProviderUpdate);
-        }
+    if (event.getType() == PathChildrenCacheEvent.Type.CHILD_UPDATED) {
+      parseEvent(event.getData().getPath(), event.getData().getData())
+          .ifPresent(listener::oAuthProviderUpdate);
     }
-
-    private Optional<OAuthProvider> parseEvent(String path, byte[] data) {
-        try {
-            return Optional.of(objectMapper.readValue(data, OAuthProvider.class));
-        } catch (IOException e) {
-            logger.error("Failed to parse object at path {}", path);
-            return Optional.empty();
-        }
+  }
+
+  private Optional<OAuthProvider> parseEvent(String path, byte[] data) {
+    try {
+      return Optional.of(objectMapper.readValue(data, OAuthProvider.class));
+    } catch (IOException e) {
+      logger.error("Failed to parse object at path {}", path);
+      return Optional.empty();
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionAccessTokens.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionAccessTokens.java
index 827a6be454..d4dc152b12 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionAccessTokens.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionAccessTokens.java
@@ -2,56 +2,56 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.LoadingCache;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 
-import java.util.Optional;
-
 public class OAuthSubscriptionAccessTokens implements OAuthAccessTokens {
 
-    private static final Logger logger = LoggerFactory.getLogger(OAuthSubscriptionAccessTokens.class);
+  private static final Logger logger = LoggerFactory.getLogger(OAuthSubscriptionAccessTokens.class);
 
-    private final LoadingCache<SubscriptionName, OAuthAccessToken> subscriptionTokens;
+  private final LoadingCache<SubscriptionName, OAuthAccessToken> subscriptionTokens;
 
-    private final OAuthAccessTokensLoader tokenLoader;
+  private final OAuthAccessTokensLoader tokenLoader;
 
-    public OAuthSubscriptionAccessTokens(OAuthAccessTokensLoader tokenLoader,
-                                         long subscriptionTokensCacheMaxSize) {
-        this.tokenLoader = tokenLoader;
-        this.subscriptionTokens = CacheBuilder.newBuilder()
-                .maximumSize(subscriptionTokensCacheMaxSize)
-                .build(tokenLoader);
-    }
+  public OAuthSubscriptionAccessTokens(
+      OAuthAccessTokensLoader tokenLoader, long subscriptionTokensCacheMaxSize) {
+    this.tokenLoader = tokenLoader;
+    this.subscriptionTokens =
+        CacheBuilder.newBuilder().maximumSize(subscriptionTokensCacheMaxSize).build(tokenLoader);
+  }
 
-    @Override
-    public Optional<OAuthAccessToken> getTokenIfPresent(SubscriptionName subscriptionName) {
-        return Optional.ofNullable(subscriptionTokens.getIfPresent(subscriptionName));
-    }
+  @Override
+  public Optional<OAuthAccessToken> getTokenIfPresent(SubscriptionName subscriptionName) {
+    return Optional.ofNullable(subscriptionTokens.getIfPresent(subscriptionName));
+  }
 
-    @Override
-    public Optional<OAuthAccessToken> loadToken(SubscriptionName subscriptionName) {
-        try {
-            return Optional.ofNullable(subscriptionTokens.get(subscriptionName));
-        } catch (Exception e) {
-            logger.error("Could not get access token for subscription {}", subscriptionName, e);
-            return Optional.empty();
-        }
+  @Override
+  public Optional<OAuthAccessToken> loadToken(SubscriptionName subscriptionName) {
+    try {
+      return Optional.ofNullable(subscriptionTokens.get(subscriptionName));
+    } catch (Exception e) {
+      logger.error("Could not get access token for subscription {}", subscriptionName, e);
+      return Optional.empty();
     }
-
-    @Override
-    public void refreshToken(SubscriptionName subscriptionName) {
-        try {
-            OAuthAccessToken token = tokenLoader.load(subscriptionName);
-            subscriptionTokens.put(subscriptionName, token);
-        } catch (Exception e) {
-            logger.error("An error occurred while refreshing access token for subscription {}",
-                    subscriptionName, e);
-        }
+  }
+
+  @Override
+  public void refreshToken(SubscriptionName subscriptionName) {
+    try {
+      OAuthAccessToken token = tokenLoader.load(subscriptionName);
+      subscriptionTokens.put(subscriptionName, token);
+    } catch (Exception e) {
+      logger.error(
+          "An error occurred while refreshing access token for subscription {}",
+          subscriptionName,
+          e);
     }
+  }
 
-    @Override
-    public boolean tokenExists(SubscriptionName subscriptionName) {
-        return subscriptionTokens.getIfPresent(subscriptionName) != null;
-    }
+  @Override
+  public boolean tokenExists(SubscriptionName subscriptionName) {
+    return subscriptionTokens.getIfPresent(subscriptionName) != null;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionHandler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionHandler.java
index f13399a69c..66eb215c5f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionHandler.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionHandler.java
@@ -1,6 +1,10 @@
 package pl.allegro.tech.hermes.consumers.consumer.oauth;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import org.eclipse.jetty.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,61 +12,64 @@
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
 public class OAuthSubscriptionHandler {
 
-    private static final Logger logger = LoggerFactory.getLogger(OAuthSubscriptionHandler.class);
+  private static final Logger logger = LoggerFactory.getLogger(OAuthSubscriptionHandler.class);
 
-    private final SubscriptionName subscriptionName;
+  private final SubscriptionName subscriptionName;
 
-    private final String providerName;
+  private final String providerName;
 
-    private final OAuthAccessTokens accessTokens;
+  private final OAuthAccessTokens accessTokens;
 
-    private final OAuthTokenRequestRateLimiter rateLimiter;
+  private final OAuthTokenRequestRateLimiter rateLimiter;
 
-    private final ScheduledExecutorService executorService;
+  private final ScheduledExecutorService executorService;
 
-    public OAuthSubscriptionHandler(SubscriptionName subscriptionName, String providerName, OAuthAccessTokens accessTokens,
-                                    OAuthTokenRequestRateLimiter rateLimiter) {
-        this.subscriptionName = subscriptionName;
-        this.providerName = providerName;
-        this.accessTokens = accessTokens;
-        this.rateLimiter = rateLimiter;
-        ThreadFactory threadFactory =
-                new ThreadFactoryBuilder().setNameFormat(subscriptionName.getQualifiedName() + "-oauth-handler-%d").build();
-        this.executorService = Executors.newScheduledThreadPool(1, threadFactory);
-    }
+  public OAuthSubscriptionHandler(
+      SubscriptionName subscriptionName,
+      String providerName,
+      OAuthAccessTokens accessTokens,
+      OAuthTokenRequestRateLimiter rateLimiter) {
+    this.subscriptionName = subscriptionName;
+    this.providerName = providerName;
+    this.accessTokens = accessTokens;
+    this.rateLimiter = rateLimiter;
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder()
+            .setNameFormat(subscriptionName.getQualifiedName() + "-oauth-handler-%d")
+            .build();
+    this.executorService = Executors.newScheduledThreadPool(1, threadFactory);
+  }
 
-    public void initialize() {
-        rateLimiter.tryAcquire();
-        accessTokens.loadToken(subscriptionName);
-    }
+  public void initialize() {
+    rateLimiter.tryAcquire();
+    accessTokens.loadToken(subscriptionName);
+  }
 
-    public String getProviderName() {
-        return providerName;
-    }
+  public String getProviderName() {
+    return providerName;
+  }
 
-    public void handleSuccess() {
-        rateLimiter.resetRate();
-    }
+  public void handleSuccess() {
+    rateLimiter.resetRate();
+  }
 
-    public void handleFailed(Subscription subscription, MessageSendingResult result) {
-        SubscriptionName subscriptionName = subscription.getQualifiedName();
-        if (shouldTryRefreshingToken(subscriptionName, result)) {
-            if (rateLimiter.tryAcquire()) {
-                logger.info("Refreshing token for subscription {}", subscriptionName);
-                rateLimiter.reduceRate();
-                executorService.schedule(() -> accessTokens.refreshToken(subscriptionName), 0, TimeUnit.MILLISECONDS);
-            }
-        }
+  public void handleFailed(Subscription subscription, MessageSendingResult result) {
+    SubscriptionName subscriptionName = subscription.getQualifiedName();
+    if (shouldTryRefreshingToken(subscriptionName, result)) {
+      if (rateLimiter.tryAcquire()) {
+        logger.info("Refreshing token for subscription {}", subscriptionName);
+        rateLimiter.reduceRate();
+        executorService.schedule(
+            () -> accessTokens.refreshToken(subscriptionName), 0, TimeUnit.MILLISECONDS);
+      }
     }
+  }
 
-    private boolean shouldTryRefreshingToken(SubscriptionName subscriptionName, MessageSendingResult result) {
-        return result.getStatusCode() == HttpStatus.UNAUTHORIZED_401 || !accessTokens.tokenExists(subscriptionName);
-    }
+  private boolean shouldTryRefreshingToken(
+      SubscriptionName subscriptionName, MessageSendingResult result) {
+    return result.getStatusCode() == HttpStatus.UNAUTHORIZED_401
+        || !accessTokens.tokenExists(subscriptionName);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionHandlerFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionHandlerFactory.java
index 993dfb48dd..f223747b03 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionHandlerFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthSubscriptionHandlerFactory.java
@@ -1,45 +1,52 @@
 package pl.allegro.tech.hermes.consumers.consumer.oauth;
 
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 
-import java.util.Optional;
-
 public class OAuthSubscriptionHandlerFactory {
 
-    private static final Logger logger = LoggerFactory.getLogger(OAuthSubscriptionHandlerFactory.class);
-
-    private final SubscriptionRepository subscriptionRepository;
-
-    private final OAuthAccessTokens accessTokens;
-
-    private final OAuthTokenRequestRateLimiterFactory rateLimiterLoader;
-
-    public OAuthSubscriptionHandlerFactory(SubscriptionRepository subscriptionRepository,
-                                           OAuthAccessTokens accessTokens,
-                                           OAuthTokenRequestRateLimiterFactory rateLimiterLoader) {
-        this.subscriptionRepository = subscriptionRepository;
-        this.accessTokens = accessTokens;
-        this.rateLimiterLoader = rateLimiterLoader;
-    }
-
-    public Optional<OAuthSubscriptionHandler> create(SubscriptionName subscriptionName) {
-        Subscription subscription = subscriptionRepository.getSubscriptionDetails(subscriptionName);
-        if (subscription.hasOAuthPolicy()) {
-            try {
-                String providerName = subscription.getOAuthPolicy().getProviderName();
-                logger.info("Creating OAuth handler subscription {} using {} OAuth provider",
-                        subscriptionName, providerName);
-                OAuthTokenRequestRateLimiter rateLimiter = rateLimiterLoader.create(subscription);
-                return Optional.of(new OAuthSubscriptionHandler(subscriptionName, providerName, accessTokens, rateLimiter));
-            } catch (Exception e) {
-                logger.error("Failed to create OAuth handler for subscription {}, {}",
-                        subscriptionName.getQualifiedName(), e.getMessage());
-            }
-        }
-        return Optional.empty();
+  private static final Logger logger =
+      LoggerFactory.getLogger(OAuthSubscriptionHandlerFactory.class);
+
+  private final SubscriptionRepository subscriptionRepository;
+
+  private final OAuthAccessTokens accessTokens;
+
+  private final OAuthTokenRequestRateLimiterFactory rateLimiterLoader;
+
+  public OAuthSubscriptionHandlerFactory(
+      SubscriptionRepository subscriptionRepository,
+      OAuthAccessTokens accessTokens,
+      OAuthTokenRequestRateLimiterFactory rateLimiterLoader) {
+    this.subscriptionRepository = subscriptionRepository;
+    this.accessTokens = accessTokens;
+    this.rateLimiterLoader = rateLimiterLoader;
+  }
+
+  public Optional<OAuthSubscriptionHandler> create(SubscriptionName subscriptionName) {
+    Subscription subscription = subscriptionRepository.getSubscriptionDetails(subscriptionName);
+    if (subscription.hasOAuthPolicy()) {
+      try {
+        String providerName = subscription.getOAuthPolicy().getProviderName();
+        logger.info(
+            "Creating OAuth handler subscription {} using {} OAuth provider",
+            subscriptionName,
+            providerName);
+        OAuthTokenRequestRateLimiter rateLimiter = rateLimiterLoader.create(subscription);
+        return Optional.of(
+            new OAuthSubscriptionHandler(
+                subscriptionName, providerName, accessTokens, rateLimiter));
+      } catch (Exception e) {
+        logger.error(
+            "Failed to create OAuth handler for subscription {}, {}",
+            subscriptionName.getQualifiedName(),
+            e.getMessage());
+      }
     }
+    return Optional.empty();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthTokenRequestRateLimiter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthTokenRequestRateLimiter.java
index d6cf977c91..55f56396da 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthTokenRequestRateLimiter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthTokenRequestRateLimiter.java
@@ -1,47 +1,46 @@
 package pl.allegro.tech.hermes.consumers.consumer.oauth;
 
 import com.google.common.util.concurrent.RateLimiter;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class OAuthTokenRequestRateLimiter {
 
-    private final double initialRate;
+  private final double initialRate;
 
-    private final double minimalRate;
+  private final double minimalRate;
 
-    private final double rateReductionFactor;
+  private final double rateReductionFactor;
 
-    private final RateLimiter rateLimiter;
+  private final RateLimiter rateLimiter;
 
-    private final AtomicInteger rateReductionsCount = new AtomicInteger();
+  private final AtomicInteger rateReductionsCount = new AtomicInteger();
 
-    public OAuthTokenRequestRateLimiter(double initialRate, double minimalRate, double rateReductionFactor,
-                                        long warmUpPeriod) {
-        this.initialRate = initialRate;
-        this.rateLimiter = RateLimiter.create(initialRate, warmUpPeriod, TimeUnit.MILLISECONDS);
-        this.minimalRate = minimalRate;
-        this.rateReductionFactor = rateReductionFactor;
-    }
+  public OAuthTokenRequestRateLimiter(
+      double initialRate, double minimalRate, double rateReductionFactor, long warmUpPeriod) {
+    this.initialRate = initialRate;
+    this.rateLimiter = RateLimiter.create(initialRate, warmUpPeriod, TimeUnit.MILLISECONDS);
+    this.minimalRate = minimalRate;
+    this.rateReductionFactor = rateReductionFactor;
+  }
 
-    public boolean tryAcquire() {
-        return rateLimiter.tryAcquire();
-    }
+  public boolean tryAcquire() {
+    return rateLimiter.tryAcquire();
+  }
 
-    public void reduceRate() {
-        rateReductionsCount.incrementAndGet();
-        rateLimiter.setRate(Math.max(rateLimiter.getRate() / rateReductionFactor, minimalRate));
-    }
+  public void reduceRate() {
+    rateReductionsCount.incrementAndGet();
+    rateLimiter.setRate(Math.max(rateLimiter.getRate() / rateReductionFactor, minimalRate));
+  }
 
-    public void resetRate() {
-        if (rateReductionsCount.get() > 0) {
-            rateLimiter.setRate(initialRate);
-            rateReductionsCount.set(0);
-        }
+  public void resetRate() {
+    if (rateReductionsCount.get() > 0) {
+      rateLimiter.setRate(initialRate);
+      rateReductionsCount.set(0);
     }
+  }
 
-    public double getCurrentRate() {
-        return rateLimiter.getRate();
-    }
+  public double getCurrentRate() {
+    return rateLimiter.getRate();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthTokenRequestRateLimiterFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthTokenRequestRateLimiterFactory.java
index df6868a87c..3d5b560415 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthTokenRequestRateLimiterFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/OAuthTokenRequestRateLimiterFactory.java
@@ -7,29 +7,30 @@
 
 public class OAuthTokenRequestRateLimiterFactory {
 
-    private final OAuthProviderRepository oAuthProviderRepository;
-
-    private final double rateReductionFactor;
-
-    public OAuthTokenRequestRateLimiterFactory(OAuthProviderRepository oAuthProviderRepository,
-                                               double rateReductionFactor) {
-        this.oAuthProviderRepository = oAuthProviderRepository;
-        this.rateReductionFactor = rateReductionFactor;
-
-        Preconditions.checkArgument(rateReductionFactor >= 1,
-                "Token request rate limiter rate reduction factor must be greater or equal to 1");
-    }
-
-    public OAuthTokenRequestRateLimiter create(Subscription subscription) {
-        String providerName = subscription.getOAuthPolicy().getProviderName();
-        OAuthProvider oAuthProvider = oAuthProviderRepository.getOAuthProviderDetails(providerName);
-        double initialRate = delayToRate(oAuthProvider.getTokenRequestInitialDelay());
-        double minimalRate = delayToRate(oAuthProvider.getTokenRequestMaxDelay());
-        return new OAuthTokenRequestRateLimiter(initialRate, minimalRate, rateReductionFactor,
-                oAuthProvider.getTokenRequestInitialDelay());
-    }
-
-    private double delayToRate(Integer delay) {
-        return 1000.0 / delay;
-    }
+  private final OAuthProviderRepository oAuthProviderRepository;
+
+  private final double rateReductionFactor;
+
+  public OAuthTokenRequestRateLimiterFactory(
+      OAuthProviderRepository oAuthProviderRepository, double rateReductionFactor) {
+    this.oAuthProviderRepository = oAuthProviderRepository;
+    this.rateReductionFactor = rateReductionFactor;
+
+    Preconditions.checkArgument(
+        rateReductionFactor >= 1,
+        "Token request rate limiter rate reduction factor must be greater or equal to 1");
+  }
+
+  public OAuthTokenRequestRateLimiter create(Subscription subscription) {
+    String providerName = subscription.getOAuthPolicy().getProviderName();
+    OAuthProvider oAuthProvider = oAuthProviderRepository.getOAuthProviderDetails(providerName);
+    double initialRate = delayToRate(oAuthProvider.getTokenRequestInitialDelay());
+    double minimalRate = delayToRate(oAuthProvider.getTokenRequestMaxDelay());
+    return new OAuthTokenRequestRateLimiter(
+        initialRate, minimalRate, rateReductionFactor, oAuthProvider.getTokenRequestInitialDelay());
+  }
+
+  private double delayToRate(Integer delay) {
+    return 1000.0 / delay;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthClient.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthClient.java
index 6a460a4c2f..9bc3e510a0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthClient.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthClient.java
@@ -4,9 +4,9 @@
 
 public interface OAuthClient {
 
-    OAuthAccessToken getToken(OAuthTokenRequest request);
+  OAuthAccessToken getToken(OAuthTokenRequest request);
 
-    void start();
+  void start();
 
-    void stop();
+  void stop();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthHttpClient.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthHttpClient.java
index 338085a1b0..8cd95f7473 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthHttpClient.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthHttpClient.java
@@ -1,98 +1,113 @@
 package pl.allegro.tech.hermes.consumers.consumer.oauth.client;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.http.entity.ContentType;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.eclipse.jetty.client.ContentResponse;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
 import pl.allegro.tech.hermes.consumers.consumer.oauth.OAuthAccessToken;
 
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
 public class OAuthHttpClient implements OAuthClient {
 
-    private final HttpClient httpClient;
+  private final HttpClient httpClient;
 
-    private final ObjectMapper objectMapper;
+  private final ObjectMapper objectMapper;
 
-    public OAuthHttpClient(HttpClient httpClient, ObjectMapper objectMapper) {
-        this.httpClient = httpClient;
-        this.objectMapper = objectMapper;
-    }
+  public OAuthHttpClient(HttpClient httpClient, ObjectMapper objectMapper) {
+    this.httpClient = httpClient;
+    this.objectMapper = objectMapper;
+  }
+
+  @Override
+  public OAuthAccessToken getToken(OAuthTokenRequest request) {
+    ContentResponse response = performHttpRequest(request);
+    validateHttpResponse(response);
+    OAuthTokenResponse accessTokenResponse = httpResponseToOAuthAccessTokenResponse(response);
+
+    return accessTokenResponse.toAccessToken();
+  }
 
-    @Override
-    public OAuthAccessToken getToken(OAuthTokenRequest request) {
-        ContentResponse response = performHttpRequest(request);
-        validateHttpResponse(response);
-        OAuthTokenResponse accessTokenResponse = httpResponseToOAuthAccessTokenResponse(response);
+  private Request createHttpRequest(OAuthTokenRequest request) {
+    Request httpRequest =
+        httpClient
+            .newRequest(request.getUrl())
+            .timeout(request.getRequestTimeout(), TimeUnit.MILLISECONDS)
+            .idleTimeout(request.getSocketTimeout(), TimeUnit.MILLISECONDS)
+            .method(HttpMethod.POST)
+            .headers(
+                headers -> {
+                  headers.add(HttpHeader.KEEP_ALIVE, "true");
+                  headers.add(HttpHeader.CONTENT_TYPE, APPLICATION_FORM_URLENCODED);
+                });
+    addParamIfNotNull(httpRequest, OAuthTokenRequest.Param.GRANT_TYPE, request.getGrantType());
+    addParamIfNotNull(httpRequest, OAuthTokenRequest.Param.SCOPE, request.getScope());
+    addParamIfNotNull(httpRequest, OAuthTokenRequest.Param.CLIENT_ID, request.getClientId());
+    addParamIfNotNull(
+        httpRequest, OAuthTokenRequest.Param.CLIENT_SECRET, request.getClientSecret());
 
-        return accessTokenResponse.toAccessToken();
+    if (OAuthTokenRequest.GrantTypeValue.RESOURCE_OWNER_USERNAME_PASSWORD.equals(
+        request.getGrantType())) {
+      addParamIfNotNull(httpRequest, OAuthTokenRequest.Param.USERNAME, request.getUsername());
+      addParamIfNotNull(httpRequest, OAuthTokenRequest.Param.PASSWORD, request.getPassword());
     }
+    return httpRequest;
+  }
 
-    private Request createHttpRequest(OAuthTokenRequest request) {
-        Request httpRequest = httpClient.newRequest(request.getUrl())
-                .timeout(request.getRequestTimeout(), TimeUnit.MILLISECONDS)
-                .idleTimeout(request.getSocketTimeout(), TimeUnit.MILLISECONDS)
-                .method(HttpMethod.POST)
-                .header(HttpHeader.KEEP_ALIVE, "true")
-                .header(HttpHeader.CONTENT_TYPE, ContentType.APPLICATION_FORM_URLENCODED.toString())
-                .param(OAuthTokenRequest.Param.GRANT_TYPE, request.getGrantType())
-                .param(OAuthTokenRequest.Param.SCOPE, request.getScope())
-                .param(OAuthTokenRequest.Param.CLIENT_ID, request.getClientId())
-                .param(OAuthTokenRequest.Param.CLIENT_SECRET, request.getClientSecret());
-
-        if (OAuthTokenRequest.GrantTypeValue.RESOURCE_OWNER_USERNAME_PASSWORD.equals(request.getGrantType())) {
-                httpRequest
-                        .param(OAuthTokenRequest.Param.USERNAME, request.getUsername())
-                        .param(OAuthTokenRequest.Param.PASSWORD, request.getPassword());
-        }
-        return httpRequest;
+  private void addParamIfNotNull(Request request, String name, String value) {
+    if (value != null) {
+      request.param(name, value);
     }
+  }
 
-    private ContentResponse performHttpRequest(OAuthTokenRequest request) {
-        try {
-            return createHttpRequest(request).send();
-        } catch (InterruptedException | TimeoutException | ExecutionException e) {
-            throw new OAuthTokenRequestException("An exception occurred while performing token request", e);
-        }
+  private ContentResponse performHttpRequest(OAuthTokenRequest request) {
+    try {
+      return createHttpRequest(request).send();
+    } catch (InterruptedException | TimeoutException | ExecutionException e) {
+      throw new OAuthTokenRequestException(
+          "An exception occurred while performing token request", e);
     }
+  }
 
-    private void validateHttpResponse(ContentResponse response) {
-        if (response.getStatus() != HttpStatus.OK_200) {
-            throw new OAuthTokenRequestException(String.format("%d %s response when performing token request",
-                    response.getStatus(), response.getContentAsString()));
-        }
+  private void validateHttpResponse(ContentResponse response) {
+    if (response.getStatus() != HttpStatus.OK_200) {
+      throw new OAuthTokenRequestException(
+          String.format(
+              "%d %s response when performing token request",
+              response.getStatus(), response.getContentAsString()));
     }
+  }
 
-    private OAuthTokenResponse httpResponseToOAuthAccessTokenResponse(ContentResponse response) {
-        try {
-            return objectMapper.readValue(response.getContentAsString(), OAuthTokenResponse.class);
-        } catch (IOException e) {
-            throw new OAuthTokenRequestException("An exception occurred while reading token response", e);
-        }
+  private OAuthTokenResponse httpResponseToOAuthAccessTokenResponse(ContentResponse response) {
+    try {
+      return objectMapper.readValue(response.getContentAsString(), OAuthTokenResponse.class);
+    } catch (IOException e) {
+      throw new OAuthTokenRequestException("An exception occurred while reading token response", e);
     }
+  }
 
-    @Override
-    public void start() {
-        try {
-            this.httpClient.start();
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
+  @Override
+  public void start() {
+    try {
+      this.httpClient.start();
+    } catch (Exception ex) {
+      throw new RuntimeException(ex);
     }
+  }
 
-    @Override
-    public void stop() {
-        try {
-            this.httpClient.stop();
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
+  @Override
+  public void stop() {
+    try {
+      this.httpClient.stop();
+    } catch (Exception ex) {
+      throw new RuntimeException(ex);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenRequest.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenRequest.java
index 70879b3418..0b3308fee7 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenRequest.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenRequest.java
@@ -2,161 +2,177 @@
 
 public class OAuthTokenRequest {
 
-    public static class Param {
-
-        public static final String GRANT_TYPE = "grant_type";
-        public static final String SCOPE = "scope";
-        public static final String CLIENT_ID = "client_id";
-        public static final String CLIENT_SECRET = "client_secret";
-        public static final String USERNAME = "username";
-        public static final String PASSWORD = "password";
-    }
+  public static class Param {
 
-    public static class GrantTypeValue {
+    public static final String GRANT_TYPE = "grant_type";
+    public static final String SCOPE = "scope";
+    public static final String CLIENT_ID = "client_id";
+    public static final String CLIENT_SECRET = "client_secret";
+    public static final String USERNAME = "username";
+    public static final String PASSWORD = "password";
+  }
 
-        public static final String RESOURCE_OWNER_USERNAME_PASSWORD = "password";
-        public static final String CLIENT_CREDENTIALS = "client_credentials";
-    }
+  public static class GrantTypeValue {
 
-    private final String url;
+    public static final String RESOURCE_OWNER_USERNAME_PASSWORD = "password";
+    public static final String CLIENT_CREDENTIALS = "client_credentials";
+  }
 
-    private final String grantType;
+  private final String url;
 
-    private final String scope;
+  private final String grantType;
 
-    private final String clientId;
+  private final String scope;
 
-    private final String clientSecret;
+  private final String clientId;
 
-    private final String username;
+  private final String clientSecret;
 
-    private final String password;
+  private final String username;
 
-    private final Integer requestTimeout;
+  private final String password;
 
-    private final Integer socketTimeout;
+  private final Integer requestTimeout;
 
-    private OAuthTokenRequest(String url, String grantType, String scope, String clientId, String clientSecret,
-                              String username, String password, Integer requestTimeout, Integer socketTimeout) {
-        this.url = url;
-        this.grantType = grantType;
-        this.scope = scope;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.username = username;
-        this.password = password;
-        this.requestTimeout = requestTimeout;
-        this.socketTimeout = socketTimeout;
-    }
+  private final Integer socketTimeout;
 
-    public String getUrl() {
-        return url;
-    }
+  private OAuthTokenRequest(
+      String url,
+      String grantType,
+      String scope,
+      String clientId,
+      String clientSecret,
+      String username,
+      String password,
+      Integer requestTimeout,
+      Integer socketTimeout) {
+    this.url = url;
+    this.grantType = grantType;
+    this.scope = scope;
+    this.clientId = clientId;
+    this.clientSecret = clientSecret;
+    this.username = username;
+    this.password = password;
+    this.requestTimeout = requestTimeout;
+    this.socketTimeout = socketTimeout;
+  }
 
-    public String getGrantType() {
-        return grantType;
-    }
+  public String getUrl() {
+    return url;
+  }
 
-    public String getScope() {
-        return scope;
-    }
+  public String getGrantType() {
+    return grantType;
+  }
 
-    public String getClientId() {
-        return clientId;
-    }
+  public String getScope() {
+    return scope;
+  }
 
-    public String getClientSecret() {
-        return clientSecret;
-    }
+  public String getClientId() {
+    return clientId;
+  }
 
-    public String getUsername() {
-        return username;
-    }
+  public String getClientSecret() {
+    return clientSecret;
+  }
 
-    public String getPassword() {
-        return password;
-    }
+  public String getUsername() {
+    return username;
+  }
 
-    public Integer getRequestTimeout() {
-        return requestTimeout;
-    }
+  public String getPassword() {
+    return password;
+  }
 
-    public Integer getSocketTimeout() {
-        return socketTimeout;
-    }
+  public Integer getRequestTimeout() {
+    return requestTimeout;
+  }
 
-    public static OAuthTokenRequestBuilder oAuthTokenRequest() {
-        return new OAuthTokenRequestBuilder();
-    }
+  public Integer getSocketTimeout() {
+    return socketTimeout;
+  }
 
-    public static class OAuthTokenRequestBuilder {
+  public static OAuthTokenRequestBuilder oAuthTokenRequest() {
+    return new OAuthTokenRequestBuilder();
+  }
 
-        private String url;
+  public static class OAuthTokenRequestBuilder {
 
-        private String grantType;
+    private String url;
 
-        private String scope;
+    private String grantType;
 
-        private String clientId;
+    private String scope;
 
-        private String clientSecret;
+    private String clientId;
 
-        private String username;
+    private String clientSecret;
 
-        private String password;
+    private String username;
 
-        private Integer requestTimeout;
+    private String password;
 
-        private Integer socketTimeout;
+    private Integer requestTimeout;
 
-        public OAuthTokenRequestBuilder withUrl(String url) {
-            this.url = url;
-            return this;
-        }
+    private Integer socketTimeout;
 
-        public OAuthTokenRequestBuilder withGrantType(String grantType) {
-            this.grantType = grantType;
-            return this;
-        }
+    public OAuthTokenRequestBuilder withUrl(String url) {
+      this.url = url;
+      return this;
+    }
 
-        public OAuthTokenRequestBuilder withScope(String scope) {
-            this.scope = scope;
-            return this;
-        }
+    public OAuthTokenRequestBuilder withGrantType(String grantType) {
+      this.grantType = grantType;
+      return this;
+    }
 
-        public OAuthTokenRequestBuilder withClientId(String clientId) {
-            this.clientId = clientId;
-            return this;
-        }
+    public OAuthTokenRequestBuilder withScope(String scope) {
+      this.scope = scope;
+      return this;
+    }
 
-        public OAuthTokenRequestBuilder withClientSecret(String clientSecret) {
-            this.clientSecret = clientSecret;
-            return this;
-        }
+    public OAuthTokenRequestBuilder withClientId(String clientId) {
+      this.clientId = clientId;
+      return this;
+    }
 
-        public OAuthTokenRequestBuilder withUsername(String username) {
-            this.username = username;
-            return this;
-        }
+    public OAuthTokenRequestBuilder withClientSecret(String clientSecret) {
+      this.clientSecret = clientSecret;
+      return this;
+    }
 
-        public OAuthTokenRequestBuilder withPassword(String password) {
-            this.password = password;
-            return this;
-        }
+    public OAuthTokenRequestBuilder withUsername(String username) {
+      this.username = username;
+      return this;
+    }
 
-        public OAuthTokenRequestBuilder withRequestTimeout(Integer requestTimeout) {
-            this.requestTimeout = requestTimeout;
-            return this;
-        }
+    public OAuthTokenRequestBuilder withPassword(String password) {
+      this.password = password;
+      return this;
+    }
 
-        public OAuthTokenRequestBuilder withSocketTimeout(Integer socketTimeout) {
-            this.socketTimeout = socketTimeout;
-            return this;
-        }
+    public OAuthTokenRequestBuilder withRequestTimeout(Integer requestTimeout) {
+      this.requestTimeout = requestTimeout;
+      return this;
+    }
+
+    public OAuthTokenRequestBuilder withSocketTimeout(Integer socketTimeout) {
+      this.socketTimeout = socketTimeout;
+      return this;
+    }
 
-        public OAuthTokenRequest build() {
-            return new OAuthTokenRequest(url, grantType, scope, clientId, clientSecret, username,
-                    password, requestTimeout, socketTimeout);
-        }
+    public OAuthTokenRequest build() {
+      return new OAuthTokenRequest(
+          url,
+          grantType,
+          scope,
+          clientId,
+          clientSecret,
+          username,
+          password,
+          requestTimeout,
+          socketTimeout);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenRequestException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenRequestException.java
index b14c17417a..74d6c9a939 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenRequestException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenRequestException.java
@@ -2,11 +2,11 @@
 
 public class OAuthTokenRequestException extends RuntimeException {
 
-    public OAuthTokenRequestException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public OAuthTokenRequestException(String message, Throwable cause) {
+    super(message, cause);
+  }
 
-    public OAuthTokenRequestException(String message) {
-        super(message);
-    }
+  public OAuthTokenRequestException(String message) {
+    super(message);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenResponse.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenResponse.java
index 7ab095095e..739ce368d1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenResponse.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenResponse.java
@@ -7,19 +7,19 @@
 
 public class OAuthTokenResponse {
 
-    @NotEmpty
-    private final String accessToken;
+  @NotEmpty private final String accessToken;
 
-    private final Integer expiresIn;
+  private final Integer expiresIn;
 
-    @JsonCreator
-    public OAuthTokenResponse(@JsonProperty("access_token") String accessToken,
-                              @JsonProperty("expires_in") Integer expiresIn) {
-        this.accessToken = accessToken;
-        this.expiresIn = expiresIn;
-    }
+  @JsonCreator
+  public OAuthTokenResponse(
+      @JsonProperty("access_token") String accessToken,
+      @JsonProperty("expires_in") Integer expiresIn) {
+    this.accessToken = accessToken;
+    this.expiresIn = expiresIn;
+  }
 
-    public OAuthAccessToken toAccessToken() {
-        return new OAuthAccessToken(accessToken, expiresIn);
-    }
+  public OAuthAccessToken toAccessToken() {
+    return new OAuthAccessToken(accessToken, expiresIn);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/ConsumerPartitionAssignmentState.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/ConsumerPartitionAssignmentState.java
index d5ac81bdc1..e6c318f369 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/ConsumerPartitionAssignmentState.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/ConsumerPartitionAssignmentState.java
@@ -1,66 +1,72 @@
 package pl.allegro.tech.hermes.consumers.consumer.offset;
 
-import org.slf4j.Logger;
-import pl.allegro.tech.hermes.api.SubscriptionName;
+import static java.util.stream.Collectors.toSet;
+import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
-import static java.util.stream.Collectors.toSet;
-import static org.slf4j.LoggerFactory.getLogger;
+import org.slf4j.Logger;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class ConsumerPartitionAssignmentState {
 
-    private static final Logger logger = getLogger(ConsumerPartitionAssignmentState.class);
+  private static final Logger logger = getLogger(ConsumerPartitionAssignmentState.class);
 
-    private final Map<SubscriptionName, Set<Integer>> assigned = new ConcurrentHashMap<>();
+  private final Map<SubscriptionName, Set<Integer>> assigned = new ConcurrentHashMap<>();
 
-    private final Map<SubscriptionName, Long> terms = new ConcurrentHashMap<>();
+  private final Map<SubscriptionName, Long> terms = new ConcurrentHashMap<>();
 
-    public void assign(SubscriptionName name, Collection<Integer> partitions) {
-        incrementTerm(name);
-        logger.info("Assigning partitions {} of {}, term={}", partitions, name, currentTerm(name));
-        assigned.compute(name, ((subscriptionName, assigned) -> {
-            HashSet<Integer> extended = new HashSet<>(partitions);
-            if (assigned == null) {
-                return extended;
-            } else {
-                extended.addAll(assigned);
-                return extended;
-            }
+  public void assign(SubscriptionName name, Collection<Integer> partitions) {
+    incrementTerm(name);
+    logger.info("Assigning partitions {} of {}, term={}", partitions, name, currentTerm(name));
+    assigned.compute(
+        name,
+        ((subscriptionName, assigned) -> {
+          HashSet<Integer> extended = new HashSet<>(partitions);
+          if (assigned == null) {
+            return extended;
+          } else {
+            extended.addAll(assigned);
+            return extended;
+          }
         }));
-    }
+  }
 
-    private void incrementTerm(SubscriptionName name) {
-        terms.compute(name, ((subscriptionName, term) -> term == null ? 0L : term + 1L));
-    }
+  private void incrementTerm(SubscriptionName name) {
+    terms.compute(name, ((subscriptionName, term) -> term == null ? 0L : term + 1L));
+  }
 
-    public void revoke(SubscriptionName name, Collection<Integer> partitions) {
-        logger.info("Revoking partitions {} of {}", partitions, name);
-        assigned.computeIfPresent(name, (subscriptionName, assigned) -> {
-            Set<Integer> filtered = assigned.stream().filter(p -> !partitions.contains(p)).collect(toSet());
-            return filtered.isEmpty() ? null : filtered;
+  public void revoke(SubscriptionName name, Collection<Integer> partitions) {
+    logger.info("Revoking partitions {} of {}", partitions, name);
+    assigned.computeIfPresent(
+        name,
+        (subscriptionName, assigned) -> {
+          Set<Integer> filtered =
+              assigned.stream().filter(p -> !partitions.contains(p)).collect(toSet());
+          return filtered.isEmpty() ? null : filtered;
         });
-    }
+  }
 
-    public void revokeAll(SubscriptionName name) {
-        logger.info("Revoking all partitions of {}", name);
-        assigned.remove(name);
-    }
+  public void revokeAll(SubscriptionName name) {
+    logger.info("Revoking all partitions of {}", name);
+    assigned.remove(name);
+  }
 
-    public long currentTerm(SubscriptionName name) {
-        return terms.getOrDefault(name, -1L);
-    }
+  public long currentTerm(SubscriptionName name) {
+    return terms.getOrDefault(name, -1L);
+  }
 
-    public boolean isAssignedPartitionAtCurrentTerm(SubscriptionPartition subscriptionPartition) {
-        return currentTerm(subscriptionPartition.getSubscriptionName()) == subscriptionPartition.getPartitionAssignmentTerm()
-                && isAssigned(subscriptionPartition.getSubscriptionName(), subscriptionPartition.getPartition());
-    }
+  public boolean isAssignedPartitionAtCurrentTerm(SubscriptionPartition subscriptionPartition) {
+    return currentTerm(subscriptionPartition.getSubscriptionName())
+            == subscriptionPartition.getPartitionAssignmentTerm()
+        && isAssigned(
+            subscriptionPartition.getSubscriptionName(), subscriptionPartition.getPartition());
+  }
 
-    private boolean isAssigned(SubscriptionName name, int partition) {
-        return assigned.containsKey(name) && assigned.get(name).contains(partition);
-    }
+  private boolean isAssigned(SubscriptionName name, int partition) {
+    return assigned.containsKey(name) && assigned.get(name).contains(partition);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/MessageState.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/MessageState.java
new file mode 100644
index 0000000000..b78a9e39b8
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/MessageState.java
@@ -0,0 +1,6 @@
+package pl.allegro.tech.hermes.consumers.consumer.offset;
+
+public enum MessageState {
+  INFLIGHT,
+  PROCESSED
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitter.java
index ad96812df3..a3fdc65409 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitter.java
@@ -1,246 +1,278 @@
 package pl.allegro.tech.hermes.consumers.consumer.offset;
 
 import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.jctools.queues.MessagePassingQueue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.consumers.consumer.receiver.MessageCommitter;
-import pl.allegro.tech.hermes.metrics.HermesCounter;
-import pl.allegro.tech.hermes.metrics.HermesTimer;
-import pl.allegro.tech.hermes.metrics.HermesTimerContext;
-
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.Function;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.metrics.HermesCounter;
+import pl.allegro.tech.hermes.metrics.HermesTimer;
+import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 
 /**
- * <p>Note on algorithm used to calculate offsets to actually commit.
- * The idea behind this algorithm is that we would like to commit:</p>
+ * Note on algorithm used to calculate offsets to actually commit. The idea behind this algorithm is
+ * that we would like to commit:
  *
  * <ul>
- * <li>maximal offset marked as committed,</li>
- * <li>but not larger than smallest inflight offset (smallest inflight - 1).</li>
+ *   <li>maximal offset marked as committed,
+ *   <li>but not larger than smallest inflight offset (smallest inflight - 1).
  * </ul>
  *
- * <p>Important note! This class is Kafka <code>OffsetCommiter</code>, and so it perceives offsets in Kafka way. Most importantly
- * committed offset marks message that is read as first on Consumer restart (offset is inclusive for reading and
- * exclusive for writing).</p>
+ * <p>Important note! This class is Kafka <code>OffsetCommiter</code>, and so it perceives offsets
+ * in Kafka way. Most importantly committed offset marks message that is read as first on Consumer
+ * restart (offset is inclusive for reading and exclusive for writing).
+ *
+ * <p>There are two queues which are used by Consumers to report message state:
  *
- * <p>There are two queues which are used by Consumers to report message state:</p>
  * <ul>
- * <li><code>inflightOffsets</code>: message offsets that are currently being sent (inflight),</li>
- * <li><code>commitedOffsets</code>: message offsets that are ready to get committed.</li>
+ *   <li><code>inflightOffsets</code>: message offsets that are currently being sent (inflight),
+ *   <li><code>commitedOffsets</code>: message offsets that are ready to get committed.
  * </ul>
  *
- * <p>This committer class holds internal state in form of inflightOffsets and maxCommittedOffsets collections.</p>
+ * <p>This committer class holds internal state in form of inflightOffsets and maxCommittedOffsets
+ * collections.
+ *
  * <ul>
- * <li><code>inflightOffsets</code> are all offsets that are currently in inflight state,</li>
- * <li><code>maxCommittedOffsets</code> are offsets (maximum per partition) of already committed messages that could not yet be committed
- * to kafka due to an existing inflight offset on the same partition.</li>
+ *   <li><code>inflightOffsets</code> are all offsets that are currently in inflight state,
+ *   <li><code>maxCommittedOffsets</code> are offsets (maximum per partition) of already committed
+ *       messages that could not yet be committed to kafka due to an existing inflight offset on the
+ *       same partition.
  * </ul>
  *
- * <p>In scheduled periods, commit algorithm is run. It has three phases. First one is draining the queues and performing
- * reductions:</p>
+ * <p>In scheduled periods, commit algorithm is run. It has three phases. First one is draining the
+ * queues and performing reductions:
+ *
  * <ul>
- * <li>drain <code>committedOffsets</code> queue to collection - it needs to be done before draining inflights, so this collection
- * will not grow anymore, resulting in having inflights unmatched by commits; commits are incremented by 1 to match
- * Kafka commit definition,</li>
- * <li>update the <code>maxCommittedOffsets</code> map with largest committed offsets,</li>
- * <li>drain <code>inflightOffsets</code>.</li>
+ *   <li>drain <code>committedOffsets</code> queue to collection - it needs to be done before
+ *       draining inflights, so this collection will not grow anymore, resulting in having inflights
+ *       unmatched by commits; commits are incremented by 1 to match Kafka commit definition,
+ *   <li>update the <code>maxCommittedOffsets</code> map with largest committed offsets,
+ *   <li>drain <code>inflightOffsets</code>.
  * </ul>
  *
- * <p>Second phase is calculating the offsets:</p>
+ * <p>Second phase is calculating the offsets:
+ *
  * <ul>
- * <li>calculate maximal committed offset for each subscription and partition,</li>
- * <li>calculate minimal inflight offset for each subscription and partition.</li>
+ *   <li>calculate maximal committed offset for each subscription and partition,
+ *   <li>calculate minimal inflight offset for each subscription and partition.
  * </ul>
  *
- * <p>Third phase is choosing which offset to commit for each subscription/partition. This is the minimal value of:</p>
+ * <p>Third phase is choosing which offset to commit for each subscription/partition. This is the
+ * minimal value of:
+ *
  * <ul>
- * <li>maximum committed offset,</li>
- * <li>minimum inflight offset.</li>
+ *   <li>maximum committed offset,
+ *   <li>minimum inflight offset.
  * </ul>
- * <p>This algorithm is very simple, memory efficient, can be performed in single thread and introduces no locks.</p>
+ *
+ * <p>This algorithm is very simple, memory efficient, can be performed in single thread and
+ * introduces no locks.
  */
-public class OffsetCommitter implements Runnable {
-
+public class OffsetCommitter {
+
+  private static final Logger logger = LoggerFactory.getLogger(OffsetCommitter.class);
+
+  private final ConsumerPartitionAssignmentState partitionAssignmentState;
+
+  private final HermesCounter obsoleteCounter;
+  private final HermesCounter committedCounter;
+  private final HermesTimer timer;
+
+  private final Set<SubscriptionPartitionOffset> inflightOffsets = new HashSet<>();
+  private final Map<SubscriptionPartition, Long> maxCommittedOffsets = new HashMap<>();
+
+  public OffsetCommitter(
+      ConsumerPartitionAssignmentState partitionAssignmentState, MetricsFacade metrics) {
+    this.partitionAssignmentState = partitionAssignmentState;
+    this.obsoleteCounter = metrics.offsetCommits().obsoleteCounter();
+    this.committedCounter = metrics.offsetCommits().committedCounter();
+    this.timer = metrics.offsetCommits().duration();
+  }
+
+  public Set<SubscriptionPartitionOffset> calculateOffsetsToBeCommitted(
+      Map<SubscriptionPartitionOffset, MessageState> offsets) {
+    try (HermesTimerContext ignored = timer.time()) {
+      List<SubscriptionPartitionOffset> processedOffsets = new ArrayList<>();
+      for (Map.Entry<SubscriptionPartitionOffset, MessageState> entry : offsets.entrySet()) {
+        if (entry.getValue() == MessageState.PROCESSED) {
+          processedOffsets.add(entry.getKey());
+        }
+      }
 
-    private static final Logger logger = LoggerFactory.getLogger(OffsetCommitter.class);
+      List<SubscriptionPartitionOffset> allOffsets = new ArrayList<>();
+      for (Map.Entry<SubscriptionPartitionOffset, MessageState> entry : offsets.entrySet()) {
+        allOffsets.add(entry.getKey());
+      }
 
-    private final ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor(
-            new ThreadFactoryBuilder().setNameFormat("offset-committer-%d").build());
+      ReducingConsumer processedOffsetsReducer = prepareProcessedOffsets(processedOffsets);
 
-    private final int offsetCommitPeriodSeconds;
+      // update stored max committed offsets with offsets drained from queue
+      Map<SubscriptionPartition, Long> maxDrainedProcessedOffsets = processedOffsetsReducer.reduced;
+      updateMaxProcessedOffsets(maxDrainedProcessedOffsets);
 
-    private final OffsetQueue offsetQueue;
+      ReducingConsumer inflightOffsetReducer =
+          prepareInflightOffsets(processedOffsetsReducer.all, allOffsets);
+      Map<SubscriptionPartition, Long> minInflightOffsets = inflightOffsetReducer.reduced;
 
-    private final ConsumerPartitionAssignmentState partitionAssignmentState;
-    private final MessageCommitter messageCommitter;
+      int scheduledToCommitCount = 0;
+      int obsoleteCount = 0;
 
-    private final HermesCounter obsoleteCounter;
-    private final HermesCounter committedCounter;
-    private final HermesTimer timer;
+      Set<SubscriptionPartition> processedOffsetToBeRemoved = new HashSet<>();
 
-    private final Set<SubscriptionPartitionOffset> inflightOffsets = new HashSet<>();
-    private final Map<SubscriptionPartition, Long> maxCommittedOffsets = new HashMap<>();
+      Set<SubscriptionPartitionOffset> offsetsToCommit = new HashSet<>();
+      for (SubscriptionPartition partition :
+          Sets.union(minInflightOffsets.keySet(), maxCommittedOffsets.keySet())) {
+        if (partitionAssignmentState.isAssignedPartitionAtCurrentTerm(partition)) {
+          long minInflight = minInflightOffsets.getOrDefault(partition, Long.MAX_VALUE);
+          long maxCommitted = maxCommittedOffsets.getOrDefault(partition, Long.MAX_VALUE);
 
-    public OffsetCommitter(
-            OffsetQueue offsetQueue,
-            ConsumerPartitionAssignmentState partitionAssignmentState,
-            MessageCommitter messageCommitter,
-            int offsetCommitPeriodSeconds,
-            MetricsFacade metrics
-    ) {
-        this.offsetQueue = offsetQueue;
-        this.partitionAssignmentState = partitionAssignmentState;
-        this.messageCommitter = messageCommitter;
-        this.offsetCommitPeriodSeconds = offsetCommitPeriodSeconds;
-        this.obsoleteCounter = metrics.offsetCommits().obsoleteCounter();
-        this.committedCounter = metrics.offsetCommits().committedCounter();
-        this.timer = metrics.offsetCommits().duration();
-    }
+          long offsetToBeCommitted = Math.min(minInflight, maxCommitted);
+          if (offsetToBeCommitted >= 0 && offsetToBeCommitted < Long.MAX_VALUE) {
+            scheduledToCommitCount++;
+            offsetsToCommit.add(new SubscriptionPartitionOffset(partition, offsetToBeCommitted));
 
-    @Override
-    public void run() {
-        try (HermesTimerContext ignored = timer.time()) {
-            // committed offsets need to be drained first so that there is no possibility of new committed offsets
-            // showing up after inflight queue is drained - this would lead to stall in committing offsets
-            ReducingConsumer committedOffsetsReducer = processCommittedOffsets();
-
-            // update stored max committed offsets with offsets drained from queue
-            Map<SubscriptionPartition, Long> maxDrainedCommittedOffsets = committedOffsetsReducer.reduced;
-            updateMaxCommittedOffsets(maxDrainedCommittedOffsets);
-
-            ReducingConsumer inflightOffsetReducer = processInflightOffsets(committedOffsetsReducer.all);
-            Map<SubscriptionPartition, Long> minInflightOffsets = inflightOffsetReducer.reduced;
-
-            int scheduledToCommitCount = 0;
-            int obsoleteCount = 0;
-
-            Set<SubscriptionPartition> committedOffsetToBeRemoved = new HashSet<>();
-
-            OffsetsToCommit offsetsToCommit = new OffsetsToCommit();
-            for (SubscriptionPartition partition : Sets.union(minInflightOffsets.keySet(), maxCommittedOffsets.keySet())) {
-                if (partitionAssignmentState.isAssignedPartitionAtCurrentTerm(partition)) {
-                    long minInflight = minInflightOffsets.getOrDefault(partition, Long.MAX_VALUE);
-                    long maxCommitted = maxCommittedOffsets.getOrDefault(partition, Long.MAX_VALUE);
-
-                    long offsetToBeCommitted = Math.min(minInflight, maxCommitted);
-                    if (offsetToBeCommitted >= 0 && offsetToBeCommitted < Long.MAX_VALUE) {
-                        scheduledToCommitCount++;
-                        offsetsToCommit.add(new SubscriptionPartitionOffset(partition, offsetToBeCommitted));
-
-                        // if we just committed the maximum possible offset for partition, we can safely forget about it
-                        if (maxCommitted == offsetToBeCommitted) {
-                            committedOffsetToBeRemoved.add(partition);
-                        }
-                    } else {
-                        logger.warn("Skipping offset out of bounds for subscription {}: partition={}, offset={}",
-                                partition.getSubscriptionName(), partition.getPartition(), offsetToBeCommitted);
-                    }
-                } else {
-                    obsoleteCount++;
-                }
+            // if we just committed the maximum possible offset for partition, we can safely forget
+            // about it
+            if (maxCommitted == offsetToBeCommitted) {
+              processedOffsetToBeRemoved.add(partition);
             }
-            committedOffsetToBeRemoved.forEach(maxCommittedOffsets::remove);
-            messageCommitter.commitOffsets(offsetsToCommit);
-
-            obsoleteCounter.increment(obsoleteCount);
-            committedCounter.increment(scheduledToCommitCount);
-
-            cleanupStoredOffsetsWithObsoleteTerms();
-        } catch (Exception exception) {
-            logger.error("Failed to run offset committer: {}", exception.getMessage(), exception);
+          } else {
+            logger.warn(
+                "Skipping offset out of bounds for subscription {}: partition={}, offset={}",
+                partition.getSubscriptionName(),
+                partition.getPartition(),
+                offsetToBeCommitted);
+          }
+        } else {
+          obsoleteCount++;
         }
-    }
+      }
+      processedOffsetToBeRemoved.forEach(maxCommittedOffsets::remove);
 
-    private ReducingConsumer processCommittedOffsets() {
-        ReducingConsumer committedOffsetsReducer = new ReducingConsumer(Math::max, c -> c + 1);
-        offsetQueue.drainCommittedOffsets(committedOffsetsReducer);
-        committedOffsetsReducer.resetModifierFunction();
-        return committedOffsetsReducer;
-    }
+      obsoleteCounter.increment(obsoleteCount);
+      committedCounter.increment(scheduledToCommitCount);
 
-    private void updateMaxCommittedOffsets(Map<SubscriptionPartition, Long> maxDrainedCommittedOffsets) {
-        maxDrainedCommittedOffsets.forEach((partition, drainedOffset) ->
-                maxCommittedOffsets.compute(partition, (p, storedOffset) ->
-                        storedOffset == null || storedOffset < drainedOffset ? drainedOffset : storedOffset)
-        );
-    }
+      cleanupStoredOffsetsWithObsoleteTerms();
 
-    private ReducingConsumer processInflightOffsets(Set<SubscriptionPartitionOffset> committedOffsets) {
-        ReducingConsumer inflightOffsetReducer = new ReducingConsumer(Math::min);
-        offsetQueue.drainInflightOffsets(o -> reduceIfNotCommitted(o, inflightOffsetReducer, committedOffsets));
-        inflightOffsets.forEach(o -> reduceIfNotCommitted(o, inflightOffsetReducer, committedOffsets));
-
-        inflightOffsets.clear();
-        inflightOffsets.addAll(inflightOffsetReducer.all);
-
-        return inflightOffsetReducer;
+      return offsetsToCommit;
+    } catch (Exception exception) {
+      logger.error("Failed to run offset committer: {}", exception.getMessage(), exception);
     }
-
-    private void reduceIfNotCommitted(SubscriptionPartitionOffset offset,
-                                      ReducingConsumer inflightOffsetReducer,
-                                      Set<SubscriptionPartitionOffset> committedOffsets) {
-        if (!committedOffsets.contains(offset)) {
-            inflightOffsetReducer.accept(offset);
-        }
+    return Set.of();
+  }
+
+  private ReducingConsumer prepareProcessedOffsets(
+      List<SubscriptionPartitionOffset> processedOffsets) {
+    ReducingConsumer processedOffsetsReducer = new ReducingConsumer(Math::max, c -> c + 1);
+    drain(processedOffsets, processedOffsetsReducer);
+    processedOffsetsReducer.resetModifierFunction();
+    return processedOffsetsReducer;
+  }
+
+  private void updateMaxProcessedOffsets(
+      Map<SubscriptionPartition, Long> maxDrainedCommittedOffsets) {
+    maxDrainedCommittedOffsets.forEach(
+        (partition, drainedOffset) ->
+            maxCommittedOffsets.compute(
+                partition,
+                (p, storedOffset) ->
+                    storedOffset == null || storedOffset < drainedOffset
+                        ? drainedOffset
+                        : storedOffset));
+  }
+
+  private ReducingConsumer prepareInflightOffsets(
+      Set<SubscriptionPartitionOffset> processedOffsets,
+      List<SubscriptionPartitionOffset> inflightOffsetsQueue) {
+    // smallest undelivered message
+    ReducingConsumer inflightOffsetReducer = new ReducingConsumer(Math::min);
+
+    // process inflights from the current iteration
+    drain(
+        inflightOffsetsQueue,
+        o -> reduceIfNotDelivered(o, inflightOffsetReducer, processedOffsets));
+
+    // process inflights from the previous iteration
+    inflightOffsets.forEach(o -> reduceIfNotDelivered(o, inflightOffsetReducer, processedOffsets));
+
+    inflightOffsets.clear();
+    inflightOffsets.addAll(inflightOffsetReducer.all);
+
+    return inflightOffsetReducer;
+  }
+
+  private void reduceIfNotDelivered(
+      SubscriptionPartitionOffset offset,
+      ReducingConsumer inflightOffsetReducer,
+      Set<SubscriptionPartitionOffset> committedOffsets) {
+    if (!committedOffsets.contains(offset)) {
+      inflightOffsetReducer.accept(offset);
     }
-
-    private void cleanupStoredOffsetsWithObsoleteTerms() {
-        inflightOffsets.removeIf(o -> !partitionAssignmentState.isAssignedPartitionAtCurrentTerm(o.getSubscriptionPartition()));
-        maxCommittedOffsets.entrySet().removeIf(entry -> !partitionAssignmentState.isAssignedPartitionAtCurrentTerm(entry.getKey()));
+  }
+
+  private void cleanupStoredOffsetsWithObsoleteTerms() {
+    inflightOffsets.removeIf(
+        o ->
+            !partitionAssignmentState.isAssignedPartitionAtCurrentTerm(
+                o.getSubscriptionPartition()));
+    maxCommittedOffsets
+        .entrySet()
+        .removeIf(
+            entry -> !partitionAssignmentState.isAssignedPartitionAtCurrentTerm(entry.getKey()));
+  }
+
+  private void drain(
+      List<SubscriptionPartitionOffset> subscriptionPartitionOffsets,
+      Consumer<SubscriptionPartitionOffset> consumer) {
+    int size = subscriptionPartitionOffsets.size();
+    for (int i = 0; i < size; i++) {
+      SubscriptionPartitionOffset element = subscriptionPartitionOffsets.get(i);
+      if (element != null) {
+        consumer.accept(element);
+      } else {
+        logger.warn("Unexpected null value while draining queue [idx={}, size={}]", i, size);
+        break;
+      }
     }
-
-    public void start() {
-        scheduledExecutor.scheduleWithFixedDelay(this,
-                offsetCommitPeriodSeconds,
-                offsetCommitPeriodSeconds,
-                TimeUnit.SECONDS
-        );
+  }
+
+  private static final class ReducingConsumer implements Consumer<SubscriptionPartitionOffset> {
+    private final BiFunction<Long, Long, Long> reductor;
+    private Function<Long, Long> modifier;
+    private final Map<SubscriptionPartition, Long> reduced = new HashMap<>();
+    private final Set<SubscriptionPartitionOffset> all = new HashSet<>();
+
+    private ReducingConsumer(
+        BiFunction<Long, Long, Long> reductor, Function<Long, Long> offsetModifier) {
+      this.reductor = reductor;
+      this.modifier = offsetModifier;
     }
 
-    public void shutdown() {
-        scheduledExecutor.shutdown();
+    private ReducingConsumer(BiFunction<Long, Long, Long> reductor) {
+      this(reductor, Function.identity());
     }
 
-    private static final class ReducingConsumer implements MessagePassingQueue.Consumer<SubscriptionPartitionOffset> {
-        private final BiFunction<Long, Long, Long> reductor;
-        private Function<Long, Long> modifier;
-        private final Map<SubscriptionPartition, Long> reduced = new HashMap<>();
-        private final Set<SubscriptionPartitionOffset> all = new HashSet<>();
-
-        private ReducingConsumer(BiFunction<Long, Long, Long> reductor, Function<Long, Long> offsetModifier) {
-            this.reductor = reductor;
-            this.modifier = offsetModifier;
-        }
-
-        private ReducingConsumer(BiFunction<Long, Long, Long> reductor) {
-            this(reductor, Function.identity());
-        }
-
-        private void resetModifierFunction() {
-            this.modifier = Function.identity();
-        }
+    private void resetModifierFunction() {
+      this.modifier = Function.identity();
+    }
 
-        @Override
-        public void accept(SubscriptionPartitionOffset p) {
-            all.add(p);
-            reduced.compute(
-                    p.getSubscriptionPartition(),
-                    (k, v) -> {
-                        long offset = modifier.apply(p.getOffset());
-                        return v == null ? offset : reductor.apply(v, offset);
-                    }
-            );
-        }
+    @Override
+    public void accept(SubscriptionPartitionOffset p) {
+      all.add(p);
+      reduced.compute(
+          p.getSubscriptionPartition(),
+          (k, v) -> {
+            long offset = modifier.apply(p.getOffset());
+            return v == null ? offset : reductor.apply(v, offset);
+          });
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterConsumerRebalanceListener.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterConsumerRebalanceListener.java
index 5d9c35d12b..3b296a7d68 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterConsumerRebalanceListener.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterConsumerRebalanceListener.java
@@ -1,35 +1,35 @@
 package pl.allegro.tech.hermes.consumers.consumer.offset;
 
-import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
-import org.apache.kafka.common.TopicPartition;
-import pl.allegro.tech.hermes.api.SubscriptionName;
+import static java.util.stream.Collectors.toSet;
 
 import java.util.Collection;
 import java.util.Set;
-
-import static java.util.stream.Collectors.toSet;
+import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
+import org.apache.kafka.common.TopicPartition;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class OffsetCommitterConsumerRebalanceListener implements ConsumerRebalanceListener {
 
-    private final SubscriptionName name;
-    private final ConsumerPartitionAssignmentState state;
+  private final SubscriptionName name;
+  private final ConsumerPartitionAssignmentState state;
 
-    public OffsetCommitterConsumerRebalanceListener(SubscriptionName name, ConsumerPartitionAssignmentState state) {
-        this.name = name;
-        this.state = state;
-    }
+  public OffsetCommitterConsumerRebalanceListener(
+      SubscriptionName name, ConsumerPartitionAssignmentState state) {
+    this.name = name;
+    this.state = state;
+  }
 
-    @Override
-    public void onPartitionsRevoked(Collection<TopicPartition> partitions) {
-        state.revoke(name, integerPartitions(partitions));
-    }
+  @Override
+  public void onPartitionsRevoked(Collection<TopicPartition> partitions) {
+    state.revoke(name, integerPartitions(partitions));
+  }
 
-    @Override
-    public void onPartitionsAssigned(Collection<TopicPartition> partitions) {
-        state.assign(name, integerPartitions(partitions));
-    }
+  @Override
+  public void onPartitionsAssigned(Collection<TopicPartition> partitions) {
+    state.assign(name, integerPartitions(partitions));
+  }
 
-    private Set<Integer> integerPartitions(Collection<TopicPartition> partitions) {
-        return partitions.stream().map(TopicPartition::partition).collect(toSet());
-    }
+  private Set<Integer> integerPartitions(Collection<TopicPartition> partitions) {
+    return partitions.stream().map(TopicPartition::partition).collect(toSet());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetQueue.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetQueue.java
deleted file mode 100644
index aee72eb210..0000000000
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetQueue.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package pl.allegro.tech.hermes.consumers.consumer.offset;
-
-import org.jctools.queues.MessagePassingQueue;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.consumers.queue.FullDrainMpscQueue;
-import pl.allegro.tech.hermes.consumers.queue.MonitoredMpscQueue;
-import pl.allegro.tech.hermes.consumers.queue.MpscQueue;
-import pl.allegro.tech.hermes.consumers.queue.WaitFreeDrainMpscQueue;
-
-public class OffsetQueue {
-
-    private final MpscQueue<SubscriptionPartitionOffset> inflightOffsetsQueue;
-
-    private final MpscQueue<SubscriptionPartitionOffset> commitOffsetsQueue;
-
-    public OffsetQueue(MetricsFacade metrics, int commitOffsetQueuesSize) {
-        this.inflightOffsetsQueue =
-                new MonitoredMpscQueue<>(new FullDrainMpscQueue<>(commitOffsetQueuesSize), metrics, "inflightOffsets");
-        this.commitOffsetsQueue =
-                new MonitoredMpscQueue<>(new WaitFreeDrainMpscQueue<>(commitOffsetQueuesSize), metrics, "committedOffsets");
-    }
-
-    public void offerInflightOffset(SubscriptionPartitionOffset offset) {
-        inflightOffsetsQueue.offer(offset);
-    }
-
-    public void offerCommittedOffset(SubscriptionPartitionOffset offset) {
-        commitOffsetsQueue.offer(offset);
-    }
-
-    public void drainInflightOffsets(MessagePassingQueue.Consumer<SubscriptionPartitionOffset> consumer) {
-        inflightOffsetsQueue.drain(consumer);
-    }
-
-    public void drainCommittedOffsets(MessagePassingQueue.Consumer<SubscriptionPartitionOffset> consumer) {
-        commitOffsetsQueue.drain(consumer);
-    }
-}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetsToCommit.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetsToCommit.java
deleted file mode 100644
index 8da371d7f4..0000000000
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetsToCommit.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package pl.allegro.tech.hermes.consumers.consumer.offset;
-
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class OffsetsToCommit {
-
-    private final Map<SubscriptionName, Set<SubscriptionPartitionOffset>> offsets = new HashMap<>();
-
-    public OffsetsToCommit add(SubscriptionPartitionOffset offset) {
-        Set<SubscriptionPartitionOffset> subscriptionOffsets = offsets.get(offset.getSubscriptionName());
-        if (subscriptionOffsets == null) {
-            subscriptionOffsets = new HashSet<>();
-            offsets.put(offset.getSubscriptionName(), subscriptionOffsets);
-        }
-        subscriptionOffsets.add(offset);
-        return this;
-    }
-
-    public Set<SubscriptionName> subscriptionNames() {
-        return offsets.keySet();
-    }
-
-    public Set<SubscriptionPartitionOffset> batchFor(SubscriptionName subscriptionName) {
-        return offsets.get(subscriptionName);
-    }
-}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsets.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsets.java
new file mode 100644
index 0000000000..54bfcad40b
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsets.java
@@ -0,0 +1,96 @@
+package pl.allegro.tech.hermes.consumers.consumer.offset;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.consumers.consumer.rate.AdjustableSemaphore;
+
+/**
+ * This class manages pending offsets for message consumption in a thread-safe manner. It ensures
+ * that the number of pending offsets does not exceed a specified maximum limit.
+ *
+ * <p>The {@code slots} map is effectively a bounded map, guarded by the {@code
+ * maxPendingOffsetsSemaphore}. This semaphore ensures that the number of entries in the {@code
+ * slots} map does not exceed {@code maxPendingOffsets} and prevents running out of memory. The
+ * semaphore is used to acquire permits before adding entries to the map and to release permits when
+ * entries are removed.
+ *
+ * <p>The {@code inflightSemaphore} is used to limit the number of messages that are currently being
+ * processed (inflight). It helps control the concurrency level of message processing.
+ *
+ * <p>Note: Methods that modify the state of the {@code slots} map, such as {@code markAsProcessed}
+ * and {@code markAsInflight}, must only be called after successfully acquiring a permit using the
+ * {@code tryAcquireSlot} method.
+ */
+public class PendingOffsets {
+
+  private final ConcurrentHashMap<SubscriptionPartitionOffset, MessageState> slots =
+      new ConcurrentHashMap<>();
+  private final AdjustableSemaphore inflightSemaphore;
+  private final Semaphore maxPendingOffsetsSemaphore;
+
+  public PendingOffsets(
+      SubscriptionName subscriptionName,
+      MetricsFacade metrics,
+      int inflightQueueSize,
+      int maxPendingOffsets) {
+    this.maxPendingOffsetsSemaphore = new Semaphore(maxPendingOffsets);
+    this.inflightSemaphore = new AdjustableSemaphore(inflightQueueSize);
+    metrics
+        .subscriptions()
+        .registerPendingOffsetsGauge(
+            subscriptionName,
+            maxPendingOffsetsSemaphore,
+            slots -> (maxPendingOffsets - (double) slots.availablePermits()) / maxPendingOffsets);
+  }
+
+  public void setInflightSize(int inflightQueueSize) {
+    this.inflightSemaphore.setMaxPermits(inflightQueueSize);
+  }
+
+  public void markAsProcessed(SubscriptionPartitionOffset subscriptionPartitionOffset) {
+    inflightSemaphore.release();
+    slots.put(subscriptionPartitionOffset, MessageState.PROCESSED);
+  }
+
+  public boolean tryAcquireSlot(Duration processingInterval) throws InterruptedException {
+    if (inflightSemaphore.tryAcquire(processingInterval.toMillis(), TimeUnit.MILLISECONDS)) {
+      if (maxPendingOffsetsSemaphore.tryAcquire(
+          processingInterval.toMillis(), TimeUnit.MILLISECONDS)) {
+        return true;
+      }
+      inflightSemaphore.release();
+    }
+    return false;
+  }
+
+  public void markAsInflight(SubscriptionPartitionOffset subscriptionPartitionOffset) {
+    slots.put(subscriptionPartitionOffset, MessageState.INFLIGHT);
+  }
+
+  public Map<SubscriptionPartitionOffset, MessageState>
+      getOffsetsSnapshotAndReleaseProcessedSlots() {
+    int permitsReleased = 0;
+    Map<SubscriptionPartitionOffset, MessageState> offsetSnapshot = new HashMap<>();
+
+    for (Map.Entry<SubscriptionPartitionOffset, MessageState> entry : slots.entrySet()) {
+      offsetSnapshot.put(entry.getKey(), entry.getValue());
+      if (entry.getValue() == MessageState.PROCESSED) {
+        slots.remove(entry.getKey());
+        permitsReleased++;
+      }
+    }
+    maxPendingOffsetsSemaphore.release(permitsReleased);
+    return offsetSnapshot;
+  }
+
+  public void releaseSlot() {
+    inflightSemaphore.release();
+    maxPendingOffsetsSemaphore.release();
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsetsAppender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsetsAppender.java
new file mode 100644
index 0000000000..8cdf6c4aca
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsetsAppender.java
@@ -0,0 +1,6 @@
+package pl.allegro.tech.hermes.consumers.consumer.offset;
+
+public interface PendingOffsetsAppender {
+
+  void markAsProcessed(SubscriptionPartitionOffset subscriptionPartitionOffset);
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/SubscriptionPartition.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/SubscriptionPartition.java
index d2e988b951..b524694c10 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/SubscriptionPartition.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/SubscriptionPartition.java
@@ -1,73 +1,77 @@
 package pl.allegro.tech.hermes.consumers.consumer.offset;
 
+import java.util.Objects;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
 
-import java.util.Objects;
-
 public class SubscriptionPartition {
 
-    private final KafkaTopicName kafkaTopicName;
+  private final KafkaTopicName kafkaTopicName;
 
-    private final SubscriptionName subscriptionName;
+  private final SubscriptionName subscriptionName;
 
-    private final int partition;
+  private final int partition;
 
-    private final long partitionAssignmentTerm;
+  private final long partitionAssignmentTerm;
 
-    public SubscriptionPartition(KafkaTopicName kafkaTopicName,
-                                 SubscriptionName subscriptionName,
-                                 int partition,
-                                 long partitionAssignmentTerm) {
-        this.kafkaTopicName = kafkaTopicName;
-        this.subscriptionName = subscriptionName;
-        this.partition = partition;
-        this.partitionAssignmentTerm = partitionAssignmentTerm;
-    }
+  public SubscriptionPartition(
+      KafkaTopicName kafkaTopicName,
+      SubscriptionName subscriptionName,
+      int partition,
+      long partitionAssignmentTerm) {
+    this.kafkaTopicName = kafkaTopicName;
+    this.subscriptionName = subscriptionName;
+    this.partition = partition;
+    this.partitionAssignmentTerm = partitionAssignmentTerm;
+  }
 
-    public KafkaTopicName getKafkaTopicName() {
-        return kafkaTopicName;
-    }
+  public KafkaTopicName getKafkaTopicName() {
+    return kafkaTopicName;
+  }
 
-    public SubscriptionName getSubscriptionName() {
-        return subscriptionName;
-    }
+  public SubscriptionName getSubscriptionName() {
+    return subscriptionName;
+  }
 
-    public int getPartition() {
-        return partition;
-    }
+  public int getPartition() {
+    return partition;
+  }
 
-    public long getPartitionAssignmentTerm() {
-        return partitionAssignmentTerm;
-    }
+  public long getPartitionAssignmentTerm() {
+    return partitionAssignmentTerm;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionPartition that = (SubscriptionPartition) o;
-        return partition == that.partition
-                && partitionAssignmentTerm == that.partitionAssignmentTerm
-                && Objects.equals(kafkaTopicName, that.kafkaTopicName)
-                && Objects.equals(subscriptionName, that.subscriptionName);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(kafkaTopicName, subscriptionName, partition, partitionAssignmentTerm);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SubscriptionPartition that = (SubscriptionPartition) o;
+    return partition == that.partition
+        && partitionAssignmentTerm == that.partitionAssignmentTerm
+        && Objects.equals(kafkaTopicName, that.kafkaTopicName)
+        && Objects.equals(subscriptionName, that.subscriptionName);
+  }
 
-    @Override
-    public String toString() {
-        return "SubscriptionPartition{"
-                + "kafkaTopicName=" + kafkaTopicName
-                + ", subscriptionName=" + subscriptionName
-                + ", partition=" + partition
-                + ", partitionAssignmentTerm=" + partitionAssignmentTerm
-                + '}';
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(kafkaTopicName, subscriptionName, partition, partitionAssignmentTerm);
+  }
+
+  @Override
+  public String toString() {
+    return "SubscriptionPartition{"
+        + "kafkaTopicName="
+        + kafkaTopicName
+        + ", subscriptionName="
+        + subscriptionName
+        + ", partition="
+        + partition
+        + ", partitionAssignmentTerm="
+        + partitionAssignmentTerm
+        + '}';
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/SubscriptionPartitionOffset.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/SubscriptionPartitionOffset.java
index b5ef044c8c..32f0eb8858 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/SubscriptionPartitionOffset.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/SubscriptionPartitionOffset.java
@@ -1,82 +1,88 @@
 package pl.allegro.tech.hermes.consumers.consumer.offset;
 
+import java.util.Objects;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
 
-import java.util.Objects;
-
 public class SubscriptionPartitionOffset {
 
-    private final SubscriptionPartition subscriptionPartition;
-
-    private final long offset;
-
-    public SubscriptionPartitionOffset(SubscriptionPartition subscriptionPartition, long offset) {
-        this.subscriptionPartition = subscriptionPartition;
-        this.offset = offset;
-    }
-
-    public static SubscriptionPartitionOffset subscriptionPartitionOffset(SubscriptionName subscriptionName,
-                                                                          PartitionOffset partitionOffset,
-                                                                          long partitionAssignmentTerm) {
-        return new SubscriptionPartitionOffset(
-                new SubscriptionPartition(
-                        partitionOffset.getTopic(),
-                        subscriptionName,
-                        partitionOffset.getPartition(),
-                        partitionAssignmentTerm
-                ),
-                partitionOffset.getOffset());
-    }
-
-    public SubscriptionName getSubscriptionName() {
-        return subscriptionPartition.getSubscriptionName();
-    }
-
-    public KafkaTopicName getKafkaTopicName() {
-        return subscriptionPartition.getKafkaTopicName();
-    }
-
-    public int getPartition() {
-        return subscriptionPartition.getPartition();
-    }
-
-    public long getOffset() {
-        return offset;
-    }
-
-    public long getPartitionAssignmentTerm() {
-        return subscriptionPartition.getPartitionAssignmentTerm();
-    }
-
-    public SubscriptionPartition getSubscriptionPartition() {
-        return subscriptionPartition;
-    }
-
-    @Override
-    public String toString() {
-        return "SubscriptionPartitionOffset{"
-                + "subscriptionPartition=" + subscriptionPartition
-                + ", offset=" + offset
-                + '}';
+  private final SubscriptionPartition subscriptionPartition;
+
+  private final long offset;
+
+  public SubscriptionPartitionOffset(SubscriptionPartition subscriptionPartition, long offset) {
+    this.subscriptionPartition = subscriptionPartition;
+    this.offset = offset;
+  }
+
+  public static SubscriptionPartitionOffset subscriptionPartitionOffset(
+      SubscriptionName subscriptionName,
+      PartitionOffset partitionOffset,
+      long partitionAssignmentTerm) {
+    return new SubscriptionPartitionOffset(
+        new SubscriptionPartition(
+            partitionOffset.getTopic(),
+            subscriptionName,
+            partitionOffset.getPartition(),
+            partitionAssignmentTerm),
+        partitionOffset.getOffset());
+  }
+
+  public SubscriptionName getSubscriptionName() {
+    return subscriptionPartition.getSubscriptionName();
+  }
+
+  public KafkaTopicName getKafkaTopicName() {
+    return subscriptionPartition.getKafkaTopicName();
+  }
+
+  public int getPartition() {
+    return subscriptionPartition.getPartition();
+  }
+
+  public long getOffset() {
+    return offset;
+  }
+
+  public PartitionOffset getPartitionOffset() {
+    return new PartitionOffset(
+        subscriptionPartition.getKafkaTopicName(), offset, subscriptionPartition.getPartition());
+  }
+
+  public long getPartitionAssignmentTerm() {
+    return subscriptionPartition.getPartitionAssignmentTerm();
+  }
+
+  public SubscriptionPartition getSubscriptionPartition() {
+    return subscriptionPartition;
+  }
+
+  @Override
+  public String toString() {
+    return "SubscriptionPartitionOffset{"
+        + "subscriptionPartition="
+        + subscriptionPartition
+        + ", offset="
+        + offset
+        + '}';
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionPartitionOffset that = (SubscriptionPartitionOffset) o;
-        return offset == that.offset
-                && Objects.equals(subscriptionPartition, that.subscriptionPartition);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(subscriptionPartition, offset);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SubscriptionPartitionOffset that = (SubscriptionPartitionOffset) o;
+    return offset == that.offset
+        && Objects.equals(subscriptionPartition, that.subscriptionPartition);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(subscriptionPartition, offset);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/BrokerOffsetCommitErrors.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/BrokerOffsetCommitErrors.java
index 78da6af7a7..e2250302c1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/BrokerOffsetCommitErrors.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/BrokerOffsetCommitErrors.java
@@ -1,21 +1,20 @@
 package pl.allegro.tech.hermes.consumers.consumer.offset.kafka.broker;
 
 import com.google.common.base.Joiner;
-import org.apache.kafka.common.TopicPartition;
-
 import java.util.Map;
+import org.apache.kafka.common.TopicPartition;
 
 public class BrokerOffsetCommitErrors {
 
-    private final Joiner.MapJoiner mapJoiner = Joiner.on(',').withKeyValueSeparator("=");
-    private final Map<TopicPartition, Object> errors;
+  private final Joiner.MapJoiner mapJoiner = Joiner.on(',').withKeyValueSeparator("=");
+  private final Map<TopicPartition, Object> errors;
 
-    public BrokerOffsetCommitErrors(Map<TopicPartition, Object> errors) {
-        this.errors = errors;
-    }
+  public BrokerOffsetCommitErrors(Map<TopicPartition, Object> errors) {
+    this.errors = errors;
+  }
 
-    @Override
-    public String toString() {
-        return mapJoiner.join(errors);
-    }
+  @Override
+  public String toString() {
+    return mapJoiner.join(errors);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/KafkaConsumerOffsetMover.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/KafkaConsumerOffsetMover.java
index b35480177b..7f26db83f2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/KafkaConsumerOffsetMover.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/KafkaConsumerOffsetMover.java
@@ -9,33 +9,41 @@
 
 public class KafkaConsumerOffsetMover {
 
-    private static final Logger logger = LoggerFactory.getLogger(KafkaConsumerOffsetMover.class);
+  private static final Logger logger = LoggerFactory.getLogger(KafkaConsumerOffsetMover.class);
 
-    private final SubscriptionName subscriptionName;
-    private KafkaConsumer consumer;
+  private final SubscriptionName subscriptionName;
+  private KafkaConsumer consumer;
 
-    public KafkaConsumerOffsetMover(SubscriptionName subscriptionName, KafkaConsumer consumer) {
-        this.subscriptionName = subscriptionName;
-        this.consumer = consumer;
-    }
+  public KafkaConsumerOffsetMover(SubscriptionName subscriptionName, KafkaConsumer consumer) {
+    this.subscriptionName = subscriptionName;
+    this.consumer = consumer;
+  }
 
-    public boolean move(PartitionOffset offset) {
-        try {
-            TopicPartition tp = new TopicPartition(offset.getTopic().asString(), offset.getPartition());
-            if (consumer.assignment().contains(tp)) {
-                logger.info("Moving offset for assigned partition {} on subscription {}",
-                        offset.getPartition(), subscriptionName);
-                consumer.seek(tp, offset.getOffset());
-                return true;
-            } else {
-                logger.info("Not assigned to partition {} on subscription {}",
-                        offset.getPartition(), subscriptionName);
-                return false;
-            }
-        } catch (IllegalStateException ex) {
-            logger.error("Failed to move offset for subscription={}, partition={}, offset={}",
-                    subscriptionName, offset.getPartition(), offset.getOffset(), ex);
-            return false;
-        }
+  public boolean move(PartitionOffset offset) {
+    try {
+      TopicPartition tp = new TopicPartition(offset.getTopic().asString(), offset.getPartition());
+      if (consumer.assignment().contains(tp)) {
+        logger.info(
+            "Moving offset for assigned partition {} on subscription {}",
+            offset.getPartition(),
+            subscriptionName);
+        consumer.seek(tp, offset.getOffset());
+        return true;
+      } else {
+        logger.info(
+            "Not assigned to partition {} on subscription {}",
+            offset.getPartition(),
+            subscriptionName);
+        return false;
+      }
+    } catch (IllegalStateException ex) {
+      logger.error(
+          "Failed to move offset for subscription={}, partition={}, offset={}",
+          subscriptionName,
+          offset.getPartition(),
+          offset.getOffset(),
+          ex);
+      return false;
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/PartitionNotAssignedException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/PartitionNotAssignedException.java
index eecfbfed1a..29d12cb599 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/PartitionNotAssignedException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/PartitionNotAssignedException.java
@@ -3,11 +3,11 @@
 import pl.allegro.tech.hermes.common.exception.RetransmissionException;
 
 public class PartitionNotAssignedException extends RetransmissionException {
-    public PartitionNotAssignedException() {
-        super("");
-    }
+  public PartitionNotAssignedException() {
+    super("");
+  }
 
-    public PartitionNotAssignedException(Throwable cause) {
-        super(cause);
-    }
-}
\ No newline at end of file
+  public PartitionNotAssignedException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/ReadingConsumerMetadataException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/ReadingConsumerMetadataException.java
index eeeb57de21..ce09a626d5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/ReadingConsumerMetadataException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/offset/kafka/broker/ReadingConsumerMetadataException.java
@@ -5,12 +5,12 @@
 
 public class ReadingConsumerMetadataException extends HermesException {
 
-    public ReadingConsumerMetadataException(int errorCode) {
-        super(String.format("Cannot read consumer metadata, response error code: %s.", errorCode));
-    }
+  public ReadingConsumerMetadataException(int errorCode) {
+    super(String.format("Cannot read consumer metadata, response error code: %s.", errorCode));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.INTERNAL_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.INTERNAL_ERROR;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/ConsumerProfiler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/ConsumerProfiler.java
new file mode 100644
index 0000000000..c83bc2ef44
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/ConsumerProfiler.java
@@ -0,0 +1,26 @@
+package pl.allegro.tech.hermes.consumers.consumer.profiling;
+
+public interface ConsumerProfiler {
+
+  void startMeasurements(String measurement);
+
+  /**
+   * Measures the execution time of a specific piece of code. The measurement starts with a call to
+   * this method, and is terminated by another call to the same method with a different parameter
+   * (to keep the measurement continuity), or by calling the <code>flushMeasurements</code> method.
+   */
+  void measure(String measurement);
+
+  /**
+   * Measures the same piece of code several times, for example, a method call in the middle of a
+   * loop. Default implementation stores individual measurements, as well as their sum. <code>
+   * stopPartialMeasurements</code> should be called before measuring again.
+   */
+  void startPartialMeasurement(String measurement);
+
+  void stopPartialMeasurement();
+
+  void saveRetryDelay(long retryDelay);
+
+  void flushMeasurements(ConsumerRun consumerRun);
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/ConsumerRun.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/ConsumerRun.java
new file mode 100644
index 0000000000..7911c803d1
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/ConsumerRun.java
@@ -0,0 +1,9 @@
+package pl.allegro.tech.hermes.consumers.consumer.profiling;
+
+public enum ConsumerRun {
+  EMPTY,
+  DELIVERED,
+  DISCARDED,
+  RETRIED,
+  FILTERED
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/DefaultConsumerProfiler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/DefaultConsumerProfiler.java
new file mode 100644
index 0000000000..783be2d435
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/DefaultConsumerProfiler.java
@@ -0,0 +1,82 @@
+package pl.allegro.tech.hermes.consumers.consumer.profiling;
+
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StopWatch;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+
+/** This class is designed to be fully thread safe. */
+public class DefaultConsumerProfiler implements ConsumerProfiler {
+
+  private static final Logger logger = LoggerFactory.getLogger(DefaultConsumerProfiler.class);
+
+  private final SubscriptionName subscriptionName;
+  private final long profilingThresholdMs;
+  private StopWatch stopWatch;
+  private StopWatch partialMeasurements;
+  private long retryDelayMillis = 0;
+
+  public DefaultConsumerProfiler(SubscriptionName subscriptionName, long profilingThresholdMs) {
+    this.subscriptionName = subscriptionName;
+    this.profilingThresholdMs = profilingThresholdMs;
+  }
+
+  @Override
+  public synchronized void startMeasurements(String measurement) {
+    this.stopWatch = new StopWatch();
+    this.stopWatch.start(measurement);
+  }
+
+  @Override
+  public synchronized void measure(String measurement) {
+    this.stopWatch.stop();
+    this.stopWatch.start(measurement);
+  }
+
+  @Override
+  public synchronized void startPartialMeasurement(String measurement) {
+    if (partialMeasurements == null) {
+      partialMeasurements = new StopWatch();
+    }
+    partialMeasurements.start(measurement);
+  }
+
+  @Override
+  public synchronized void stopPartialMeasurement() {
+    partialMeasurements.stop();
+  }
+
+  @Override
+  public synchronized void saveRetryDelay(long retryDelay) {
+    this.retryDelayMillis = retryDelay;
+  }
+
+  @Override
+  public synchronized void flushMeasurements(ConsumerRun consumerRun) {
+    this.stopWatch.stop();
+    if (stopWatch.getTotalTimeMillis() > profilingThresholdMs) {
+      logMeasurements(consumerRun);
+    }
+  }
+
+  private void logMeasurements(ConsumerRun consumerRun) {
+    if (partialMeasurements != null) {
+      logger.info(
+          "Consumer profiler measurements for subscription {} and {} run: \n {} partialMeasurements: {} retryDelayMillis {}",
+          subscriptionName,
+          consumerRun,
+          stopWatch.prettyPrint(TimeUnit.MILLISECONDS),
+          partialMeasurements.prettyPrint(TimeUnit.MILLISECONDS),
+          retryDelayMillis);
+    } else {
+      logger.info(
+          "Consumer profiler measurements for subscription {} and {} run: \n {} partialMeasurements: {}, retryDelayMillis {}",
+          subscriptionName,
+          consumerRun,
+          stopWatch.prettyPrint(TimeUnit.MILLISECONDS),
+          null,
+          retryDelayMillis);
+    }
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/Measurement.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/Measurement.java
new file mode 100644
index 0000000000..6ac8fa8cf7
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/Measurement.java
@@ -0,0 +1,15 @@
+package pl.allegro.tech.hermes.consumers.consumer.profiling;
+
+public class Measurement {
+  public static final String SIGNALS_AND_SEMAPHORE_ACQUIRE = "signalsAndSemaphoreAcquire";
+  public static final String SIGNALS_INTERRUPT_RUN = "signalsInterrupt.run";
+  public static final String SCHEDULE_RESEND = "schedule.resend";
+  public static final String MESSAGE_RECEIVER_NEXT = "messageReceiver.next";
+  public static final String MESSAGE_CONVERSION = "messageConverter.convert";
+  public static final String OFFER_INFLIGHT_OFFSET = "offsetQueue.offerInflightOffset";
+  public static final String TRACKERS_LOG_INFLIGHT = "trackers.logInflight";
+  public static final String SCHEDULE_MESSAGE_SENDING = "retrySingleThreadExecutor.schedule";
+  public static final String ACQUIRE_RATE_LIMITER = "acquireRateLimiter";
+  public static final String MESSAGE_SENDER_SEND = "messageSender.send";
+  public static final String HANDLERS = "handlers";
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/NoOpConsumerProfiler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/NoOpConsumerProfiler.java
new file mode 100644
index 0000000000..f478c04d27
--- /dev/null
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/profiling/NoOpConsumerProfiler.java
@@ -0,0 +1,22 @@
+package pl.allegro.tech.hermes.consumers.consumer.profiling;
+
+public class NoOpConsumerProfiler implements ConsumerProfiler {
+
+  @Override
+  public void startMeasurements(String measurement) {}
+
+  @Override
+  public void measure(String measurement) {}
+
+  @Override
+  public void startPartialMeasurement(String measurement) {}
+
+  @Override
+  public void stopPartialMeasurement() {}
+
+  @Override
+  public void saveRetryDelay(long retryDelay) {}
+
+  @Override
+  public void flushMeasurements(ConsumerRun consumerRun) {}
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/AdjustableSemaphore.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/AdjustableSemaphore.java
index 03ce96488a..3d9b08cdd0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/AdjustableSemaphore.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/AdjustableSemaphore.java
@@ -17,109 +17,97 @@
  *
  * */
 
-/**
- * A simple implementation of an adjustable semaphore.
- */
+/** A simple implementation of an adjustable semaphore. */
 @ThreadSafe
 public final class AdjustableSemaphore {
 
-    /**
-     * Semaphore starts at 0 capacity; must be set by setMaxPermits before use.
-     */
-    private final ResizeableSemaphore semaphore;
-
-    /**
-     * How many permits are allowed as governed by this semaphore.
-     * Access must be synchronized on this object.
-     */
-    private int maxPermits = 0;
-
-    /**
-     * New instances should be configured with setMaxPermits().
-     */
-    public AdjustableSemaphore(int maxPermits) {
-        this.maxPermits = maxPermits;
-        this.semaphore = new ResizeableSemaphore(maxPermits);
+  /** Semaphore starts at 0 capacity; must be set by setMaxPermits before use. */
+  private final ResizeableSemaphore semaphore;
+
+  /**
+   * How many permits are allowed as governed by this semaphore. Access must be synchronized on this
+   * object.
+   */
+  private int maxPermits = 0;
+
+  /** New instances should be configured with setMaxPermits(). */
+  public AdjustableSemaphore(int maxPermits) {
+    this.maxPermits = maxPermits;
+    this.semaphore = new ResizeableSemaphore(maxPermits);
+  }
+
+  /*
+   * Must be synchronized because the underlying int is not thread safe
+   */
+
+  /**
+   * Set the max number of permits. Must be greater than zero.
+   *
+   * <p>Note that if there are more than the new max number of permits currently outstanding, any
+   * currently blocking threads or any new threads that start to block after the call will wait
+   * until enough permits have been released to have the number of outstanding permits fall below
+   * the new maximum. In other words, it does what you probably think it should.
+   */
+  public synchronized void setMaxPermits(int newMax) {
+    if (newMax < 1) {
+      throw new IllegalArgumentException("Semaphore size must be at least 1," + " was " + newMax);
     }
 
-    /*
-     * Must be synchronized because the underlying int is not thread safe
-     */
-
-    /**
-     * <p>Set the max number of permits. Must be greater than zero.</p>
-     *
-     * <p>Note that if there are more than the new max number of permits currently
-     * outstanding, any currently blocking threads or any new threads that start
-     * to block after the call will wait until enough permits have been released to
-     * have the number of outstanding permits fall below the new maximum. In
-     * other words, it does what you probably think it should.</p>
-     */
-    public synchronized void setMaxPermits(int newMax) {
-        if (newMax < 1) {
-            throw new IllegalArgumentException("Semaphore size must be at least 1,"
-                    + " was " + newMax);
-        }
-
-        int delta = newMax - this.maxPermits;
-
-        if (delta == 0) {
-            return;
-        } else if (delta > 0) {
-            // new max is higher, so release that many permits
-            this.semaphore.release(delta);
-        } else {
-            delta *= -1;
-            // delta < 0.
-            // reducePermits needs a positive #, though.
-            this.semaphore.reducePermits(delta);
-        }
-
-        this.maxPermits = newMax;
+    int delta = newMax - this.maxPermits;
+
+    if (delta == 0) {
+      return;
+    } else if (delta > 0) {
+      // new max is higher, so release that many permits
+      this.semaphore.release(delta);
+    } else {
+      delta *= -1;
+      // delta < 0.
+      // reducePermits needs a positive #, though.
+      this.semaphore.reducePermits(delta);
     }
 
-    /**
-     * Release a permit back to the semaphore. Make sure not to double-release.
-     */
-    public void release() {
-        this.semaphore.release();
+    this.maxPermits = newMax;
+  }
+
+  /** Release a permit back to the semaphore. Make sure not to double-release. */
+  public void release() {
+    this.semaphore.release();
+  }
+
+  /**
+   * Get a permit, blocking if necessary.
+   *
+   * @throws InterruptedException if interrupted while waiting for a permit
+   */
+  public void acquire() throws InterruptedException {
+    this.semaphore.acquire();
+  }
+
+  public boolean tryAcquire(long timeout, TimeUnit unit) throws InterruptedException {
+    return this.semaphore.tryAcquire(timeout, unit);
+  }
+
+  public int availablePermits() {
+    return this.semaphore.availablePermits();
+  }
+
+  /**
+   * A trivial subclass of <code>Semaphore</code> that exposes the reducePermits call to the parent
+   * class. Doug Lea says it's ok...
+   * http://osdir.com/ml/java.jsr.166-concurrency/2003-10/msg00042.html
+   */
+  private static final class ResizeableSemaphore extends Semaphore {
+    private static final long serialVersionUID = 1L;
+
+    /** Create a new semaphore with 0 permits. */
+    ResizeableSemaphore(int maxPermits) {
+      super(maxPermits);
     }
 
-    /**
-     * Get a permit, blocking if necessary.
-     *
-     * @throws InterruptedException if interrupted while waiting for a permit
-     */
-    public void acquire() throws InterruptedException {
-        this.semaphore.acquire();
-    }
-
-    public boolean tryAcquire(long timeout, TimeUnit unit) throws InterruptedException {
-        return this.semaphore.tryAcquire(timeout, unit);
-    }
-
-    public int availablePermits() {
-        return this.semaphore.availablePermits();
-    }
-
-    /**
-     * A trivial subclass of <code>Semaphore</code> that exposes the reducePermits
-     * call to the parent class. Doug Lea says it's ok...
-     * http://osdir.com/ml/java.jsr.166-concurrency/2003-10/msg00042.html
-     */
-    private static final class ResizeableSemaphore extends Semaphore {
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * Create a new semaphore with 0 permits.
-         */
-        ResizeableSemaphore(int maxPermits) {
-            super(maxPermits);
-        }
-
-        @Override
-        protected void reducePermits(int reduction) {
-            super.reducePermits(reduction);
-        }
+    @Override
+    protected void reducePermits(int reduction) {
+      super.reducePermits(reduction);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/BatchConsumerRateLimiter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/BatchConsumerRateLimiter.java
index c90ac028f6..25c1f0653f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/BatchConsumerRateLimiter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/BatchConsumerRateLimiter.java
@@ -4,35 +4,27 @@
 
 public class BatchConsumerRateLimiter implements ConsumerRateLimiter {
 
-    @Override
-    public void initialize() {
-    }
+  @Override
+  public void initialize() {}
 
-    @Override
-    public void shutdown() {
-    }
+  @Override
+  public void shutdown() {}
 
-    @Override
-    public void acquire() {
-    }
+  @Override
+  public void acquire() {}
 
-    @Override
-    public void acquireFiltered() {
-    }
+  @Override
+  public void acquireFiltered() {}
 
-    @Override
-    public void adjustConsumerRate() {
-    }
+  @Override
+  public void adjustConsumerRate() {}
 
-    @Override
-    public void updateSubscription(Subscription newSubscription) {
-    }
+  @Override
+  public void updateSubscription(Subscription newSubscription) {}
 
-    @Override
-    public void registerSuccessfulSending() {
-    }
+  @Override
+  public void registerSuccessfulSending() {}
 
-    @Override
-    public void registerFailedSending() {
-    }
+  @Override
+  public void registerFailedSending() {}
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/ConsumerRateLimitSupervisor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/ConsumerRateLimitSupervisor.java
index 086107f0a0..9c923c5e05 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/ConsumerRateLimitSupervisor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/ConsumerRateLimitSupervisor.java
@@ -1,9 +1,6 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.time.Duration;
 import java.util.Collections;
 import java.util.Set;
@@ -11,36 +8,43 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ConsumerRateLimitSupervisor implements Runnable {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConsumerRateLimitSupervisor.class);
-
-    private final Set<ConsumerRateLimiter> consumerRateLimiters = Collections.newSetFromMap(new ConcurrentHashMap<>());
-
-    public ConsumerRateLimitSupervisor(Duration rateLimiterSupervisorPeriod) {
-        ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("rate-limit-supervisor-%d").build();
-        Executors.newSingleThreadScheduledExecutor(threadFactory)
-                .scheduleAtFixedRate(this, rateLimiterSupervisorPeriod.toSeconds(), rateLimiterSupervisorPeriod.toSeconds(),
-                        TimeUnit.SECONDS);
+  private static final Logger logger = LoggerFactory.getLogger(ConsumerRateLimitSupervisor.class);
+
+  private final Set<ConsumerRateLimiter> consumerRateLimiters =
+      Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+  public ConsumerRateLimitSupervisor(Duration rateLimiterSupervisorPeriod) {
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat("rate-limit-supervisor-%d").build();
+    Executors.newSingleThreadScheduledExecutor(threadFactory)
+        .scheduleAtFixedRate(
+            this,
+            rateLimiterSupervisorPeriod.toSeconds(),
+            rateLimiterSupervisorPeriod.toSeconds(),
+            TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void run() {
+    for (ConsumerRateLimiter limiter : consumerRateLimiters) {
+      try {
+        limiter.adjustConsumerRate();
+      } catch (Exception e) {
+        logger.warn("Issue adjusting consumer rate", e);
+      }
     }
+  }
 
-    @Override
-    public void run() {
-        for (ConsumerRateLimiter limiter : consumerRateLimiters) {
-            try {
-                limiter.adjustConsumerRate();
-            } catch (Exception e) {
-                logger.warn("Issue adjusting consumer rate", e);
-            }
-        }
-    }
+  public void register(ConsumerRateLimiter consumerRateLimiter) {
+    consumerRateLimiters.add(consumerRateLimiter);
+  }
 
-    public void register(ConsumerRateLimiter consumerRateLimiter) {
-        consumerRateLimiters.add(consumerRateLimiter);
-    }
-
-    public void unregister(ConsumerRateLimiter consumerRateLimiter) {
-        consumerRateLimiters.remove(consumerRateLimiter);
-    }
+  public void unregister(ConsumerRateLimiter consumerRateLimiter) {
+    consumerRateLimiters.remove(consumerRateLimiter);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/ConsumerRateLimiter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/ConsumerRateLimiter.java
index 26cee215f6..ba2951a1ba 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/ConsumerRateLimiter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/ConsumerRateLimiter.java
@@ -4,19 +4,19 @@
 
 public interface ConsumerRateLimiter {
 
-    void initialize();
+  void initialize();
 
-    void shutdown();
+  void shutdown();
 
-    void acquire();
+  void acquire();
 
-    void acquireFiltered();
+  void acquireFiltered();
 
-    void adjustConsumerRate();
+  void adjustConsumerRate();
 
-    void updateSubscription(Subscription newSubscription);
+  void updateSubscription(Subscription newSubscription);
 
-    void registerSuccessfulSending();
+  void registerSuccessfulSending();
 
-    void registerFailedSending();
+  void registerFailedSending();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/InflightsPool.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/InflightsPool.java
index 79d8c8190e..e57965bc96 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/InflightsPool.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/InflightsPool.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate;
 
 public interface InflightsPool {
-    void release();
+  void release();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/SendCounters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/SendCounters.java
index f81f9648c6..28debbf3e1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/SendCounters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/SendCounters.java
@@ -1,85 +1,84 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate;
 
-import com.google.common.util.concurrent.AtomicDouble;
-import org.apache.commons.lang.math.Fraction;
+import static org.apache.commons.lang3.math.Fraction.getFraction;
 
+import com.google.common.util.concurrent.AtomicDouble;
 import java.time.Clock;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.apache.commons.lang.math.Fraction.getFraction;
+import org.apache.commons.lang3.math.Fraction;
 
 public class SendCounters {
 
-    private final AtomicInteger successes = new AtomicInteger(0);
+  private final AtomicInteger successes = new AtomicInteger(0);
 
-    private final AtomicInteger failures = new AtomicInteger(0);
+  private final AtomicInteger failures = new AtomicInteger(0);
 
-    private final AtomicInteger attempted = new AtomicInteger(0);
+  private final AtomicInteger attempted = new AtomicInteger(0);
 
-    private final AtomicDouble rate = new AtomicDouble(0);
+  private final AtomicDouble rate = new AtomicDouble(0);
 
-    private final Clock clock;
+  private final Clock clock;
 
-    private volatile long lastReset;
+  private volatile long lastReset;
 
-    public SendCounters(Clock clock) {
-        this.clock = clock;
-    }
+  public SendCounters(Clock clock) {
+    this.clock = clock;
+  }
 
-    public SendCounters incrementFailures() {
-        failures.incrementAndGet();
-        return this;
-    }
-
-    public SendCounters incrementSuccesses() {
-        successes.incrementAndGet();
-        return this;
-    }
+  public SendCounters incrementFailures() {
+    failures.incrementAndGet();
+    return this;
+  }
 
-    public SendCounters incrementAttempted() {
-        attempted.incrementAndGet();
-        return this;
-    }
+  public SendCounters incrementSuccesses() {
+    successes.incrementAndGet();
+    return this;
+  }
 
-    public void reset() {
-        failures.set(0);
-        successes.set(0);
+  public SendCounters incrementAttempted() {
+    attempted.incrementAndGet();
+    return this;
+  }
 
-        long now = clock.millis();
-        long elapsedSeconds = TimeUnit.MILLISECONDS.toSeconds(now - lastReset);
-        rate.set(attempted.doubleValue() / Math.max(elapsedSeconds, 1));
+  public void reset() {
+    failures.set(0);
+    successes.set(0);
 
-        attempted.set(0);
-        lastReset = now;
-    }
+    long now = clock.millis();
+    long elapsedSeconds = TimeUnit.MILLISECONDS.toSeconds(now - lastReset);
+    rate.set(attempted.doubleValue() / Math.max(elapsedSeconds, 1));
 
-    public boolean noFailures() {
-        return failures.intValue() == 0;
-    }
+    attempted.set(0);
+    lastReset = now;
+  }
 
-    public boolean hasFailures() {
-        return failures.intValue() > 0;
-    }
+  public boolean noFailures() {
+    return failures.intValue() == 0;
+  }
 
-    public boolean majorityOfFailures() {
-        return failures.intValue() > successes.intValue();
-    }
+  public boolean hasFailures() {
+    return failures.intValue() > 0;
+  }
 
-    public boolean onlySuccessess() {
-        return successes.intValue() > 0 && failures.intValue() == 0;
-    }
+  public boolean majorityOfFailures() {
+    return failures.intValue() > successes.intValue();
+  }
 
-    public boolean failuresRatioExceeds(double threshold) {
-        if (hasFailures()) {
-            Fraction failuresRatio = getFraction(failures.intValue(), failures.intValue() + successes.intValue());
-            return failuresRatio.compareTo(getFraction(threshold)) > 0;
-        }
-        return false;
-    }
+  public boolean onlySuccessess() {
+    return successes.intValue() > 0 && failures.intValue() == 0;
+  }
 
-    public double getRate() {
-        return rate.get();
+  public boolean failuresRatioExceeds(double threshold) {
+    if (hasFailures()) {
+      Fraction failuresRatio =
+          getFraction(failures.intValue(), failures.intValue() + successes.intValue());
+      return failuresRatio.compareTo(getFraction(threshold)) > 0;
     }
+    return false;
+  }
 
+  public double getRate() {
+    return rate.get();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/SerialConsumerRateLimiter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/SerialConsumerRateLimiter.java
index c2bf40d93f..5e9bf40aa0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/SerialConsumerRateLimiter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/SerialConsumerRateLimiter.java
@@ -1,123 +1,128 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate;
 
 import com.google.common.util.concurrent.RateLimiter;
+import java.time.Clock;
+import java.util.Objects;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.consumer.rate.calculator.OutputRateCalculationResult;
 import pl.allegro.tech.hermes.consumers.consumer.rate.calculator.OutputRateCalculator;
 import pl.allegro.tech.hermes.consumers.consumer.rate.calculator.OutputRateCalculatorFactory;
 
-import java.time.Clock;
-import java.util.Objects;
-
 public class SerialConsumerRateLimiter implements ConsumerRateLimiter {
 
-    private Subscription subscription;
-
-    private final MetricsFacade metrics;
-
-    private final ConsumerRateLimitSupervisor rateLimitSupervisor;
-
-    private final RateLimiter rateLimiter;
-
-    private final RateLimiter filterRateLimiter;
-
-    private final OutputRateCalculator outputRateCalculator;
-
-    private final SendCounters sendCounters;
-
-    private OutputRateCalculator.Mode currentMode;
-
-    public SerialConsumerRateLimiter(Subscription subscription,
-                                     OutputRateCalculatorFactory outputRateCalculatorFactory,
-                                     MetricsFacade metrics,
-                                     ConsumerRateLimitSupervisor rateLimitSupervisor,
-                                     Clock clock) {
-        this.subscription = subscription;
-        this.metrics = metrics;
-        this.rateLimitSupervisor = rateLimitSupervisor;
-        this.sendCounters = new SendCounters(clock);
-        this.outputRateCalculator = outputRateCalculatorFactory.createCalculator(subscription, sendCounters, metrics);
-        this.currentMode = OutputRateCalculator.Mode.NORMAL;
-        this.rateLimiter = RateLimiter.create(calculateInitialRate().rate());
-        this.filterRateLimiter = RateLimiter.create(subscription.getSerialSubscriptionPolicy().getRate());
+  private Subscription subscription;
+
+  private final MetricsFacade metrics;
+
+  private final ConsumerRateLimitSupervisor rateLimitSupervisor;
+
+  private final RateLimiter rateLimiter;
+
+  private final RateLimiter filterRateLimiter;
+
+  private final OutputRateCalculator outputRateCalculator;
+
+  private final SendCounters sendCounters;
+
+  private OutputRateCalculator.Mode currentMode;
+
+  public SerialConsumerRateLimiter(
+      Subscription subscription,
+      OutputRateCalculatorFactory outputRateCalculatorFactory,
+      MetricsFacade metrics,
+      ConsumerRateLimitSupervisor rateLimitSupervisor,
+      Clock clock) {
+    this.subscription = subscription;
+    this.metrics = metrics;
+    this.rateLimitSupervisor = rateLimitSupervisor;
+    this.sendCounters = new SendCounters(clock);
+    this.outputRateCalculator =
+        outputRateCalculatorFactory.createCalculator(subscription, sendCounters, metrics);
+    this.currentMode = OutputRateCalculator.Mode.NORMAL;
+    this.rateLimiter = RateLimiter.create(calculateInitialRate().rate());
+    this.filterRateLimiter =
+        RateLimiter.create(subscription.getSerialSubscriptionPolicy().getRate());
+  }
+
+  @Override
+  public void initialize() {
+    outputRateCalculator.start();
+    adjustConsumerRate();
+    metrics
+        .maxRate()
+        .registerOutputRateGauge(
+            subscription.getQualifiedName(), rateLimiter, RateLimiter::getRate);
+    rateLimitSupervisor.register(this);
+  }
+
+  @Override
+  public void shutdown() {
+    rateLimitSupervisor.unregister(this);
+    outputRateCalculator.shutdown();
+  }
+
+  @Override
+  public void acquire() {
+    rateLimiter.acquire();
+    sendCounters.incrementAttempted();
+  }
+
+  @Override
+  public void acquireFiltered() {
+    filterRateLimiter.acquire();
+  }
+
+  @Override
+  public void adjustConsumerRate() {
+    OutputRateCalculationResult result = recalculate();
+    rateLimiter.setRate(result.rate());
+    currentMode = result.mode();
+    sendCounters.reset();
+  }
+
+  private OutputRateCalculationResult calculateInitialRate() {
+    return outputRateCalculator.recalculateRate(sendCounters, currentMode, 0.0);
+  }
+
+  private OutputRateCalculationResult recalculate() {
+    return outputRateCalculator.recalculateRate(sendCounters, currentMode, rateLimiter.getRate());
+  }
+
+  @Override
+  public void updateSubscription(Subscription newSubscription) {
+    this.subscription = newSubscription;
+    this.filterRateLimiter.setRate(newSubscription.getSerialSubscriptionPolicy().getRate());
+    this.outputRateCalculator.updateSubscription(newSubscription);
+  }
+
+  @Override
+  public void registerSuccessfulSending() {
+    sendCounters.incrementSuccesses();
+  }
+
+  @Override
+  public void registerFailedSending() {
+    sendCounters.incrementFailures();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
 
-    @Override
-    public void initialize() {
-        outputRateCalculator.start();
-        adjustConsumerRate();
-        metrics.maxRate().registerOutputRateGauge(subscription.getQualifiedName(), rateLimiter, RateLimiter::getRate);
-        rateLimitSupervisor.register(this);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
 
-    @Override
-    public void shutdown() {
-        rateLimitSupervisor.unregister(this);
-        outputRateCalculator.shutdown();
-    }
+    SerialConsumerRateLimiter that = (SerialConsumerRateLimiter) o;
 
-    @Override
-    public void acquire() {
-        rateLimiter.acquire();
-        sendCounters.incrementAttempted();
-    }
-
-    @Override
-    public void acquireFiltered() {
-        filterRateLimiter.acquire();
-    }
+    return Objects.equals(subscription.getQualifiedName(), that.subscription.getQualifiedName());
+  }
 
-    @Override
-    public void adjustConsumerRate() {
-        OutputRateCalculationResult result = recalculate();
-        rateLimiter.setRate(result.rate());
-        currentMode = result.mode();
-        sendCounters.reset();
-    }
-
-    private OutputRateCalculationResult calculateInitialRate() {
-        return outputRateCalculator.recalculateRate(sendCounters, currentMode, 0.0);
-    }
-
-    private OutputRateCalculationResult recalculate() {
-        return outputRateCalculator.recalculateRate(sendCounters, currentMode, rateLimiter.getRate());
-    }
-
-    @Override
-    public void updateSubscription(Subscription newSubscription) {
-        this.subscription = newSubscription;
-        this.filterRateLimiter.setRate(newSubscription.getSerialSubscriptionPolicy().getRate());
-        this.outputRateCalculator.updateSubscription(newSubscription);
-    }
-
-    @Override
-    public void registerSuccessfulSending() {
-        sendCounters.incrementSuccesses();
-    }
-
-    @Override
-    public void registerFailedSending() {
-        sendCounters.incrementFailures();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        SerialConsumerRateLimiter that = (SerialConsumerRateLimiter) o;
-
-        return Objects.equals(subscription.getQualifiedName(), that.subscription.getQualifiedName());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(subscription.getQualifiedName());
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(subscription.getQualifiedName());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/HeartbeatModeOutputRateCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/HeartbeatModeOutputRateCalculator.java
index b6d4ee467e..e8254b8601 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/HeartbeatModeOutputRateCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/HeartbeatModeOutputRateCalculator.java
@@ -4,19 +4,18 @@
 
 class HeartbeatModeOutputRateCalculator implements ModeOutputRateCalculator {
 
-    private final double slowModeRate;
+  private final double slowModeRate;
 
-    HeartbeatModeOutputRateCalculator(double slowModeRate) {
-        this.slowModeRate = slowModeRate;
-    }
+  HeartbeatModeOutputRateCalculator(double slowModeRate) {
+    this.slowModeRate = slowModeRate;
+  }
 
-    @Override
-    public OutputRateCalculationResult calculateOutputRate(double currentRate,
-                                                           double maximumOutputRate,
-                                                           SendCounters counters) {
-        if (counters.onlySuccessess()) {
-            return new OutputRateCalculationResult(slowModeRate, OutputRateCalculator.Mode.SLOW);
-        }
-        return new OutputRateCalculationResult(currentRate, OutputRateCalculator.Mode.HEARTBEAT);
+  @Override
+  public OutputRateCalculationResult calculateOutputRate(
+      double currentRate, double maximumOutputRate, SendCounters counters) {
+    if (counters.onlySuccessess()) {
+      return new OutputRateCalculationResult(slowModeRate, OutputRateCalculator.Mode.SLOW);
     }
+    return new OutputRateCalculationResult(currentRate, OutputRateCalculator.Mode.HEARTBEAT);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/ModeOutputRateCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/ModeOutputRateCalculator.java
index 9a865f7514..cf0c748634 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/ModeOutputRateCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/ModeOutputRateCalculator.java
@@ -4,8 +4,6 @@
 
 interface ModeOutputRateCalculator {
 
-    OutputRateCalculationResult calculateOutputRate(double currentRate,
-                                                    double maximumOutputRate,
-                                                    SendCounters counters);
-
+  OutputRateCalculationResult calculateOutputRate(
+      double currentRate, double maximumOutputRate, SendCounters counters);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/NormalModeOutputRateCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/NormalModeOutputRateCalculator.java
index a0a9449d62..9b695949f7 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/NormalModeOutputRateCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/NormalModeOutputRateCalculator.java
@@ -4,39 +4,39 @@
 
 class NormalModeOutputRateCalculator implements ModeOutputRateCalculator {
 
-    private final double rateConvergenceFactor;
-    private final double slowModeRate;
-    private final double failuresSpeedupToleranceRatio;
-    private final double failuresNochangeToleranceRatio;
-
-    NormalModeOutputRateCalculator(double rateConvergenceFactor, 
-                                   double slowModeRate,
-                                   double failuresSpeedupToleranceRatio,
-                                   double failuresNochangeToleranceRatio) {
-        this.rateConvergenceFactor = rateConvergenceFactor;
-        this.slowModeRate = slowModeRate;
-        this.failuresSpeedupToleranceRatio = failuresSpeedupToleranceRatio;
-        this.failuresNochangeToleranceRatio = failuresNochangeToleranceRatio;
-    }
-
-    @Override
-    public OutputRateCalculationResult calculateOutputRate(double currentRate,
-                                                           double maximumOutputRate,
-                                                           SendCounters counters) {
-        double calculatedRate = currentRate;
-        OutputRateCalculator.Mode calculatedMode = OutputRateCalculator.Mode.NORMAL;
-
-        if (!counters.failuresRatioExceeds(failuresSpeedupToleranceRatio) && currentRate < maximumOutputRate) {
-            double rateAddOn = (maximumOutputRate - currentRate) * rateConvergenceFactor;
-            calculatedRate = Math.min(maximumOutputRate, currentRate + rateAddOn);
-        } else if (counters.majorityOfFailures()) {
-            calculatedRate = slowModeRate;
-            calculatedMode = OutputRateCalculator.Mode.SLOW;
-        } else if (counters.failuresRatioExceeds(failuresNochangeToleranceRatio)) {
-            calculatedRate = Math.max(slowModeRate, currentRate * (1 - rateConvergenceFactor));
-        }
-
-        return new OutputRateCalculationResult(calculatedRate, calculatedMode);
+  private final double rateConvergenceFactor;
+  private final double slowModeRate;
+  private final double failuresSpeedupToleranceRatio;
+  private final double failuresNochangeToleranceRatio;
+
+  NormalModeOutputRateCalculator(
+      double rateConvergenceFactor,
+      double slowModeRate,
+      double failuresSpeedupToleranceRatio,
+      double failuresNochangeToleranceRatio) {
+    this.rateConvergenceFactor = rateConvergenceFactor;
+    this.slowModeRate = slowModeRate;
+    this.failuresSpeedupToleranceRatio = failuresSpeedupToleranceRatio;
+    this.failuresNochangeToleranceRatio = failuresNochangeToleranceRatio;
+  }
+
+  @Override
+  public OutputRateCalculationResult calculateOutputRate(
+      double currentRate, double maximumOutputRate, SendCounters counters) {
+    double calculatedRate = currentRate;
+    OutputRateCalculator.Mode calculatedMode = OutputRateCalculator.Mode.NORMAL;
+
+    if (!counters.failuresRatioExceeds(failuresSpeedupToleranceRatio)
+        && currentRate < maximumOutputRate) {
+      double rateAddOn = (maximumOutputRate - currentRate) * rateConvergenceFactor;
+      calculatedRate = Math.min(maximumOutputRate, currentRate + rateAddOn);
+    } else if (counters.majorityOfFailures()) {
+      calculatedRate = slowModeRate;
+      calculatedMode = OutputRateCalculator.Mode.SLOW;
+    } else if (counters.failuresRatioExceeds(failuresNochangeToleranceRatio)) {
+      calculatedRate = Math.max(slowModeRate, currentRate * (1 - rateConvergenceFactor));
     }
 
+    return new OutputRateCalculationResult(calculatedRate, calculatedMode);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationResult.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationResult.java
index 5e0325c4b8..e834a370e3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationResult.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationResult.java
@@ -2,25 +2,25 @@
 
 public class OutputRateCalculationResult {
 
-    private final double rate;
+  private final double rate;
 
-    private final OutputRateCalculator.Mode mode;
+  private final OutputRateCalculator.Mode mode;
 
-    public OutputRateCalculationResult(double rate, OutputRateCalculator.Mode mode) {
-        this.rate = rate;
-        this.mode = mode;
-    }
+  public OutputRateCalculationResult(double rate, OutputRateCalculator.Mode mode) {
+    this.rate = rate;
+    this.mode = mode;
+  }
 
-    public static OutputRateCalculationResult adjustRate(OutputRateCalculationResult result, double adjustedRate) {
-        return new OutputRateCalculationResult(adjustedRate, result.mode());
-    }
+  public static OutputRateCalculationResult adjustRate(
+      OutputRateCalculationResult result, double adjustedRate) {
+    return new OutputRateCalculationResult(adjustedRate, result.mode());
+  }
 
-    public OutputRateCalculator.Mode mode() {
-        return mode;
-    }
-
-    public double rate() {
-        return rate;
-    }
+  public OutputRateCalculator.Mode mode() {
+    return mode;
+  }
 
+  public double rate() {
+    return rate;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculator.java
index 3e8f3ac77c..cb633a9624 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculator.java
@@ -1,66 +1,69 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.calculator;
 
+import java.util.EnumMap;
+import java.util.Map;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
 import pl.allegro.tech.hermes.consumers.consumer.rate.maxrate.MaxRateProvider;
 
-import java.util.EnumMap;
-import java.util.Map;
-
 public class OutputRateCalculator {
 
-    public enum Mode {
-        NORMAL,
-        SLOW,
-        HEARTBEAT
-    }
-
-    private final Map<Mode, ModeOutputRateCalculator> modeCalculators = new EnumMap<>(Mode.class);
+  public enum Mode {
+    NORMAL,
+    SLOW,
+    HEARTBEAT
+  }
 
-    private final MaxRateProvider maxRateProvider;
+  private final Map<Mode, ModeOutputRateCalculator> modeCalculators = new EnumMap<>(Mode.class);
 
-    public OutputRateCalculator(RateCalculatorParameters rateCalculatorParameters, MaxRateProvider maxRateProvider) {
-        this.maxRateProvider = maxRateProvider;
+  private final MaxRateProvider maxRateProvider;
 
-        modeCalculators.put(Mode.NORMAL,
-                new NormalModeOutputRateCalculator(
-                        rateCalculatorParameters.getConvergenceFactor(),
-                        1.0 / rateCalculatorParameters.getLimiterSlowModeDelay().toSeconds(),
-                        rateCalculatorParameters.getFailuresSpeedUpToleranceRatio(),
-                        rateCalculatorParameters.getFailuresNoChangeToleranceRatio())
-        );
-        modeCalculators.put(Mode.SLOW,
-                new SlowModeOutputRateCalculator(
-                        1.0 / rateCalculatorParameters.getLimiterHeartbeatModeDelay().toSeconds())
-        );
-        modeCalculators.put(Mode.HEARTBEAT, new HeartbeatModeOutputRateCalculator(
-                1.0 / rateCalculatorParameters.getLimiterSlowModeDelay().toSeconds())
-        );
-    }
+  public OutputRateCalculator(
+      RateCalculatorParameters rateCalculatorParameters, MaxRateProvider maxRateProvider) {
+    this.maxRateProvider = maxRateProvider;
 
-    public OutputRateCalculationResult recalculateRate(SendCounters counters,
-                                                       Mode currentMode, double currentRateLimit) {
+    modeCalculators.put(
+        Mode.NORMAL,
+        new NormalModeOutputRateCalculator(
+            rateCalculatorParameters.getConvergenceFactor(),
+            1.0 / rateCalculatorParameters.getLimiterSlowModeDelay().toSeconds(),
+            rateCalculatorParameters.getFailuresSpeedUpToleranceRatio(),
+            rateCalculatorParameters.getFailuresNoChangeToleranceRatio()));
+    modeCalculators.put(
+        Mode.SLOW,
+        new SlowModeOutputRateCalculator(
+            1.0 / rateCalculatorParameters.getLimiterHeartbeatModeDelay().toSeconds()));
+    modeCalculators.put(
+        Mode.HEARTBEAT,
+        new HeartbeatModeOutputRateCalculator(
+            1.0 / rateCalculatorParameters.getLimiterSlowModeDelay().toSeconds()));
+  }
 
-        double maximumRate = maxRateProvider.get();
-        OutputRateCalculationResult recalculatedResult
-                = modeCalculators.get(currentMode).calculateOutputRate(currentRateLimit, maximumRate, counters);
+  public OutputRateCalculationResult recalculateRate(
+      SendCounters counters, Mode currentMode, double currentRateLimit) {
 
-        if (recalculatedResult.rate() > maximumRate) {
-            recalculatedResult = OutputRateCalculationResult.adjustRate(recalculatedResult, maximumRate);
-        }
+    double maximumRate = maxRateProvider.get();
+    OutputRateCalculationResult recalculatedResult =
+        modeCalculators
+            .get(currentMode)
+            .calculateOutputRate(currentRateLimit, maximumRate, counters);
 
-        return recalculatedResult;
+    if (recalculatedResult.rate() > maximumRate) {
+      recalculatedResult = OutputRateCalculationResult.adjustRate(recalculatedResult, maximumRate);
     }
 
-    public void updateSubscription(Subscription newSubscription) {
-        maxRateProvider.updateSubscription(newSubscription);
-    }
+    return recalculatedResult;
+  }
 
-    public void start() {
-        maxRateProvider.start();
-    }
+  public void updateSubscription(Subscription newSubscription) {
+    maxRateProvider.updateSubscription(newSubscription);
+  }
 
-    public void shutdown() {
-        maxRateProvider.shutdown();
-    }
+  public void start() {
+    maxRateProvider.start();
+  }
+
+  public void shutdown() {
+    maxRateProvider.shutdown();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculatorFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculatorFactory.java
index 52d4892b08..6cbb578de2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculatorFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculatorFactory.java
@@ -8,19 +8,20 @@
 
 public class OutputRateCalculatorFactory {
 
-    private final RateCalculatorParameters rateCalculatorParameters;
-    private final MaxRateProviderFactory maxRateProviderFactory;
+  private final RateCalculatorParameters rateCalculatorParameters;
+  private final MaxRateProviderFactory maxRateProviderFactory;
 
-    public OutputRateCalculatorFactory(RateCalculatorParameters rateCalculatorParameters,
-                                       MaxRateProviderFactory maxRateProviderFactory) {
-        this.rateCalculatorParameters = rateCalculatorParameters;
-        this.maxRateProviderFactory = maxRateProviderFactory;
-    }
+  public OutputRateCalculatorFactory(
+      RateCalculatorParameters rateCalculatorParameters,
+      MaxRateProviderFactory maxRateProviderFactory) {
+    this.rateCalculatorParameters = rateCalculatorParameters;
+    this.maxRateProviderFactory = maxRateProviderFactory;
+  }
 
-    public OutputRateCalculator createCalculator(Subscription subscription,
-                                                 SendCounters sendCounters,
-                                                 MetricsFacade metrics) {
-        MaxRateProvider maxRateProvider = maxRateProviderFactory.create(subscription, sendCounters, metrics);
-        return new OutputRateCalculator(rateCalculatorParameters, maxRateProvider);
-    }
+  public OutputRateCalculator createCalculator(
+      Subscription subscription, SendCounters sendCounters, MetricsFacade metrics) {
+    MaxRateProvider maxRateProvider =
+        maxRateProviderFactory.create(subscription, sendCounters, metrics);
+    return new OutputRateCalculator(rateCalculatorParameters, maxRateProvider);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/RateCalculatorParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/RateCalculatorParameters.java
index 7249c6577c..453b43aefc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/RateCalculatorParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/RateCalculatorParameters.java
@@ -4,13 +4,13 @@
 
 public interface RateCalculatorParameters {
 
-    Duration getLimiterHeartbeatModeDelay();
+  Duration getLimiterHeartbeatModeDelay();
 
-    Duration getLimiterSlowModeDelay();
+  Duration getLimiterSlowModeDelay();
 
-    double getConvergenceFactor();
+  double getConvergenceFactor();
 
-    double getFailuresNoChangeToleranceRatio();
+  double getFailuresNoChangeToleranceRatio();
 
-    double getFailuresSpeedUpToleranceRatio();
+  double getFailuresSpeedUpToleranceRatio();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/SlowModeOutputRateCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/SlowModeOutputRateCalculator.java
index 54d8eac575..ee0533171e 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/SlowModeOutputRateCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/SlowModeOutputRateCalculator.java
@@ -4,22 +4,21 @@
 
 class SlowModeOutputRateCalculator implements ModeOutputRateCalculator {
 
-    private final double heartbeatModeRate;
+  private final double heartbeatModeRate;
 
-    SlowModeOutputRateCalculator(double heartbeatModeRate) {
-        this.heartbeatModeRate = heartbeatModeRate;
-    }
+  SlowModeOutputRateCalculator(double heartbeatModeRate) {
+    this.heartbeatModeRate = heartbeatModeRate;
+  }
 
-    @Override
-    public OutputRateCalculationResult calculateOutputRate(double currentRate,
-                                                           double maximumOutputRate,
-                                                           SendCounters counters) {
-        if (counters.majorityOfFailures()) {
-            return new OutputRateCalculationResult(heartbeatModeRate, OutputRateCalculator.Mode.HEARTBEAT);
-        } else if (counters.onlySuccessess()) {
-            return new OutputRateCalculationResult(currentRate, OutputRateCalculator.Mode.NORMAL);
-        }
-        return new OutputRateCalculationResult(currentRate, OutputRateCalculator.Mode.SLOW);
+  @Override
+  public OutputRateCalculationResult calculateOutputRate(
+      double currentRate, double maximumOutputRate, SendCounters counters) {
+    if (counters.majorityOfFailures()) {
+      return new OutputRateCalculationResult(
+          heartbeatModeRate, OutputRateCalculator.Mode.HEARTBEAT);
+    } else if (counters.onlySuccessess()) {
+      return new OutputRateCalculationResult(currentRate, OutputRateCalculator.Mode.NORMAL);
     }
-
+    return new OutputRateCalculationResult(currentRate, OutputRateCalculator.Mode.SLOW);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerInstance.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerInstance.java
index 07adf0684d..3bec1cd15d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerInstance.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerInstance.java
@@ -1,50 +1,52 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Objects;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 final class ConsumerInstance {
 
-    private final String consumerId;
-    private final SubscriptionName subscription;
+  private final String consumerId;
+  private final SubscriptionName subscription;
 
-    ConsumerInstance(String consumerId, SubscriptionName subscription) {
-        this.consumerId = consumerId;
-        this.subscription = subscription;
-    }
+  ConsumerInstance(String consumerId, SubscriptionName subscription) {
+    this.consumerId = consumerId;
+    this.subscription = subscription;
+  }
 
-    public String getConsumerId() {
-        return consumerId;
-    }
+  public String getConsumerId() {
+    return consumerId;
+  }
 
-    public SubscriptionName getSubscription() {
-        return subscription;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerInstance that = (ConsumerInstance) o;
-        return Objects.equals(consumerId, that.consumerId)
-                && Objects.equals(subscription, that.subscription);
-    }
+  public SubscriptionName getSubscription() {
+    return subscription;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(consumerId, subscription);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return "ConsumerInstance{"
-                + "consumerId='" + consumerId + '\''
-                + ", subscription=" + subscription
-                + '}';
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumerInstance that = (ConsumerInstance) o;
+    return Objects.equals(consumerId, that.consumerId)
+        && Objects.equals(subscription, that.subscription);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(consumerId, subscription);
+  }
+
+  @Override
+  public String toString() {
+    return "ConsumerInstance{"
+        + "consumerId='"
+        + consumerId
+        + '\''
+        + ", subscription="
+        + subscription
+        + '}';
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRates.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRates.java
index 1cd556dc52..f59b465c8a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRates.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRates.java
@@ -1,66 +1,67 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
-
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
 
 class ConsumerMaxRates {
 
-    private final Map<SubscriptionName, MaxRate> maxRates;
+  private final Map<SubscriptionName, MaxRate> maxRates;
 
-    ConsumerMaxRates() {
-        this.maxRates = new ConcurrentHashMap<>();
-    }
+  ConsumerMaxRates() {
+    this.maxRates = new ConcurrentHashMap<>();
+  }
 
-    void setAllMaxRates(ConsumerMaxRates newMaxRates) {
-        maxRates.clear();
-        maxRates.putAll(newMaxRates.maxRates);
-    }
+  void setAllMaxRates(ConsumerMaxRates newMaxRates) {
+    maxRates.clear();
+    maxRates.putAll(newMaxRates.maxRates);
+  }
 
-    Optional<MaxRate> getMaxRate(SubscriptionName subscription) {
-        return Optional.ofNullable(maxRates.get(subscription));
-    }
+  Optional<MaxRate> getMaxRate(SubscriptionName subscription) {
+    return Optional.ofNullable(maxRates.get(subscription));
+  }
 
-    void setMaxRate(SubscriptionName subscription, MaxRate maxRate) {
-        maxRates.put(subscription, maxRate);
-    }
+  void setMaxRate(SubscriptionName subscription, MaxRate maxRate) {
+    maxRates.put(subscription, maxRate);
+  }
 
-    public void cleanup(Set<SubscriptionName> subscriptions) {
-        this.maxRates.entrySet()
-                .removeIf(entry -> !subscriptions.contains(entry.getKey()));
-    }
+  public void cleanup(Set<SubscriptionName> subscriptions) {
+    this.maxRates.entrySet().removeIf(entry -> !subscriptions.contains(entry.getKey()));
+  }
 
-    int size() {
-        return maxRates.size();
-    }
+  int size() {
+    return maxRates.size();
+  }
 
-    Map<SubscriptionId, MaxRate> toSubscriptionsIdsMap(SubscriptionIdMapper subscriptionIdMapping) {
-        return maxRates.keySet().stream()
-                .map(subscriptionIdMapping::mapToSubscriptionId)
-                .filter(Optional::isPresent)
-                .collect(Collectors.toMap(Optional::get, subscriptionId -> maxRates.get(subscriptionId.get().getSubscriptionName())));
-    }
+  Map<SubscriptionId, MaxRate> toSubscriptionsIdsMap(SubscriptionIdMapper subscriptionIdMapping) {
+    return maxRates.keySet().stream()
+        .map(subscriptionIdMapping::mapToSubscriptionId)
+        .filter(Optional::isPresent)
+        .collect(
+            Collectors.toMap(
+                Optional::get,
+                subscriptionId -> maxRates.get(subscriptionId.get().getSubscriptionName())));
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerMaxRates that = (ConsumerMaxRates) o;
-        return Objects.equals(maxRates, that.maxRates);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(maxRates);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumerMaxRates that = (ConsumerMaxRates) o;
+    return Objects.equals(maxRates, that.maxRates);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(maxRates);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRatesDecoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRatesDecoder.java
index ee5d3beebf..2af80e2c52 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRatesDecoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRatesDecoder.java
@@ -7,32 +7,37 @@
 
 class ConsumerMaxRatesDecoder {
 
-    private final SubscriptionIds subscriptionIds;
+  private final SubscriptionIds subscriptionIds;
 
-    ConsumerMaxRatesDecoder(SubscriptionIds subscriptionIds) {
-        this.subscriptionIds = subscriptionIds;
-    }
+  ConsumerMaxRatesDecoder(SubscriptionIds subscriptionIds) {
+    this.subscriptionIds = subscriptionIds;
+  }
+
+  ConsumerMaxRates decode(byte[] data) {
+    MessageHeaderDecoder header = new MessageHeaderDecoder();
+    MaxRateDecoder body = new MaxRateDecoder();
 
-    ConsumerMaxRates decode(byte[] data) {
-        MessageHeaderDecoder header = new MessageHeaderDecoder();
-        MaxRateDecoder body = new MaxRateDecoder();
-
-        UnsafeBuffer buffer = new UnsafeBuffer(data);
-        header.wrap(buffer, 0);
-
-        if (header.templateId() != MaxRateDecoder.TEMPLATE_ID) {
-            throw new IllegalStateException(String.format("MaxRatesDecoder TEMPLATE_ID=%d does not match encoded TEMPLATE_ID=%d",
-                    MaxRateDecoder.TEMPLATE_ID, header.templateId()));
-        }
-        body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
-
-        ConsumerMaxRates result = new ConsumerMaxRates();
-        for (MaxRateDecoder.SubscriptionsDecoder subscriptionDecoder : body.subscriptions()) {
-            long id = subscriptionDecoder.id();
-            double maxRate = subscriptionDecoder.maxRate();
-            subscriptionIds.getSubscriptionId(id)
-                    .ifPresent(subscriptionId -> result.setMaxRate(subscriptionId.getSubscriptionName(), new MaxRate(maxRate)));
-        }
-        return result;
+    UnsafeBuffer buffer = new UnsafeBuffer(data);
+    header.wrap(buffer, 0);
+
+    if (header.templateId() != MaxRateDecoder.TEMPLATE_ID) {
+      throw new IllegalStateException(
+          String.format(
+              "MaxRatesDecoder TEMPLATE_ID=%d does not match encoded TEMPLATE_ID=%d",
+              MaxRateDecoder.TEMPLATE_ID, header.templateId()));
+    }
+    body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
+
+    ConsumerMaxRates result = new ConsumerMaxRates();
+    for (MaxRateDecoder.SubscriptionsDecoder subscriptionDecoder : body.subscriptions()) {
+      long id = subscriptionDecoder.id();
+      double maxRate = subscriptionDecoder.maxRate();
+      subscriptionIds
+          .getSubscriptionId(id)
+          .ifPresent(
+              subscriptionId ->
+                  result.setMaxRate(subscriptionId.getSubscriptionName(), new MaxRate(maxRate)));
     }
+    return result;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRatesEncoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRatesEncoder.java
index 6683d5ab91..326ed52ca6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRatesEncoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerMaxRatesEncoder.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import java.util.Map;
 import org.agrona.ExpandableDirectByteBuffer;
 import org.agrona.MutableDirectBuffer;
 import pl.allegro.tech.hermes.consumers.consumer.rate.sbe.stubs.MaxRateEncoder;
@@ -7,37 +8,35 @@
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
 
-import java.util.Map;
-
 class ConsumerMaxRatesEncoder {
 
-    private final SubscriptionIds subscriptionIds;
-    private final MutableDirectBuffer buffer;
+  private final SubscriptionIds subscriptionIds;
+  private final MutableDirectBuffer buffer;
 
-    ConsumerMaxRatesEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
-        this.subscriptionIds = subscriptionIds;
-        this.buffer = new ExpandableDirectByteBuffer(bufferSize);
-    }
+  ConsumerMaxRatesEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
+    this.subscriptionIds = subscriptionIds;
+    this.buffer = new ExpandableDirectByteBuffer(bufferSize);
+  }
 
-    byte[] encode(ConsumerMaxRates consumerMaxRates) {
-        MessageHeaderEncoder headerEncoder = new MessageHeaderEncoder();
-        MaxRateEncoder body = new MaxRateEncoder();
+  byte[] encode(ConsumerMaxRates consumerMaxRates) {
+    MessageHeaderEncoder headerEncoder = new MessageHeaderEncoder();
+    MaxRateEncoder body = new MaxRateEncoder();
 
-        Map<SubscriptionId, MaxRate> filteredRates = consumerMaxRates.toSubscriptionsIdsMap(subscriptionIds::getSubscriptionId);
+    Map<SubscriptionId, MaxRate> filteredRates =
+        consumerMaxRates.toSubscriptionsIdsMap(subscriptionIds::getSubscriptionId);
 
-        MaxRateEncoder.SubscriptionsEncoder subscriptionsEncoder = body.wrapAndApplyHeader(buffer, 0, headerEncoder)
-                .subscriptionsCount(filteredRates.size());
+    MaxRateEncoder.SubscriptionsEncoder subscriptionsEncoder =
+        body.wrapAndApplyHeader(buffer, 0, headerEncoder).subscriptionsCount(filteredRates.size());
 
-        filteredRates.forEach((id, maxRate) -> {
-            subscriptionsEncoder.next()
-                    .id(id.getValue())
-                    .maxRate(maxRate.getMaxRate());
+    filteredRates.forEach(
+        (id, maxRate) -> {
+          subscriptionsEncoder.next().id(id.getValue()).maxRate(maxRate.getMaxRate());
         });
 
-        int len = headerEncoder.encodedLength() + body.encodedLength();
+    int len = headerEncoder.encodedLength() + body.encodedLength();
 
-        byte[] dst = new byte[len];
-        buffer.getBytes(0, dst);
-        return dst;
-    }
+    byte[] dst = new byte[len];
+    buffer.getBytes(0, dst);
+    return dst;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistoriesDecoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistoriesDecoder.java
index b79e13c6a7..0991fa6a8d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistoriesDecoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistoriesDecoder.java
@@ -1,49 +1,53 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import org.agrona.concurrent.UnsafeBuffer;
 import pl.allegro.tech.hermes.consumers.consumer.rate.sbe.stubs.MessageHeaderDecoder;
 import pl.allegro.tech.hermes.consumers.consumer.rate.sbe.stubs.RateHistoryDecoder;
 import pl.allegro.tech.hermes.consumers.consumer.rate.sbe.stubs.RateHistoryDecoder.SubscriptionsDecoder.RatesDecoder;
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
 class ConsumerRateHistoriesDecoder {
 
-    private final SubscriptionIds subscriptionIds;
+  private final SubscriptionIds subscriptionIds;
+
+  ConsumerRateHistoriesDecoder(SubscriptionIds subscriptionIds) {
+    this.subscriptionIds = subscriptionIds;
+  }
+
+  ConsumerRateHistory decode(byte[] data) {
+    MessageHeaderDecoder header = new MessageHeaderDecoder();
+    RateHistoryDecoder body = new RateHistoryDecoder();
+
+    UnsafeBuffer buffer = new UnsafeBuffer(data);
+    header.wrap(buffer, 0);
 
-    ConsumerRateHistoriesDecoder(SubscriptionIds subscriptionIds) {
-        this.subscriptionIds = subscriptionIds;
+    if (header.templateId() != RateHistoryDecoder.TEMPLATE_ID) {
+      throw new IllegalStateException(
+          String.format(
+              "RateHistoryDecoder TEMPLATE_ID=%d does not match encoded TEMPLATE_ID=%d",
+              RateHistoryDecoder.TEMPLATE_ID, header.templateId()));
     }
 
-    ConsumerRateHistory decode(byte[] data) {
-        MessageHeaderDecoder header = new MessageHeaderDecoder();
-        RateHistoryDecoder body = new RateHistoryDecoder();
-
-        UnsafeBuffer buffer = new UnsafeBuffer(data);
-        header.wrap(buffer, 0);
-
-        if (header.templateId() != RateHistoryDecoder.TEMPLATE_ID) {
-            throw new IllegalStateException(String.format("RateHistoryDecoder TEMPLATE_ID=%d does not match encoded TEMPLATE_ID=%d",
-                    RateHistoryDecoder.TEMPLATE_ID, header.templateId()));
-        }
-
-        body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
-
-        ConsumerRateHistory result = new ConsumerRateHistory();
-        for (RateHistoryDecoder.SubscriptionsDecoder subscriptionDecoder : body.subscriptions()) {
-            long id = subscriptionDecoder.id();
-            List<Double> rates = StreamSupport.stream(subscriptionDecoder.rates().spliterator(), false)
-                    .map(RatesDecoder::rate)
-                    .collect(Collectors.toList());
-
-            subscriptionIds.getSubscriptionId(id)
-                    .ifPresent(subscriptionId -> {
-                        result.setRateHistory(subscriptionId.getSubscriptionName(), new RateHistory(rates));
-                    });
-        }
-        return result;
+    body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
+
+    ConsumerRateHistory result = new ConsumerRateHistory();
+    for (RateHistoryDecoder.SubscriptionsDecoder subscriptionDecoder : body.subscriptions()) {
+      long id = subscriptionDecoder.id();
+      List<Double> rates =
+          StreamSupport.stream(subscriptionDecoder.rates().spliterator(), false)
+              .map(RatesDecoder::rate)
+              .collect(Collectors.toList());
+
+      subscriptionIds
+          .getSubscriptionId(id)
+          .ifPresent(
+              subscriptionId -> {
+                result.setRateHistory(subscriptionId.getSubscriptionName(), new RateHistory(rates));
+              });
     }
+    return result;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistoriesEncoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistoriesEncoder.java
index f84e4ae114..23b0618439 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistoriesEncoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistoriesEncoder.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import java.util.List;
+import java.util.Map;
 import org.agrona.ExpandableDirectByteBuffer;
 import org.agrona.MutableDirectBuffer;
 import pl.allegro.tech.hermes.consumers.consumer.rate.sbe.stubs.MessageHeaderEncoder;
@@ -7,41 +9,38 @@
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
 
-import java.util.List;
-import java.util.Map;
-
 class ConsumerRateHistoriesEncoder {
 
-    private final MutableDirectBuffer buffer;
-    private final SubscriptionIds subscriptionIds;
+  private final MutableDirectBuffer buffer;
+  private final SubscriptionIds subscriptionIds;
 
-    ConsumerRateHistoriesEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
-        this.subscriptionIds = subscriptionIds;
-        this.buffer = new ExpandableDirectByteBuffer(bufferSize);
-    }
+  ConsumerRateHistoriesEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
+    this.subscriptionIds = subscriptionIds;
+    this.buffer = new ExpandableDirectByteBuffer(bufferSize);
+  }
 
-    byte[] encode(ConsumerRateHistory consumerRateHistory) {
-        MessageHeaderEncoder header = new MessageHeaderEncoder();
-        RateHistoryEncoder body = new RateHistoryEncoder();
+  byte[] encode(ConsumerRateHistory consumerRateHistory) {
+    MessageHeaderEncoder header = new MessageHeaderEncoder();
+    RateHistoryEncoder body = new RateHistoryEncoder();
 
-        Map<SubscriptionId, RateHistory> historiesFiltered = consumerRateHistory.toSubscriptionIdsMap(subscriptionIds::getSubscriptionId);
+    Map<SubscriptionId, RateHistory> historiesFiltered =
+        consumerRateHistory.toSubscriptionIdsMap(subscriptionIds::getSubscriptionId);
 
-        RateHistoryEncoder.SubscriptionsEncoder subscriptionsEncoder = body.wrapAndApplyHeader(buffer, 0, header)
-                .subscriptionsCount(historiesFiltered.size());
+    RateHistoryEncoder.SubscriptionsEncoder subscriptionsEncoder =
+        body.wrapAndApplyHeader(buffer, 0, header).subscriptionsCount(historiesFiltered.size());
 
-        historiesFiltered.forEach((id, rateHistory) -> {
-            List<Double> rates = rateHistory.getRates();
-            RateHistoryEncoder.SubscriptionsEncoder.RatesEncoder ratesEncoder = subscriptionsEncoder.next()
-                    .id(id.getValue())
-                    .ratesCount(rates.size());
+    historiesFiltered.forEach(
+        (id, rateHistory) -> {
+          List<Double> rates = rateHistory.getRates();
+          RateHistoryEncoder.SubscriptionsEncoder.RatesEncoder ratesEncoder =
+              subscriptionsEncoder.next().id(id.getValue()).ratesCount(rates.size());
 
-            rates.forEach(rate -> ratesEncoder.next()
-                    .rate(rate));
+          rates.forEach(rate -> ratesEncoder.next().rate(rate));
         });
-        int len = header.encodedLength() + body.encodedLength();
+    int len = header.encodedLength() + body.encodedLength();
 
-        byte[] dst = new byte[len];
-        buffer.getBytes(0, dst);
-        return dst;
-    }
+    byte[] dst = new byte[len];
+    buffer.getBytes(0, dst);
+    return dst;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistory.java
index 39c404e253..f54f18dfb6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateHistory.java
@@ -1,61 +1,63 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
 
 class ConsumerRateHistory {
 
-    private final Map<SubscriptionName, RateHistory> rateHistories;
-
-    ConsumerRateHistory() {
-        this.rateHistories = new HashMap<>();
-    }
-
-    RateHistory getRateHistory(SubscriptionName subscription) {
-        return rateHistories.getOrDefault(subscription, RateHistory.empty());
-    }
-
-    void setRateHistory(SubscriptionName subscription, RateHistory rateHistory) {
-        rateHistories.put(subscription, rateHistory);
-    }
-
-    void cleanup(Set<SubscriptionName> subscriptions) {
-        rateHistories.entrySet()
-                .removeIf(entry -> !subscriptions.contains(entry.getKey()));
-    }
-
-    int size() {
-        return rateHistories.size();
-    }
-
-    Map<SubscriptionId, RateHistory> toSubscriptionIdsMap(SubscriptionIdMapper subscriptionIdMapping) {
-        return rateHistories.keySet().stream()
-                .map(subscriptionIdMapping::mapToSubscriptionId)
-                .filter(Optional::isPresent)
-                .collect(Collectors.toMap(Optional::get, subscriptionId -> rateHistories.get(subscriptionId.get().getSubscriptionName())));
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerRateHistory that = (ConsumerRateHistory) o;
-        return Objects.equals(rateHistories, that.rateHistories);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(rateHistories);
-    }
+  private final Map<SubscriptionName, RateHistory> rateHistories;
+
+  ConsumerRateHistory() {
+    this.rateHistories = new HashMap<>();
+  }
+
+  RateHistory getRateHistory(SubscriptionName subscription) {
+    return rateHistories.getOrDefault(subscription, RateHistory.empty());
+  }
+
+  void setRateHistory(SubscriptionName subscription, RateHistory rateHistory) {
+    rateHistories.put(subscription, rateHistory);
+  }
+
+  void cleanup(Set<SubscriptionName> subscriptions) {
+    rateHistories.entrySet().removeIf(entry -> !subscriptions.contains(entry.getKey()));
+  }
+
+  int size() {
+    return rateHistories.size();
+  }
+
+  Map<SubscriptionId, RateHistory> toSubscriptionIdsMap(
+      SubscriptionIdMapper subscriptionIdMapping) {
+    return rateHistories.keySet().stream()
+        .map(subscriptionIdMapping::mapToSubscriptionId)
+        .filter(Optional::isPresent)
+        .collect(
+            Collectors.toMap(
+                Optional::get,
+                subscriptionId -> rateHistories.get(subscriptionId.get().getSubscriptionName())));
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ConsumerRateHistory that = (ConsumerRateHistory) o;
+    return Objects.equals(rateHistories, that.rateHistories);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(rateHistories);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateInfo.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateInfo.java
index e48e1a6b5d..ad0c5c3eb1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateInfo.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ConsumerRateInfo.java
@@ -5,51 +5,55 @@
 
 final class ConsumerRateInfo {
 
-    private final String consumerId;
-    private final Optional<MaxRate> maxRate;
-    private final RateHistory history;
-
-    ConsumerRateInfo(String consumerId, RateInfo rateInfo) {
-        this.consumerId = consumerId;
-        this.maxRate = rateInfo.getMaxRate();
-        this.history = rateInfo.getRateHistory();
+  private final String consumerId;
+  private final Optional<MaxRate> maxRate;
+  private final RateHistory history;
+
+  ConsumerRateInfo(String consumerId, RateInfo rateInfo) {
+    this.consumerId = consumerId;
+    this.maxRate = rateInfo.getMaxRate();
+    this.history = rateInfo.getRateHistory();
+  }
+
+  Optional<MaxRate> getMaxRate() {
+    return maxRate;
+  }
+
+  RateHistory getHistory() {
+    return history;
+  }
+
+  String getConsumerId() {
+    return consumerId;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    Optional<MaxRate> getMaxRate() {
-        return maxRate;
-    }
-
-    RateHistory getHistory() {
-        return history;
-    }
-
-    String getConsumerId() {
-        return consumerId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerRateInfo that = (ConsumerRateInfo) o;
-        return Objects.equals(consumerId, that.consumerId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(consumerId);
-    }
-
-    @Override
-    public String toString() {
-        return "ConsumerRateInfo{"
-                + "consumerId='" + consumerId + '\''
-                + ", maxRate=" + maxRate
-                + ", history=" + history
-                + '}';
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumerRateInfo that = (ConsumerRateInfo) o;
+    return Objects.equals(consumerId, that.consumerId);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(consumerId);
+  }
+
+  @Override
+  public String toString() {
+    return "ConsumerRateInfo{"
+        + "consumerId='"
+        + consumerId
+        + '\''
+        + ", maxRate="
+        + maxRate
+        + ", history="
+        + history
+        + '}';
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRate.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRate.java
index c04d2fd044..a3d9abdc0e 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRate.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRate.java
@@ -5,38 +5,36 @@
 
 final class MaxRate {
 
-    private final double maxRate;
+  private final double maxRate;
 
-    @ConstructorProperties({"maxRate"})
-    MaxRate(double maxRate) {
-        this.maxRate = maxRate;
-    }
+  @ConstructorProperties({"maxRate"})
+  MaxRate(double maxRate) {
+    this.maxRate = maxRate;
+  }
 
-    public double getMaxRate() {
-        return maxRate;
-    }
+  public double getMaxRate() {
+    return maxRate;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        MaxRate maxRate1 = (MaxRate) o;
-        return Double.compare(maxRate1.maxRate, maxRate) == 0;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(maxRate);
-    }
-
-    @Override
-    public String toString() {
-        return "MaxRate{"
-                + "maxRate=" + maxRate
-                + '}';
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    MaxRate maxRate1 = (MaxRate) o;
+    return Double.compare(maxRate1.maxRate, maxRate) == 0;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(maxRate);
+  }
+
+  @Override
+  public String toString() {
+    return "MaxRate{" + "maxRate=" + maxRate + '}';
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateBalancer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateBalancer.java
index 8e33f6af0b..1fe0aa5886 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateBalancer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateBalancer.java
@@ -10,331 +10,353 @@
 
 class MaxRateBalancer {
 
-    private static final double ALLOWED_DISTRIBUTION_ERROR = 1.0d;
+  private static final double ALLOWED_DISTRIBUTION_ERROR = 1.0d;
 
-    private final double busyTolerance;
-    private final double minMax;
-    private final double minAllowedChangePercent;
+  private final double busyTolerance;
+  private final double minMax;
+  private final double minAllowedChangePercent;
 
-    MaxRateBalancer(double busyTolerance, double minMax, double minAllowedChangePercent) {
-        this.busyTolerance = busyTolerance;
-        this.minMax = minMax;
-        this.minAllowedChangePercent = minAllowedChangePercent;
-    }
+  MaxRateBalancer(double busyTolerance, double minMax, double minAllowedChangePercent) {
+    this.busyTolerance = busyTolerance;
+    this.minMax = minMax;
+    this.minAllowedChangePercent = minAllowedChangePercent;
+  }
+
+  Optional<Map<String, MaxRate>> balance(double subscriptionMax, Set<ConsumerRateInfo> rateInfos) {
+    double defaultRate = Math.max(minMax, subscriptionMax / Math.max(1, rateInfos.size()));
 
-    Optional<Map<String, MaxRate>> balance(double subscriptionMax, Set<ConsumerRateInfo> rateInfos) {
-        double defaultRate = Math.max(minMax, subscriptionMax / Math.max(1, rateInfos.size()));
-
-        if (shouldResortToDefaults(subscriptionMax, rateInfos)) {
-            return Optional.of(balanceDefault(defaultRate, rateInfos));
-        }
-
-        List<ActiveConsumerInfo> activeConsumerInfos =
-                rateInfos.stream().map(ActiveConsumerInfo::convert).collect(Collectors.toList());
-
-        if (subscriptionRateChanged(activeConsumerInfos, subscriptionMax)) {
-            return Optional.of(balanceDefault(defaultRate, rateInfos));
-        }
-
-        Map<Boolean, List<ActiveConsumerInfo>> busyOrNot = busyOrNot(activeConsumerInfos);
-        List<ActiveConsumerInfo> busy = busyOrNot.get(true);
-        List<ActiveConsumerInfo> notBusy = busyOrNot.get(false)
-                .stream()
-                .filter(consumer -> !consumer.getRateHistory().getRates().isEmpty())
-                .collect(Collectors.toList());
-
-        if (busy.isEmpty()) {
-            return Optional.empty();
-        }
-
-        double minChange = (minAllowedChangePercent / 100) * subscriptionMax;
-        NotBusyBalancer.Result notBusyChanges = handleNotBusy(notBusy, minChange);
-        Map<String, MaxRate> busyUpdates =
-                handleBusy(minChange, busy, notBusyChanges.getReleasedRate()).calculateNewMaxRates();
-        Map<String, MaxRate> notBusyUpdates = notBusyChanges.calculateNewMaxRates();
-
-        return Optional.of(Stream.of(busyUpdates, notBusyUpdates)
-                .map(Map::entrySet)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+    if (shouldResortToDefaults(subscriptionMax, rateInfos)) {
+      return Optional.of(balanceDefault(defaultRate, rateInfos));
     }
 
-    private boolean shouldResortToDefaults(double subscriptionMax, Set<ConsumerRateInfo> rateInfos) {
-        return anyNewConsumers(rateInfos) || insufficientSubscriptionRate(subscriptionMax, rateInfos.size());
+    List<ActiveConsumerInfo> activeConsumerInfos =
+        rateInfos.stream().map(ActiveConsumerInfo::convert).collect(Collectors.toList());
+
+    if (subscriptionRateChanged(activeConsumerInfos, subscriptionMax)) {
+      return Optional.of(balanceDefault(defaultRate, rateInfos));
     }
 
-    private Map<String, MaxRate> balanceDefault(double defaultRate, Set<ConsumerRateInfo> rateInfos) {
-        return rateInfos.stream()
-                .collect(Collectors.toMap(ConsumerRateInfo::getConsumerId,
-                        rateInfo -> new MaxRate(defaultRate)));
+    Map<Boolean, List<ActiveConsumerInfo>> busyOrNot = busyOrNot(activeConsumerInfos);
+    List<ActiveConsumerInfo> busy = busyOrNot.get(true);
+    List<ActiveConsumerInfo> notBusy =
+        busyOrNot.get(false).stream()
+            .filter(consumer -> !consumer.getRateHistory().getRates().isEmpty())
+            .collect(Collectors.toList());
+
+    if (busy.isEmpty()) {
+      return Optional.empty();
     }
 
-    private boolean anyNewConsumers(Set<ConsumerRateInfo> rateInfos) {
-        return rateInfos.stream().anyMatch(this::isUnassigned);
+    double minChange = (minAllowedChangePercent / 100) * subscriptionMax;
+    NotBusyBalancer.Result notBusyChanges = handleNotBusy(notBusy, minChange);
+    Map<String, MaxRate> busyUpdates =
+        handleBusy(minChange, busy, notBusyChanges.getReleasedRate()).calculateNewMaxRates();
+    Map<String, MaxRate> notBusyUpdates = notBusyChanges.calculateNewMaxRates();
+
+    return Optional.of(
+        Stream.of(busyUpdates, notBusyUpdates)
+            .map(Map::entrySet)
+            .flatMap(Collection::stream)
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+  }
+
+  private boolean shouldResortToDefaults(double subscriptionMax, Set<ConsumerRateInfo> rateInfos) {
+    return anyNewConsumers(rateInfos)
+        || insufficientSubscriptionRate(subscriptionMax, rateInfos.size());
+  }
+
+  private Map<String, MaxRate> balanceDefault(double defaultRate, Set<ConsumerRateInfo> rateInfos) {
+    return rateInfos.stream()
+        .collect(
+            Collectors.toMap(
+                ConsumerRateInfo::getConsumerId, rateInfo -> new MaxRate(defaultRate)));
+  }
+
+  private boolean anyNewConsumers(Set<ConsumerRateInfo> rateInfos) {
+    return rateInfos.stream().anyMatch(this::isUnassigned);
+  }
+
+  private boolean insufficientSubscriptionRate(double subscriptionMax, int consumersCount) {
+    return subscriptionMax / consumersCount <= 1.0d;
+  }
+
+  private boolean subscriptionRateChanged(
+      List<ActiveConsumerInfo> activeConsumerInfos, double subscriptionMax) {
+    double sum = activeConsumerInfos.stream().mapToDouble(ActiveConsumerInfo::getMax).sum();
+    return Math.abs(sum - subscriptionMax) > ALLOWED_DISTRIBUTION_ERROR;
+  }
+
+  private boolean isUnassigned(ConsumerRateInfo rateInfo) {
+    return !rateInfo.getMaxRate().isPresent();
+  }
+
+  private Map<Boolean, List<ActiveConsumerInfo>> busyOrNot(List<ActiveConsumerInfo> infos) {
+    return infos.stream().collect(Collectors.partitioningBy(this::isBusy));
+  }
+
+  private boolean isBusy(ActiveConsumerInfo info) {
+    return info.getRateHistory().getRates().stream()
+            .mapToDouble(Double::doubleValue)
+            .average()
+            .orElse(0)
+        > 1.0 - busyTolerance;
+  }
+
+  private NotBusyBalancer.Result handleNotBusy(List<ActiveConsumerInfo> notBusy, double minChange) {
+    return new NotBusyBalancer(notBusy, minChange, minMax).balance();
+  }
+
+  private BusyBalancer.Result handleBusy(
+      double minChange, List<ActiveConsumerInfo> busy, double freedByNotBusy) {
+    return new BusyBalancer(busy, freedByNotBusy, minChange).balance();
+  }
+
+  private static class ActiveConsumerInfo {
+
+    private final String consumerId;
+    private final RateHistory rateHistory;
+    private final Double max;
+
+    ActiveConsumerInfo(String consumerId, RateHistory rateHistory, Double max) {
+      this.consumerId = consumerId;
+      this.rateHistory = rateHistory;
+      this.max = max;
     }
 
-    private boolean insufficientSubscriptionRate(double subscriptionMax, int consumersCount) {
-        return subscriptionMax / consumersCount <= 1.0d;
+    static ActiveConsumerInfo convert(ConsumerRateInfo rateInfo) {
+      return new ActiveConsumerInfo(
+          rateInfo.getConsumerId(),
+          rateInfo.getHistory(),
+          rateInfo.getMaxRate().get().getMaxRate());
     }
 
-    private boolean subscriptionRateChanged(List<ActiveConsumerInfo> activeConsumerInfos, double subscriptionMax) {
-        double sum = activeConsumerInfos.stream().mapToDouble(ActiveConsumerInfo::getMax).sum();
-        return Math.abs(sum - subscriptionMax) > ALLOWED_DISTRIBUTION_ERROR;
+    String getConsumerId() {
+      return consumerId;
     }
 
-    private boolean isUnassigned(ConsumerRateInfo rateInfo) {
-        return !rateInfo.getMaxRate().isPresent();
+    RateHistory getRateHistory() {
+      return rateHistory;
     }
 
-    private Map<Boolean, List<ActiveConsumerInfo>> busyOrNot(List<ActiveConsumerInfo> infos) {
-        return infos.stream().collect(Collectors.partitioningBy(this::isBusy));
+    Double getMax() {
+      return max;
     }
+  }
+
+  private static class NotBusyBalancer {
 
-    private boolean isBusy(ActiveConsumerInfo info) {
-        return info.getRateHistory().getRates().stream()
-                .mapToDouble(Double::doubleValue).average().orElse(0) > 1.0 - busyTolerance;
+    private final List<ActiveConsumerInfo> consumerInfos;
+    private final double minChange;
+    private final double minMax;
+
+    NotBusyBalancer(List<ActiveConsumerInfo> consumerInfos, double minChange, double minMax) {
+      this.consumerInfos = consumerInfos;
+      this.minChange = minChange;
+      this.minMax = minMax;
     }
 
-    private NotBusyBalancer.Result handleNotBusy(List<ActiveConsumerInfo> notBusy, double minChange) {
-        return new NotBusyBalancer(notBusy, minChange, minMax).balance();
+    Result balance() {
+      List<ConsumerRateChange> changes =
+          consumerInfos.stream()
+              .map(
+                  ri -> {
+                    double currentMax = ri.getMax();
+                    double toDistribute = takeAwayFromNotBusy(ri.getRateHistory(), currentMax);
+                    return new ConsumerRateChange(ri.getConsumerId(), currentMax, -toDistribute);
+                  })
+              .collect(Collectors.toList());
+
+      return new Result(changes);
     }
 
-    private BusyBalancer.Result handleBusy(double minChange, List<ActiveConsumerInfo> busy, double freedByNotBusy) {
-        return new BusyBalancer(busy, freedByNotBusy, minChange).balance();
+    private double takeAwayFromNotBusy(RateHistory history, double currentMax) {
+      double usedRatio = history.getRates().get(0); // rate history must be present
+      double scalingFactor = 2 / (usedRatio + 1.0) - 1;
+
+      double proposedChange = scalingFactor * currentMax;
+      double actualChange = proposedChange > minChange ? proposedChange : 0.0d;
+
+      return currentMax - actualChange > minMax ? actualChange : currentMax - minMax;
     }
 
-    private static class ActiveConsumerInfo {
+    private static class Result {
 
-        private final String consumerId;
-        private final RateHistory rateHistory;
-        private final Double max;
+      private final List<ConsumerRateChange> changes;
+      private final double releasedRate;
 
-        ActiveConsumerInfo(String consumerId, RateHistory rateHistory, Double max) {
-            this.consumerId = consumerId;
-            this.rateHistory = rateHistory;
-            this.max = max;
-        }
+      Result(List<ConsumerRateChange> changes) {
+        this.changes = changes;
+        this.releasedRate = -changes.stream().mapToDouble(ConsumerRateChange::getRateChange).sum();
+      }
 
-        static ActiveConsumerInfo convert(ConsumerRateInfo rateInfo) {
-            return new ActiveConsumerInfo(
-                    rateInfo.getConsumerId(),
-                    rateInfo.getHistory(),
-                    rateInfo.getMaxRate().get().getMaxRate());
-        }
+      double getReleasedRate() {
+        return releasedRate;
+      }
 
-        String getConsumerId() {
-            return consumerId;
-        }
+      Map<String, MaxRate> calculateNewMaxRates() {
+        return changes.stream()
+            .collect(
+                Collectors.toMap(
+                    ConsumerRateChange::getConsumerId,
+                    change -> new MaxRate(change.getCurrentMax() + change.getRateChange())));
+      }
+    }
+  }
 
-        RateHistory getRateHistory() {
-            return rateHistory;
-        }
+  private static class BusyBalancer {
 
-        Double getMax() {
-            return max;
-        }
+    private final List<ActiveConsumerInfo> consumerInfos;
+    private final double freedByNotBusy;
+    private final double minChange;
+
+    BusyBalancer(List<ActiveConsumerInfo> consumerInfos, double freedByNotBusy, double minChange) {
+      this.consumerInfos = consumerInfos;
+      this.freedByNotBusy = freedByNotBusy;
+      this.minChange = minChange;
     }
 
-    private static class NotBusyBalancer {
+    Result balance() {
+      double busyMaxSum = consumerInfos.stream().mapToDouble(ActiveConsumerInfo::getMax).sum();
+
+      List<ConsumerMaxShare> shares =
+          consumerInfos.stream()
+              .map(
+                  info ->
+                      new ConsumerMaxShare(
+                          info.getConsumerId(), info.getMax(), info.getMax() / busyMaxSum))
+              .collect(Collectors.toList());
+
+      if (shares.size() == 1) {
+        return new Result(distribute(freedByNotBusy, shares));
+      }
+
+      double equalShare = busyMaxSum / consumerInfos.size();
+
+      Map<Boolean, List<ConsumerMaxShare>> greedyOrNot =
+          shares.stream()
+              .collect(
+                  Collectors.partitioningBy(
+                      share -> share.getCurrentMax() > equalShare + minChange));
+
+      List<ConsumerMaxShare> greedy = greedyOrNot.get(true);
+      List<ConsumerMaxShare> notGreedy = greedyOrNot.get(false);
+
+      List<ConsumerRateChange> greedySubtracts =
+          greedy.stream()
+              .map(
+                  share -> {
+                    double toDistribute =
+                        takeAwayFromGreedy(share.getCurrentMax(), share.getShare(), equalShare);
+                    return new ConsumerRateChange(
+                        share.getConsumerId(), share.currentMax, -toDistribute);
+                  })
+              .collect(Collectors.toList());
+
+      double toDistribute =
+          freedByNotBusy
+              - greedySubtracts.stream().mapToDouble(ConsumerRateChange::getRateChange).sum();
+
+      List<ConsumerMaxShare> notGreedyShares = recalculateShare(notGreedy);
+      List<ConsumerRateChange> notGreedyAdds = distribute(toDistribute, notGreedyShares);
+
+      return new Result(
+          Stream.concat(notGreedyAdds.stream(), greedySubtracts.stream())
+              .collect(Collectors.toList()));
+    }
 
-        private final List<ActiveConsumerInfo> consumerInfos;
-        private final double minChange;
-        private final double minMax;
+    private double takeAwayFromGreedy(double currentMax, double share, double equalShare) {
+      double scale = 2 / (share + 1.0) - 1;
+      double changeProposal = (currentMax / 2) * scale;
+      double actualChange = Math.max(changeProposal, minChange);
+      return (currentMax - actualChange) > equalShare ? actualChange : currentMax - equalShare;
+    }
 
-        NotBusyBalancer(List<ActiveConsumerInfo> consumerInfos, double minChange, double minMax) {
-            this.consumerInfos = consumerInfos;
-            this.minChange = minChange;
-            this.minMax = minMax;
-        }
+    private List<ConsumerMaxShare> recalculateShare(List<ConsumerMaxShare> shares) {
+      double sum = shares.stream().mapToDouble(ConsumerMaxShare::getCurrentMax).sum();
+      return shares.stream()
+          .map(
+              previous ->
+                  new ConsumerMaxShare(
+                      previous.getConsumerId(),
+                      previous.getCurrentMax(),
+                      previous.currentMax / sum))
+          .collect(Collectors.toList());
+    }
 
-        Result balance() {
-            List<ConsumerRateChange> changes = consumerInfos.stream()
-                    .map(ri -> {
-                        double currentMax = ri.getMax();
-                        double toDistribute = takeAwayFromNotBusy(ri.getRateHistory(), currentMax);
-                        return new ConsumerRateChange(ri.getConsumerId(), currentMax, -toDistribute);
-            }).collect(Collectors.toList());
+    private List<ConsumerRateChange> distribute(double maxAmount, List<ConsumerMaxShare> shares) {
+      return shares.stream()
+          .map(
+              share ->
+                  new ConsumerRateChange(
+                      share.consumerId, share.getCurrentMax(), share.getShare() * maxAmount))
+          .collect(Collectors.toList());
+    }
 
-            return new Result(changes);
-        }
+    private static class Result {
 
-        private double takeAwayFromNotBusy(RateHistory history, double currentMax) {
-            double usedRatio = history.getRates().get(0); // rate history must be present
-            double scalingFactor = 2 / (usedRatio + 1.0) - 1;
+      private final List<ConsumerRateChange> changes;
 
-            double proposedChange = scalingFactor * currentMax;
-            double actualChange = proposedChange > minChange ? proposedChange : 0.0d;
+      Result(List<ConsumerRateChange> changes) {
+        this.changes = changes;
+      }
 
-            return currentMax - actualChange > minMax ? actualChange : currentMax - minMax;
-        }
+      Map<String, MaxRate> calculateNewMaxRates() {
+        return changes.stream()
+            .collect(
+                Collectors.toMap(
+                    ConsumerRateChange::getConsumerId,
+                    change -> new MaxRate(change.getCurrentMax() + change.getRateChange())));
+      }
+    }
 
-        private static class Result {
+    private static class ConsumerMaxShare {
 
-            private final List<ConsumerRateChange> changes;
-            private final double releasedRate;
+      private final String consumerId;
+      private final double currentMax;
+      private final double share;
 
-            Result(List<ConsumerRateChange> changes) {
-                this.changes = changes;
-                this.releasedRate = -changes.stream().mapToDouble(ConsumerRateChange::getRateChange).sum();
-            }
+      ConsumerMaxShare(String consumerId, double currentMax, double share) {
+        this.consumerId = consumerId;
+        this.currentMax = currentMax;
+        this.share = share;
+      }
 
-            double getReleasedRate() {
-                return releasedRate;
-            }
+      String getConsumerId() {
+        return consumerId;
+      }
 
-            Map<String, MaxRate> calculateNewMaxRates() {
-                return changes.stream()
-                        .collect(Collectors.toMap(
-                                ConsumerRateChange::getConsumerId,
-                                change -> new MaxRate(change.getCurrentMax() + change.getRateChange())));
-            }
-        }
-    }
+      double getCurrentMax() {
+        return currentMax;
+      }
 
-    private static class BusyBalancer {
-
-        private final List<ActiveConsumerInfo> consumerInfos;
-        private final double freedByNotBusy;
-        private final double minChange;
-
-        BusyBalancer(List<ActiveConsumerInfo> consumerInfos, double freedByNotBusy, double minChange) {
-            this.consumerInfos = consumerInfos;
-            this.freedByNotBusy = freedByNotBusy;
-            this.minChange = minChange;
-        }
-
-        Result balance() {
-            double busyMaxSum = consumerInfos.stream().mapToDouble(ActiveConsumerInfo::getMax).sum();
-
-            List<ConsumerMaxShare> shares = consumerInfos.stream()
-                    .map(info ->
-                            new ConsumerMaxShare(info.getConsumerId(), info.getMax(), info.getMax() / busyMaxSum))
-                    .collect(Collectors.toList());
-
-            if (shares.size() == 1) {
-                return new Result(distribute(freedByNotBusy, shares));
-            }
-
-            double equalShare = busyMaxSum / consumerInfos.size();
-
-            Map<Boolean, List<ConsumerMaxShare>> greedyOrNot =
-                    shares.stream().collect(
-                            Collectors.partitioningBy(share -> share.getCurrentMax() > equalShare + minChange));
-
-            List<ConsumerMaxShare> greedy = greedyOrNot.get(true);
-            List<ConsumerMaxShare> notGreedy = greedyOrNot.get(false);
-
-            List<ConsumerRateChange> greedySubtracts = greedy.stream()
-                    .map(share -> {
-                        double toDistribute =
-                                takeAwayFromGreedy(share.getCurrentMax(), share.getShare(), equalShare);
-                        return new ConsumerRateChange(share.getConsumerId(), share.currentMax, -toDistribute);
-                    })
-                    .collect(Collectors.toList());
-
-            double toDistribute = freedByNotBusy - greedySubtracts.stream()
-                    .mapToDouble(ConsumerRateChange::getRateChange)
-                    .sum();
-
-            List<ConsumerMaxShare> notGreedyShares = recalculateShare(notGreedy);
-            List<ConsumerRateChange> notGreedyAdds = distribute(toDistribute, notGreedyShares);
-
-            return new Result(
-                    Stream.concat(notGreedyAdds.stream(), greedySubtracts.stream())
-                            .collect(Collectors.toList())
-            );
-        }
-
-        private double takeAwayFromGreedy(double currentMax, double share, double equalShare) {
-            double scale = 2 / (share + 1.0) - 1;
-            double changeProposal = (currentMax / 2) * scale;
-            double actualChange = Math.max(changeProposal, minChange);
-            return (currentMax - actualChange) > equalShare ? actualChange : currentMax - equalShare;
-        }
-
-        private List<ConsumerMaxShare> recalculateShare(List<ConsumerMaxShare> shares) {
-            double sum = shares.stream().mapToDouble(ConsumerMaxShare::getCurrentMax).sum();
-            return shares.stream()
-                    .map(previous -> new ConsumerMaxShare(
-                            previous.getConsumerId(),
-                            previous.getCurrentMax(),
-                            previous.currentMax / sum))
-                    .collect(Collectors.toList());
-        }
-
-        private List<ConsumerRateChange> distribute(double maxAmount, List<ConsumerMaxShare> shares) {
-            return shares.stream()
-                    .map(share -> new ConsumerRateChange(
-                            share.consumerId,
-                            share.getCurrentMax(),
-                            share.getShare() * maxAmount))
-                    .collect(Collectors.toList());
-        }
-
-        private static class Result {
-
-            private final List<ConsumerRateChange> changes;
-
-            Result(List<ConsumerRateChange> changes) {
-                this.changes = changes;
-            }
-
-            Map<String, MaxRate> calculateNewMaxRates() {
-                return changes.stream()
-                        .collect(Collectors.toMap(
-                                ConsumerRateChange::getConsumerId,
-                                change -> new MaxRate(change.getCurrentMax() + change.getRateChange())));
-            }
-        }
-
-        private static class ConsumerMaxShare {
-
-            private final String consumerId;
-            private final double currentMax;
-            private final double share;
-
-            ConsumerMaxShare(String consumerId, double currentMax, double share) {
-                this.consumerId = consumerId;
-                this.currentMax = currentMax;
-                this.share = share;
-            }
-
-            String getConsumerId() {
-                return consumerId;
-            }
-
-            double getCurrentMax() {
-                return currentMax;
-            }
-
-            double getShare() {
-                return share;
-            }
-        }
+      double getShare() {
+        return share;
+      }
     }
+  }
 
-    private static class ConsumerRateChange {
+  private static class ConsumerRateChange {
 
-        private String consumerId;
-        private double currentMax;
-        private double rateChange;
+    private String consumerId;
+    private double currentMax;
+    private double rateChange;
 
-        ConsumerRateChange(String consumerId, double currentMax, double rateChange) {
-            this.consumerId = consumerId;
-            this.currentMax = currentMax;
-            this.rateChange = rateChange;
-        }
+    ConsumerRateChange(String consumerId, double currentMax, double rateChange) {
+      this.consumerId = consumerId;
+      this.currentMax = currentMax;
+      this.rateChange = rateChange;
+    }
 
-        String getConsumerId() {
-            return consumerId;
-        }
+    String getConsumerId() {
+      return consumerId;
+    }
 
-        double getCurrentMax() {
-            return currentMax;
-        }
+    double getCurrentMax() {
+      return currentMax;
+    }
 
-        double getRateChange() {
-            return rateChange;
-        }
+    double getRateChange() {
+      return rateChange;
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateCalculator.java
index 536f815fbc..d52bdcf285 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateCalculator.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import java.time.Clock;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -7,72 +11,81 @@
 import pl.allegro.tech.hermes.consumers.subscription.cache.SubscriptionsCache;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.ClusterAssignmentCache;
 
-import java.time.Clock;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
 class MaxRateCalculator {
 
-    private static final Logger logger = LoggerFactory.getLogger(MaxRateCalculator.class);
-
-    private final ClusterAssignmentCache clusterAssignmentCache;
-    private final SubscriptionsCache subscriptionsCache;
-    private final MaxRateBalancer balancer;
-    private final MaxRateRegistry maxRateRegistry;
-    private final Clock clock;
-
-    private volatile long lastUpdateDurationMillis = 0;
-
-    MaxRateCalculator(ClusterAssignmentCache clusterAssignmentCache,
-                      SubscriptionsCache subscriptionsCache,
-                      MaxRateBalancer balancer,
-                      MaxRateRegistry maxRateRegistry,
-                      MetricsFacade metrics,
-                      Clock clock) {
-        this.clusterAssignmentCache = clusterAssignmentCache;
-        this.subscriptionsCache = subscriptionsCache;
-        this.balancer = balancer;
-        this.maxRateRegistry = maxRateRegistry;
-        this.clock = clock;
-        metrics.maxRate().registerCalculationDurationInMillisGauge(this, calculator -> calculator.lastUpdateDurationMillis);
-    }
-
-    void calculate() {
-        try {
-            logger.info("Max rate calculation started");
-
-            final long start = clock.millis();
-            maxRateRegistry.onBeforeMaxRateCalculation();
-
-            clusterAssignmentCache.getSubscriptionConsumers().forEach((subscriptionName, consumerIds) -> {
+  private static final Logger logger = LoggerFactory.getLogger(MaxRateCalculator.class);
+
+  private final ClusterAssignmentCache clusterAssignmentCache;
+  private final SubscriptionsCache subscriptionsCache;
+  private final MaxRateBalancer balancer;
+  private final MaxRateRegistry maxRateRegistry;
+  private final Clock clock;
+
+  private volatile long lastUpdateDurationMillis = 0;
+
+  MaxRateCalculator(
+      ClusterAssignmentCache clusterAssignmentCache,
+      SubscriptionsCache subscriptionsCache,
+      MaxRateBalancer balancer,
+      MaxRateRegistry maxRateRegistry,
+      MetricsFacade metrics,
+      Clock clock) {
+    this.clusterAssignmentCache = clusterAssignmentCache;
+    this.subscriptionsCache = subscriptionsCache;
+    this.balancer = balancer;
+    this.maxRateRegistry = maxRateRegistry;
+    this.clock = clock;
+    metrics
+        .maxRate()
+        .registerCalculationDurationInMillisGauge(
+            this, calculator -> calculator.lastUpdateDurationMillis);
+  }
+
+  void calculate() {
+    try {
+      logger.info("Max rate calculation started");
+
+      final long start = clock.millis();
+      maxRateRegistry.onBeforeMaxRateCalculation();
+
+      clusterAssignmentCache
+          .getSubscriptionConsumers()
+          .forEach(
+              (subscriptionName, consumerIds) -> {
                 try {
-                    Subscription subscription = subscriptionsCache.getSubscription(subscriptionName);
-                    if (!subscription.isBatchSubscription()) {
+                  Subscription subscription = subscriptionsCache.getSubscription(subscriptionName);
+                  if (!subscription.isBatchSubscription()) {
 
-                        Set<ConsumerRateInfo> rateInfos = maxRateRegistry.ensureCorrectAssignments(
-                                subscription.getQualifiedName(), consumerIds);
+                    Set<ConsumerRateInfo> rateInfos =
+                        maxRateRegistry.ensureCorrectAssignments(
+                            subscription.getQualifiedName(), consumerIds);
 
-                        Optional<Map<String, MaxRate>> newRates
-                                = balancer.balance(subscription.getSerialSubscriptionPolicy().getRate(), rateInfos);
+                    Optional<Map<String, MaxRate>> newRates =
+                        balancer.balance(
+                            subscription.getSerialSubscriptionPolicy().getRate(), rateInfos);
 
-                        newRates.ifPresent(rates -> {
-                            logger.debug("Calculated new max rates for {}: {}", subscription.getQualifiedName(), rates);
+                    newRates.ifPresent(
+                        rates -> {
+                          logger.debug(
+                              "Calculated new max rates for {}: {}",
+                              subscription.getQualifiedName(),
+                              rates);
 
-                            maxRateRegistry.update(subscription.getQualifiedName(), rates);
+                          maxRateRegistry.update(subscription.getQualifiedName(), rates);
                         });
-                    }
+                  }
                 } catch (Exception e) {
-                    logger.error("Problem calculating max rates for subscription {}", subscriptionName, e);
+                  logger.error(
+                      "Problem calculating max rates for subscription {}", subscriptionName, e);
                 }
-            });
+              });
 
-            maxRateRegistry.onAfterMaxRateCalculation();
+      maxRateRegistry.onAfterMaxRateCalculation();
 
-            lastUpdateDurationMillis = clock.millis() - start;
-            logger.info("Max rate calculation done in {} ms", lastUpdateDurationMillis);
-        } catch (Exception e) {
-            logger.error("Problem calculating max rate", e);
-        }
+      lastUpdateDurationMillis = clock.millis() - start;
+      logger.info("Max rate calculation done in {} ms", lastUpdateDurationMillis);
+    } catch (Exception e) {
+      logger.error("Problem calculating max rate", e);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateCalculatorJob.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateCalculatorJob.java
index 0ceebc5814..32fc1422f5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateCalculatorJob.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateCalculatorJob.java
@@ -1,80 +1,83 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.curator.framework.recipes.leader.LeaderLatchListener;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry;
-import pl.allegro.tech.hermes.consumers.subscription.cache.SubscriptionsCache;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.ClusterAssignmentCache;
-
 import java.time.Clock;
 import java.time.Duration;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import org.apache.curator.framework.recipes.leader.LeaderLatchListener;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry;
+import pl.allegro.tech.hermes.consumers.subscription.cache.SubscriptionsCache;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.ClusterAssignmentCache;
 
 class MaxRateCalculatorJob implements LeaderLatchListener, Runnable {
 
-    private final Duration interval;
-    private final ScheduledExecutorService executorService;
-    private final MaxRateCalculator maxRateCalculator;
-    private final ConsumerNodesRegistry consumerNodesRegistry;
+  private final Duration interval;
+  private final ScheduledExecutorService executorService;
+  private final MaxRateCalculator maxRateCalculator;
+  private final ConsumerNodesRegistry consumerNodesRegistry;
 
-    private ScheduledFuture<?> job;
+  private ScheduledFuture<?> job;
 
-    MaxRateCalculatorJob(Duration internal,
-                         ClusterAssignmentCache clusterAssignmentCache,
-                         ConsumerNodesRegistry consumerNodesRegistry,
-                         MaxRateBalancer balancer,
-                         MaxRateRegistry maxRateRegistry,
-                         SubscriptionsCache subscriptionsCache,
-                         MetricsFacade metrics,
-                         Clock clock) {
-        this.consumerNodesRegistry = consumerNodesRegistry;
-        this.interval = internal;
-        this.executorService = Executors.newSingleThreadScheduledExecutor(
-                new ThreadFactoryBuilder().setNameFormat("max-rate-calculator-%d").build());
-        this.maxRateCalculator = new MaxRateCalculator(
-                clusterAssignmentCache, subscriptionsCache, balancer, maxRateRegistry, metrics, clock
-        );
-    }
+  MaxRateCalculatorJob(
+      Duration internal,
+      ClusterAssignmentCache clusterAssignmentCache,
+      ConsumerNodesRegistry consumerNodesRegistry,
+      MaxRateBalancer balancer,
+      MaxRateRegistry maxRateRegistry,
+      SubscriptionsCache subscriptionsCache,
+      MetricsFacade metrics,
+      Clock clock) {
+    this.consumerNodesRegistry = consumerNodesRegistry;
+    this.interval = internal;
+    this.executorService =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactoryBuilder().setNameFormat("max-rate-calculator-%d").build());
+    this.maxRateCalculator =
+        new MaxRateCalculator(
+            clusterAssignmentCache, subscriptionsCache, balancer, maxRateRegistry, metrics, clock);
+  }
 
-    public void start() {
-        consumerNodesRegistry.addLeaderLatchListener(this);
-        startJobIfAlreadyBeingLeader();
-    }
+  public void start() {
+    consumerNodesRegistry.addLeaderLatchListener(this);
+    startJobIfAlreadyBeingLeader();
+  }
 
-    private void startJobIfAlreadyBeingLeader() {
-        if (consumerNodesRegistry.isLeader()) {
-            isLeader();
-        }
+  private void startJobIfAlreadyBeingLeader() {
+    if (consumerNodesRegistry.isLeader()) {
+      isLeader();
     }
+  }
 
-    public void stop() throws InterruptedException {
-        consumerNodesRegistry.removeLeaderLatchListener(this);
+  public void stop() throws InterruptedException {
+    consumerNodesRegistry.removeLeaderLatchListener(this);
 
-        if (job != null) {
-            job.cancel(false);
-        }
-        executorService.shutdown();
-        executorService.awaitTermination(1, TimeUnit.MINUTES);
+    if (job != null) {
+      job.cancel(false);
     }
+    executorService.shutdown();
+    executorService.awaitTermination(1, TimeUnit.MINUTES);
+  }
 
-    @Override
-    public void run() {
-        if (consumerNodesRegistry.isLeader()) {
-            maxRateCalculator.calculate();
-        }
+  @Override
+  public void run() {
+    if (consumerNodesRegistry.isLeader()) {
+      maxRateCalculator.calculate();
     }
+  }
 
-    @Override
-    public void isLeader() {
-        job = executorService.scheduleAtFixedRate(this, interval.toSeconds(), interval.toSeconds(), TimeUnit.SECONDS);
-    }
+  @Override
+  public void isLeader() {
+    job =
+        executorService.scheduleAtFixedRate(
+            this, interval.toSeconds(), interval.toSeconds(), TimeUnit.SECONDS);
+  }
 
-    @Override
-    public void notLeader() {
-        job.cancel(false);
-    }
+  @Override
+  public void notLeader() {
+    job.cancel(false);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateParameters.java
index 70e8a73346..d655f0f077 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateParameters.java
@@ -4,17 +4,17 @@
 
 public interface MaxRateParameters {
 
-    Duration getBalanceInterval();
+  Duration getBalanceInterval();
 
-    Duration getUpdateInterval();
+  Duration getUpdateInterval();
 
-    int getHistorySize();
+  int getHistorySize();
 
-    double getBusyTolerance();
+  double getBusyTolerance();
 
-    double getMinMaxRate();
+  double getMinMaxRate();
 
-    double getMinAllowedChangePercent();
+  double getMinAllowedChangePercent();
 
-    double getMinSignificantUpdatePercent();
+  double getMinSignificantUpdatePercent();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRatePathSerializer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRatePathSerializer.java
index df2e4fc9f6..30872c65e0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRatePathSerializer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRatePathSerializer.java
@@ -1,37 +1,43 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import static com.google.common.base.Preconditions.checkArgument;
 
+import pl.allegro.tech.hermes.api.SubscriptionName;
+
 public class MaxRatePathSerializer {
 
-    ConsumerInstance consumerInstanceFromContentPath(String path) {
-        String[] paths = splitContentPath(path);
-        return new ConsumerInstance(paths[paths.length - 2], SubscriptionName.fromString(paths[paths.length - 3]));
-    }
-
-    ConsumerInstance consumerInstanceFromConsumerPath(String path) {
-        String[] paths = splitConsumerPath(path);
-        return new ConsumerInstance(paths[paths.length - 1], SubscriptionName.fromString(paths[paths.length - 2]));
-    }
-
-    String content(String path) {
-        String[] paths = splitContentPath(path);
-        return paths[paths.length - 1];
-    }
-
-    private String[] splitContentPath(String path) {
-        String[] paths = path.split("/");
-        checkArgument(paths.length > 2,
-                "Incorrect path format. Expected:'/base/subscription/consumerId/content'. Found:'%s'", path);
-        return paths;
-    }
-
-    private String[] splitConsumerPath(String path) {
-        String[] paths = path.split("/");
-        checkArgument(paths.length > 2,
-                "Incorrect path format. Expected:'/base/subscription/consumerId'. Found:'%s'", path);
-        return paths;
-    }
+  ConsumerInstance consumerInstanceFromContentPath(String path) {
+    String[] paths = splitContentPath(path);
+    return new ConsumerInstance(
+        paths[paths.length - 2], SubscriptionName.fromString(paths[paths.length - 3]));
+  }
+
+  ConsumerInstance consumerInstanceFromConsumerPath(String path) {
+    String[] paths = splitConsumerPath(path);
+    return new ConsumerInstance(
+        paths[paths.length - 1], SubscriptionName.fromString(paths[paths.length - 2]));
+  }
+
+  String content(String path) {
+    String[] paths = splitContentPath(path);
+    return paths[paths.length - 1];
+  }
+
+  private String[] splitContentPath(String path) {
+    String[] paths = path.split("/");
+    checkArgument(
+        paths.length > 2,
+        "Incorrect path format. Expected:'/base/subscription/consumerId/content'. Found:'%s'",
+        path);
+    return paths;
+  }
+
+  private String[] splitConsumerPath(String path) {
+    String[] paths = path.split("/");
+    checkArgument(
+        paths.length > 2,
+        "Incorrect path format. Expected:'/base/subscription/consumerId'. Found:'%s'",
+        path);
+    return paths;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateProvider.java
index c95834dc6e..00982826dd 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateProvider.java
@@ -3,11 +3,11 @@
 import pl.allegro.tech.hermes.api.Subscription;
 
 public interface MaxRateProvider {
-    double get();
+  double get();
 
-    default void start() {}
+  default void start() {}
 
-    default void shutdown() {}
+  default void shutdown() {}
 
-    default void updateSubscription(Subscription newSubscription) {}
+  default void updateSubscription(Subscription newSubscription) {}
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateProviderFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateProviderFactory.java
index 40fed0de87..e3f09aacde 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateProviderFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateProviderFactory.java
@@ -7,34 +7,48 @@
 
 public class MaxRateProviderFactory {
 
-    private final Creator providerCreator;
-
-    public MaxRateProviderFactory(MaxRateParameters maxRateParameters,
-                                  String nodeId,
-                                  MaxRateRegistry maxRateRegistry,
-                                  MaxRateSupervisor maxRateSupervisor) {
-        double minSignificantChange = maxRateParameters.getMinSignificantUpdatePercent() / 100;
-        checkNegotiatedSettings(minSignificantChange, maxRateParameters.getBusyTolerance());
-        providerCreator = (subscription, sendCounters, metrics) -> {
-            int historyLimit = maxRateParameters.getHistorySize();
-            double initialMaxRate = maxRateParameters.getMinMaxRate();
-
-            return new NegotiatedMaxRateProvider(nodeId, maxRateRegistry, maxRateSupervisor,
-                    subscription, sendCounters, metrics, initialMaxRate, minSignificantChange, historyLimit);
+  private final Creator providerCreator;
+
+  public MaxRateProviderFactory(
+      MaxRateParameters maxRateParameters,
+      String nodeId,
+      MaxRateRegistry maxRateRegistry,
+      MaxRateSupervisor maxRateSupervisor) {
+    double minSignificantChange = maxRateParameters.getMinSignificantUpdatePercent() / 100;
+    checkNegotiatedSettings(minSignificantChange, maxRateParameters.getBusyTolerance());
+    providerCreator =
+        (subscription, sendCounters, metrics) -> {
+          int historyLimit = maxRateParameters.getHistorySize();
+          double initialMaxRate = maxRateParameters.getMinMaxRate();
+
+          return new NegotiatedMaxRateProvider(
+              nodeId,
+              maxRateRegistry,
+              maxRateSupervisor,
+              subscription,
+              sendCounters,
+              metrics,
+              initialMaxRate,
+              minSignificantChange,
+              historyLimit);
         };
-    }
-
-    public MaxRateProvider create(Subscription subscription, SendCounters sendCounters, MetricsFacade metrics) {
-        return providerCreator.create(subscription, sendCounters, metrics);
-    }
-
-    private interface Creator {
-        MaxRateProvider create(Subscription subscription, SendCounters sendCounters, MetricsFacade metrics);
-    }
-
-    private void checkNegotiatedSettings(double minSignificantChange, double busyTolerance) {
-        Preconditions.checkArgument(busyTolerance > minSignificantChange,
-                "Significant rate change (%s) can't be higher than busy tolerance (%s)",
-                minSignificantChange, busyTolerance);
-    }
+  }
+
+  public MaxRateProvider create(
+      Subscription subscription, SendCounters sendCounters, MetricsFacade metrics) {
+    return providerCreator.create(subscription, sendCounters, metrics);
+  }
+
+  private interface Creator {
+    MaxRateProvider create(
+        Subscription subscription, SendCounters sendCounters, MetricsFacade metrics);
+  }
+
+  private void checkNegotiatedSettings(double minSignificantChange, double busyTolerance) {
+    Preconditions.checkArgument(
+        busyTolerance > minSignificantChange,
+        "Significant rate change (%s) can't be higher than busy tolerance (%s)",
+        minSignificantChange,
+        busyTolerance);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistry.java
index 1aa24f0dac..466285a26a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistry.java
@@ -1,6 +1,16 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.ChildData;
 import org.apache.curator.framework.recipes.cache.NodeCache;
@@ -12,238 +22,258 @@
 import pl.allegro.tech.hermes.consumers.supervisor.workload.ConsumerAssignmentCache;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
 public class MaxRateRegistry implements NodeCacheListener {
 
-    private static final Logger logger = getLogger(MaxRateRegistry.class);
-
-    private final ZookeeperOperations zookeeper;
-
-    private final Map<String, ConsumerMaxRates> consumersMaxRates = new HashMap<>();
-    private final Map<String, ConsumerRateHistory> consumersRateHistories = new HashMap<>();
-
-    private final ConsumerRateHistory currentConsumerRateHistories;
-    private final ConsumerMaxRates currentConsumerMaxRates;
-
-    private final String consumerId;
-    private final ClusterAssignmentCache clusterAssignmentCache;
-    private final ConsumerAssignmentCache consumerAssignmentCache;
-
-    private final ConsumerRateHistoriesEncoder consumerRateHistoriesEncoder;
-    private final ConsumerRateHistoriesDecoder consumerRateHistoriesDecoder;
-    private final ConsumerMaxRatesDecoder consumerMaxRatesDecoder;
-    private final ConsumerMaxRatesEncoder consumerMaxRatesEncoder;
-
-    private final NodeCache maxRateNodeCache;
-
-    private final MaxRateRegistryPaths registryPaths;
-
-    public MaxRateRegistry(int historiesEncoderBufferSize,
-                           int maxRateEncoderBufferSize,
-                           String nodeId,
-                           String clusterName,
-                           ClusterAssignmentCache clusterAssignmentCache,
-                           ConsumerAssignmentCache consumerAssignmentCache,
-                           CuratorFramework curator,
-                           ZookeeperPaths zookeeperPaths,
-                           SubscriptionIds subscriptionIds) {
-        this.consumerId = nodeId;
-        this.clusterAssignmentCache = clusterAssignmentCache;
-        this.consumerAssignmentCache = consumerAssignmentCache;
-
-        this.currentConsumerRateHistories = new ConsumerRateHistory();
-        this.currentConsumerMaxRates = new ConsumerMaxRates();
-
-        this.registryPaths = new MaxRateRegistryPaths(zookeeperPaths, consumerId, clusterName);
-        this.zookeeper = new ZookeeperOperations(curator);
-
-        this.consumerRateHistoriesEncoder = new ConsumerRateHistoriesEncoder(subscriptionIds, historiesEncoderBufferSize);
-        this.consumerRateHistoriesDecoder = new ConsumerRateHistoriesDecoder(subscriptionIds);
-
-        this.consumerMaxRatesEncoder = new ConsumerMaxRatesEncoder(subscriptionIds, maxRateEncoderBufferSize);
-        this.consumerMaxRatesDecoder = new ConsumerMaxRatesDecoder(subscriptionIds);
-
-        this.maxRateNodeCache = new NodeCache(curator, registryPaths.consumerMaxRatePath(consumerId));
-        maxRateNodeCache.getListenable().addListener(this);
+  private static final Logger logger = getLogger(MaxRateRegistry.class);
+
+  private final ZookeeperOperations zookeeper;
+
+  private final Map<String, ConsumerMaxRates> consumersMaxRates = new HashMap<>();
+  private final Map<String, ConsumerRateHistory> consumersRateHistories = new HashMap<>();
+
+  private final ConsumerRateHistory currentConsumerRateHistories;
+  private final ConsumerMaxRates currentConsumerMaxRates;
+
+  private final String consumerId;
+  private final ClusterAssignmentCache clusterAssignmentCache;
+  private final ConsumerAssignmentCache consumerAssignmentCache;
+
+  private final ConsumerRateHistoriesEncoder consumerRateHistoriesEncoder;
+  private final ConsumerRateHistoriesDecoder consumerRateHistoriesDecoder;
+  private final ConsumerMaxRatesDecoder consumerMaxRatesDecoder;
+  private final ConsumerMaxRatesEncoder consumerMaxRatesEncoder;
+
+  private final NodeCache maxRateNodeCache;
+
+  private final MaxRateRegistryPaths registryPaths;
+
+  public MaxRateRegistry(
+      int historiesEncoderBufferSize,
+      int maxRateEncoderBufferSize,
+      String nodeId,
+      String clusterName,
+      ClusterAssignmentCache clusterAssignmentCache,
+      ConsumerAssignmentCache consumerAssignmentCache,
+      CuratorFramework curator,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionIds subscriptionIds) {
+    this.consumerId = nodeId;
+    this.clusterAssignmentCache = clusterAssignmentCache;
+    this.consumerAssignmentCache = consumerAssignmentCache;
+
+    this.currentConsumerRateHistories = new ConsumerRateHistory();
+    this.currentConsumerMaxRates = new ConsumerMaxRates();
+
+    this.registryPaths = new MaxRateRegistryPaths(zookeeperPaths, consumerId, clusterName);
+    this.zookeeper = new ZookeeperOperations(curator);
+
+    this.consumerRateHistoriesEncoder =
+        new ConsumerRateHistoriesEncoder(subscriptionIds, historiesEncoderBufferSize);
+    this.consumerRateHistoriesDecoder = new ConsumerRateHistoriesDecoder(subscriptionIds);
+
+    this.consumerMaxRatesEncoder =
+        new ConsumerMaxRatesEncoder(subscriptionIds, maxRateEncoderBufferSize);
+    this.consumerMaxRatesDecoder = new ConsumerMaxRatesDecoder(subscriptionIds);
+
+    this.maxRateNodeCache = new NodeCache(curator, registryPaths.consumerMaxRatePath(consumerId));
+    maxRateNodeCache.getListenable().addListener(this);
+  }
+
+  public void start() {
+    try {
+      logger.info(
+          "Starting binary max rate registry at {}, watching current consumer path at {}",
+          registryPaths.consumersRateCurrentClusterRuntimeBinaryPath(),
+          registryPaths.consumerMaxRatePath(consumerId));
+      maxRateNodeCache.start();
+    } catch (Exception e) {
+      throw new IllegalStateException("Could not start node cache for consumer max rate", e);
     }
-
-    public void start() {
-        try {
-            logger.info("Starting binary max rate registry at {}, watching current consumer path at {}",
-                    registryPaths.consumersRateCurrentClusterRuntimeBinaryPath(), registryPaths.consumerMaxRatePath(consumerId));
-            maxRateNodeCache.start();
-        } catch (Exception e) {
-            throw new IllegalStateException("Could not start node cache for consumer max rate", e);
-        }
-        refreshConsumerMaxRates();
+    refreshConsumerMaxRates();
+  }
+
+  private void refreshConsumerMaxRates() {
+    ChildData nodeData = maxRateNodeCache.getCurrentData();
+    if (nodeData != null) {
+      byte[] data = nodeData.getData();
+      ConsumerMaxRates decodedMaxRates = consumerMaxRatesDecoder.decode(data);
+      currentConsumerMaxRates.setAllMaxRates(decodedMaxRates);
     }
-
-    private void refreshConsumerMaxRates() {
-        ChildData nodeData = maxRateNodeCache.getCurrentData();
-        if (nodeData != null) {
-            byte[] data = nodeData.getData();
-            ConsumerMaxRates decodedMaxRates = consumerMaxRatesDecoder.decode(data);
-            currentConsumerMaxRates.setAllMaxRates(decodedMaxRates);
-        }
-    }
-
-    public void stop() {
-        try {
-            logger.info("Stopping binary max rate registry");
-            maxRateNodeCache.close();
-        } catch (IOException e) {
-            throw new RuntimeException("Could not stop node cache for consumer max rate", e);
-        }
-    }
-
-    public void onBeforeMaxRateCalculation() {
-        Set<String> assignedConsumers = clusterAssignmentCache.getAssignedConsumers();
-        clearCacheFromInactiveConsumers(assignedConsumers);
-        refreshRateCachesOfConsumers(assignedConsumers);
-    }
-
-    private void clearCacheFromInactiveConsumers(Set<String> assignedConsumers) {
-        consumersMaxRates.entrySet().removeIf(entry -> !assignedConsumers.contains(entry.getKey()));
-        consumersRateHistories.entrySet().removeIf(entry -> !assignedConsumers.contains(entry.getKey()));
+  }
+
+  public void stop() {
+    try {
+      logger.info("Stopping binary max rate registry");
+      maxRateNodeCache.close();
+    } catch (IOException e) {
+      throw new RuntimeException("Could not stop node cache for consumer max rate", e);
     }
-
-    private void refreshRateCachesOfConsumers(Set<String> assignedConsumers) {
-        getMaxRateConsumerNodes().forEach(consumerId -> {
-            if (assignedConsumers.contains(consumerId)) {
+  }
+
+  public void onBeforeMaxRateCalculation() {
+    Set<String> assignedConsumers = clusterAssignmentCache.getAssignedConsumers();
+    clearCacheFromInactiveConsumers(assignedConsumers);
+    refreshRateCachesOfConsumers(assignedConsumers);
+  }
+
+  private void clearCacheFromInactiveConsumers(Set<String> assignedConsumers) {
+    consumersMaxRates.entrySet().removeIf(entry -> !assignedConsumers.contains(entry.getKey()));
+    consumersRateHistories
+        .entrySet()
+        .removeIf(entry -> !assignedConsumers.contains(entry.getKey()));
+  }
+
+  private void refreshRateCachesOfConsumers(Set<String> assignedConsumers) {
+    getMaxRateConsumerNodes()
+        .forEach(
+            consumerId -> {
+              if (assignedConsumers.contains(consumerId)) {
                 refreshConsumerRateHistory(consumerId);
                 refreshConsumerMaxRate(consumerId);
-            } else {
+              } else {
                 removeConsumerRateRootNode(consumerId);
-            }
-        });
-    }
-
-    private List<String> getMaxRateConsumerNodes() {
-        String path = registryPaths.consumersRateCurrentClusterRuntimeBinaryPath();
-        try {
-            if (zookeeper.exists(path)) {
-                return zookeeper.getNodeChildren(path);
-            }
-        } catch (Exception e) {
-            logger.warn("Could not get max rate consumer nodes list", e);
-        }
-        return Collections.emptyList();
+              }
+            });
+  }
+
+  private List<String> getMaxRateConsumerNodes() {
+    String path = registryPaths.consumersRateCurrentClusterRuntimeBinaryPath();
+    try {
+      if (zookeeper.exists(path)) {
+        return zookeeper.getNodeChildren(path);
+      }
+    } catch (Exception e) {
+      logger.warn("Could not get max rate consumer nodes list", e);
     }
-
-    private void refreshConsumerMaxRate(String consumerId) {
-        logger.debug("Refreshing max rate of {}", consumerId);
-        String consumerMaxRatePath = registryPaths.consumerMaxRatePath(consumerId);
-        zookeeper.getNodeData(consumerMaxRatePath)
-                .map(consumerMaxRatesDecoder::decode)
-                .ifPresent(maxRates -> {
-                    int decodedSize = maxRates.size();
-                    maxRates.cleanup(clusterAssignmentCache.getConsumerSubscriptions(consumerId));
-                    int cleanedSize = maxRates.size();
-                    if (decodedSize > cleanedSize) {
-                        logger.debug("Refreshed max rates of {} with {} subscriptions ({} stale entries omitted)",
-                                consumerId, cleanedSize, decodedSize - cleanedSize);
-                    } else {
-                        logger.debug("Refreshed max rates of {} with {} subscriptions", consumerId, cleanedSize);
-                    }
-                    consumersMaxRates.put(consumerId, maxRates);
-                });
-    }
-
-    private void refreshConsumerRateHistory(String consumerId) {
-        logger.debug("Refreshing rate history of {}", consumerId);
-        String consumerRateHistoryPath = registryPaths.consumerRateHistoryPath(consumerId);
-        zookeeper.getNodeData(consumerRateHistoryPath)
-                .map(consumerRateHistoriesDecoder::decode)
-                .ifPresent(rateHistories -> {
-                    logger.debug("Refreshed rate history of {} with {} subscriptions", consumerId, rateHistories.size());
-                    consumersRateHistories.put(consumerId, rateHistories);
-                });
+    return Collections.emptyList();
+  }
+
+  private void refreshConsumerMaxRate(String consumerId) {
+    logger.debug("Refreshing max rate of {}", consumerId);
+    String consumerMaxRatePath = registryPaths.consumerMaxRatePath(consumerId);
+    zookeeper
+        .getNodeData(consumerMaxRatePath)
+        .map(consumerMaxRatesDecoder::decode)
+        .ifPresent(
+            maxRates -> {
+              int decodedSize = maxRates.size();
+              maxRates.cleanup(clusterAssignmentCache.getConsumerSubscriptions(consumerId));
+              int cleanedSize = maxRates.size();
+              if (decodedSize > cleanedSize) {
+                logger.debug(
+                    "Refreshed max rates of {} with {} subscriptions ({} stale entries omitted)",
+                    consumerId,
+                    cleanedSize,
+                    decodedSize - cleanedSize);
+              } else {
+                logger.debug(
+                    "Refreshed max rates of {} with {} subscriptions", consumerId, cleanedSize);
+              }
+              consumersMaxRates.put(consumerId, maxRates);
+            });
+  }
+
+  private void refreshConsumerRateHistory(String consumerId) {
+    logger.debug("Refreshing rate history of {}", consumerId);
+    String consumerRateHistoryPath = registryPaths.consumerRateHistoryPath(consumerId);
+    zookeeper
+        .getNodeData(consumerRateHistoryPath)
+        .map(consumerRateHistoriesDecoder::decode)
+        .ifPresent(
+            rateHistories -> {
+              logger.debug(
+                  "Refreshed rate history of {} with {} subscriptions",
+                  consumerId,
+                  rateHistories.size());
+              consumersRateHistories.put(consumerId, rateHistories);
+            });
+  }
+
+  private void removeConsumerRateRootNode(String consumerId) {
+    logger.info("Deleting max rate node of stale consumer {}", consumerId);
+    String path = registryPaths.consumerRateParentRuntimePath(consumerId);
+    try {
+      zookeeper.deleteNodeRecursively(path);
+    } catch (Exception e) {
+      logger.warn("Could not delete stale consumer max rate node {}", path, e);
     }
-
-    private void removeConsumerRateRootNode(String consumerId) {
-        logger.info("Deleting max rate node of stale consumer {}", consumerId);
-        String path = registryPaths.consumerRateParentRuntimePath(consumerId);
-        try {
-            zookeeper.deleteNodeRecursively(path);
-        } catch (Exception e) {
-            logger.warn("Could not delete stale consumer max rate node {}", path, e);
-        }
-    }
-
-    public void onAfterMaxRateCalculation() {
-        persistMaxRatesForAllConsumers();
-    }
-
-    private void persistMaxRatesForAllConsumers() {
-        consumersMaxRates.forEach((consumerId, maxRates) -> {
-            byte[] encoded = consumerMaxRatesEncoder.encode(maxRates);
-            String consumerMaxRatePath = registryPaths.consumerMaxRatePath(consumerId);
-            try {
-                zookeeper.writeOrCreatePersistent(consumerMaxRatePath, encoded);
-            } catch (Exception e) {
-                logger.warn("Could not write max rates for consumer {}", consumerId, e);
-            }
+  }
+
+  public void onAfterMaxRateCalculation() {
+    persistMaxRatesForAllConsumers();
+  }
+
+  private void persistMaxRatesForAllConsumers() {
+    consumersMaxRates.forEach(
+        (consumerId, maxRates) -> {
+          byte[] encoded = consumerMaxRatesEncoder.encode(maxRates);
+          String consumerMaxRatePath = registryPaths.consumerMaxRatePath(consumerId);
+          try {
+            zookeeper.writeOrCreatePersistent(consumerMaxRatePath, encoded);
+          } catch (Exception e) {
+            logger.warn("Could not write max rates for consumer {}", consumerId, e);
+          }
         });
+  }
+
+  public Set<ConsumerRateInfo> ensureCorrectAssignments(
+      SubscriptionName subscriptionName, Set<String> currentConsumers) {
+    Set<ConsumerRateInfo> rateInfos = new HashSet<>();
+    for (String consumerId : currentConsumers) {
+      Optional<MaxRate> maxRate =
+          Optional.ofNullable(consumersMaxRates.get(consumerId))
+              .flatMap(rates -> rates.getMaxRate(subscriptionName));
+      RateHistory rateHistory =
+          Optional.ofNullable(consumersRateHistories.get(consumerId))
+              .map(histories -> histories.getRateHistory(subscriptionName))
+              .orElse(RateHistory.empty());
+      rateInfos.add(new ConsumerRateInfo(consumerId, new RateInfo(maxRate, rateHistory)));
     }
-
-    public Set<ConsumerRateInfo> ensureCorrectAssignments(SubscriptionName subscriptionName, Set<String> currentConsumers) {
-        Set<ConsumerRateInfo> rateInfos = new HashSet<>();
-        for (String consumerId : currentConsumers) {
-            Optional<MaxRate> maxRate = Optional.ofNullable(consumersMaxRates.get(consumerId))
-                    .flatMap(rates -> rates.getMaxRate(subscriptionName));
-            RateHistory rateHistory = Optional.ofNullable(consumersRateHistories.get(consumerId))
-                    .map(histories -> histories.getRateHistory(subscriptionName))
-                    .orElse(RateHistory.empty());
-            rateInfos.add(new ConsumerRateInfo(consumerId, new RateInfo(maxRate, rateHistory)));
-        }
-        return rateInfos;
-    }
-
-    public void update(SubscriptionName subscriptionName, Map<String, MaxRate> newMaxRates) {
-        newMaxRates.forEach((consumerId, maxRate) -> {
-            consumersMaxRates.putIfAbsent(consumerId, new ConsumerMaxRates());
-            consumersMaxRates.get(consumerId).setMaxRate(subscriptionName, maxRate);
+    return rateInfos;
+  }
+
+  public void update(SubscriptionName subscriptionName, Map<String, MaxRate> newMaxRates) {
+    newMaxRates.forEach(
+        (consumerId, maxRate) -> {
+          consumersMaxRates.putIfAbsent(consumerId, new ConsumerMaxRates());
+          consumersMaxRates.get(consumerId).setMaxRate(subscriptionName, maxRate);
         });
+  }
+
+  public Optional<MaxRate> getMaxRate(ConsumerInstance consumer) {
+    Preconditions.checkState(
+        consumer.getConsumerId().equals(consumerId),
+        "Reading max rate is allowed only for current consumer");
+    return currentConsumerMaxRates.getMaxRate(consumer.getSubscription());
+  }
+
+  public RateHistory getRateHistory(ConsumerInstance consumer) {
+    Preconditions.checkState(
+        consumer.getConsumerId().equals(consumerId),
+        "Reading rate history is allowed only for current consumer");
+    return currentConsumerRateHistories.getRateHistory(consumer.getSubscription());
+  }
+
+  public void writeRateHistory(ConsumerInstance consumer, RateHistory rateHistory) {
+    Preconditions.checkState(
+        consumer.getConsumerId().equals(consumerId),
+        "Saving rate history is allowed only for current consumer");
+    currentConsumerRateHistories.setRateHistory(consumer.getSubscription(), rateHistory);
+  }
+
+  public void onAfterWriteRateHistories() {
+    Set<SubscriptionName> subscriptions = consumerAssignmentCache.getConsumerSubscriptions();
+    currentConsumerRateHistories.cleanup(subscriptions);
+    byte[] encoded = consumerRateHistoriesEncoder.encode(currentConsumerRateHistories);
+    try {
+      zookeeper.writeOrCreatePersistent(registryPaths.currentConsumerRateHistoryPath(), encoded);
+    } catch (Exception e) {
+      logger.error("An error while saving consumers rate histories");
     }
+  }
 
-    public Optional<MaxRate> getMaxRate(ConsumerInstance consumer) {
-        Preconditions.checkState(consumer.getConsumerId().equals(consumerId), "Reading max rate is allowed only for current consumer");
-        return currentConsumerMaxRates.getMaxRate(consumer.getSubscription());
-    }
-
-    public RateHistory getRateHistory(ConsumerInstance consumer) {
-        Preconditions.checkState(consumer.getConsumerId().equals(consumerId), "Reading rate history is allowed only for current consumer");
-        return currentConsumerRateHistories.getRateHistory(consumer.getSubscription());
-    }
-
-    public void writeRateHistory(ConsumerInstance consumer, RateHistory rateHistory) {
-        Preconditions.checkState(consumer.getConsumerId().equals(consumerId), "Saving rate history is allowed only for current consumer");
-        currentConsumerRateHistories.setRateHistory(consumer.getSubscription(), rateHistory);
-    }
-
-    public void onAfterWriteRateHistories() {
-        Set<SubscriptionName> subscriptions = consumerAssignmentCache.getConsumerSubscriptions();
-        currentConsumerRateHistories.cleanup(subscriptions);
-        byte[] encoded = consumerRateHistoriesEncoder.encode(currentConsumerRateHistories);
-        try {
-            zookeeper.writeOrCreatePersistent(registryPaths.currentConsumerRateHistoryPath(), encoded);
-        } catch (Exception e) {
-            logger.error("An error while saving consumers rate histories");
-        }
-    }
-
-    @Override
-    public void nodeChanged() {
-        refreshConsumerMaxRates();
-    }
+  @Override
+  public void nodeChanged() {
+    refreshConsumerMaxRates();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistryPaths.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistryPaths.java
index 2999a54f54..f96dc45b6f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistryPaths.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistryPaths.java
@@ -1,42 +1,44 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
-import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
-
 import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.CONSUMERS_RATE_PATH;
 import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.MAX_RATE_HISTORY_PATH;
 import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.MAX_RATE_PATH;
 
+import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
+
 class MaxRateRegistryPaths {
 
-    private static final String RATE_RUNTIME_PATH = "runtime-bin";
+  private static final String RATE_RUNTIME_PATH = "runtime-bin";
 
-    private final ZookeeperPaths zookeeperPaths;
-    private final String clusterName;
-    private final String currentConsumerRateHistoryPath;
+  private final ZookeeperPaths zookeeperPaths;
+  private final String clusterName;
+  private final String currentConsumerRateHistoryPath;
 
-    MaxRateRegistryPaths(ZookeeperPaths zookeeperPaths, String currentConsumerId, String clusterName) {
-        this.zookeeperPaths = zookeeperPaths;
-        this.clusterName = clusterName;
-        this.currentConsumerRateHistoryPath = consumerRateHistoryPath(currentConsumerId);
-    }
+  MaxRateRegistryPaths(
+      ZookeeperPaths zookeeperPaths, String currentConsumerId, String clusterName) {
+    this.zookeeperPaths = zookeeperPaths;
+    this.clusterName = clusterName;
+    this.currentConsumerRateHistoryPath = consumerRateHistoryPath(currentConsumerId);
+  }
 
-    String consumerMaxRatePath(String consumerId) {
-        return zookeeperPaths.join(consumerRateParentRuntimePath(consumerId), MAX_RATE_PATH);
-    }
+  String consumerMaxRatePath(String consumerId) {
+    return zookeeperPaths.join(consumerRateParentRuntimePath(consumerId), MAX_RATE_PATH);
+  }
 
-    String consumerRateHistoryPath(String consumerId) {
-        return zookeeperPaths.join(consumerRateParentRuntimePath(consumerId), MAX_RATE_HISTORY_PATH);
-    }
+  String consumerRateHistoryPath(String consumerId) {
+    return zookeeperPaths.join(consumerRateParentRuntimePath(consumerId), MAX_RATE_HISTORY_PATH);
+  }
 
-    String consumerRateParentRuntimePath(String consumerId) {
-        return zookeeperPaths.join(consumersRateCurrentClusterRuntimeBinaryPath(), consumerId);
-    }
+  String consumerRateParentRuntimePath(String consumerId) {
+    return zookeeperPaths.join(consumersRateCurrentClusterRuntimeBinaryPath(), consumerId);
+  }
 
-    String consumersRateCurrentClusterRuntimeBinaryPath() {
-        return zookeeperPaths.join(zookeeperPaths.basePath(), CONSUMERS_RATE_PATH, clusterName, RATE_RUNTIME_PATH);
-    }
+  String consumersRateCurrentClusterRuntimeBinaryPath() {
+    return zookeeperPaths.join(
+        zookeeperPaths.basePath(), CONSUMERS_RATE_PATH, clusterName, RATE_RUNTIME_PATH);
+  }
 
-    String currentConsumerRateHistoryPath() {
-        return currentConsumerRateHistoryPath;
-    }
+  String currentConsumerRateHistoryPath() {
+    return currentConsumerRateHistoryPath;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateSupervisor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateSupervisor.java
index 069356e9dd..5966d27651 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateSupervisor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateSupervisor.java
@@ -1,11 +1,6 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry;
-import pl.allegro.tech.hermes.consumers.subscription.cache.SubscriptionsCache;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.ClusterAssignmentCache;
-
 import java.time.Clock;
 import java.time.Duration;
 import java.util.Collections;
@@ -15,79 +10,86 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry;
+import pl.allegro.tech.hermes.consumers.subscription.cache.SubscriptionsCache;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.ClusterAssignmentCache;
 
 public class MaxRateSupervisor implements Runnable {
 
-    private final Set<NegotiatedMaxRateProvider> providers = Collections.newSetFromMap(new ConcurrentHashMap<>());
-    private final Duration selfUpdateInterval;
-    private final ScheduledExecutorService selfUpdateExecutor;
-    private final MaxRateCalculatorJob calculatorJob;
-    private final MaxRateRegistry maxRateRegistry;
-    private ScheduledFuture<?> updateJob;
+  private final Set<NegotiatedMaxRateProvider> providers =
+      Collections.newSetFromMap(new ConcurrentHashMap<>());
+  private final Duration selfUpdateInterval;
+  private final ScheduledExecutorService selfUpdateExecutor;
+  private final MaxRateCalculatorJob calculatorJob;
+  private final MaxRateRegistry maxRateRegistry;
+  private ScheduledFuture<?> updateJob;
 
-    public MaxRateSupervisor(MaxRateParameters maxRateParameters,
-                             ClusterAssignmentCache clusterAssignmentCache,
-                             MaxRateRegistry maxRateRegistry,
-                             ConsumerNodesRegistry consumerNodesRegistry,
-                             SubscriptionsCache subscriptionsCache,
-                             MetricsFacade metrics,
-                             Clock clock) {
-        this.maxRateRegistry = maxRateRegistry;
-        this.selfUpdateInterval = maxRateParameters.getUpdateInterval();
+  public MaxRateSupervisor(
+      MaxRateParameters maxRateParameters,
+      ClusterAssignmentCache clusterAssignmentCache,
+      MaxRateRegistry maxRateRegistry,
+      ConsumerNodesRegistry consumerNodesRegistry,
+      SubscriptionsCache subscriptionsCache,
+      MetricsFacade metrics,
+      Clock clock) {
+    this.maxRateRegistry = maxRateRegistry;
+    this.selfUpdateInterval = maxRateParameters.getUpdateInterval();
 
-        this.selfUpdateExecutor = Executors.newSingleThreadScheduledExecutor(
-                new ThreadFactoryBuilder().setNameFormat("max-rate-provider-%d").build()
-        );
+    this.selfUpdateExecutor =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactoryBuilder().setNameFormat("max-rate-provider-%d").build());
 
-        MaxRateBalancer balancer = new MaxRateBalancer(
-                maxRateParameters.getBusyTolerance(),
-                maxRateParameters.getMinMaxRate(),
-                maxRateParameters.getMinAllowedChangePercent());
+    MaxRateBalancer balancer =
+        new MaxRateBalancer(
+            maxRateParameters.getBusyTolerance(),
+            maxRateParameters.getMinMaxRate(),
+            maxRateParameters.getMinAllowedChangePercent());
 
-        this.calculatorJob = new MaxRateCalculatorJob(
-                maxRateParameters.getBalanceInterval(),
-                clusterAssignmentCache,
-                consumerNodesRegistry,
-                balancer,
-                maxRateRegistry,
-                subscriptionsCache,
-                metrics,
-                clock
-        );
-    }
+    this.calculatorJob =
+        new MaxRateCalculatorJob(
+            maxRateParameters.getBalanceInterval(),
+            clusterAssignmentCache,
+            consumerNodesRegistry,
+            balancer,
+            maxRateRegistry,
+            subscriptionsCache,
+            metrics,
+            clock);
+  }
 
-    public void start() throws Exception {
-        maxRateRegistry.start();
-        calculatorJob.start();
-        updateJob = startSelfUpdate();
-    }
+  public void start() throws Exception {
+    maxRateRegistry.start();
+    calculatorJob.start();
+    updateJob = startSelfUpdate();
+  }
 
-    public void stop() throws Exception {
-        maxRateRegistry.stop();
-        calculatorJob.stop();
-        if (updateJob != null) {
-            updateJob.cancel(false);
-        }
-        selfUpdateExecutor.shutdown();
-        selfUpdateExecutor.awaitTermination(10, TimeUnit.SECONDS);
+  public void stop() throws Exception {
+    maxRateRegistry.stop();
+    calculatorJob.stop();
+    if (updateJob != null) {
+      updateJob.cancel(false);
     }
+    selfUpdateExecutor.shutdown();
+    selfUpdateExecutor.awaitTermination(10, TimeUnit.SECONDS);
+  }
 
-    private ScheduledFuture<?> startSelfUpdate() {
-        return selfUpdateExecutor.scheduleAtFixedRate(
-                this, 0, selfUpdateInterval.toSeconds(), TimeUnit.SECONDS);
-    }
+  private ScheduledFuture<?> startSelfUpdate() {
+    return selfUpdateExecutor.scheduleAtFixedRate(
+        this, 0, selfUpdateInterval.toSeconds(), TimeUnit.SECONDS);
+  }
 
-    @Override
-    public void run() {
-        providers.forEach(NegotiatedMaxRateProvider::tickForHistory);
-        maxRateRegistry.onAfterWriteRateHistories();
-    }
+  @Override
+  public void run() {
+    providers.forEach(NegotiatedMaxRateProvider::tickForHistory);
+    maxRateRegistry.onAfterWriteRateHistories();
+  }
 
-    public void register(NegotiatedMaxRateProvider maxRateProvider) {
-        providers.add(maxRateProvider);
-    }
+  public void register(NegotiatedMaxRateProvider maxRateProvider) {
+    providers.add(maxRateProvider);
+  }
 
-    public void unregister(NegotiatedMaxRateProvider maxRateProvider) {
-        providers.remove(maxRateProvider);
-    }
+  public void unregister(NegotiatedMaxRateProvider maxRateProvider) {
+    providers.remove(maxRateProvider);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/NegotiatedMaxRateProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/NegotiatedMaxRateProvider.java
index 705c2c1e2c..0fef710608 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/NegotiatedMaxRateProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/NegotiatedMaxRateProvider.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -7,91 +8,98 @@
 import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 
-import java.util.Optional;
-
 public class NegotiatedMaxRateProvider implements MaxRateProvider {
 
-    private static final Logger logger = LoggerFactory.getLogger(NegotiatedMaxRateProvider.class);
+  private static final Logger logger = LoggerFactory.getLogger(NegotiatedMaxRateProvider.class);
 
-    private final ConsumerInstance consumer;
-    private final MaxRateRegistry registry;
-    private final MaxRateSupervisor maxRateSupervisor;
-    private final SendCounters sendCounters;
-    private final MetricsFacade metrics;
-    private final HermesCounter fetchFailuresCounter;
-    private final HermesCounter historyUpdateFailuresCounter;
-    private final double minSignificantChange;
-    private final int historyLimit;
-    private volatile double maxRate;
-    private volatile double previousRecordedRate = -1;
+  private final ConsumerInstance consumer;
+  private final MaxRateRegistry registry;
+  private final MaxRateSupervisor maxRateSupervisor;
+  private final SendCounters sendCounters;
+  private final MetricsFacade metrics;
+  private final HermesCounter fetchFailuresCounter;
+  private final HermesCounter historyUpdateFailuresCounter;
+  private final double minSignificantChange;
+  private final int historyLimit;
+  private volatile double maxRate;
+  private volatile double previousRecordedRate = -1;
 
-    NegotiatedMaxRateProvider(String consumerId,
-                              MaxRateRegistry registry,
-                              MaxRateSupervisor maxRateSupervisor,
-                              Subscription subscription,
-                              SendCounters sendCounters,
-                              MetricsFacade metrics,
-                              double initialMaxRate,
-                              double minSignificantChange,
-                              int historyLimit) {
-        this.consumer = new ConsumerInstance(consumerId, subscription.getQualifiedName());
-        this.registry = registry;
-        this.maxRateSupervisor = maxRateSupervisor;
-        this.sendCounters = sendCounters;
-        this.metrics = metrics;
-        this.fetchFailuresCounter = metrics.maxRate().fetchFailuresCounter(subscription.getQualifiedName());
-        this.historyUpdateFailuresCounter = metrics.maxRate().historyUpdateFailuresCounter(subscription.getQualifiedName());
-        this.minSignificantChange = minSignificantChange;
-        this.historyLimit = historyLimit;
-        this.maxRate = initialMaxRate;
-    }
+  NegotiatedMaxRateProvider(
+      String consumerId,
+      MaxRateRegistry registry,
+      MaxRateSupervisor maxRateSupervisor,
+      Subscription subscription,
+      SendCounters sendCounters,
+      MetricsFacade metrics,
+      double initialMaxRate,
+      double minSignificantChange,
+      int historyLimit) {
+    this.consumer = new ConsumerInstance(consumerId, subscription.getQualifiedName());
+    this.registry = registry;
+    this.maxRateSupervisor = maxRateSupervisor;
+    this.sendCounters = sendCounters;
+    this.metrics = metrics;
+    this.fetchFailuresCounter =
+        metrics.maxRate().fetchFailuresCounter(subscription.getQualifiedName());
+    this.historyUpdateFailuresCounter =
+        metrics.maxRate().historyUpdateFailuresCounter(subscription.getQualifiedName());
+    this.minSignificantChange = minSignificantChange;
+    this.historyLimit = historyLimit;
+    this.maxRate = initialMaxRate;
+  }
 
-    @Override
-    public double get() {
-        return maxRate;
-    }
+  @Override
+  public double get() {
+    return maxRate;
+  }
 
-    void tickForHistory() {
-        recordCurrentRate(sendCounters.getRate());
-        fetchCurrentMaxRate().ifPresent(currentMaxRate -> maxRate = currentMaxRate.getMaxRate());
-    }
+  void tickForHistory() {
+    recordCurrentRate(sendCounters.getRate());
+    fetchCurrentMaxRate().ifPresent(currentMaxRate -> maxRate = currentMaxRate.getMaxRate());
+  }
 
-    private void recordCurrentRate(double actualRate) {
-        double usedRate = Math.min(actualRate / Math.max(maxRate, 1), 1.0d);
-        if (shouldRecordHistory(usedRate)) {
-            try {
-                RateHistory rateHistory = registry.getRateHistory(consumer);
-                RateHistory updatedHistory = RateHistory.updatedRates(rateHistory, usedRate, historyLimit);
-                registry.writeRateHistory(consumer, updatedHistory);
-                previousRecordedRate = usedRate;
-            } catch (Exception e) {
-                logger.warn("Encountered problem updating max rate for {}", consumer, e);
-                historyUpdateFailuresCounter.increment();
-            }
-        }
+  private void recordCurrentRate(double actualRate) {
+    double usedRate = Math.min(actualRate / Math.max(maxRate, 1), 1.0d);
+    if (shouldRecordHistory(usedRate)) {
+      try {
+        RateHistory rateHistory = registry.getRateHistory(consumer);
+        RateHistory updatedHistory = RateHistory.updatedRates(rateHistory, usedRate, historyLimit);
+        registry.writeRateHistory(consumer, updatedHistory);
+        previousRecordedRate = usedRate;
+      } catch (Exception e) {
+        logger.warn("Encountered problem updating max rate for {}", consumer, e);
+        historyUpdateFailuresCounter.increment();
+      }
     }
+  }
 
-    private boolean shouldRecordHistory(double usedRate) {
-        return previousRecordedRate < 0 || Math.abs(previousRecordedRate - usedRate) > minSignificantChange;
-    }
+  private boolean shouldRecordHistory(double usedRate) {
+    return previousRecordedRate < 0
+        || Math.abs(previousRecordedRate - usedRate) > minSignificantChange;
+  }
 
-    private Optional<MaxRate> fetchCurrentMaxRate() {
-        try {
-            return registry.getMaxRate(consumer);
-        } catch (Exception e) {
-            logger.warn("Encountered problem fetching max rate for {}", consumer);
-            fetchFailuresCounter.increment();
-            return Optional.empty();
-        }
+  private Optional<MaxRate> fetchCurrentMaxRate() {
+    try {
+      return registry.getMaxRate(consumer);
+    } catch (Exception e) {
+      logger.warn("Encountered problem fetching max rate for {}", consumer);
+      fetchFailuresCounter.increment();
+      return Optional.empty();
     }
+  }
 
-    public void start() {
-        maxRateSupervisor.register(this);
-        metrics.maxRate().registerCalculatedRateGauge(consumer.getSubscription(), this, NegotiatedMaxRateProvider::get);
-        metrics.maxRate().registerActualRateGauge(consumer.getSubscription(), sendCounters, SendCounters::getRate);
-    }
+  public void start() {
+    maxRateSupervisor.register(this);
+    metrics
+        .maxRate()
+        .registerCalculatedRateGauge(
+            consumer.getSubscription(), this, NegotiatedMaxRateProvider::get);
+    metrics
+        .maxRate()
+        .registerActualRateGauge(consumer.getSubscription(), sendCounters, SendCounters::getRate);
+  }
 
-    public void shutdown() {
-        maxRateSupervisor.unregister(this);
-    }
+  public void shutdown() {
+    maxRateSupervisor.unregister(this);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/RateHistory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/RateHistory.java
index 17bc2f68e7..b2a380eecc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/RateHistory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/RateHistory.java
@@ -1,7 +1,6 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
 import com.google.common.base.Preconditions;
-
 import java.beans.ConstructorProperties;
 import java.util.Arrays;
 import java.util.Collections;
@@ -11,54 +10,52 @@
 import java.util.stream.Stream;
 
 public final class RateHistory {
-    private final List<Double> rates;
-
-    @ConstructorProperties({"rates"})
-    public RateHistory(List<Double> rates) {
-        this.rates = rates;
-    }
-
-    static RateHistory updatedRates(RateHistory history, double newRate, int limit) {
-        Preconditions.checkArgument(limit > 0);
-        List<Double> rates = Stream.concat(
-                Stream.of(newRate), history.getRates().stream().limit(limit - 1)).collect(Collectors.toList());
-        return new RateHistory(rates);
-    }
-
-    static RateHistory create(double rate) {
-        return new RateHistory(Arrays.asList(rate));
-    }
-
-    static RateHistory empty() {
-        return new RateHistory(Collections.emptyList());
-    }
-
-    public List<Double> getRates() {
-        return rates;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        RateHistory that = (RateHistory) o;
-        return Objects.equals(rates, that.rates);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(rates);
-    }
-
-    @Override
-    public String toString() {
-        return "RateHistory{"
-                + "rates="
-                + rates
-                + '}';
-    }
+  private final List<Double> rates;
+
+  @ConstructorProperties({"rates"})
+  public RateHistory(List<Double> rates) {
+    this.rates = rates;
+  }
+
+  static RateHistory updatedRates(RateHistory history, double newRate, int limit) {
+    Preconditions.checkArgument(limit > 0);
+    List<Double> rates =
+        Stream.concat(Stream.of(newRate), history.getRates().stream().limit(limit - 1))
+            .collect(Collectors.toList());
+    return new RateHistory(rates);
+  }
+
+  static RateHistory create(double rate) {
+    return new RateHistory(Arrays.asList(rate));
+  }
+
+  static RateHistory empty() {
+    return new RateHistory(Collections.emptyList());
+  }
+
+  public List<Double> getRates() {
+    return rates;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    RateHistory that = (RateHistory) o;
+    return Objects.equals(rates, that.rates);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(rates);
+  }
+
+  @Override
+  public String toString() {
+    return "RateHistory{" + "rates=" + rates + '}';
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/RateInfo.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/RateInfo.java
index 1f9dc87b37..4084df7202 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/RateInfo.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/RateInfo.java
@@ -4,50 +4,47 @@
 
 class RateInfo {
 
-    private static final RateInfo empty = new RateInfo(Optional.empty(), RateHistory.empty());
+  private static final RateInfo empty = new RateInfo(Optional.empty(), RateHistory.empty());
 
-    private final Optional<MaxRate> maxRate;
+  private final Optional<MaxRate> maxRate;
 
-    private final RateHistory rateHistory;
+  private final RateHistory rateHistory;
 
-    RateInfo(Optional<MaxRate> maxRate, RateHistory rateHistory) {
-        this.maxRate = maxRate;
-        this.rateHistory = rateHistory;
-    }
+  RateInfo(Optional<MaxRate> maxRate, RateHistory rateHistory) {
+    this.maxRate = maxRate;
+    this.rateHistory = rateHistory;
+  }
 
-    static RateInfo empty() {
-        return empty;
-    }
+  static RateInfo empty() {
+    return empty;
+  }
 
-    static RateInfo withNoHistory(MaxRate maxRate) {
-        return new RateInfo(Optional.of(maxRate), RateHistory.empty());
-    }
+  static RateInfo withNoHistory(MaxRate maxRate) {
+    return new RateInfo(Optional.of(maxRate), RateHistory.empty());
+  }
 
-    static RateInfo withNoMaxRate(RateHistory rateHistory) {
-        return new RateInfo(Optional.empty(), rateHistory);
-    }
+  static RateInfo withNoMaxRate(RateHistory rateHistory) {
+    return new RateInfo(Optional.empty(), rateHistory);
+  }
 
-    Optional<MaxRate> getMaxRate() {
-        return maxRate;
-    }
+  Optional<MaxRate> getMaxRate() {
+    return maxRate;
+  }
 
-    RateHistory getRateHistory() {
-        return rateHistory;
-    }
+  RateHistory getRateHistory() {
+    return rateHistory;
+  }
 
-    RateInfo copyWithNewMaxRate(MaxRate maxRate) {
-        return new RateInfo(Optional.of(maxRate), this.rateHistory);
-    }
+  RateInfo copyWithNewMaxRate(MaxRate maxRate) {
+    return new RateInfo(Optional.of(maxRate), this.rateHistory);
+  }
 
-    RateInfo copyWithNewRateHistory(RateHistory rateHistory) {
-        return new RateInfo(this.maxRate, rateHistory);
-    }
+  RateInfo copyWithNewRateHistory(RateHistory rateHistory) {
+    return new RateInfo(this.maxRate, rateHistory);
+  }
 
-    @Override
-    public String toString() {
-        return "RateInfo{"
-                + "maxRate=" + maxRate
-                + ", rateHistory=" + rateHistory
-                + '}';
-    }
+  @Override
+  public String toString() {
+    return "RateInfo{" + "maxRate=" + maxRate + ", rateHistory=" + rateHistory + '}';
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/SubscriptionIdMapper.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/SubscriptionIdMapper.java
index efd63ed2b2..388507559a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/SubscriptionIdMapper.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/SubscriptionIdMapper.java
@@ -1,12 +1,11 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
 
-import java.util.Optional;
-
 @FunctionalInterface
 interface SubscriptionIdMapper {
 
-    Optional<SubscriptionId> mapToSubscriptionId(SubscriptionName subscriptionName);
+  Optional<SubscriptionId> mapToSubscriptionId(SubscriptionName subscriptionName);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ZookeeperOperations.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ZookeeperOperations.java
index 7d954066a5..b263c42ec5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ZookeeperOperations.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/ZookeeperOperations.java
@@ -1,69 +1,71 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import java.util.List;
+import java.util.Optional;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
-import java.util.List;
-import java.util.Optional;
-
 class ZookeeperOperations {
 
-    private final CuratorFramework curator;
+  private final CuratorFramework curator;
 
-    ZookeeperOperations(CuratorFramework curator) {
-        this.curator = curator;
-    }
+  ZookeeperOperations(CuratorFramework curator) {
+    this.curator = curator;
+  }
 
-    void writeOrCreatePersistent(String path, byte[] serializedData) throws Exception {
-        try {
-            curator.setData().forPath(path, serializedData);
-        } catch (KeeperException.NoNodeException e) {
-            try {
-                curator.create().creatingParentContainersIfNeeded()
-                        .withMode(CreateMode.PERSISTENT)
-                        .forPath(path, serializedData);
-            } catch (KeeperException.NodeExistsException ex) {
-                // ignore
-            }
-        }
+  void writeOrCreatePersistent(String path, byte[] serializedData) throws Exception {
+    try {
+      curator.setData().forPath(path, serializedData);
+    } catch (KeeperException.NoNodeException e) {
+      try {
+        curator
+            .create()
+            .creatingParentContainersIfNeeded()
+            .withMode(CreateMode.PERSISTENT)
+            .forPath(path, serializedData);
+      } catch (KeeperException.NodeExistsException ex) {
+        // ignore
+      }
     }
+  }
 
-    Optional<byte[]> getNodeData(String path) {
-        try {
-            if (curator.checkExists().forPath(path) != null) {
-                return Optional.of(curator.getData().forPath(path));
-            }
-        } catch (Exception e) {
-            throw new InternalProcessingException(String.format("Could not read node data on path %s", path), e);
-        }
-        return Optional.empty();
+  Optional<byte[]> getNodeData(String path) {
+    try {
+      if (curator.checkExists().forPath(path) != null) {
+        return Optional.of(curator.getData().forPath(path));
+      }
+    } catch (Exception e) {
+      throw new InternalProcessingException(
+          String.format("Could not read node data on path %s", path), e);
     }
+    return Optional.empty();
+  }
 
-    void deleteNodeRecursively(String path) {
-        try {
-            if (curator.checkExists().forPath(path) != null) {
-                curator.delete().deletingChildrenIfNeeded().forPath(path);
-            }
-        } catch (Exception e) {
-            throw new InternalProcessingException("Could not delete node " + path, e);
-        }
+  void deleteNodeRecursively(String path) {
+    try {
+      if (curator.checkExists().forPath(path) != null) {
+        curator.delete().deletingChildrenIfNeeded().forPath(path);
+      }
+    } catch (Exception e) {
+      throw new InternalProcessingException("Could not delete node " + path, e);
     }
+  }
 
-    List<String> getNodeChildren(String path) {
-        try {
-            return curator.getChildren().forPath(path);
-        } catch (Exception e) {
-            throw new InternalProcessingException("Could not get children of node " + path, e);
-        }
+  List<String> getNodeChildren(String path) {
+    try {
+      return curator.getChildren().forPath(path);
+    } catch (Exception e) {
+      throw new InternalProcessingException("Could not get children of node " + path, e);
     }
+  }
 
-    boolean exists(String path) {
-        try {
-            return curator.checkExists().forPath(path) != null;
-        } catch (Exception e) {
-            throw new InternalProcessingException("Unable to check existence of node " + path, e);
-        }
+  boolean exists(String path) {
+    try {
+      return curator.checkExists().forPath(path) != null;
+    } catch (Exception e) {
+      throw new InternalProcessingException("Unable to check existence of node " + path, e);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ConsumerNotInitializedException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ConsumerNotInitializedException.java
index ed7e3561c8..a5219dc1ad 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ConsumerNotInitializedException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ConsumerNotInitializedException.java
@@ -3,7 +3,7 @@
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 public class ConsumerNotInitializedException extends InternalProcessingException {
-    public ConsumerNotInitializedException() {
-        super("Please make sure that you call initialize first.");
-    }
+  public ConsumerNotInitializedException() {
+    super("Please make sure that you call initialize first.");
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/MessageCommitter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/MessageCommitter.java
deleted file mode 100644
index ed1fa97fc4..0000000000
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/MessageCommitter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pl.allegro.tech.hermes.consumers.consumer.receiver;
-
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetsToCommit;
-
-public interface MessageCommitter {
-    void commitOffsets(OffsetsToCommit offsetsToCommit);
-}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/MessageReceiver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/MessageReceiver.java
index 8ba64a8d3f..797539028a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/MessageReceiver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/MessageReceiver.java
@@ -1,22 +1,37 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver;
 
+import java.util.Optional;
+import java.util.Set;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
 
-import java.util.Optional;
-import java.util.Set;
-
 public interface MessageReceiver {
 
-    Optional<Message> next();
-
-    default void stop() {}
-
-    default void update(Subscription newSubscription) {}
-
-    void commit(Set<SubscriptionPartitionOffset> offsets);
-
-    boolean moveOffset(PartitionOffset offset);
+  /**
+   * Retrieves the next available message from the queue.
+   *
+   * <p>Depending on the context, the returned {@link Optional} can contain:
+   *
+   * <ul>
+   *   <li>A {@link Message} that contains a valid message ready to be sent.
+   *   <li>A {@link Message} with the `isFiltered` flag set, indicating that the message has been
+   *       filtered and should be skipped during processing or sending.
+   *   <li>{@code null}, indicating that there are no messages currently available in the queue.
+   * </ul>
+   *
+   * @return an {@link Optional} containing the next {@link Message} if available; an {@link
+   *     Optional} containing a filtered message if it should be skipped; or an empty {@link
+   *     Optional} if there are no messages in the queue.
+   */
+  Optional<Message> next();
+
+  default void stop() {}
+
+  default void update(Subscription newSubscription) {}
+
+  void commit(Set<SubscriptionPartitionOffset> offsets);
+
+  boolean moveOffset(PartitionOffset offset);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ReceiverFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ReceiverFactory.java
index 4077ad22bf..75c379a8c7 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ReceiverFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ReceiverFactory.java
@@ -4,14 +4,16 @@
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecorder;
+import pl.allegro.tech.hermes.consumers.consumer.offset.PendingOffsetsAppender;
 import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimiter;
 
 public interface ReceiverFactory {
 
-    MessageReceiver createMessageReceiver(Topic receivingTopic,
-                                          Subscription subscription,
-                                          ConsumerRateLimiter consumerRateLimiter,
-                                          SubscriptionLoadRecorder subscriptionLoadRecorder,
-                                          MetricsFacade metrics);
-
+  MessageReceiver createMessageReceiver(
+      Topic receivingTopic,
+      Subscription subscription,
+      ConsumerRateLimiter consumerRateLimiter,
+      SubscriptionLoadRecorder subscriptionLoadRecorder,
+      MetricsFacade metrics,
+      PendingOffsetsAppender pendingOffsetsAppender);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/RetryableReceiverError.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/RetryableReceiverError.java
index 56b013ee41..8cd5065d5d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/RetryableReceiverError.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/RetryableReceiverError.java
@@ -3,7 +3,7 @@
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 public class RetryableReceiverError extends InternalProcessingException {
-    public RetryableReceiverError(String message, Throwable throwable) {
-        super(message, throwable);
-    }
+  public RetryableReceiverError(String message, Throwable throwable) {
+    super(message, throwable);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ThrottlingMessageReceiver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ThrottlingMessageReceiver.java
index 41d959780f..7abe865d26 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ThrottlingMessageReceiver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/ThrottlingMessageReceiver.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver;
 
+import java.util.Optional;
+import java.util.Set;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
@@ -10,61 +12,58 @@
 import pl.allegro.tech.hermes.metrics.HermesTimer;
 import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 
-import java.util.Optional;
-import java.util.Set;
-
-
 public class ThrottlingMessageReceiver implements MessageReceiver {
 
-    private final MessageReceiver receiver;
-    private final IdleTimeCalculator idleTimeCalculator;
-    private final HermesTimer idleTimer;
+  private final MessageReceiver receiver;
+  private final IdleTimeCalculator idleTimeCalculator;
+  private final HermesTimer idleTimer;
 
-    public ThrottlingMessageReceiver(MessageReceiver receiver,
-                                     IdleTimeCalculator idleTimeCalculator,
-                                     SubscriptionName subscriptionName,
-                                     MetricsFacade metrics) {
-        this.receiver = receiver;
-        this.idleTimeCalculator = idleTimeCalculator;
-        this.idleTimer = metrics.subscriptions().consumerIdleTimer(subscriptionName);
-    }
+  public ThrottlingMessageReceiver(
+      MessageReceiver receiver,
+      IdleTimeCalculator idleTimeCalculator,
+      SubscriptionName subscriptionName,
+      MetricsFacade metrics) {
+    this.receiver = receiver;
+    this.idleTimeCalculator = idleTimeCalculator;
+    this.idleTimer = metrics.subscriptions().consumerIdleTimer(subscriptionName);
+  }
 
-    @Override
-    public Optional<Message> next() {
-        Optional<Message> next = receiver.next();
-        if (next.isPresent()) {
-            idleTimeCalculator.reset();
-        } else {
-            awaitUntilNextPoll();
-        }
-        return next;
+  @Override
+  public Optional<Message> next() {
+    Optional<Message> next = receiver.next();
+    if (next.isPresent()) {
+      idleTimeCalculator.reset();
+    } else {
+      awaitUntilNextPoll();
     }
+    return next;
+  }
 
-    private void awaitUntilNextPoll() {
-        try (HermesTimerContext ignored = idleTimer.time()) {
-            Thread.sleep(idleTimeCalculator.increaseIdleTime());
-        } catch (InterruptedException ex) {
-            Thread.currentThread().interrupt();
-        }
+  private void awaitUntilNextPoll() {
+    try (HermesTimerContext ignored = idleTimer.time()) {
+      Thread.sleep(idleTimeCalculator.increaseIdleTime());
+    } catch (InterruptedException ex) {
+      Thread.currentThread().interrupt();
     }
+  }
 
-    @Override
-    public void commit(Set<SubscriptionPartitionOffset> offsets) {
-        receiver.commit(offsets);
-    }
+  @Override
+  public void commit(Set<SubscriptionPartitionOffset> offsets) {
+    receiver.commit(offsets);
+  }
 
-    @Override
-    public boolean moveOffset(PartitionOffset offset) {
-        return receiver.moveOffset(offset);
-    }
+  @Override
+  public boolean moveOffset(PartitionOffset offset) {
+    return receiver.moveOffset(offset);
+  }
 
-    @Override
-    public void stop() {
-        receiver.stop();
-    }
+  @Override
+  public void stop() {
+    receiver.stop();
+  }
 
-    @Override
-    public void update(Subscription newSubscription) {
-        this.receiver.update(newSubscription);
-    }
+  @Override
+  public void update(Subscription newSubscription) {
+    this.receiver.update(newSubscription);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/UninitializedMessageReceiver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/UninitializedMessageReceiver.java
index cfb9b4a18a..591a24384d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/UninitializedMessageReceiver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/UninitializedMessageReceiver.java
@@ -1,25 +1,24 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver;
 
+import java.util.Optional;
+import java.util.Set;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
 
-import java.util.Optional;
-import java.util.Set;
-
 public class UninitializedMessageReceiver implements MessageReceiver {
-    @Override
-    public Optional<Message> next() {
-        throw new ConsumerNotInitializedException();
-    }
+  @Override
+  public Optional<Message> next() {
+    throw new ConsumerNotInitializedException();
+  }
 
-    @Override
-    public void commit(Set<SubscriptionPartitionOffset> offsets) {
-        throw new ConsumerNotInitializedException();
-    }
+  @Override
+  public void commit(Set<SubscriptionPartitionOffset> offsets) {
+    throw new ConsumerNotInitializedException();
+  }
 
-    @Override
-    public boolean moveOffset(PartitionOffset offset) {
-        throw new ConsumerNotInitializedException();
-    }
+  @Override
+  public boolean moveOffset(PartitionOffset offset) {
+    throw new ConsumerNotInitializedException();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/BasicMessageContentReader.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/BasicMessageContentReader.java
index 8bd23d7c87..9e41a1041d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/BasicMessageContentReader.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/BasicMessageContentReader.java
@@ -13,43 +13,47 @@
 
 class BasicMessageContentReader implements MessageContentReader {
 
-    private final CompositeMessageContentWrapper compositeMessageContentWrapper;
-    private final KafkaHeaderExtractor kafkaHeaderExtractor;
-    private final Topic topic;
-    private final SchemaExistenceEnsurer schemaExistenceEnsurer;
+  private final CompositeMessageContentWrapper compositeMessageContentWrapper;
+  private final KafkaHeaderExtractor kafkaHeaderExtractor;
+  private final Topic topic;
+  private final SchemaExistenceEnsurer schemaExistenceEnsurer;
 
-    BasicMessageContentReader(CompositeMessageContentWrapper compositeMessageContentWrapper,
-                              KafkaHeaderExtractor kafkaHeaderExtractor,
-                              Topic topic, SchemaExistenceEnsurer schemaExistenceEnsurer) {
-        this.compositeMessageContentWrapper = compositeMessageContentWrapper;
-        this.kafkaHeaderExtractor = kafkaHeaderExtractor;
-        this.topic = topic;
-        this.schemaExistenceEnsurer = schemaExistenceEnsurer;
-    }
+  BasicMessageContentReader(
+      CompositeMessageContentWrapper compositeMessageContentWrapper,
+      KafkaHeaderExtractor kafkaHeaderExtractor,
+      Topic topic,
+      SchemaExistenceEnsurer schemaExistenceEnsurer) {
+    this.compositeMessageContentWrapper = compositeMessageContentWrapper;
+    this.kafkaHeaderExtractor = kafkaHeaderExtractor;
+    this.topic = topic;
+    this.schemaExistenceEnsurer = schemaExistenceEnsurer;
+  }
 
-    @Override
-    public UnwrappedMessageContent read(ConsumerRecord<byte[], byte[]> message, ContentType contentType) {
-        if (contentType == ContentType.AVRO) {
-            Integer schemaVersion = kafkaHeaderExtractor.extractSchemaVersion(message.headers());
-            Integer schemaId = kafkaHeaderExtractor.extractSchemaId(message.headers());
-            ensureExistence(schemaVersion, schemaId);
-            return compositeMessageContentWrapper.unwrapAvro(message.value(), topic, schemaId, schemaVersion);
-        } else if (contentType == ContentType.JSON) {
-            return compositeMessageContentWrapper.unwrapJson(message.value());
-        }
-        throw new UnsupportedContentTypeException(topic);
+  @Override
+  public UnwrappedMessageContent read(
+      ConsumerRecord<byte[], byte[]> message, ContentType contentType) {
+    if (contentType == ContentType.AVRO) {
+      Integer schemaVersion = kafkaHeaderExtractor.extractSchemaVersion(message.headers());
+      Integer schemaId = kafkaHeaderExtractor.extractSchemaId(message.headers());
+      ensureExistence(schemaVersion, schemaId);
+      return compositeMessageContentWrapper.unwrapAvro(
+          message.value(), topic, schemaId, schemaVersion);
+    } else if (contentType == ContentType.JSON) {
+      return compositeMessageContentWrapper.unwrapJson(message.value());
     }
+    throw new UnsupportedContentTypeException(topic);
+  }
 
-    private void ensureExistence(Integer schemaVersion, Integer schemaId) {
-        try {
-            if (schemaVersion != null) {
-                schemaExistenceEnsurer.ensureSchemaExists(topic, SchemaVersion.valueOf(schemaVersion));
-            }
-            if (schemaId != null) {
-                schemaExistenceEnsurer.ensureSchemaExists(topic, SchemaId.valueOf(schemaId));
-            }
-        } catch (SchemaExistenceEnsurer.SchemaNotLoaded ex) {
-            throw new RetryableReceiverError("Requested schema not present yet...", ex);
-        }
+  private void ensureExistence(Integer schemaVersion, Integer schemaId) {
+    try {
+      if (schemaVersion != null) {
+        schemaExistenceEnsurer.ensureSchemaExists(topic, SchemaVersion.valueOf(schemaVersion));
+      }
+      if (schemaId != null) {
+        schemaExistenceEnsurer.ensureSchemaExists(topic, SchemaId.valueOf(schemaId));
+      }
+    } catch (SchemaExistenceEnsurer.SchemaNotLoaded ex) {
+      throw new RetryableReceiverError("Requested schema not present yet...", ex);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/BasicMessageContentReaderFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/BasicMessageContentReaderFactory.java
index ff2e996501..708da15eb1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/BasicMessageContentReaderFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/BasicMessageContentReaderFactory.java
@@ -7,20 +7,23 @@
 
 public class BasicMessageContentReaderFactory implements MessageContentReaderFactory {
 
-    private final CompositeMessageContentWrapper compositeMessageContentWrapper;
-    private final KafkaHeaderExtractor kafkaHeaderExtractor;
-    private final SchemaRepository schemaRepository;
+  private final CompositeMessageContentWrapper compositeMessageContentWrapper;
+  private final KafkaHeaderExtractor kafkaHeaderExtractor;
+  private final SchemaRepository schemaRepository;
 
-    public BasicMessageContentReaderFactory(CompositeMessageContentWrapper compositeMessageContentWrapper,
-                                            KafkaHeaderExtractor kafkaHeaderExtractor, SchemaRepository schemaRepository) {
-        this.compositeMessageContentWrapper = compositeMessageContentWrapper;
-        this.kafkaHeaderExtractor = kafkaHeaderExtractor;
-        this.schemaRepository = schemaRepository;
-    }
+  public BasicMessageContentReaderFactory(
+      CompositeMessageContentWrapper compositeMessageContentWrapper,
+      KafkaHeaderExtractor kafkaHeaderExtractor,
+      SchemaRepository schemaRepository) {
+    this.compositeMessageContentWrapper = compositeMessageContentWrapper;
+    this.kafkaHeaderExtractor = kafkaHeaderExtractor;
+    this.schemaRepository = schemaRepository;
+  }
 
-    @Override
-    public MessageContentReader provide(Topic topic) {
-        SchemaExistenceEnsurer schemaExistenceEnsurer = new SchemaExistenceEnsurer(schemaRepository);
-        return new BasicMessageContentReader(compositeMessageContentWrapper, kafkaHeaderExtractor, topic, schemaExistenceEnsurer);
-    }
+  @Override
+  public MessageContentReader provide(Topic topic) {
+    SchemaExistenceEnsurer schemaExistenceEnsurer = new SchemaExistenceEnsurer(schemaRepository);
+    return new BasicMessageContentReader(
+        compositeMessageContentWrapper, kafkaHeaderExtractor, topic, schemaExistenceEnsurer);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/FilteringMessageReceiver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/FilteringMessageReceiver.java
index 430e426002..67ac4f0b6a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/FilteringMessageReceiver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/FilteringMessageReceiver.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver.kafka;
 
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
@@ -10,63 +13,59 @@
 import pl.allegro.tech.hermes.domain.filtering.chain.FilterChainFactory;
 import pl.allegro.tech.hermes.domain.filtering.chain.FilterResult;
 
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-
 public class FilteringMessageReceiver implements MessageReceiver {
-    private final MessageReceiver receiver;
-    private final FilteredMessageHandler filteredMessageHandler;
-    private final FilterChainFactory filterChainFactory;
+  private final MessageReceiver receiver;
+  private final FilteredMessageHandler filteredMessageHandler;
+  private final FilterChainFactory filterChainFactory;
 
-    private volatile FilterChain filterChain;
-    private Subscription subscription;
+  private volatile FilterChain filterChain;
+  private Subscription subscription;
 
-    public FilteringMessageReceiver(MessageReceiver receiver,
-                                    FilteredMessageHandler filteredMessageHandler,
-                                    FilterChainFactory filterChainFactory,
-                                    Subscription subscription) {
-        this.receiver = receiver;
-        this.filteredMessageHandler = filteredMessageHandler;
-        this.filterChainFactory = filterChainFactory;
-        this.subscription = subscription;
-        this.filterChain = filterChainFactory.create(subscription.getFilters());
-    }
+  public FilteringMessageReceiver(
+      MessageReceiver receiver,
+      FilteredMessageHandler filteredMessageHandler,
+      FilterChainFactory filterChainFactory,
+      Subscription subscription) {
+    this.receiver = receiver;
+    this.filteredMessageHandler = filteredMessageHandler;
+    this.filterChainFactory = filterChainFactory;
+    this.subscription = subscription;
+    this.filterChain = filterChainFactory.create(subscription.getFilters());
+  }
 
-    @Override
-    public Optional<Message> next() {
-        return receiver.next().map(message ->
-                allow(message) ? message : null
-        );
-    }
+  @Override
+  public Optional<Message> next() {
+    return receiver.next().map(this::filter);
+  }
 
-    private boolean allow(Message message) {
-        FilterResult result = filterChain.apply(message);
-        filteredMessageHandler.handle(result, message, subscription);
-        return !result.isFiltered();
-    }
+  private Message filter(Message message) {
+    FilterResult result = filterChain.apply(message);
+    filteredMessageHandler.handle(result, message, subscription);
+    message.setFiltered(result.isFiltered());
+    return message;
+  }
 
-    @Override
-    public void stop() {
-        receiver.stop();
-    }
+  @Override
+  public void stop() {
+    receiver.stop();
+  }
 
-    @Override
-    public void update(Subscription newSubscription) {
-        if (!Objects.equals(subscription.getFilters(), newSubscription.getFilters())) {
-            this.filterChain = filterChainFactory.create(newSubscription.getFilters());
-        }
-        this.subscription = newSubscription;
-        this.receiver.update(newSubscription);
+  @Override
+  public void update(Subscription newSubscription) {
+    if (!Objects.equals(subscription.getFilters(), newSubscription.getFilters())) {
+      this.filterChain = filterChainFactory.create(newSubscription.getFilters());
     }
+    this.subscription = newSubscription;
+    this.receiver.update(newSubscription);
+  }
 
-    @Override
-    public void commit(Set<SubscriptionPartitionOffset> offsets) {
-        receiver.commit(offsets);
-    }
+  @Override
+  public void commit(Set<SubscriptionPartitionOffset> offsets) {
+    receiver.commit(offsets);
+  }
 
-    @Override
-    public boolean moveOffset(PartitionOffset offset) {
-        return receiver.moveOffset(offset);
-    }
+  @Override
+  public boolean moveOffset(PartitionOffset offset) {
+    return receiver.moveOffset(offset);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerParameters.java
index ce07cf65f6..0647f43282 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerParameters.java
@@ -5,43 +5,43 @@
 
 public interface KafkaConsumerParameters {
 
-    int getSendBufferBytes();
+  int getSendBufferBytes();
 
-    int getReceiveBufferBytes();
+  int getReceiveBufferBytes();
 
-    int getFetchMinBytes();
+  int getFetchMinBytes();
 
-    Duration getFetchMaxWait();
+  Duration getFetchMaxWait();
 
-    Duration getReconnectBackoff();
+  Duration getReconnectBackoff();
 
-    Duration getRetryBackoff();
+  Duration getRetryBackoff();
 
-    boolean isCheckCrcs();
+  boolean isCheckCrcs();
 
-    Duration getMetricsSampleWindow();
+  Duration getMetricsSampleWindow();
 
-    int getMetricsNumSamples();
+  int getMetricsNumSamples();
 
-    Duration getRequestTimeout();
+  Duration getRequestTimeout();
 
-    Duration getConnectionsMaxIdle();
+  Duration getConnectionsMaxIdle();
 
-    int getMaxPollRecords();
+  int getMaxPollRecords();
 
-    Duration getMaxPollInterval();
+  Duration getMaxPollInterval();
 
-    String getAutoOffsetReset();
+  String getAutoOffsetReset();
 
-    Duration getSessionTimeout();
+  Duration getSessionTimeout();
 
-    Duration getHeartbeatInterval();
+  Duration getHeartbeatInterval();
 
-    Duration getMetadataMaxAge();
+  Duration getMetadataMaxAge();
 
-    int getMaxPartitionFetchMin();
+  int getMaxPartitionFetchMin();
 
-    int getMaxPartitionFetchMax();
+  int getMaxPartitionFetchMax();
 
-    List<PartitionAssignmentStrategy> getPartitionAssignmentStrategies();
+  List<PartitionAssignmentStrategy> getPartitionAssignmentStrategies();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerRecordToMessageConverter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerRecordToMessageConverter.java
index dee25336ec..d70311d68c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerRecordToMessageConverter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerRecordToMessageConverter.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver.kafka;
 
+import java.time.Clock;
+import java.util.Map;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
@@ -8,54 +10,58 @@
 import pl.allegro.tech.hermes.common.message.wrapper.UnwrappedMessageContent;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 
-import java.time.Clock;
-import java.util.Map;
-
 public class KafkaConsumerRecordToMessageConverter {
 
-    private final Topic topic;
-    private volatile Subscription subscription;
-    private final Map<String, KafkaTopic> topics;
-    private final MessageContentReader messageContentReader;
-    private final KafkaHeaderExtractor kafkaHeaderExtractor;
-    private final Clock clock;
-
-    public KafkaConsumerRecordToMessageConverter(Topic topic,
-                                                 Subscription subscription,
-                                                 Map<String, KafkaTopic> topics,
-                                                 MessageContentReader messageContentReader,
-                                                 KafkaHeaderExtractor kafkaHeaderExtractor,
-                                                 Clock clock) {
-        this.topic = topic;
-        this.subscription = subscription;
-        this.topics = topics;
-        this.messageContentReader = messageContentReader;
-        this.kafkaHeaderExtractor = kafkaHeaderExtractor;
-        this.clock = clock;
-    }
-
-    public Message convertToMessage(ConsumerRecord<byte[], byte[]> record, long partitionAssignmentTerm) {
-        KafkaTopic kafkaTopic = topics.get(record.topic());
-        UnwrappedMessageContent unwrappedContent = messageContentReader.read(record, kafkaTopic.contentType());
-        return new Message(
-                kafkaHeaderExtractor.extractMessageId(record.headers()),
-                topic.getQualifiedName(),
-                unwrappedContent.getContent(),
-                kafkaTopic.contentType(),
-                unwrappedContent.getSchema(),
-                record.timestamp(),
-                clock.millis(),
-                new PartitionOffset(kafkaTopic.name(), record.offset(), record.partition()),
-                partitionAssignmentTerm,
-                unwrappedContent.getMessageMetadata().getExternalMetadata(),
-                subscription.getHeaders(),
-                subscription.getName(),
-                subscription.isSubscriptionIdentityHeadersEnabled()
-        );
-    }
-
-    public void update(Subscription newSubscription) {
-        this.subscription = newSubscription;
-    }
+  private final Topic topic;
+  private volatile Subscription subscription;
+  private final Map<String, KafkaTopic> topics;
+  private final MessageContentReader messageContentReader;
+  private final KafkaHeaderExtractor kafkaHeaderExtractor;
+  private final Clock clock;
+
+  public KafkaConsumerRecordToMessageConverter(
+      Topic topic,
+      Subscription subscription,
+      Map<String, KafkaTopic> topics,
+      MessageContentReader messageContentReader,
+      KafkaHeaderExtractor kafkaHeaderExtractor,
+      Clock clock) {
+    this.topic = topic;
+    this.subscription = subscription;
+    this.topics = topics;
+    this.messageContentReader = messageContentReader;
+    this.kafkaHeaderExtractor = kafkaHeaderExtractor;
+    this.clock = clock;
+  }
+
+  public Message convertToMessage(
+      ConsumerRecord<byte[], byte[]> record, long partitionAssignmentTerm) {
+    KafkaTopic kafkaTopic = topics.get(record.topic());
+    UnwrappedMessageContent unwrappedContent =
+        messageContentReader.read(record, kafkaTopic.contentType());
+
+    Map<String, String> externalMetadataFromBody =
+        unwrappedContent.getMessageMetadata().getExternalMetadata();
+    Map<String, String> externalMetadata =
+        kafkaHeaderExtractor.extractExternalMetadata(record.headers(), externalMetadataFromBody);
+
+    return new Message(
+        kafkaHeaderExtractor.extractMessageId(record.headers()),
+        topic.getQualifiedName(),
+        unwrappedContent.getContent(),
+        kafkaTopic.contentType(),
+        unwrappedContent.getSchema(),
+        record.timestamp(),
+        clock.millis(),
+        new PartitionOffset(kafkaTopic.name(), record.offset(), record.partition()),
+        partitionAssignmentTerm,
+        externalMetadata,
+        subscription.getHeaders(),
+        subscription.getName(),
+        subscription.isSubscriptionIdentityHeadersEnabled());
+  }
 
+  public void update(Subscription newSubscription) {
+    this.subscription = newSubscription;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerRecordToMessageConverterFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerRecordToMessageConverterFactory.java
index e748983102..3aa47993e3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerRecordToMessageConverterFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaConsumerRecordToMessageConverterFactory.java
@@ -1,28 +1,34 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver.kafka;
 
+import java.time.Clock;
+import java.util.Map;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
 
-import java.time.Clock;
-import java.util.Map;
-
 public class KafkaConsumerRecordToMessageConverterFactory {
 
-    private final MessageContentReaderFactory messageContentReaderFactory;
-    private final KafkaHeaderExtractor kafkaHeaderExtractor;
-    private final Clock clock;
-
-    public KafkaConsumerRecordToMessageConverterFactory(MessageContentReaderFactory messageContentReaderFactory,
-                                                        KafkaHeaderExtractor kafkaHeaderExtractor, Clock clock) {
-        this.messageContentReaderFactory = messageContentReaderFactory;
-        this.kafkaHeaderExtractor = kafkaHeaderExtractor;
-        this.clock = clock;
-    }
+  private final MessageContentReaderFactory messageContentReaderFactory;
+  private final KafkaHeaderExtractor kafkaHeaderExtractor;
+  private final Clock clock;
 
-    public KafkaConsumerRecordToMessageConverter create(Topic topic, Subscription subscription, Map<String, KafkaTopic> topics) {
-        return new KafkaConsumerRecordToMessageConverter(topic, subscription, topics, messageContentReaderFactory.provide(topic),
-                kafkaHeaderExtractor, clock);
-    }
+  public KafkaConsumerRecordToMessageConverterFactory(
+      MessageContentReaderFactory messageContentReaderFactory,
+      KafkaHeaderExtractor kafkaHeaderExtractor,
+      Clock clock) {
+    this.messageContentReaderFactory = messageContentReaderFactory;
+    this.kafkaHeaderExtractor = kafkaHeaderExtractor;
+    this.clock = clock;
+  }
 
+  public KafkaConsumerRecordToMessageConverter create(
+      Topic topic, Subscription subscription, Map<String, KafkaTopic> topics) {
+    return new KafkaConsumerRecordToMessageConverter(
+        topic,
+        subscription,
+        topics,
+        messageContentReaderFactory.provide(topic),
+        kafkaHeaderExtractor,
+        clock);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaHeaderExtractor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaHeaderExtractor.java
index 9da4fdf43c..36149b0599 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaHeaderExtractor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaHeaderExtractor.java
@@ -1,45 +1,84 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver.kafka;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.StreamSupport.stream;
+
 import com.google.common.primitives.Ints;
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.Headers;
+import pl.allegro.tech.hermes.common.kafka.HTTPHeadersPropagationAsKafkaHeadersProperties;
+import pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker;
 import pl.allegro.tech.hermes.consumers.config.KafkaHeaderNameProperties;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 public class KafkaHeaderExtractor {
 
-    private final KafkaHeaderNameProperties kafkaHeaderNameProperties;
+  private final KafkaHeaderNameProperties kafkaHeaderNameProperties;
+  private final boolean isHTTPheadersPropagationAsKafkaHeadersEnabled;
+  private final String httpHeadersPrefix;
 
-    public KafkaHeaderExtractor(KafkaHeaderNameProperties kafkaHeaderNameProperties) {
+  public KafkaHeaderExtractor(
+      KafkaHeaderNameProperties kafkaHeaderNameProperties,
+      HTTPHeadersPropagationAsKafkaHeadersProperties
+          httpHeadersPropagationAsKafkaHeadersProperties) {
 
-        this.kafkaHeaderNameProperties = kafkaHeaderNameProperties;
-    }
+    this.kafkaHeaderNameProperties = kafkaHeaderNameProperties;
+    this.isHTTPheadersPropagationAsKafkaHeadersEnabled =
+        httpHeadersPropagationAsKafkaHeadersProperties.isEnabled();
+    this.httpHeadersPrefix = httpHeadersPropagationAsKafkaHeadersProperties.getPrefix();
+  }
 
-    public Integer extractSchemaVersion(Headers headers) {
-        Header header = headers.lastHeader(kafkaHeaderNameProperties.getSchemaVersion());
-        return extract(header);
-    }
+  public Integer extractSchemaVersion(Headers headers) {
+    Header header = headers.lastHeader(kafkaHeaderNameProperties.getSchemaVersion());
+    return extract(header);
+  }
 
-    public Integer extractSchemaId(Headers headers) {
-        Header header = headers.lastHeader(kafkaHeaderNameProperties.getSchemaId());
-        return extract(header);
-    }
+  public Integer extractSchemaId(Headers headers) {
+    Header header = headers.lastHeader(kafkaHeaderNameProperties.getSchemaId());
+    return extract(header);
+  }
 
-    private Integer extract(Header header) {
-        if (header != null) {
-            return Ints.fromByteArray(header.value());
-        } else {
-            return null;
-        }
+  private Integer extract(Header header) {
+    if (header != null) {
+      return Ints.fromByteArray(header.value());
+    } else {
+      return null;
     }
+  }
 
-    public String extractMessageId(Headers headers) {
-        Header header = headers.lastHeader(kafkaHeaderNameProperties.getMessageId());
-        if (header == null) {
-            return "";
-        }
-        return new String(header.value(), UTF_8);
+  public String extractMessageId(Headers headers) {
+    Header header = headers.lastHeader(kafkaHeaderNameProperties.getMessageId());
+    if (header == null) {
+      return "";
     }
+    return new String(header.value(), UTF_8);
+  }
 
+  public Map<String, String> extractExternalMetadata(
+      Headers headers, Map<String, String> defaultExternalMetadata) {
+    if (isHTTPheadersPropagationAsKafkaHeadersEnabled) {
+      Map<String, String> httpHeaders =
+          stream(headers.spliterator(), false)
+              .filter(h -> h.key().startsWith(httpHeadersPrefix))
+              .collect(
+                  toMap(
+                      h -> h.key().substring(httpHeadersPrefix.length()),
+                      h -> new String(h.value(), UTF_8)));
+      if (httpHeaders.isEmpty()) {
+        // After completing the migration to the approach with Kafka headers, we should remove this
+        // condition.
+        return defaultExternalMetadata;
+      }
+      // The following is necessary to be compatible with building external metadata based on the
+      // message body.
+      // See: pl.allegro.tech.hermes.common.message.wrapper.AvroMessageContentWrapper.getMetadata
+      Map<String, String> externalMetadata = new HashMap<>(httpHeaders);
+      externalMetadata.put(
+          AvroMetadataMarker.METADATA_MESSAGE_ID_KEY.toString(), extractMessageId(headers));
+      return externalMetadata;
+    }
+    return defaultExternalMetadata;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaMessageReceiverFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaMessageReceiverFactory.java
index e412be416a..e3a6b4a093 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaMessageReceiverFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaMessageReceiverFactory.java
@@ -1,29 +1,5 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver.kafka;
 
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.common.kafka.ConsumerGroupId;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.consumers.CommonConsumerParameters;
-import pl.allegro.tech.hermes.consumers.consumer.filtering.FilteredMessageHandler;
-import pl.allegro.tech.hermes.consumers.consumer.idletime.ExponentiallyGrowingIdleTimeCalculator;
-import pl.allegro.tech.hermes.consumers.consumer.idletime.IdleTimeCalculator;
-import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecorder;
-import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
-import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimiter;
-import pl.allegro.tech.hermes.consumers.consumer.receiver.MessageReceiver;
-import pl.allegro.tech.hermes.consumers.consumer.receiver.ReceiverFactory;
-import pl.allegro.tech.hermes.consumers.consumer.receiver.ThrottlingMessageReceiver;
-import pl.allegro.tech.hermes.domain.filtering.chain.FilterChainFactory;
-import pl.allegro.tech.hermes.tracker.consumers.Trackers;
-
-import java.util.List;
-import java.util.Properties;
-
 import static java.util.stream.Collectors.toList;
 import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
 import static org.apache.kafka.clients.consumer.ConsumerConfig.AUTO_OFFSET_RESET_CONFIG;
@@ -52,170 +28,208 @@
 import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
 import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
 
-public class KafkaMessageReceiverFactory implements ReceiverFactory {
-
-    private final CommonConsumerParameters commonConsumerParameters;
-    private final KafkaParameters kafkaAuthorizationParameters;
-    private final KafkaReceiverParameters consumerReceiverParameters;
-    private final KafkaConsumerParameters kafkaConsumerParameters;
-    private final KafkaConsumerRecordToMessageConverterFactory messageConverterFactory;
-    private final MetricsFacade metricsFacade;
-    private final OffsetQueue offsetQueue;
-    private final KafkaNamesMapper kafkaNamesMapper;
-    private final FilterChainFactory filterChainFactory;
-    private final Trackers trackers;
-    private final ConsumerPartitionAssignmentState consumerPartitionAssignmentState;
-
-    public KafkaMessageReceiverFactory(CommonConsumerParameters commonConsumerParameters,
-                                       KafkaReceiverParameters consumerReceiverParameters,
-                                       KafkaConsumerParameters kafkaConsumerParameters,
-                                       KafkaParameters kafkaAuthorizationParameters,
-                                       KafkaConsumerRecordToMessageConverterFactory messageConverterFactory,
-                                       MetricsFacade metricsFacade,
-                                       OffsetQueue offsetQueue,
-                                       KafkaNamesMapper kafkaNamesMapper,
-                                       FilterChainFactory filterChainFactory,
-                                       Trackers trackers,
-                                       ConsumerPartitionAssignmentState consumerPartitionAssignmentState) {
-        this.commonConsumerParameters = commonConsumerParameters;
-        this.consumerReceiverParameters = consumerReceiverParameters;
-        this.kafkaConsumerParameters = kafkaConsumerParameters;
-        this.kafkaAuthorizationParameters = kafkaAuthorizationParameters;
-        this.messageConverterFactory = messageConverterFactory;
-        this.metricsFacade = metricsFacade;
-        this.offsetQueue = offsetQueue;
-        this.kafkaNamesMapper = kafkaNamesMapper;
-        this.filterChainFactory = filterChainFactory;
-        this.trackers = trackers;
-        this.consumerPartitionAssignmentState = consumerPartitionAssignmentState;
-    }
-
-    @Override
-    public MessageReceiver createMessageReceiver(Topic topic,
-                                                 Subscription subscription,
-                                                 ConsumerRateLimiter consumerRateLimiter,
-                                                 SubscriptionLoadRecorder loadReporter,
-                                                 MetricsFacade metrics) {
-
-        MessageReceiver receiver = createKafkaSingleThreadedMessageReceiver(topic, subscription, loadReporter);
-
-        if (consumerReceiverParameters.isWaitBetweenUnsuccessfulPolls()) {
-            receiver = createThrottlingMessageReceiver(receiver, subscription, metrics);
-        }
-
-        if (consumerReceiverParameters.isFilteringEnabled()) {
-            receiver = createFilteringMessageReceiver(receiver, consumerRateLimiter, subscription, metrics);
-        }
-
-        return receiver;
-    }
-
-    private MessageReceiver createKafkaSingleThreadedMessageReceiver(Topic topic,
-                                                                     Subscription subscription,
-                                                                     SubscriptionLoadRecorder loadReporter) {
-        return new KafkaSingleThreadedMessageReceiver(
-                createKafkaConsumer(topic, subscription),
-                messageConverterFactory,
-                metricsFacade,
-                kafkaNamesMapper,
-                topic,
-                subscription,
-                consumerReceiverParameters.getPoolTimeout(),
-                consumerReceiverParameters.getReadQueueCapacity(),
-                loadReporter,
-                consumerPartitionAssignmentState
-        );
-    }
-
-    private MessageReceiver createThrottlingMessageReceiver(MessageReceiver receiver,
-                                                            Subscription subscription,
-                                                            MetricsFacade metrics) {
-        IdleTimeCalculator idleTimeCalculator = new ExponentiallyGrowingIdleTimeCalculator(
-                consumerReceiverParameters.getInitialIdleTime().toMillis(),
-                consumerReceiverParameters.getMaxIdleTime().toMillis());
-
-        return new ThrottlingMessageReceiver(receiver, idleTimeCalculator, subscription.getQualifiedName(), metrics);
-    }
-
-    private MessageReceiver createFilteringMessageReceiver(MessageReceiver receiver,
-                                                           ConsumerRateLimiter consumerRateLimiter,
-                                                           Subscription subscription,
-                                                           MetricsFacade metrics) {
-        boolean filteringRateLimitEnabled = consumerReceiverParameters.isFilteringRateLimiterEnabled();
-        FilteredMessageHandler filteredMessageHandler = new FilteredMessageHandler(
-                offsetQueue,
-                filteringRateLimitEnabled ? consumerRateLimiter : null,
-                trackers,
-                metrics,
-                subscription.getQualifiedName()
-        );
-        return new FilteringMessageReceiver(receiver, filteredMessageHandler, filterChainFactory, subscription);
-    }
+import java.util.List;
+import java.util.Properties;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.common.kafka.ConsumerGroupId;
+import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
+import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.consumers.CommonConsumerParameters;
+import pl.allegro.tech.hermes.consumers.consumer.filtering.FilteredMessageHandler;
+import pl.allegro.tech.hermes.consumers.consumer.idletime.ExponentiallyGrowingIdleTimeCalculator;
+import pl.allegro.tech.hermes.consumers.consumer.idletime.IdleTimeCalculator;
+import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecorder;
+import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
+import pl.allegro.tech.hermes.consumers.consumer.offset.PendingOffsetsAppender;
+import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimiter;
+import pl.allegro.tech.hermes.consumers.consumer.receiver.MessageReceiver;
+import pl.allegro.tech.hermes.consumers.consumer.receiver.ReceiverFactory;
+import pl.allegro.tech.hermes.consumers.consumer.receiver.ThrottlingMessageReceiver;
+import pl.allegro.tech.hermes.domain.filtering.chain.FilterChainFactory;
+import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-    private KafkaConsumer<byte[], byte[]> createKafkaConsumer(Topic topic, Subscription subscription) {
-        ConsumerGroupId groupId = kafkaNamesMapper.toConsumerGroupId(subscription.getQualifiedName());
-        Properties props = new Properties();
-        props.put(BOOTSTRAP_SERVERS_CONFIG, kafkaAuthorizationParameters.getBrokerList());
-        props.put(CLIENT_ID_CONFIG, consumerReceiverParameters.getClientId() + "_" + groupId.asString());
-        props.put(GROUP_ID_CONFIG, groupId.asString());
-        props.put(ENABLE_AUTO_COMMIT_CONFIG, "false");
-        props.put("key.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
-        props.put("value.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
-
-        addKafkaAuthorizationParameters(props);
-        addKafkaConsumerParameters(props, topic);
-        return new KafkaConsumer<>(props);
-    }
+public class KafkaMessageReceiverFactory implements ReceiverFactory {
 
-    private void addKafkaAuthorizationParameters(Properties props) {
-        if (kafkaAuthorizationParameters.isEnabled()) {
-            props.put(SASL_MECHANISM, kafkaAuthorizationParameters.getMechanism());
-            props.put(SECURITY_PROTOCOL_CONFIG, kafkaAuthorizationParameters.getProtocol());
-            props.put(SASL_JAAS_CONFIG,
-                    "org.apache.kafka.common.security.plain.PlainLoginModule required\n"
-                            + "username=\"" + kafkaAuthorizationParameters.getUsername() + "\"\n"
-                            + "password=\"" + kafkaAuthorizationParameters.getPassword() + "\";"
-            );
-        }
+  private final CommonConsumerParameters commonConsumerParameters;
+  private final KafkaParameters kafkaParameters;
+  private final KafkaReceiverParameters consumerReceiverParameters;
+  private final KafkaConsumerParameters kafkaConsumerParameters;
+  private final KafkaConsumerRecordToMessageConverterFactory messageConverterFactory;
+  private final MetricsFacade metricsFacade;
+  private final KafkaNamesMapper kafkaNamesMapper;
+  private final FilterChainFactory filterChainFactory;
+  private final Trackers trackers;
+  private final ConsumerPartitionAssignmentState consumerPartitionAssignmentState;
+
+  public KafkaMessageReceiverFactory(
+      CommonConsumerParameters commonConsumerParameters,
+      KafkaReceiverParameters consumerReceiverParameters,
+      KafkaConsumerParameters kafkaConsumerParameters,
+      KafkaParameters kafkaParameters,
+      KafkaConsumerRecordToMessageConverterFactory messageConverterFactory,
+      MetricsFacade metricsFacade,
+      KafkaNamesMapper kafkaNamesMapper,
+      FilterChainFactory filterChainFactory,
+      Trackers trackers,
+      ConsumerPartitionAssignmentState consumerPartitionAssignmentState) {
+    this.commonConsumerParameters = commonConsumerParameters;
+    this.consumerReceiverParameters = consumerReceiverParameters;
+    this.kafkaConsumerParameters = kafkaConsumerParameters;
+    this.kafkaParameters = kafkaParameters;
+    this.messageConverterFactory = messageConverterFactory;
+    this.metricsFacade = metricsFacade;
+    this.kafkaNamesMapper = kafkaNamesMapper;
+    this.filterChainFactory = filterChainFactory;
+    this.trackers = trackers;
+    this.consumerPartitionAssignmentState = consumerPartitionAssignmentState;
+  }
+
+  @Override
+  public MessageReceiver createMessageReceiver(
+      Topic topic,
+      Subscription subscription,
+      ConsumerRateLimiter consumerRateLimiter,
+      SubscriptionLoadRecorder loadReporter,
+      MetricsFacade metrics,
+      PendingOffsetsAppender pendingOffsetsAppender) {
+
+    MessageReceiver receiver =
+        createKafkaSingleThreadedMessageReceiver(topic, subscription, loadReporter);
+
+    if (consumerReceiverParameters.isWaitBetweenUnsuccessfulPolls()) {
+      receiver = createThrottlingMessageReceiver(receiver, subscription, metrics);
     }
 
-    private void addKafkaConsumerParameters(Properties props, Topic topic) {
-        props.put(AUTO_OFFSET_RESET_CONFIG, kafkaConsumerParameters.getAutoOffsetReset());
-        props.put(SESSION_TIMEOUT_MS_CONFIG, (int) kafkaConsumerParameters.getSessionTimeout().toMillis());
-        props.put(HEARTBEAT_INTERVAL_MS_CONFIG, (int) kafkaConsumerParameters.getHeartbeatInterval().toMillis());
-        props.put(METADATA_MAX_AGE_CONFIG, (int) kafkaConsumerParameters.getMetadataMaxAge().toMillis());
-        props.put(MAX_PARTITION_FETCH_BYTES_CONFIG, getMaxPartitionFetch(topic));
-        props.put(SEND_BUFFER_CONFIG, kafkaConsumerParameters.getSendBufferBytes());
-        props.put(RECEIVE_BUFFER_CONFIG, kafkaConsumerParameters.getReceiveBufferBytes());
-        props.put(FETCH_MIN_BYTES_CONFIG, kafkaConsumerParameters.getFetchMinBytes());
-        props.put(FETCH_MAX_WAIT_MS_CONFIG, (int) kafkaConsumerParameters.getFetchMaxWait().toMillis());
-        props.put(RECONNECT_BACKOFF_MS_CONFIG, (int) kafkaConsumerParameters.getReconnectBackoff().toMillis());
-        props.put(RETRY_BACKOFF_MS_CONFIG, (int) kafkaConsumerParameters.getRetryBackoff().toMillis());
-        props.put(CHECK_CRCS_CONFIG, kafkaConsumerParameters.isCheckCrcs());
-        props.put(METRICS_SAMPLE_WINDOW_MS_CONFIG, (int) kafkaConsumerParameters.getMetricsSampleWindow().toMillis());
-        props.put(METRICS_NUM_SAMPLES_CONFIG, kafkaConsumerParameters.getMetricsNumSamples());
-        props.put(REQUEST_TIMEOUT_MS_CONFIG, (int) kafkaConsumerParameters.getRequestTimeout().toMillis());
-        props.put(CONNECTIONS_MAX_IDLE_MS_CONFIG, (int) kafkaConsumerParameters.getConnectionsMaxIdle().toMillis());
-        props.put(MAX_POLL_RECORDS_CONFIG, kafkaConsumerParameters.getMaxPollRecords());
-        props.put(MAX_POLL_INTERVAL_MS_CONFIG, (int) kafkaConsumerParameters.getMaxPollInterval().toMillis());
-        props.put(PARTITION_ASSIGNMENT_STRATEGY_CONFIG, getPartitionAssignmentStrategies());
+    if (consumerReceiverParameters.isFilteringEnabled()) {
+      receiver =
+          createFilteringMessageReceiver(
+              receiver, consumerRateLimiter, subscription, metrics, pendingOffsetsAppender);
     }
 
-    private int getMaxPartitionFetch(Topic topic) {
-        if (commonConsumerParameters.isUseTopicMessageSizeEnabled()) {
-            int topicMessageSize = topic.getMaxMessageSize();
-            int min = kafkaConsumerParameters.getMaxPartitionFetchMin();
-            int max = kafkaConsumerParameters.getMaxPartitionFetchMax();
-            return Math.max(Math.min(topicMessageSize, max), min);
-        } else {
-            return kafkaConsumerParameters.getMaxPartitionFetchMax();
-        }
+    return receiver;
+  }
+
+  private MessageReceiver createKafkaSingleThreadedMessageReceiver(
+      Topic topic, Subscription subscription, SubscriptionLoadRecorder loadReporter) {
+    return new KafkaSingleThreadedMessageReceiver(
+        createKafkaConsumer(topic, subscription),
+        messageConverterFactory,
+        metricsFacade,
+        kafkaNamesMapper,
+        topic,
+        subscription,
+        consumerReceiverParameters.getPoolTimeout(),
+        consumerReceiverParameters.getReadQueueCapacity(),
+        loadReporter,
+        consumerPartitionAssignmentState);
+  }
+
+  private MessageReceiver createThrottlingMessageReceiver(
+      MessageReceiver receiver, Subscription subscription, MetricsFacade metrics) {
+    IdleTimeCalculator idleTimeCalculator =
+        new ExponentiallyGrowingIdleTimeCalculator(
+            consumerReceiverParameters.getInitialIdleTime().toMillis(),
+            consumerReceiverParameters.getMaxIdleTime().toMillis());
+
+    return new ThrottlingMessageReceiver(
+        receiver, idleTimeCalculator, subscription.getQualifiedName(), metrics);
+  }
+
+  private MessageReceiver createFilteringMessageReceiver(
+      MessageReceiver receiver,
+      ConsumerRateLimiter consumerRateLimiter,
+      Subscription subscription,
+      MetricsFacade metrics,
+      PendingOffsetsAppender pendingOffsetsAppender) {
+    boolean filteringRateLimitEnabled = consumerReceiverParameters.isFilteringRateLimiterEnabled();
+    FilteredMessageHandler filteredMessageHandler =
+        new FilteredMessageHandler(
+            filteringRateLimitEnabled ? consumerRateLimiter : null,
+            pendingOffsetsAppender,
+            trackers,
+            metrics,
+            subscription.getQualifiedName());
+    return new FilteringMessageReceiver(
+        receiver, filteredMessageHandler, filterChainFactory, subscription);
+  }
+
+  private KafkaConsumer<byte[], byte[]> createKafkaConsumer(
+      Topic topic, Subscription subscription) {
+    ConsumerGroupId groupId = kafkaNamesMapper.toConsumerGroupId(subscription.getQualifiedName());
+    Properties props = new Properties();
+    props.put(BOOTSTRAP_SERVERS_CONFIG, kafkaParameters.getBrokerList());
+    props.put(
+        CLIENT_ID_CONFIG, consumerReceiverParameters.getClientId() + "_" + groupId.asString());
+    props.put(GROUP_ID_CONFIG, groupId.asString());
+    props.put(ENABLE_AUTO_COMMIT_CONFIG, "false");
+    props.put("key.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
+    props.put("value.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
+
+    addKafkaAuthorizationParameters(props);
+    addKafkaConsumerParameters(props, topic);
+    return new KafkaConsumer<>(props);
+  }
+
+  private void addKafkaAuthorizationParameters(Properties props) {
+    if (kafkaParameters.isAuthenticationEnabled()) {
+      props.put(SASL_MECHANISM, kafkaParameters.getAuthenticationMechanism());
+      props.put(SECURITY_PROTOCOL_CONFIG, kafkaParameters.getAuthenticationProtocol());
+      props.put(SASL_JAAS_CONFIG, kafkaParameters.getJaasConfig());
     }
-
-    private List<String> getPartitionAssignmentStrategies() {
-        return kafkaConsumerParameters.getPartitionAssignmentStrategies().stream()
-                .map(PartitionAssignmentStrategy::getAssignorClass)
-                .map(Class::getName)
-                .collect(toList());
+  }
+
+  private void addKafkaConsumerParameters(Properties props, Topic topic) {
+    props.put(AUTO_OFFSET_RESET_CONFIG, kafkaConsumerParameters.getAutoOffsetReset());
+    props.put(
+        SESSION_TIMEOUT_MS_CONFIG, (int) kafkaConsumerParameters.getSessionTimeout().toMillis());
+    props.put(
+        HEARTBEAT_INTERVAL_MS_CONFIG,
+        (int) kafkaConsumerParameters.getHeartbeatInterval().toMillis());
+    props.put(
+        METADATA_MAX_AGE_CONFIG, (int) kafkaConsumerParameters.getMetadataMaxAge().toMillis());
+    props.put(MAX_PARTITION_FETCH_BYTES_CONFIG, getMaxPartitionFetch(topic));
+    props.put(SEND_BUFFER_CONFIG, kafkaConsumerParameters.getSendBufferBytes());
+    props.put(RECEIVE_BUFFER_CONFIG, kafkaConsumerParameters.getReceiveBufferBytes());
+    props.put(FETCH_MIN_BYTES_CONFIG, kafkaConsumerParameters.getFetchMinBytes());
+    props.put(FETCH_MAX_WAIT_MS_CONFIG, (int) kafkaConsumerParameters.getFetchMaxWait().toMillis());
+    props.put(
+        RECONNECT_BACKOFF_MS_CONFIG,
+        (int) kafkaConsumerParameters.getReconnectBackoff().toMillis());
+    props.put(RETRY_BACKOFF_MS_CONFIG, (int) kafkaConsumerParameters.getRetryBackoff().toMillis());
+    props.put(CHECK_CRCS_CONFIG, kafkaConsumerParameters.isCheckCrcs());
+    props.put(
+        METRICS_SAMPLE_WINDOW_MS_CONFIG,
+        (int) kafkaConsumerParameters.getMetricsSampleWindow().toMillis());
+    props.put(METRICS_NUM_SAMPLES_CONFIG, kafkaConsumerParameters.getMetricsNumSamples());
+    props.put(
+        REQUEST_TIMEOUT_MS_CONFIG, (int) kafkaConsumerParameters.getRequestTimeout().toMillis());
+    props.put(
+        CONNECTIONS_MAX_IDLE_MS_CONFIG,
+        (int) kafkaConsumerParameters.getConnectionsMaxIdle().toMillis());
+    props.put(MAX_POLL_RECORDS_CONFIG, kafkaConsumerParameters.getMaxPollRecords());
+    props.put(
+        MAX_POLL_INTERVAL_MS_CONFIG, (int) kafkaConsumerParameters.getMaxPollInterval().toMillis());
+    props.put(PARTITION_ASSIGNMENT_STRATEGY_CONFIG, getPartitionAssignmentStrategies());
+  }
+
+  private int getMaxPartitionFetch(Topic topic) {
+    if (commonConsumerParameters.isUseTopicMessageSizeEnabled()) {
+      int topicMessageSize = topic.getMaxMessageSize();
+      int min = kafkaConsumerParameters.getMaxPartitionFetchMin();
+      int max = kafkaConsumerParameters.getMaxPartitionFetchMax();
+      return Math.max(Math.min(topicMessageSize, max), min);
+    } else {
+      return kafkaConsumerParameters.getMaxPartitionFetchMax();
     }
+  }
+
+  private List<String> getPartitionAssignmentStrategies() {
+    return kafkaConsumerParameters.getPartitionAssignmentStrategies().stream()
+        .map(PartitionAssignmentStrategy::getAssignorClass)
+        .map(Class::getName)
+        .collect(toList());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaReceiverParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaReceiverParameters.java
index 37d246f450..39e6bf90a0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaReceiverParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaReceiverParameters.java
@@ -4,19 +4,19 @@
 
 public interface KafkaReceiverParameters {
 
-    Duration getPoolTimeout();
+  Duration getPoolTimeout();
 
-    int getReadQueueCapacity();
+  int getReadQueueCapacity();
 
-    boolean isWaitBetweenUnsuccessfulPolls();
+  boolean isWaitBetweenUnsuccessfulPolls();
 
-    Duration getInitialIdleTime();
+  Duration getInitialIdleTime();
 
-    Duration getMaxIdleTime();
+  Duration getMaxIdleTime();
 
-    String getClientId();
+  String getClientId();
 
-    boolean isFilteringRateLimiterEnabled();
+  boolean isFilteringRateLimiterEnabled();
 
-    boolean isFilteringEnabled();
+  boolean isFilteringEnabled();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaSingleThreadedMessageReceiver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaSingleThreadedMessageReceiver.java
index cc95936347..e256371bc3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaSingleThreadedMessageReceiver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/KafkaSingleThreadedMessageReceiver.java
@@ -1,6 +1,16 @@
 package pl.allegro.tech.hermes.consumers.consumer.receiver.kafka;
 
 import com.google.common.collect.ImmutableList;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -27,189 +37,193 @@
 import pl.allegro.tech.hermes.consumers.consumer.receiver.RetryableReceiverError;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 
-import java.time.Duration;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 public class KafkaSingleThreadedMessageReceiver implements MessageReceiver {
-    private static final Logger logger = LoggerFactory.getLogger(KafkaSingleThreadedMessageReceiver.class);
-
-    private final KafkaConsumer<byte[], byte[]> consumer;
-    private final KafkaConsumerRecordToMessageConverter messageConverter;
-
-    private final BlockingQueue<ConsumerRecord<byte[], byte[]>> readQueue;
-    private final KafkaConsumerOffsetMover offsetMover;
-
-    private final HermesCounter skippedCounter;
-    private final HermesCounter failuresCounter;
-    private final SubscriptionLoadRecorder loadReporter;
-    private volatile Subscription subscription;
-
-    private final Duration poolTimeout;
-    private final ConsumerPartitionAssignmentState partitionAssignmentState;
-
-    public KafkaSingleThreadedMessageReceiver(KafkaConsumer<byte[], byte[]> consumer,
-                                              KafkaConsumerRecordToMessageConverterFactory messageConverterFactory,
-                                              MetricsFacade metrics,
-                                              KafkaNamesMapper kafkaNamesMapper,
-                                              Topic topic,
-                                              Subscription subscription,
-                                              Duration poolTimeout,
-                                              int readQueueCapacity,
-                                              SubscriptionLoadRecorder loadReporter,
-                                              ConsumerPartitionAssignmentState partitionAssignmentState) {
-        this.skippedCounter = metrics.offsetCommits().skippedCounter();
-        this.failuresCounter = metrics.offsetCommits().failuresCounter();
-        this.subscription = subscription;
-        this.poolTimeout = poolTimeout;
-        this.loadReporter = loadReporter;
-        this.partitionAssignmentState = partitionAssignmentState;
-        this.consumer = consumer;
-        this.readQueue = new ArrayBlockingQueue<>(readQueueCapacity);
-        this.offsetMover = new KafkaConsumerOffsetMover(subscription.getQualifiedName(), consumer);
-        Map<String, KafkaTopic> topics = getKafkaTopics(topic, kafkaNamesMapper).stream()
-                .collect(Collectors.toMap(t -> t.name().asString(), Function.identity()));
-        this.messageConverter = messageConverterFactory.create(topic, subscription, topics);
-        this.consumer.subscribe(topics.keySet(),
-                new OffsetCommitterConsumerRebalanceListener(subscription.getQualifiedName(), partitionAssignmentState));
-    }
-
-    private Collection<KafkaTopic> getKafkaTopics(Topic topic, KafkaNamesMapper kafkaNamesMapper) {
-        KafkaTopics kafkaTopics = kafkaNamesMapper.toKafkaTopics(topic);
-        ImmutableList.Builder<KafkaTopic> topicsBuilder = new ImmutableList.Builder<KafkaTopic>().add(kafkaTopics.getPrimary());
-        kafkaTopics.getSecondary().ifPresent(topicsBuilder::add);
-        return topicsBuilder.build();
-    }
-
-    @Override
-    public Optional<Message> next() {
-        try {
-            supplyReadQueue();
-            return getMessageFromReadQueue();
-        } catch (InterruptException ex) {
-            // Despite that Thread.currentThread().interrupt() is called in InterruptException's constructor
-            // Thread.currentThread().isInterrupted() somehow returns false so we reset it.
-            logger.info("Kafka consumer thread interrupted", ex);
-            Thread.currentThread().interrupt();
-            return Optional.empty();
-        } catch (KafkaException ex) {
-            logger.error("Error while reading message for subscription {}", subscription.getQualifiedName(), ex);
-            return Optional.empty();
-        } catch (Exception ex) {
-            logger.error("Failed to read message for subscription {}, readQueueSize {}",
-                    subscription.getQualifiedName(),
-                    readQueue.size(),
-                    ex);
-            return Optional.empty();
-        }
+  private static final Logger logger =
+      LoggerFactory.getLogger(KafkaSingleThreadedMessageReceiver.class);
+
+  private final KafkaConsumer<byte[], byte[]> consumer;
+  private final KafkaConsumerRecordToMessageConverter messageConverter;
+
+  private final BlockingQueue<ConsumerRecord<byte[], byte[]>> readQueue;
+  private final KafkaConsumerOffsetMover offsetMover;
+
+  private final HermesCounter skippedCounter;
+  private final HermesCounter failuresCounter;
+  private final SubscriptionLoadRecorder loadReporter;
+  private volatile Subscription subscription;
+
+  private final Duration poolTimeout;
+  private final ConsumerPartitionAssignmentState partitionAssignmentState;
+
+  public KafkaSingleThreadedMessageReceiver(
+      KafkaConsumer<byte[], byte[]> consumer,
+      KafkaConsumerRecordToMessageConverterFactory messageConverterFactory,
+      MetricsFacade metrics,
+      KafkaNamesMapper kafkaNamesMapper,
+      Topic topic,
+      Subscription subscription,
+      Duration poolTimeout,
+      int readQueueCapacity,
+      SubscriptionLoadRecorder loadReporter,
+      ConsumerPartitionAssignmentState partitionAssignmentState) {
+    this.skippedCounter = metrics.offsetCommits().skippedCounter();
+    this.failuresCounter = metrics.offsetCommits().failuresCounter();
+    this.subscription = subscription;
+    this.poolTimeout = poolTimeout;
+    this.loadReporter = loadReporter;
+    this.partitionAssignmentState = partitionAssignmentState;
+    this.consumer = consumer;
+    this.readQueue = new ArrayBlockingQueue<>(readQueueCapacity);
+    this.offsetMover = new KafkaConsumerOffsetMover(subscription.getQualifiedName(), consumer);
+    Map<String, KafkaTopic> topics =
+        getKafkaTopics(topic, kafkaNamesMapper).stream()
+            .collect(Collectors.toMap(t -> t.name().asString(), Function.identity()));
+    this.messageConverter = messageConverterFactory.create(topic, subscription, topics);
+    this.consumer.subscribe(
+        topics.keySet(),
+        new OffsetCommitterConsumerRebalanceListener(
+            subscription.getQualifiedName(), partitionAssignmentState));
+  }
+
+  private Collection<KafkaTopic> getKafkaTopics(Topic topic, KafkaNamesMapper kafkaNamesMapper) {
+    KafkaTopics kafkaTopics = kafkaNamesMapper.toKafkaTopics(topic);
+    ImmutableList.Builder<KafkaTopic> topicsBuilder =
+        new ImmutableList.Builder<KafkaTopic>().add(kafkaTopics.getPrimary());
+    kafkaTopics.getSecondary().ifPresent(topicsBuilder::add);
+    return topicsBuilder.build();
+  }
+
+  @Override
+  public Optional<Message> next() {
+    try {
+      supplyReadQueue();
+      return getMessageFromReadQueue();
+    } catch (InterruptException ex) {
+      // Despite that Thread.currentThread().interrupt() is called in InterruptException's
+      // constructor
+      // Thread.currentThread().isInterrupted() somehow returns false so we reset it.
+      logger.info("Kafka consumer thread interrupted", ex);
+      Thread.currentThread().interrupt();
+      return Optional.empty();
+    } catch (KafkaException ex) {
+      logger.error(
+          "Error while reading message for subscription {}", subscription.getQualifiedName(), ex);
+      return Optional.empty();
+    } catch (Exception ex) {
+      logger.error(
+          "Failed to read message for subscription {}, readQueueSize {}",
+          subscription.getQualifiedName(),
+          readQueue.size(),
+          ex);
+      return Optional.empty();
     }
-
-    private void supplyReadQueue() {
-        if (readQueue.isEmpty()) {
-            ConsumerRecords<byte[], byte[]> records = consumer.poll(poolTimeout);
-            try {
-                for (ConsumerRecord<byte[], byte[]> record : records) {
-                    loadReporter.recordSingleOperation();
-                    readQueue.add(record);
-                }
-            } catch (Exception ex) {
-                logger.error("Failed to read message for subscription {}, readQueueSize {}, records {}",
-                        subscription.getQualifiedName(),
-                        readQueue.size(),
-                        records.count(),
-                        ex);
-            }
+  }
+
+  private void supplyReadQueue() {
+    if (readQueue.isEmpty()) {
+      ConsumerRecords<byte[], byte[]> records = consumer.poll(poolTimeout);
+      try {
+        for (ConsumerRecord<byte[], byte[]> record : records) {
+          loadReporter.recordSingleOperation();
+          readQueue.add(record);
         }
+      } catch (Exception ex) {
+        logger.error(
+            "Failed to read message for subscription {}, readQueueSize {}, records {}",
+            subscription.getQualifiedName(),
+            readQueue.size(),
+            records.count(),
+            ex);
+      }
     }
-
-    private Optional<Message> getMessageFromReadQueue() {
-        if (!readQueue.isEmpty()) {
-            ConsumerRecord<byte[], byte[]> record = readQueue.element();
-            try {
-                Message message = convertToMessage(record);
-                readQueue.poll();
-                return Optional.of(message);
-            } catch (RetryableReceiverError ex) {
-                logger.warn("Cannot convert record to message... Operation will be delayed", ex);
-                return Optional.empty();
-            }
-        }
+  }
+
+  private Optional<Message> getMessageFromReadQueue() {
+    if (!readQueue.isEmpty()) {
+      ConsumerRecord<byte[], byte[]> record = readQueue.element();
+      try {
+        Message message = convertToMessage(record);
+        readQueue.poll();
+        return Optional.of(message);
+      } catch (RetryableReceiverError ex) {
+        logger.warn("Cannot convert record to message... Operation will be delayed", ex);
         return Optional.empty();
+      }
     }
-
-    private Message convertToMessage(ConsumerRecord<byte[], byte[]> record) {
-        long currentTerm = partitionAssignmentState.currentTerm(subscription.getQualifiedName());
-        return messageConverter.convertToMessage(record, currentTerm);
+    return Optional.empty();
+  }
+
+  private Message convertToMessage(ConsumerRecord<byte[], byte[]> record) {
+    long currentTerm = partitionAssignmentState.currentTerm(subscription.getQualifiedName());
+    return messageConverter.convertToMessage(record, currentTerm);
+  }
+
+  @Override
+  public void stop() {
+    try {
+      consumer.close();
+    } catch (IllegalStateException ex) {
+      // means it was already closed
+    } catch (InterruptException ex) {
+      // means that the thread was interrupted
+    } catch (KafkaException ex) {
+      logger.warn("KafkaException occurred during closing consumer.", ex);
+    } finally {
+      partitionAssignmentState.revokeAll(subscription.getQualifiedName());
     }
-
-    @Override
-    public void stop() {
-        try {
-            consumer.close();
-        } catch (IllegalStateException ex) {
-            // means it was already closed
-        } catch (InterruptException ex) {
-            // means that the thread was interrupted
-        } catch (KafkaException ex) {
-            logger.warn("KafkaException occurred during closing consumer.", ex);
-        } finally {
-            partitionAssignmentState.revokeAll(subscription.getQualifiedName());
-        }
+  }
+
+  @Override
+  public void update(Subscription newSubscription) {
+    this.subscription = newSubscription;
+    messageConverter.update(subscription);
+  }
+
+  @Override
+  public void commit(Set<SubscriptionPartitionOffset> offsets) {
+    try {
+      consumer.commitSync(createOffset(offsets));
+    } catch (InterruptException ex) {
+      logger.info("Kafka consumer thread interrupted", ex);
+      Thread.currentThread().interrupt();
+    } catch (Exception ex) {
+      logger.error(
+          "Error while committing offset for subscription {}", subscription.getQualifiedName(), ex);
+      failuresCounter.increment();
     }
-
-    @Override
-    public void update(Subscription newSubscription) {
-        this.subscription = newSubscription;
-        messageConverter.update(subscription);
-    }
-
-    @Override
-    public void commit(Set<SubscriptionPartitionOffset> offsets) {
-        try {
-            consumer.commitSync(createOffset(offsets));
-        } catch (InterruptException ex) {
-            logger.info("Kafka consumer thread interrupted", ex);
-            Thread.currentThread().interrupt();
-        } catch (Exception ex) {
-            logger.error("Error while committing offset for subscription {}", subscription.getQualifiedName(), ex);
-            failuresCounter.increment();
+  }
+
+  private Map<TopicPartition, OffsetAndMetadata> createOffset(
+      Set<SubscriptionPartitionOffset> partitionOffsets) {
+    Map<TopicPartition, OffsetAndMetadata> offsetsData = new LinkedHashMap<>();
+    for (SubscriptionPartitionOffset partitionOffset : partitionOffsets) {
+      TopicPartition topicAndPartition =
+          new TopicPartition(
+              partitionOffset.getKafkaTopicName().asString(), partitionOffset.getPartition());
+
+      if (partitionAssignmentState.isAssignedPartitionAtCurrentTerm(
+          partitionOffset.getSubscriptionPartition())) {
+        if (consumer.position(topicAndPartition) >= partitionOffset.getOffset()) {
+          offsetsData.put(topicAndPartition, new OffsetAndMetadata(partitionOffset.getOffset()));
+        } else {
+          skippedCounter.increment();
         }
+      } else {
+        logger.warn(
+            "Consumer is not assigned to partition {} of subscription {} at current term {},"
+                + " ignoring offset {} from term {} to commit",
+            partitionOffset.getPartition(),
+            partitionOffset.getSubscriptionName(),
+            partitionAssignmentState.currentTerm(partitionOffset.getSubscriptionName()),
+            partitionOffset.getOffset(),
+            partitionOffset.getPartitionAssignmentTerm());
+      }
     }
+    return offsetsData;
+  }
 
-    private Map<TopicPartition, OffsetAndMetadata> createOffset(Set<SubscriptionPartitionOffset> partitionOffsets) {
-        Map<TopicPartition, OffsetAndMetadata> offsetsData = new LinkedHashMap<>();
-        for (SubscriptionPartitionOffset partitionOffset : partitionOffsets) {
-            TopicPartition topicAndPartition = new TopicPartition(
-                    partitionOffset.getKafkaTopicName().asString(),
-                    partitionOffset.getPartition());
-
-            if (partitionAssignmentState.isAssignedPartitionAtCurrentTerm(partitionOffset.getSubscriptionPartition())) {
-                if (consumer.position(topicAndPartition) >= partitionOffset.getOffset()) {
-                    offsetsData.put(topicAndPartition, new OffsetAndMetadata(partitionOffset.getOffset()));
-                } else {
-                    skippedCounter.increment();
-                }
-            } else {
-                logger.warn(
-                        "Consumer is not assigned to partition {} of subscription {} at current term {},"
-                                + " ignoring offset {} from term {} to commit",
-                        partitionOffset.getPartition(), partitionOffset.getSubscriptionName(),
-                        partitionAssignmentState.currentTerm(partitionOffset.getSubscriptionName()),
-                        partitionOffset.getOffset(), partitionOffset.getPartitionAssignmentTerm());
-            }
-        }
-        return offsetsData;
-    }
-
-    @Override
-    public boolean moveOffset(PartitionOffset offset) {
-        return offsetMover.move(offset);
-    }
+  @Override
+  public boolean moveOffset(PartitionOffset offset) {
+    return offsetMover.move(offset);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/MessageContentReader.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/MessageContentReader.java
index 1930f97296..dd7a7b3b8a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/MessageContentReader.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/MessageContentReader.java
@@ -5,5 +5,5 @@
 import pl.allegro.tech.hermes.common.message.wrapper.UnwrappedMessageContent;
 
 public interface MessageContentReader {
-    UnwrappedMessageContent read(ConsumerRecord<byte[], byte[]> message, ContentType contentType);
+  UnwrappedMessageContent read(ConsumerRecord<byte[], byte[]> message, ContentType contentType);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/MessageContentReaderFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/MessageContentReaderFactory.java
index bf159d9638..f24c9536c9 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/MessageContentReaderFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/MessageContentReaderFactory.java
@@ -3,5 +3,5 @@
 import pl.allegro.tech.hermes.api.Topic;
 
 public interface MessageContentReaderFactory {
-    MessageContentReader provide(Topic topic);
+  MessageContentReader provide(Topic topic);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/PartitionAssignmentStrategy.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/PartitionAssignmentStrategy.java
index a30e2b2869..462553dba6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/PartitionAssignmentStrategy.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/receiver/kafka/PartitionAssignmentStrategy.java
@@ -6,17 +6,17 @@
 import org.apache.kafka.clients.consumer.StickyAssignor;
 
 public enum PartitionAssignmentStrategy {
-    RANGE(RangeAssignor.class),
-    STICKY(StickyAssignor.class),
-    COOPERATIVE(CooperativeStickyAssignor.class);
+  RANGE(RangeAssignor.class),
+  STICKY(StickyAssignor.class),
+  COOPERATIVE(CooperativeStickyAssignor.class);
 
-    private final Class<? extends ConsumerPartitionAssignor> assignorClass;
+  private final Class<? extends ConsumerPartitionAssignor> assignorClass;
 
-    PartitionAssignmentStrategy(Class<? extends ConsumerPartitionAssignor> assignorClass) {
-        this.assignorClass = assignorClass;
-    }
+  PartitionAssignmentStrategy(Class<? extends ConsumerPartitionAssignor> assignorClass) {
+    this.assignorClass = assignorClass;
+  }
 
-    Class<? extends ConsumerPartitionAssignor> getAssignorClass() {
-        return assignorClass;
-    }
+  Class<? extends ConsumerPartitionAssignor> getAssignorClass() {
+    return assignorClass;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/DefaultErrorHandler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/DefaultErrorHandler.java
index ea7747d698..c842b514e3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/DefaultErrorHandler.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/DefaultErrorHandler.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.consumers.consumer.result;
 
+import static pl.allegro.tech.hermes.api.SentMessageTrace.Builder.undeliveredMessage;
+import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
+
+import java.time.Clock;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -7,80 +13,73 @@
 import pl.allegro.tech.hermes.common.message.undelivered.UndeliveredMessageLog;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.HermesHistogram;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.time.Clock;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static pl.allegro.tech.hermes.api.SentMessageTrace.Builder.undeliveredMessage;
-import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
-import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
-
 public class DefaultErrorHandler implements ErrorHandler {
 
-    private static final Logger logger = LoggerFactory.getLogger(DefaultErrorHandler.class);
-
-    private final OffsetQueue offsetQueue;
-    private final MetricsFacade metrics;
-    private final UndeliveredMessageLog undeliveredMessageLog;
-    private final Clock clock;
-    private final Trackers trackers;
-    private final String cluster;
-    private final SubscriptionName subscriptionName;
-    private final HermesCounter failures;
-    private final HermesCounter timeouts;
-    private final HermesCounter otherErrors;
-    private final HermesCounter discarded;
-    private final HermesHistogram inflightTime;
-    private final HermesCounter throughputInBytes;
-    private final Map<Integer, HermesCounter> httpStatusCodes = new ConcurrentHashMap<>();
-
-
-    public DefaultErrorHandler(OffsetQueue offsetQueue,
-                               MetricsFacade metrics,
-                               UndeliveredMessageLog undeliveredMessageLog,
-                               Clock clock,
-                               Trackers trackers,
-                               String cluster,
-                               SubscriptionName subscriptionName) {
-        this.offsetQueue = offsetQueue;
-        this.metrics = metrics;
-        this.undeliveredMessageLog = undeliveredMessageLog;
-        this.clock = clock;
-        this.trackers = trackers;
-        this.cluster = cluster;
-        this.subscriptionName = subscriptionName;
-        this.failures = metrics.subscriptions().failuresCounter(subscriptionName);
-        this.timeouts = metrics.subscriptions().timeoutsCounter(subscriptionName);
-        this.otherErrors = metrics.subscriptions().otherErrorsCounter(subscriptionName);
-        this.discarded = metrics.subscriptions().discarded(subscriptionName);
-        this.inflightTime = metrics.subscriptions().inflightTimeInMillisHistogram(subscriptionName);
-        this.throughputInBytes = metrics.subscriptions().throughputInBytes(subscriptionName);
-    }
-
-    @Override
-    public void handleDiscarded(Message message, Subscription subscription, MessageSendingResult result) {
-        logResult(message, subscription, result);
-
-        offsetQueue.offerCommittedOffset(subscriptionPartitionOffset(subscription.getQualifiedName(),
-                message.getPartitionOffset(), message.getPartitionAssignmentTerm()));
-
-        discarded.increment();
-        inflightTime.record(System.currentTimeMillis() - message.getReadingTimestamp());
-
-        addToMessageLog(message, subscription, result);
-
-        trackers.get(subscription).logDiscarded(toMessageMetadata(message, subscription), result.getRootCause());
-    }
-
-    private void addToMessageLog(Message message, Subscription subscription, MessageSendingResult result) {
-        result.getLogInfo().forEach(logInfo -> undeliveredMessageLog.add(
-                undeliveredMessage()
+  private static final Logger logger = LoggerFactory.getLogger(DefaultErrorHandler.class);
+
+  private final MetricsFacade metrics;
+  private final UndeliveredMessageLog undeliveredMessageLog;
+  private final Clock clock;
+  private final Trackers trackers;
+  private final String cluster;
+  private final SubscriptionName subscriptionName;
+  private final HermesCounter failures;
+  private final HermesCounter timeouts;
+  private final HermesCounter otherErrors;
+  private final HermesCounter discarded;
+  private final HermesHistogram inflightTime;
+  private final HermesCounter throughputInBytes;
+  private final Map<Integer, HermesCounter> httpStatusCodes = new ConcurrentHashMap<>();
+
+  public DefaultErrorHandler(
+      MetricsFacade metrics,
+      UndeliveredMessageLog undeliveredMessageLog,
+      Clock clock,
+      Trackers trackers,
+      String cluster,
+      SubscriptionName subscriptionName) {
+    this.metrics = metrics;
+    this.undeliveredMessageLog = undeliveredMessageLog;
+    this.clock = clock;
+    this.trackers = trackers;
+    this.cluster = cluster;
+    this.subscriptionName = subscriptionName;
+    this.failures = metrics.subscriptions().failuresCounter(subscriptionName);
+    this.timeouts = metrics.subscriptions().timeoutsCounter(subscriptionName);
+    this.otherErrors = metrics.subscriptions().otherErrorsCounter(subscriptionName);
+    this.discarded = metrics.subscriptions().discarded(subscriptionName);
+    this.inflightTime = metrics.subscriptions().inflightTimeInMillisHistogram(subscriptionName);
+    this.throughputInBytes = metrics.subscriptions().throughputInBytes(subscriptionName);
+  }
+
+  @Override
+  public void handleDiscarded(
+      Message message, Subscription subscription, MessageSendingResult result) {
+    logResult(message, subscription, result);
+
+    discarded.increment();
+    inflightTime.record(System.currentTimeMillis() - message.getReadingTimestamp());
+
+    addToMessageLog(message, subscription, result);
+
+    trackers
+        .get(subscription)
+        .logDiscarded(toMessageMetadata(message, subscription), result.getRootCause());
+  }
+
+  private void addToMessageLog(
+      Message message, Subscription subscription, MessageSendingResult result) {
+    result
+        .getLogInfo()
+        .forEach(
+            logInfo ->
+                undeliveredMessageLog.add(
+                    undeliveredMessage()
                         .withSubscription(subscription.getName())
                         .withTopicName(subscription.getQualifiedTopicName())
                         .withMessage(new String(message.getData()))
@@ -89,41 +88,51 @@ private void addToMessageLog(Message message, Subscription subscription, Message
                         .withPartition(message.getPartition())
                         .withOffset(message.getOffset())
                         .withCluster(cluster)
-                        .build()
-        ));
-    }
-
-    private void logResult(Message message, Subscription subscription, MessageSendingResult result) {
-        if (result.isLoggable()) {
-            result.getLogInfo().forEach(logInfo ->
-                    logger.warn(
-                            "Abnormal delivery failure: "
-                                    + "subscription: {}; cause: {}; endpoint: {}; messageId: {}; partition: {}; offset: {}",
-                            subscription.getQualifiedName(), logInfo.getRootCause(), logInfo.getUrlString(), message.getId(),
-                            message.getPartition(), message.getOffset(), logInfo.getFailure()
-                    )
-            );
-        }
+                        .build()));
+  }
+
+  private void logResult(Message message, Subscription subscription, MessageSendingResult result) {
+    if (result.isLoggable()) {
+      result
+          .getLogInfo()
+          .forEach(
+              logInfo ->
+                  logger.warn(
+                      "Abnormal delivery failure: "
+                          + "subscription: {}; cause: {}; endpoint: {}; messageId: {}; partition: {}; offset: {}",
+                      subscription.getQualifiedName(),
+                      logInfo.getRootCause(),
+                      logInfo.getUrlString(),
+                      message.getId(),
+                      message.getPartition(),
+                      message.getOffset(),
+                      logInfo.getFailure()));
     }
-
-    @Override
-    public void handleFailed(Message message, Subscription subscription, MessageSendingResult result) {
-        failures.increment();
-        if (result.hasHttpAnswer()) {
-            markHttpStatusCode(result.getStatusCode());
-        } else if (result.isTimeout()) {
-            timeouts.increment();
-        } else {
-            otherErrors.increment();
-        }
-        throughputInBytes.increment(message.getSize());
-        trackers.get(subscription).logFailed(toMessageMetadata(message, subscription), result.getRootCause(), result.getHostname());
-    }
-
-    private void markHttpStatusCode(int statusCode) {
-        httpStatusCodes.computeIfAbsent(
-                statusCode,
-                integer -> metrics.subscriptions().httpAnswerCounter(subscriptionName, statusCode)
-        ).increment();
+  }
+
+  @Override
+  public void handleFailed(
+      Message message, Subscription subscription, MessageSendingResult result) {
+    failures.increment();
+    if (result.hasHttpAnswer()) {
+      markHttpStatusCode(result.getStatusCode());
+    } else if (result.isTimeout()) {
+      timeouts.increment();
+    } else {
+      otherErrors.increment();
     }
+    throughputInBytes.increment(message.getSize());
+    trackers
+        .get(subscription)
+        .logFailed(
+            toMessageMetadata(message, subscription), result.getRootCause(), result.getHostname());
+  }
+
+  private void markHttpStatusCode(int statusCode) {
+    httpStatusCodes
+        .computeIfAbsent(
+            statusCode,
+            integer -> metrics.subscriptions().httpAnswerCounter(subscriptionName, statusCode))
+        .increment();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/DefaultSuccessHandler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/DefaultSuccessHandler.java
index acd52b773e..c5e8968abd 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/DefaultSuccessHandler.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/DefaultSuccessHandler.java
@@ -1,64 +1,59 @@
 package pl.allegro.tech.hermes.consumers.consumer.result;
 
+import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 import pl.allegro.tech.hermes.metrics.HermesHistogram;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static pl.allegro.tech.hermes.consumers.consumer.message.MessageConverter.toMessageMetadata;
-import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset;
-
 public class DefaultSuccessHandler implements SuccessHandler {
 
-    private final Trackers trackers;
-    private final SubscriptionName subscriptionName;
-    private final OffsetQueue offsetQueue;
-    private final MetricsFacade metrics;
-    private final Map<Integer, HermesCounter> httpStatusCodes = new ConcurrentHashMap<>();
-    private final HermesCounter throughputInBytes;
-    private final HermesCounter successes;
-    private final HermesHistogram inflightTime;
-
-    public DefaultSuccessHandler(OffsetQueue offsetQueue,
-                                 MetricsFacade metrics,
-                                 Trackers trackers,
-                                 SubscriptionName subscriptionName) {
-        this.offsetQueue = offsetQueue;
-        this.metrics = metrics;
-        this.trackers = trackers;
-        this.subscriptionName = subscriptionName;
-        this.throughputInBytes = metrics.subscriptions().throughputInBytes(subscriptionName);
-        this.successes = metrics.subscriptions().successes(subscriptionName);
-        this.inflightTime = metrics.subscriptions().inflightTimeInMillisHistogram(subscriptionName);
-    }
-
-    @Override
-    public void handleSuccess(Message message, Subscription subscription, MessageSendingResult result) {
-        offsetQueue.offerCommittedOffset(subscriptionPartitionOffset(subscription.getQualifiedName(),
-                message.getPartitionOffset(), message.getPartitionAssignmentTerm()));
-        markSuccess(message, result);
-        trackers.get(subscription).logSent(toMessageMetadata(message, subscription), result.getHostname());
-    }
-
-    private void markSuccess(Message message, MessageSendingResult result) {
-        successes.increment();
-        throughputInBytes.increment(message.getSize());
-        markHttpStatusCode(result.getStatusCode());
-        inflightTime.record(System.currentTimeMillis() - message.getReadingTimestamp());
-    }
-
-    private void markHttpStatusCode(int statusCode) {
-        httpStatusCodes.computeIfAbsent(
-                statusCode,
-                integer -> metrics.subscriptions().httpAnswerCounter(subscriptionName, statusCode)
-        ).increment();
-    }
+  private final Trackers trackers;
+  private final SubscriptionName subscriptionName;
+  private final MetricsFacade metrics;
+  private final Map<Integer, HermesCounter> httpStatusCodes = new ConcurrentHashMap<>();
+  private final HermesCounter throughputInBytes;
+  private final HermesCounter successes;
+  private final HermesHistogram inflightTime;
+
+  public DefaultSuccessHandler(
+      MetricsFacade metrics, Trackers trackers, SubscriptionName subscriptionName) {
+    this.metrics = metrics;
+    this.trackers = trackers;
+    this.subscriptionName = subscriptionName;
+    this.throughputInBytes = metrics.subscriptions().throughputInBytes(subscriptionName);
+    this.successes = metrics.subscriptions().successes(subscriptionName);
+    this.inflightTime = metrics.subscriptions().inflightTimeInMillisHistogram(subscriptionName);
+  }
+
+  @Override
+  public void handleSuccess(
+      Message message, Subscription subscription, MessageSendingResult result) {
+    markSuccess(message, result);
+    trackers
+        .get(subscription)
+        .logSent(toMessageMetadata(message, subscription), result.getHostname());
+  }
+
+  private void markSuccess(Message message, MessageSendingResult result) {
+    successes.increment();
+    throughputInBytes.increment(message.getSize());
+    markHttpStatusCode(result.getStatusCode());
+    inflightTime.record(System.currentTimeMillis() - message.getReadingTimestamp());
+  }
+
+  private void markHttpStatusCode(int statusCode) {
+    httpStatusCodes
+        .computeIfAbsent(
+            statusCode,
+            integer -> metrics.subscriptions().httpAnswerCounter(subscriptionName, statusCode))
+        .increment();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/ErrorHandler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/ErrorHandler.java
index 5dcdf0052d..e571ad86d3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/ErrorHandler.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/ErrorHandler.java
@@ -5,7 +5,7 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 
 public interface ErrorHandler {
-    void handleDiscarded(Message message, Subscription subscription, MessageSendingResult result);
+  void handleDiscarded(Message message, Subscription subscription, MessageSendingResult result);
 
-    void handleFailed(Message message, Subscription subscription, MessageSendingResult result);
+  void handleFailed(Message message, Subscription subscription, MessageSendingResult result);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/SuccessHandler.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/SuccessHandler.java
index d6b9b23e26..350353b31f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/SuccessHandler.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/result/SuccessHandler.java
@@ -5,5 +5,5 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 
 public interface SuccessHandler {
-    void handleSuccess(Message message, Subscription subscription, MessageSendingResult result);
+  void handleSuccess(Message message, Subscription subscription, MessageSendingResult result);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/CompletableFutureAwareMessageSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/CompletableFutureAwareMessageSender.java
index 0e7824b81c..fd4317085b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/CompletableFutureAwareMessageSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/CompletableFutureAwareMessageSender.java
@@ -1,12 +1,11 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-
 import java.util.concurrent.CompletableFuture;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
 
 public interface CompletableFutureAwareMessageSender {
 
-    void send(Message message, CompletableFuture<MessageSendingResult> resultFuture);
+  void send(Message message, CompletableFuture<MessageSendingResult> resultFuture);
 
-    void stop();
+  void stop();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageBatchSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageBatchSender.java
index 33692b1e15..fa8b795c3c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageBatchSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageBatchSender.java
@@ -5,5 +5,9 @@
 import pl.allegro.tech.hermes.consumers.consumer.batch.MessageBatch;
 
 public interface MessageBatchSender {
-    MessageSendingResult send(MessageBatch message, EndpointAddress address, EndpointAddressResolverMetadata metadata, int requestTimeout);
+  MessageSendingResult send(
+      MessageBatch message,
+      EndpointAddress address,
+      EndpointAddressResolverMetadata metadata,
+      int requestTimeout);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageBatchSenderFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageBatchSenderFactory.java
index 293be4a3dc..0ed2a44dc5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageBatchSenderFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageBatchSenderFactory.java
@@ -3,5 +3,5 @@
 import pl.allegro.tech.hermes.api.Subscription;
 
 public interface MessageBatchSenderFactory {
-    MessageBatchSender create(Subscription subscription);
+  MessageBatchSender create(Subscription subscription);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSender.java
index 0f2bde7a4a..f2df875196 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSender.java
@@ -1,12 +1,11 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-
 import java.util.concurrent.CompletableFuture;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
 
 public interface MessageSender {
 
-    CompletableFuture<MessageSendingResult> send(Message message);
+  CompletableFuture<MessageSendingResult> send(Message message);
 
-    void stop();
+  void stop();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSenderFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSenderFactory.java
index 5fdc0acc9f..22e8a49169 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSenderFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSenderFactory.java
@@ -1,59 +1,64 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.common.exception.EndpointProtocolNotSupportedException;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class MessageSenderFactory {
 
-    private final Map<String, ProtocolMessageSenderProvider> protocolProviders = new HashMap<>();
+  private final Map<String, ProtocolMessageSenderProvider> protocolProviders = new HashMap<>();
 
-    public MessageSenderFactory(List<ProtocolMessageSenderProvider> providers) {
-        for (ProtocolMessageSenderProvider provider : providers) {
-            for (String protocol : provider.getSupportedProtocols()) {
-                addSupportedProtocol(protocol, provider);
-            }
-        }
+  public MessageSenderFactory(List<ProtocolMessageSenderProvider> providers) {
+    for (ProtocolMessageSenderProvider provider : providers) {
+      for (String protocol : provider.getSupportedProtocols()) {
+        addSupportedProtocol(protocol, provider);
+      }
     }
+  }
 
-    public MessageSender create(Subscription subscription, ResilientMessageSender resilientMessageSender) {
-        EndpointAddress endpoint = subscription.getEndpoint();
+  public MessageSender create(
+      Subscription subscription, ResilientMessageSender resilientMessageSender) {
+    EndpointAddress endpoint = subscription.getEndpoint();
 
-        ProtocolMessageSenderProvider provider = protocolProviders.get(endpoint.getProtocol());
-        if (provider == null) {
-            throw new EndpointProtocolNotSupportedException(endpoint);
-        }
-        return provider.create(subscription, resilientMessageSender);
+    ProtocolMessageSenderProvider provider = protocolProviders.get(endpoint.getProtocol());
+    if (provider == null) {
+      throw new EndpointProtocolNotSupportedException(endpoint);
     }
+    return provider.create(subscription, resilientMessageSender);
+  }
 
-    private void addSupportedProtocol(String protocol, ProtocolMessageSenderProvider provider) {
-        if (!protocolProviders.containsKey(protocol)) {
-            startProvider(provider);
-            protocolProviders.put(protocol, provider);
-        }
+  private void addSupportedProtocol(String protocol, ProtocolMessageSenderProvider provider) {
+    if (!protocolProviders.containsKey(protocol)) {
+      startProvider(provider);
+      protocolProviders.put(protocol, provider);
     }
+  }
 
-    private void startProvider(ProtocolMessageSenderProvider provider) {
-        try {
-            provider.start();
-        } catch (Exception e) {
-            throw new InternalProcessingException("Something went wrong while starting message sender provider", e);
-        }
+  private void startProvider(ProtocolMessageSenderProvider provider) {
+    try {
+      provider.start();
+    } catch (Exception e) {
+      throw new InternalProcessingException(
+          "Something went wrong while starting message sender provider", e);
     }
+  }
 
-    public void closeProviders() {
-        protocolProviders.values().forEach(provider -> {
-            try {
+  public void closeProviders() {
+    protocolProviders
+        .values()
+        .forEach(
+            provider -> {
+              try {
                 provider.stop();
-            } catch (Exception e) {
-                throw new InternalProcessingException("Something went wrong while stopping message sender provider", e);
-            }
-        });
-    }
+              } catch (Exception e) {
+                throw new InternalProcessingException(
+                    "Something went wrong while stopping message sender provider", e);
+              }
+            });
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResult.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResult.java
index c5458fbaee..45cf4a7496 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResult.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResult.java
@@ -1,92 +1,93 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
-import org.eclipse.jetty.client.api.Result;
-import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.EndpointAddressResolutionException;
+import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
+import static java.util.stream.Collectors.joining;
 
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
-
-import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS;
-import static jakarta.ws.rs.core.Response.Status.OK;
-import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
-import static java.util.stream.Collectors.joining;
+import org.eclipse.jetty.client.Result;
+import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.EndpointAddressResolutionException;
 
 public interface MessageSendingResult {
-    String CAUSE_UNKNOWN = "unknown";
+  String CAUSE_UNKNOWN = "unknown";
 
-    static SingleMessageSendingResult succeededResult() {
-        return new SingleMessageSendingResult(OK.getStatusCode());
-    }
+  static SingleMessageSendingResult succeededResult() {
+    return new SingleMessageSendingResult(OK.getStatusCode());
+  }
 
-    static SingleMessageSendingResult succeededResult(URI requestURI) {
-        return new SingleMessageSendingResult(OK.getStatusCode(), requestURI);
-    }
+  static SingleMessageSendingResult succeededResult(URI requestURI) {
+    return new SingleMessageSendingResult(OK.getStatusCode(), requestURI);
+  }
 
-    static SingleMessageSendingResult failedResult(Throwable cause) {
-        return new SingleMessageSendingResult(cause);
-    }
+  static SingleMessageSendingResult failedResult(Throwable cause) {
+    return new SingleMessageSendingResult(cause);
+  }
 
-    static SingleMessageSendingResult failedResult(EndpointAddressResolutionException cause) {
-        return new SingleMessageSendingResult(cause, cause.isIgnoreInRateCalculation());
-    }
+  static SingleMessageSendingResult failedResult(EndpointAddressResolutionException cause) {
+    return new SingleMessageSendingResult(cause, cause.isIgnoreInRateCalculation());
+  }
 
-    static SingleMessageSendingResult failedResult(int statusCode) {
-        return new SingleMessageSendingResult(statusCode);
-    }
+  static SingleMessageSendingResult failedResult(int statusCode) {
+    return new SingleMessageSendingResult(statusCode);
+  }
 
-    static SingleMessageSendingResult ofStatusCode(int statusCode) {
-        return new SingleMessageSendingResult(statusCode);
-    }
+  static SingleMessageSendingResult ofStatusCode(int statusCode) {
+    return new SingleMessageSendingResult(statusCode);
+  }
 
-    static SingleMessageSendingResult retryAfter(int seconds) {
-        return new SingleMessageSendingResult(SERVICE_UNAVAILABLE.getStatusCode(), TimeUnit.SECONDS.toMillis(seconds));
-    }
+  static SingleMessageSendingResult retryAfter(int seconds) {
+    return new SingleMessageSendingResult(
+        SERVICE_UNAVAILABLE.getStatusCode(), TimeUnit.SECONDS.toMillis(seconds));
+  }
 
-    static SingleMessageSendingResult tooManyRequests(int seconds) {
-        return new SingleMessageSendingResult(TOO_MANY_REQUESTS.code(), TimeUnit.SECONDS.toMillis(seconds));
-    }
+  static SingleMessageSendingResult tooManyRequests(int seconds) {
+    return new SingleMessageSendingResult(
+        TOO_MANY_REQUESTS.code(), TimeUnit.SECONDS.toMillis(seconds));
+  }
 
-    static SingleMessageSendingResult of(Result result) {
-        return new SingleMessageSendingResult(result);
-    }
+  static SingleMessageSendingResult of(Result result) {
+    return new SingleMessageSendingResult(result);
+  }
 
-    static SingleMessageSendingResult ofResultWithUri(Result result, URI uri) {
-        return new SingleMessageSendingResult(result, uri);
-    }
+  static SingleMessageSendingResult ofResultWithUri(Result result, URI uri) {
+    return new SingleMessageSendingResult(result, uri);
+  }
 
-    String getRootCause();
+  String getRootCause();
 
-    int getStatusCode();
+  int getStatusCode();
 
-    boolean isLoggable();
+  boolean isLoggable();
 
-    Optional<Long> getRetryAfterMillis();
+  Optional<Long> getRetryAfterMillis();
 
-    boolean isClientError();
+  boolean isClientError();
 
-    boolean isTimeout();
+  boolean isTimeout();
 
-    boolean succeeded();
+  boolean succeeded();
 
-    boolean ignoreInRateCalculation(boolean retryClientErrors, boolean isOAuthSecuredSubscription);
+  boolean ignoreInRateCalculation(boolean retryClientErrors, boolean isOAuthSecuredSubscription);
 
-    default boolean hasHttpAnswer() {
-        return getStatusCode() != 0;
-    }
+  default boolean hasHttpAnswer() {
+    return getStatusCode() != 0;
+  }
 
-    boolean isRetryLater();
+  boolean isRetryLater();
 
-    List<MessageSendingResultLogInfo> getLogInfo();
+  List<MessageSendingResultLogInfo> getLogInfo();
 
-    List<URI> getSucceededUris(Predicate<MessageSendingResult> filter);
+  List<URI> getSucceededUris(Predicate<MessageSendingResult> filter);
 
-    default String getHostname() {
-        return getLogInfo().stream()
-                .filter(logInfo -> logInfo.getUrl().isPresent())
-                .map(logInfo -> logInfo.getUrl().get().getHost())
-                .collect(joining(","));
-    }
+  default String getHostname() {
+    return getLogInfo().stream()
+        .filter(logInfo -> logInfo.getUrl().isPresent())
+        .map(logInfo -> logInfo.getUrl().get().getHost())
+        .collect(joining(","));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResultLogInfo.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResultLogInfo.java
index 4b8cde9f75..656e1e7544 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResultLogInfo.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResultLogInfo.java
@@ -4,29 +4,29 @@
 import java.util.Optional;
 
 public class MessageSendingResultLogInfo {
-    private final Optional<URI> url;
-    private final String rootCause;
-    private final Throwable failure;
+  private final Optional<URI> url;
+  private final String rootCause;
+  private final Throwable failure;
 
-    public MessageSendingResultLogInfo(Optional<URI> url, Throwable failure, String rootCause) {
-        this.url = url;
-        this.failure = failure;
-        this.rootCause = rootCause;
-    }
+  public MessageSendingResultLogInfo(Optional<URI> url, Throwable failure, String rootCause) {
+    this.url = url;
+    this.failure = failure;
+    this.rootCause = rootCause;
+  }
 
-    public Optional<URI> getUrl() {
-        return url;
-    }
+  public Optional<URI> getUrl() {
+    return url;
+  }
 
-    public String getUrlString() {
-        return url.isPresent() ? url.get().toString() : "";
-    }
+  public String getUrlString() {
+    return url.isPresent() ? url.get().toString() : "";
+  }
 
-    public String getRootCause() {
-        return rootCause;
-    }
+  public String getRootCause() {
+    return rootCause;
+  }
 
-    public Throwable getFailure() {
-        return failure;
-    }
+  public Throwable getFailure() {
+    return failure;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MultiMessageSendingResult.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MultiMessageSendingResult.java
index fed25180c4..9b0e0234a5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MultiMessageSendingResult.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MultiMessageSendingResult.java
@@ -1,8 +1,8 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
+import static java.util.stream.Collectors.joining;
 
 import com.google.common.collect.ImmutableList;
-
 import java.net.URI;
 import java.util.Comparator;
 import java.util.List;
@@ -10,93 +10,106 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.joining;
-
 public class MultiMessageSendingResult implements MessageSendingResult {
 
-    private final List<SingleMessageSendingResult> children;
-
-    public MultiMessageSendingResult(List<SingleMessageSendingResult> children) {
-        this.children = ImmutableList.copyOf(children);
-    }
-
-    @Override
-    public int getStatusCode() {
-        if (succeeded()) {
-            return children.stream().mapToInt(MessageSendingResult::getStatusCode).max().orElse(0);
-        } else {
-            return children.stream().filter(child -> !child.succeeded()).mapToInt(MessageSendingResult::getStatusCode).max().orElse(0);
-        }
-    }
-
-    @Override
-    public boolean isLoggable() {
-        return children.stream().anyMatch(MessageSendingResult::isLoggable);
-    }
-
-    @Override
-    public boolean ignoreInRateCalculation(boolean retryClientErrors, boolean isOAuthSecuredSubscription) {
-        return children.stream().allMatch(r -> r.ignoreInRateCalculation(retryClientErrors, isOAuthSecuredSubscription));
-    }
-
-    @Override
-    public Optional<Long> getRetryAfterMillis() {
-        return children.stream()
-                .map(MessageSendingResult::getRetryAfterMillis)
-                .filter(Optional::isPresent).map(Optional::get)
-                .min(Comparator.naturalOrder());
-    }
-
-    @Override
-    public boolean succeeded() {
-        return !children.isEmpty() && children.stream().allMatch(MessageSendingResult::succeeded);
+  private final List<SingleMessageSendingResult> children;
+
+  public MultiMessageSendingResult(List<SingleMessageSendingResult> children) {
+    this.children = ImmutableList.copyOf(children);
+  }
+
+  @Override
+  public int getStatusCode() {
+    if (succeeded()) {
+      return children.stream().mapToInt(MessageSendingResult::getStatusCode).max().orElse(0);
+    } else {
+      return children.stream()
+          .filter(child -> !child.succeeded())
+          .mapToInt(MessageSendingResult::getStatusCode)
+          .max()
+          .orElse(0);
     }
-
-    @Override
-    public boolean isClientError() {
-        List<SingleMessageSendingResult> failed = children.stream().filter(child -> !child.succeeded()).collect(Collectors.toList());
-        return !failed.isEmpty()
-                && failed.stream().allMatch(MessageSendingResult::isClientError);
-    }
-
-    @Override
-    public boolean isTimeout() {
-        return !children.isEmpty() && children.stream().anyMatch(MessageSendingResult::isTimeout);
-    }
-
-    @Override
-    public boolean isRetryLater() {
-        return children.isEmpty() || children.stream().anyMatch(MessageSendingResult::isRetryLater);
-    }
-
-    @Override
-    public List<MessageSendingResultLogInfo> getLogInfo() {
-            return children.stream().map(child ->
-                    new MessageSendingResultLogInfo(child.getRequestUri(), child.getFailure(), child.getRootCause()))
-                    .collect(Collectors.toList());
-
-    }
-
-    @Override
-    public List<URI> getSucceededUris(Predicate<MessageSendingResult> filter) {
-            return children.stream()
-                    .filter(filter)
-                    .map(SingleMessageSendingResult::getRequestUri)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .collect(Collectors.toList());
-
-    }
-
-    public List<SingleMessageSendingResult> getChildren() {
-        return children;
-    }
-
-    @Override
-    public String getRootCause() {
-        return children.stream()
-                .map(child -> child.getRequestUri().map(Object::toString).orElse("") + ":" + child.getRootCause())
-                .collect(joining(";"));
+  }
+
+  @Override
+  public boolean isLoggable() {
+    return children.stream().anyMatch(MessageSendingResult::isLoggable);
+  }
+
+  @Override
+  public boolean ignoreInRateCalculation(
+      boolean retryClientErrors, boolean isOAuthSecuredSubscription) {
+    return children.stream()
+        .allMatch(r -> r.ignoreInRateCalculation(retryClientErrors, isOAuthSecuredSubscription));
+  }
+
+  @Override
+  public Optional<Long> getRetryAfterMillis() {
+    return children.stream()
+        .map(MessageSendingResult::getRetryAfterMillis)
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .min(Comparator.naturalOrder());
+  }
+
+  @Override
+  public boolean succeeded() {
+    return !children.isEmpty() && children.stream().allMatch(MessageSendingResult::succeeded);
+  }
+
+  @Override
+  public boolean isClientError() {
+    List<SingleMessageSendingResult> failed =
+        children.stream().filter(child -> !child.succeeded()).collect(Collectors.toList());
+    return !failed.isEmpty() && failed.stream().allMatch(MessageSendingResult::isClientError);
+  }
+
+  @Override
+  public boolean isTimeout() {
+    return !children.isEmpty() && children.stream().anyMatch(MessageSendingResult::isTimeout);
+  }
+
+  @Override
+  public boolean isRetryLater() {
+    return children.isEmpty() || children.stream().anyMatch(MessageSendingResult::isRetryLater);
+  }
+
+  @Override
+  public List<MessageSendingResultLogInfo> getLogInfo() {
+    return children.stream()
+        .map(
+            child ->
+                new MessageSendingResultLogInfo(
+                    child.getRequestUri(), child.getFailure(), child.getRootCause()))
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public List<URI> getSucceededUris(Predicate<MessageSendingResult> filter) {
+    return children.stream()
+        .filter(filter)
+        .map(SingleMessageSendingResult::getRequestUri)
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(Collectors.toList());
+  }
+
+  public List<SingleMessageSendingResult> getChildren() {
+    return children;
+  }
+
+  @Override
+  public String getRootCause() {
+    if (children.isEmpty()) {
+      return "Empty children message results";
+    } else {
+      return children.stream()
+          .map(
+              child ->
+                  child.getRequestUri().map(Object::toString).orElse("")
+                      + ":"
+                      + child.getRootCause())
+          .collect(joining(";"));
     }
+  }
 }
-
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/ProtocolMessageSenderProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/ProtocolMessageSenderProvider.java
index 6743bd8272..cd3c4fbd61 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/ProtocolMessageSenderProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/ProtocolMessageSenderProvider.java
@@ -1,17 +1,16 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
+import java.util.Set;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender;
 
-import java.util.Set;
-
 public interface ProtocolMessageSenderProvider {
 
-    MessageSender create(Subscription subscription, ResilientMessageSender resilientMessageSender);
+  MessageSender create(Subscription subscription, ResilientMessageSender resilientMessageSender);
 
-    Set<String> getSupportedProtocols();
+  Set<String> getSupportedProtocols();
 
-    void start() throws Exception;
+  void start() throws Exception;
 
-    void stop() throws Exception;
+  void stop() throws Exception;
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleMessageSendingResult.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleMessageSendingResult.java
index 0690740b76..df8533b2b2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleMessageSendingResult.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleMessageSendingResult.java
@@ -1,13 +1,15 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
+import static io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE;
+import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS;
+import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.Status.Family.CLIENT_ERROR;
+import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
+import static jakarta.ws.rs.core.Response.Status.Family.familyOf;
+
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import jakarta.ws.rs.core.Response;
-import org.eclipse.jetty.client.api.Result;
-import org.eclipse.jetty.http.HttpFields;
-import org.eclipse.jetty.http.HttpHeader;
-import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
-
 import java.net.URI;
 import java.util.Collections;
 import java.util.List;
@@ -15,173 +17,174 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
-
-import static io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE;
-import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS;
-import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
-import static jakarta.ws.rs.core.Response.Status.Family.CLIENT_ERROR;
-import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
-import static jakarta.ws.rs.core.Response.Status.Family.familyOf;
+import org.eclipse.jetty.client.Result;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpHeader;
+import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 public class SingleMessageSendingResult implements MessageSendingResult {
 
-    private Throwable failure;
-    private boolean loggable;
-    private boolean ignoreInRateCalculation = false;
-
-    private Optional<Long> retryAfterMillis = Optional.empty();
-    private Optional<URI> requestUri = Optional.empty();
-    private int statusCode;
-    private Response.Status.Family responseFamily;
-
-    SingleMessageSendingResult(Throwable failure, boolean ignoreInRateCalculation) {
-        this.failure = failure;
-        this.loggable = !isTimeout();
-        this.ignoreInRateCalculation = ignoreInRateCalculation;
-    }
-
-    SingleMessageSendingResult(Throwable failure) {
-        this(failure, false);
-    }
-
-    SingleMessageSendingResult(Result result) {
-        this.failure = result.getFailure();
-
-        if (result.getResponse() != null) {
-            initializeForStatusCode(result.getResponse().getStatus());
-            if (shouldRetryOnStatusCode()) {
-                initializeRetryAfterMillis(result);
-            }
-        }
-
-        this.loggable = !isTimeout() && !hasHttpAnswer();
-        this.requestUri = Optional.ofNullable(result.getRequest().getURI());
-    }
-
-    SingleMessageSendingResult(int statusCode) {
-        initializeForStatusCode(statusCode);
-    }
-
-    SingleMessageSendingResult(int statusCode, URI requestURI) {
-        this(statusCode);
-        this.requestUri = Optional.of(requestURI);
-    }
-
-    SingleMessageSendingResult(int statusCode, long retryAfterMillis) {
-        initializeForStatusCode(statusCode);
-        if (shouldRetryOnStatusCode() && retryAfterMillis >= 0) {
-            this.retryAfterMillis = Optional.of(retryAfterMillis);
+  private Throwable failure;
+  private boolean loggable;
+  private boolean ignoreInRateCalculation = false;
+
+  private Optional<Long> retryAfterMillis = Optional.empty();
+  private Optional<URI> requestUri = Optional.empty();
+  private int statusCode;
+  private Response.Status.Family responseFamily;
+
+  SingleMessageSendingResult(Throwable failure, boolean ignoreInRateCalculation) {
+    this.failure = failure;
+    this.loggable = !isTimeout();
+    this.ignoreInRateCalculation = ignoreInRateCalculation;
+  }
+
+  SingleMessageSendingResult(Throwable failure) {
+    this(failure, false);
+  }
+
+  SingleMessageSendingResult(Result result) {
+    this.failure = result.getFailure();
+
+    if (result.getResponse() != null) {
+      initializeForStatusCode(result.getResponse().getStatus());
+      if (shouldRetryOnStatusCode()) {
+        initializeRetryAfterMillis(result);
+      }
+    }
+
+    this.loggable = !isTimeout() && !hasHttpAnswer();
+    this.requestUri = Optional.ofNullable(result.getRequest().getURI());
+  }
+
+  SingleMessageSendingResult(int statusCode) {
+    initializeForStatusCode(statusCode);
+  }
+
+  SingleMessageSendingResult(int statusCode, URI requestURI) {
+    this(statusCode);
+    this.requestUri = Optional.of(requestURI);
+  }
+
+  SingleMessageSendingResult(int statusCode, long retryAfterMillis) {
+    initializeForStatusCode(statusCode);
+    if (shouldRetryOnStatusCode() && retryAfterMillis >= 0) {
+      this.retryAfterMillis = Optional.of(retryAfterMillis);
+    }
+  }
+
+  public SingleMessageSendingResult(Result result, URI uri) {
+    this(result);
+    this.requestUri = Optional.of(uri);
+  }
+
+  private void initializeForStatusCode(int statusCode) {
+    this.statusCode = statusCode;
+    responseFamily = familyOf(statusCode);
+    if (this.failure == null && !isInFamily(SUCCESSFUL)) {
+      this.failure =
+          new InternalProcessingException("Message sending failed with status code: " + statusCode);
+    }
+  }
+
+  private void initializeRetryAfterMillis(Result result) {
+    HttpFields headers = result.getResponse().getHeaders();
+    if (headers.contains(HttpHeader.RETRY_AFTER)) {
+      try {
+        int seconds = Integer.parseInt(headers.get(HttpHeader.RETRY_AFTER));
+        if (seconds >= 0) {
+          retryAfterMillis = Optional.of(TimeUnit.SECONDS.toMillis(seconds));
         }
-    }
-
-    public SingleMessageSendingResult(Result result, URI uri) {
-        this(result);
-        this.requestUri = Optional.of(uri);
-    }
-
-    private void initializeForStatusCode(int statusCode) {
-        this.statusCode = statusCode;
-        responseFamily = familyOf(statusCode);
-        if (this.failure == null && !isInFamily(SUCCESSFUL)) {
-            this.failure = new InternalProcessingException("Message sending failed with status code: " + statusCode);
-        }
-    }
-
-    private void initializeRetryAfterMillis(Result result) {
-        HttpFields headers = result.getResponse().getHeaders();
-        if (headers.contains(HttpHeader.RETRY_AFTER)) {
-            try {
-                int seconds = Integer.parseInt(headers.get(HttpHeader.RETRY_AFTER));
-                if (seconds >= 0) {
-                    retryAfterMillis = Optional.of(TimeUnit.SECONDS.toMillis(seconds));
-                }
-            } catch (NumberFormatException e) {
-                // retryAfterMillis stays empty
-            }
-        }
-    }
-
-    private boolean isInFamily(Response.Status.Family family) {
-        Preconditions.checkNotNull(family);
-        return family.equals(responseFamily);
-    }
-
-    @Override
-    public boolean isRetryLater() {
-        return shouldRetryOnStatusCode() && retryAfterMillis.isPresent();
-    }
-
-    private boolean shouldRetryOnStatusCode() {
-        return getStatusCode() == SERVICE_UNAVAILABLE.code()
-                || getStatusCode() == TOO_MANY_REQUESTS.code();
-    }
-
-    @Override
-    public boolean succeeded() {
-        return getFailure() == null;
-    }
-
-    Throwable getFailure() {
-        return failure;
-    }
-
-    @Override
-    public String getRootCause() {
-        return failure != null ? Throwables.getRootCause(failure).getMessage() : CAUSE_UNKNOWN;
-    }
-
-    @Override
-    public int getStatusCode() {
-        return statusCode;
-    }
-
-    @Override
-    public boolean isLoggable() {
-        return loggable;
-    }
-
-    @Override
-    public Optional<Long> getRetryAfterMillis() {
-        return retryAfterMillis;
-    }
-
-    public Optional<URI> getRequestUri() {
-        return requestUri;
-    }
-
-    @Override
-    public boolean isClientError() {
-        return isInFamily(CLIENT_ERROR);
-    }
-
-    @Override
-    public boolean ignoreInRateCalculation(boolean retryClientErrors, boolean isOAuthSecuredSubscription) {
-        return isRetryLater()
-                || this.ignoreInRateCalculation
-                || (isClientError() && !retryClientErrors && !(isOAuthSecuredSubscription && isUnauthorized()));
-    }
-
-    private boolean isUnauthorized() {
-        return getStatusCode() == UNAUTHORIZED.code();
-    }
-
-    @Override
-    public boolean isTimeout() {
-        return failure instanceof TimeoutException;
-    }
-
-    @Override
-    public List<MessageSendingResultLogInfo> getLogInfo() {
-        return Collections.singletonList(new MessageSendingResultLogInfo(getRequestUri(), failure, getRootCause()));
-    }
-
-    @Override
-    public List<URI> getSucceededUris(Predicate<MessageSendingResult> filter) {
-        if (filter.test(this) && requestUri.isPresent()) {
-            return Collections.singletonList(getRequestUri().get());
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
+      } catch (NumberFormatException e) {
+        // retryAfterMillis stays empty
+      }
+    }
+  }
+
+  private boolean isInFamily(Response.Status.Family family) {
+    Preconditions.checkNotNull(family);
+    return family.equals(responseFamily);
+  }
+
+  @Override
+  public boolean isRetryLater() {
+    return shouldRetryOnStatusCode() && retryAfterMillis.isPresent();
+  }
+
+  private boolean shouldRetryOnStatusCode() {
+    return getStatusCode() == SERVICE_UNAVAILABLE.code()
+        || getStatusCode() == TOO_MANY_REQUESTS.code();
+  }
+
+  @Override
+  public boolean succeeded() {
+    return getFailure() == null;
+  }
+
+  Throwable getFailure() {
+    return failure;
+  }
+
+  @Override
+  public String getRootCause() {
+    return failure != null ? Throwables.getRootCause(failure).getMessage() : CAUSE_UNKNOWN;
+  }
+
+  @Override
+  public int getStatusCode() {
+    return statusCode;
+  }
+
+  @Override
+  public boolean isLoggable() {
+    return loggable;
+  }
+
+  @Override
+  public Optional<Long> getRetryAfterMillis() {
+    return retryAfterMillis;
+  }
+
+  public Optional<URI> getRequestUri() {
+    return requestUri;
+  }
+
+  @Override
+  public boolean isClientError() {
+    return isInFamily(CLIENT_ERROR);
+  }
+
+  @Override
+  public boolean ignoreInRateCalculation(
+      boolean retryClientErrors, boolean isOAuthSecuredSubscription) {
+    return isRetryLater()
+        || this.ignoreInRateCalculation
+        || (isClientError()
+            && !retryClientErrors
+            && !(isOAuthSecuredSubscription && isUnauthorized()));
+  }
+
+  private boolean isUnauthorized() {
+    return getStatusCode() == UNAUTHORIZED.code();
+  }
+
+  @Override
+  public boolean isTimeout() {
+    return failure instanceof TimeoutException;
+  }
+
+  @Override
+  public List<MessageSendingResultLogInfo> getLogInfo() {
+    return Collections.singletonList(
+        new MessageSendingResultLogInfo(getRequestUri(), failure, getRootCause()));
+  }
+
+  @Override
+  public List<URI> getSucceededUris(Predicate<MessageSendingResult> filter) {
+    if (filter.test(this) && requestUri.isPresent()) {
+      return Collections.singletonList(getRequestUri().get());
+    } else {
+      return Collections.emptyList();
+    }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleRecipientMessageSenderAdapter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleRecipientMessageSenderAdapter.java
index 47b8dd0c77..72c9fed511 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleRecipientMessageSenderAdapter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleRecipientMessageSenderAdapter.java
@@ -1,32 +1,31 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender;
-
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
+import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender;
 
 public class SingleRecipientMessageSenderAdapter implements MessageSender {
-    private final CompletableFutureAwareMessageSender adaptee;
-    private final Function<Throwable, MessageSendingResult> exceptionMapper = MessageSendingResult::failedResult;
+  private final CompletableFutureAwareMessageSender adaptee;
+  private final Function<Throwable, MessageSendingResult> exceptionMapper =
+      MessageSendingResult::failedResult;
 
-    private final ResilientMessageSender resilientMessageSender;
+  private final ResilientMessageSender resilientMessageSender;
 
-    public SingleRecipientMessageSenderAdapter(CompletableFutureAwareMessageSender adaptee, ResilientMessageSender resilientMessageSender) {
-        this.resilientMessageSender = resilientMessageSender;
-        this.adaptee = adaptee;
-    }
+  public SingleRecipientMessageSenderAdapter(
+      CompletableFutureAwareMessageSender adaptee, ResilientMessageSender resilientMessageSender) {
+    this.resilientMessageSender = resilientMessageSender;
+    this.adaptee = adaptee;
+  }
 
-    @Override
-    public CompletableFuture<MessageSendingResult> send(Message message) {
-        return resilientMessageSender.send(
-                resultFuture -> adaptee.send(message, resultFuture),
-                exceptionMapper
-        );
-    }
+  @Override
+  public CompletableFuture<MessageSendingResult> send(Message message) {
+    return resilientMessageSender.send(
+        resultFuture -> adaptee.send(message, resultFuture), exceptionMapper);
+  }
 
-    @Override
-    public void stop() {
-        adaptee.stop();
-    }
+  @Override
+  public void stop() {
+    adaptee.stop();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/CompressionCodec.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/CompressionCodec.java
index d03d08c931..b8223d1651 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/CompressionCodec.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/CompressionCodec.java
@@ -1,21 +1,20 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub;
 
 enum CompressionCodec {
-    DEFLATE("df"),
-    BZIP2("bz2"),
-    ZSTANDARD("zstd"),
-    EMPTY;
+  DEFLATE("df"),
+  BZIP2("bz2"),
+  ZSTANDARD("zstd"),
+  EMPTY;
 
-    private String header;
+  private String header;
 
-    CompressionCodec(String header) {
-        this.header = header;
-    }
+  CompressionCodec(String header) {
+    this.header = header;
+  }
 
-    CompressionCodec() {
-    }
+  CompressionCodec() {}
 
-    String getHeader() {
-        return header;
-    }
-}
\ No newline at end of file
+  String getHeader() {
+    return header;
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/CompressionCodecFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/CompressionCodecFactory.java
index ba46970280..4866b6212b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/CompressionCodecFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/CompressionCodecFactory.java
@@ -7,84 +7,86 @@
 
 abstract class CompressionCodecFactory {
 
-    enum CompressionLevel {
-        LOW(1),
-        MEDIUM(3),
-        HIGH(9);
+  enum CompressionLevel {
+    LOW(1),
+    MEDIUM(3),
+    HIGH(9);
 
-        private final int levelId;
+    private final int levelId;
 
-        CompressionLevel(int levelId) {
-            this.levelId = levelId;
-        }
-
-        int getLevelId() {
-            return levelId;
-        }
+    CompressionLevel(int levelId) {
+      this.levelId = levelId;
     }
 
-    private final String name;
-
-    static CompressionCodecFactory of(CompressionCodec codec, CompressionLevel level) {
-        switch (codec) {
-            case DEFLATE: return new DeflateCodecFactory(codec.name(), level.getLevelId());
-            case BZIP2: return new CompressionCodecFactory.Bzip2CodecFactory(codec.name());
-            case ZSTANDARD: return new CompressionCodecFactory.ZstandardCodecFactory(codec.name(), level.getLevelId());
-            default: return null;
-        }
+    int getLevelId() {
+      return levelId;
     }
-
-    abstract Codec createInstance();
-
-    CompressionCodecFactory(String name) {
-        this.name = name;
+  }
+
+  private final String name;
+
+  static CompressionCodecFactory of(CompressionCodec codec, CompressionLevel level) {
+    switch (codec) {
+      case DEFLATE:
+        return new DeflateCodecFactory(codec.name(), level.getLevelId());
+      case BZIP2:
+        return new CompressionCodecFactory.Bzip2CodecFactory(codec.name());
+      case ZSTANDARD:
+        return new CompressionCodecFactory.ZstandardCodecFactory(codec.name(), level.getLevelId());
+      default:
+        return null;
     }
+  }
 
-    String codecName() {
-        return this.name;
-    }
+  abstract Codec createInstance();
 
-    static class DeflateCodecFactory extends CompressionCodecFactory {
+  CompressionCodecFactory(String name) {
+    this.name = name;
+  }
 
-        private final int compressionLevel;
+  String codecName() {
+    return this.name;
+  }
 
-        DeflateCodecFactory(String name, int compressionLevel) {
-            super(name);
-            this.compressionLevel = compressionLevel;
-        }
+  static class DeflateCodecFactory extends CompressionCodecFactory {
 
-        @Override
-        Codec createInstance() {
-            return new DeflateCodec(this.compressionLevel);
-        }
-    }
+    private final int compressionLevel;
 
+    DeflateCodecFactory(String name, int compressionLevel) {
+      super(name);
+      this.compressionLevel = compressionLevel;
+    }
 
-    static class Bzip2CodecFactory extends CompressionCodecFactory {
+    @Override
+    Codec createInstance() {
+      return new DeflateCodec(this.compressionLevel);
+    }
+  }
 
-        Bzip2CodecFactory(String name) {
-            super(name);
-        }
+  static class Bzip2CodecFactory extends CompressionCodecFactory {
 
-        @Override
-        Codec createInstance() {
-            return new BZip2Codec();
-        }
+    Bzip2CodecFactory(String name) {
+      super(name);
     }
 
+    @Override
+    Codec createInstance() {
+      return new BZip2Codec();
+    }
+  }
 
-    static class ZstandardCodecFactory extends CompressionCodecFactory {
+  static class ZstandardCodecFactory extends CompressionCodecFactory {
 
-        private final int compressionLevel;
+    private final int compressionLevel;
 
-        ZstandardCodecFactory(String name, int compressionLevel) {
-            super(name);
-            this.compressionLevel = compressionLevel;
-        }
+    ZstandardCodecFactory(String name, int compressionLevel) {
+      super(name);
+      this.compressionLevel = compressionLevel;
+    }
 
-        @Override
-        Codec createInstance() {
-            return new ZstandardCodec(compressionLevel, true);
-        }
+    @Override
+    Codec createInstance() {
+      return new ZstandardCodec(compressionLevel, true, ZstandardCodec.DEFAULT_USE_BUFFERPOOL);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubClient.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubClient.java
index aeb77eeb17..ef39f1da70 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubClient.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubClient.java
@@ -5,37 +5,37 @@
 import com.google.cloud.pubsub.v1.Publisher;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.pubsub.v1.PubsubMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
-
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 
 class GooglePubSubClient {
 
-    private static final Logger logger = LoggerFactory.getLogger(GooglePubSubClient.class);
+  private static final Logger logger = LoggerFactory.getLogger(GooglePubSubClient.class);
 
-    private final Publisher publisher;
+  private final Publisher publisher;
 
-    GooglePubSubClient(Publisher publisher) {
-        this.publisher = publisher;
-    }
+  GooglePubSubClient(Publisher publisher) {
+    this.publisher = publisher;
+  }
 
-    void publish(PubsubMessage pubsubMessage, CompletableFuture<MessageSendingResult> resultFuture)
-            throws IOException, ExecutionException, InterruptedException {
-        ApiFuture<String> future = publisher.publish(pubsubMessage);
-        ApiFutures.addCallback(future, new GooglePubSubMessageSentCallback(resultFuture), MoreExecutors.directExecutor());
-    }
+  void publish(PubsubMessage pubsubMessage, CompletableFuture<MessageSendingResult> resultFuture)
+      throws IOException, ExecutionException, InterruptedException {
+    ApiFuture<String> future = publisher.publish(pubsubMessage);
+    ApiFutures.addCallback(
+        future, new GooglePubSubMessageSentCallback(resultFuture), MoreExecutors.directExecutor());
+  }
 
-    void shutdown() {
-        publisher.shutdown();
-        try {
-            publisher.awaitTermination(30, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            logger.error("Interrupted termination of the PubSub publisher.");
-        }
+  void shutdown() {
+    publisher.shutdown();
+    try {
+      publisher.awaitTermination(30, TimeUnit.SECONDS);
+    } catch (InterruptedException e) {
+      logger.error("Interrupted termination of the PubSub publisher.");
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubClientsPool.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubClientsPool.java
index aa4e1f0aba..531d660b5d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubClientsPool.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubClientsPool.java
@@ -6,81 +6,84 @@
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.cloud.pubsub.v1.Publisher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class GooglePubSubClientsPool {
-    private static final Logger logger = LoggerFactory.getLogger(GooglePubSubClientsPool.class);
+  private static final Logger logger = LoggerFactory.getLogger(GooglePubSubClientsPool.class);
 
-    private final CredentialsProvider credentialsProvider;
-    private final ExecutorProvider publishingExecutorProvider;
-    private final RetrySettings retrySettings;
-    private final BatchingSettings batchingSettings;
-    private final Map<GooglePubSubSenderTarget, GooglePubSubClient> clients = new HashMap<>();
-    private final Map<GooglePubSubSenderTarget, Integer> counters = new HashMap<>();
+  private final CredentialsProvider credentialsProvider;
+  private final ExecutorProvider publishingExecutorProvider;
+  private final RetrySettings retrySettings;
+  private final BatchingSettings batchingSettings;
+  private final Map<GooglePubSubSenderTarget, GooglePubSubClient> clients = new HashMap<>();
+  private final Map<GooglePubSubSenderTarget, Integer> counters = new HashMap<>();
 
-    private final TransportChannelProvider transportChannelProvider;
+  private final TransportChannelProvider transportChannelProvider;
 
-    GooglePubSubClientsPool(CredentialsProvider credentialsProvider,
-                            ExecutorProvider publishingExecutorProvider,
-                            RetrySettings retrySettings,
-                            BatchingSettings batchingSettings,
-                            TransportChannelProvider transportChannelProvider) {
-        this.credentialsProvider = credentialsProvider;
-        this.publishingExecutorProvider = publishingExecutorProvider;
-        this.retrySettings = retrySettings;
-        this.batchingSettings = batchingSettings;
-        this.transportChannelProvider = transportChannelProvider;
-    }
+  GooglePubSubClientsPool(
+      CredentialsProvider credentialsProvider,
+      ExecutorProvider publishingExecutorProvider,
+      RetrySettings retrySettings,
+      BatchingSettings batchingSettings,
+      TransportChannelProvider transportChannelProvider) {
+    this.credentialsProvider = credentialsProvider;
+    this.publishingExecutorProvider = publishingExecutorProvider;
+    this.retrySettings = retrySettings;
+    this.batchingSettings = batchingSettings;
+    this.transportChannelProvider = transportChannelProvider;
+  }
 
-    synchronized GooglePubSubClient acquire(GooglePubSubSenderTarget resolvedTarget) throws IOException {
-        GooglePubSubClient client = clients.get(resolvedTarget);
-        if (client == null) {
-            client = createClient(resolvedTarget);
-        }
-        clients.put(resolvedTarget, client);
-        Integer counter = counters.getOrDefault(resolvedTarget, 0);
-        counters.put(resolvedTarget, ++counter);
-        return client;
+  synchronized GooglePubSubClient acquire(GooglePubSubSenderTarget resolvedTarget)
+      throws IOException {
+    GooglePubSubClient client = clients.get(resolvedTarget);
+    if (client == null) {
+      client = createClient(resolvedTarget);
     }
+    clients.put(resolvedTarget, client);
+    Integer counter = counters.getOrDefault(resolvedTarget, 0);
+    counters.put(resolvedTarget, ++counter);
+    return client;
+  }
 
-    synchronized void release(GooglePubSubSenderTarget resolvedTarget) {
-        Integer counter = counters.getOrDefault(resolvedTarget, 0);
-        if (counter == 0) {
-            logger.warn("Attempt to release GooglePubSubClient that is not acquired");
-        } else if (counter == 1) {
-            counters.remove(resolvedTarget);
-            GooglePubSubClient client = clients.remove(resolvedTarget);
-            client.shutdown();
-        } else if (counter > 1) {
-            counters.put(resolvedTarget, --counter);
-        }
+  synchronized void release(GooglePubSubSenderTarget resolvedTarget) {
+    Integer counter = counters.getOrDefault(resolvedTarget, 0);
+    if (counter == 0) {
+      logger.warn("Attempt to release GooglePubSubClient that is not acquired");
+    } else if (counter == 1) {
+      counters.remove(resolvedTarget);
+      GooglePubSubClient client = clients.remove(resolvedTarget);
+      client.shutdown();
+    } else if (counter > 1) {
+      counters.put(resolvedTarget, --counter);
     }
+  }
 
-    synchronized void shutdown() {
-        clients.values().forEach(GooglePubSubClient::shutdown);
-        clients.clear();
-        counters.clear();
-    }
+  synchronized void shutdown() {
+    clients.values().forEach(GooglePubSubClient::shutdown);
+    clients.clear();
+    counters.clear();
+  }
 
-    protected GooglePubSubClient createClient(GooglePubSubSenderTarget resolvedTarget) throws IOException {
-        final Publisher.Builder builder = Publisher.newBuilder(resolvedTarget.getTopicName())
-                .setEndpoint(resolvedTarget.getPubSubEndpoint())
-                .setCredentialsProvider(credentialsProvider)
-                .setRetrySettings(retrySettings)
-                .setBatchingSettings(batchingSettings)
-                .setExecutorProvider(publishingExecutorProvider);
+  protected GooglePubSubClient createClient(GooglePubSubSenderTarget resolvedTarget)
+      throws IOException {
+    final Publisher.Builder builder =
+        Publisher.newBuilder(resolvedTarget.getTopicName())
+            .setEndpoint(resolvedTarget.getPubSubEndpoint())
+            .setCredentialsProvider(credentialsProvider)
+            .setRetrySettings(retrySettings)
+            .setBatchingSettings(batchingSettings)
+            .setExecutorProvider(publishingExecutorProvider);
 
-        Publisher publisher;
-        if (transportChannelProvider == null) {
-            publisher = builder.build();
-        } else {
-            publisher = builder.setChannelProvider(transportChannelProvider).build();
-        }
-        return new GooglePubSubClient(publisher);
+    Publisher publisher;
+    if (transportChannelProvider == null) {
+      publisher = builder.build();
+    } else {
+      publisher = builder.setChannelProvider(transportChannelProvider).build();
     }
+    return new GooglePubSubClient(publisher);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageCompressionException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageCompressionException.java
index cbc34af1cc..c6dade4fdf 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageCompressionException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageCompressionException.java
@@ -2,7 +2,7 @@
 
 public class GooglePubSubMessageCompressionException extends RuntimeException {
 
-    public GooglePubSubMessageCompressionException(String message, Throwable e) {
-        super(message, e);
-    }
+  public GooglePubSubMessageCompressionException(String message, Throwable e) {
+    super(message, e);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSender.java
index 3fed4f81f8..6c41a524bc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSender.java
@@ -1,44 +1,45 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub;
 
-import com.google.pubsub.v1.PubsubMessage;
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.consumers.consumer.sender.CompletableFutureAwareMessageSender;
-import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
+import static pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult.failedResult;
 
+import com.google.pubsub.v1.PubsubMessage;
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-
-import static pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult.failedResult;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
+import pl.allegro.tech.hermes.consumers.consumer.sender.CompletableFutureAwareMessageSender;
+import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 
 class GooglePubSubMessageSender implements CompletableFutureAwareMessageSender {
 
-    private final GooglePubSubClient googlePubSubClient;
-    private final GooglePubSubSenderTarget resolvedTarget;
-    private final GooglePubSubClientsPool clientsPool;
-    private final GooglePubSubMessageTransformer messageTransformer;
-
-    GooglePubSubMessageSender(GooglePubSubSenderTarget resolvedTarget,
-                              GooglePubSubClientsPool clientsPool,
-                              GooglePubSubMessageTransformer messageTransformer) throws IOException {
-        this.googlePubSubClient = clientsPool.acquire(resolvedTarget);
-        this.resolvedTarget = resolvedTarget;
-        this.clientsPool = clientsPool;
-        this.messageTransformer = messageTransformer;
+  private final GooglePubSubClient googlePubSubClient;
+  private final GooglePubSubSenderTarget resolvedTarget;
+  private final GooglePubSubClientsPool clientsPool;
+  private final GooglePubSubMessageTransformer messageTransformer;
+
+  GooglePubSubMessageSender(
+      GooglePubSubSenderTarget resolvedTarget,
+      GooglePubSubClientsPool clientsPool,
+      GooglePubSubMessageTransformer messageTransformer)
+      throws IOException {
+    this.googlePubSubClient = clientsPool.acquire(resolvedTarget);
+    this.resolvedTarget = resolvedTarget;
+    this.clientsPool = clientsPool;
+    this.messageTransformer = messageTransformer;
+  }
+
+  @Override
+  public void send(Message message, CompletableFuture<MessageSendingResult> resultFuture) {
+    try {
+      PubsubMessage pubsubMessage = messageTransformer.fromHermesMessage(message);
+      googlePubSubClient.publish(pubsubMessage, resultFuture);
+    } catch (IOException | ExecutionException | InterruptedException exception) {
+      resultFuture.complete(failedResult(exception));
     }
+  }
 
-    @Override
-    public void send(Message message, CompletableFuture<MessageSendingResult> resultFuture) {
-        try {
-            PubsubMessage pubsubMessage = messageTransformer.fromHermesMessage(message);
-            googlePubSubClient.publish(pubsubMessage, resultFuture);
-        } catch (IOException | ExecutionException | InterruptedException exception) {
-            resultFuture.complete(failedResult(exception));
-        }
-    }
-
-    @Override
-    public void stop() {
-        clientsPool.release(resolvedTarget);
-    }
-}
\ No newline at end of file
+  @Override
+  public void stop() {
+    clientsPool.release(resolvedTarget);
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSenderProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSenderProvider.java
index fb0302c04b..4b66a1ce3e 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSenderProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSenderProvider.java
@@ -6,65 +6,67 @@
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.common.collect.ImmutableSet;
+import java.io.IOException;
+import java.util.Set;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSender;
 import pl.allegro.tech.hermes.consumers.consumer.sender.ProtocolMessageSenderProvider;
 import pl.allegro.tech.hermes.consumers.consumer.sender.SingleRecipientMessageSenderAdapter;
 
-import java.io.IOException;
-import java.util.Set;
-
 public class GooglePubSubMessageSenderProvider implements ProtocolMessageSenderProvider {
 
-    public static final String SUPPORTED_PROTOCOL = "googlepubsub";
+  public static final String SUPPORTED_PROTOCOL = "googlepubsub";
 
-    private final GooglePubSubSenderTargetResolver resolver;
-    private final GooglePubSubMessageTransformerCreator messageTransformerCreator;
-    private final GooglePubSubClientsPool clientsPool;
+  private final GooglePubSubSenderTargetResolver resolver;
+  private final GooglePubSubMessageTransformerCreator messageTransformerCreator;
+  private final GooglePubSubClientsPool clientsPool;
 
-    public GooglePubSubMessageSenderProvider(GooglePubSubSenderTargetResolver resolver,
-                                             CredentialsProvider credentialsProvider,
-                                             ExecutorProvider executorProvider,
-                                             RetrySettings retrySettings,
-                                             BatchingSettings batchingSettings,
-                                             TransportChannelProvider transportChannelProvider,
-                                             GooglePubSubMessageTransformerCreator messageTransformerCreator) {
+  public GooglePubSubMessageSenderProvider(
+      GooglePubSubSenderTargetResolver resolver,
+      CredentialsProvider credentialsProvider,
+      ExecutorProvider executorProvider,
+      RetrySettings retrySettings,
+      BatchingSettings batchingSettings,
+      TransportChannelProvider transportChannelProvider,
+      GooglePubSubMessageTransformerCreator messageTransformerCreator) {
 
-        this.resolver = resolver;
-        this.messageTransformerCreator = messageTransformerCreator;
-        this.clientsPool = new GooglePubSubClientsPool(
-                credentialsProvider,
-                executorProvider,
-                retrySettings,
-                batchingSettings,
-                transportChannelProvider
-        );
-    }
+    this.resolver = resolver;
+    this.messageTransformerCreator = messageTransformerCreator;
+    this.clientsPool =
+        new GooglePubSubClientsPool(
+            credentialsProvider,
+            executorProvider,
+            retrySettings,
+            batchingSettings,
+            transportChannelProvider);
+  }
 
-    @Override
-    public MessageSender create(final Subscription subscription, ResilientMessageSender resilientMessageSender) {
-        final GooglePubSubSenderTarget resolvedTarget = resolver.resolve(subscription.getEndpoint());
-        try {
-            GooglePubSubMessageTransformer messageTransformer = messageTransformerCreator.getTransformerForTargetEndpoint(resolvedTarget);
-            GooglePubSubMessageSender sender = new GooglePubSubMessageSender(resolvedTarget, clientsPool, messageTransformer);
-            return new SingleRecipientMessageSenderAdapter(sender, resilientMessageSender);
-        } catch (IOException e) {
-            throw new RuntimeException("Cannot create Google PubSub publishers cache", e);
-        }
+  @Override
+  public MessageSender create(
+      final Subscription subscription, ResilientMessageSender resilientMessageSender) {
+    final GooglePubSubSenderTarget resolvedTarget = resolver.resolve(subscription.getEndpoint());
+    try {
+      GooglePubSubMessageTransformer messageTransformer =
+          messageTransformerCreator.getTransformerForTargetEndpoint(resolvedTarget);
+      GooglePubSubMessageSender sender =
+          new GooglePubSubMessageSender(resolvedTarget, clientsPool, messageTransformer);
+      return new SingleRecipientMessageSenderAdapter(sender, resilientMessageSender);
+    } catch (IOException e) {
+      throw new RuntimeException("Cannot create Google PubSub publishers cache", e);
     }
+  }
 
-    @Override
-    public Set<String> getSupportedProtocols() {
-        return ImmutableSet.of(SUPPORTED_PROTOCOL);
-    }
+  @Override
+  public Set<String> getSupportedProtocols() {
+    return ImmutableSet.of(SUPPORTED_PROTOCOL);
+  }
 
-    @Override
-    public void start() throws Exception {
-    }
+  @Override
+  public void start() throws Exception {}
 
-    @Override
-    public void stop() throws Exception {
-        clientsPool.shutdown();
-    }
+  @Override
+  public void stop() throws Exception {
+    clientsPool.shutdown();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSentCallback.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSentCallback.java
index 5a29e23e42..a6dd28731d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSentCallback.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageSentCallback.java
@@ -1,27 +1,26 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub;
 
-import com.google.api.core.ApiFutureCallback;
-import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
-
-import java.util.concurrent.CompletableFuture;
-
 import static pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult.failedResult;
 import static pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult.succeededResult;
 
+import com.google.api.core.ApiFutureCallback;
+import java.util.concurrent.CompletableFuture;
+import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
+
 class GooglePubSubMessageSentCallback implements ApiFutureCallback<String> {
-    private final CompletableFuture<MessageSendingResult> resultFuture;
+  private final CompletableFuture<MessageSendingResult> resultFuture;
 
-    GooglePubSubMessageSentCallback(CompletableFuture<MessageSendingResult> resultFuture) {
-        this.resultFuture = resultFuture;
-    }
+  GooglePubSubMessageSentCallback(CompletableFuture<MessageSendingResult> resultFuture) {
+    this.resultFuture = resultFuture;
+  }
 
-    @Override
-    public void onFailure(Throwable throwable) {
-        resultFuture.complete(failedResult(throwable));
-    }
+  @Override
+  public void onFailure(Throwable throwable) {
+    resultFuture.complete(failedResult(throwable));
+  }
 
-    @Override
-    public void onSuccess(String messageId) {
-        resultFuture.complete(succeededResult());
-    }
+  @Override
+  public void onSuccess(String messageId) {
+    resultFuture.complete(succeededResult());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformer.java
index 40e9b7bfa8..fd547141a0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformer.java
@@ -5,6 +5,5 @@
 
 interface GooglePubSubMessageTransformer {
 
-    PubsubMessage fromHermesMessage(Message message);
-
+  PubsubMessage fromHermesMessage(Message message);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerCompression.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerCompression.java
index d8260a964e..e2dd61e599 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerCompression.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerCompression.java
@@ -2,49 +2,48 @@
 
 import com.google.protobuf.ByteString;
 import com.google.pubsub.v1.PubsubMessage;
+import java.io.IOException;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
-import java.io.IOException;
-
 class GooglePubSubMessageTransformerCompression implements GooglePubSubMessageTransformer {
 
-    private final MessageCompressor compressor;
-    private final Long compressionThresholdBytes;
-    private final GooglePubSubMessageTransformerRaw rawTransformer;
-    private final MetadataAppender<PubsubMessage> metadataAppender;
-
-    GooglePubSubMessageTransformerCompression(
-            Long compressionThresholdBytes,
-            GooglePubSubMessageTransformerRaw rawTransformer,
-            MetadataAppender<PubsubMessage> metadataAppender,
-            MessageCompressor compressor) {
-        this.compressor = compressor;
-        this.compressionThresholdBytes = compressionThresholdBytes;
-        this.rawTransformer = rawTransformer;
-        this.metadataAppender = metadataAppender;
+  private final MessageCompressor compressor;
+  private final Long compressionThresholdBytes;
+  private final GooglePubSubMessageTransformerRaw rawTransformer;
+  private final MetadataAppender<PubsubMessage> metadataAppender;
+
+  GooglePubSubMessageTransformerCompression(
+      Long compressionThresholdBytes,
+      GooglePubSubMessageTransformerRaw rawTransformer,
+      MetadataAppender<PubsubMessage> metadataAppender,
+      MessageCompressor compressor) {
+    this.compressor = compressor;
+    this.compressionThresholdBytes = compressionThresholdBytes;
+    this.rawTransformer = rawTransformer;
+    this.metadataAppender = metadataAppender;
+  }
+
+  @Override
+  public PubsubMessage fromHermesMessage(Message message) {
+    byte[] data = message.getData();
+    if (data.length > compressionThresholdBytes) {
+      return compressHermesMessage(message);
+    } else {
+      return rawTransformer.fromHermesMessage(message);
     }
-
-    @Override
-    public PubsubMessage fromHermesMessage(Message message) {
-        byte[] data = message.getData();
-        if (data.length > compressionThresholdBytes) {
-            return compressHermesMessage(message);
-        } else {
-            return rawTransformer.fromHermesMessage(message);
-        }
-    }
-
-    private PubsubMessage compressHermesMessage(Message message) {
-        try {
-            final PubsubMessage pubsubMessage = PubsubMessage.newBuilder()
-                    .setData(ByteString.copyFrom(
-                            compressor.compress(message.getData())
-                    )).build();
-
-            return metadataAppender.append(pubsubMessage, message);
-        } catch (IOException e) {
-            throw new GooglePubSubMessageCompressionException("Error on PubSub message compression", e);
-        }
+  }
+
+  private PubsubMessage compressHermesMessage(Message message) {
+    try {
+      final PubsubMessage pubsubMessage =
+          PubsubMessage.newBuilder()
+              .setData(ByteString.copyFrom(compressor.compress(message.getData())))
+              .build();
+
+      return metadataAppender.append(pubsubMessage, message);
+    } catch (IOException e) {
+      throw new GooglePubSubMessageCompressionException("Error on PubSub message compression", e);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerCreator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerCreator.java
index cff2b884ff..bf373e234c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerCreator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerCreator.java
@@ -1,71 +1,77 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub;
 
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Optional;
-
 public class GooglePubSubMessageTransformerCreator {
 
-    private boolean compressionEnabled;
-    private Long compressionThresholdBytes;
-    private CompressionCodecFactory.CompressionLevel compressionLevel;
-    private final GooglePubSubMessageTransformerRaw messageRawTransformer;
+  private boolean compressionEnabled;
+  private Long compressionThresholdBytes;
+  private CompressionCodecFactory.CompressionLevel compressionLevel;
+  private final GooglePubSubMessageTransformerRaw messageRawTransformer;
 
-    private static final Logger logger = LoggerFactory.getLogger(GooglePubSubMessageTransformerCreator.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(GooglePubSubMessageTransformerCreator.class);
 
-    public static GooglePubSubMessageTransformerCreator creator() {
-        return new GooglePubSubMessageTransformerCreator();
-    }
+  public static GooglePubSubMessageTransformerCreator creator() {
+    return new GooglePubSubMessageTransformerCreator();
+  }
 
-    private GooglePubSubMessageTransformerCreator() {
-        this.messageRawTransformer = new GooglePubSubMessageTransformerRaw(new GooglePubSubMetadataAppender());
-    }
+  private GooglePubSubMessageTransformerCreator() {
+    this.messageRawTransformer =
+        new GooglePubSubMessageTransformerRaw(new GooglePubSubMetadataAppender());
+  }
 
-    public GooglePubSubMessageTransformerCreator withCompressionEnabled(boolean compressionEnabled) {
-        this.compressionEnabled = compressionEnabled;
-        return this;
-    }
+  public GooglePubSubMessageTransformerCreator withCompressionEnabled(boolean compressionEnabled) {
+    this.compressionEnabled = compressionEnabled;
+    return this;
+  }
 
-    public GooglePubSubMessageTransformerCreator withCompressionLevel(String compressionLevel) {
-        try {
-            this.compressionLevel = Optional.ofNullable(compressionLevel)
-                    .map(String::toUpperCase)
-                    .map(CompressionCodecFactory.CompressionLevel::valueOf)
-                    .orElse(CompressionCodecFactory.CompressionLevel.MEDIUM);
-        } catch (IllegalArgumentException ex) {
-            logger.warn("Unsupported compression level: {}, setting it to default", compressionLevel);
-            this.compressionLevel = CompressionCodecFactory.CompressionLevel.MEDIUM;
-        }
-        return this;
+  public GooglePubSubMessageTransformerCreator withCompressionLevel(String compressionLevel) {
+    try {
+      this.compressionLevel =
+          Optional.ofNullable(compressionLevel)
+              .map(String::toUpperCase)
+              .map(CompressionCodecFactory.CompressionLevel::valueOf)
+              .orElse(CompressionCodecFactory.CompressionLevel.MEDIUM);
+    } catch (IllegalArgumentException ex) {
+      logger.warn("Unsupported compression level: {}, setting it to default", compressionLevel);
+      this.compressionLevel = CompressionCodecFactory.CompressionLevel.MEDIUM;
     }
+    return this;
+  }
 
-    public GooglePubSubMessageTransformerCreator withCompressionThresholdBytes(Long compressionThresholdBytes) {
-        this.compressionThresholdBytes = compressionThresholdBytes;
-        return this;
-    }
+  public GooglePubSubMessageTransformerCreator withCompressionThresholdBytes(
+      Long compressionThresholdBytes) {
+    this.compressionThresholdBytes = compressionThresholdBytes;
+    return this;
+  }
 
-    GooglePubSubMessageTransformer getTransformerForTargetEndpoint(GooglePubSubSenderTarget pubSubTarget) {
-        if (this.compressionEnabled && pubSubTarget.isCompressionRequested()) {
-            Optional<GooglePubSubMessageTransformer> compressingTransformer =
-                    transformerForCodec(pubSubTarget.getCompressionCodec());
-            if (compressingTransformer.isPresent()) {
-                return compressingTransformer.get();
-            } else {
-                logger.warn("Unsupported codec, switching to raw transfer for {}.", pubSubTarget.getTopicName());
-            }
-        }
-        return this.messageRawTransformer;
+  GooglePubSubMessageTransformer getTransformerForTargetEndpoint(
+      GooglePubSubSenderTarget pubSubTarget) {
+    if (this.compressionEnabled && pubSubTarget.isCompressionRequested()) {
+      Optional<GooglePubSubMessageTransformer> compressingTransformer =
+          transformerForCodec(pubSubTarget.getCompressionCodec());
+      if (compressingTransformer.isPresent()) {
+        return compressingTransformer.get();
+      } else {
+        logger.warn(
+            "Unsupported codec, switching to raw transfer for {}.", pubSubTarget.getTopicName());
+      }
     }
+    return this.messageRawTransformer;
+  }
 
-    private Optional<GooglePubSubMessageTransformer> transformerForCodec(CompressionCodec codec) {
-        return Optional.ofNullable(codec)
-                .map(it -> CompressionCodecFactory.of(it, compressionLevel))
-                .map(codecFactory ->
-                        new GooglePubSubMessageTransformerCompression(
-                                this.compressionThresholdBytes,
-                                this.messageRawTransformer,
-                                new GooglePubSubMetadataCompressionAppender(codec),
-                                new MessageCompressor(codecFactory)));
-    }
+  private Optional<GooglePubSubMessageTransformer> transformerForCodec(CompressionCodec codec) {
+    return Optional.ofNullable(codec)
+        .map(it -> CompressionCodecFactory.of(it, compressionLevel))
+        .map(
+            codecFactory ->
+                new GooglePubSubMessageTransformerCompression(
+                    this.compressionThresholdBytes,
+                    this.messageRawTransformer,
+                    new GooglePubSubMetadataCompressionAppender(codec),
+                    new MessageCompressor(codecFactory)));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerRaw.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerRaw.java
index 407d9c5231..6bdc3c9da9 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerRaw.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMessageTransformerRaw.java
@@ -7,18 +7,17 @@
 
 class GooglePubSubMessageTransformerRaw implements GooglePubSubMessageTransformer {
 
-    private final MetadataAppender<PubsubMessage> metadataAppender;
+  private final MetadataAppender<PubsubMessage> metadataAppender;
 
-    GooglePubSubMessageTransformerRaw(MetadataAppender<PubsubMessage> metadataAppender) {
-        this.metadataAppender = metadataAppender;
-    }
+  GooglePubSubMessageTransformerRaw(MetadataAppender<PubsubMessage> metadataAppender) {
+    this.metadataAppender = metadataAppender;
+  }
 
-    @Override
-    public PubsubMessage fromHermesMessage(Message message) {
-        final PubsubMessage pubsubMessage = PubsubMessage.newBuilder()
-                .setData(ByteString.copyFrom(message.getData()))
-                .build();
+  @Override
+  public PubsubMessage fromHermesMessage(Message message) {
+    final PubsubMessage pubsubMessage =
+        PubsubMessage.newBuilder().setData(ByteString.copyFrom(message.getData())).build();
 
-        return metadataAppender.append(pubsubMessage, message);
-    }
+    return metadataAppender.append(pubsubMessage, message);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMetadataAppender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMetadataAppender.java
index 8d23df04bc..f219d1144d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMetadataAppender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMetadataAppender.java
@@ -2,48 +2,55 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.pubsub.v1.PubsubMessage;
-import org.apache.commons.lang3.tuple.Pair;
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import org.apache.commons.lang3.tuple.Pair;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
+import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
 public class GooglePubSubMetadataAppender implements MetadataAppender<PubsubMessage> {
 
-    public static final String HEADER_NAME_TOPIC_NAME = "tn";
-    public static final String HEADER_NAME_MESSAGE_ID = "id";
-    public static final String HEADER_NAME_SUBSCRIPTION_NAME = "sn";
-    public static final String HEADER_NAME_TIMESTAMP = "ts";
-    public static final String HEADER_NAME_SCHEMA_ID = "sid";
-    public static final String HEADER_NAME_SCHEMA_VERSION = "sv";
-
-    @Override
-    public PubsubMessage append(PubsubMessage target, Message message) {
-        return PubsubMessage.newBuilder(target)
-                .putAllAttributes(createMessageAttributes(message))
-                .build();
-    }
-
-    protected Map<String, String> createMessageAttributes(Message message) {
-        Optional<Pair<String, String>> schemaIdAndVersion = message.getSchema().map(s ->
-                Pair.of(String.valueOf(s.getId().value()), String.valueOf(s.getVersion().value())));
-
-        final Map<String, String> headers = new HashMap<>(ImmutableMap.of(
+  public static final String HEADER_NAME_TOPIC_NAME = "tn";
+  public static final String HEADER_NAME_MESSAGE_ID = "id";
+  public static final String HEADER_NAME_SUBSCRIPTION_NAME = "sn";
+  public static final String HEADER_NAME_TIMESTAMP = "ts";
+  public static final String HEADER_NAME_SCHEMA_ID = "sid";
+  public static final String HEADER_NAME_SCHEMA_VERSION = "sv";
+
+  @Override
+  public PubsubMessage append(PubsubMessage target, Message message) {
+    return PubsubMessage.newBuilder(target)
+        .putAllAttributes(createMessageAttributes(message))
+        .build();
+  }
+
+  protected Map<String, String> createMessageAttributes(Message message) {
+    Optional<Pair<String, String>> schemaIdAndVersion =
+        message
+            .getSchema()
+            .map(
+                s ->
+                    Pair.of(
+                        String.valueOf(s.getId().value()), String.valueOf(s.getVersion().value())));
+
+    final Map<String, String> headers =
+        new HashMap<>(
+            ImmutableMap.of(
                 HEADER_NAME_TOPIC_NAME, message.getTopic(),
                 HEADER_NAME_MESSAGE_ID, message.getId(),
                 HEADER_NAME_TIMESTAMP, String.valueOf(message.getPublishingTimestamp())));
 
-        if (message.hasSubscriptionIdentityHeaders()) {
-            headers.put(HEADER_NAME_SUBSCRIPTION_NAME, message.getSubscription());
-        }
+    if (message.hasSubscriptionIdentityHeaders()) {
+      headers.put(HEADER_NAME_SUBSCRIPTION_NAME, message.getSubscription());
+    }
 
-        schemaIdAndVersion.ifPresent(sv -> {
-            headers.put(HEADER_NAME_SCHEMA_ID, sv.getLeft());
-            headers.put(HEADER_NAME_SCHEMA_VERSION, sv.getRight());
+    schemaIdAndVersion.ifPresent(
+        sv -> {
+          headers.put(HEADER_NAME_SCHEMA_ID, sv.getLeft());
+          headers.put(HEADER_NAME_SCHEMA_VERSION, sv.getRight());
         });
 
-        return headers;
-    }
+    return headers;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMetadataCompressionAppender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMetadataCompressionAppender.java
index 03fa6e3305..2557e2bcd3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMetadataCompressionAppender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubMetadataCompressionAppender.java
@@ -1,22 +1,21 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub;
 
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-
 import java.util.Map;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
 
 class GooglePubSubMetadataCompressionAppender extends GooglePubSubMetadataAppender {
 
-    public static final String HEADER_NAME_CODEC_NAME = "cn";
-    private final String codecHeader;
+  public static final String HEADER_NAME_CODEC_NAME = "cn";
+  private final String codecHeader;
 
-    GooglePubSubMetadataCompressionAppender(CompressionCodec codec) {
-        this.codecHeader = codec.getHeader();
-    }
+  GooglePubSubMetadataCompressionAppender(CompressionCodec codec) {
+    this.codecHeader = codec.getHeader();
+  }
 
-    @Override
-    protected Map<String, String> createMessageAttributes(Message message) {
-        Map<String, String> messageAttributes = super.createMessageAttributes(message);
-        messageAttributes.put(HEADER_NAME_CODEC_NAME, codecHeader);
-        return messageAttributes;
-    }
+  @Override
+  protected Map<String, String> createMessageAttributes(Message message) {
+    Map<String, String> messageAttributes = super.createMessageAttributes(message);
+    messageAttributes.put(HEADER_NAME_CODEC_NAME, codecHeader);
+    return messageAttributes;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubSenderTarget.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubSenderTarget.java
index 4a179d8ac2..f984c6f559 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubSenderTarget.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubSenderTarget.java
@@ -1,91 +1,90 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub;
 
 import com.google.pubsub.v1.TopicName;
-
 import java.util.Objects;
 
 class GooglePubSubSenderTarget {
 
-    private final TopicName topicName;
-    private final String pubSubEndpoint;
-    private final CompressionCodec compressionCodec;
-
-    private GooglePubSubSenderTarget(TopicName topicName, String pubSubEndpoint, CompressionCodec compressionCodec) {
-        this.topicName = topicName;
-        this.pubSubEndpoint = pubSubEndpoint;
-        this.compressionCodec = compressionCodec;
+  private final TopicName topicName;
+  private final String pubSubEndpoint;
+  private final CompressionCodec compressionCodec;
+
+  private GooglePubSubSenderTarget(
+      TopicName topicName, String pubSubEndpoint, CompressionCodec compressionCodec) {
+    this.topicName = topicName;
+    this.pubSubEndpoint = pubSubEndpoint;
+    this.compressionCodec = compressionCodec;
+  }
+
+  TopicName getTopicName() {
+    return topicName;
+  }
+
+  String getPubSubEndpoint() {
+    return pubSubEndpoint;
+  }
+
+  CompressionCodec getCompressionCodec() {
+    return compressionCodec;
+  }
+
+  boolean isCompressionRequested() {
+    return compressionCodec != CompressionCodec.EMPTY;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    TopicName getTopicName() {
-        return topicName;
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    return skipCompressionCodecEquals((GooglePubSubSenderTarget) o);
+  }
 
-    String getPubSubEndpoint() {
-        return pubSubEndpoint;
-    }
+  @Override
+  public int hashCode() {
+    return skipCompressionCodecHashCode();
+  }
 
-    CompressionCodec getCompressionCodec() {
-        return compressionCodec;
-    }
+  private boolean skipCompressionCodecEquals(GooglePubSubSenderTarget that) {
+    return Objects.equals(topicName, that.topicName)
+        && Objects.equals(pubSubEndpoint, that.pubSubEndpoint);
+  }
 
-    boolean isCompressionRequested() {
-        return compressionCodec != CompressionCodec.EMPTY;
-    }
+  private int skipCompressionCodecHashCode() {
+    return Objects.hash(topicName, pubSubEndpoint);
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return skipCompressionCodecEquals((GooglePubSubSenderTarget) o);
-    }
+  static PubSubTargetBuilder builder() {
+    return new PubSubTargetBuilder();
+  }
 
-    @Override
-    public int hashCode() {
-        return skipCompressionCodecHashCode();
-    }
+  static final class PubSubTargetBuilder {
+    private TopicName topicName;
+    private String pubSubEndpoint;
+    private CompressionCodec compressionCodec;
 
-    private boolean skipCompressionCodecEquals(GooglePubSubSenderTarget that) {
-        return Objects.equals(topicName, that.topicName)
-                && Objects.equals(pubSubEndpoint, that.pubSubEndpoint);
-    }
+    private PubSubTargetBuilder() {}
 
-    private int skipCompressionCodecHashCode() {
-        return Objects.hash(topicName, pubSubEndpoint);
+    PubSubTargetBuilder withTopicName(TopicName topicName) {
+      this.topicName = topicName;
+      return this;
     }
 
-    static PubSubTargetBuilder builder() {
-        return new PubSubTargetBuilder();
+    PubSubTargetBuilder withPubSubEndpoint(String pubSubEndpoint) {
+      this.pubSubEndpoint = pubSubEndpoint;
+      return this;
     }
 
-    static final class PubSubTargetBuilder {
-        private TopicName topicName;
-        private String pubSubEndpoint;
-        private CompressionCodec compressionCodec;
-
-        private PubSubTargetBuilder() {
-        }
-
-        PubSubTargetBuilder withTopicName(TopicName topicName) {
-            this.topicName = topicName;
-            return this;
-        }
-
-        PubSubTargetBuilder withPubSubEndpoint(String pubSubEndpoint) {
-            this.pubSubEndpoint = pubSubEndpoint;
-            return this;
-        }
-
-        PubSubTargetBuilder withCompressionCodec(CompressionCodec compressionCodec) {
-            this.compressionCodec = compressionCodec;
-            return this;
-        }
+    PubSubTargetBuilder withCompressionCodec(CompressionCodec compressionCodec) {
+      this.compressionCodec = compressionCodec;
+      return this;
+    }
 
-        GooglePubSubSenderTarget build() {
-            return new GooglePubSubSenderTarget(topicName, pubSubEndpoint, compressionCodec);
-        }
+    GooglePubSubSenderTarget build() {
+      return new GooglePubSubSenderTarget(topicName, pubSubEndpoint, compressionCodec);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubSenderTargetResolver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubSenderTargetResolver.java
index 0d3231fd80..17fad97fe6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubSenderTargetResolver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/GooglePubSubSenderTargetResolver.java
@@ -2,8 +2,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.pubsub.v1.TopicName;
-import pl.allegro.tech.hermes.api.EndpointAddress;
-
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
@@ -11,42 +9,46 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import pl.allegro.tech.hermes.api.EndpointAddress;
 
 public class GooglePubSubSenderTargetResolver {
 
-    GooglePubSubSenderTarget resolve(EndpointAddress address) {
-        try {
-            final URI uri = URI.create(address.getRawEndpoint());
-            Preconditions.checkArgument(uri.getScheme().equals("googlepubsub"));
-            Preconditions.checkArgument(uri.getPort() > 0);
+  GooglePubSubSenderTarget resolve(EndpointAddress address) {
+    try {
+      final URI uri = URI.create(address.getRawEndpoint());
+      Preconditions.checkArgument(uri.getScheme().equals("googlepubsub"));
+      Preconditions.checkArgument(uri.getPort() > 0);
 
-            return GooglePubSubSenderTarget.builder()
-                    .withPubSubEndpoint(uri.getAuthority())
-                    .withTopicName(TopicName.parse(uri.getPath().substring(1)))
-                    .withCompressionCodec(findCompressionCodec(uri.getQuery()))
-                    .build();
-        } catch (RuntimeException e) {
-            throw new IllegalArgumentException("Given endpoint is invalid", e);
-        }
+      return GooglePubSubSenderTarget.builder()
+          .withPubSubEndpoint(uri.getAuthority())
+          .withTopicName(TopicName.parse(uri.getPath().substring(1)))
+          .withCompressionCodec(findCompressionCodec(uri.getQuery()))
+          .build();
+    } catch (RuntimeException e) {
+      throw new IllegalArgumentException("Given endpoint is invalid", e);
     }
+  }
 
-    private CompressionCodec findCompressionCodec(String params) {
-        try {
-            Map<String, List<String[]>> paramListMap = Optional.ofNullable(params)
-                    .map(q -> Arrays.stream(q.split("&"))
-                            .map(p -> p.split("="))
-                            .filter(p -> p.length > 1)
-                            .collect(Collectors.groupingBy(c -> c[0])))
-                    .orElse(Collections.emptyMap());
+  private CompressionCodec findCompressionCodec(String params) {
+    try {
+      Map<String, List<String[]>> paramListMap =
+          Optional.ofNullable(params)
+              .map(
+                  q ->
+                      Arrays.stream(q.split("&"))
+                          .map(p -> p.split("="))
+                          .filter(p -> p.length > 1)
+                          .collect(Collectors.groupingBy(c -> c[0])))
+              .orElse(Collections.emptyMap());
 
-            return Optional.ofNullable(paramListMap.get("compression"))
-                    .flatMap(p -> p.stream().findFirst())
-                    .flatMap(p -> Optional.ofNullable(p[1]))
-                    .map(String::toUpperCase)
-                    .map(CompressionCodec::valueOf)
-                    .orElse(CompressionCodec.EMPTY);
-        } catch (RuntimeException ex) {
-            throw new IllegalArgumentException("Unsupported compression codec", ex);
-        }
+      return Optional.ofNullable(paramListMap.get("compression"))
+          .flatMap(p -> p.stream().findFirst())
+          .flatMap(p -> Optional.ofNullable(p[1]))
+          .map(String::toUpperCase)
+          .map(CompressionCodec::valueOf)
+          .orElse(CompressionCodec.EMPTY);
+    } catch (RuntimeException ex) {
+      throw new IllegalArgumentException("Unsupported compression codec", ex);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/MessageCompressor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/MessageCompressor.java
index bf933b18cd..b0017f77b0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/MessageCompressor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/googlepubsub/MessageCompressor.java
@@ -1,31 +1,33 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub;
 
-import org.apache.avro.file.Codec;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import org.apache.avro.file.Codec;
 
 class MessageCompressor {
 
-    private final CompressionCodecFactory codecFactory;
-
-    MessageCompressor(CompressionCodecFactory codecFactory) {
-        this.codecFactory = codecFactory;
-    }
+  private final CompressionCodecFactory codecFactory;
 
-    byte[] compress(byte[] data) throws IOException {
-        Codec codec = codecFactory.createInstance();
+  MessageCompressor(CompressionCodecFactory codecFactory) {
+    this.codecFactory = codecFactory;
+  }
 
-        ByteBuffer compressed = codec.compress(ByteBuffer.wrap(data));
+  byte[] compress(byte[] data) throws IOException {
+    Codec codec = codecFactory.createInstance();
 
-        return compressed.array();
-    }
+    ByteBuffer compressed = codec.compress(ByteBuffer.wrap(data));
+    byte[] compressedBytes = new byte[compressed.limit()];
+    compressed.get(compressedBytes);
 
-    byte[] decompress(byte[] data) throws IOException {
-        Codec codec = codecFactory.createInstance();
+    return compressedBytes;
+  }
 
-        ByteBuffer decompressed = codec.decompress(ByteBuffer.wrap(data));
+  byte[] decompress(byte[] data) throws IOException {
+    Codec codec = codecFactory.createInstance();
 
-        return decompressed.array();
-    }
+    ByteBuffer decompressed = codec.decompress(ByteBuffer.wrap(data));
+    byte[] decompressedBytes = new byte[decompressed.limit()];
+    decompressed.get(decompressedBytes);
+    return decompressedBytes;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/BatchHttpRequestFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/BatchHttpRequestFactory.java
index b5d31e5f07..5db38ef1af 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/BatchHttpRequestFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/BatchHttpRequestFactory.java
@@ -1,13 +1,13 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.api.Request;
+import java.net.URI;
+import org.eclipse.jetty.client.Request;
 import pl.allegro.tech.hermes.consumers.consumer.batch.MessageBatch;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HttpRequestHeaders;
 
-import java.net.URI;
-
 public interface BatchHttpRequestFactory {
-    Request buildRequest(MessageBatch message, URI uri, HttpRequestHeaders headers, int requestTimeout);
+  Request buildRequest(
+      MessageBatch message, URI uri, HttpRequestHeaders headers, int requestTimeout);
 
-    void stop();
+  void stop();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/ByteBufferEntity.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/ByteBufferEntity.java
deleted file mode 100644
index 44435a681b..0000000000
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/ByteBufferEntity.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package pl.allegro.tech.hermes.consumers.consumer.sender.http;
-
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-import org.apache.http.annotation.Contract;
-import org.apache.http.entity.AbstractHttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.util.Args;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.WritableByteChannel;
-
-/*
- *  CAUTION!
- *  This implementation comes from PR that was merged directly into hc.core5
- *  which is not backwards compatible with http-components version 4. We need
- *  entire http stack and not just the core so we cannot use core5 yet. This
- *  is the last implementation that works on version 4. If it is good enough
- *  for hc.core5 then it should be ok for out use case.
- *
- *  PR: https://github.com/apache/httpcore/pull/13
- *
-* */
-
-/**
- * An entity that delivers the contents of a {@link ByteBuffer}.
- */
-@Contract(threading = org.apache.http.annotation.ThreadingBehavior.UNSAFE)
-public class ByteBufferEntity extends AbstractHttpEntity implements Cloneable {
-
-    private final ByteBuffer buffer;
-
-    private class ByteBufferInputStream extends InputStream {
-
-        ByteBufferInputStream() {
-            buffer.position(0);
-        }
-
-        public int read() throws IOException {
-            if (!buffer.hasRemaining()) {
-                return -1;
-            }
-            return buffer.get() & 0xFF;
-        }
-
-        public int read(byte[] bytes, int off, int len) throws IOException {
-            if (!buffer.hasRemaining()) {
-                return -1;
-            }
-
-            len = Math.min(len, buffer.remaining());
-            buffer.get(bytes, off, len);
-            return len;
-        }
-    }
-
-    public ByteBufferEntity(final ByteBuffer buffer, final ContentType contentType) {
-        super();
-        Args.notNull(buffer, "Source byte buffer");
-        this.buffer = buffer;
-        if (contentType != null) {
-            setContentType(contentType.toString());
-        }
-    }
-
-    public ByteBufferEntity(final ByteBuffer buffer) {
-        this(buffer, null);
-    }
-
-    @Override
-    public boolean isRepeatable() {
-        return true;
-    }
-
-    @Override
-    public long getContentLength() {
-        return buffer.limit();
-    }
-
-    @Override
-    public InputStream getContent() throws IOException, UnsupportedOperationException {
-        return new ByteBufferInputStream();
-    }
-
-    @Override
-    public void writeTo(OutputStream outstream) throws IOException {
-        Args.notNull(outstream, "Output stream");
-        WritableByteChannel channel = Channels.newChannel(outstream);
-        channel.write(buffer);
-        outstream.flush();
-    }
-
-    @Override
-    public boolean isStreaming() {
-        return false;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultBatchHttpRequestFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultBatchHttpRequestFactory.java
index a2bd0ab2f8..4925aec082 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultBatchHttpRequestFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultBatchHttpRequestFactory.java
@@ -1,51 +1,46 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
+import java.net.URI;
+import java.util.concurrent.TimeUnit;
+import org.eclipse.jetty.client.ByteBufferRequestContent;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.util.ByteBufferContentProvider;
+import org.eclipse.jetty.client.Request;
 import org.eclipse.jetty.http.HttpMethod;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 import pl.allegro.tech.hermes.consumers.consumer.batch.MessageBatch;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HttpRequestHeaders;
 
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-
 public class DefaultBatchHttpRequestFactory implements BatchHttpRequestFactory {
-    private final HttpClient client;
-
-    public DefaultBatchHttpRequestFactory(HttpClient client) {
-        this.client = started(client);
-    }
-
-    public Request buildRequest(MessageBatch message, URI uri, HttpRequestHeaders headers, int requestTimeout) {
-        Request request = client.newRequest(uri)
-                .method(HttpMethod.POST)
-                .timeout(requestTimeout, TimeUnit.MILLISECONDS)
-                .content(new ByteBufferContentProvider(message.getContent()));
-
-
-        headers.asMap()
-                .forEach(request::header);
-
-        return request;
+  private final HttpClient client;
+
+  public DefaultBatchHttpRequestFactory(HttpClient client) {
+    this.client = started(client);
+  }
+
+  public Request buildRequest(
+      MessageBatch message, URI uri, HttpRequestHeaders headers, int requestTimeout) {
+    return client
+        .newRequest(uri)
+        .method(HttpMethod.POST)
+        .timeout(requestTimeout, TimeUnit.MILLISECONDS)
+        .body(new ByteBufferRequestContent(message.getContent()))
+        .headers(httpHeaders -> headers.asMap().forEach(httpHeaders::add));
+  }
+
+  private static HttpClient started(HttpClient httpClient) {
+    try {
+      httpClient.start();
+      return httpClient;
+    } catch (Exception e) {
+      throw new InternalProcessingException("Failed to start http batch client", e);
     }
+  }
 
-    private static HttpClient started(HttpClient httpClient) {
-        try {
-            httpClient.start();
-            return httpClient;
-        } catch (Exception e) {
-            throw new InternalProcessingException("Failed to start http batch client", e);
-        }
-    }
-
-
-    public void stop() {
-        try {
-            client.stop();
-        } catch (Exception e) {
-            throw new InternalProcessingException("Failed to stop http batch client", e);
-        }
+  public void stop() {
+    try {
+      client.stop();
+    } catch (Exception e) {
+      throw new InternalProcessingException("Failed to stop http batch client", e);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpMetadataAppender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpMetadataAppender.java
index a982c5c814..368753ecbd 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpMetadataAppender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpMetadataAppender.java
@@ -1,14 +1,14 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
 public class DefaultHttpMetadataAppender implements MetadataAppender<Request> {
 
-    @Override
-    public Request append(Request target, Message message) {
-        message.getExternalMetadata().forEach(target::header);
-        return target;
-    }
+  @Override
+  public Request append(Request target, Message message) {
+    target.headers(httpFields -> message.getExternalMetadata().forEach(httpFields::add));
+    return target;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpRequestFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpRequestFactory.java
index 65e3886f7b..dfb2c1cc88 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpRequestFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpRequestFactory.java
@@ -1,70 +1,66 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
+import java.net.URI;
+import java.util.concurrent.TimeUnit;
+import org.eclipse.jetty.client.BytesRequestContent;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.util.BytesContentProvider;
+import org.eclipse.jetty.client.Request;
 import org.eclipse.jetty.http.HttpMethod;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HttpRequestHeaders;
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-
 class DefaultHttpRequestFactory implements HttpRequestFactory {
 
-    private final HttpClient client;
-    private final long timeout;
-    private final long socketTimeout;
-    private final MetadataAppender<Request> metadataAppender;
-
-    public DefaultHttpRequestFactory(HttpClient client,
-                              long timeout,
-                              long socketTimeout,
-                              MetadataAppender<Request> metadataAppender) {
-        this.client = client;
-        this.timeout = timeout;
-        this.socketTimeout = socketTimeout;
-        this.metadataAppender = metadataAppender;
+  private final HttpClient client;
+  private final long timeout;
+  private final long socketTimeout;
+  private final MetadataAppender<Request> metadataAppender;
+
+  public DefaultHttpRequestFactory(
+      HttpClient client,
+      long timeout,
+      long socketTimeout,
+      MetadataAppender<Request> metadataAppender) {
+    this.client = client;
+    this.timeout = timeout;
+    this.socketTimeout = socketTimeout;
+    this.metadataAppender = metadataAppender;
+  }
+
+  @Override
+  public Request buildRequest(Message message, URI uri, HttpRequestHeaders headers) {
+    return new HttpRequestBuilder(message, uri, headers).build();
+  }
+
+  private class HttpRequestBuilder {
+
+    private final Message message;
+    private final URI uri;
+    private final HttpRequestHeaders headers;
+
+    HttpRequestBuilder(Message message, URI uri, HttpRequestHeaders headers) {
+      this.message = message;
+      this.uri = uri;
+      this.headers = headers;
     }
 
-    @Override
-    public Request buildRequest(Message message, URI uri, HttpRequestHeaders headers) {
-        return new HttpRequestBuilder(message, uri, headers).build();
+    Request build() {
+      return baseRequest().headers(httpHeaders -> headers.asMap().forEach(httpHeaders::add));
     }
 
-    private class HttpRequestBuilder {
-
-        private final Message message;
-        private final URI uri;
-        private final HttpRequestHeaders headers;
-
-        HttpRequestBuilder(Message message, URI uri, HttpRequestHeaders headers) {
-            this.message = message;
-            this.uri = uri;
-            this.headers = headers;
-        }
-
-        Request build() {
-            Request request = baseRequest();
-
-            headers.asMap()
-                    .forEach(request::header);
-
-            return request;
-        }
-
-        private Request baseRequest() {
-            Request baseRequest = client.newRequest(uri)
-                    .method(HttpMethod.POST)
-                    .timeout(timeout, TimeUnit.MILLISECONDS)
-                    .idleTimeout(socketTimeout, TimeUnit.MILLISECONDS)
-                    .content(new BytesContentProvider(message.getData()));
-
-            metadataAppender.append(baseRequest, message);
+    private Request baseRequest() {
+      Request baseRequest =
+          client
+              .newRequest(uri)
+              .method(HttpMethod.POST)
+              .timeout(timeout, TimeUnit.MILLISECONDS)
+              .idleTimeout(socketTimeout, TimeUnit.MILLISECONDS)
+              .body(new BytesRequestContent(message.getData()));
 
-            return baseRequest;
-        }
+      metadataAppender.append(baseRequest, message);
 
+      return baseRequest;
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpRequestFactoryProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpRequestFactoryProvider.java
index 6b34c2a983..1ff86235e2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpRequestFactoryProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultHttpRequestFactoryProvider.java
@@ -1,24 +1,19 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
 public class DefaultHttpRequestFactoryProvider implements HttpRequestFactoryProvider {
-    @Override
-    public HttpRequestFactory provideRequestFactory(Subscription subscription,
-                                                    HttpClient httpClient,
-                                                    MetadataAppender<Request> metadataAppender) {
-        int requestTimeout = subscription.getSerialSubscriptionPolicy().getRequestTimeout();
-        int socketTimeout = subscription.getSerialSubscriptionPolicy().getSocketTimeout();
-        return new DefaultHttpRequestFactory(
-                httpClient,
-                requestTimeout,
-                socketTimeout,
-                metadataAppender
-        );
-    }
-
-
+  @Override
+  public HttpRequestFactory provideRequestFactory(
+      Subscription subscription,
+      HttpClient httpClient,
+      MetadataAppender<Request> metadataAppender) {
+    int requestTimeout = subscription.getSerialSubscriptionPolicy().getRequestTimeout();
+    int socketTimeout = subscription.getSerialSubscriptionPolicy().getSocketTimeout();
+    return new DefaultHttpRequestFactory(
+        httpClient, requestTimeout, socketTimeout, metadataAppender);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultSendingResultHandlers.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultSendingResultHandlers.java
index d7c25c94ed..679ef249dd 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultSendingResultHandlers.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/DefaultSendingResultHandlers.java
@@ -1,25 +1,26 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.api.Response;
+import java.util.concurrent.CompletableFuture;
+import org.eclipse.jetty.client.ContentResponse;
+import org.eclipse.jetty.client.Response;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 import pl.allegro.tech.hermes.consumers.consumer.sender.SingleMessageSendingResult;
 
-import java.util.concurrent.CompletableFuture;
-
 public class DefaultSendingResultHandlers implements SendingResultHandlers {
-    @Override
-    public Response.CompleteListener handleSendingResultForSerial(CompletableFuture<MessageSendingResult> resultFuture) {
-        return new JettyResponseListener(resultFuture);
-    }
+  @Override
+  public Response.CompleteListener handleSendingResultForSerial(
+      CompletableFuture<MessageSendingResult> resultFuture) {
+    return new JettyResponseListener(resultFuture);
+  }
 
-    @Override
-    public Response.CompleteListener handleSendingResultForBroadcast(CompletableFuture<SingleMessageSendingResult> resultFuture) {
-        return new JettyBroadCastResponseListener(resultFuture);
-    }
+  @Override
+  public Response.CompleteListener handleSendingResultForBroadcast(
+      CompletableFuture<SingleMessageSendingResult> resultFuture) {
+    return new JettyBroadCastResponseListener(resultFuture);
+  }
 
-    @Override
-    public MessageSendingResult handleSendingResultForBatch(ContentResponse response) {
-        return MessageSendingResult.ofStatusCode(response.getStatus());
-    }
+  @Override
+  public MessageSendingResult handleSendingResultForBatch(ContentResponse response) {
+    return MessageSendingResult.ofStatusCode(response.getStatus());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/EmptyHttpHeadersProvidersFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/EmptyHttpHeadersProvidersFactory.java
index 959dfa66c7..eab054bd53 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/EmptyHttpHeadersProvidersFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/EmptyHttpHeadersProvidersFactory.java
@@ -1,15 +1,14 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HttpHeadersProvider;
+import static java.util.Collections.emptySet;
 
 import java.util.Collection;
-
-import static java.util.Collections.emptySet;
+import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HttpHeadersProvider;
 
 public class EmptyHttpHeadersProvidersFactory implements HttpHeadersProvidersFactory {
 
-    @Override
-    public Collection<HttpHeadersProvider> createAll() {
-        return emptySet();
-    }
+  @Override
+  public Collection<HttpHeadersProvider> createAll() {
+    return emptySet();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http1ClientParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http1ClientParameters.java
index 41412d908c..a576b29b58 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http1ClientParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http1ClientParameters.java
@@ -2,6 +2,5 @@
 
 public interface Http1ClientParameters extends HttpClientParameters {
 
-    int getMaxConnectionsPerDestination();
-
+  int getMaxConnectionsPerDestination();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http2ClientHolder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http2ClientHolder.java
index 3514906f16..f42ae7882c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http2ClientHolder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http2ClientHolder.java
@@ -1,18 +1,17 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.HttpClient;
-
 import java.util.Optional;
+import org.eclipse.jetty.client.HttpClient;
 
 public class Http2ClientHolder {
 
-    private final HttpClient http2Client;
+  private final HttpClient http2Client;
 
-    public Http2ClientHolder(HttpClient http2Client) {
-        this.http2Client = http2Client;
-    }
+  public Http2ClientHolder(HttpClient http2Client) {
+    this.http2Client = http2Client;
+  }
 
-    Optional<HttpClient> getHttp2Client() {
-        return Optional.ofNullable(http2Client);
-    }
+  Optional<HttpClient> getHttp2Client() {
+    return Optional.ofNullable(http2Client);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http2ClientParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http2ClientParameters.java
index 3e3c9c3170..e14ead01f5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http2ClientParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/Http2ClientParameters.java
@@ -1,6 +1,3 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-
-public interface Http2ClientParameters extends HttpClientParameters {
-
-}
+public interface Http2ClientParameters extends HttpClientParameters {}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpBatchSenderException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpBatchSenderException.java
index 6be23ce272..4776e143f4 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpBatchSenderException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpBatchSenderException.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
 class HttpBatchSenderException extends RuntimeException {
-    HttpBatchSenderException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  HttpBatchSenderException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientParameters.java
index 63da1e530f..416686b143 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientParameters.java
@@ -4,15 +4,15 @@
 
 public interface HttpClientParameters {
 
-        int getThreadPoolSize();
+  int getThreadPoolSize();
 
-        boolean isThreadPoolMonitoringEnabled();
+  boolean isThreadPoolMonitoringEnabled();
 
-        boolean isFollowRedirectsEnabled();
+  boolean isFollowRedirectsEnabled();
 
-        Duration getIdleTimeout();
+  Duration getIdleTimeout();
 
-        int getMaxRequestsQueuedPerDestination();
+  int getMaxRequestsQueuedPerDestination();
 
-        Duration getConnectionTimeout();
+  Duration getConnectionTimeout();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsFactory.java
index 8784afb9bc..daef1ad234 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsFactory.java
@@ -1,71 +1,78 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
+import java.util.concurrent.ExecutorService;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.http.HttpCookieStore;
 import org.eclipse.jetty.http2.client.HTTP2Client;
-import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;
+import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2;
 import org.eclipse.jetty.io.ClientConnector;
-import org.eclipse.jetty.util.HttpCookieStore;
 import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory;
 
-import java.util.concurrent.ExecutorService;
-
 public class HttpClientsFactory {
 
-    private final InstrumentedExecutorServiceFactory executorFactory;
-    private final SslContextFactoryProvider sslContextFactoryProvider;
+  private final InstrumentedExecutorServiceFactory executorFactory;
+  private final SslContextFactoryProvider sslContextFactoryProvider;
 
-    public HttpClientsFactory(
-            InstrumentedExecutorServiceFactory executorFactory,
-            SslContextFactoryProvider sslContextFactoryProvider) {
-        this.executorFactory = executorFactory;
-        this.sslContextFactoryProvider = sslContextFactoryProvider;
-    }
+  public HttpClientsFactory(
+      InstrumentedExecutorServiceFactory executorFactory,
+      SslContextFactoryProvider sslContextFactoryProvider) {
+    this.executorFactory = executorFactory;
+    this.sslContextFactoryProvider = sslContextFactoryProvider;
+  }
 
-    public HttpClient createClientForHttp1(String name, Http1ClientParameters http1ClientParameters) {
-        ClientConnector clientConnector = new ClientConnector();
-        sslContextFactoryProvider.provideSslContextFactory()
-                .ifPresent(clientConnector::setSslContextFactory);
-        HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP(clientConnector);
-        HttpClient client = new HttpClient(transport);
+  public HttpClient createClientForHttp1(String name, Http1ClientParameters http1ClientParameters) {
+    ClientConnector clientConnector = new ClientConnector();
+    sslContextFactoryProvider
+        .provideSslContextFactory()
+        .ifPresent(clientConnector::setSslContextFactory);
+    HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP(clientConnector);
+    HttpClient client = new HttpClient(transport);
 
-        ExecutorService executor = executorFactory.getExecutorService(
-                name,
-                http1ClientParameters.getThreadPoolSize(),
-                http1ClientParameters.isThreadPoolMonitoringEnabled());
-        client.setExecutor(executor);
-        client.setMaxConnectionsPerDestination(http1ClientParameters.getMaxConnectionsPerDestination());
-        client.setMaxRequestsQueuedPerDestination(http1ClientParameters.getMaxRequestsQueuedPerDestination());
-        client.setCookieStore(new HttpCookieStore.Empty());
-        client.setIdleTimeout(http1ClientParameters.getIdleTimeout().toMillis());
-        client.setFollowRedirects(http1ClientParameters.isFollowRedirectsEnabled());
-        client.setConnectTimeout(http1ClientParameters.getConnectionTimeout().toMillis());
-        return client;
-    }
+    ExecutorService executor =
+        executorFactory.getExecutorService(
+            name,
+            http1ClientParameters.getThreadPoolSize(),
+            http1ClientParameters.isThreadPoolMonitoringEnabled());
+    client.setExecutor(executor);
+    client.setMaxConnectionsPerDestination(http1ClientParameters.getMaxConnectionsPerDestination());
+    client.setMaxRequestsQueuedPerDestination(
+        http1ClientParameters.getMaxRequestsQueuedPerDestination());
+    client.setHttpCookieStore(new HttpCookieStore.Empty());
+    client.setIdleTimeout(http1ClientParameters.getIdleTimeout().toMillis());
+    client.setFollowRedirects(http1ClientParameters.isFollowRedirectsEnabled());
+    client.setConnectTimeout(http1ClientParameters.getConnectionTimeout().toMillis());
+    return client;
+  }
 
-    public HttpClient createClientForHttp2(String name, Http2ClientParameters http2ClientParameters) {
-        ClientConnector clientConnector = new ClientConnector();
-        sslContextFactoryProvider.provideSslContextFactory()
-                .ifPresentOrElse(clientConnector::setSslContextFactory,
-                        () -> {
-                            throw new  IllegalStateException("Cannot create http/2 client due to lack of ssl context factory");
-                        });
-        HTTP2Client http2Client = new HTTP2Client(clientConnector);
+  public HttpClient createClientForHttp2(String name, Http2ClientParameters http2ClientParameters) {
+    ClientConnector clientConnector = new ClientConnector();
+    sslContextFactoryProvider
+        .provideSslContextFactory()
+        .ifPresentOrElse(
+            clientConnector::setSslContextFactory,
+            () -> {
+              throw new IllegalStateException(
+                  "Cannot create http/2 client due to lack of ssl context factory");
+            });
+    HTTP2Client http2Client = new HTTP2Client(clientConnector);
 
-        ExecutorService executor = executorFactory.getExecutorService(
-                name,
-                http2ClientParameters.getThreadPoolSize(),
-                http2ClientParameters.isThreadPoolMonitoringEnabled());
-        http2Client.setExecutor(executor);
+    ExecutorService executor =
+        executorFactory.getExecutorService(
+            name,
+            http2ClientParameters.getThreadPoolSize(),
+            http2ClientParameters.isThreadPoolMonitoringEnabled());
+    http2Client.setExecutor(executor);
 
-        HttpClientTransportOverHTTP2 transport = new HttpClientTransportOverHTTP2(http2Client);
-        HttpClient client = new HttpClient(transport);
+    HttpClientTransportOverHTTP2 transport = new HttpClientTransportOverHTTP2(http2Client);
+    HttpClient client = new HttpClient(transport);
 
-        client.setMaxRequestsQueuedPerDestination(http2ClientParameters.getMaxRequestsQueuedPerDestination());
-        client.setCookieStore(new HttpCookieStore.Empty());
-        client.setIdleTimeout(http2ClientParameters.getIdleTimeout().toMillis());
-        client.setFollowRedirects(http2ClientParameters.isFollowRedirectsEnabled());
-        client.setConnectTimeout(http2ClientParameters.getConnectionTimeout().toMillis());
-        return client;
-    }
+    client.setMaxRequestsQueuedPerDestination(
+        http2ClientParameters.getMaxRequestsQueuedPerDestination());
+    client.setHttpCookieStore(new HttpCookieStore.Empty());
+    client.setIdleTimeout(http2ClientParameters.getIdleTimeout().toMillis());
+    client.setFollowRedirects(http2ClientParameters.isFollowRedirectsEnabled());
+    client.setConnectTimeout(http2ClientParameters.getConnectionTimeout().toMillis());
+    return client;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporter.java
index f6d36ba6ec..1effa5c7f0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporter.java
@@ -1,169 +1,181 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
+import java.util.Queue;
+import java.util.function.Function;
+import java.util.stream.Stream;
 import org.eclipse.jetty.client.ConnectionPool;
 import org.eclipse.jetty.client.DuplexConnectionPool;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.HttpDestination;
 import org.eclipse.jetty.client.MultiplexConnectionPool;
+import org.eclipse.jetty.client.transport.HttpDestination;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 
-import java.util.Queue;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
 public class HttpClientsWorkloadReporter {
 
-    private final MetricsFacade metrics;
-    private final HttpClient http1SerialClient;
-    private final HttpClient http1BatchClient;
-    private final Http2ClientHolder http2ClientHolder;
-    private final boolean isRequestQueueMonitoringEnabled;
-    private final boolean isConnectionPoolMonitoringEnabled;
-
-    public HttpClientsWorkloadReporter(
-            MetricsFacade metrics,
-            HttpClient http1SerialClient,
-            HttpClient http1BatchClient,
-            Http2ClientHolder http2ClientHolder,
-            boolean isRequestQueueMonitoringEnabled,
-            boolean isConnectionPoolMonitoringEnabled
-    ) {
-        this.metrics = metrics;
-        this.http1SerialClient = http1SerialClient;
-        this.http1BatchClient = http1BatchClient;
-        this.http2ClientHolder = http2ClientHolder;
-        this.isRequestQueueMonitoringEnabled = isRequestQueueMonitoringEnabled;
-        this.isConnectionPoolMonitoringEnabled = isConnectionPoolMonitoringEnabled;
-    }
-
-    public void start() {
-        if (isRequestQueueMonitoringEnabled) {
-            registerRequestQueueSizeGauges();
-        }
-        if (isConnectionPoolMonitoringEnabled) {
-            registerConnectionGauges();
-        }
-    }
-
-    private void registerRequestQueueSizeGauges() {
-        metrics.consumerSender()
-                .registerRequestQueueSizeGauge(this, HttpClientsWorkloadReporter::getQueuesSize);
-        metrics.consumerSender()
-                .registerHttp1SerialClientRequestQueueSizeGauge(this, HttpClientsWorkloadReporter::getHttp1SerialQueueSize);
-        metrics.consumerSender()
-                .registerHttp1BatchClientRequestQueueSizeGauge(this, HttpClientsWorkloadReporter::getHttp1BatchQueueSize);
-        metrics.consumerSender()
-                .registerHttp2RequestQueueSizeGauge(this, HttpClientsWorkloadReporter::getHttp2SerialQueueSize);
-    }
-
-    private void registerConnectionGauges() {
-        metrics.consumerSender()
-                .registerHttp1SerialClientActiveConnectionsGauge(this, HttpClientsWorkloadReporter::getHttp1SerialActiveConnections);
-        metrics.consumerSender()
-                .registerHttp1SerialClientIdleConnectionsGauge(this, HttpClientsWorkloadReporter::getHttp1SerialIdleConnections);
-        metrics.consumerSender()
-                .registerHttp1BatchClientActiveConnectionsGauge(this, HttpClientsWorkloadReporter::getHttp1BatchActiveConnections);
-        metrics.consumerSender()
-                .registerHttp1BatchClientIdleConnectionsGauge(this, HttpClientsWorkloadReporter::getHttp1BatchIdleConnections);
-        metrics.consumerSender()
-                .registerHttp2SerialClientConnectionsGauge(this, HttpClientsWorkloadReporter::getHttp2SerialConnections);
-        metrics.consumerSender()
-                .registerHttp2SerialClientPendingConnectionsGauge(this, HttpClientsWorkloadReporter::getHttp2SerialPendingConnections);
-    }
-
-    int getQueuesSize() {
-        return getHttp1SerialQueueSize() + getHttp1BatchQueueSize() + getHttp2SerialQueueSize();
-    }
-
-    int getHttp1SerialQueueSize() {
-        return getQueueSize.apply(http1SerialClient);
-    }
-
-    int getHttp1BatchQueueSize() {
-        return getQueueSize.apply(http1BatchClient);
-    }
-
-
-    int getHttp2SerialQueueSize() {
-        return http2ClientHolder.getHttp2Client()
-                .map(getQueueSize)
-                .orElse(0);
-    }
-
-    private int getHttp1SerialActiveConnections() {
-        return getHttp1ActiveConnectionsCount.apply(http1SerialClient);
-    }
-
-    private int getHttp1SerialIdleConnections() {
-        return getHttp1IdleConnectionsCount.apply(http1SerialClient);
-    }
-
-    private int getHttp1BatchActiveConnections() {
-        return getHttp1ActiveConnectionsCount.apply(http1BatchClient);
-    }
-
-    private int getHttp1BatchIdleConnections() {
-        return getHttp1IdleConnectionsCount.apply(http1BatchClient);
-    }
-
-    private int getHttp2SerialConnections() {
-        return http2ClientHolder.getHttp2Client()
-                .map(getHttp2ConnectionsCount)
-                .orElse(0);
-    }
-
-    private int getHttp2SerialPendingConnections() {
-        return http2ClientHolder.getHttp2Client()
-                .map(getHttp2PendingConnectionsCount)
-                .orElse(0);
-    }
-
-    private final Function<HttpClient, Integer> getQueueSize = httpClient ->
-            httpClient.getDestinations().stream()
-                    .map(HttpDestination.class::cast)
-                    .map(HttpDestination::getHttpExchanges)
-                    .map(Queue::size)
-                    .mapToInt(i -> i)
-                    .sum();
-
-    private final Function<HttpClient, Integer> getHttp1ActiveConnectionsCount = httpClient ->
-            getHttp1ConnectionPool(httpClient)
-                    .map(DuplexConnectionPool::getActiveConnectionCount)
-                    .mapToInt(i -> i)
-                    .sum();
-
-    private final Function<HttpClient, Integer> getHttp1IdleConnectionsCount = httpClient ->
-            getHttp1ConnectionPool(httpClient)
-                    .map(DuplexConnectionPool::getIdleConnectionCount)
-                    .mapToInt(i -> i)
-                    .sum();
-
-    private final Function<HttpClient, Integer> getHttp2ConnectionsCount = http2Client ->
-            getHttp2ConnectionPool(http2Client)
-                    .map(MultiplexConnectionPool::getConnectionCount)
-                    .mapToInt(i -> i)
-                    .sum();
-
-    private final Function<HttpClient, Integer> getHttp2PendingConnectionsCount = http2Client ->
-            getHttp2ConnectionPool(http2Client)
-                    .map(MultiplexConnectionPool::getPendingConnectionCount)
-                    .mapToInt(i -> i)
-                    .sum();
-
-    private Stream<ConnectionPool> getConnectionPool(HttpClient httpClient) {
-        return httpClient.getDestinations().stream()
-                .map(HttpDestination.class::cast)
-                .map(HttpDestination::getConnectionPool);
-    }
-
-    private Stream<DuplexConnectionPool> getHttp1ConnectionPool(HttpClient httpClient) {
-        return getConnectionPool(httpClient)
-                .map(DuplexConnectionPool.class::cast);
-    }
-
-    private Stream<MultiplexConnectionPool> getHttp2ConnectionPool(HttpClient http2Client) {
-        return getConnectionPool(http2Client)
-                .map(MultiplexConnectionPool.class::cast);
-    }
-
+  private final MetricsFacade metrics;
+  private final HttpClient http1SerialClient;
+  private final HttpClient http1BatchClient;
+  private final Http2ClientHolder http2ClientHolder;
+  private final boolean isRequestQueueMonitoringEnabled;
+  private final boolean isConnectionPoolMonitoringEnabled;
+
+  public HttpClientsWorkloadReporter(
+      MetricsFacade metrics,
+      HttpClient http1SerialClient,
+      HttpClient http1BatchClient,
+      Http2ClientHolder http2ClientHolder,
+      boolean isRequestQueueMonitoringEnabled,
+      boolean isConnectionPoolMonitoringEnabled) {
+    this.metrics = metrics;
+    this.http1SerialClient = http1SerialClient;
+    this.http1BatchClient = http1BatchClient;
+    this.http2ClientHolder = http2ClientHolder;
+    this.isRequestQueueMonitoringEnabled = isRequestQueueMonitoringEnabled;
+    this.isConnectionPoolMonitoringEnabled = isConnectionPoolMonitoringEnabled;
+  }
+
+  public void start() {
+    if (isRequestQueueMonitoringEnabled) {
+      registerRequestQueueSizeGauges();
+    }
+    if (isConnectionPoolMonitoringEnabled) {
+      registerConnectionGauges();
+    }
+  }
+
+  private void registerRequestQueueSizeGauges() {
+    metrics
+        .consumerSender()
+        .registerRequestQueueSizeGauge(this, HttpClientsWorkloadReporter::getQueuesSize);
+    metrics
+        .consumerSender()
+        .registerHttp1SerialClientRequestQueueSizeGauge(
+            this, HttpClientsWorkloadReporter::getHttp1SerialQueueSize);
+    metrics
+        .consumerSender()
+        .registerHttp1BatchClientRequestQueueSizeGauge(
+            this, HttpClientsWorkloadReporter::getHttp1BatchQueueSize);
+    metrics
+        .consumerSender()
+        .registerHttp2RequestQueueSizeGauge(
+            this, HttpClientsWorkloadReporter::getHttp2SerialQueueSize);
+  }
+
+  private void registerConnectionGauges() {
+    metrics
+        .consumerSender()
+        .registerHttp1SerialClientActiveConnectionsGauge(
+            this, HttpClientsWorkloadReporter::getHttp1SerialActiveConnections);
+    metrics
+        .consumerSender()
+        .registerHttp1SerialClientIdleConnectionsGauge(
+            this, HttpClientsWorkloadReporter::getHttp1SerialIdleConnections);
+    metrics
+        .consumerSender()
+        .registerHttp1BatchClientActiveConnectionsGauge(
+            this, HttpClientsWorkloadReporter::getHttp1BatchActiveConnections);
+    metrics
+        .consumerSender()
+        .registerHttp1BatchClientIdleConnectionsGauge(
+            this, HttpClientsWorkloadReporter::getHttp1BatchIdleConnections);
+    metrics
+        .consumerSender()
+        .registerHttp2SerialClientConnectionsGauge(
+            this, HttpClientsWorkloadReporter::getHttp2SerialConnections);
+    metrics
+        .consumerSender()
+        .registerHttp2SerialClientPendingConnectionsGauge(
+            this, HttpClientsWorkloadReporter::getHttp2SerialPendingConnections);
+  }
+
+  int getQueuesSize() {
+    return getHttp1SerialQueueSize() + getHttp1BatchQueueSize() + getHttp2SerialQueueSize();
+  }
+
+  int getHttp1SerialQueueSize() {
+    return getQueueSize.apply(http1SerialClient);
+  }
+
+  int getHttp1BatchQueueSize() {
+    return getQueueSize.apply(http1BatchClient);
+  }
+
+  int getHttp2SerialQueueSize() {
+    return http2ClientHolder.getHttp2Client().map(getQueueSize).orElse(0);
+  }
+
+  private int getHttp1SerialActiveConnections() {
+    return getHttp1ActiveConnectionsCount.apply(http1SerialClient);
+  }
+
+  private int getHttp1SerialIdleConnections() {
+    return getHttp1IdleConnectionsCount.apply(http1SerialClient);
+  }
+
+  private int getHttp1BatchActiveConnections() {
+    return getHttp1ActiveConnectionsCount.apply(http1BatchClient);
+  }
+
+  private int getHttp1BatchIdleConnections() {
+    return getHttp1IdleConnectionsCount.apply(http1BatchClient);
+  }
+
+  private int getHttp2SerialConnections() {
+    return http2ClientHolder.getHttp2Client().map(getHttp2ConnectionsCount).orElse(0);
+  }
+
+  private int getHttp2SerialPendingConnections() {
+    return http2ClientHolder.getHttp2Client().map(getHttp2PendingConnectionsCount).orElse(0);
+  }
+
+  private final Function<HttpClient, Integer> getQueueSize =
+      httpClient ->
+          httpClient.getDestinations().stream()
+              .map(HttpDestination.class::cast)
+              .map(HttpDestination::getHttpExchanges)
+              .map(Queue::size)
+              .mapToInt(i -> i)
+              .sum();
+
+  private final Function<HttpClient, Integer> getHttp1ActiveConnectionsCount =
+      httpClient ->
+          getHttp1ConnectionPool(httpClient)
+              .map(DuplexConnectionPool::getActiveConnectionCount)
+              .mapToInt(i -> i)
+              .sum();
+
+  private final Function<HttpClient, Integer> getHttp1IdleConnectionsCount =
+      httpClient ->
+          getHttp1ConnectionPool(httpClient)
+              .map(DuplexConnectionPool::getIdleConnectionCount)
+              .mapToInt(i -> i)
+              .sum();
+
+  private final Function<HttpClient, Integer> getHttp2ConnectionsCount =
+      http2Client ->
+          getHttp2ConnectionPool(http2Client)
+              .map(MultiplexConnectionPool::getConnectionCount)
+              .mapToInt(i -> i)
+              .sum();
+
+  private final Function<HttpClient, Integer> getHttp2PendingConnectionsCount =
+      http2Client ->
+          getHttp2ConnectionPool(http2Client)
+              .map(MultiplexConnectionPool::getPendingConnectionCount)
+              .mapToInt(i -> i)
+              .sum();
+
+  private Stream<ConnectionPool> getConnectionPool(HttpClient httpClient) {
+    return httpClient.getDestinations().stream()
+        .map(HttpDestination.class::cast)
+        .map(HttpDestination::getConnectionPool);
+  }
+
+  private Stream<DuplexConnectionPool> getHttp1ConnectionPool(HttpClient httpClient) {
+    return getConnectionPool(httpClient).map(DuplexConnectionPool.class::cast);
+  }
+
+  private Stream<MultiplexConnectionPool> getHttp2ConnectionPool(HttpClient http2Client) {
+    return getConnectionPool(http2Client).map(MultiplexConnectionPool.class::cast);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpHeadersProvidersFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpHeadersProvidersFactory.java
index 6906fa59bc..ef51d29151 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpHeadersProvidersFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpHeadersProvidersFactory.java
@@ -1,10 +1,9 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HttpHeadersProvider;
-
 import java.util.Collection;
+import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HttpHeadersProvider;
 
 public interface HttpHeadersProvidersFactory {
 
-    Collection<HttpHeadersProvider> createAll();
+  Collection<HttpHeadersProvider> createAll();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpMessageBatchSenderFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpMessageBatchSenderFactory.java
index 3253e94cc7..9d3e613e78 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpMessageBatchSenderFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpMessageBatchSenderFactory.java
@@ -1,35 +1,34 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageBatchSender;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageBatchSenderFactory;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.DefaultBatchHeadersProvider;
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.SimpleEndpointAddressResolver;
 
-import static com.google.common.base.Preconditions.checkState;
-
 public class HttpMessageBatchSenderFactory implements MessageBatchSenderFactory {
 
-    private final SendingResultHandlers resultHandlers;
-    private final BatchHttpRequestFactory batchHttpRequestFactory;
-
-    public HttpMessageBatchSenderFactory(SendingResultHandlers resultHandlers,
-                                         BatchHttpRequestFactory batchHttpRequestFactory
-    ) {
-        this.resultHandlers = resultHandlers;
-        this.batchHttpRequestFactory = batchHttpRequestFactory;
-    }
-
-
-    @Override
-    public MessageBatchSender create(Subscription subscription) {
-        checkState(subscription.getEndpoint().getProtocol().contains("http"), "Batching is only supported for http/s currently.");
-
-
-        return new JettyMessageBatchSender(
-                batchHttpRequestFactory,
-                new SimpleEndpointAddressResolver(),
-                resultHandlers,
-                new DefaultBatchHeadersProvider());
-    }
+  private final SendingResultHandlers resultHandlers;
+  private final BatchHttpRequestFactory batchHttpRequestFactory;
+
+  public HttpMessageBatchSenderFactory(
+      SendingResultHandlers resultHandlers, BatchHttpRequestFactory batchHttpRequestFactory) {
+    this.resultHandlers = resultHandlers;
+    this.batchHttpRequestFactory = batchHttpRequestFactory;
+  }
+
+  @Override
+  public MessageBatchSender create(Subscription subscription) {
+    checkState(
+        subscription.getEndpoint().getProtocol().contains("http"),
+        "Batching is only supported for http/s currently.");
+
+    return new JettyMessageBatchSender(
+        batchHttpRequestFactory,
+        new SimpleEndpointAddressResolver(),
+        resultHandlers,
+        new DefaultBatchHeadersProvider());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestData.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestData.java
index 25869cb036..196a98d20d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestData.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestData.java
@@ -4,26 +4,26 @@
 
 public class HttpRequestData {
 
-    private EndpointAddress rawAddress;
+  private EndpointAddress rawAddress;
 
-    public HttpRequestData(EndpointAddress rawAddress) {
-        this.rawAddress = rawAddress;
-    }
+  public HttpRequestData(EndpointAddress rawAddress) {
+    this.rawAddress = rawAddress;
+  }
 
-    public EndpointAddress getRawAddress() {
-        return rawAddress;
-    }
+  public EndpointAddress getRawAddress() {
+    return rawAddress;
+  }
 
-    public static class HttpRequestDataBuilder {
-        private EndpointAddress rawAddress;
+  public static class HttpRequestDataBuilder {
+    private EndpointAddress rawAddress;
 
-        public HttpRequestDataBuilder withRawAddress(EndpointAddress rawAddress) {
-            this.rawAddress = rawAddress;
-            return this;
-        }
+    public HttpRequestDataBuilder withRawAddress(EndpointAddress rawAddress) {
+      this.rawAddress = rawAddress;
+      return this;
+    }
 
-        public HttpRequestData build() {
-            return new HttpRequestData(rawAddress);
-        }
+    public HttpRequestData build() {
+      return new HttpRequestData(rawAddress);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestFactory.java
index dcd432d4c3..2970c957b5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestFactory.java
@@ -1,11 +1,10 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.api.Request;
+import java.net.URI;
+import org.eclipse.jetty.client.Request;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HttpRequestHeaders;
 
-import java.net.URI;
-
 public interface HttpRequestFactory {
-    Request buildRequest(Message message, URI uri, HttpRequestHeaders headers);
+  Request buildRequest(Message message, URI uri, HttpRequestHeaders headers);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestFactoryProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestFactoryProvider.java
index 7e0ffe4408..9ee4f83515 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestFactoryProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpRequestFactoryProvider.java
@@ -1,10 +1,11 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
 public interface HttpRequestFactoryProvider {
-    HttpRequestFactory provideRequestFactory(Subscription subscription, HttpClient httpClient, MetadataAppender<Request> metadataAppender);
+  HttpRequestFactory provideRequestFactory(
+      Subscription subscription, HttpClient httpClient, MetadataAppender<Request> metadataAppender);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastMessageSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastMessageSender.java
index 07ec0a5536..4e515c3338 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastMessageSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastMessageSender.java
@@ -1,7 +1,18 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
 import com.google.common.collect.ImmutableList;
-import org.eclipse.jetty.client.api.Request;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.eclipse.jetty.client.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSender;
@@ -14,89 +25,116 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.EndpointAddressResolutionException;
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.ResolvableEndpointAddress;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 public class JettyBroadCastMessageSender implements MessageSender {
 
-    private final HttpRequestFactory requestFactory;
-    private final ResolvableEndpointAddress endpoint;
-    private final HttpHeadersProvider requestHeadersProvider;
-    private final SendingResultHandlers sendingResultHandlers;
-    private final Function<Throwable, SingleMessageSendingResult> exceptionMapper = MessageSendingResult::failedResult;
-    private final ResilientMessageSender resilientMessageSender;
-
-    public JettyBroadCastMessageSender(HttpRequestFactory requestFactory,
-                                       ResolvableEndpointAddress endpoint,
-                                       HttpHeadersProvider requestHeadersProvider,
-                                       SendingResultHandlers sendingResultHandlers,
-                                       ResilientMessageSender resilientMessageSender
-    ) {
-        this.requestFactory = requestFactory;
-        this.endpoint = endpoint;
-        this.requestHeadersProvider = requestHeadersProvider;
-        this.sendingResultHandlers = sendingResultHandlers;
-        this.resilientMessageSender = resilientMessageSender;
+  private static final Logger logger = LoggerFactory.getLogger(JettyBroadCastMessageSender.class);
+
+  private final HttpRequestFactory requestFactory;
+  private final ResolvableEndpointAddress endpoint;
+  private final HttpHeadersProvider requestHeadersProvider;
+  private final SendingResultHandlers sendingResultHandlers;
+  private final Function<Throwable, SingleMessageSendingResult> exceptionMapper =
+      MessageSendingResult::failedResult;
+  private final ResilientMessageSender resilientMessageSender;
+
+  public JettyBroadCastMessageSender(
+      HttpRequestFactory requestFactory,
+      ResolvableEndpointAddress endpoint,
+      HttpHeadersProvider requestHeadersProvider,
+      SendingResultHandlers sendingResultHandlers,
+      ResilientMessageSender resilientMessageSender) {
+    this.requestFactory = requestFactory;
+    this.endpoint = endpoint;
+    this.requestHeadersProvider = requestHeadersProvider;
+    this.sendingResultHandlers = sendingResultHandlers;
+    this.resilientMessageSender = resilientMessageSender;
+  }
+
+  @Override
+  public CompletableFuture<MessageSendingResult> send(Message message) {
+    try {
+      return sendMessage(message).thenApply(MultiMessageSendingResult::new);
+    } catch (Exception exception) {
+      return CompletableFuture.completedFuture(exceptionMapper.apply(exception));
     }
-
-    @Override
-    public CompletableFuture<MessageSendingResult> send(Message message) {
-        try {
-            return sendMessage(message).thenApply(MultiMessageSendingResult::new);
-        } catch (Exception exception) {
-            return CompletableFuture.completedFuture(exceptionMapper.apply(exception));
-        }
+  }
+
+  private CompletableFuture<List<SingleMessageSendingResult>> sendMessage(Message message) {
+    try {
+      Set<CompletableFuture<SingleMessageSendingResult>> results = collectResults(message);
+      return mergeResults(results);
+    } catch (EndpointAddressResolutionException exception) {
+      return CompletableFuture.completedFuture(
+          Collections.singletonList(exceptionMapper.apply(exception)));
     }
-
-    private CompletableFuture<List<SingleMessageSendingResult>> sendMessage(Message message) {
-        try {
-            List<CompletableFuture<SingleMessageSendingResult>> results = collectResults(message);
-            return mergeResults(results);
-        } catch (EndpointAddressResolutionException exception) {
-            return CompletableFuture.completedFuture(Collections.singletonList(exceptionMapper.apply(exception)));
-        }
+  }
+
+  private Set<CompletableFuture<SingleMessageSendingResult>> collectResults(Message message)
+      throws EndpointAddressResolutionException {
+    var currentResults = sendPendingMessages(message);
+    var results = new HashSet<>(currentResults);
+
+    // add previously succeeded uris to the result set so that successful uris from all attempts are
+    // retained.
+    // this way a MessageSendingResult can be considered successful even when the last send attempt
+    // did not send to any uri, e.g. because all uris returned by endpoint resolver were already
+    // sent to in the past.
+    for (String succeededUri : message.getSucceededUris()) {
+      try {
+        var uri = new URI(succeededUri);
+        var result = MessageSendingResult.succeededResult(uri);
+        results.add(CompletableFuture.completedFuture(result));
+      } catch (URISyntaxException exception) {
+        logger.error("Error while parsing already sent broadcast URI {}", succeededUri, exception);
+      }
     }
-
-    private List<CompletableFuture<SingleMessageSendingResult>> collectResults(
-            Message message
-    ) throws EndpointAddressResolutionException {
-
-        final HttpRequestData requestData = new HttpRequestDataBuilder()
-                .withRawAddress(endpoint.getRawAddress())
-                .build();
-
-        HttpRequestHeaders headers = requestHeadersProvider.getHeaders(message, requestData);
-
-        return endpoint.resolveAllFor(message).stream()
-                .filter(uri -> message.hasNotBeenSentTo(uri.toString()))
-                .map(uri -> requestFactory.buildRequest(message, uri, headers))
-                .map(this::processResponse)
-                .collect(Collectors.toList());
-    }
-
-    private CompletableFuture<List<SingleMessageSendingResult>> mergeResults(List<CompletableFuture<SingleMessageSendingResult>> results) {
-        return CompletableFuture.allOf(results.toArray(new CompletableFuture[results.size()]))
-                .thenApply(v -> results.stream()
-                        .map(CompletableFuture::join)
-                        .reduce(
-                                ImmutableList.<SingleMessageSendingResult>builder(),
-                                (builder, element) -> builder.add(element),
-                                (listA, listB) -> listA.addAll(listB.build())
-                        ).build());
+    return results;
+  }
+
+  private Set<CompletableFuture<SingleMessageSendingResult>> sendPendingMessages(Message message)
+      throws EndpointAddressResolutionException {
+    final HttpRequestData requestData =
+        new HttpRequestDataBuilder().withRawAddress(endpoint.getRawAddress()).build();
+
+    HttpRequestHeaders headers = requestHeadersProvider.getHeaders(message, requestData);
+
+    List<URI> resolvedUris =
+        endpoint.resolveAllFor(message).stream()
+            .filter(uri -> message.hasNotBeenSentTo(uri.toString()))
+            .toList();
+
+    if (resolvedUris.isEmpty()) {
+      logger.debug("Empty resolved URIs for message: {}", message.getId());
+      return Collections.emptySet();
+    } else {
+      return resolvedUris.stream()
+          .map(uri -> requestFactory.buildRequest(message, uri, headers))
+          .map(this::processResponse)
+          .collect(Collectors.toSet());
     }
-
-    private CompletableFuture<SingleMessageSendingResult> processResponse(Request request) {
-        return resilientMessageSender.send(
-                resultFuture -> request.send(sendingResultHandlers.handleSendingResultForBroadcast(resultFuture)),
-                exceptionMapper);
-
-    }
-
-    @Override
-    public void stop() {
-    }
-
+  }
+
+  private CompletableFuture<List<SingleMessageSendingResult>> mergeResults(
+      Set<CompletableFuture<SingleMessageSendingResult>> results) {
+    return CompletableFuture.allOf(results.toArray(new CompletableFuture[results.size()]))
+        .thenApply(
+            v ->
+                results.stream()
+                    .map(CompletableFuture::join)
+                    .reduce(
+                        ImmutableList.<SingleMessageSendingResult>builder(),
+                        (builder, element) -> builder.add(element),
+                        (listA, listB) -> listA.addAll(listB.build()))
+                    .build());
+  }
+
+  private CompletableFuture<SingleMessageSendingResult> processResponse(Request request) {
+    return resilientMessageSender.send(
+        resultFuture ->
+            request.send(sendingResultHandlers.handleSendingResultForBroadcast(resultFuture)),
+        exceptionMapper);
+  }
+
+  @Override
+  public void stop() {}
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastResponseListener.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastResponseListener.java
index 980ea7a3f8..f11233f9bb 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastResponseListener.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastResponseListener.java
@@ -1,23 +1,22 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.api.Result;
-import org.eclipse.jetty.client.util.BufferingResponseListener;
+import java.util.concurrent.CompletableFuture;
+import org.eclipse.jetty.client.BufferingResponseListener;
+import org.eclipse.jetty.client.Result;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 import pl.allegro.tech.hermes.consumers.consumer.sender.SingleMessageSendingResult;
 
-import java.util.concurrent.CompletableFuture;
-
 public class JettyBroadCastResponseListener extends BufferingResponseListener {
 
-    CompletableFuture<SingleMessageSendingResult> resultFuture;
-
-    public JettyBroadCastResponseListener(CompletableFuture<SingleMessageSendingResult> resultFuture) {
-        this.resultFuture = resultFuture;
-    }
+  CompletableFuture<SingleMessageSendingResult> resultFuture;
 
-    @Override
-    public void onComplete(Result result) {
-        resultFuture.complete(MessageSendingResult.of(result));
-    }
+  public JettyBroadCastResponseListener(
+      CompletableFuture<SingleMessageSendingResult> resultFuture) {
+    this.resultFuture = resultFuture;
+  }
 
-}
\ No newline at end of file
+  @Override
+  public void onComplete(Result result) {
+    resultFuture.complete(MessageSendingResult.of(result));
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyHttpMessageSenderProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyHttpMessageSenderProvider.java
index ab0eaf966b..8a0abad58b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyHttpMessageSenderProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyHttpMessageSenderProvider.java
@@ -1,8 +1,11 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
 import com.google.common.collect.ImmutableSet;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.EndpointAddress;
@@ -24,149 +27,152 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.ResolvableEndpointAddress;
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
-import java.util.Collection;
-import java.util.Optional;
-import java.util.Set;
-
 public class JettyHttpMessageSenderProvider implements ProtocolMessageSenderProvider {
 
-    private static final Logger logger = LoggerFactory.getLogger(JettyHttpMessageSenderProvider.class);
-
-    private static final HttpHeadersProvider http1HeadersProvider = new Http1HeadersProvider();
-    private static final HttpHeadersProvider http2HeadersProvider = new Http2HeadersProvider();
-
-    private final HttpClient httpClient;
-    private final Http2ClientHolder http2ClientHolder;
-    private final EndpointAddressResolver endpointAddressResolver;
-    private final MetadataAppender<Request> metadataAppender;
-    private final HttpAuthorizationProviderFactory authorizationProviderFactory;
-    private final HttpHeadersProvidersFactory httpHeadersProviderFactory;
-    private final SendingResultHandlers sendingResultHandlers;
-    private final HttpRequestFactoryProvider requestFactoryProvider;
-    private final Set<String> supportedProtocols;
-
-    public JettyHttpMessageSenderProvider(
-            HttpClient httpClient,
-            Http2ClientHolder http2ClientHolder,
-            EndpointAddressResolver endpointAddressResolver,
-            MetadataAppender<Request> metadataAppender,
-            HttpAuthorizationProviderFactory authorizationProviderFactory,
-            HttpHeadersProvidersFactory httpHeadersProviderFactory,
-            SendingResultHandlers sendingResultHandlers,
-            HttpRequestFactoryProvider requestFactoryProvider,
-            Set<String> supportedProtocols) {
-        this.httpClient = httpClient;
-        this.http2ClientHolder = http2ClientHolder;
-        this.endpointAddressResolver = endpointAddressResolver;
-        this.metadataAppender = metadataAppender;
-        this.authorizationProviderFactory = authorizationProviderFactory;
-        this.httpHeadersProviderFactory = httpHeadersProviderFactory;
-        this.sendingResultHandlers = sendingResultHandlers;
-        this.requestFactoryProvider = requestFactoryProvider;
-        this.supportedProtocols = supportedProtocols;
+  private static final Logger logger =
+      LoggerFactory.getLogger(JettyHttpMessageSenderProvider.class);
+
+  private static final HttpHeadersProvider http1HeadersProvider = new Http1HeadersProvider();
+  private static final HttpHeadersProvider http2HeadersProvider = new Http2HeadersProvider();
+
+  private final HttpClient httpClient;
+  private final Http2ClientHolder http2ClientHolder;
+  private final EndpointAddressResolver endpointAddressResolver;
+  private final MetadataAppender<Request> metadataAppender;
+  private final HttpAuthorizationProviderFactory authorizationProviderFactory;
+  private final HttpHeadersProvidersFactory httpHeadersProviderFactory;
+  private final SendingResultHandlers sendingResultHandlers;
+  private final HttpRequestFactoryProvider requestFactoryProvider;
+  private final Set<String> supportedProtocols;
+
+  public JettyHttpMessageSenderProvider(
+      HttpClient httpClient,
+      Http2ClientHolder http2ClientHolder,
+      EndpointAddressResolver endpointAddressResolver,
+      MetadataAppender<Request> metadataAppender,
+      HttpAuthorizationProviderFactory authorizationProviderFactory,
+      HttpHeadersProvidersFactory httpHeadersProviderFactory,
+      SendingResultHandlers sendingResultHandlers,
+      HttpRequestFactoryProvider requestFactoryProvider,
+      Set<String> supportedProtocols) {
+    this.httpClient = httpClient;
+    this.http2ClientHolder = http2ClientHolder;
+    this.endpointAddressResolver = endpointAddressResolver;
+    this.metadataAppender = metadataAppender;
+    this.authorizationProviderFactory = authorizationProviderFactory;
+    this.httpHeadersProviderFactory = httpHeadersProviderFactory;
+    this.sendingResultHandlers = sendingResultHandlers;
+    this.requestFactoryProvider = requestFactoryProvider;
+    this.supportedProtocols = supportedProtocols;
+  }
+
+  @Override
+  public MessageSender create(
+      Subscription subscription, ResilientMessageSender resilientMessageSender) {
+    EndpointAddress endpoint = subscription.getEndpoint();
+    EndpointAddressResolverMetadata endpointAddressResolverMetadata =
+        subscription.getEndpointAddressResolverMetadata();
+    ResolvableEndpointAddress resolvableEndpoint =
+        new ResolvableEndpointAddress(
+            endpoint, endpointAddressResolver, endpointAddressResolverMetadata);
+    HttpRequestFactory requestFactory =
+        requestFactoryProvider.provideRequestFactory(
+            subscription, getHttpClient(subscription), metadataAppender);
+
+    if (subscription.getMode() == SubscriptionMode.BROADCAST) {
+      return new JettyBroadCastMessageSender(
+          requestFactory,
+          resolvableEndpoint,
+          getHttpRequestHeadersProvider(subscription),
+          sendingResultHandlers,
+          resilientMessageSender);
+    } else {
+      JettyMessageSender jettyMessageSender =
+          new JettyMessageSender(
+              requestFactory,
+              resolvableEndpoint,
+              getHttpRequestHeadersProvider(subscription),
+              sendingResultHandlers);
+      return new SingleRecipientMessageSenderAdapter(jettyMessageSender, resilientMessageSender);
     }
-
-    @Override
-    public MessageSender create(Subscription subscription, ResilientMessageSender resilientMessageSender) {
-        EndpointAddress endpoint = subscription.getEndpoint();
-        EndpointAddressResolverMetadata endpointAddressResolverMetadata = subscription.getEndpointAddressResolverMetadata();
-        ResolvableEndpointAddress resolvableEndpoint =
-                new ResolvableEndpointAddress(endpoint, endpointAddressResolver, endpointAddressResolverMetadata);
-        HttpRequestFactory requestFactory =
-                requestFactoryProvider.provideRequestFactory(subscription, getHttpClient(subscription), metadataAppender);
-
-        if (subscription.getMode() == SubscriptionMode.BROADCAST) {
-            return new JettyBroadCastMessageSender(
-                    requestFactory,
-                    resolvableEndpoint,
-                    getHttpRequestHeadersProvider(subscription),
-                    sendingResultHandlers,
-                    resilientMessageSender);
-        } else {
-            JettyMessageSender jettyMessageSender =  new JettyMessageSender(
-                    requestFactory,
-                    resolvableEndpoint,
-                    getHttpRequestHeadersProvider(subscription),
-                    sendingResultHandlers);
-            return new SingleRecipientMessageSenderAdapter(jettyMessageSender, resilientMessageSender);
-        }
+  }
+
+  @Override
+  public Set<String> getSupportedProtocols() {
+    return supportedProtocols;
+  }
+
+  private HttpHeadersProvider getHttpRequestHeadersProvider(Subscription subscription) {
+    AuthHeadersProvider authProvider = getAuthHeadersProvider(subscription);
+    Collection<HttpHeadersProvider> additionalProviders = httpHeadersProviderFactory.createAll();
+    Collection<HttpHeadersProvider> providers =
+        ImmutableSet.<HttpHeadersProvider>builder()
+            .addAll(additionalProviders)
+            .add(authProvider)
+            .build();
+
+    return new HermesHeadersProvider(providers);
+  }
+
+  private AuthHeadersProvider getAuthHeadersProvider(Subscription subscription) {
+    Optional<HttpAuthorizationProvider> authorizationProvider =
+        authorizationProviderFactory.create(subscription);
+    HttpHeadersProvider httpHeadersProvider =
+        subscription.isHttp2Enabled() ? http2HeadersProvider : http1HeadersProvider;
+
+    return new AuthHeadersProvider(httpHeadersProvider, authorizationProvider.orElse(null));
+  }
+
+  private HttpClient getHttpClient(Subscription subscription) {
+    if (subscription.isHttp2Enabled()) {
+      return tryToGetHttp2Client(subscription);
+    } else {
+      logger.info("Using http/1.1 for {}.", subscription.getQualifiedName());
+      return httpClient;
     }
-
-    @Override
-    public Set<String> getSupportedProtocols() {
-        return supportedProtocols;
+  }
+
+  private HttpClient tryToGetHttp2Client(Subscription subscription) {
+    if (http2ClientHolder.getHttp2Client().isPresent()) {
+      logger.info("Using http/2 for {}.", subscription.getQualifiedName());
+      return http2ClientHolder.getHttp2Client().get();
+    } else {
+      logger.info(
+          "Using http/1.1 for {}. Http/2 delivery is not enabled on this server.",
+          subscription.getQualifiedName());
+      return httpClient;
     }
-
-    private HttpHeadersProvider getHttpRequestHeadersProvider(Subscription subscription) {
-        AuthHeadersProvider authProvider = getAuthHeadersProvider(subscription);
-        Collection<HttpHeadersProvider> additionalProviders = httpHeadersProviderFactory.createAll();
-        Collection<HttpHeadersProvider> providers = ImmutableSet.<HttpHeadersProvider>builder()
-                .addAll(additionalProviders)
-                .add(authProvider)
-                .build();
-
-        return new HermesHeadersProvider(providers);
+  }
+
+  @Override
+  public void start() throws Exception {
+    startClient(httpClient);
+    http2ClientHolder.getHttp2Client().ifPresent(this::startClient);
+  }
+
+  private void startClient(HttpClient client) {
+    if (client.isStopped()) {
+      try {
+        client.start();
+      } catch (Exception ex) {
+        logger.error("Could not start http client.", ex);
+      }
     }
-
-    private AuthHeadersProvider getAuthHeadersProvider(Subscription subscription) {
-        Optional<HttpAuthorizationProvider> authorizationProvider = authorizationProviderFactory.create(subscription);
-        HttpHeadersProvider httpHeadersProvider = subscription.isHttp2Enabled() ? http2HeadersProvider : http1HeadersProvider;
-
-        return new AuthHeadersProvider(
-                httpHeadersProvider,
-                authorizationProvider.orElse(null)
-        );
-    }
-
-    private HttpClient getHttpClient(Subscription subscription) {
-        if (subscription.isHttp2Enabled()) {
-            return tryToGetHttp2Client(subscription);
-        } else {
-            logger.info("Using http/1.1 for {}.", subscription.getQualifiedName());
-            return httpClient;
-        }
-    }
-
-    private HttpClient tryToGetHttp2Client(Subscription subscription) {
-        if (http2ClientHolder.getHttp2Client().isPresent()) {
-            logger.info("Using http/2 for {}.", subscription.getQualifiedName());
-            return http2ClientHolder.getHttp2Client().get();
-        } else {
-            logger.info("Using http/1.1 for {}. Http/2 delivery is not enabled on this server.",
-                    subscription.getQualifiedName());
-            return httpClient;
-        }
-    }
-
-    @Override
-    public void start() throws Exception {
-        startClient(httpClient);
-        http2ClientHolder.getHttp2Client().ifPresent(this::startClient);
-    }
-
-    private void startClient(HttpClient client) {
-        if (client.isStopped()) {
-            try {
-                client.start();
-            } catch (Exception ex) {
-                logger.error("Could not start http client.", ex);
-            }
-        }
-    }
-
-    @Override
-    public void stop() throws Exception {
-        stopClient(httpClient);
-        http2ClientHolder.getHttp2Client().ifPresent(this::stopClient);
-    }
-
-    private void stopClient(HttpClient client) {
-        if (client.isRunning()) {
-            try {
-                client.stop();
-            } catch (Exception ex) {
-                logger.error("Could not stop http client", ex);
-            }
-        }
+  }
+
+  @Override
+  public void stop() throws Exception {
+    stopClient(httpClient);
+    http2ClientHolder.getHttp2Client().ifPresent(this::stopClient);
+  }
+
+  private void stopClient(HttpClient client) {
+    if (client.isRunning()) {
+      try {
+        client.stop();
+      } catch (Exception ex) {
+        logger.error("Could not stop http client", ex);
+      }
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageBatchSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageBatchSender.java
index 21ef73498b..d3565dff15 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageBatchSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageBatchSender.java
@@ -1,9 +1,21 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.apache.http.entity.ContentType;
-import org.apache.http.protocol.HTTP;
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.api.Request;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
+import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.BATCH_ID;
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.RETRY_COUNT;
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.SUBSCRIPTION_NAME;
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.TOPIC_NAME;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+import org.apache.hc.core5.http.ContentType;
+import org.eclipse.jetty.client.ContentResponse;
+import org.eclipse.jetty.client.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.EndpointAddress;
@@ -16,84 +28,78 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.EndpointAddressResolutionException;
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.EndpointAddressResolver;
 
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
-import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.BATCH_ID;
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.RETRY_COUNT;
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.SUBSCRIPTION_NAME;
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.TOPIC_NAME;
-
 public class JettyMessageBatchSender implements MessageBatchSender {
 
-    private static final Logger logger = LoggerFactory.getLogger(JettyMessageBatchSender.class);
+  private static final Logger logger = LoggerFactory.getLogger(JettyMessageBatchSender.class);
 
-    private final BatchHttpRequestFactory requestFactory;
-    private final EndpointAddressResolver resolver;
-    private final SendingResultHandlers resultHandlers;
-    private final BatchHttpHeadersProvider headersProvider;
+  private final BatchHttpRequestFactory requestFactory;
+  private final EndpointAddressResolver resolver;
+  private final SendingResultHandlers resultHandlers;
+  private final BatchHttpHeadersProvider headersProvider;
 
-    public JettyMessageBatchSender(BatchHttpRequestFactory requestFactory,
-                                   EndpointAddressResolver resolver,
-                                   SendingResultHandlers resultHandlers,
-                                   BatchHttpHeadersProvider headersProvider) {
-        this.requestFactory = requestFactory;
-        this.resolver = resolver;
-        this.resultHandlers = resultHandlers;
-        this.headersProvider = headersProvider;
-    }
+  public JettyMessageBatchSender(
+      BatchHttpRequestFactory requestFactory,
+      EndpointAddressResolver resolver,
+      SendingResultHandlers resultHandlers,
+      BatchHttpHeadersProvider headersProvider) {
+    this.requestFactory = requestFactory;
+    this.resolver = resolver;
+    this.resultHandlers = resultHandlers;
+    this.headersProvider = headersProvider;
+  }
 
-    @Override
-    public MessageSendingResult send(MessageBatch batch,
-                                     EndpointAddress address,
-                                     EndpointAddressResolverMetadata metadata,
-                                     int requestTimeout) {
-        try {
-            HttpRequestHeaders headers = headersProvider.getHeaders(address);
-            return send(batch, resolver.resolve(address, batch, metadata), requestTimeout, headers);
-        } catch (EndpointAddressResolutionException e) {
-            return MessageSendingResult.failedResult(e);
-        }
+  @Override
+  public MessageSendingResult send(
+      MessageBatch batch,
+      EndpointAddress address,
+      EndpointAddressResolverMetadata metadata,
+      int requestTimeout) {
+    try {
+      HttpRequestHeaders headers = headersProvider.getHeaders(address);
+      return send(batch, resolver.resolve(address, batch, metadata), requestTimeout, headers);
+    } catch (EndpointAddressResolutionException e) {
+      return MessageSendingResult.failedResult(e);
     }
+  }
 
-    private MessageSendingResult send(MessageBatch batch, URI address, int requestTimeout, HttpRequestHeaders baseHeaders) {
-        HttpRequestHeaders headers = buildHeaders(batch, baseHeaders);
-        Request request = requestFactory.buildRequest(batch, address, headers, requestTimeout);
-        try {
-            ContentResponse response = request.send();
-            return resultHandlers.handleSendingResultForBatch(response);
-        } catch (TimeoutException | ExecutionException | InterruptedException e) {
-            if (e instanceof InterruptedException) {
-                Thread.currentThread().interrupt();
-                logger.info("Restoring interrupted status", e);
-            }
-            throw new HttpBatchSenderException("Failed to send message batch", e);
-        }
+  private MessageSendingResult send(
+      MessageBatch batch, URI address, int requestTimeout, HttpRequestHeaders baseHeaders) {
+    HttpRequestHeaders headers = buildHeaders(batch, baseHeaders);
+    Request request = requestFactory.buildRequest(batch, address, headers, requestTimeout);
+    try {
+      ContentResponse response = request.send();
+      return resultHandlers.handleSendingResultForBatch(response);
+    } catch (TimeoutException | ExecutionException | InterruptedException e) {
+      if (e instanceof InterruptedException) {
+        Thread.currentThread().interrupt();
+        logger.info("Restoring interrupted status", e);
+      }
+      throw new HttpBatchSenderException("Failed to send message batch", e);
     }
+  }
 
-    private HttpRequestHeaders buildHeaders(MessageBatch batch, HttpRequestHeaders baseHeaders) {
-        Map<String, String> headers = new HashMap<>(baseHeaders.asMap());
+  private HttpRequestHeaders buildHeaders(MessageBatch batch, HttpRequestHeaders baseHeaders) {
+    Map<String, String> headers = new HashMap<>(baseHeaders.asMap());
 
-        ContentType contentType = getMediaType(batch.getContentType());
-        headers.put(BATCH_ID.getName(), batch.getId());
-        headers.put(HTTP.CONTENT_TYPE, contentType.getMimeType());
-        headers.put(RETRY_COUNT.getName(), Integer.toString(batch.getRetryCounter()));
+    ContentType contentType = getMediaType(batch.getContentType());
+    headers.put(BATCH_ID.getName(), batch.getId());
+    headers.put(CONTENT_TYPE, contentType.getMimeType());
+    headers.put(RETRY_COUNT.getName(), Integer.toString(batch.getRetryCounter()));
 
-        if (batch.hasSubscriptionIdentityHeaders()) {
-            headers.put(TOPIC_NAME.getName(), batch.getTopic());
-            headers.put(SUBSCRIPTION_NAME.getName(), batch.getSubscription().getName());
-        }
-
-        batch.getAdditionalHeaders().forEach(header -> headers.put(header.getName(), header.getValue()));
-        return new HttpRequestHeaders(headers);
+    if (batch.hasSubscriptionIdentityHeaders()) {
+      headers.put(TOPIC_NAME.getName(), batch.getTopic());
+      headers.put(SUBSCRIPTION_NAME.getName(), batch.getSubscription().getName());
     }
 
-    private ContentType getMediaType(pl.allegro.tech.hermes.api.ContentType contentType) {
-        return AVRO.equals(contentType) ? ContentType.create(AVRO_BINARY) : ContentType.APPLICATION_JSON;
-    }
+    batch
+        .getAdditionalHeaders()
+        .forEach(header -> headers.put(header.getName(), header.getValue()));
+    return new HttpRequestHeaders(headers);
+  }
+
+  private ContentType getMediaType(pl.allegro.tech.hermes.api.ContentType contentType) {
+    return AVRO.equals(contentType)
+        ? ContentType.create(AVRO_BINARY)
+        : ContentType.APPLICATION_JSON;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSender.java
index 03b7a36264..05e47d988f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSender.java
@@ -1,6 +1,8 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.api.Request;
+import java.net.URI;
+import java.util.concurrent.CompletableFuture;
+import org.eclipse.jetty.client.Request;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.sender.CompletableFutureAwareMessageSender;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
@@ -10,45 +12,41 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.EndpointAddressResolutionException;
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.ResolvableEndpointAddress;
 
-import java.net.URI;
-import java.util.concurrent.CompletableFuture;
-
 public class JettyMessageSender implements CompletableFutureAwareMessageSender {
 
-    private final HttpRequestFactory requestFactory;
-    private final ResolvableEndpointAddress addressResolver;
-    private final HttpHeadersProvider requestHeadersProvider;
-    private final SendingResultHandlers sendingResultHandlers;
-
-    public JettyMessageSender(HttpRequestFactory requestFactory,
-                              ResolvableEndpointAddress addressResolver,
-                              HttpHeadersProvider headersProvider,
-                              SendingResultHandlers sendingResultHandlers) {
-        this.requestFactory = requestFactory;
-        this.addressResolver = addressResolver;
-        this.requestHeadersProvider = headersProvider;
-        this.sendingResultHandlers = sendingResultHandlers;
+  private final HttpRequestFactory requestFactory;
+  private final ResolvableEndpointAddress addressResolver;
+  private final HttpHeadersProvider requestHeadersProvider;
+  private final SendingResultHandlers sendingResultHandlers;
+
+  public JettyMessageSender(
+      HttpRequestFactory requestFactory,
+      ResolvableEndpointAddress addressResolver,
+      HttpHeadersProvider headersProvider,
+      SendingResultHandlers sendingResultHandlers) {
+    this.requestFactory = requestFactory;
+    this.addressResolver = addressResolver;
+    this.requestHeadersProvider = headersProvider;
+    this.sendingResultHandlers = sendingResultHandlers;
+  }
+
+  @Override
+  public void send(Message message, final CompletableFuture<MessageSendingResult> resultFuture) {
+    try {
+      final HttpRequestData requestData =
+          new HttpRequestDataBuilder().withRawAddress(addressResolver.getRawAddress()).build();
+
+      HttpRequestHeaders headers = requestHeadersProvider.getHeaders(message, requestData);
+
+      URI resolvedUri = addressResolver.resolveFor(message);
+      Request request = requestFactory.buildRequest(message, resolvedUri, headers);
+
+      request.send(sendingResultHandlers.handleSendingResultForSerial(resultFuture));
+    } catch (EndpointAddressResolutionException exception) {
+      resultFuture.complete(MessageSendingResult.failedResult(exception));
     }
+  }
 
-    @Override
-    public void send(Message message, final CompletableFuture<MessageSendingResult> resultFuture) {
-        try {
-            final HttpRequestData requestData = new HttpRequestDataBuilder()
-                    .withRawAddress(addressResolver.getRawAddress())
-                    .build();
-
-            HttpRequestHeaders headers = requestHeadersProvider.getHeaders(message, requestData);
-
-            URI resolvedUri = addressResolver.resolveFor(message);
-            Request request = requestFactory.buildRequest(message, resolvedUri, headers);
-
-            request.send(sendingResultHandlers.handleSendingResultForSerial(resultFuture));
-        } catch (EndpointAddressResolutionException exception) {
-            resultFuture.complete(MessageSendingResult.failedResult(exception));
-        }
-    }
-
-    @Override
-    public void stop() {
-    }
+  @Override
+  public void stop() {}
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyResponseListener.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyResponseListener.java
index e6c2bdfc40..eb725b2cff 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyResponseListener.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyResponseListener.java
@@ -1,22 +1,20 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.api.Result;
-import org.eclipse.jetty.client.util.BufferingResponseListener;
-import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
-
 import java.util.concurrent.CompletableFuture;
+import org.eclipse.jetty.client.BufferingResponseListener;
+import org.eclipse.jetty.client.Result;
+import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 
 public class JettyResponseListener extends BufferingResponseListener {
 
-    CompletableFuture<MessageSendingResult> resultFuture;
-
-    public JettyResponseListener(CompletableFuture<MessageSendingResult> resultFuture) {
-        this.resultFuture = resultFuture;
-    }
+  CompletableFuture<MessageSendingResult> resultFuture;
 
-    @Override
-    public void onComplete(Result result) {
-        resultFuture.complete(MessageSendingResult.of(result));
-    }
+  public JettyResponseListener(CompletableFuture<MessageSendingResult> resultFuture) {
+    this.resultFuture = resultFuture;
+  }
 
+  @Override
+  public void onComplete(Result result) {
+    resultFuture.complete(MessageSendingResult.of(result));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SendingResultHandlers.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SendingResultHandlers.java
index d8b252f4bb..3fb38d478d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SendingResultHandlers.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SendingResultHandlers.java
@@ -1,16 +1,17 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.api.Response.CompleteListener;
+import java.util.concurrent.CompletableFuture;
+import org.eclipse.jetty.client.ContentResponse;
+import org.eclipse.jetty.client.Response.CompleteListener;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 import pl.allegro.tech.hermes.consumers.consumer.sender.SingleMessageSendingResult;
 
-import java.util.concurrent.CompletableFuture;
-
 public interface SendingResultHandlers {
-    CompleteListener handleSendingResultForSerial(CompletableFuture<MessageSendingResult> resultFuture);
+  CompleteListener handleSendingResultForSerial(
+      CompletableFuture<MessageSendingResult> resultFuture);
 
-    CompleteListener handleSendingResultForBroadcast(CompletableFuture<SingleMessageSendingResult> resultFuture);
+  CompleteListener handleSendingResultForBroadcast(
+      CompletableFuture<SingleMessageSendingResult> resultFuture);
 
-    MessageSendingResult handleSendingResultForBatch(ContentResponse response);
+  MessageSendingResult handleSendingResultForBatch(ContentResponse response);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextFactoryProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextFactoryProvider.java
index 1b8f22b92a..88d67b4b22 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextFactoryProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextFactoryProvider.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
+import static pl.allegro.tech.hermes.common.ssl.KeystoreSource.JRE;
+import static pl.allegro.tech.hermes.common.ssl.KeystoreSource.PROVIDED;
+
+import java.util.Optional;
 import pl.allegro.tech.hermes.common.ssl.DefaultSslContextFactory;
 import pl.allegro.tech.hermes.common.ssl.KeyManagersProvider;
 import pl.allegro.tech.hermes.common.ssl.KeystoreConfigurationException;
@@ -12,73 +16,70 @@
 import pl.allegro.tech.hermes.common.ssl.provided.ProvidedKeyManagersProvider;
 import pl.allegro.tech.hermes.common.ssl.provided.ProvidedTrustManagersProvider;
 
-import java.util.Optional;
-
-import static pl.allegro.tech.hermes.common.ssl.KeystoreSource.JRE;
-import static pl.allegro.tech.hermes.common.ssl.KeystoreSource.PROVIDED;
-
 public class SslContextFactoryProvider {
 
-    private final SslContextFactory sslContextFactory;
+  private final SslContextFactory sslContextFactory;
 
-    private final SslContextParameters sslContextParams;
+  private final SslContextParameters sslContextParams;
 
-    public SslContextFactoryProvider(SslContextFactory sslContextFactory, SslContextParameters sslContextParams) {
-        this.sslContextFactory = sslContextFactory;
-        this.sslContextParams = sslContextParams;
-    }
+  public SslContextFactoryProvider(
+      SslContextFactory sslContextFactory, SslContextParameters sslContextParams) {
+    this.sslContextFactory = sslContextFactory;
+    this.sslContextParams = sslContextParams;
+  }
 
-    public Optional<org.eclipse.jetty.util.ssl.SslContextFactory.Client> provideSslContextFactory() {
-        if (sslContextParams.isEnabled()) {
-            org.eclipse.jetty.util.ssl.SslContextFactory.Client sslCtx = new org.eclipse.jetty.util.ssl.SslContextFactory.Client();
-            sslCtx.setEndpointIdentificationAlgorithm("HTTPS");
-            sslCtx.setSslContext(sslContextFactory().create().getSslContext());
-            return Optional.of(sslCtx);
-        } else {
-            return Optional.empty();
-        }
+  public Optional<org.eclipse.jetty.util.ssl.SslContextFactory.Client> provideSslContextFactory() {
+    if (sslContextParams.isEnabled()) {
+      org.eclipse.jetty.util.ssl.SslContextFactory.Client sslCtx =
+          new org.eclipse.jetty.util.ssl.SslContextFactory.Client();
+      sslCtx.setEndpointIdentificationAlgorithm("HTTPS");
+      sslCtx.setSslContext(sslContextFactory().create().getSslContext());
+      return Optional.of(sslCtx);
+    } else {
+      return Optional.empty();
     }
+  }
 
-    private SslContextFactory sslContextFactory() {
-        return Optional.ofNullable(sslContextFactory).orElseGet(this::defaultSslContextFactory);
-    }
+  private SslContextFactory sslContextFactory() {
+    return Optional.ofNullable(sslContextFactory).orElseGet(this::defaultSslContextFactory);
+  }
 
-    private SslContextFactory defaultSslContextFactory() {
-        String protocol = sslContextParams.getProtocol();
-        KeyManagersProvider keyManagersProvider = createKeyManagersProvider();
-        TrustManagersProvider trustManagersProvider = createTrustManagersProvider();
-        return new DefaultSslContextFactory(protocol, keyManagersProvider, trustManagersProvider);
-    }
+  private SslContextFactory defaultSslContextFactory() {
+    String protocol = sslContextParams.getProtocol();
+    KeyManagersProvider keyManagersProvider = createKeyManagersProvider();
+    TrustManagersProvider trustManagersProvider = createTrustManagersProvider();
+    return new DefaultSslContextFactory(protocol, keyManagersProvider, trustManagersProvider);
+  }
 
-    private KeyManagersProvider createKeyManagersProvider() {
-        String keystoreSource = sslContextParams.getKeystoreSource();
-        if (PROVIDED.getValue().equals(keystoreSource)) {
-            KeystoreProperties properties = new KeystoreProperties(
-                    sslContextParams.getKeystoreLocation(),
-                    sslContextParams.getKeystoreFormat(),
-                    sslContextParams.getKeystorePassword()
-            );
-            return new ProvidedKeyManagersProvider(properties);
-        }
-        if (JRE.getValue().equals(keystoreSource)) {
-            return new JvmKeyManagersProvider();
-        }
-        throw new KeystoreConfigurationException(keystoreSource);
+  private KeyManagersProvider createKeyManagersProvider() {
+    String keystoreSource = sslContextParams.getKeystoreSource();
+    if (PROVIDED.getValue().equals(keystoreSource)) {
+      KeystoreProperties properties =
+          new KeystoreProperties(
+              sslContextParams.getKeystoreLocation(),
+              sslContextParams.getKeystoreFormat(),
+              sslContextParams.getKeystorePassword());
+      return new ProvidedKeyManagersProvider(properties);
+    }
+    if (JRE.getValue().equals(keystoreSource)) {
+      return new JvmKeyManagersProvider();
     }
+    throw new KeystoreConfigurationException(keystoreSource);
+  }
 
-    public TrustManagersProvider createTrustManagersProvider() {
-        String truststoreSource = sslContextParams.getTruststoreSource();
-        if (PROVIDED.getValue().equals(truststoreSource)) {
-            KeystoreProperties properties = new KeystoreProperties(
-                    sslContextParams.getTruststoreLocation(),
-                    sslContextParams.getTruststoreFormat(),
-                    sslContextParams.getTruststorePassword()
-            );
-            return new ProvidedTrustManagersProvider(properties);
-        }
-        if (JRE.getValue().equals(truststoreSource)) {
-            return new JvmTrustManagerProvider();
-        }
-        throw new TruststoreConfigurationException(truststoreSource);
+  public TrustManagersProvider createTrustManagersProvider() {
+    String truststoreSource = sslContextParams.getTruststoreSource();
+    if (PROVIDED.getValue().equals(truststoreSource)) {
+      KeystoreProperties properties =
+          new KeystoreProperties(
+              sslContextParams.getTruststoreLocation(),
+              sslContextParams.getTruststoreFormat(),
+              sslContextParams.getTruststorePassword());
+      return new ProvidedTrustManagersProvider(properties);
+    }
+    if (JRE.getValue().equals(truststoreSource)) {
+      return new JvmTrustManagerProvider();
     }
+    throw new TruststoreConfigurationException(truststoreSource);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextParameters.java
index 25d0044a1e..96c7ed79eb 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextParameters.java
@@ -2,23 +2,23 @@
 
 public interface SslContextParameters {
 
-    boolean isEnabled();
+  boolean isEnabled();
 
-    String getProtocol();
+  String getProtocol();
 
-    String getKeystoreSource();
+  String getKeystoreSource();
 
-    String getKeystoreLocation();
+  String getKeystoreLocation();
 
-    String getKeystorePassword();
+  String getKeystorePassword();
 
-    String getKeystoreFormat();
+  String getKeystoreFormat();
 
-    String getTruststoreSource();
+  String getTruststoreSource();
 
-    String getTruststoreLocation();
+  String getTruststoreLocation();
 
-    String getTruststorePassword();
+  String getTruststorePassword();
 
-    String getTruststoreFormat();
+  String getTruststoreFormat();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/BasicAuthProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/BasicAuthProvider.java
index 761f06af35..b9708f52cf 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/BasicAuthProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/BasicAuthProvider.java
@@ -1,23 +1,23 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.auth;
 
-import org.apache.commons.codec.binary.Base64;
-import pl.allegro.tech.hermes.api.EndpointAddress;
-
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Optional;
+import pl.allegro.tech.hermes.api.EndpointAddress;
 
 public class BasicAuthProvider implements HttpAuthorizationProvider {
 
-    private final String token;
+  private final String token;
 
-    public BasicAuthProvider(EndpointAddress endpoint) {
-        String credentials = endpoint.getUsername() + ":" + endpoint.getPassword();
-        String encodedCredentials = Base64.encodeBase64String(credentials.getBytes(StandardCharsets.UTF_8));
-        this.token = "Basic " + encodedCredentials;
-    }
+  public BasicAuthProvider(EndpointAddress endpoint) {
+    String credentials = endpoint.getUsername() + ":" + endpoint.getPassword();
+    String encodedCredentials =
+        Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.UTF_8));
+    this.token = "Basic " + encodedCredentials;
+  }
 
-    @Override
-    public Optional<String> authorizationToken() {
-        return Optional.of(token);
-    }
+  @Override
+  public Optional<String> authorizationToken() {
+    return Optional.of(token);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/HttpAuthorizationProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/HttpAuthorizationProvider.java
index af1b119397..a6e58ab1f9 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/HttpAuthorizationProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/HttpAuthorizationProvider.java
@@ -4,5 +4,5 @@
 
 public interface HttpAuthorizationProvider {
 
-    Optional<String> authorizationToken();
+  Optional<String> authorizationToken();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/HttpAuthorizationProviderFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/HttpAuthorizationProviderFactory.java
index 010d1f2980..31d334e686 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/HttpAuthorizationProviderFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/HttpAuthorizationProviderFactory.java
@@ -1,25 +1,24 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.auth;
 
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.consumers.consumer.oauth.OAuthAccessTokens;
 
-import java.util.Optional;
-
 public class HttpAuthorizationProviderFactory {
 
-    private final OAuthAccessTokens accessTokens;
+  private final OAuthAccessTokens accessTokens;
 
-    public HttpAuthorizationProviderFactory(OAuthAccessTokens accessTokens) {
-        this.accessTokens = accessTokens;
-    }
+  public HttpAuthorizationProviderFactory(OAuthAccessTokens accessTokens) {
+    this.accessTokens = accessTokens;
+  }
 
-    public Optional<HttpAuthorizationProvider> create(Subscription subscription) {
-        if (subscription.getEndpoint().containsCredentials()) {
-            return Optional.of(new BasicAuthProvider(subscription.getEndpoint()));
-        } else if (subscription.hasOAuthPolicy()) {
-            return Optional.of(new OAuthHttpAuthorizationProvider(subscription.getQualifiedName(), accessTokens));
-        }
-        return Optional.empty();
+  public Optional<HttpAuthorizationProvider> create(Subscription subscription) {
+    if (subscription.getEndpoint().containsCredentials()) {
+      return Optional.of(new BasicAuthProvider(subscription.getEndpoint()));
+    } else if (subscription.hasOAuthPolicy()) {
+      return Optional.of(
+          new OAuthHttpAuthorizationProvider(subscription.getQualifiedName(), accessTokens));
     }
-
+    return Optional.empty();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/OAuthHttpAuthorizationProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/OAuthHttpAuthorizationProvider.java
index 727a024d4f..7ace474330 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/OAuthHttpAuthorizationProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/auth/OAuthHttpAuthorizationProvider.java
@@ -1,28 +1,29 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.auth;
 
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.consumer.oauth.OAuthAccessToken;
 import pl.allegro.tech.hermes.consumers.consumer.oauth.OAuthAccessTokens;
 
-import java.util.Optional;
-
 public class OAuthHttpAuthorizationProvider implements HttpAuthorizationProvider {
 
-    private static final String BEARER_TOKEN_PREFIX = "Bearer ";
+  private static final String BEARER_TOKEN_PREFIX = "Bearer ";
 
-    private final SubscriptionName subscriptionName;
+  private final SubscriptionName subscriptionName;
 
-    private final OAuthAccessTokens accessTokens;
+  private final OAuthAccessTokens accessTokens;
 
-    public OAuthHttpAuthorizationProvider(SubscriptionName subscriptionName, OAuthAccessTokens accessTokens) {
-        this.subscriptionName = subscriptionName;
-        this.accessTokens = accessTokens;
-    }
+  public OAuthHttpAuthorizationProvider(
+      SubscriptionName subscriptionName, OAuthAccessTokens accessTokens) {
+    this.subscriptionName = subscriptionName;
+    this.accessTokens = accessTokens;
+  }
 
-    @Override
-    public Optional<String> authorizationToken() {
-        return accessTokens.getTokenIfPresent(subscriptionName)
-                .map(OAuthAccessToken::getTokenValue)
-                .map(value -> BEARER_TOKEN_PREFIX + value);
-    }
+  @Override
+  public Optional<String> authorizationToken() {
+    return accessTokens
+        .getTokenIfPresent(subscriptionName)
+        .map(OAuthAccessToken::getTokenValue)
+        .map(value -> BEARER_TOKEN_PREFIX + value);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/AuthHeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/AuthHeadersProvider.java
index fcb7cf854e..833c7a4e93 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/AuthHeadersProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/AuthHeadersProvider.java
@@ -1,37 +1,36 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.headers;
 
 import com.google.common.collect.ImmutableMap;
+import java.util.Optional;
 import org.eclipse.jetty.http.HttpHeader;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.HttpRequestData;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.auth.HttpAuthorizationProvider;
 
-import java.util.Optional;
-
 public final class AuthHeadersProvider implements HttpHeadersProvider {
 
-    private final HttpHeadersProvider headersProvider;
-    private final HttpAuthorizationProvider authorizationProvider;
+  private final HttpHeadersProvider headersProvider;
+  private final HttpAuthorizationProvider authorizationProvider;
 
-    public AuthHeadersProvider(HttpHeadersProvider headersProvider, HttpAuthorizationProvider authorizationProvider) {
-        this.headersProvider = headersProvider;
-        this.authorizationProvider = authorizationProvider;
-    }
-
-    @Override
-    public HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData) {
-        ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
+  public AuthHeadersProvider(
+      HttpHeadersProvider headersProvider, HttpAuthorizationProvider authorizationProvider) {
+    this.headersProvider = headersProvider;
+    this.authorizationProvider = authorizationProvider;
+  }
 
-        if (headersProvider != null) {
-            builder.putAll(headersProvider.getHeaders(message, requestData).asMap());
-        }
+  @Override
+  public HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData) {
+    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
 
-        if (authorizationProvider != null) {
-            Optional<String> token = authorizationProvider.authorizationToken();
-            token.ifPresent(s -> builder.put(HttpHeader.AUTHORIZATION.toString(), s));
-        }
+    if (headersProvider != null) {
+      builder.putAll(headersProvider.getHeaders(message, requestData).asMap());
+    }
 
-        return new HttpRequestHeaders(builder.build());
+    if (authorizationProvider != null) {
+      Optional<String> token = authorizationProvider.authorizationToken();
+      token.ifPresent(s -> builder.put(HttpHeader.AUTHORIZATION.toString(), s));
     }
 
+    return new HttpRequestHeaders(builder.build());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/BatchHttpHeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/BatchHttpHeadersProvider.java
index d8a9e19022..220dae47f8 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/BatchHttpHeadersProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/BatchHttpHeadersProvider.java
@@ -3,5 +3,5 @@
 import pl.allegro.tech.hermes.api.EndpointAddress;
 
 public interface BatchHttpHeadersProvider {
-    HttpRequestHeaders getHeaders(EndpointAddress address);
+  HttpRequestHeaders getHeaders(EndpointAddress address);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/DefaultBatchHeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/DefaultBatchHeadersProvider.java
index d655695d60..dd7bbdbed0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/DefaultBatchHeadersProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/DefaultBatchHeadersProvider.java
@@ -1,13 +1,12 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.headers;
 
-import pl.allegro.tech.hermes.api.EndpointAddress;
-
 import java.util.Collections;
+import pl.allegro.tech.hermes.api.EndpointAddress;
 
 public final class DefaultBatchHeadersProvider implements BatchHttpHeadersProvider {
 
-    @Override
-    public HttpRequestHeaders getHeaders(EndpointAddress address) {
-        return new HttpRequestHeaders(Collections.emptyMap());
-    }
+  @Override
+  public HttpRequestHeaders getHeaders(EndpointAddress address) {
+    return new HttpRequestHeaders(Collections.emptyMap());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HermesHeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HermesHeadersProvider.java
index 77445fe955..322e130e1a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HermesHeadersProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HermesHeadersProvider.java
@@ -1,11 +1,5 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.headers;
 
-import com.google.common.collect.ImmutableMap;
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.consumers.consumer.sender.http.HttpRequestData;
-
-import java.util.Collection;
-
 import static java.lang.String.valueOf;
 import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
 import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.RETRY_COUNT;
@@ -14,33 +8,45 @@
 import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.SUBSCRIPTION_NAME;
 import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.TOPIC_NAME;
 
-public final class HermesHeadersProvider implements HttpHeadersProvider {
-
-    private final Collection<HttpHeadersProvider> headersProvider;
+import com.google.common.collect.ImmutableMap;
+import java.util.Collection;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
+import pl.allegro.tech.hermes.consumers.consumer.sender.http.HttpRequestData;
 
-    public HermesHeadersProvider(Collection<HttpHeadersProvider> headersProvider) {
-        this.headersProvider = headersProvider;
-    }
+public final class HermesHeadersProvider implements HttpHeadersProvider {
 
-    @Override
-    public HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData) {
-        ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
+  private final Collection<HttpHeadersProvider> headersProvider;
 
-        headersProvider.forEach(provider -> builder.putAll(provider.getHeaders(message, requestData).asMap()));
+  public HermesHeadersProvider(Collection<HttpHeadersProvider> headersProvider) {
+    this.headersProvider = headersProvider;
+  }
 
-        builder.put(MESSAGE_ID.getName(), message.getId());
-        builder.put(RETRY_COUNT.getName(), Integer.toString(message.getRetryCounter()));
+  @Override
+  public HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData) {
+    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
 
-        if (message.hasSubscriptionIdentityHeaders()) {
-            builder.put(TOPIC_NAME.getName(), message.getTopic());
-            builder.put(SUBSCRIPTION_NAME.getName(), message.getSubscription());
-        }
+    headersProvider.forEach(
+        provider -> builder.putAll(provider.getHeaders(message, requestData).asMap()));
 
-        message.getSchema().ifPresent(schema -> builder.put(SCHEMA_VERSION.getName(), valueOf(schema.getVersion().value())));
-        message.getSchema().ifPresent(schema -> builder.put(SCHEMA_ID.getName(), valueOf(schema.getId().value())));
-        message.getAdditionalHeaders().forEach(header -> builder.put(header.getName(), header.getValue()));
+    builder.put(MESSAGE_ID.getName(), message.getId());
+    builder.put(RETRY_COUNT.getName(), Integer.toString(message.getRetryCounter()));
 
-        return new HttpRequestHeaders(builder.build());
+    if (message.hasSubscriptionIdentityHeaders()) {
+      builder.put(TOPIC_NAME.getName(), message.getTopic());
+      builder.put(SUBSCRIPTION_NAME.getName(), message.getSubscription());
     }
 
+    message
+        .getSchema()
+        .ifPresent(
+            schema -> builder.put(SCHEMA_VERSION.getName(), valueOf(schema.getVersion().value())));
+    message
+        .getSchema()
+        .ifPresent(schema -> builder.put(SCHEMA_ID.getName(), valueOf(schema.getId().value())));
+    message
+        .getAdditionalHeaders()
+        .forEach(header -> builder.put(header.getName(), header.getValue()));
+
+    return new HttpRequestHeaders(builder.build());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http1HeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http1HeadersProvider.java
index a78502454b..f6441b58e6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http1HeadersProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http1HeadersProvider.java
@@ -1,30 +1,28 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.headers;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+
 import com.google.common.collect.ImmutableMap;
+import java.util.function.Function;
 import org.eclipse.jetty.http.HttpHeader;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.HttpRequestData;
 
-import java.util.function.Function;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-
 public final class Http1HeadersProvider implements HttpHeadersProvider {
 
-    private static final Function<ContentType, String> contentTypeToMediaType = contentType ->
-            AVRO.equals(contentType) ? AVRO_BINARY : APPLICATION_JSON;
-
-    @Override
-    public HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData) {
-        return new HttpRequestHeaders(
-                ImmutableMap.of(
-                        HttpHeader.CONTENT_TYPE.toString(), contentTypeToMediaType.apply(message.getContentType()),
-                        HttpHeader.KEEP_ALIVE.toString(), "true"
-                )
-        );
-    }
+  private static final Function<ContentType, String> contentTypeToMediaType =
+      contentType -> AVRO.equals(contentType) ? AVRO_BINARY : APPLICATION_JSON;
 
+  @Override
+  public HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData) {
+    return new HttpRequestHeaders(
+        ImmutableMap.of(
+            HttpHeader.CONTENT_TYPE.toString(),
+            contentTypeToMediaType.apply(message.getContentType()),
+            HttpHeader.KEEP_ALIVE.toString(),
+            "true"));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http2HeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http2HeadersProvider.java
index 4d61a75184..d4c34bb75a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http2HeadersProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http2HeadersProvider.java
@@ -1,27 +1,26 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.headers;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+
 import com.google.common.collect.ImmutableMap;
+import java.util.function.Function;
 import org.eclipse.jetty.http.HttpHeader;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.HttpRequestData;
 
-import java.util.function.Function;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-
 public final class Http2HeadersProvider implements HttpHeadersProvider {
 
-    private static final Function<ContentType, String> contentTypeToMediaType = contentType ->
-            AVRO.equals(contentType) ? AVRO_BINARY : APPLICATION_JSON;
-
-    @Override
-    public HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData) {
-        return new HttpRequestHeaders(
-                ImmutableMap.of(HttpHeader.CONTENT_TYPE.toString(), contentTypeToMediaType.apply(message.getContentType()))
-        );
-    }
+  private static final Function<ContentType, String> contentTypeToMediaType =
+      contentType -> AVRO.equals(contentType) ? AVRO_BINARY : APPLICATION_JSON;
 
+  @Override
+  public HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData) {
+    return new HttpRequestHeaders(
+        ImmutableMap.of(
+            HttpHeader.CONTENT_TYPE.toString(),
+            contentTypeToMediaType.apply(message.getContentType())));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HttpHeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HttpHeadersProvider.java
index cfc5107662..380c26e3a9 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HttpHeadersProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HttpHeadersProvider.java
@@ -5,6 +5,5 @@
 
 public interface HttpHeadersProvider {
 
-    HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData);
-
+  HttpRequestHeaders getHeaders(Message message, HttpRequestData requestData);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HttpRequestHeaders.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HttpRequestHeaders.java
index c0c625b7d9..9195e5b7c2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HttpRequestHeaders.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/HttpRequestHeaders.java
@@ -1,19 +1,17 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http.headers;
 
 import com.google.common.collect.ImmutableMap;
-
 import java.util.Map;
 
 public final class HttpRequestHeaders {
 
-    private final Map<String, String> headers;
-
-    public HttpRequestHeaders(Map<String, String> headers) {
-        this.headers = headers;
-    }
+  private final Map<String, String> headers;
 
-    public Map<String, String> asMap() {
-        return ImmutableMap.copyOf(headers);
-    }
+  public HttpRequestHeaders(Map<String, String> headers) {
+    this.headers = headers;
+  }
 
+  public Map<String, String> asMap() {
+    return ImmutableMap.copyOf(headers);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/AbstractJmsMessageSenderProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/AbstractJmsMessageSenderProvider.java
index 70a0cc45fd..04279d7765 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/AbstractJmsMessageSenderProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/AbstractJmsMessageSenderProvider.java
@@ -3,6 +3,11 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import java.net.URI;
+import java.util.concurrent.ExecutionException;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSContext;
+import javax.jms.Message;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
@@ -12,63 +17,56 @@
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 import pl.allegro.tech.hermes.consumers.uri.UriUtils;
 
-import java.net.URI;
-import java.util.concurrent.ExecutionException;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.Message;
-
 public abstract class AbstractJmsMessageSenderProvider implements JmsMessageSenderProvider {
 
-    protected final LoadingCache<URI, ConnectionFactory> connectionFactoryCache;
-    protected final MetadataAppender<Message> metadataAppender;
+  protected final LoadingCache<URI, ConnectionFactory> connectionFactoryCache;
+  protected final MetadataAppender<Message> metadataAppender;
 
-    public AbstractJmsMessageSenderProvider(MetadataAppender<Message> metadataAppender) {
-        this.connectionFactoryCache = CacheBuilder.newBuilder().build(new ConnectionFactoryLoader());
-        this.metadataAppender = metadataAppender;
-    }
+  public AbstractJmsMessageSenderProvider(MetadataAppender<Message> metadataAppender) {
+    this.connectionFactoryCache = CacheBuilder.newBuilder().build(new ConnectionFactoryLoader());
+    this.metadataAppender = metadataAppender;
+  }
 
-    @Override
-    public MessageSender create(Subscription subscription, ResilientMessageSender resilientMessageSender) {
-        EndpointAddress endpoint = subscription.getEndpoint();
-        URI uri = endpoint.getUri();
-        ConnectionFactory connectionFactory = getConnectionFactory(uri);
-        JMSContext jmsContext = connectionFactory.createContext(
-                endpoint.getUsername(),
-                endpoint.getPassword()
-        );
+  @Override
+  public MessageSender create(
+      Subscription subscription, ResilientMessageSender resilientMessageSender) {
+    EndpointAddress endpoint = subscription.getEndpoint();
+    URI uri = endpoint.getUri();
+    ConnectionFactory connectionFactory = getConnectionFactory(uri);
+    JMSContext jmsContext =
+        connectionFactory.createContext(endpoint.getUsername(), endpoint.getPassword());
 
-        JmsMessageSender jmsMessageSender = new JmsMessageSender(jmsContext, extractTopicName(uri), metadataAppender);
-        return new SingleRecipientMessageSenderAdapter(jmsMessageSender, resilientMessageSender);
-    }
+    JmsMessageSender jmsMessageSender =
+        new JmsMessageSender(jmsContext, extractTopicName(uri), metadataAppender);
+    return new SingleRecipientMessageSenderAdapter(jmsMessageSender, resilientMessageSender);
+  }
 
-    @Override
-    public void start() throws Exception {
-    }
+  @Override
+  public void start() throws Exception {}
 
-    @Override
-    public void stop() throws Exception {
-        connectionFactoryCache.invalidateAll();
-    }
+  @Override
+  public void stop() throws Exception {
+    connectionFactoryCache.invalidateAll();
+  }
 
-    private ConnectionFactory getConnectionFactory(URI serverUri) {
-        try {
-            return connectionFactoryCache.get(serverUri);
-        } catch (ExecutionException e) {
-            throw new InternalProcessingException(
-                    String.format("Unable to create connection factory for url %s", serverUri), e);
-        }
+  private ConnectionFactory getConnectionFactory(URI serverUri) {
+    try {
+      return connectionFactoryCache.get(serverUri);
+    } catch (ExecutionException e) {
+      throw new InternalProcessingException(
+          String.format("Unable to create connection factory for url %s", serverUri), e);
     }
+  }
 
-    private String extractTopicName(URI endpointURI) {
-        return UriUtils.extractContextFromUri(endpointURI).replaceFirst("/", "");
-    }
+  private String extractTopicName(URI endpointURI) {
+    return UriUtils.extractContextFromUri(endpointURI).replaceFirst("/", "");
+  }
 
-    protected class ConnectionFactoryLoader extends CacheLoader<URI, ConnectionFactory> {
+  protected class ConnectionFactoryLoader extends CacheLoader<URI, ConnectionFactory> {
 
-        @Override
-        public ConnectionFactory load(URI serverUri) throws Exception {
-            return createConnectionFactory(serverUri);
-        }
+    @Override
+    public ConnectionFactory load(URI serverUri) throws Exception {
+      return createConnectionFactory(serverUri);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsHornetQMessageSenderProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsHornetQMessageSenderProvider.java
index 2c5d707da4..75c4737c5a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsHornetQMessageSenderProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsHornetQMessageSenderProvider.java
@@ -1,6 +1,11 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.jms;
 
 import com.google.common.collect.ImmutableSet;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Set;
+import javax.jms.ConnectionFactory;
+import javax.jms.Message;
 import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.jms.HornetQJMSClient;
 import org.hornetq.api.jms.JMSFactoryType;
@@ -8,33 +13,29 @@
 import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 import pl.allegro.tech.hermes.consumers.uri.UriUtils;
 
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Set;
-import javax.jms.ConnectionFactory;
-import javax.jms.Message;
-
 public class JmsHornetQMessageSenderProvider extends AbstractJmsMessageSenderProvider {
-    private static final Set<String> SUPPORTED_PROTOCOLS = ImmutableSet.of("jms");
+  private static final Set<String> SUPPORTED_PROTOCOLS = ImmutableSet.of("jms");
 
-    public JmsHornetQMessageSenderProvider(MetadataAppender<Message> metadataAppender) {
-        super(metadataAppender);
-    }
+  public JmsHornetQMessageSenderProvider(MetadataAppender<Message> metadataAppender) {
+    super(metadataAppender);
+  }
 
-    @Override
-    public ConnectionFactory createConnectionFactory(URI serverUri) {
-        HashMap<String, Object> props = new HashMap<>();
-        props.put("host", UriUtils.extractHostFromUri(serverUri));
-        Integer port = UriUtils.extractPortFromUri(serverUri);
-        if (port != null) {
-            props.put("port", port);
-        }
-        TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getName(), props);
-        return HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, transportConfiguration);
+  @Override
+  public ConnectionFactory createConnectionFactory(URI serverUri) {
+    HashMap<String, Object> props = new HashMap<>();
+    props.put("host", UriUtils.extractHostFromUri(serverUri));
+    Integer port = UriUtils.extractPortFromUri(serverUri);
+    if (port != null) {
+      props.put("port", port);
     }
+    TransportConfiguration transportConfiguration =
+        new TransportConfiguration(NettyConnectorFactory.class.getName(), props);
+    return HornetQJMSClient.createConnectionFactoryWithoutHA(
+        JMSFactoryType.CF, transportConfiguration);
+  }
 
-    @Override
-    public Set<String> getSupportedProtocols() {
-        return SUPPORTED_PROTOCOLS;
-    }
+  @Override
+  public Set<String> getSupportedProtocols() {
+    return SUPPORTED_PROTOCOLS;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSender.java
index 995fe555bf..1886d183b6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSender.java
@@ -1,11 +1,9 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.jms;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.consumers.consumer.sender.CompletableFutureAwareMessageSender;
-import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
-import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.TOPIC_NAME;
+import static pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult.failedResult;
+import static pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult.succeededResult;
 
 import java.util.concurrent.CompletableFuture;
 import javax.jms.BytesMessage;
@@ -13,59 +11,66 @@
 import javax.jms.JMSContext;
 import javax.jms.JMSException;
 import javax.jms.JMSRuntimeException;
-
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.TOPIC_NAME;
-import static pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult.failedResult;
-import static pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult.succeededResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
+import pl.allegro.tech.hermes.consumers.consumer.sender.CompletableFutureAwareMessageSender;
+import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
+import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
 public class JmsMessageSender implements CompletableFutureAwareMessageSender {
 
-    private static final Logger logger = LoggerFactory.getLogger(JmsMessageSender.class);
+  private static final Logger logger = LoggerFactory.getLogger(JmsMessageSender.class);
 
-    private final String topicName;
-    private final JMSContext jmsContext;
-    private final MetadataAppender<javax.jms.Message> metadataAppender;
+  private final String topicName;
+  private final JMSContext jmsContext;
+  private final MetadataAppender<javax.jms.Message> metadataAppender;
 
-    public JmsMessageSender(JMSContext jmsContext, String destinationTopic, MetadataAppender<javax.jms.Message> metadataAppender) {
-        this.jmsContext = jmsContext;
-        this.topicName = destinationTopic;
-        this.metadataAppender = metadataAppender;
-    }
+  public JmsMessageSender(
+      JMSContext jmsContext,
+      String destinationTopic,
+      MetadataAppender<javax.jms.Message> metadataAppender) {
+    this.jmsContext = jmsContext;
+    this.topicName = destinationTopic;
+    this.metadataAppender = metadataAppender;
+  }
 
-    @Override
-    public void stop() {
-        jmsContext.close();
-    }
+  @Override
+  public void stop() {
+    jmsContext.close();
+  }
 
-    @Override
-    public void send(Message msg, final CompletableFuture<MessageSendingResult> resultFuture) {
-        try {
-            BytesMessage message = jmsContext.createBytesMessage();
-            message.writeBytes(msg.getData());
-            message.setStringProperty(TOPIC_NAME.getCamelCaseName(), msg.getTopic());
-            message.setStringProperty(MESSAGE_ID.getCamelCaseName(), msg.getId());
+  @Override
+  public void send(Message msg, final CompletableFuture<MessageSendingResult> resultFuture) {
+    try {
+      BytesMessage message = jmsContext.createBytesMessage();
+      message.writeBytes(msg.getData());
+      message.setStringProperty(TOPIC_NAME.getCamelCaseName(), msg.getTopic());
+      message.setStringProperty(MESSAGE_ID.getCamelCaseName(), msg.getId());
 
-            metadataAppender.append(message, msg);
+      metadataAppender.append(message, msg);
 
-            CompletionListener asyncListener = new CompletionListener() {
-                @Override
-                public void onCompletion(javax.jms.Message message) {
-                    resultFuture.complete(succeededResult());
-                }
+      CompletionListener asyncListener =
+          new CompletionListener() {
+            @Override
+            public void onCompletion(javax.jms.Message message) {
+              resultFuture.complete(succeededResult());
+            }
 
-                @Override
-                public void onException(javax.jms.Message message, Exception exception) {
-                    logger.warn(String.format("Exception while sending message to topic %s", topicName), exception);
-                    resultFuture.complete(failedResult(exception));
-                }
-            };
-            jmsContext.createProducer()
-                    .setAsync(asyncListener)
-                    .send(jmsContext.createTopic(topicName), message);
-        } catch (JMSException | JMSRuntimeException e) {
-            resultFuture.complete(failedResult(e));
-        }
+            @Override
+            public void onException(javax.jms.Message message, Exception exception) {
+              logger.warn(
+                  String.format("Exception while sending message to topic %s", topicName),
+                  exception);
+              resultFuture.complete(failedResult(exception));
+            }
+          };
+      jmsContext
+          .createProducer()
+          .setAsync(asyncListener)
+          .send(jmsContext.createTopic(topicName), message);
+    } catch (JMSException | JMSRuntimeException e) {
+      resultFuture.complete(failedResult(e));
     }
-
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSenderProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSenderProvider.java
index bd4969f5f4..9265a89bea 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSenderProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSenderProvider.java
@@ -1,12 +1,10 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.jms;
 
-import pl.allegro.tech.hermes.consumers.consumer.sender.ProtocolMessageSenderProvider;
-
 import java.net.URI;
 import javax.jms.ConnectionFactory;
+import pl.allegro.tech.hermes.consumers.consumer.sender.ProtocolMessageSenderProvider;
 
 public interface JmsMessageSenderProvider extends ProtocolMessageSenderProvider {
 
-    ConnectionFactory createConnectionFactory(URI serverUri);
-
+  ConnectionFactory createConnectionFactory(URI serverUri);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMetadataAppender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMetadataAppender.java
index c9b73e953f..fbab75c211 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMetadataAppender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMetadataAppender.java
@@ -1,28 +1,27 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.jms;
 
-import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
-
 import java.util.Map;
 import javax.jms.JMSException;
 import javax.jms.JMSRuntimeException;
 import javax.jms.Message;
+import pl.allegro.tech.hermes.consumers.consumer.trace.MetadataAppender;
 
 public class JmsMetadataAppender implements MetadataAppender<Message> {
 
-    private static String normalize(String key) {
-        return key.replaceAll("-", "");
-    }
+  private static String normalize(String key) {
+    return key.replaceAll("-", "");
+  }
 
-    @Override
-    public Message append(Message target, pl.allegro.tech.hermes.consumers.consumer.Message message) {
+  @Override
+  public Message append(Message target, pl.allegro.tech.hermes.consumers.consumer.Message message) {
 
-        try {
-            for (Map.Entry<String, String> entry : message.getExternalMetadata().entrySet()) {
-                target.setStringProperty(normalize(entry.getKey()), entry.getValue());
-            }
-            return target;
-        } catch (JMSException e) {
-            throw new JMSRuntimeException(e.getMessage(), e.getErrorCode(), e);
-        }
+    try {
+      for (Map.Entry<String, String> entry : message.getExternalMetadata().entrySet()) {
+        target.setStringProperty(normalize(entry.getKey()), entry.getValue());
+      }
+      return target;
+    } catch (JMSException e) {
+      throw new JMSRuntimeException(e.getMessage(), e.getErrorCode(), e);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/EndpointAddressResolutionException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/EndpointAddressResolutionException.java
index 6cf669a5f4..37d10152e5 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/EndpointAddressResolutionException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/EndpointAddressResolutionException.java
@@ -5,27 +5,29 @@
 @SuppressWarnings("serial")
 public class EndpointAddressResolutionException extends Exception {
 
-    private final boolean ignoreInRateCalculation;
-
-    public EndpointAddressResolutionException(EndpointAddress endpointAddress, Throwable cause, boolean ignoreInRateCalculation) {
-        super("Failed to resolve " + endpointAddress, cause);
-        this.ignoreInRateCalculation = ignoreInRateCalculation;
-    }
-
-    public EndpointAddressResolutionException(EndpointAddress endpointAddress, Throwable cause) {
-        this(endpointAddress, cause, false);
-    }
-
-    public EndpointAddressResolutionException(String message, Throwable cause, boolean ignoreInRateCalculation) {
-        super(message, cause);
-        this.ignoreInRateCalculation = ignoreInRateCalculation;
-    }
-
-    public EndpointAddressResolutionException(String message, Throwable cause) {
-        this(message, cause, false);
-    }
-
-    public boolean isIgnoreInRateCalculation() {
-        return ignoreInRateCalculation;
-    }
+  private final boolean ignoreInRateCalculation;
+
+  public EndpointAddressResolutionException(
+      EndpointAddress endpointAddress, Throwable cause, boolean ignoreInRateCalculation) {
+    super("Failed to resolve " + endpointAddress, cause);
+    this.ignoreInRateCalculation = ignoreInRateCalculation;
+  }
+
+  public EndpointAddressResolutionException(EndpointAddress endpointAddress, Throwable cause) {
+    this(endpointAddress, cause, false);
+  }
+
+  public EndpointAddressResolutionException(
+      String message, Throwable cause, boolean ignoreInRateCalculation) {
+    super(message, cause);
+    this.ignoreInRateCalculation = ignoreInRateCalculation;
+  }
+
+  public EndpointAddressResolutionException(String message, Throwable cause) {
+    this(message, cause, false);
+  }
+
+  public boolean isIgnoreInRateCalculation() {
+    return ignoreInRateCalculation;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/EndpointAddressResolver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/EndpointAddressResolver.java
index c5fa1e3e98..9f201d049b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/EndpointAddressResolver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/EndpointAddressResolver.java
@@ -1,36 +1,38 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.resolver;
 
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.api.EndpointAddressResolverMetadata;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.batch.MessageBatch;
 
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-
 public interface EndpointAddressResolver {
 
-    default URI resolve(EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
-            throws EndpointAddressResolutionException {
-        return resolve(address);
-    }
+  default URI resolve(
+      EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
+      throws EndpointAddressResolutionException {
+    return resolve(address);
+  }
 
-    default URI resolve(EndpointAddress address, MessageBatch batch, EndpointAddressResolverMetadata metadata)
-            throws EndpointAddressResolutionException {
-        return resolve(address);
-    }
+  default URI resolve(
+      EndpointAddress address, MessageBatch batch, EndpointAddressResolverMetadata metadata)
+      throws EndpointAddressResolutionException {
+    return resolve(address);
+  }
 
-    static URI resolve(EndpointAddress address) throws EndpointAddressResolutionException {
-        try {
-            return address.getUri();
-        } catch (Exception ex) {
-            throw new EndpointAddressResolutionException(address, ex);
-        }
+  static URI resolve(EndpointAddress address) throws EndpointAddressResolutionException {
+    try {
+      return address.getUri();
+    } catch (Exception ex) {
+      throw new EndpointAddressResolutionException(address, ex);
     }
+  }
 
-    default List<URI> resolveAll(EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
-            throws EndpointAddressResolutionException {
-        return Collections.singletonList(resolve(address, message, metadata));
-    }
+  default List<URI> resolveAll(
+      EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
+      throws EndpointAddressResolutionException {
+    return Collections.singletonList(resolve(address, message, metadata));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/InterpolatingEndpointAddressResolver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/InterpolatingEndpointAddressResolver.java
index d025d312f5..e5f5246959 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/InterpolatingEndpointAddressResolver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/InterpolatingEndpointAddressResolver.java
@@ -1,29 +1,28 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.resolver;
 
+import java.net.URI;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.api.EndpointAddressResolverMetadata;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.interpolation.InterpolationException;
 import pl.allegro.tech.hermes.consumers.consumer.interpolation.UriInterpolator;
 
-import java.net.URI;
-
 public class InterpolatingEndpointAddressResolver implements EndpointAddressResolver {
 
-    private final UriInterpolator interpolator;
+  private final UriInterpolator interpolator;
 
-    public InterpolatingEndpointAddressResolver(UriInterpolator interpolator) {
-        this.interpolator = interpolator;
-    }
+  public InterpolatingEndpointAddressResolver(UriInterpolator interpolator) {
+    this.interpolator = interpolator;
+  }
 
-    @Override
-    public URI resolve(EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
-            throws EndpointAddressResolutionException {
-        try {
-            return interpolator.interpolate(address, message);
-        } catch (InterpolationException ex) {
-            throw new EndpointAddressResolutionException(address, ex);
-        }
+  @Override
+  public URI resolve(
+      EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
+      throws EndpointAddressResolutionException {
+    try {
+      return interpolator.interpolate(address, message);
+    } catch (InterpolationException ex) {
+      throw new EndpointAddressResolutionException(address, ex);
     }
-
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/ResolvableEndpointAddress.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/ResolvableEndpointAddress.java
index 6569dccbbe..c165eaa453 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/ResolvableEndpointAddress.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/ResolvableEndpointAddress.java
@@ -1,39 +1,41 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.resolver;
 
+import java.net.URI;
+import java.util.List;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.api.EndpointAddressResolverMetadata;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 
-import java.net.URI;
-import java.util.List;
-
 public class ResolvableEndpointAddress {
 
-    private final EndpointAddress address;
+  private final EndpointAddress address;
 
-    private final EndpointAddressResolver resolver;
+  private final EndpointAddressResolver resolver;
 
-    private final EndpointAddressResolverMetadata metadata;
+  private final EndpointAddressResolverMetadata metadata;
 
-    public ResolvableEndpointAddress(EndpointAddress address, EndpointAddressResolver resolver, EndpointAddressResolverMetadata metadata) {
-        this.address = address;
-        this.resolver = resolver;
-        this.metadata = metadata;
-    }
+  public ResolvableEndpointAddress(
+      EndpointAddress address,
+      EndpointAddressResolver resolver,
+      EndpointAddressResolverMetadata metadata) {
+    this.address = address;
+    this.resolver = resolver;
+    this.metadata = metadata;
+  }
 
-    public URI resolveFor(Message message) throws EndpointAddressResolutionException {
-        return resolver.resolve(address, message, metadata);
-    }
+  public URI resolveFor(Message message) throws EndpointAddressResolutionException {
+    return resolver.resolve(address, message, metadata);
+  }
 
-    public List<URI> resolveAllFor(Message message) throws EndpointAddressResolutionException {
-        return resolver.resolveAll(address, message, metadata);
-    }
+  public List<URI> resolveAllFor(Message message) throws EndpointAddressResolutionException {
+    return resolver.resolveAll(address, message, metadata);
+  }
 
-    public EndpointAddress getRawAddress() {
-        return address;
-    }
+  public EndpointAddress getRawAddress() {
+    return address;
+  }
 
-    public String toString() {
-        return address.toString();
-    }
+  public String toString() {
+    return address.toString();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/SimpleEndpointAddressResolver.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/SimpleEndpointAddressResolver.java
index e7ecf25191..fbb486dee9 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/SimpleEndpointAddressResolver.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/SimpleEndpointAddressResolver.java
@@ -1,5 +1,3 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.resolver;
 
-public class SimpleEndpointAddressResolver implements EndpointAddressResolver {
-
-}
+public class SimpleEndpointAddressResolver implements EndpointAddressResolver {}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/timeout/FutureAsyncTimeout.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/timeout/FutureAsyncTimeout.java
index 3cc296cb42..883813f8d0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/timeout/FutureAsyncTimeout.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/timeout/FutureAsyncTimeout.java
@@ -7,32 +7,34 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 
-/**
- * see http://www.nurkiewicz.com/2014/12/asynchronous-timeouts-with.html
- */
+/** see http://www.nurkiewicz.com/2014/12/asynchronous-timeouts-with.html */
 public class FutureAsyncTimeout {
 
-    private final ScheduledExecutorService executor;
-
-
-    public FutureAsyncTimeout(ScheduledExecutorService scheduledExecutorService) {
-        this.executor = scheduledExecutorService;
-    }
-
-    public <T> CompletableFuture<T> within(CompletableFuture<T> future, Duration duration, Function<Throwable, T> exceptionMapper) {
-        return future.applyToEither(failAfter(duration, exceptionMapper), Function.identity());
-    }
-
-    private <T> CompletableFuture<T> failAfter(Duration duration, Function<Throwable, T> exceptionMapper) {
-        final CompletableFuture<T> promise = new CompletableFuture<>();
-        executor.schedule(() -> {
-            TimeoutException ex = new TimeoutException("Timeout after " + duration);
-            return promise.complete(exceptionMapper.apply(ex));
-        }, duration.toMillis(), TimeUnit.MILLISECONDS);
-        return promise;
-    }
-
-    public void shutdown() {
-        executor.shutdown();
-    }
+  private final ScheduledExecutorService executor;
+
+  public FutureAsyncTimeout(ScheduledExecutorService scheduledExecutorService) {
+    this.executor = scheduledExecutorService;
+  }
+
+  public <T> CompletableFuture<T> within(
+      CompletableFuture<T> future, Duration duration, Function<Throwable, T> exceptionMapper) {
+    return future.applyToEither(failAfter(duration, exceptionMapper), Function.identity());
+  }
+
+  private <T> CompletableFuture<T> failAfter(
+      Duration duration, Function<Throwable, T> exceptionMapper) {
+    final CompletableFuture<T> promise = new CompletableFuture<>();
+    executor.schedule(
+        () -> {
+          TimeoutException ex = new TimeoutException("Timeout after " + duration);
+          return promise.complete(exceptionMapper.apply(ex));
+        },
+        duration.toMillis(),
+        TimeUnit.MILLISECONDS);
+    return promise;
+  }
+
+  public void shutdown() {
+    executor.shutdown();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/trace/MetadataAppender.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/trace/MetadataAppender.java
index f94f644d0c..00c9ec1380 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/trace/MetadataAppender.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/trace/MetadataAppender.java
@@ -4,5 +4,5 @@
 
 public interface MetadataAppender<T> {
 
-    T append(T target, Message message);
+  T append(T target, Message message);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/health/Checks.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/health/Checks.java
index 6ea6a97bb4..19fe5ed5e2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/health/Checks.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/health/Checks.java
@@ -1,6 +1,6 @@
 package pl.allegro.tech.hermes.consumers.health;
 
 public final class Checks {
-    public static final String SUBSCRIPTIONS = "subscriptions";
-    public static final String SUBSCRIPTIONS_COUNT = "subscriptionsCount";
+  public static final String SUBSCRIPTIONS = "subscriptions";
+  public static final String SUBSCRIPTIONS_COUNT = "subscriptionsCount";
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/health/ConsumerMonitor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/health/ConsumerMonitor.java
index 557b468d7f..03aa7e1dfb 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/health/ConsumerMonitor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/health/ConsumerMonitor.java
@@ -6,17 +6,17 @@
 
 public class ConsumerMonitor {
 
-    private Map<String, Supplier<Object>> checks = new ConcurrentHashMap<>();
+  private Map<String, Supplier<Object>> checks = new ConcurrentHashMap<>();
 
-    public void register(String key, Supplier<Object> check) {
-        checks.putIfAbsent(key, check);
-    }
+  public void register(String key, Supplier<Object> check) {
+    checks.putIfAbsent(key, check);
+  }
 
-    public Object check(String key) {
-        try {
-            return checks.getOrDefault(key, () -> "Unavailable").get();
-        } catch (Exception ex) {
-            return "Failed to evaluate check, " + ex.getMessage();
-        }
+  public Object check(String key) {
+    try {
+      return checks.getOrDefault(key, () -> "Unavailable").get();
+    } catch (Exception ex) {
+      return "Failed to evaluate check, " + ex.getMessage();
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/message/undelivered/UndeliveredMessageLogPersister.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/message/undelivered/UndeliveredMessageLogPersister.java
index 8dd1f6310a..911ffb3a38 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/message/undelivered/UndeliveredMessageLogPersister.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/message/undelivered/UndeliveredMessageLogPersister.java
@@ -1,33 +1,36 @@
 package pl.allegro.tech.hermes.consumers.message.undelivered;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import pl.allegro.tech.hermes.common.message.undelivered.UndeliveredMessageLog;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.time.Duration;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import pl.allegro.tech.hermes.common.message.undelivered.UndeliveredMessageLog;
 
 public class UndeliveredMessageLogPersister {
 
-    private final Duration period;
-    private final UndeliveredMessageLog undeliveredMessageLog;
-    private final ScheduledExecutorService scheduledExecutorService;
-
-    public UndeliveredMessageLogPersister(UndeliveredMessageLog undeliveredMessageLog, Duration undeliveredMessageLogPersistPeriod) {
-        this.undeliveredMessageLog = undeliveredMessageLog;
-        this.period = undeliveredMessageLogPersistPeriod;
-        this.scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(
-                new ThreadFactoryBuilder().setNameFormat("undelivered-message-log-persister-%d").build());
-    }
-
-    public void start() {
-        scheduledExecutorService.scheduleAtFixedRate(undeliveredMessageLog::persist, period.toMillis(), period.toMillis(), MILLISECONDS);
-    }
-
-    public void shutdown() {
-        scheduledExecutorService.shutdown();
-    }
-
+  private final Duration period;
+  private final UndeliveredMessageLog undeliveredMessageLog;
+  private final ScheduledExecutorService scheduledExecutorService;
+
+  public UndeliveredMessageLogPersister(
+      UndeliveredMessageLog undeliveredMessageLog, Duration undeliveredMessageLogPersistPeriod) {
+    this.undeliveredMessageLog = undeliveredMessageLog;
+    this.period = undeliveredMessageLogPersistPeriod;
+    this.scheduledExecutorService =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactoryBuilder()
+                .setNameFormat("undelivered-message-log-persister-%d")
+                .build());
+  }
+
+  public void start() {
+    scheduledExecutorService.scheduleAtFixedRate(
+        undeliveredMessageLog::persist, period.toMillis(), period.toMillis(), MILLISECONDS);
+  }
+
+  public void shutdown() {
+    scheduledExecutorService.shutdown();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/FullDrainMpscQueue.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/FullDrainMpscQueue.java
index 3dbb63f890..58b45c29f6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/FullDrainMpscQueue.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/FullDrainMpscQueue.java
@@ -1,55 +1,56 @@
 package pl.allegro.tech.hermes.consumers.queue;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 import org.jctools.queues.MessagePassingQueue;
 import org.jctools.queues.MpscArrayQueue;
 import org.slf4j.Logger;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 public class FullDrainMpscQueue<T> implements MpscQueue<T> {
 
-    private static final Logger logger = getLogger(FullDrainMpscQueue.class);
-
-    private final MpscArrayQueue<T> queue;
-
-    public FullDrainMpscQueue(int capacity) {
-        this.queue = new MpscArrayQueue<>(capacity);
+  private static final Logger logger = getLogger(FullDrainMpscQueue.class);
+
+  private final MpscArrayQueue<T> queue;
+
+  public FullDrainMpscQueue(int capacity) {
+    this.queue = new MpscArrayQueue<>(capacity);
+  }
+
+  @Override
+  public boolean offer(T element) {
+    return queue.offer(element);
+  }
+
+  /**
+   * The {@link MpscArrayQueue#drain(MessagePassingQueue.Consumer)} method may skip items with
+   * allocated slots by producers (who won CAS) but were not added to the queue yet. This may happen
+   * to broken elements chain. See explanation <a
+   * href="http://psy-lob-saw.blogspot.com/2014/07/poll-me-maybe.html">here</a>.
+   *
+   * <p>This is an alternative approach which waits for all items to become available by using
+   * {@link MpscArrayQueue#poll()} underneath (which spin-waits when getting next item).
+   */
+  @Override
+  public void drain(MessagePassingQueue.Consumer<T> consumer) {
+    int size = queue.size();
+    for (int i = 0; i < size; i++) {
+      T element = queue.poll();
+      if (element != null) {
+        consumer.accept(element);
+      } else {
+        logger.warn("Unexpected null value while draining queue [idx={}, size={}]", i, size);
+        break;
+      }
     }
+  }
 
-    @Override
-    public boolean offer(T element) {
-        return queue.offer(element);
-    }
-
-    /**
-     * <p>The {@link MpscArrayQueue#drain(MessagePassingQueue.Consumer)} method may skip items with allocated slots
-     * by producers (who won CAS) but were not added to the queue yet. This may happen to broken elements chain.
-     * See explanation <a href="http://psy-lob-saw.blogspot.com/2014/07/poll-me-maybe.html">here</a>.</p>
-     *
-     * <p>This is an alternative approach which waits for all items to become available
-     * by using {@link MpscArrayQueue#poll()} underneath (which spin-waits when getting next item).</p>
-     */
-    @Override
-    public void drain(MessagePassingQueue.Consumer<T> consumer) {
-        int size = queue.size();
-        for (int i = 0; i < size; i++) {
-            T element = queue.poll();
-            if (element != null) {
-                consumer.accept(element);
-            } else {
-                logger.warn("Unexpected null value while draining queue [idx={}, size={}]", i, size);
-                break;
-            }
-        }
-    }
+  @Override
+  public int size() {
+    return queue.size();
+  }
 
-    @Override
-    public int size() {
-        return queue.size();
-    }
-
-    @Override
-    public int capacity() {
-        return queue.capacity();
-    }
+  @Override
+  public int capacity() {
+    return queue.capacity();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/MonitoredMpscQueue.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/MonitoredMpscQueue.java
index fafc33af83..5c1b7e38a1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/MonitoredMpscQueue.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/MonitoredMpscQueue.java
@@ -8,43 +8,46 @@
 
 public class MonitoredMpscQueue<T> implements MpscQueue<T> {
 
-    private static final Logger logger = LoggerFactory.getLogger(MonitoredMpscQueue.class);
-
-    private final MpscQueue<T> queue;
-
-    private final String name;
-
-    private final HermesCounter failuresCounter;
-
-    public MonitoredMpscQueue(MpscQueue<T> queue, MetricsFacade metrics, String name) {
-        this.queue = queue;
-        this.name = name;
-        metrics.consumer().registerQueueUtilizationGauge(queue, name, q -> (double) q.size() / q.capacity());
-        this.failuresCounter = metrics.consumer().queueFailuresCounter(name);
-    }
-
-    @Override
-    public boolean offer(T element) {
-        boolean accepted = queue.offer(element);
-        if (!accepted) {
-            failuresCounter.increment();
-            logger.error("[Queue: {}] Unable to add item: queue is full. Offered item: {}", name, element);
-        }
-        return accepted;
-    }
-
-    @Override
-    public void drain(MessagePassingQueue.Consumer<T> consumer) {
-        queue.drain(consumer);
-    }
-
-    @Override
-    public int size() {
-        return queue.size();
-    }
-
-    @Override
-    public int capacity() {
-        return queue.capacity();
+  private static final Logger logger = LoggerFactory.getLogger(MonitoredMpscQueue.class);
+
+  private final MpscQueue<T> queue;
+
+  private final String name;
+
+  private final HermesCounter failuresCounter;
+
+  public MonitoredMpscQueue(MpscQueue<T> queue, MetricsFacade metrics, String name) {
+    this.queue = queue;
+    this.name = name;
+    metrics
+        .consumer()
+        .registerQueueUtilizationGauge(queue, name, q -> (double) q.size() / q.capacity());
+    this.failuresCounter = metrics.consumer().queueFailuresCounter(name);
+  }
+
+  @Override
+  public boolean offer(T element) {
+    boolean accepted = queue.offer(element);
+    if (!accepted) {
+      failuresCounter.increment();
+      logger.error(
+          "[Queue: {}] Unable to add item: queue is full. Offered item: {}", name, element);
     }
+    return accepted;
+  }
+
+  @Override
+  public void drain(MessagePassingQueue.Consumer<T> consumer) {
+    queue.drain(consumer);
+  }
+
+  @Override
+  public int size() {
+    return queue.size();
+  }
+
+  @Override
+  public int capacity() {
+    return queue.capacity();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/MpscQueue.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/MpscQueue.java
index c9fe254a53..36febba296 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/MpscQueue.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/MpscQueue.java
@@ -4,11 +4,11 @@
 
 public interface MpscQueue<T> {
 
-    boolean offer(T element);
+  boolean offer(T element);
 
-    void drain(MessagePassingQueue.Consumer<T> consumer);
+  void drain(MessagePassingQueue.Consumer<T> consumer);
 
-    int size();
+  int size();
 
-    int capacity();
+  int capacity();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/WaitFreeDrainMpscQueue.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/WaitFreeDrainMpscQueue.java
index 88cc5a5f57..c346f5edc1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/WaitFreeDrainMpscQueue.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/queue/WaitFreeDrainMpscQueue.java
@@ -5,29 +5,29 @@
 
 public class WaitFreeDrainMpscQueue<T> implements MpscQueue<T> {
 
-    private final MpscArrayQueue<T> queue;
-
-    public WaitFreeDrainMpscQueue(int capacity) {
-        this.queue = new MpscArrayQueue<>(capacity);
-    }
-
-    @Override
-    public boolean offer(T element) {
-        return queue.offer(element);
-    }
-
-    @Override
-    public void drain(MessagePassingQueue.Consumer<T> consumer) {
-        queue.drain(consumer);
-    }
-
-    @Override
-    public int size() {
-        return queue.size();
-    }
-
-    @Override
-    public int capacity() {
-        return queue.capacity();
-    }
+  private final MpscArrayQueue<T> queue;
+
+  public WaitFreeDrainMpscQueue(int capacity) {
+    this.queue = new MpscArrayQueue<>(capacity);
+  }
+
+  @Override
+  public boolean offer(T element) {
+    return queue.offer(element);
+  }
+
+  @Override
+  public void drain(MessagePassingQueue.Consumer<T> consumer) {
+    queue.drain(consumer);
+  }
+
+  @Override
+  public int size() {
+    return queue.size();
+  }
+
+  @Override
+  public int capacity() {
+    return queue.capacity();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/registry/ConsumerNodesRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/registry/ConsumerNodesRegistry.java
index 6b61cd5932..2f8cd13e80 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/registry/ConsumerNodesRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/registry/ConsumerNodesRegistry.java
@@ -1,5 +1,18 @@
 package pl.allegro.tech.hermes.consumers.registry;
 
+import static java.util.stream.Collectors.toList;
+import static org.apache.commons.lang3.StringUtils.substringAfterLast;
+import static org.apache.zookeeper.CreateMode.EPHEMERAL;
+
+import java.io.IOException;
+import java.time.Clock;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
@@ -11,157 +24,148 @@
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
-import java.io.IOException;
-import java.time.Clock;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.stream.Collectors.toList;
-import static org.apache.commons.lang.StringUtils.substringAfterLast;
-import static org.apache.zookeeper.CreateMode.EPHEMERAL;
-
 public class ConsumerNodesRegistry extends PathChildrenCache implements PathChildrenCacheListener {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConsumerNodesRegistry.class);
-
-    private final CuratorFramework curatorClient;
-    private final ConsumerNodesRegistryPaths registryPaths;
-    private final String consumerNodeId;
-    private final LeaderLatch leaderLatch;
-    private final Map<String, Long> consumersLastSeen = new HashMap<>();
-    private final long deathOfConsumerAfterMillis;
-    private final Clock clock;
-
-    public ConsumerNodesRegistry(
-            CuratorFramework curatorClient,
-            ExecutorService executorService,
-            ConsumerNodesRegistryPaths registryPaths,
-            String consumerNodeId,
-            long deathOfConsumerAfterSeconds,
-            Clock clock
-    ) {
-        super(curatorClient, registryPaths.nodesPath(), true, false, executorService);
-
-        this.curatorClient = curatorClient;
-        this.registryPaths = registryPaths;
-        this.consumerNodeId = consumerNodeId;
-        this.clock = clock;
-        this.leaderLatch = new LeaderLatch(curatorClient, registryPaths.leaderPath(), consumerNodeId);
-        this.deathOfConsumerAfterMillis = TimeUnit.SECONDS.toMillis(deathOfConsumerAfterSeconds);
-    }
-
-    @Override
-    public void start() throws Exception {
-        getListenable().addListener(this);
-        super.start(StartMode.POST_INITIALIZED_EVENT);
-        leaderLatch.start();
-    }
-
-    public void stop() throws IOException {
-        leaderLatch.close();
-        close();
-    }
-
-    @Override
-    public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
-        switch (event.getType()) {
-            case INITIALIZED:
-            case CONNECTION_RECONNECTED:
-                if (!isRegistered(consumerNodeId)) {
-                    registerConsumerNode();
-                }
-                break;
-            default:
-                // noop
-                break;
+  private static final Logger logger = LoggerFactory.getLogger(ConsumerNodesRegistry.class);
+
+  private final CuratorFramework curatorClient;
+  private final ConsumerNodesRegistryPaths registryPaths;
+  private final String consumerNodeId;
+  private final LeaderLatch leaderLatch;
+  private final Map<String, Long> consumersLastSeen = new ConcurrentHashMap<>();
+  private final long deathOfConsumerAfterMillis;
+  private final Clock clock;
+
+  public ConsumerNodesRegistry(
+      CuratorFramework curatorClient,
+      ExecutorService executorService,
+      ConsumerNodesRegistryPaths registryPaths,
+      String consumerNodeId,
+      long deathOfConsumerAfterSeconds,
+      Clock clock) {
+    super(curatorClient, registryPaths.nodesPath(), true, false, executorService);
+
+    this.curatorClient = curatorClient;
+    this.registryPaths = registryPaths;
+    this.consumerNodeId = consumerNodeId;
+    this.clock = clock;
+    this.leaderLatch = new LeaderLatch(curatorClient, registryPaths.leaderPath(), consumerNodeId);
+    this.deathOfConsumerAfterMillis = TimeUnit.SECONDS.toMillis(deathOfConsumerAfterSeconds);
+  }
+
+  @Override
+  public void start() throws Exception {
+    getListenable().addListener(this);
+    super.start(StartMode.POST_INITIALIZED_EVENT);
+    leaderLatch.start();
+  }
+
+  public void stop() throws IOException {
+    leaderLatch.close();
+    close();
+  }
+
+  @Override
+  public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
+    switch (event.getType()) {
+      case INITIALIZED:
+      case CONNECTION_RECONNECTED:
+        if (!isRegistered(consumerNodeId)) {
+          registerConsumerNode();
         }
+        break;
+      default:
+        // noop
+        break;
     }
+  }
 
-    public boolean isRegistered(String consumerNodeId) {
-        try {
-            return curatorClient.checkExists().forPath(registryPaths.nodePath(consumerNodeId)) != null;
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    public boolean isLeader() {
-        return ensureRegistered() && leaderLatch.hasLeadership();
-    }
-
-    public List<String> listConsumerNodes() {
-        return new ArrayList<>(consumersLastSeen.keySet());
-    }
-
-    public void refresh() {
-        logger.info("Refreshing current consumers registry");
-
-        long currentTime = clock.millis();
-        readCurrentNodes().forEach(node -> consumersLastSeen.put(node, currentTime));
-
-        List<String> deadConsumers = findDeadConsumers(currentTime);
-        if (!deadConsumers.isEmpty()) {
-            logger.info("Considering following consumers dead: {}", deadConsumers);
-        }
-        deadConsumers.forEach(consumersLastSeen::remove);
+  public boolean isRegistered(String consumerNodeId) {
+    try {
+      return curatorClient.checkExists().forPath(registryPaths.nodePath(consumerNodeId)) != null;
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    private boolean ensureRegistered() {
-        if (curatorClient.getZookeeperClient().isConnected()) {
-            if (!isRegistered(consumerNodeId)) {
-                registerConsumerNode();
-            }
-            return true;
-        }
-        return false;
-    }
+  public boolean isLeader() {
+    return ensureRegistered() && leaderLatch.hasLeadership();
+  }
 
-    private void registerConsumerNode() {
-        try {
-            String nodePath = registryPaths.nodePath(consumerNodeId);
-            if (curatorClient.checkExists().forPath(nodePath) == null) {
-                curatorClient.create().creatingParentsIfNeeded()
-                        .withMode(EPHEMERAL).forPath(nodePath);
-                logger.info("Registered in consumer nodes registry as {}", consumerNodeId);
-            }
-        } catch (NodeExistsException e) {
-            // Ignore as it is a race condition between threads trying to register the consumer node.
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-        refresh();
-    }
+  public List<String> listConsumerNodes() {
+    return new ArrayList<>(consumersLastSeen.keySet());
+  }
 
-    private List<String> findDeadConsumers(long currentTime) {
-        long tooOld = currentTime - deathOfConsumerAfterMillis;
-        return consumersLastSeen.entrySet().stream()
-                .filter(entry -> {
-                    long lastSeen = entry.getValue();
-                    return lastSeen < tooOld;
-                })
-                .map(Map.Entry::getKey)
-                .collect(toList());
-    }
+  public synchronized void refresh() {
+    logger.info("Refreshing current consumers registry");
 
-    private List<String> readCurrentNodes() {
-        return getCurrentData().stream()
-                .map(data -> substringAfterLast(data.getPath(), "/"))
-                .collect(toList());
+    long currentTime = clock.millis();
+    List<String> currentNodes = readCurrentNodes();
+    List<String> validNodes = currentNodes.stream().filter(StringUtils::isNotBlank).toList();
+    if (currentNodes.size() != validNodes.size()) {
+      logger.warn("Found {} invalid consumer nodes.", currentNodes.size() - validNodes.size());
     }
+    validNodes.forEach(node -> consumersLastSeen.put(node, currentTime));
 
-    public String getConsumerId() {
-        return consumerNodeId;
+    List<String> deadConsumers = findDeadConsumers(currentTime);
+    if (!deadConsumers.isEmpty()) {
+      logger.info("Considering following consumers dead: {}", deadConsumers);
     }
-
-    public void addLeaderLatchListener(LeaderLatchListener listener) {
-        leaderLatch.addListener(listener);
+    deadConsumers.forEach(consumersLastSeen::remove);
+  }
+
+  private boolean ensureRegistered() {
+    if (curatorClient.getZookeeperClient().isConnected()) {
+      if (!isRegistered(consumerNodeId)) {
+        registerConsumerNode();
+      }
+      return true;
     }
-
-    public void removeLeaderLatchListener(LeaderLatchListener listener) {
-        leaderLatch.removeListener(listener);
+    return false;
+  }
+
+  private void registerConsumerNode() {
+    try {
+      String nodePath = registryPaths.nodePath(consumerNodeId);
+      if (curatorClient.checkExists().forPath(nodePath) == null) {
+        curatorClient.create().creatingParentsIfNeeded().withMode(EPHEMERAL).forPath(nodePath);
+        logger.info("Registered in consumer nodes registry as {}", consumerNodeId);
+      }
+    } catch (NodeExistsException e) {
+      // Ignore as it is a race condition between threads trying to register the consumer node.
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+    refresh();
+  }
+
+  private List<String> findDeadConsumers(long currentTime) {
+    long tooOld = currentTime - deathOfConsumerAfterMillis;
+    return consumersLastSeen.entrySet().stream()
+        .filter(
+            entry -> {
+              long lastSeen = entry.getValue();
+              return lastSeen < tooOld;
+            })
+        .map(Map.Entry::getKey)
+        .collect(toList());
+  }
+
+  private List<String> readCurrentNodes() {
+    return getCurrentData().stream()
+        .map(data -> substringAfterLast(data.getPath(), "/"))
+        .collect(toList());
+  }
+
+  public String getConsumerId() {
+    return consumerNodeId;
+  }
+
+  public void addLeaderLatchListener(LeaderLatchListener listener) {
+    leaderLatch.addListener(listener);
+  }
+
+  public void removeLeaderLatchListener(LeaderLatchListener listener) {
+    leaderLatch.removeListener(listener);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/registry/ConsumerNodesRegistryPaths.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/registry/ConsumerNodesRegistryPaths.java
index 0f51bf0881..02cdcc1056 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/registry/ConsumerNodesRegistryPaths.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/registry/ConsumerNodesRegistryPaths.java
@@ -4,23 +4,24 @@
 
 public class ConsumerNodesRegistryPaths {
 
-    private final ZookeeperPaths zookeeperPaths;
-    private final String registryPath;
+  private final ZookeeperPaths zookeeperPaths;
+  private final String registryPath;
 
-    public ConsumerNodesRegistryPaths(ZookeeperPaths zookeeperPaths, String clusterName) {
-        this.zookeeperPaths = zookeeperPaths;
-        this.registryPath = zookeeperPaths.join(zookeeperPaths.basePath(), "consumers-registry", clusterName);
-    }
+  public ConsumerNodesRegistryPaths(ZookeeperPaths zookeeperPaths, String clusterName) {
+    this.zookeeperPaths = zookeeperPaths;
+    this.registryPath =
+        zookeeperPaths.join(zookeeperPaths.basePath(), "consumers-registry", clusterName);
+  }
 
-    public String leaderPath() {
-        return zookeeperPaths.join(registryPath, "leader");
-    }
+  public String leaderPath() {
+    return zookeeperPaths.join(registryPath, "leader");
+  }
 
-    public String nodePath(String nodeId) {
-        return zookeeperPaths.join(nodesPath(), nodeId);
-    }
+  public String nodePath(String nodeId) {
+    return zookeeperPaths.join(nodesPath(), nodeId);
+  }
 
-    public String nodesPath() {
-        return zookeeperPaths.join(registryPath, "nodes");
-    }
+  public String nodesPath() {
+    return zookeeperPaths.join(registryPath, "nodes");
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java
index a6af139fc8..722ecbc711 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java
@@ -1,70 +1,77 @@
 package pl.allegro.tech.hermes.consumers.server;
 
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS;
+import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS_COUNT;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpServer;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
-import pl.allegro.tech.hermes.consumers.health.ConsumerMonitor;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.util.List;
-
-import static jakarta.ws.rs.core.Response.Status.OK;
-import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS;
-import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS_COUNT;
+import pl.allegro.tech.hermes.consumers.health.ConsumerMonitor;
 
 public class ConsumerHttpServer {
 
-    private final HttpServer server;
+  private final HttpServer server;
 
-    private static final String STATUS_UP = "{\"status\": \"UP\"}";
+  private static final String STATUS_UP = "{\"status\": \"UP\"}";
 
-    public ConsumerHttpServer(int healthCheckPort, ConsumerMonitor monitor, ObjectMapper mapper,
-                              PrometheusMeterRegistry meterRegistry) throws IOException {
-        server = createServer(healthCheckPort);
-        server.createContext("/status/health",
-                (exchange) -> respondWithJson(exchange, STATUS_UP));
-        server.createContext("/status/subscriptions",
-                (exchange) -> respondWithObject(exchange, mapper, monitor.check(SUBSCRIPTIONS)));
-        server.createContext("/status/subscriptionsCount",
-                (exchange) -> respondWithObject(exchange, mapper, monitor.check(SUBSCRIPTIONS_COUNT)));
-        server.createContext("/status/prometheus",
-                (exchange) -> respondWithString(exchange, meterRegistry.scrape()));
-    }
+  public ConsumerHttpServer(
+      int healthCheckPort,
+      ConsumerMonitor monitor,
+      ObjectMapper mapper,
+      PrometheusMeterRegistry meterRegistry)
+      throws IOException {
+    server = createServer(healthCheckPort);
+    server.createContext("/status/health", (exchange) -> respondWithJson(exchange, STATUS_UP));
+    server.createContext(
+        "/status/subscriptions",
+        (exchange) -> respondWithObject(exchange, mapper, monitor.check(SUBSCRIPTIONS)));
+    server.createContext(
+        "/status/subscriptionsCount",
+        (exchange) -> respondWithObject(exchange, mapper, monitor.check(SUBSCRIPTIONS_COUNT)));
+    server.createContext(
+        "/status/prometheus", (exchange) -> respondWithString(exchange, meterRegistry.scrape()));
+  }
 
-    private HttpServer createServer(int port) throws IOException {
-        HttpServer httpServer = HttpServer.create(new InetSocketAddress(port), 0);
-        httpServer.setExecutor(null);
-        return httpServer;
-    }
+  private HttpServer createServer(int port) throws IOException {
+    HttpServer httpServer = HttpServer.create(new InetSocketAddress(port), 0);
+    httpServer.setExecutor(null);
+    return httpServer;
+  }
 
-    private static void respondWithObject(HttpExchange httpExchange, ObjectMapper mapper, Object response) throws IOException {
-        respondWithJson(httpExchange, mapper.writeValueAsString(response));
-    }
+  private static void respondWithObject(
+      HttpExchange httpExchange, ObjectMapper mapper, Object response) throws IOException {
+    respondWithJson(httpExchange, mapper.writeValueAsString(response));
+  }
 
-    private static void respondWithJson(HttpExchange httpExchange, String response) throws IOException {
-        httpExchange.getResponseHeaders().put("Content-Type", List.of("application/json"));
-        respondWithString(httpExchange, response);
-    }
+  private static void respondWithJson(HttpExchange httpExchange, String response)
+      throws IOException {
+    httpExchange.getResponseHeaders().put("Content-Type", List.of("application/json"));
+    respondWithString(httpExchange, response);
+  }
 
-    private static void respondWithString(HttpExchange httpExchange, String response) throws IOException {
-        httpExchange.sendResponseHeaders(OK.getStatusCode(), response.length());
-        OutputStream os = httpExchange.getResponseBody();
-        os.write(response.getBytes());
-        os.close();
-    }
+  private static void respondWithString(HttpExchange httpExchange, String response)
+      throws IOException {
+    httpExchange.sendResponseHeaders(OK.getStatusCode(), response.length());
+    OutputStream os = httpExchange.getResponseBody();
+    os.write(response.getBytes());
+    os.close();
+  }
 
-    public void start() {
-        server.start();
-    }
+  public void start() {
+    server.start();
+  }
 
-    public void stop() {
-        server.stop(0);
-    }
+  public void stop() {
+    server.stop(0);
+  }
 
-    public int getPort() {
-        return server.getAddress().getPort();
-    }
+  public int getPort() {
+    return server.getAddress().getPort();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/cache/NotificationsBasedSubscriptionCache.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/cache/NotificationsBasedSubscriptionCache.java
index 1bad30c416..5dc00dbb7e 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/cache/NotificationsBasedSubscriptionCache.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/cache/NotificationsBasedSubscriptionCache.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.consumers.subscription.cache;
 
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.TopicName;
@@ -9,74 +13,72 @@
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 import pl.allegro.tech.hermes.domain.topic.TopicRepository;
 
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-public class NotificationsBasedSubscriptionCache implements SubscriptionsCache, SubscriptionCallback {
+public class NotificationsBasedSubscriptionCache
+    implements SubscriptionsCache, SubscriptionCallback {
 
-    private final Map<SubscriptionName, Subscription> subscriptions = new ConcurrentHashMap<>();
+  private final Map<SubscriptionName, Subscription> subscriptions = new ConcurrentHashMap<>();
 
-    private final GroupRepository groupRepository;
+  private final GroupRepository groupRepository;
 
-    private final TopicRepository topicRepository;
+  private final TopicRepository topicRepository;
 
-    private final SubscriptionRepository subscriptionRepository;
+  private final SubscriptionRepository subscriptionRepository;
 
-    public NotificationsBasedSubscriptionCache(InternalNotificationsBus notificationsBus,
-                                               GroupRepository groupRepository,
-                                               TopicRepository topicRepository,
-                                               SubscriptionRepository subscriptionRepository) {
-        notificationsBus.registerSubscriptionCallback(this);
-        this.groupRepository = groupRepository;
-        this.topicRepository = topicRepository;
-        this.subscriptionRepository = subscriptionRepository;
-    }
+  public NotificationsBasedSubscriptionCache(
+      InternalNotificationsBus notificationsBus,
+      GroupRepository groupRepository,
+      TopicRepository topicRepository,
+      SubscriptionRepository subscriptionRepository) {
+    notificationsBus.registerSubscriptionCallback(this);
+    this.groupRepository = groupRepository;
+    this.topicRepository = topicRepository;
+    this.subscriptionRepository = subscriptionRepository;
+  }
 
-    @Override
-    public void onSubscriptionCreated(Subscription subscription) {
-        this.subscriptions.put(subscription.getQualifiedName(), subscription);
-    }
+  @Override
+  public void onSubscriptionCreated(Subscription subscription) {
+    this.subscriptions.put(subscription.getQualifiedName(), subscription);
+  }
 
-    @Override
-    public void onSubscriptionRemoved(Subscription subscription) {
-        this.subscriptions.remove(subscription.getQualifiedName(), subscription);
-    }
+  @Override
+  public void onSubscriptionRemoved(Subscription subscription) {
+    this.subscriptions.remove(subscription.getQualifiedName(), subscription);
+  }
 
-    @Override
-    public void onSubscriptionChanged(Subscription subscription) {
-        this.subscriptions.put(subscription.getQualifiedName(), subscription);
-    }
+  @Override
+  public void onSubscriptionChanged(Subscription subscription) {
+    this.subscriptions.put(subscription.getQualifiedName(), subscription);
+  }
 
-    @Override
-    public Subscription getSubscription(SubscriptionName subscriptionName) {
-        return subscriptions.get(subscriptionName);
-    }
+  @Override
+  public Subscription getSubscription(SubscriptionName subscriptionName) {
+    return subscriptions.get(subscriptionName);
+  }
 
-    @Override
-    public List<Subscription> subscriptionsOfTopic(TopicName topicName) {
-        return subscriptions.values().stream()
-                .filter(s -> s.getTopicName().equals(topicName))
-                .collect(Collectors.toList());
-    }
+  @Override
+  public List<Subscription> subscriptionsOfTopic(TopicName topicName) {
+    return subscriptions.values().stream()
+        .filter(s -> s.getTopicName().equals(topicName))
+        .collect(Collectors.toList());
+  }
 
-    @Override
-    public List<SubscriptionName> listActiveSubscriptionNames() {
-        return subscriptions.values().stream()
-                .filter(Subscription::isActive)
-                .map(Subscription::getQualifiedName)
-                .collect(Collectors.toList());
-    }
+  @Override
+  public List<SubscriptionName> listActiveSubscriptionNames() {
+    return subscriptions.values().stream()
+        .filter(Subscription::isActive)
+        .map(Subscription::getQualifiedName)
+        .collect(Collectors.toList());
+  }
 
-    @Override
-    public void start() {
-        for (String groupName : groupRepository.listGroupNames()) {
-            for (String topicName : topicRepository.listTopicNames(groupName)) {
-                for (Subscription subscription : subscriptionRepository.listSubscriptions(new TopicName(groupName, topicName))) {
-                    subscriptions.put(subscription.getQualifiedName(), subscription);
-                }
-            }
+  @Override
+  public void start() {
+    for (String groupName : groupRepository.listGroupNames()) {
+      for (String topicName : topicRepository.listTopicNames(groupName)) {
+        for (Subscription subscription :
+            subscriptionRepository.listSubscriptions(new TopicName(groupName, topicName))) {
+          subscriptions.put(subscription.getQualifiedName(), subscription);
         }
+      }
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/cache/SubscriptionsCache.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/cache/SubscriptionsCache.java
index 0e54e63502..27ade341fe 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/cache/SubscriptionsCache.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/cache/SubscriptionsCache.java
@@ -1,18 +1,17 @@
 package pl.allegro.tech.hermes.consumers.subscription.cache;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.TopicName;
 
-import java.util.List;
-
 public interface SubscriptionsCache {
 
-    Subscription getSubscription(SubscriptionName subscriptionName);
+  Subscription getSubscription(SubscriptionName subscriptionName);
 
-    List<Subscription> subscriptionsOfTopic(TopicName topicName);
+  List<Subscription> subscriptionsOfTopic(TopicName topicName);
 
-    List<SubscriptionName> listActiveSubscriptionNames();
+  List<SubscriptionName> listActiveSubscriptionNames();
 
-    void start();
+  void start();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/NotificationAwareSubscriptionIdsCache.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/NotificationAwareSubscriptionIdsCache.java
index f3838d10d3..80b96e9376 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/NotificationAwareSubscriptionIdsCache.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/NotificationAwareSubscriptionIdsCache.java
@@ -4,6 +4,10 @@
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalListener;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -12,95 +16,103 @@
 import pl.allegro.tech.hermes.domain.notifications.InternalNotificationsBus;
 import pl.allegro.tech.hermes.domain.notifications.SubscriptionCallback;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-public class NotificationAwareSubscriptionIdsCache implements SubscriptionIds, SubscriptionCallback {
-
-    private static final Logger logger = LoggerFactory.getLogger(NotificationAwareSubscriptionIdsCache.class);
-
-    private final SubscriptionsCache subscriptionsCache;
-    private final SubscriptionIdProvider subscriptionIdProvider;
-    private final Map<SubscriptionName, SubscriptionId> nameToIdMap = new ConcurrentHashMap<>();
-    private final Map<Long, SubscriptionId> valueToIdMap = new ConcurrentHashMap<>();
-    private final Cache<SubscriptionName, SubscriptionId> nameToIdMapOfRemoved;
-    private final Cache<Long, SubscriptionId> valueToIdMapOfRemoved;
-
-    public NotificationAwareSubscriptionIdsCache(InternalNotificationsBus notificationsBus,
-                                                 SubscriptionsCache subscriptionsCache,
-                                                 SubscriptionIdProvider subscriptionIdProvider,
-                                                 long removedSubscriptionsExpireAfterAccessSeconds,
-                                                 Ticker ticker) {
-        this.subscriptionsCache = subscriptionsCache;
-        this.subscriptionIdProvider = subscriptionIdProvider;
-
-        this.nameToIdMapOfRemoved = createExpiringCache(
-                removedSubscriptionsExpireAfterAccessSeconds, ticker,
-                notification -> logger.info("Removing expired subscription {} id from name->id cache",
-                        notification.getKey().getQualifiedName())
-        );
-
-        this.valueToIdMapOfRemoved = createExpiringCache(
-                removedSubscriptionsExpireAfterAccessSeconds, ticker,
-                notification -> logger.info("Removing expired subscription {} id from value->id cache",
-                        notification.getValue().getSubscriptionName().getQualifiedName())
-        );
-
-        notificationsBus.registerSubscriptionCallback(this);
-    }
-
-    private <K, V> Cache<K, V> createExpiringCache(long expireAfterSeconds, Ticker ticker, RemovalListener<K, V> removalListener) {
-        CacheBuilder<K, V> cacheBuilder = CacheBuilder.newBuilder()
-                .expireAfterAccess(expireAfterSeconds, TimeUnit.SECONDS)
-                .ticker(ticker)
-                .removalListener(removalListener);
-        return cacheBuilder.build();
-    }
-
-    @Override
-    public void start() {
-        subscriptionsCache.listActiveSubscriptionNames()
-                .forEach(this::putSubscriptionId);
-    }
-
-    private void putSubscriptionId(SubscriptionName name) {
-        SubscriptionId id = subscriptionIdProvider.getSubscriptionId(name);
-        nameToIdMap.put(name, id);
-        valueToIdMap.put(id.getValue(), id);
-    }
-
-    @Override
-    public Optional<SubscriptionId> getSubscriptionId(SubscriptionName subscriptionName) {
-        return Optional.ofNullable(Optional.ofNullable(nameToIdMap.get(subscriptionName))
-                .orElseGet(() -> nameToIdMapOfRemoved.getIfPresent(subscriptionName)));
-    }
-
-    @Override
-    public Optional<SubscriptionId> getSubscriptionId(long id) {
-        return Optional.ofNullable(Optional.ofNullable(valueToIdMap.get(id))
-                .orElseGet(() -> valueToIdMapOfRemoved.getIfPresent(id)));
-    }
-
-    @Override
-    public void onSubscriptionCreated(Subscription subscription) {
-        putSubscriptionId(subscription.getQualifiedName());
-    }
-
-    @Override
-    public void onSubscriptionChanged(Subscription subscription) {
-        putSubscriptionId(subscription.getQualifiedName());
-    }
-
-    @Override
-    public void onSubscriptionRemoved(Subscription subscription) {
-        Optional.ofNullable(nameToIdMap.remove(subscription.getQualifiedName()))
-                .ifPresent(id -> {
-                    valueToIdMap.remove(id.getValue());
-
-                    nameToIdMapOfRemoved.put(subscription.getQualifiedName(), id);
-                    valueToIdMapOfRemoved.put(id.getValue(), id);
-                });
-    }
+public class NotificationAwareSubscriptionIdsCache
+    implements SubscriptionIds, SubscriptionCallback {
+
+  private static final Logger logger =
+      LoggerFactory.getLogger(NotificationAwareSubscriptionIdsCache.class);
+
+  private final SubscriptionsCache subscriptionsCache;
+  private final SubscriptionIdProvider subscriptionIdProvider;
+  private final Map<SubscriptionName, SubscriptionId> nameToIdMap = new ConcurrentHashMap<>();
+  private final Map<Long, SubscriptionId> valueToIdMap = new ConcurrentHashMap<>();
+  private final Cache<SubscriptionName, SubscriptionId> nameToIdMapOfRemoved;
+  private final Cache<Long, SubscriptionId> valueToIdMapOfRemoved;
+
+  public NotificationAwareSubscriptionIdsCache(
+      InternalNotificationsBus notificationsBus,
+      SubscriptionsCache subscriptionsCache,
+      SubscriptionIdProvider subscriptionIdProvider,
+      long removedSubscriptionsExpireAfterAccessSeconds,
+      Ticker ticker) {
+    this.subscriptionsCache = subscriptionsCache;
+    this.subscriptionIdProvider = subscriptionIdProvider;
+
+    this.nameToIdMapOfRemoved =
+        createExpiringCache(
+            removedSubscriptionsExpireAfterAccessSeconds,
+            ticker,
+            notification ->
+                logger.info(
+                    "Removing expired subscription {} id from name->id cache",
+                    notification.getKey().getQualifiedName()));
+
+    this.valueToIdMapOfRemoved =
+        createExpiringCache(
+            removedSubscriptionsExpireAfterAccessSeconds,
+            ticker,
+            notification ->
+                logger.info(
+                    "Removing expired subscription {} id from value->id cache",
+                    notification.getValue().getSubscriptionName().getQualifiedName()));
+
+    notificationsBus.registerSubscriptionCallback(this);
+  }
+
+  private <K, V> Cache<K, V> createExpiringCache(
+      long expireAfterSeconds, Ticker ticker, RemovalListener<K, V> removalListener) {
+    CacheBuilder<K, V> cacheBuilder =
+        CacheBuilder.newBuilder()
+            .expireAfterAccess(expireAfterSeconds, TimeUnit.SECONDS)
+            .ticker(ticker)
+            .removalListener(removalListener);
+    return cacheBuilder.build();
+  }
+
+  @Override
+  public void start() {
+    subscriptionsCache.listActiveSubscriptionNames().forEach(this::putSubscriptionId);
+  }
+
+  private void putSubscriptionId(SubscriptionName name) {
+    SubscriptionId id = subscriptionIdProvider.getSubscriptionId(name);
+    nameToIdMap.put(name, id);
+    valueToIdMap.put(id.getValue(), id);
+  }
+
+  @Override
+  public Optional<SubscriptionId> getSubscriptionId(SubscriptionName subscriptionName) {
+    return Optional.ofNullable(
+        Optional.ofNullable(nameToIdMap.get(subscriptionName))
+            .orElseGet(() -> nameToIdMapOfRemoved.getIfPresent(subscriptionName)));
+  }
+
+  @Override
+  public Optional<SubscriptionId> getSubscriptionId(long id) {
+    return Optional.ofNullable(
+        Optional.ofNullable(valueToIdMap.get(id))
+            .orElseGet(() -> valueToIdMapOfRemoved.getIfPresent(id)));
+  }
+
+  @Override
+  public void onSubscriptionCreated(Subscription subscription) {
+    putSubscriptionId(subscription.getQualifiedName());
+  }
+
+  @Override
+  public void onSubscriptionChanged(Subscription subscription) {
+    putSubscriptionId(subscription.getQualifiedName());
+  }
+
+  @Override
+  public void onSubscriptionRemoved(Subscription subscription) {
+    Optional.ofNullable(nameToIdMap.remove(subscription.getQualifiedName()))
+        .ifPresent(
+            id -> {
+              valueToIdMap.remove(id.getValue());
+
+              nameToIdMapOfRemoved.put(subscription.getQualifiedName(), id);
+              valueToIdMapOfRemoved.put(id.getValue(), id);
+            });
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionId.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionId.java
index c5c6184c24..4d0763afd1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionId.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionId.java
@@ -1,46 +1,45 @@
 package pl.allegro.tech.hermes.consumers.subscription.id;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Objects;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class SubscriptionId {
 
-    private final long value;
+  private final long value;
 
-    private final SubscriptionName subscriptionName;
+  private final SubscriptionName subscriptionName;
 
-    private SubscriptionId(SubscriptionName subscriptionName, long value) {
-        this.value = value;
-        this.subscriptionName = subscriptionName;
-    }
+  private SubscriptionId(SubscriptionName subscriptionName, long value) {
+    this.value = value;
+    this.subscriptionName = subscriptionName;
+  }
 
-    public static SubscriptionId from(SubscriptionName subscriptionName, long value) {
-        return new SubscriptionId(subscriptionName, value);
-    }
+  public static SubscriptionId from(SubscriptionName subscriptionName, long value) {
+    return new SubscriptionId(subscriptionName, value);
+  }
 
-    public long getValue() {
-        return value;
-    }
+  public long getValue() {
+    return value;
+  }
 
-    public SubscriptionName getSubscriptionName() {
-        return subscriptionName;
-    }
+  public SubscriptionName getSubscriptionName() {
+    return subscriptionName;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionId that = (SubscriptionId) o;
-        return value == that.value;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(value);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SubscriptionId that = (SubscriptionId) o;
+    return value == that.value;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionIdProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionIdProvider.java
index 991b76b12e..23a4f71f10 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionIdProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionIdProvider.java
@@ -4,5 +4,5 @@
 
 public interface SubscriptionIdProvider {
 
-    SubscriptionId getSubscriptionId(SubscriptionName name);
+  SubscriptionId getSubscriptionId(SubscriptionName name);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionIds.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionIds.java
index 91671e76b2..4c5498baaf 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionIds.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/SubscriptionIds.java
@@ -1,14 +1,13 @@
 package pl.allegro.tech.hermes.consumers.subscription.id;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Optional;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public interface SubscriptionIds {
 
-    Optional<SubscriptionId> getSubscriptionId(SubscriptionName subscriptionName);
+  Optional<SubscriptionId> getSubscriptionId(SubscriptionName subscriptionName);
 
-    Optional<SubscriptionId> getSubscriptionId(long id);
+  Optional<SubscriptionId> getSubscriptionId(long id);
 
-    void start();
+  void start();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/ZookeeperSubscriptionIdProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/ZookeeperSubscriptionIdProvider.java
index bded66c883..23774950af 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/ZookeeperSubscriptionIdProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/subscription/id/ZookeeperSubscriptionIdProvider.java
@@ -1,39 +1,45 @@
 package pl.allegro.tech.hermes.consumers.subscription.id;
 
+import java.util.Optional;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.data.Stat;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.util.Optional;
-
 public class ZookeeperSubscriptionIdProvider implements SubscriptionIdProvider {
 
-    private final CuratorFramework curatorFramework;
-    private final ZookeeperPaths zookeeperPaths;
+  private final CuratorFramework curatorFramework;
+  private final ZookeeperPaths zookeeperPaths;
 
-    public ZookeeperSubscriptionIdProvider(CuratorFramework curatorFramework, ZookeeperPaths zookeeperPaths) {
-        this.curatorFramework = curatorFramework;
-        this.zookeeperPaths = zookeeperPaths;
-    }
+  public ZookeeperSubscriptionIdProvider(
+      CuratorFramework curatorFramework, ZookeeperPaths zookeeperPaths) {
+    this.curatorFramework = curatorFramework;
+    this.zookeeperPaths = zookeeperPaths;
+  }
 
-    @Override
-    public SubscriptionId getSubscriptionId(SubscriptionName name) {
-        return Optional.ofNullable(getZnodeStat(name))
-                .map(Stat::getCzxid)
-                .map(czxid -> SubscriptionId.from(name, czxid))
-                .orElseThrow(() -> new IllegalStateException(
-                        String.format("Cannot get czxid of subscription %s as it doesn't exist", name.getQualifiedName())));
-    }
+  @Override
+  public SubscriptionId getSubscriptionId(SubscriptionName name) {
+    return Optional.ofNullable(getZnodeStat(name))
+        .map(Stat::getCzxid)
+        .map(czxid -> SubscriptionId.from(name, czxid))
+        .orElseThrow(
+            () ->
+                new IllegalStateException(
+                    String.format(
+                        "Cannot get czxid of subscription %s as it doesn't exist",
+                        name.getQualifiedName())));
+  }
 
-    private Stat getZnodeStat(SubscriptionName name) {
-        String path = zookeeperPaths.subscriptionPath(name.getTopicName(), name.getName());
-        try {
-            return curatorFramework.checkExists().forPath(path);
-        } catch (Exception e) {
-            throw new InternalProcessingException(String.format("Could not check existence of subscription %s node",
-                    name.getQualifiedName()), e);
-        }
+  private Stat getZnodeStat(SubscriptionName name) {
+    String path = zookeeperPaths.subscriptionPath(name.getTopicName(), name.getName());
+    try {
+      return curatorFramework.checkExists().forPath(path);
+    } catch (Exception e) {
+      throw new InternalProcessingException(
+          String.format(
+              "Could not check existence of subscription %s node", name.getQualifiedName()),
+          e);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumerFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumerFactory.java
index fc4c0334f1..8ae3000766 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumerFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumerFactory.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.consumers.supervisor;
 
+import java.time.Clock;
+import java.time.Duration;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.message.wrapper.CompositeMessageContentWrapper;
@@ -14,7 +16,7 @@
 import pl.allegro.tech.hermes.consumers.consumer.converter.MessageConverterResolver;
 import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecorder;
 import pl.allegro.tech.hermes.consumers.consumer.load.SubscriptionLoadRecordersRegistry;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
+import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
 import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimitSupervisor;
 import pl.allegro.tech.hermes.consumers.consumer.rate.SerialConsumerRateLimiter;
 import pl.allegro.tech.hermes.consumers.consumer.rate.calculator.OutputRateCalculatorFactory;
@@ -23,96 +25,108 @@
 import pl.allegro.tech.hermes.domain.topic.TopicRepository;
 import pl.allegro.tech.hermes.tracker.consumers.Trackers;
 
-import java.time.Clock;
-
 public class ConsumerFactory {
 
-    private final ConsumerRateLimitSupervisor consumerRateLimitSupervisor;
-    private final OutputRateCalculatorFactory outputRateCalculatorFactory;
-    private final ReceiverFactory messageReceiverFactory;
-    private final MetricsFacade metrics;
-    private final CommonConsumerParameters commonConsumerParameters;
-    private final Trackers trackers;
-    private final OffsetQueue offsetQueue;
-    private final ConsumerMessageSenderFactory consumerMessageSenderFactory;
-    private final TopicRepository topicRepository;
-    private final MessageConverterResolver messageConverterResolver;
-    private final MessageBatchFactory batchFactory;
-    private final CompositeMessageContentWrapper compositeMessageContentWrapper;
-    private final MessageBatchSenderFactory batchSenderFactory;
-    private final ConsumerAuthorizationHandler consumerAuthorizationHandler;
-    private final Clock clock;
-    private final SubscriptionLoadRecordersRegistry subscriptionLoadRecordersRegistry;
+  private final ConsumerRateLimitSupervisor consumerRateLimitSupervisor;
+  private final OutputRateCalculatorFactory outputRateCalculatorFactory;
+  private final ReceiverFactory messageReceiverFactory;
+  private final MetricsFacade metrics;
+  private final CommonConsumerParameters commonConsumerParameters;
+  private final Trackers trackers;
+  private final ConsumerMessageSenderFactory consumerMessageSenderFactory;
+  private final TopicRepository topicRepository;
+  private final MessageConverterResolver messageConverterResolver;
+  private final MessageBatchFactory batchFactory;
+  private final CompositeMessageContentWrapper compositeMessageContentWrapper;
+  private final MessageBatchSenderFactory batchSenderFactory;
+  private final ConsumerAuthorizationHandler consumerAuthorizationHandler;
+  private final Clock clock;
+  private final SubscriptionLoadRecordersRegistry subscriptionLoadRecordersRegistry;
+  private final ConsumerPartitionAssignmentState consumerPartitionAssignmentState;
+  private final Duration commitPeriod;
+  private final int offsetQueueSize;
 
-    public ConsumerFactory(ReceiverFactory messageReceiverFactory,
-                           MetricsFacade metrics,
-                           CommonConsumerParameters commonConsumerParameters,
-                           ConsumerRateLimitSupervisor consumerRateLimitSupervisor,
-                           OutputRateCalculatorFactory outputRateCalculatorFactory,
-                           Trackers trackers,
-                           OffsetQueue offsetQueue,
-                           ConsumerMessageSenderFactory consumerMessageSenderFactory,
-                           TopicRepository topicRepository,
-                           MessageConverterResolver messageConverterResolver,
-                           MessageBatchFactory byteBufferMessageBatchFactory,
-                           CompositeMessageContentWrapper compositeMessageContentWrapper,
-                           MessageBatchSenderFactory batchSenderFactory,
-                           ConsumerAuthorizationHandler consumerAuthorizationHandler,
-                           Clock clock,
-                           SubscriptionLoadRecordersRegistry subscriptionLoadRecordersRegistry) {
-        this.messageReceiverFactory = messageReceiverFactory;
-        this.metrics = metrics;
-        this.commonConsumerParameters = commonConsumerParameters;
-        this.consumerRateLimitSupervisor = consumerRateLimitSupervisor;
-        this.outputRateCalculatorFactory = outputRateCalculatorFactory;
-        this.trackers = trackers;
-        this.offsetQueue = offsetQueue;
-        this.consumerMessageSenderFactory = consumerMessageSenderFactory;
-        this.topicRepository = topicRepository;
-        this.messageConverterResolver = messageConverterResolver;
-        this.batchFactory = byteBufferMessageBatchFactory;
-        this.compositeMessageContentWrapper = compositeMessageContentWrapper;
-        this.batchSenderFactory = batchSenderFactory;
-        this.consumerAuthorizationHandler = consumerAuthorizationHandler;
-        this.clock = clock;
-        this.subscriptionLoadRecordersRegistry = subscriptionLoadRecordersRegistry;
-    }
+  public ConsumerFactory(
+      ReceiverFactory messageReceiverFactory,
+      MetricsFacade metrics,
+      CommonConsumerParameters commonConsumerParameters,
+      ConsumerRateLimitSupervisor consumerRateLimitSupervisor,
+      OutputRateCalculatorFactory outputRateCalculatorFactory,
+      Trackers trackers,
+      ConsumerMessageSenderFactory consumerMessageSenderFactory,
+      TopicRepository topicRepository,
+      MessageConverterResolver messageConverterResolver,
+      MessageBatchFactory byteBufferMessageBatchFactory,
+      CompositeMessageContentWrapper compositeMessageContentWrapper,
+      MessageBatchSenderFactory batchSenderFactory,
+      ConsumerAuthorizationHandler consumerAuthorizationHandler,
+      Clock clock,
+      SubscriptionLoadRecordersRegistry subscriptionLoadRecordersRegistry,
+      ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
+      Duration commitPeriod,
+      int offsetQueueSize) {
+    this.messageReceiverFactory = messageReceiverFactory;
+    this.metrics = metrics;
+    this.commonConsumerParameters = commonConsumerParameters;
+    this.consumerRateLimitSupervisor = consumerRateLimitSupervisor;
+    this.outputRateCalculatorFactory = outputRateCalculatorFactory;
+    this.trackers = trackers;
+    this.consumerMessageSenderFactory = consumerMessageSenderFactory;
+    this.topicRepository = topicRepository;
+    this.messageConverterResolver = messageConverterResolver;
+    this.batchFactory = byteBufferMessageBatchFactory;
+    this.compositeMessageContentWrapper = compositeMessageContentWrapper;
+    this.batchSenderFactory = batchSenderFactory;
+    this.consumerAuthorizationHandler = consumerAuthorizationHandler;
+    this.clock = clock;
+    this.subscriptionLoadRecordersRegistry = subscriptionLoadRecordersRegistry;
+    this.consumerPartitionAssignmentState = consumerPartitionAssignmentState;
+    this.commitPeriod = commitPeriod;
+    this.offsetQueueSize = offsetQueueSize;
+  }
 
-    public Consumer createConsumer(Subscription subscription) {
-        Topic topic = topicRepository.getTopicDetails(subscription.getTopicName());
-        SubscriptionLoadRecorder loadRecorder = subscriptionLoadRecordersRegistry.register(subscription.getQualifiedName());
-        if (subscription.isBatchSubscription()) {
-            return new BatchConsumer(messageReceiverFactory,
-                    batchSenderFactory.create(subscription),
-                    batchFactory,
-                    offsetQueue,
-                    messageConverterResolver,
-                    compositeMessageContentWrapper,
-                    metrics,
-                    trackers,
-                    subscription,
-                    topic,
-                    commonConsumerParameters.isUseTopicMessageSizeEnabled(),
-                    loadRecorder
-            );
-        } else {
-            SerialConsumerRateLimiter consumerRateLimiter = new SerialConsumerRateLimiter(subscription,
-                    outputRateCalculatorFactory, metrics, consumerRateLimitSupervisor, clock);
+  public Consumer createConsumer(Subscription subscription) {
+    Topic topic = topicRepository.getTopicDetails(subscription.getTopicName());
+    SubscriptionLoadRecorder loadRecorder =
+        subscriptionLoadRecordersRegistry.register(subscription.getQualifiedName());
+    if (subscription.isBatchSubscription()) {
+      return new BatchConsumer(
+          messageReceiverFactory,
+          batchSenderFactory.create(subscription),
+          batchFactory,
+          messageConverterResolver,
+          compositeMessageContentWrapper,
+          metrics,
+          trackers,
+          subscription,
+          topic,
+          commonConsumerParameters.isUseTopicMessageSizeEnabled(),
+          loadRecorder,
+          commitPeriod);
+    } else {
+      SerialConsumerRateLimiter consumerRateLimiter =
+          new SerialConsumerRateLimiter(
+              subscription,
+              outputRateCalculatorFactory,
+              metrics,
+              consumerRateLimitSupervisor,
+              clock);
 
-            return new SerialConsumer(
-                    messageReceiverFactory,
-                    metrics,
-                    subscription,
-                    consumerRateLimiter,
-                    consumerMessageSenderFactory,
-                    trackers,
-                    messageConverterResolver,
-                    topic,
-                    commonConsumerParameters,
-                    offsetQueue,
-                    consumerAuthorizationHandler,
-                    loadRecorder
-            );
-        }
+      return new SerialConsumer(
+          messageReceiverFactory,
+          metrics,
+          subscription,
+          consumerRateLimiter,
+          consumerMessageSenderFactory,
+          trackers,
+          messageConverterResolver,
+          topic,
+          commonConsumerParameters,
+          consumerAuthorizationHandler,
+          loadRecorder,
+          consumerPartitionAssignmentState,
+          commitPeriod,
+          offsetQueueSize);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumerHolder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumerHolder.java
index c0182bd104..e9496fa7a6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumerHolder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumerHolder.java
@@ -3,38 +3,37 @@
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Table;
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.consumers.consumer.Consumer;
-
 import java.util.Iterator;
 import java.util.Optional;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.consumers.consumer.Consumer;
 
 public class ConsumerHolder implements Iterable<Consumer> {
 
-    private Table<TopicName, String, Consumer> consumers = HashBasedTable.create();
+  private Table<TopicName, String, Consumer> consumers = HashBasedTable.create();
 
-    public synchronized void add(TopicName topicName, String subscriptionName, Consumer consumer) {
-        consumers.put(topicName, subscriptionName, consumer);
-    }
+  public synchronized void add(TopicName topicName, String subscriptionName, Consumer consumer) {
+    consumers.put(topicName, subscriptionName, consumer);
+  }
 
-    public synchronized void remove(TopicName topicName, String subscriptionName) {
-        consumers.remove(topicName, subscriptionName);
-    }
+  public synchronized void remove(TopicName topicName, String subscriptionName) {
+    consumers.remove(topicName, subscriptionName);
+  }
 
-    public synchronized Optional<Consumer> get(TopicName topicName, String subscriptionName) {
-        return Optional.ofNullable(consumers.get(topicName, subscriptionName));
-    }
+  public synchronized Optional<Consumer> get(TopicName topicName, String subscriptionName) {
+    return Optional.ofNullable(consumers.get(topicName, subscriptionName));
+  }
 
-    public synchronized boolean contains(TopicName topicName, String subscriptionName) {
-        return consumers.contains(topicName, subscriptionName);
-    }
+  public synchronized boolean contains(TopicName topicName, String subscriptionName) {
+    return consumers.contains(topicName, subscriptionName);
+  }
 
-    @Override
-    public synchronized Iterator<Consumer> iterator() {
-        return Lists.newArrayList(consumers.values()).iterator();
-    }
+  @Override
+  public synchronized Iterator<Consumer> iterator() {
+    return Lists.newArrayList(consumers.values()).iterator();
+  }
 
-    public synchronized void clear() {
-        consumers.clear();
-    }
+  public synchronized void clear() {
+    consumers.clear();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumersExecutorService.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumersExecutorService.java
index d44c145bce..6a9eef256e 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumersExecutorService.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumersExecutorService.java
@@ -1,43 +1,46 @@
 package pl.allegro.tech.hermes.consumers.supervisor;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.consumers.supervisor.process.ConsumerProcess;
-
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.consumers.supervisor.process.ConsumerProcess;
 
 public class ConsumersExecutorService {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConsumersExecutorService.class);
-    private final ThreadPoolExecutor executor;
+  private static final Logger logger = LoggerFactory.getLogger(ConsumersExecutorService.class);
+  private final ThreadPoolExecutor executor;
 
-    public ConsumersExecutorService(int poolSize, MetricsFacade metrics) {
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
+  public ConsumersExecutorService(int poolSize, MetricsFacade metrics) {
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder()
             .setNameFormat("Consumer-%d")
-            .setUncaughtExceptionHandler((t, e) -> logger.error("Exception from consumer with name {}", t.getName(), e)).build();
-
-        executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(poolSize, threadFactory);
-
-        metrics.consumer().registerConsumerProcessesThreadsGauge(executor, ThreadPoolExecutor::getActiveCount);
-    }
-
-    public Future<?> execute(ConsumerProcess consumer) {
-        return executor.submit(consumer);
-    }
-
-    public void shutdown() {
-        executor.shutdownNow();
-        try {
-            executor.awaitTermination(1, TimeUnit.MINUTES);
-        } catch (InterruptedException e) {
-            logger.error("Termination of consumers executor service interrupted.", e);
-        }
+            .setUncaughtExceptionHandler(
+                (t, e) -> logger.error("Exception from consumer with name {}", t.getName(), e))
+            .build();
+
+    executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(poolSize, threadFactory);
+
+    metrics
+        .consumer()
+        .registerConsumerProcessesThreadsGauge(executor, ThreadPoolExecutor::getActiveCount);
+  }
+
+  public Future<?> execute(ConsumerProcess consumer) {
+    return executor.submit(consumer);
+  }
+
+  public void shutdown() {
+    executor.shutdownNow();
+    try {
+      executor.awaitTermination(1, TimeUnit.MINUTES);
+    } catch (InterruptedException e) {
+      logger.error("Termination of consumers executor service interrupted.", e);
     }
-
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumersSupervisor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumersSupervisor.java
index aa533f3001..5a3409dd60 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumersSupervisor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/ConsumersSupervisor.java
@@ -1,26 +1,25 @@
 package pl.allegro.tech.hermes.consumers.supervisor;
 
+import java.util.Set;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.Topic;
 
-import java.util.Set;
-
 public interface ConsumersSupervisor {
 
-    void assignConsumerForSubscription(Subscription subscription);
+  void assignConsumerForSubscription(Subscription subscription);
 
-    void deleteConsumerForSubscriptionName(SubscriptionName subscription);
+  void deleteConsumerForSubscriptionName(SubscriptionName subscription);
 
-    void updateSubscription(Subscription subscription);
+  void updateSubscription(Subscription subscription);
 
-    void updateTopic(Subscription subscription, Topic topic);
+  void updateTopic(Subscription subscription, Topic topic);
 
-    void shutdown() throws InterruptedException;
+  void shutdown() throws InterruptedException;
 
-    void retransmit(SubscriptionName subscription) throws Exception;
+  void retransmit(SubscriptionName subscription) throws Exception;
 
-    Set<SubscriptionName> runningConsumers();
+  Set<SubscriptionName> runningConsumers();
 
-    void start() throws Exception;
+  void start() throws Exception;
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/NonblockingConsumersSupervisor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/NonblockingConsumersSupervisor.java
index c5dbbf8fbe..d628050a0d 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/NonblockingConsumersSupervisor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/NonblockingConsumersSupervisor.java
@@ -1,6 +1,18 @@
 package pl.allegro.tech.hermes.consumers.supervisor;
 
+import static pl.allegro.tech.hermes.api.Subscription.State.ACTIVE;
+import static pl.allegro.tech.hermes.api.Subscription.State.PENDING;
+import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS;
+import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS_COUNT;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.time.Clock;
+import java.time.Duration;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -9,8 +21,6 @@
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.consumers.CommonConsumerParameters;
 import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetCommitter;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
 import pl.allegro.tech.hermes.consumers.health.ConsumerMonitor;
 import pl.allegro.tech.hermes.consumers.message.undelivered.UndeliveredMessageLogPersister;
 import pl.allegro.tech.hermes.consumers.supervisor.process.ConsumerProcessFactory;
@@ -19,133 +29,121 @@
 import pl.allegro.tech.hermes.consumers.supervisor.process.Signal;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import static pl.allegro.tech.hermes.api.Subscription.State.ACTIVE;
-import static pl.allegro.tech.hermes.api.Subscription.State.PENDING;
-import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS;
-import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS_COUNT;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.COMMIT;
-
 public class NonblockingConsumersSupervisor implements ConsumersSupervisor {
-    private static final Logger logger = LoggerFactory.getLogger(NonblockingConsumersSupervisor.class);
-
-    private final ConsumerProcessSupervisor backgroundProcess;
-    private final UndeliveredMessageLogPersister undeliveredMessageLogPersister;
-    private final Duration backgroundSupervisorInterval;
-    private final OffsetCommitter offsetCommitter;
-    private final SubscriptionRepository subscriptionRepository;
-
-    private final ScheduledExecutorService scheduledExecutor;
-
-    public NonblockingConsumersSupervisor(CommonConsumerParameters commonConsumerParameters,
-                                          ConsumersExecutorService executor,
-                                          ConsumerFactory consumerFactory,
-                                          OffsetQueue offsetQueue,
-                                          ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
-                                          Retransmitter retransmitter,
-                                          UndeliveredMessageLogPersister undeliveredMessageLogPersister,
-                                          SubscriptionRepository subscriptionRepository,
-                                          MetricsFacade metrics,
-                                          ConsumerMonitor monitor,
-                                          Clock clock,
-                                          Duration commitOffsetPeriod) {
-        this.undeliveredMessageLogPersister = undeliveredMessageLogPersister;
-        this.subscriptionRepository = subscriptionRepository;
-        this.backgroundSupervisorInterval = commonConsumerParameters.getBackgroundSupervisor().getInterval();
-        this.backgroundProcess = new ConsumerProcessSupervisor(executor, clock, metrics,
-                new ConsumerProcessFactory(
-                        retransmitter,
-                        consumerFactory,
-                        commonConsumerParameters.getBackgroundSupervisor().getUnhealthyAfter(),
-                        clock),
-                commonConsumerParameters.getSignalProcessingQueueSize(),
-                commonConsumerParameters.getBackgroundSupervisor().getKillAfter());
-        this.scheduledExecutor = createExecutorForSupervision();
-        this.offsetCommitter = new OffsetCommitter(
-                offsetQueue,
-                consumerPartitionAssignmentState,
-                (offsets) -> offsets.subscriptionNames().forEach(subscription ->
-                        backgroundProcess.accept(Signal.of(COMMIT, subscription, offsets.batchFor(subscription)))
-                ),
-                (int) commitOffsetPeriod.toSeconds(),
-                metrics
-        );
-        monitor.register(SUBSCRIPTIONS, backgroundProcess::runningSubscriptionsStatus);
-        monitor.register(SUBSCRIPTIONS_COUNT, backgroundProcess::countRunningProcesses);
-    }
-
-    private ScheduledExecutorService createExecutorForSupervision() {
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("NonblockingConsumersSupervisor-%d")
-                .setUncaughtExceptionHandler((t, e) -> logger.error("Exception from supervisor with name {}", t.getName(), e)).build();
-        return Executors.newSingleThreadScheduledExecutor(threadFactory);
-    }
-
-    @Override
-    public void assignConsumerForSubscription(Subscription subscription) {
-        try {
-            Signal start = Signal.of(Signal.SignalType.START, subscription.getQualifiedName(), subscription);
-
-            backgroundProcess.accept(start);
-
-            if (subscription.getState() == PENDING) {
-                subscriptionRepository.updateSubscriptionState(subscription.getTopicName(), subscription.getName(), ACTIVE);
-            }
-        } catch (RuntimeException e) {
-            logger.error("Error during assigning subscription {} to consumer", subscription.getQualifiedName(), e);
-        }
-    }
-
-    @Override
-    public void deleteConsumerForSubscriptionName(SubscriptionName subscription) {
-        Signal stop = Signal.of(Signal.SignalType.STOP, subscription);
-        logger.info("Deleting consumer for {}. {}", subscription, stop.getLogWithIdAndType());
-        backgroundProcess.accept(stop);
-    }
-
-    @Override
-    public void updateTopic(Subscription subscription, Topic topic) {
-        backgroundProcess.accept(Signal.of(Signal.SignalType.UPDATE_TOPIC, subscription.getQualifiedName(), topic));
-    }
-
-    @Override
-    public void updateSubscription(Subscription subscription) {
-        backgroundProcess.accept(Signal.of(Signal.SignalType.UPDATE_SUBSCRIPTION, subscription.getQualifiedName(), subscription));
-    }
-
-    @Override
-    public void retransmit(SubscriptionName subscription) {
-        backgroundProcess.accept(Signal.of(Signal.SignalType.RETRANSMIT, subscription));
-    }
-
-    @Override
-    public Set<SubscriptionName> runningConsumers() {
-        return backgroundProcess.existingConsumers();
-    }
-
-    @Override
-    public void start() {
-        scheduledExecutor.scheduleAtFixedRate(
-                backgroundProcess,
-                backgroundSupervisorInterval.toMillis(),
-                backgroundSupervisorInterval.toMillis(),
-                TimeUnit.MILLISECONDS);
-        offsetCommitter.start();
-        undeliveredMessageLogPersister.start();
-    }
-
-    @Override
-    public void shutdown() {
-        backgroundProcess.shutdown();
-        scheduledExecutor.shutdown();
-        offsetCommitter.shutdown();
-        undeliveredMessageLogPersister.shutdown();
+  private static final Logger logger =
+      LoggerFactory.getLogger(NonblockingConsumersSupervisor.class);
+
+  private final ConsumerProcessSupervisor backgroundProcess;
+  private final UndeliveredMessageLogPersister undeliveredMessageLogPersister;
+  private final Duration backgroundSupervisorInterval;
+  private final SubscriptionRepository subscriptionRepository;
+
+  private final ScheduledExecutorService scheduledExecutor;
+
+  public NonblockingConsumersSupervisor(
+      CommonConsumerParameters commonConsumerParameters,
+      ConsumersExecutorService executor,
+      ConsumerFactory consumerFactory,
+      ConsumerPartitionAssignmentState consumerPartitionAssignmentState,
+      Retransmitter retransmitter,
+      UndeliveredMessageLogPersister undeliveredMessageLogPersister,
+      SubscriptionRepository subscriptionRepository,
+      MetricsFacade metrics,
+      ConsumerMonitor monitor,
+      Clock clock) {
+    this.undeliveredMessageLogPersister = undeliveredMessageLogPersister;
+    this.subscriptionRepository = subscriptionRepository;
+    this.backgroundSupervisorInterval =
+        commonConsumerParameters.getBackgroundSupervisor().getInterval();
+    this.backgroundProcess =
+        new ConsumerProcessSupervisor(
+            executor,
+            clock,
+            metrics,
+            new ConsumerProcessFactory(
+                retransmitter,
+                consumerFactory,
+                commonConsumerParameters.getBackgroundSupervisor().getUnhealthyAfter(),
+                clock),
+            commonConsumerParameters.getSignalProcessingQueueSize(),
+            commonConsumerParameters.getBackgroundSupervisor().getKillAfter());
+    this.scheduledExecutor = createExecutorForSupervision();
+    monitor.register(SUBSCRIPTIONS, backgroundProcess::runningSubscriptionsStatus);
+    monitor.register(SUBSCRIPTIONS_COUNT, backgroundProcess::countRunningProcesses);
+  }
+
+  private ScheduledExecutorService createExecutorForSupervision() {
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder()
+            .setNameFormat("NonblockingConsumersSupervisor-%d")
+            .setUncaughtExceptionHandler(
+                (t, e) -> logger.error("Exception from supervisor with name {}", t.getName(), e))
+            .build();
+    return Executors.newSingleThreadScheduledExecutor(threadFactory);
+  }
+
+  @Override
+  public void assignConsumerForSubscription(Subscription subscription) {
+    try {
+      Signal start =
+          Signal.of(Signal.SignalType.START, subscription.getQualifiedName(), subscription);
+
+      backgroundProcess.accept(start);
+
+      if (subscription.getState() == PENDING) {
+        subscriptionRepository.updateSubscriptionState(
+            subscription.getTopicName(), subscription.getName(), ACTIVE);
+      }
+    } catch (RuntimeException e) {
+      logger.error(
+          "Error during assigning subscription {} to consumer", subscription.getQualifiedName(), e);
     }
+  }
+
+  @Override
+  public void deleteConsumerForSubscriptionName(SubscriptionName subscription) {
+    Signal stop = Signal.of(Signal.SignalType.STOP, subscription);
+    logger.info("Deleting consumer for {}. {}", subscription, stop.getLogWithIdAndType());
+    backgroundProcess.accept(stop);
+  }
+
+  @Override
+  public void updateTopic(Subscription subscription, Topic topic) {
+    backgroundProcess.accept(
+        Signal.of(Signal.SignalType.UPDATE_TOPIC, subscription.getQualifiedName(), topic));
+  }
+
+  @Override
+  public void updateSubscription(Subscription subscription) {
+    backgroundProcess.accept(
+        Signal.of(
+            Signal.SignalType.UPDATE_SUBSCRIPTION, subscription.getQualifiedName(), subscription));
+  }
+
+  @Override
+  public void retransmit(SubscriptionName subscription) {
+    backgroundProcess.accept(Signal.of(Signal.SignalType.RETRANSMIT, subscription));
+  }
+
+  @Override
+  public Set<SubscriptionName> runningConsumers() {
+    return backgroundProcess.existingConsumers();
+  }
+
+  @Override
+  public void start() {
+    scheduledExecutor.scheduleAtFixedRate(
+        backgroundProcess,
+        backgroundSupervisorInterval.toMillis(),
+        backgroundSupervisorInterval.toMillis(),
+        TimeUnit.MILLISECONDS);
+    undeliveredMessageLogPersister.start();
+  }
+
+  @Override
+  public void shutdown() {
+    backgroundProcess.shutdown();
+    scheduledExecutor.shutdown();
+    undeliveredMessageLogPersister.shutdown();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/SupervisorParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/SupervisorParameters.java
index cd4cf48cbb..a5a75bc7c1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/SupervisorParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/SupervisorParameters.java
@@ -4,9 +4,9 @@
 
 public interface SupervisorParameters {
 
-    Duration getInterval();
+  Duration getInterval();
 
-    Duration getUnhealthyAfter();
+  Duration getUnhealthyAfter();
 
-    Duration getKillAfter();
+  Duration getKillAfter();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/ConsumersRuntimeMonitor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/ConsumersRuntimeMonitor.java
index 5416ffc344..1bef4fe15f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/ConsumersRuntimeMonitor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/ConsumersRuntimeMonitor.java
@@ -2,6 +2,12 @@
 
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.time.Duration;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -10,140 +16,140 @@
 import pl.allegro.tech.hermes.consumers.supervisor.ConsumersSupervisor;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkloadSupervisor;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
 public class ConsumersRuntimeMonitor implements Runnable {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConsumersRuntimeMonitor.class);
+  private static final Logger logger = LoggerFactory.getLogger(ConsumersRuntimeMonitor.class);
 
-    private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(
-            new ThreadFactoryBuilder().setNameFormat("consumer-monitor-%d").build()
-    );
+  private final ScheduledExecutorService executor =
+      Executors.newSingleThreadScheduledExecutor(
+          new ThreadFactoryBuilder().setNameFormat("consumer-monitor-%d").build());
 
-    private final Duration scanInterval;
+  private final Duration scanInterval;
 
-    private final ConsumersSupervisor consumerSupervisor;
+  private final ConsumersSupervisor consumerSupervisor;
 
-    private final WorkloadSupervisor workloadSupervisor;
+  private final WorkloadSupervisor workloadSupervisor;
 
-    private final SubscriptionsCache subscriptionsCache;
+  private final SubscriptionsCache subscriptionsCache;
 
-    private final MonitorMetrics monitorMetrics = new MonitorMetrics();
+  private final MonitorMetrics monitorMetrics = new MonitorMetrics();
 
-    private ScheduledFuture<?> monitoringTask;
+  private ScheduledFuture<?> monitoringTask;
 
-    public ConsumersRuntimeMonitor(ConsumersSupervisor consumerSupervisor,
-                                   WorkloadSupervisor workloadSupervisor,
-                                   MetricsFacade metrics,
-                                   SubscriptionsCache subscriptionsCache,
-                                   Duration scanInterval) {
-        this.consumerSupervisor = consumerSupervisor;
-        this.workloadSupervisor = workloadSupervisor;
-        this.subscriptionsCache = subscriptionsCache;
-        this.scanInterval = scanInterval;
+  public ConsumersRuntimeMonitor(
+      ConsumersSupervisor consumerSupervisor,
+      WorkloadSupervisor workloadSupervisor,
+      MetricsFacade metrics,
+      SubscriptionsCache subscriptionsCache,
+      Duration scanInterval) {
+    this.consumerSupervisor = consumerSupervisor;
+    this.workloadSupervisor = workloadSupervisor;
+    this.subscriptionsCache = subscriptionsCache;
+    this.scanInterval = scanInterval;
 
-        metrics.workload().registerRunningSubscriptionsGauge(monitorMetrics, mm -> mm.running);
-        metrics.workload().registerAssignedSubscriptionsGauge(monitorMetrics, mm -> mm.assigned);
-        metrics.workload().registerMissingSubscriptionsGauge(monitorMetrics, mm -> mm.missing);
-        metrics.workload().registerOversubscribedGauge(monitorMetrics, mm -> mm.oversubscribed);
-    }
+    metrics.workload().registerRunningSubscriptionsGauge(monitorMetrics, mm -> mm.running);
+    metrics.workload().registerAssignedSubscriptionsGauge(monitorMetrics, mm -> mm.assigned);
+    metrics.workload().registerMissingSubscriptionsGauge(monitorMetrics, mm -> mm.missing);
+    metrics.workload().registerOversubscribedGauge(monitorMetrics, mm -> mm.oversubscribed);
+  }
 
-    @Override
-    public void run() {
-        try {
-            Set<SubscriptionName> assigned = workloadSupervisor.assignedSubscriptions();
-            Set<SubscriptionName> running = consumerSupervisor.runningConsumers();
-            Set<SubscriptionName> missing = missing(assigned, running);
-            Set<SubscriptionName> oversubscribed = oversubscribed(assigned, running);
-
-            log(assigned, running, missing, oversubscribed);
-            updateMetrics(assigned, running, missing, oversubscribed);
-
-            ensureCorrectness(missing, oversubscribed);
-        } catch (Exception exception) {
-            logger.error("Could not check correctness of assignments", exception);
-        }
-    }
+  @Override
+  public void run() {
+    try {
+      Set<SubscriptionName> assigned = workloadSupervisor.assignedSubscriptions();
+      Set<SubscriptionName> running = consumerSupervisor.runningConsumers();
+      Set<SubscriptionName> missing = missing(assigned, running);
+      Set<SubscriptionName> oversubscribed = oversubscribed(assigned, running);
 
-    public void start() {
-        this.monitoringTask = executor.scheduleWithFixedDelay(this, scanInterval.toSeconds(), scanInterval.toSeconds(), TimeUnit.SECONDS);
-    }
+      log(assigned, running, missing, oversubscribed);
+      updateMetrics(assigned, running, missing, oversubscribed);
 
-    public void shutdown() throws InterruptedException {
-        try {
-            monitoringTask.cancel(false);
-            executor.shutdown();
-            executor.awaitTermination(1, TimeUnit.MINUTES);
-        } catch (InterruptedException exception) {
-            logger.warn("Got exception when stopping consumers runtime monitor", exception);
-        }
+      ensureCorrectness(missing, oversubscribed);
+    } catch (Exception exception) {
+      logger.error("Could not check correctness of assignments", exception);
     }
-
-    private void ensureCorrectness(Set<SubscriptionName> missing, Set<SubscriptionName> oversubscribed) {
-        if (!missing.isEmpty() || !oversubscribed.isEmpty()) {
-            logger.info("Fixing runtime. Creating {} and killing {} consumers", missing.size(), oversubscribed.size());
-        }
-        missing.stream()
-                .map(subscriptionsCache::getSubscription)
-                .forEach(consumerSupervisor::assignConsumerForSubscription);
-        oversubscribed.forEach(consumerSupervisor::deleteConsumerForSubscriptionName);
+  }
+
+  public void start() {
+    this.monitoringTask =
+        executor.scheduleWithFixedDelay(
+            this, scanInterval.toSeconds(), scanInterval.toSeconds(), TimeUnit.SECONDS);
+  }
+
+  public void shutdown() throws InterruptedException {
+    try {
+      monitoringTask.cancel(false);
+      executor.shutdown();
+      executor.awaitTermination(1, TimeUnit.MINUTES);
+    } catch (InterruptedException exception) {
+      logger.warn("Got exception when stopping consumers runtime monitor", exception);
     }
-
-    private void log(Set<SubscriptionName> assigned,
-                    Set<SubscriptionName> running,
-                    Set<SubscriptionName> missing,
-                    Set<SubscriptionName> oversubscribed) {
-        for (SubscriptionName subscriptionName : missing) {
-            logger.warn("Missing consumer process for subscription: {}", subscriptionName);
-        }
-
-        for (SubscriptionName subscriptionName : oversubscribed) {
-            logger.warn("Unwanted consumer process for subscription: {}", subscriptionName);
-        }
-
-        logger.info(
-                "Subscriptions assigned: {}, existing subscriptions: {}, missing: {}, oversubscribed: {}",
-                assigned.size(),
-                running.size(),
-                missing.size(),
-                oversubscribed.size()
-        );
+  }
+
+  private void ensureCorrectness(
+      Set<SubscriptionName> missing, Set<SubscriptionName> oversubscribed) {
+    if (!missing.isEmpty() || !oversubscribed.isEmpty()) {
+      logger.info(
+          "Fixing runtime. Creating {} and killing {} consumers",
+          missing.size(),
+          oversubscribed.size());
     }
-
-    private void updateMetrics(Set<SubscriptionName> assigned,
-                               Set<SubscriptionName> running,
-                               Set<SubscriptionName> missing,
-                               Set<SubscriptionName> oversubscribed) {
-        monitorMetrics.assigned = assigned.size();
-        monitorMetrics.running = running.size();
-        monitorMetrics.missing = missing.size();
-        monitorMetrics.oversubscribed = oversubscribed.size();
-    }
-
-    private Set<SubscriptionName> missing(Set<SubscriptionName> assignedSubscriptions,
-                                          Set<SubscriptionName> runningSubscriptions) {
-        return Sets.difference(assignedSubscriptions, runningSubscriptions).immutableCopy();
+    missing.stream()
+        .map(subscriptionsCache::getSubscription)
+        .forEach(consumerSupervisor::assignConsumerForSubscription);
+    oversubscribed.forEach(consumerSupervisor::deleteConsumerForSubscriptionName);
+  }
+
+  private void log(
+      Set<SubscriptionName> assigned,
+      Set<SubscriptionName> running,
+      Set<SubscriptionName> missing,
+      Set<SubscriptionName> oversubscribed) {
+    for (SubscriptionName subscriptionName : missing) {
+      logger.warn("Missing consumer process for subscription: {}", subscriptionName);
     }
 
-    private Set<SubscriptionName> oversubscribed(Set<SubscriptionName> assignedSubscriptions,
-                                                 Set<SubscriptionName> runningSubscriptions) {
-        return Sets.difference(runningSubscriptions, assignedSubscriptions).immutableCopy();
+    for (SubscriptionName subscriptionName : oversubscribed) {
+      logger.warn("Unwanted consumer process for subscription: {}", subscriptionName);
     }
 
-    private static class MonitorMetrics {
-
-        volatile int assigned;
-
-        volatile int running;
-
-        volatile int missing;
-
-        volatile int oversubscribed;
-
-    }
+    logger.info(
+        "Subscriptions assigned: {}, existing subscriptions: {}, missing: {}, oversubscribed: {}",
+        assigned.size(),
+        running.size(),
+        missing.size(),
+        oversubscribed.size());
+  }
+
+  private void updateMetrics(
+      Set<SubscriptionName> assigned,
+      Set<SubscriptionName> running,
+      Set<SubscriptionName> missing,
+      Set<SubscriptionName> oversubscribed) {
+    monitorMetrics.assigned = assigned.size();
+    monitorMetrics.running = running.size();
+    monitorMetrics.missing = missing.size();
+    monitorMetrics.oversubscribed = oversubscribed.size();
+  }
+
+  private Set<SubscriptionName> missing(
+      Set<SubscriptionName> assignedSubscriptions, Set<SubscriptionName> runningSubscriptions) {
+    return Sets.difference(assignedSubscriptions, runningSubscriptions).immutableCopy();
+  }
+
+  private Set<SubscriptionName> oversubscribed(
+      Set<SubscriptionName> assignedSubscriptions, Set<SubscriptionName> runningSubscriptions) {
+    return Sets.difference(runningSubscriptions, assignedSubscriptions).immutableCopy();
+  }
+
+  private static class MonitorMetrics {
+
+    volatile int assigned;
+
+    volatile int running;
+
+    volatile int missing;
+
+    volatile int oversubscribed;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/DifferenceCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/DifferenceCalculator.java
index 405f1b7311..df2e843501 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/DifferenceCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/DifferenceCalculator.java
@@ -1,16 +1,13 @@
 package pl.allegro.tech.hermes.consumers.supervisor.monitor;
 
 import com.google.common.collect.Sets;
-
 import java.util.Set;
 
 class DifferenceCalculator {
 
-    static <E> SetDifference<E> calculate(Set<E> collection1, Set<E> collection2) {
-        return new SetDifference<>(
-                Sets.difference(collection2, collection1).immutableCopy(),
-                Sets.difference(collection1, collection2).immutableCopy()
-        );
-    }
-
+  static <E> SetDifference<E> calculate(Set<E> collection1, Set<E> collection2) {
+    return new SetDifference<>(
+        Sets.difference(collection2, collection1).immutableCopy(),
+        Sets.difference(collection1, collection2).immutableCopy());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/SetDifference.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/SetDifference.java
index 9726206986..06ec54d30c 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/SetDifference.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/monitor/SetDifference.java
@@ -6,32 +6,29 @@
 
 class SetDifference<E> {
 
-    private final Set<E> added;
-
-    private final Set<E> removed;
-
-    SetDifference(Set<E> added, Set<E> removed) {
-        this.added = Collections.unmodifiableSet(new HashSet<>(added));
-        this.removed = Collections.unmodifiableSet(new HashSet<>(removed));
-    }
-
-    Set<E> added() {
-        return added;
-    }
-
-    Set<E> removed() {
-        return removed;
-    }
-
-    boolean containsChanges() {
-        return !added.isEmpty() || !removed.isEmpty();
-    }
-
-    @Override
-    public String toString() {
-        return "SetDifference{"
-                + "added=" + added
-                + ", removed=" + removed
-                + '}';
-    }
+  private final Set<E> added;
+
+  private final Set<E> removed;
+
+  SetDifference(Set<E> added, Set<E> removed) {
+    this.added = Collections.unmodifiableSet(new HashSet<>(added));
+    this.removed = Collections.unmodifiableSet(new HashSet<>(removed));
+  }
+
+  Set<E> added() {
+    return added;
+  }
+
+  Set<E> removed() {
+    return removed;
+  }
+
+  boolean containsChanges() {
+    return !added.isEmpty() || !removed.isEmpty();
+  }
+
+  @Override
+  public String toString() {
+    return "SetDifference{" + "added=" + added + ", removed=" + removed + '}';
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcess.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcess.java
index 576ff01b9e..821fbf7340 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcess.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcess.java
@@ -1,6 +1,13 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
+import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.START;
+
 import com.google.common.collect.ImmutableMap;
+import java.time.Clock;
+import java.time.Duration;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import org.jctools.queues.SpscArrayQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,212 +15,221 @@
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.consumer.Consumer;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.START;
-
 public class ConsumerProcess implements Runnable {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConsumerProcess.class);
-
-    private final SpscArrayQueue<Signal> signals = new SpscArrayQueue<>(100);
-
-    private final Clock clock;
-
-    private final Consumer consumer;
-
-    private final Retransmitter retransmitter;
-
-    private final java.util.function.Consumer<SubscriptionName> onConsumerStopped;
-
-    private final Duration unhealthyAfter;
-
-    private volatile boolean running = true;
-
-    private volatile long healthcheckRefreshTime;
-
-    private final Map<Signal.SignalType, Long> signalTimesheet = new ConcurrentHashMap<>();
-
-    public ConsumerProcess(
-            Signal startSignal,
-            Consumer consumer,
-            Retransmitter retransmitter,
-            Clock clock,
-            Duration unhealthyAfter,
-            java.util.function.Consumer<SubscriptionName> onConsumerStopped) {
-        this.consumer = consumer;
-        this.retransmitter = retransmitter;
-        this.onConsumerStopped = onConsumerStopped;
-        this.clock = clock;
-        this.healthcheckRefreshTime = clock.millis();
-        this.unhealthyAfter = unhealthyAfter;
-
-        addSignal(startSignal);
-    }
-
-    @Override
-    public void run() {
-        try {
-            Thread.currentThread().setName("consumer-" + getSubscriptionName());
-
-            while (running && !Thread.currentThread().isInterrupted()) {
-                consumer.consume(this::processSignals);
-            }
-        } catch (Throwable throwable) {
-            logger.error("Consumer process of subscription {} failed", getSubscriptionName(), throwable);
-        } finally {
-            logger.info("Releasing consumer process thread of subscription {}", getSubscriptionName());
-            refreshHealthcheck();
-            try {
-                stop();
-            } catch (Exception exceptionWhileStopping) {
-                logger.error("An error occurred while stopping consumer process of subscription {}",
-                        getSubscriptionName(), exceptionWhileStopping);
-            } finally {
-                onConsumerStopped.accept(getSubscriptionName());
-                Thread.currentThread().setName("consumer-released-thread");
-            }
-        }
-    }
-
-    public ConsumerProcess accept(Signal signal) {
-        addSignal(signal);
-        return this;
-    }
-
-    public boolean isHealthy() {
-        return unhealthyAfter.toMillis() > lastSeen();
-    }
-
-    public long lastSeen() {
-        return clock.millis() - healthcheckRefreshTime;
-    }
-
-    public long healthcheckRefreshTime() {
-        return healthcheckRefreshTime;
-    }
-
-    private void processSignals() {
-        refreshHealthcheck();
-        signals.drain(this::process);
-        refreshHealthcheck();
-    }
-
-    private void refreshHealthcheck() {
-        this.healthcheckRefreshTime = clock.millis();
-    }
-
-    private void process(Signal signal) {
-        try {
-            switch (signal.getType()) {
-                case START:
-                    start(signal);
-                    break;
-                case STOP:
-                    logger.info("Stopping main loop for consumer {}. {}", signal.getTarget(), signal.getLogWithIdAndType());
-                    this.running = false;
-                    break;
-                case RETRANSMIT:
-                    retransmit(signal);
-                    break;
-                case UPDATE_SUBSCRIPTION:
-                    consumer.updateSubscription(signal.getPayload());
-                    break;
-                case UPDATE_TOPIC:
-                    consumer.updateTopic(signal.getPayload());
-                    break;
-                case COMMIT:
-                    consumer.commit(signal.getPayload());
-                    break;
-                default:
-                    logger.warn("Unhandled signal found {}", signal);
-                    break;
-            }
-            signalTimesheet.put(signal.getType(), clock.millis());
-        } catch (Exception ex) {
-            logger.error("Failed to process signal {}", signal, ex);
-        }
-    }
-
-    private void start(Signal signal) {
-        long startTime = clock.millis();
-        logger.info("Starting consumer for subscription {}. {}",
-                getSubscriptionName(), signal.getLogWithIdAndType());
-
-        consumer.initialize();
-
-        long initializationTime = clock.millis();
-        logger.info("Started consumer for subscription {} in {}ms. {}",
-                getSubscriptionName(), initializationTime - startTime, signal.getLogWithIdAndType());
-        signalTimesheet.put(START, initializationTime);
-    }
-
-    private void stop() {
-        long startTime = clock.millis();
-        logger.info("Stopping consumer for subscription {}", getSubscriptionName());
-
-        consumer.tearDown();
-
-        logger.info("Stopped consumer for subscription {} in {}ms", getSubscriptionName(), clock.millis() - startTime);
-    }
-
-    private void retransmit(Signal signal) {
-        long startTime = clock.millis();
-        logger.info("Starting retransmission for consumer of subscription {}. {}",
-                getSubscriptionName(), signal.getLogWithIdAndType());
-        try {
-            retransmitter.reloadOffsets(getSubscriptionName(), consumer);
-            logger.info("Done retransmission for consumer of subscription {} in {}ms",
-                    getSubscriptionName(), clock.millis() - startTime);
-        } catch (Exception ex) {
-            logger.error("Failed retransmission for consumer of subscription {} in {}ms",
-                    getSubscriptionName(), clock.millis() - startTime, ex);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "ConsumerProcess{"
-                + "subscriptionName=" + getSubscriptionName()
-                + '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerProcess that = (ConsumerProcess) o;
-        return Objects.equals(getSubscriptionName(), that.getSubscriptionName());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getSubscriptionName());
-    }
-
-    public Subscription getSubscription() {
-        return consumer.getSubscription();
-    }
-
-    public Map<Signal.SignalType, Long> getSignalTimesheet() {
-        return ImmutableMap.copyOf(signalTimesheet);
-    }
-
-    SubscriptionName getSubscriptionName() {
-        return getSubscription().getQualifiedName();
-    }
-
-    private void addSignal(Signal signal) {
-        if (!this.signals.add(signal)) {
-            logger.error("[Queue: consumerProcessSignals] Unable to add item: queue is full. Offered item: {}", signal);
-        }
-    }
+  private static final Logger logger = LoggerFactory.getLogger(ConsumerProcess.class);
+
+  private final SpscArrayQueue<Signal> signals = new SpscArrayQueue<>(100);
+
+  private final Clock clock;
+
+  private final Consumer consumer;
+
+  private final Retransmitter retransmitter;
+
+  private final java.util.function.Consumer<SubscriptionName> onConsumerStopped;
+
+  private final Duration unhealthyAfter;
+
+  private volatile boolean running = true;
+
+  private volatile long healthcheckRefreshTime;
+
+  private final Map<Signal.SignalType, Long> signalTimesheet = new ConcurrentHashMap<>();
+
+  public ConsumerProcess(
+      Signal startSignal,
+      Consumer consumer,
+      Retransmitter retransmitter,
+      Clock clock,
+      Duration unhealthyAfter,
+      java.util.function.Consumer<SubscriptionName> onConsumerStopped) {
+    this.consumer = consumer;
+    this.retransmitter = retransmitter;
+    this.onConsumerStopped = onConsumerStopped;
+    this.clock = clock;
+    this.healthcheckRefreshTime = clock.millis();
+    this.unhealthyAfter = unhealthyAfter;
+
+    addSignal(startSignal);
+  }
+
+  @Override
+  public void run() {
+    try {
+      Thread.currentThread().setName("consumer-" + getSubscriptionName());
+
+      while (running && !Thread.currentThread().isInterrupted()) {
+        consumer.consume(this::processSignals);
+      }
+    } catch (Throwable throwable) {
+      logger.error("Consumer process of subscription {} failed", getSubscriptionName(), throwable);
+    } finally {
+      logger.info("Releasing consumer process thread of subscription {}", getSubscriptionName());
+      refreshHealthcheck();
+      try {
+        stop();
+      } catch (Exception exceptionWhileStopping) {
+        logger.error(
+            "An error occurred while stopping consumer process of subscription {}",
+            getSubscriptionName(),
+            exceptionWhileStopping);
+      } finally {
+        onConsumerStopped.accept(getSubscriptionName());
+        Thread.currentThread().setName("consumer-released-thread");
+      }
+    }
+  }
+
+  public ConsumerProcess accept(Signal signal) {
+    addSignal(signal);
+    return this;
+  }
+
+  public boolean isHealthy() {
+    return unhealthyAfter.toMillis() > lastSeen();
+  }
+
+  public long lastSeen() {
+    return clock.millis() - healthcheckRefreshTime;
+  }
+
+  public long healthcheckRefreshTime() {
+    return healthcheckRefreshTime;
+  }
+
+  private void processSignals() {
+    refreshHealthcheck();
+    signals.drain(this::process);
+    refreshHealthcheck();
+  }
+
+  private void refreshHealthcheck() {
+    this.healthcheckRefreshTime = clock.millis();
+  }
+
+  private void process(Signal signal) {
+    try {
+      switch (signal.getType()) {
+        case START:
+          start(signal);
+          break;
+        case STOP:
+          logger.info(
+              "Stopping main loop for consumer {}. {}",
+              signal.getTarget(),
+              signal.getLogWithIdAndType());
+          this.running = false;
+          break;
+        case RETRANSMIT:
+          retransmit(signal);
+          break;
+        case UPDATE_SUBSCRIPTION:
+          consumer.updateSubscription(signal.getPayload());
+          break;
+        case UPDATE_TOPIC:
+          consumer.updateTopic(signal.getPayload());
+          break;
+        default:
+          logger.warn("Unhandled signal found {}", signal);
+          break;
+      }
+      signalTimesheet.put(signal.getType(), clock.millis());
+    } catch (Exception ex) {
+      logger.error("Failed to process signal {}", signal, ex);
+    }
+  }
+
+  private void start(Signal signal) {
+    long startTime = clock.millis();
+    logger.info(
+        "Starting consumer for subscription {}. {}",
+        getSubscriptionName(),
+        signal.getLogWithIdAndType());
+
+    consumer.initialize();
+
+    long initializationTime = clock.millis();
+    logger.info(
+        "Started consumer for subscription {} in {}ms. {}",
+        getSubscriptionName(),
+        initializationTime - startTime,
+        signal.getLogWithIdAndType());
+    signalTimesheet.put(START, initializationTime);
+  }
+
+  private void stop() {
+    long startTime = clock.millis();
+    logger.info("Stopping consumer for subscription {}", getSubscriptionName());
+
+    consumer.tearDown();
+
+    logger.info(
+        "Stopped consumer for subscription {} in {}ms",
+        getSubscriptionName(),
+        clock.millis() - startTime);
+  }
+
+  private void retransmit(Signal signal) {
+    long startTime = clock.millis();
+    logger.info(
+        "Starting retransmission for consumer of subscription {}. {}",
+        getSubscriptionName(),
+        signal.getLogWithIdAndType());
+    try {
+      retransmitter.reloadOffsets(getSubscriptionName(), consumer);
+      logger.info(
+          "Done retransmission for consumer of subscription {} in {}ms",
+          getSubscriptionName(),
+          clock.millis() - startTime);
+    } catch (Exception ex) {
+      logger.error(
+          "Failed retransmission for consumer of subscription {} in {}ms",
+          getSubscriptionName(),
+          clock.millis() - startTime,
+          ex);
+    }
+  }
+
+  @Override
+  public String toString() {
+    return "ConsumerProcess{" + "subscriptionName=" + getSubscriptionName() + '}';
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ConsumerProcess that = (ConsumerProcess) o;
+    return Objects.equals(getSubscriptionName(), that.getSubscriptionName());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getSubscriptionName());
+  }
+
+  public Subscription getSubscription() {
+    return consumer.getSubscription();
+  }
+
+  public Map<Signal.SignalType, Long> getSignalTimesheet() {
+    return ImmutableMap.copyOf(signalTimesheet);
+  }
+
+  SubscriptionName getSubscriptionName() {
+    return getSubscription().getQualifiedName();
+  }
+
+  private void addSignal(Signal signal) {
+    if (!this.signals.add(signal)) {
+      logger.error(
+          "[Queue: consumerProcessSignals] Unable to add item: queue is full. Offered item: {}",
+          signal);
+    }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessFactory.java
index 0657629307..1b155821a6 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessFactory.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessFactory.java
@@ -1,39 +1,41 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
+import java.time.Clock;
+import java.time.Duration;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.supervisor.ConsumerFactory;
 
-import java.time.Clock;
-import java.time.Duration;
-
 public class ConsumerProcessFactory implements ConsumerProcessSupplier {
 
-    private final Retransmitter retransmitter;
-    private final Duration unhealthyAfter;
-    private final Clock clock;
-    private final ConsumerFactory consumerFactory;
+  private final Retransmitter retransmitter;
+  private final Duration unhealthyAfter;
+  private final Clock clock;
+  private final ConsumerFactory consumerFactory;
 
-    public ConsumerProcessFactory(Retransmitter retransmitter,
-                                  ConsumerFactory consumerFactory,
-                                  Duration unhealthyAfter,
-                                  Clock clock) {
-        this.retransmitter = retransmitter;
-        this.consumerFactory = consumerFactory;
-        this.unhealthyAfter = unhealthyAfter;
-        this.clock = clock;
-    }
+  public ConsumerProcessFactory(
+      Retransmitter retransmitter,
+      ConsumerFactory consumerFactory,
+      Duration unhealthyAfter,
+      Clock clock) {
+    this.retransmitter = retransmitter;
+    this.consumerFactory = consumerFactory;
+    this.unhealthyAfter = unhealthyAfter;
+    this.clock = clock;
+  }
 
-    @Override
-    public ConsumerProcess createProcess(Subscription subscription,
-                                  Signal startSignal,
-                                  java.util.function.Consumer<SubscriptionName> onConsumerStopped) {
+  @Override
+  public ConsumerProcess createProcess(
+      Subscription subscription,
+      Signal startSignal,
+      java.util.function.Consumer<SubscriptionName> onConsumerStopped) {
 
-        return new ConsumerProcess(startSignal,
-                                   consumerFactory.createConsumer(subscription),
-                                   retransmitter,
-                                   clock,
-                                   unhealthyAfter,
-                                   onConsumerStopped);
-    }
-}
\ No newline at end of file
+    return new ConsumerProcess(
+        startSignal,
+        consumerFactory.createConsumer(subscription),
+        retransmitter,
+        clock,
+        unhealthyAfter,
+        onConsumerStopped);
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessKiller.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessKiller.java
index 19d4a9043f..f461f5477f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessKiller.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessKiller.java
@@ -1,51 +1,49 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
+import java.time.Clock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 
-import java.time.Clock;
-
 class ConsumerProcessKiller {
-    private static final Logger logger = LoggerFactory.getLogger(ConsumerProcessKiller.class);
-
-    private final long killAfterMs;
-    private final Clock clock;
-    private final RunningConsumerProcesses dyingConsumerProcesses;
-
-    ConsumerProcessKiller(long killAfterMs, Clock clock) {
-        this.clock = clock;
-        this.killAfterMs = killAfterMs;
-        this.dyingConsumerProcesses = new RunningConsumerProcesses(clock);
-    }
-
-    int countDying() {
-        return dyingConsumerProcesses.count();
-    }
-
-    void killAllDying() {
-        dyingConsumerProcesses
-                .stream()
-                .filter(RunningConsumerProcess::shouldBeCanceledNow)
-                .forEach(RunningConsumerProcess::cancel);
-    }
-
-    void kill(RunningConsumerProcess process) {
-        observe(process).cancel();
-    }
-
-    boolean isDying(SubscriptionName subscriptionName) {
-        return dyingConsumerProcesses.hasProcess(subscriptionName);
-    }
-
-    void cleanup(SubscriptionName subscriptionName) {
-        logger.info("Removing consumer process for subscription {}", subscriptionName);
-        dyingConsumerProcesses.remove(subscriptionName);
-    }
-
-    RunningConsumerProcess observe(RunningConsumerProcess process) {
-        RunningConsumerProcess observed = process.copyWithTimeOfDeath(clock.millis() + killAfterMs);
-        dyingConsumerProcesses.add(observed);
-        return observed;
-    }
-}
\ No newline at end of file
+  private static final Logger logger = LoggerFactory.getLogger(ConsumerProcessKiller.class);
+
+  private final long killAfterMs;
+  private final Clock clock;
+  private final RunningConsumerProcesses dyingConsumerProcesses;
+
+  ConsumerProcessKiller(long killAfterMs, Clock clock) {
+    this.clock = clock;
+    this.killAfterMs = killAfterMs;
+    this.dyingConsumerProcesses = new RunningConsumerProcesses(clock);
+  }
+
+  int countDying() {
+    return dyingConsumerProcesses.count();
+  }
+
+  void killAllDying() {
+    dyingConsumerProcesses.stream()
+        .filter(RunningConsumerProcess::shouldBeCanceledNow)
+        .forEach(RunningConsumerProcess::cancel);
+  }
+
+  void kill(RunningConsumerProcess process) {
+    observe(process).cancel();
+  }
+
+  boolean isDying(SubscriptionName subscriptionName) {
+    return dyingConsumerProcesses.hasProcess(subscriptionName);
+  }
+
+  void cleanup(SubscriptionName subscriptionName) {
+    logger.info("Removing consumer process for subscription {}", subscriptionName);
+    dyingConsumerProcesses.remove(subscriptionName);
+  }
+
+  RunningConsumerProcess observe(RunningConsumerProcess process) {
+    RunningConsumerProcess observed = process.copyWithTimeOfDeath(clock.millis() + killAfterMs);
+    dyingConsumerProcesses.add(observed);
+    return observed;
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupervisor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupervisor.java
index b62825530a..ec6595ce3e 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupervisor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupervisor.java
@@ -1,5 +1,16 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
+import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.START;
+import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.STOP;
+
+import java.time.Clock;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Future;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -11,234 +22,267 @@
 import pl.allegro.tech.hermes.consumers.supervisor.ConsumersExecutorService;
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Future;
-
-import static java.util.stream.Collectors.toList;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.START;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.STOP;
-
 public class ConsumerProcessSupervisor implements Runnable {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConsumerProcessSupervisor.class);
-
-    private final MpscQueue<Signal> taskQueue;
-
-    private final RunningConsumerProcesses runningConsumerProcesses;
-
-    private final ConsumerProcessKiller processKiller;
-
-    private final ConsumersExecutorService executor;
-
-    private final Clock clock;
-
-    private final MetricsFacade metrics;
-
-    private final SignalsFilter signalsFilter;
-
-    private final ConsumerProcessSupplier processFactory;
-
-    private final Map<String, HermesCounter> processedSignalsCounters = new HashMap<>();
-
-    private final Map<String, HermesCounter> droppedSignalsCounters = new HashMap<>();
-
-    public ConsumerProcessSupervisor(ConsumersExecutorService executor,
-                                     Clock clock,
-                                     MetricsFacade metrics,
-                                     ConsumerProcessSupplier processFactory,
-                                     int signalQueueSize,
-                                     Duration backgroundSupervisorKillAfter) {
-        this.executor = executor;
-        this.clock = clock;
-        this.metrics = metrics;
-        this.taskQueue = new MonitoredMpscQueue<>(new WaitFreeDrainMpscQueue<>(signalQueueSize), metrics, "signalQueue");
-        this.signalsFilter = new SignalsFilter(taskQueue, clock);
-        this.runningConsumerProcesses = new RunningConsumerProcesses(clock);
-        this.processKiller = new ConsumerProcessKiller(backgroundSupervisorKillAfter.toMillis(), clock);
-        this.processFactory = processFactory;
-
-        metrics.consumer().registerRunningConsumerProcessesGauge(runningConsumerProcesses, RunningConsumerProcesses::count);
-        metrics.consumer().registerDyingConsumerProcessesGauge(processKiller, ConsumerProcessKiller::countDying);
+  private static final Logger logger = LoggerFactory.getLogger(ConsumerProcessSupervisor.class);
+
+  private final MpscQueue<Signal> taskQueue;
+
+  private final RunningConsumerProcesses runningConsumerProcesses;
+
+  private final ConsumerProcessKiller processKiller;
+
+  private final ConsumersExecutorService executor;
+
+  private final Clock clock;
+
+  private final MetricsFacade metrics;
+
+  private final SignalsFilter signalsFilter;
+
+  private final ConsumerProcessSupplier processFactory;
+
+  private final Map<String, HermesCounter> processedSignalsCounters = new HashMap<>();
+
+  private final Map<String, HermesCounter> droppedSignalsCounters = new HashMap<>();
+
+  public ConsumerProcessSupervisor(
+      ConsumersExecutorService executor,
+      Clock clock,
+      MetricsFacade metrics,
+      ConsumerProcessSupplier processFactory,
+      int signalQueueSize,
+      Duration backgroundSupervisorKillAfter) {
+    this.executor = executor;
+    this.clock = clock;
+    this.metrics = metrics;
+    this.taskQueue =
+        new MonitoredMpscQueue<>(
+            new WaitFreeDrainMpscQueue<>(signalQueueSize), metrics, "signalQueue");
+    this.signalsFilter = new SignalsFilter(taskQueue, clock);
+    this.runningConsumerProcesses = new RunningConsumerProcesses(clock);
+    this.processKiller = new ConsumerProcessKiller(backgroundSupervisorKillAfter.toMillis(), clock);
+    this.processFactory = processFactory;
+
+    metrics
+        .consumer()
+        .registerRunningConsumerProcessesGauge(
+            runningConsumerProcesses, RunningConsumerProcesses::count);
+    metrics
+        .consumer()
+        .registerDyingConsumerProcessesGauge(processKiller, ConsumerProcessKiller::countDying);
+  }
+
+  public ConsumerProcessSupervisor accept(Signal signal) {
+    taskQueue.offer(signal);
+    return this;
+  }
+
+  public Set<SubscriptionName> existingConsumers() {
+    return runningConsumerProcesses.existingConsumers();
+  }
+
+  @Override
+  public void run() {
+    logger.debug("Starting process supervisor loop");
+    final long currentTime = clock.millis();
+
+    restartUnhealthy();
+    processKiller.killAllDying();
+
+    List<Signal> signalsToProcess = new ArrayList<>();
+    taskQueue.drain(signalsToProcess::add);
+    signalsFilter.filterSignals(signalsToProcess).forEach(this::tryToProcessSignal);
+
+    logger.debug(
+        "Process supervisor loop took {} ms to check all consumers", clock.millis() - currentTime);
+  }
+
+  public void shutdown() {
+    runningConsumerProcesses.stream()
+        .forEach(
+            p ->
+                p.getConsumerProcess()
+                    .accept(Signal.of(STOP, p.getConsumerProcess().getSubscriptionName())));
+
+    processKiller.killAllDying();
+    executor.shutdown();
+  }
+
+  public List<RunningSubscriptionStatus> runningSubscriptionsStatus() {
+    return runningConsumerProcesses.listRunningSubscriptions();
+  }
+
+  public Integer countRunningProcesses() {
+    return runningConsumerProcesses.count();
+  }
+
+  private void restartUnhealthy() {
+    runningConsumerProcesses.stream()
+        .filter(process -> !process.getConsumerProcess().isHealthy())
+        .toList()
+        .forEach(
+            process -> {
+              logger.info(
+                  "Lost contact with consumer {} (last seen {}ms ago). Attempting to kill this process and spawn new one.",
+                  process.getConsumerProcess(),
+                  process.getConsumerProcess().lastSeen());
+              processKiller.kill(process);
+              runningConsumerProcesses.remove(process);
+              taskQueue.offer(
+                  Signal.of(
+                      START,
+                      process.getSubscription().getQualifiedName(),
+                      process.getSubscription()));
+            });
+  }
+
+  private void tryToProcessSignal(Signal signal) {
+    try {
+      processSignal(signal);
+    } catch (Exception exception) {
+      logger.error("Supervisor failed to process signal {}", signal, exception);
     }
-
-    public ConsumerProcessSupervisor accept(Signal signal) {
-        taskQueue.offer(signal);
-        return this;
+  }
+
+  private void processSignal(Signal signal) {
+    logger.debug("Processing signal: {}", signal);
+    processedSignalsCounters
+        .computeIfAbsent(
+            signal.getType().name(), name -> metrics.consumer().processedSignalsCounter(name))
+        .increment();
+
+    switch (signal.getType()) {
+      case START:
+        start(signal);
+        break;
+      case UPDATE_SUBSCRIPTION:
+        updateSubscription(signal);
+        break;
+      case UPDATE_TOPIC:
+      case RETRANSMIT:
+        forRunningConsumerProcess(
+            signal, runningProcess -> runningProcess.getConsumerProcess().accept(signal));
+        break;
+      case STOP:
+        stop(signal);
+        break;
+      default:
+        logger.warn("Unknown signal {}", signal);
+        break;
     }
+  }
 
-    public Set<SubscriptionName> existingConsumers() {
-        return runningConsumerProcesses.existingConsumers();
+  private void updateSubscription(Signal signal) {
+    if (runningConsumerProcesses.hasProcess(signal.getTarget())) {
+      stopOrUpdateConsumer(signal);
+    } else {
+      drop(signal);
     }
-
-    @Override
-    public void run() {
-        logger.debug("Starting process supervisor loop");
-        final long currentTime = clock.millis();
-
-        restartUnhealthy();
-        processKiller.killAllDying();
-
-        List<Signal> signalsToProcess = new ArrayList<>();
-        taskQueue.drain(signalsToProcess::add);
-        signalsFilter.filterSignals(signalsToProcess).forEach(this::tryToProcessSignal);
-
-        logger.debug("Process supervisor loop took {} ms to check all consumers", clock.millis() - currentTime);
+  }
+
+  private void stopOrUpdateConsumer(Signal signal) {
+    Subscription signalSubscription = signal.getPayload();
+    if (!deliveryTypesEqual(signalSubscription)) {
+      logger.info(
+          "Stopping subscription: {} because of delivery type update",
+          signalSubscription.getQualifiedName());
+      stop(Signal.of(STOP, signal.getTarget()));
+    } else {
+      forRunningConsumerProcess(
+          signal, runningProcess -> runningProcess.getConsumerProcess().accept(signal));
     }
-
-    public void shutdown() {
-        runningConsumerProcesses.stream()
-                .forEach(p -> p.getConsumerProcess().accept(Signal.of(STOP, p.getConsumerProcess().getSubscriptionName())));
-
-        processKiller.killAllDying();
-        executor.shutdown();
-    }
-
-    public List<RunningSubscriptionStatus> runningSubscriptionsStatus() {
-        return runningConsumerProcesses.listRunningSubscriptions();
-    }
-
-    public Integer countRunningProcesses() {
-        return runningConsumerProcesses.count();
-    }
-
-    private void restartUnhealthy() {
-        runningConsumerProcesses.stream()
-                .filter(process -> !process.getConsumerProcess().isHealthy())
-                .collect(toList())
-                .forEach(process -> {
-                    logger.info("Lost contact with consumer {} (last seen {}ms ago). Attempting to kill this process and spawn new one.",
-                            process.getConsumerProcess(), process.getConsumerProcess().lastSeen());
-                    processKiller.kill(process);
-                    runningConsumerProcesses.remove(process);
-                    taskQueue.offer(Signal.of(START, process.getSubscription().getQualifiedName(), process.getSubscription()));
-                });
-    }
-
-    private void tryToProcessSignal(Signal signal) {
-        try {
-            processSignal(signal);
-        } catch (Exception exception) {
-            logger.error("Supervisor failed to process signal {}", signal, exception);
-        }
-    }
-
-    private void processSignal(Signal signal) {
-        logger.debug("Processing signal: {}", signal);
-        processedSignalsCounters.computeIfAbsent(
-                signal.getType().name(),
-                name -> metrics.consumer().processedSignalsCounter(name)
-        ).increment();
-
-        switch (signal.getType()) {
-            case START:
-                start(signal);
-                break;
-            case UPDATE_SUBSCRIPTION:
-                updateSubscription(signal);
-                break;
-            case UPDATE_TOPIC:
-            case RETRANSMIT:
-            case COMMIT:
-                forRunningConsumerProcess(signal, runningProcess -> runningProcess.getConsumerProcess().accept(signal));
-                break;
-            case STOP:
-                stop(signal);
-                break;
-            default:
-                logger.warn("Unknown signal {}", signal);
-                break;
-        }
-    }
-
-    private void updateSubscription(Signal signal) {
-        if (runningConsumerProcesses.hasProcess(signal.getTarget())) {
-            stopOrUpdateConsumer(signal);
-        } else {
-            drop(signal);
-        }
-    }
-
-    private void stopOrUpdateConsumer(Signal signal) {
-        Subscription signalSubscription = signal.getPayload();
-        if (!deliveryTypesEqual(signalSubscription)) {
-            logger.info("Stopping subscription: {} because of delivery type update", signalSubscription.getQualifiedName());
-            stop(Signal.of(STOP, signal.getTarget()));
-        } else {
-            forRunningConsumerProcess(signal, runningProcess -> runningProcess.getConsumerProcess().accept(signal));
-        }
-    }
-
-    private boolean deliveryTypesEqual(Subscription signalSubscription) {
-        return signalSubscription.getDeliveryType() == runningConsumerProcesses.getProcess(signalSubscription.getQualifiedName())
-                                                                                .getSubscription()
-                                                                                .getDeliveryType();
-    }
-
-    private void stop(Signal signal) {
-        forRunningConsumerProcess(signal, runningProcess -> {
-            processKiller.observe(runningProcess);
-            runningConsumerProcesses.remove(runningProcess);
-            runningProcess.getConsumerProcess().accept(signal);
+  }
+
+  private boolean deliveryTypesEqual(Subscription signalSubscription) {
+    return signalSubscription.getDeliveryType()
+        == runningConsumerProcesses
+            .getProcess(signalSubscription.getQualifiedName())
+            .getSubscription()
+            .getDeliveryType();
+  }
+
+  private void stop(Signal signal) {
+    forRunningConsumerProcess(
+        signal,
+        runningProcess -> {
+          processKiller.observe(runningProcess);
+          runningConsumerProcesses.remove(runningProcess);
+          runningProcess.getConsumerProcess().accept(signal);
         });
+  }
+
+  private void forRunningConsumerProcess(
+      Signal signal, java.util.function.Consumer<RunningConsumerProcess> consumerProcessConsumer) {
+    if (runningConsumerProcesses.hasProcess(signal.getTarget())) {
+      consumerProcessConsumer.accept(runningConsumerProcesses.getProcess(signal.getTarget()));
+    } else {
+      drop(signal);
     }
-
-    private void forRunningConsumerProcess(Signal signal, java.util.function.Consumer<RunningConsumerProcess> consumerProcessConsumer) {
-        if (runningConsumerProcesses.hasProcess(signal.getTarget())) {
-            consumerProcessConsumer.accept(runningConsumerProcesses.getProcess(signal.getTarget()));
-        } else {
-            drop(signal);
-        }
-    }
-
-    private void drop(Signal signal) {
-        droppedSignalsCounters.computeIfAbsent(
-                signal.getType().name(),
-                name -> metrics.consumer().droppedSignalsCounter(name)
-        ).increment();
-        logger.warn("Dropping signal {} as running target consumer process does not exist.", signal);
-    }
-
-    private void start(Signal start) {
-        Subscription subscription = getSubscriptionFromPayload(start);
-
-        if (!hasProcess(start.getTarget())) {
-            try {
-                logger.info("Creating consumer for {}", subscription.getQualifiedName());
-                ConsumerProcess process = processFactory.createProcess(subscription, start, processKiller::cleanup);
-                logger.info("Created consumer for {}. {}", subscription.getQualifiedName(), start.getLogWithIdAndType());
-
-                logger.info("Starting consumer process for subscription {}. {}", start.getTarget(), start.getLogWithIdAndType());
-                Future<?> future = executor.execute(process);
-                logger.info("Consumer for {} was added for execution. {}", subscription.getQualifiedName(), start.getLogWithIdAndType());
-
-                runningConsumerProcesses.add(process, future);
-                logger.info("Started consumer process for subscription {}. {}", start.getTarget(), start.getLogWithIdAndType());
-            } catch (Exception ex) {
-                logger.error("Failed to create consumer for subscription {}", subscription.getQualifiedName(), ex);
-            }
-        } else if (processKiller.isDying(start.getTarget())) {
-            logger.info("Consumer process for {} is already dying, startup deferred.", subscription.getQualifiedName());
-            accept(start);
-        } else {
-            logger.info("Abort consumer process start: process for subscription {} is already running. {}",
-                    start.getTarget(), start.getLogWithIdAndType());
-        }
+  }
+
+  private void drop(Signal signal) {
+    droppedSignalsCounters
+        .computeIfAbsent(
+            signal.getType().name(), name -> metrics.consumer().droppedSignalsCounter(name))
+        .increment();
+    logger.warn("Dropping signal {} as running target consumer process does not exist.", signal);
+  }
+
+  private void start(Signal start) {
+    Subscription subscription = getSubscriptionFromPayload(start);
+
+    if (!hasProcess(start.getTarget())) {
+      try {
+        logger.info("Creating consumer for {}", subscription.getQualifiedName());
+        ConsumerProcess process =
+            processFactory.createProcess(subscription, start, processKiller::cleanup);
+        logger.info(
+            "Created consumer for {}. {}",
+            subscription.getQualifiedName(),
+            start.getLogWithIdAndType());
+
+        logger.info(
+            "Starting consumer process for subscription {}. {}",
+            start.getTarget(),
+            start.getLogWithIdAndType());
+        Future<?> future = executor.execute(process);
+        logger.info(
+            "Consumer for {} was added for execution. {}",
+            subscription.getQualifiedName(),
+            start.getLogWithIdAndType());
+
+        runningConsumerProcesses.add(process, future);
+        logger.info(
+            "Started consumer process for subscription {}. {}",
+            start.getTarget(),
+            start.getLogWithIdAndType());
+      } catch (Exception ex) {
+        logger.error(
+            "Failed to create consumer for subscription {}", subscription.getQualifiedName(), ex);
+      }
+    } else if (processKiller.isDying(start.getTarget())) {
+      logger.info(
+          "Consumer process for {} is already dying, startup deferred.",
+          subscription.getQualifiedName());
+      accept(start);
+    } else {
+      logger.info(
+          "Abort consumer process start: process for subscription {} is already running. {}",
+          start.getTarget(),
+          start.getLogWithIdAndType());
     }
+  }
 
-    private boolean hasProcess(SubscriptionName subscriptionName) {
-        return runningConsumerProcesses.hasProcess(subscriptionName) || processKiller.isDying(subscriptionName);
-    }
+  private boolean hasProcess(SubscriptionName subscriptionName) {
+    return runningConsumerProcesses.hasProcess(subscriptionName)
+        || processKiller.isDying(subscriptionName);
+  }
 
-    private Subscription getSubscriptionFromPayload(Signal startSignal) {
-        if (!(startSignal.getPayload() instanceof Subscription)) {
-            throw new IllegalArgumentException("Signal's payload has to be Subscription type");
-        }
-        return startSignal.getPayload();
+  private Subscription getSubscriptionFromPayload(Signal startSignal) {
+    if (!(startSignal.getPayload() instanceof Subscription)) {
+      throw new IllegalArgumentException("Signal's payload has to be Subscription type");
     }
+    return startSignal.getPayload();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupplier.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupplier.java
index d9b8627d12..e478500eeb 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupplier.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupplier.java
@@ -4,7 +4,8 @@
 import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public interface ConsumerProcessSupplier {
-    ConsumerProcess createProcess(Subscription subscription,
-                                  Signal startSignal,
-                                  java.util.function.Consumer<SubscriptionName> onConsumerStopped);
-}
\ No newline at end of file
+  ConsumerProcess createProcess(
+      Subscription subscription,
+      Signal startSignal,
+      java.util.function.Consumer<SubscriptionName> onConsumerStopped);
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/Retransmitter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/Retransmitter.java
index f78e2939ff..3ccd141f89 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/Retransmitter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/Retransmitter.java
@@ -11,50 +11,55 @@
 
 public class Retransmitter {
 
-    private static final Logger logger = LoggerFactory.getLogger(Retransmitter.class);
+  private static final Logger logger = LoggerFactory.getLogger(Retransmitter.class);
 
-    private final SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicator;
-    private final String brokersClusterName;
+  private final SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicator;
+  private final String brokersClusterName;
 
-    public Retransmitter(SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicator,
-                         String kafkaClusterName) {
-        this.subscriptionOffsetChangeIndicator = subscriptionOffsetChangeIndicator;
-        this.brokersClusterName = kafkaClusterName;
-    }
+  public Retransmitter(
+      SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicator,
+      String kafkaClusterName) {
+    this.subscriptionOffsetChangeIndicator = subscriptionOffsetChangeIndicator;
+    this.brokersClusterName = kafkaClusterName;
+  }
+
+  public void reloadOffsets(SubscriptionName subscriptionName, Consumer consumer) {
+    logger.info("Reloading offsets for {}", subscriptionName);
+    try {
+      PartitionOffsets offsets =
+          subscriptionOffsetChangeIndicator.getSubscriptionOffsets(
+              subscriptionName.getTopicName(), subscriptionName.getName(), brokersClusterName);
 
-    public void reloadOffsets(SubscriptionName subscriptionName, Consumer consumer) {
-        logger.info("Reloading offsets for {}", subscriptionName);
-        try {
-            PartitionOffsets offsets = subscriptionOffsetChangeIndicator.getSubscriptionOffsets(
-                    subscriptionName.getTopicName(), subscriptionName.getName(), brokersClusterName);
-
-            for (PartitionOffset partitionOffset : offsets) {
-                if (moveOffset(subscriptionName, consumer, partitionOffset)) {
-                    subscriptionOffsetChangeIndicator.removeOffset(
-                        subscriptionName.getTopicName(),
-                        subscriptionName.getName(),
-                        brokersClusterName,
-                        partitionOffset.getTopic(),
-                        partitionOffset.getPartition()
-                    );
-                    logger.info("Removed offset indicator for subscription={} and partition={}",
-                            subscriptionName, partitionOffset.getPartition());
-                }
-            }
-        } catch (Exception ex) {
-            throw new RetransmissionException(ex);
+      for (PartitionOffset partitionOffset : offsets) {
+        if (moveOffset(subscriptionName, consumer, partitionOffset)) {
+          subscriptionOffsetChangeIndicator.removeOffset(
+              subscriptionName.getTopicName(),
+              subscriptionName.getName(),
+              brokersClusterName,
+              partitionOffset.getTopic(),
+              partitionOffset.getPartition());
+          logger.info(
+              "Removed offset indicator for subscription={} and partition={}",
+              subscriptionName,
+              partitionOffset.getPartition());
         }
+      }
+    } catch (Exception ex) {
+      throw new RetransmissionException(ex);
     }
+  }
 
-    private boolean moveOffset(SubscriptionName subscriptionName,
-                            Consumer consumer,
-                            PartitionOffset partitionOffset) {
-        try {
-            return consumer.moveOffset(partitionOffset);
-        } catch (IllegalStateException ex) {
-            logger.warn("Cannot move offset for subscription={} and partition={} , possibly owned by different node",
-                    subscriptionName, partitionOffset.getPartition(), ex);
-            return false;
-        }
+  private boolean moveOffset(
+      SubscriptionName subscriptionName, Consumer consumer, PartitionOffset partitionOffset) {
+    try {
+      return consumer.moveOffset(partitionOffset);
+    } catch (IllegalStateException ex) {
+      logger.warn(
+          "Cannot move offset for subscription={} and partition={} , possibly owned by different node",
+          subscriptionName,
+          partitionOffset.getPartition(),
+          ex);
+      return false;
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningConsumerProcess.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningConsumerProcess.java
index fbf80fb4f9..b7ca2b27b3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningConsumerProcess.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningConsumerProcess.java
@@ -1,59 +1,64 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
+import java.time.Clock;
+import java.util.Optional;
+import java.util.concurrent.Future;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 
-import java.time.Clock;
-import java.util.Optional;
-import java.util.concurrent.Future;
-
 class RunningConsumerProcess {
-    private static final Logger logger = LoggerFactory.getLogger(RunningConsumerProcess.class);
-    
-    private ConsumerProcess process;
-    private Future executionHandle;
-    private Clock clock;
-    private Optional<Long> timeOfDeath = Optional.empty();
-
-    RunningConsumerProcess(ConsumerProcess process, Future executionHandle, Clock clock) {
-        this.process = process;
-        this.executionHandle = executionHandle;
-        this.clock = clock;
-    }
-
-    private RunningConsumerProcess(ConsumerProcess process, Future executionHandle, long killTime, Clock clock) {
-        this(process, executionHandle, clock);
-        this.timeOfDeath = Optional.of(killTime);
-    }
-
-    void cancel() {
-        timeOfDeath.ifPresent(timeOfDeath -> {
-            SubscriptionName subscriptionName = process.getSubscriptionName();
-            logger.info("Canceling consumer process for subscription {}. It should have been killed {}ms ago.",
-                    subscriptionName, clock.millis() - timeOfDeath);
-            if (executionHandle.cancel(true)) {
-                logger.info("Canceled consumer process for subscription {}", subscriptionName);
-            } else {
-                logger.error("Failed to cancel consumer process for {}.", subscriptionName);
-            }
+  private static final Logger logger = LoggerFactory.getLogger(RunningConsumerProcess.class);
+
+  private ConsumerProcess process;
+  private Future executionHandle;
+  private Clock clock;
+  private Optional<Long> timeOfDeath = Optional.empty();
+
+  RunningConsumerProcess(ConsumerProcess process, Future executionHandle, Clock clock) {
+    this.process = process;
+    this.executionHandle = executionHandle;
+    this.clock = clock;
+  }
+
+  private RunningConsumerProcess(
+      ConsumerProcess process, Future executionHandle, long killTime, Clock clock) {
+    this(process, executionHandle, clock);
+    this.timeOfDeath = Optional.of(killTime);
+  }
+
+  void cancel() {
+    timeOfDeath.ifPresent(
+        timeOfDeath -> {
+          SubscriptionName subscriptionName = process.getSubscriptionName();
+          logger.info(
+              "Canceling consumer process for subscription {}. It should have been killed {}ms ago.",
+              subscriptionName,
+              clock.millis() - timeOfDeath);
+          if (executionHandle.cancel(true)) {
+            logger.info("Canceled consumer process for subscription {}", subscriptionName);
+          } else {
+            logger.error("Failed to cancel consumer process for {}.", subscriptionName);
+          }
         });
-    }
+  }
 
-    boolean shouldBeCanceledNow() {
-        return timeOfDeath.map(time -> time < clock.millis() && !executionHandle.isDone()).orElse(false);
-    }
+  boolean shouldBeCanceledNow() {
+    return timeOfDeath
+        .map(time -> time < clock.millis() && !executionHandle.isDone())
+        .orElse(false);
+  }
 
-    RunningConsumerProcess copyWithTimeOfDeath(long timeOfDeath) {
-        return new RunningConsumerProcess(process, executionHandle, timeOfDeath, clock);
-    }
+  RunningConsumerProcess copyWithTimeOfDeath(long timeOfDeath) {
+    return new RunningConsumerProcess(process, executionHandle, timeOfDeath, clock);
+  }
 
-    ConsumerProcess getConsumerProcess() {
-        return process;
-    }
+  ConsumerProcess getConsumerProcess() {
+    return process;
+  }
 
-    public Subscription getSubscription() {
-        return getConsumerProcess().getSubscription();
-    }
+  public Subscription getSubscription() {
+    return getConsumerProcess().getSubscription();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningConsumerProcesses.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningConsumerProcesses.java
index a836ed2bae..9669d12b23 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningConsumerProcesses.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningConsumerProcesses.java
@@ -1,8 +1,8 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
-import com.google.common.collect.ImmutableSet;
-import pl.allegro.tech.hermes.api.SubscriptionName;
+import static java.util.stream.Collectors.toList;
 
+import com.google.common.collect.ImmutableSet;
 import java.time.Clock;
 import java.util.List;
 import java.util.Map;
@@ -10,64 +10,69 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 import java.util.stream.Stream;
-
-import static java.util.stream.Collectors.toList;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 class RunningConsumerProcesses {
 
-    private final Map<SubscriptionName, RunningConsumerProcess> processes = new ConcurrentHashMap<>();
-    private final Clock clock;
-
-    RunningConsumerProcesses(Clock clock) {
-        this.clock = clock;
-    }
-
-    void add(ConsumerProcess process, Future executionHandle) {
-        this.processes.put(process.getSubscription().getQualifiedName(), new RunningConsumerProcess(process, executionHandle, clock));
-    }
-
-    void add(RunningConsumerProcess process) {
-        this.processes.put(process.getConsumerProcess().getSubscriptionName(), process);
-    }
-
-    void remove(SubscriptionName subscriptionName) {
-        processes.remove(subscriptionName);
-    }
-
-    public void remove(ConsumerProcess consumerProcess) {
-        remove(consumerProcess.getSubscriptionName());
-    }
-
-    void remove(RunningConsumerProcess runningProcess) {
-        remove(runningProcess.getConsumerProcess().getSubscriptionName());
-    }
-
-    RunningConsumerProcess getProcess(SubscriptionName subscriptionName) {
-        return processes.get(subscriptionName);
-    }
-
-    boolean hasProcess(SubscriptionName subscriptionName) {
-        return processes.containsKey(subscriptionName);
-    }
-
-    Stream<RunningConsumerProcess> stream() {
-        return processes.values().stream();
-    }
-
-    Set<SubscriptionName> existingConsumers() {
-        return ImmutableSet.copyOf(processes.keySet());
-    }
-
-    List<RunningSubscriptionStatus> listRunningSubscriptions() {
-        return processes.entrySet().stream()
-                .map(entry -> new RunningSubscriptionStatus(
-                        entry.getKey().getQualifiedName(),
-                        entry.getValue().getConsumerProcess().getSignalTimesheet()))
-                .sorted((s1, s2) -> String.CASE_INSENSITIVE_ORDER.compare(s1.getQualifiedName(), s2.getQualifiedName()))
-                .collect(toList());
-    }
-
-    Integer count() {
-        return processes.size();
-    }
-}
\ No newline at end of file
+  private final Map<SubscriptionName, RunningConsumerProcess> processes = new ConcurrentHashMap<>();
+  private final Clock clock;
+
+  RunningConsumerProcesses(Clock clock) {
+    this.clock = clock;
+  }
+
+  void add(ConsumerProcess process, Future executionHandle) {
+    this.processes.put(
+        process.getSubscription().getQualifiedName(),
+        new RunningConsumerProcess(process, executionHandle, clock));
+  }
+
+  void add(RunningConsumerProcess process) {
+    this.processes.put(process.getConsumerProcess().getSubscriptionName(), process);
+  }
+
+  void remove(SubscriptionName subscriptionName) {
+    processes.remove(subscriptionName);
+  }
+
+  public void remove(ConsumerProcess consumerProcess) {
+    remove(consumerProcess.getSubscriptionName());
+  }
+
+  void remove(RunningConsumerProcess runningProcess) {
+    remove(runningProcess.getConsumerProcess().getSubscriptionName());
+  }
+
+  RunningConsumerProcess getProcess(SubscriptionName subscriptionName) {
+    return processes.get(subscriptionName);
+  }
+
+  boolean hasProcess(SubscriptionName subscriptionName) {
+    return processes.containsKey(subscriptionName);
+  }
+
+  Stream<RunningConsumerProcess> stream() {
+    return processes.values().stream();
+  }
+
+  Set<SubscriptionName> existingConsumers() {
+    return ImmutableSet.copyOf(processes.keySet());
+  }
+
+  List<RunningSubscriptionStatus> listRunningSubscriptions() {
+    return processes.entrySet().stream()
+        .map(
+            entry ->
+                new RunningSubscriptionStatus(
+                    entry.getKey().getQualifiedName(),
+                    entry.getValue().getConsumerProcess().getSignalTimesheet()))
+        .sorted(
+            (s1, s2) ->
+                String.CASE_INSENSITIVE_ORDER.compare(s1.getQualifiedName(), s2.getQualifiedName()))
+        .collect(toList());
+  }
+
+  Integer count() {
+    return processes.size();
+  }
+}
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningSubscriptionStatus.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningSubscriptionStatus.java
index 2c289cc71d..840214865b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningSubscriptionStatus.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/RunningSubscriptionStatus.java
@@ -1,25 +1,25 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Map;
 
 public class RunningSubscriptionStatus {
-    private final String qualifiedName;
-    private final Map<Signal.SignalType, Long> signalTimesheet;
+  private final String qualifiedName;
+  private final Map<Signal.SignalType, Long> signalTimesheet;
 
-    public RunningSubscriptionStatus(@JsonProperty("qualifiedName") String qualifiedName,
-                                     @JsonProperty("signals") Map<Signal.SignalType, Long> signalTimesheet) {
+  public RunningSubscriptionStatus(
+      @JsonProperty("qualifiedName") String qualifiedName,
+      @JsonProperty("signals") Map<Signal.SignalType, Long> signalTimesheet) {
 
-        this.qualifiedName = qualifiedName;
-        this.signalTimesheet = signalTimesheet;
-    }
+    this.qualifiedName = qualifiedName;
+    this.signalTimesheet = signalTimesheet;
+  }
 
-    public String getQualifiedName() {
-        return qualifiedName;
-    }
+  public String getQualifiedName() {
+    return qualifiedName;
+  }
 
-    public Map<Signal.SignalType, Long> getSignalTimesheet() {
-        return signalTimesheet;
-    }
+  public Map<Signal.SignalType, Long> getSignalTimesheet() {
+    return signalTimesheet;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/Signal.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/Signal.java
index 41d4c6b94b..fa5066d9b3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/Signal.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/Signal.java
@@ -1,92 +1,100 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class Signal {
 
-    private final SignalType type;
-
-    private final SubscriptionName target;
-
-    private final Object payload;
-
-    private final long executeAfterTimestamp;
-    private final long id;
-
-    public enum SignalType {
-        START, STOP, RETRANSMIT, UPDATE_SUBSCRIPTION, UPDATE_TOPIC, COMMIT
-    }
-
-    private static AtomicLong SIGNALS_COUNTER = new AtomicLong();
-
-    private Signal(SignalType type, SubscriptionName target, Object payload, long executeAfterTimestamp, long id) {
-        this.type = type;
-        this.target = target;
-        this.payload = payload;
-        this.executeAfterTimestamp = executeAfterTimestamp;
-        this.id = id;
-    }
-
-    public static Signal of(SignalType type, SubscriptionName target) {
-        return of(type, target, null);
-    }
-
-    public static Signal of(SignalType type, SubscriptionName target, Object payload) {
-        return of(type, target, payload, -1);
-    }
-
-    public static Signal of(SignalType type, SubscriptionName target, Object payload, long executeAfterTimestamp) {
-        return new Signal(type, target, payload, executeAfterTimestamp, SIGNALS_COUNTER.incrementAndGet());
+  private final SignalType type;
+
+  private final SubscriptionName target;
+
+  private final Object payload;
+
+  private final long executeAfterTimestamp;
+  private final long id;
+
+  public enum SignalType {
+    START,
+    STOP,
+    RETRANSMIT,
+    UPDATE_SUBSCRIPTION,
+    UPDATE_TOPIC
+  }
+
+  private static final AtomicLong SIGNALS_COUNTER = new AtomicLong();
+
+  private Signal(
+      SignalType type,
+      SubscriptionName target,
+      Object payload,
+      long executeAfterTimestamp,
+      long id) {
+    this.type = type;
+    this.target = target;
+    this.payload = payload;
+    this.executeAfterTimestamp = executeAfterTimestamp;
+    this.id = id;
+  }
+
+  public static Signal of(SignalType type, SubscriptionName target) {
+    return of(type, target, null);
+  }
+
+  public static Signal of(SignalType type, SubscriptionName target, Object payload) {
+    return of(type, target, payload, -1);
+  }
+
+  public static Signal of(
+      SignalType type, SubscriptionName target, Object payload, long executeAfterTimestamp) {
+    return new Signal(
+        type, target, payload, executeAfterTimestamp, SIGNALS_COUNTER.incrementAndGet());
+  }
+
+  Signal createChild(SignalType type) {
+    return new Signal(type, target, payload, executeAfterTimestamp, id);
+  }
+
+  SignalType getType() {
+    return type;
+  }
+
+  SubscriptionName getTarget() {
+    return target;
+  }
+
+  boolean canExecuteNow(long currentTimestamp) {
+    return currentTimestamp >= executeAfterTimestamp;
+  }
+
+  @SuppressWarnings("unchecked")
+  <T> T getPayload() {
+    return (T) payload;
+  }
+
+  @Override
+  public String toString() {
+    return "Signal(" + id + ", " + type + ", " + target + ")";
+  }
+
+  public String getLogWithIdAndType() {
+    return "[Signal(" + id + ", " + type + ")]";
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    Signal createChild(SignalType type) {
-        return new Signal(type, target, payload, executeAfterTimestamp, id);
-    }
-
-    SignalType getType() {
-        return type;
-    }
-
-    SubscriptionName getTarget() {
-        return target;
-    }
-
-    boolean canExecuteNow(long currentTimestamp) {
-        return currentTimestamp >= executeAfterTimestamp;
-    }
-
-    @SuppressWarnings("unchecked")
-    <T> T getPayload() {
-        return (T) payload;
-    }
-
-    @Override
-    public String toString() {
-        return "Signal(" + id + ", " + type + ", " + target + ")";
-    }
-
-    public String getLogWithIdAndType() {
-        return "[Signal(" + id + ", " + type + ")]";
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof Signal)) {
-            return false;
-        }
-        Signal signal = (Signal) o;
-        return type == signal.type
-                && Objects.equals(target, signal.target);
+    if (!(o instanceof Signal signal)) {
+      return false;
     }
+    return type == signal.type && Objects.equals(target, signal.target);
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(type, target);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(type, target);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/SignalsFilter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/SignalsFilter.java
index ff2b56f963..a79d0cc4cb 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/SignalsFilter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/process/SignalsFilter.java
@@ -1,62 +1,62 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process;
 
 import com.google.common.collect.ImmutableMap;
-import pl.allegro.tech.hermes.consumers.queue.MpscQueue;
-import pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType;
-
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import pl.allegro.tech.hermes.consumers.queue.MpscQueue;
+import pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType;
 
 class SignalsFilter {
 
-    private static final Map<SignalType, SignalType> MERGEABLE_SIGNALS = ImmutableMap.<SignalType, SignalType>builder()
-            .put(SignalType.START, SignalType.STOP)
-            .put(SignalType.STOP, SignalType.START)
-            .build();
+  private static final Map<SignalType, SignalType> MERGEABLE_SIGNALS =
+      ImmutableMap.<SignalType, SignalType>builder()
+          .put(SignalType.START, SignalType.STOP)
+          .put(SignalType.STOP, SignalType.START)
+          .build();
 
-    private final Clock clock;
+  private final Clock clock;
 
-    private final MpscQueue<Signal> taskQueue;
+  private final MpscQueue<Signal> taskQueue;
 
-    SignalsFilter(MpscQueue<Signal> taskQueue, Clock clock) {
-        this.taskQueue = taskQueue;
-        this.clock = clock;
-    }
+  SignalsFilter(MpscQueue<Signal> taskQueue, Clock clock) {
+    this.taskQueue = taskQueue;
+    this.clock = clock;
+  }
 
-    List<Signal> filterSignals(List<Signal> signals) {
-        List<Signal> filteredSignals = new ArrayList<>(signals.size());
-
-        for (Signal signal : signals) {
-            boolean merged = merge(filteredSignals, signal);
-            if (!merged) {
-                if (signal.canExecuteNow(clock.millis())) {
-                    addWithoutDuplicationMergeableSignals(filteredSignals, signal);
-                } else {
-                    taskQueue.offer(signal);
-                }
-            }
-        }
+  List<Signal> filterSignals(List<Signal> signals) {
+    List<Signal> filteredSignals = new ArrayList<>(signals.size());
 
-        return filteredSignals;
-    }
-
-    private void addWithoutDuplicationMergeableSignals(List<Signal> filteredSignals, Signal signal) {
-        if (MERGEABLE_SIGNALS.containsKey(signal.getType())) {
-            if (!filteredSignals.contains(signal)) {
-                filteredSignals.add(signal);
-            }
+    for (Signal signal : signals) {
+      boolean merged = merge(filteredSignals, signal);
+      if (!merged) {
+        if (signal.canExecuteNow(clock.millis())) {
+          addWithoutDuplicationMergeableSignals(filteredSignals, signal);
         } else {
-            filteredSignals.add(signal);
+          taskQueue.offer(signal);
         }
+      }
     }
 
-    private boolean merge(List<Signal> filteredSignals, Signal signal) {
-        SignalType signalTypeToMerge = MERGEABLE_SIGNALS.get(signal.getType());
-        if (signalTypeToMerge != null) {
-            return filteredSignals.remove(signal.createChild(signalTypeToMerge));
-        }
-        return false;
+    return filteredSignals;
+  }
+
+  private void addWithoutDuplicationMergeableSignals(List<Signal> filteredSignals, Signal signal) {
+    if (MERGEABLE_SIGNALS.containsKey(signal.getType())) {
+      if (!filteredSignals.contains(signal)) {
+        filteredSignals.add(signal);
+      }
+    } else {
+      filteredSignals.add(signal);
+    }
+  }
+
+  private boolean merge(List<Signal> filteredSignals, Signal signal) {
+    SignalType signalTypeToMerge = MERGEABLE_SIGNALS.get(signal.getType());
+    if (signalTypeToMerge != null) {
+      return filteredSignals.remove(signal.createChild(signalTypeToMerge));
     }
+    return false;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/BalancingJob.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/BalancingJob.java
index b0cdbdb274..cf794b7c51 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/BalancingJob.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/BalancingJob.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -10,144 +11,159 @@
 import pl.allegro.tech.hermes.domain.workload.constraints.WorkloadConstraintsRepository;
 import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 
-import java.util.List;
-
 class BalancingJob implements Runnable {
 
-    private static final Logger logger = LoggerFactory.getLogger(BalancingJob.class);
-
-    private final ConsumerNodesRegistry consumersRegistry;
-    private final WorkBalancingParameters workBalancingParameters;
-    private final SubscriptionsCache subscriptionsCache;
-    private final ClusterAssignmentCache clusterAssignmentCache;
-    private final ConsumerAssignmentRegistry consumerAssignmentRegistry;
-    private final WorkBalancer workBalancer;
-    private final MetricsFacade metrics;
-    private final String kafkaCluster;
-    private final WorkloadConstraintsRepository workloadConstraintsRepository;
-    private final BalancingListener balancingListener;
-    private final BalancingJobMetrics balancingMetrics = new BalancingJobMetrics();
-
-    BalancingJob(ConsumerNodesRegistry consumersRegistry,
-                 WorkBalancingParameters workBalancingParameters,
-                 SubscriptionsCache subscriptionsCache,
-                 ClusterAssignmentCache clusterAssignmentCache,
-                 ConsumerAssignmentRegistry consumerAssignmentRegistry,
-                 WorkBalancer workBalancer,
-                 MetricsFacade metrics,
-                 String kafkaCluster,
-                 WorkloadConstraintsRepository workloadConstraintsRepository,
-                 BalancingListener balancingListener) {
-        this.consumersRegistry = consumersRegistry;
-        this.workBalancingParameters = workBalancingParameters;
-        this.subscriptionsCache = subscriptionsCache;
-        this.clusterAssignmentCache = clusterAssignmentCache;
-        this.consumerAssignmentRegistry = consumerAssignmentRegistry;
-        this.workBalancer = workBalancer;
-        this.metrics = metrics;
-        this.kafkaCluster = kafkaCluster;
-        this.workloadConstraintsRepository = workloadConstraintsRepository;
-        this.balancingListener = balancingListener;
-        metrics.workload().registerAllAssignmentsGauge(balancingMetrics, kafkaCluster, bm -> bm.allAssignments);
-        metrics.workload().registerMissingResourcesGauge(balancingMetrics, kafkaCluster, bm -> bm.missingResources);
-        metrics.workload().registerDeletedAssignmentsGauge(balancingMetrics, kafkaCluster, bm -> bm.deletedAssignments);
-        metrics.workload().registerCreatedAssignmentsGauge(balancingMetrics, kafkaCluster, bm -> bm.createdAssignments);
-    }
-
-    @Override
-    public void run() {
-        try {
-            consumersRegistry.refresh();
-            if (consumersRegistry.isLeader()) {
-                try (HermesTimerContext ignored = metrics.workload().rebalanceDurationTimer(kafkaCluster).time()) {
-                    logger.info("Initializing workload balance.");
-                    clusterAssignmentCache.refresh();
-
-                    SubscriptionAssignmentView initialState = clusterAssignmentCache.createSnapshot();
-                    List<String> activeConsumers = consumersRegistry.listConsumerNodes();
-                    List<SubscriptionName> activeSubscriptions = subscriptionsCache.listActiveSubscriptionNames();
-
-                    balancingListener.onBeforeBalancing(activeConsumers);
-
-                    WorkBalancingResult work = workBalancer.balance(
-                            activeSubscriptions,
-                            activeConsumers,
-                            initialState,
-                            prepareWorkloadConstraints(activeConsumers)
-                    );
-
-                    if (consumersRegistry.isLeader()) {
-                        logger.info("Applying workload balance changes");
-                        WorkDistributionChanges changes = calculateWorkDistributionChanges(initialState, work);
-                        applyWorkloadChanges(changes, work);
-                        logger.info("Finished workload balance");
-
-                        clusterAssignmentCache.refresh(); // refresh cache with just stored data
-
-                        balancingListener.onAfterBalancing(changes);
-
-                        updateMetrics(work, changes);
-                    } else {
-                        logger.info("Lost leadership before applying changes");
-                    }
-                }
-            } else {
-                balancingMetrics.reset();
-                balancingListener.onBalancingSkipped();
-            }
-        } catch (Exception e) {
-            logger.error("Caught exception when running balancing job", e);
+  private static final Logger logger = LoggerFactory.getLogger(BalancingJob.class);
+
+  private final ConsumerNodesRegistry consumersRegistry;
+  private final WorkBalancingParameters workBalancingParameters;
+  private final SubscriptionsCache subscriptionsCache;
+  private final ClusterAssignmentCache clusterAssignmentCache;
+  private final ConsumerAssignmentRegistry consumerAssignmentRegistry;
+  private final WorkBalancer workBalancer;
+  private final MetricsFacade metrics;
+  private final String kafkaCluster;
+  private final WorkloadConstraintsRepository workloadConstraintsRepository;
+  private final BalancingListener balancingListener;
+  private final BalancingJobMetrics balancingMetrics = new BalancingJobMetrics();
+
+  BalancingJob(
+      ConsumerNodesRegistry consumersRegistry,
+      WorkBalancingParameters workBalancingParameters,
+      SubscriptionsCache subscriptionsCache,
+      ClusterAssignmentCache clusterAssignmentCache,
+      ConsumerAssignmentRegistry consumerAssignmentRegistry,
+      WorkBalancer workBalancer,
+      MetricsFacade metrics,
+      String kafkaCluster,
+      WorkloadConstraintsRepository workloadConstraintsRepository,
+      BalancingListener balancingListener) {
+    this.consumersRegistry = consumersRegistry;
+    this.workBalancingParameters = workBalancingParameters;
+    this.subscriptionsCache = subscriptionsCache;
+    this.clusterAssignmentCache = clusterAssignmentCache;
+    this.consumerAssignmentRegistry = consumerAssignmentRegistry;
+    this.workBalancer = workBalancer;
+    this.metrics = metrics;
+    this.kafkaCluster = kafkaCluster;
+    this.workloadConstraintsRepository = workloadConstraintsRepository;
+    this.balancingListener = balancingListener;
+    metrics
+        .workload()
+        .registerAllAssignmentsGauge(balancingMetrics, kafkaCluster, bm -> bm.allAssignments);
+    metrics
+        .workload()
+        .registerMissingResourcesGauge(balancingMetrics, kafkaCluster, bm -> bm.missingResources);
+    metrics
+        .workload()
+        .registerDeletedAssignmentsGauge(
+            balancingMetrics, kafkaCluster, bm -> bm.deletedAssignments);
+    metrics
+        .workload()
+        .registerCreatedAssignmentsGauge(
+            balancingMetrics, kafkaCluster, bm -> bm.createdAssignments);
+  }
+
+  @Override
+  public void run() {
+    try {
+      consumersRegistry.refresh();
+      if (consumersRegistry.isLeader()) {
+        try (HermesTimerContext ignored =
+            metrics.workload().rebalanceDurationTimer(kafkaCluster).time()) {
+          logger.info("Initializing workload balance.");
+          clusterAssignmentCache.refresh();
+
+          SubscriptionAssignmentView initialState = clusterAssignmentCache.createSnapshot();
+          List<String> activeConsumers = consumersRegistry.listConsumerNodes();
+          List<SubscriptionName> activeSubscriptions =
+              subscriptionsCache.listActiveSubscriptionNames();
+
+          balancingListener.onBeforeBalancing(activeConsumers);
+
+          WorkBalancingResult work =
+              workBalancer.balance(
+                  activeSubscriptions,
+                  activeConsumers,
+                  initialState,
+                  prepareWorkloadConstraints(activeConsumers));
+
+          if (consumersRegistry.isLeader()) {
+            logger.info("Applying workload balance changes");
+            WorkDistributionChanges changes = calculateWorkDistributionChanges(initialState, work);
+            applyWorkloadChanges(changes, work);
+            logger.info("Finished workload balance");
+
+            clusterAssignmentCache.refresh(); // refresh cache with just stored data
+
+            balancingListener.onAfterBalancing(changes);
+
+            updateMetrics(work, changes);
+          } else {
+            logger.info("Lost leadership before applying changes");
+          }
         }
+      } else {
+        balancingMetrics.reset();
+        balancingListener.onBalancingSkipped();
+      }
+    } catch (Exception e) {
+      logger.error("Caught exception when running balancing job", e);
     }
-
-    private WorkloadConstraints prepareWorkloadConstraints(List<String> activeConsumers) {
-        ConsumersWorkloadConstraints constraints = workloadConstraintsRepository.getConsumersWorkloadConstraints();
-        return WorkloadConstraints.builder()
-                .withActiveConsumers(activeConsumers.size())
-                .withConsumersPerSubscription(workBalancingParameters.getConsumersPerSubscription())
-                .withMaxSubscriptionsPerConsumer(workBalancingParameters.getMaxSubscriptionsPerConsumer())
-                .withSubscriptionConstraints(constraints.getSubscriptionConstraints())
-                .withTopicConstraints(constraints.getTopicConstraints())
-                .build();
+  }
+
+  private WorkloadConstraints prepareWorkloadConstraints(List<String> activeConsumers) {
+    ConsumersWorkloadConstraints constraints =
+        workloadConstraintsRepository.getConsumersWorkloadConstraints();
+    return WorkloadConstraints.builder()
+        .withActiveConsumers(activeConsumers.size())
+        .withConsumersPerSubscription(workBalancingParameters.getConsumersPerSubscription())
+        .withMaxSubscriptionsPerConsumer(workBalancingParameters.getMaxSubscriptionsPerConsumer())
+        .withSubscriptionConstraints(constraints.getSubscriptionConstraints())
+        .withTopicConstraints(constraints.getTopicConstraints())
+        .build();
+  }
+
+  private WorkDistributionChanges calculateWorkDistributionChanges(
+      SubscriptionAssignmentView initialState, WorkBalancingResult workBalancingResult) {
+    SubscriptionAssignmentView balancedState = workBalancingResult.getAssignmentsView();
+    SubscriptionAssignmentView deletions = initialState.deletions(balancedState);
+    SubscriptionAssignmentView additions = initialState.additions(balancedState);
+    return new WorkDistributionChanges(deletions, additions);
+  }
+
+  private void applyWorkloadChanges(
+      WorkDistributionChanges changes, WorkBalancingResult workBalancingResult) {
+    SubscriptionAssignmentView balancedState = workBalancingResult.getAssignmentsView();
+    for (String consumerId : changes.getModifiedConsumerNodes()) {
+      consumerAssignmentRegistry.updateAssignments(
+          consumerId, balancedState.getSubscriptionsForConsumerNode(consumerId));
     }
+  }
 
-    private WorkDistributionChanges calculateWorkDistributionChanges(SubscriptionAssignmentView initialState,
-                                                                     WorkBalancingResult workBalancingResult) {
-        SubscriptionAssignmentView balancedState = workBalancingResult.getAssignmentsView();
-        SubscriptionAssignmentView deletions = initialState.deletions(balancedState);
-        SubscriptionAssignmentView additions = initialState.additions(balancedState);
-        return new WorkDistributionChanges(deletions, additions);
-    }
+  private void updateMetrics(WorkBalancingResult balancingResult, WorkDistributionChanges changes) {
+    this.balancingMetrics.allAssignments =
+        balancingResult.getAssignmentsView().getAllAssignments().size();
+    this.balancingMetrics.missingResources = balancingResult.getMissingResources();
+    this.balancingMetrics.createdAssignments = changes.getCreatedAssignmentsCount();
+    this.balancingMetrics.deletedAssignments = changes.getDeletedAssignmentsCount();
+  }
 
-    private void applyWorkloadChanges(WorkDistributionChanges changes, WorkBalancingResult workBalancingResult) {
-        SubscriptionAssignmentView balancedState = workBalancingResult.getAssignmentsView();
-        for (String consumerId : changes.getModifiedConsumerNodes()) {
-            consumerAssignmentRegistry.updateAssignments(consumerId, balancedState.getSubscriptionsForConsumerNode(consumerId));
-        }
-    }
-
-    private void updateMetrics(WorkBalancingResult balancingResult, WorkDistributionChanges changes) {
-        this.balancingMetrics.allAssignments = balancingResult.getAssignmentsView().getAllAssignments().size();
-        this.balancingMetrics.missingResources = balancingResult.getMissingResources();
-        this.balancingMetrics.createdAssignments = changes.getCreatedAssignmentsCount();
-        this.balancingMetrics.deletedAssignments = changes.getDeletedAssignmentsCount();
-    }
-
-    private static class BalancingJobMetrics {
+  private static class BalancingJobMetrics {
 
-        volatile int allAssignments;
+    volatile int allAssignments;
 
-        volatile int missingResources;
+    volatile int missingResources;
 
-        volatile int deletedAssignments;
+    volatile int deletedAssignments;
 
-        volatile int createdAssignments;
+    volatile int createdAssignments;
 
-        void reset() {
-            this.allAssignments = 0;
-            this.missingResources = 0;
-            this.deletedAssignments = 0;
-            this.createdAssignments = 0;
-        }
+    void reset() {
+      this.allAssignments = 0;
+      this.missingResources = 0;
+      this.deletedAssignments = 0;
+      this.createdAssignments = 0;
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/BalancingListener.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/BalancingListener.java
index 5d8aa9a3f7..41a2fea0fc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/BalancingListener.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/BalancingListener.java
@@ -4,9 +4,9 @@
 
 public interface BalancingListener {
 
-    void onBeforeBalancing(List<String> activeConsumers);
+  void onBeforeBalancing(List<String> activeConsumers);
 
-    void onAfterBalancing(WorkDistributionChanges changes);
+  void onAfterBalancing(WorkDistributionChanges changes);
 
-    void onBalancingSkipped();
+  void onBalancingSkipped();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ClusterAssignmentCache.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ClusterAssignmentCache.java
index 5d78913a6d..b3641ecfb3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ClusterAssignmentCache.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ClusterAssignmentCache.java
@@ -1,11 +1,6 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import org.apache.curator.framework.CuratorFramework;
-import org.slf4j.Logger;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry;
-import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
-import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
+import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -15,117 +10,128 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
-import static org.slf4j.LoggerFactory.getLogger;
+import org.apache.curator.framework.CuratorFramework;
+import org.slf4j.Logger;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry;
+import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
+import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
 public class ClusterAssignmentCache {
 
-    private static final Logger logger = getLogger(ClusterAssignmentCache.class);
-
-    private final ConsumerNodesRegistry consumerNodesRegistry;
-    private final WorkloadRegistryPaths paths;
-    private final ConsumerWorkloadDecoder consumerWorkloadDecoder;
-    private final String consumersPath;
-    private final ZookeeperOperations zookeeper;
-
-    private final Map<String, Set<SubscriptionName>> consumerSubscriptions = new ConcurrentHashMap<>();
-    private final Set<SubscriptionAssignment> assignments = Collections.newSetFromMap(new ConcurrentHashMap<>());
-
-    public ClusterAssignmentCache(CuratorFramework curator,
-                                  String clusterName,
-                                  ZookeeperPaths zookeeperPaths,
-                                  SubscriptionIds subscriptionIds,
-                                  ConsumerNodesRegistry consumerNodesRegistry) {
-        this.zookeeper = new ZookeeperOperations(curator);
-        this.consumerNodesRegistry = consumerNodesRegistry;
-        this.paths = new WorkloadRegistryPaths(zookeeperPaths, clusterName);
-        this.consumerWorkloadDecoder = new ConsumerWorkloadDecoder(subscriptionIds);
-        this.consumersPath = paths.consumersWorkloadCurrentClusterRuntimeBinaryPath();
-    }
-
-    public void refresh() {
-        logger.info("Refreshing consumer workload assignments");
-        List<String> currentlyAssignedConsumers = getWorkloadConsumers();
-        List<String> activeConsumers = consumerNodesRegistry.listConsumerNodes();
-
-        assignments.clear();
-        consumerSubscriptions.clear();
-
-        for (String consumer : currentlyAssignedConsumers) {
-            if (activeConsumers.contains(consumer)) {
-                Set<SubscriptionName> subscriptions = readConsumerWorkload(consumer);
-                consumerSubscriptions.put(consumer, subscriptions);
-                subscriptions.forEach(subscription -> {
-                    assignments.add(new SubscriptionAssignment(consumer, subscription));
-                });
-            } else {
-                logger.info("Deleting consumer {} from workload", consumer);
-                deleteConsumerWorkloadNode(consumer);
-            }
-        }
-    }
-
-    private Set<SubscriptionName> readConsumerWorkload(String consumer) {
-        Optional<byte[]> nodeData = zookeeper.getNodeData(paths.consumerWorkloadPath(consumer));
-        if (nodeData.isPresent()) {
-            byte[] data = nodeData.get();
-            return consumerWorkloadDecoder.decode(data);
-        } else {
-            logger.info("No workload data available for consumer {}", consumer);
-            return Collections.emptySet();
-        }
+  private static final Logger logger = getLogger(ClusterAssignmentCache.class);
+
+  private final ConsumerNodesRegistry consumerNodesRegistry;
+  private final WorkloadRegistryPaths paths;
+  private final ConsumerWorkloadDecoder consumerWorkloadDecoder;
+  private final String consumersPath;
+  private final ZookeeperOperations zookeeper;
+
+  private final Map<String, Set<SubscriptionName>> consumerSubscriptions =
+      new ConcurrentHashMap<>();
+  private final Set<SubscriptionAssignment> assignments =
+      Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+  public ClusterAssignmentCache(
+      CuratorFramework curator,
+      String clusterName,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionIds subscriptionIds,
+      ConsumerNodesRegistry consumerNodesRegistry) {
+    this.zookeeper = new ZookeeperOperations(curator);
+    this.consumerNodesRegistry = consumerNodesRegistry;
+    this.paths = new WorkloadRegistryPaths(zookeeperPaths, clusterName);
+    this.consumerWorkloadDecoder = new ConsumerWorkloadDecoder(subscriptionIds);
+    this.consumersPath = paths.consumersWorkloadCurrentClusterRuntimeBinaryPath();
+  }
+
+  public void refresh() {
+    logger.info("Refreshing consumer workload assignments");
+    List<String> currentlyAssignedConsumers = getWorkloadConsumers();
+    List<String> activeConsumers = consumerNodesRegistry.listConsumerNodes();
+
+    assignments.clear();
+    consumerSubscriptions.clear();
+
+    for (String consumer : currentlyAssignedConsumers) {
+      if (activeConsumers.contains(consumer)) {
+        Set<SubscriptionName> subscriptions = readConsumerWorkload(consumer);
+        consumerSubscriptions.put(consumer, subscriptions);
+        subscriptions.forEach(
+            subscription -> {
+              assignments.add(new SubscriptionAssignment(consumer, subscription));
+            });
+      } else {
+        logger.info("Deleting consumer {} from workload", consumer);
+        deleteConsumerWorkloadNode(consumer);
+      }
     }
-
-    private void deleteConsumerWorkloadNode(String consumer) {
-        String path = paths.consumerWorkloadPath(consumer);
-        try {
-            zookeeper.deleteNode(path);
-        } catch (Exception e) {
-            logger.warn("Could not delete consumer workload node at {}", path, e);
-        }
+  }
+
+  private Set<SubscriptionName> readConsumerWorkload(String consumer) {
+    Optional<byte[]> nodeData = zookeeper.getNodeData(paths.consumerWorkloadPath(consumer));
+    if (nodeData.isPresent()) {
+      byte[] data = nodeData.get();
+      return consumerWorkloadDecoder.decode(data);
+    } else {
+      logger.info("No workload data available for consumer {}", consumer);
+      return Collections.emptySet();
     }
-
-    private List<String> getWorkloadConsumers() {
-        try {
-            if (zookeeper.exists(consumersPath)) {
-                return zookeeper.getNodeChildren(consumersPath);
-            }
-        } catch (Exception e) {
-            logger.warn("Could not get workload consumer nodes list", e);
-        }
-        return Collections.emptyList();
+  }
+
+  private void deleteConsumerWorkloadNode(String consumer) {
+    String path = paths.consumerWorkloadPath(consumer);
+    try {
+      zookeeper.deleteNode(path);
+    } catch (Exception e) {
+      logger.warn("Could not delete consumer workload node at {}", path, e);
     }
-
-    public SubscriptionAssignmentView createSnapshot() {
-        return SubscriptionAssignmentView.of(assignments);
+  }
+
+  private List<String> getWorkloadConsumers() {
+    try {
+      if (zookeeper.exists(consumersPath)) {
+        return zookeeper.getNodeChildren(consumersPath);
+      }
+    } catch (Exception e) {
+      logger.warn("Could not get workload consumer nodes list", e);
     }
-
-    public boolean isAssignedTo(String consumerId, SubscriptionName subscription) {
-        Set<SubscriptionName> subscriptions = consumerSubscriptions.getOrDefault(consumerId, Collections.emptySet());
-        return subscriptions.contains(subscription);
-    }
-
-    public Map<SubscriptionName, Set<String>> getSubscriptionConsumers() {
-        Map<SubscriptionName, Set<String>> result = new HashMap<>();
-        consumerSubscriptions.forEach((consumer, subscriptions) -> {
-            subscriptions.forEach(subscription -> {
+    return Collections.emptyList();
+  }
+
+  public SubscriptionAssignmentView createSnapshot() {
+    return SubscriptionAssignmentView.of(assignments);
+  }
+
+  public boolean isAssignedTo(String consumerId, SubscriptionName subscription) {
+    Set<SubscriptionName> subscriptions =
+        consumerSubscriptions.getOrDefault(consumerId, Collections.emptySet());
+    return subscriptions.contains(subscription);
+  }
+
+  public Map<SubscriptionName, Set<String>> getSubscriptionConsumers() {
+    Map<SubscriptionName, Set<String>> result = new HashMap<>();
+    consumerSubscriptions.forEach(
+        (consumer, subscriptions) -> {
+          subscriptions.forEach(
+              subscription -> {
                 if (result.containsKey(subscription)) {
-                    result.get(subscription).add(consumer);
+                  result.get(subscription).add(consumer);
                 } else {
-                    HashSet<String> consumers = new HashSet<>();
-                    consumers.add(consumer);
-                    result.put(subscription, consumers);
+                  HashSet<String> consumers = new HashSet<>();
+                  consumers.add(consumer);
+                  result.put(subscription, consumers);
                 }
-            });
+              });
         });
-        return result;
-    }
+    return result;
+  }
 
-    public Set<String> getAssignedConsumers() {
-        return consumerSubscriptions.keySet();
-    }
+  public Set<String> getAssignedConsumers() {
+    return consumerSubscriptions.keySet();
+  }
 
-    public Set<SubscriptionName> getConsumerSubscriptions(String consumerId) {
-        return consumerSubscriptions.getOrDefault(consumerId, Collections.emptySet());
-    }
+  public Set<SubscriptionName> getConsumerSubscriptions(String consumerId) {
+    return consumerSubscriptions.getOrDefault(consumerId, Collections.emptySet());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerAssignmentCache.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerAssignmentCache.java
index 2a28adbb51..7b2ea7f5b0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerAssignmentCache.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerAssignmentCache.java
@@ -1,7 +1,13 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.ChildData;
 import org.apache.curator.framework.recipes.cache.NodeCache;
@@ -11,105 +17,106 @@
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
 public class ConsumerAssignmentCache implements NodeCacheListener {
 
-    private static final Logger logger = getLogger(ConsumerAssignmentCache.class);
-
-    private final WorkloadRegistryPaths paths;
-    private final String consumerId;
-    private final NodeCache workloadNodeCache;
-    private final ConsumerWorkloadDecoder consumerWorkloadDecoder;
-    private final Set<SubscriptionName> currentlyAssignedSubscriptions = Collections.newSetFromMap(new ConcurrentHashMap<>());
-    private final Set<SubscriptionAssignmentAware> callbacks = Collections.newSetFromMap(new ConcurrentHashMap<>());
-
-    public ConsumerAssignmentCache(CuratorFramework curator,
-                                   String consumerId,
-                                   String clusterName,
-                                   ZookeeperPaths zookeeperPaths,
-                                   SubscriptionIds subscriptionIds) {
-        this.paths = new WorkloadRegistryPaths(zookeeperPaths, clusterName);
-        this.consumerId = consumerId;
-
-        String path = paths.consumerWorkloadPath(consumerId);
-        this.workloadNodeCache = new NodeCache(curator, path);
-        workloadNodeCache.getListenable().addListener(this);
-
-        this.consumerWorkloadDecoder = new ConsumerWorkloadDecoder(subscriptionIds);
-    }
-
-    public void start() throws Exception {
-        try {
-            logger.info("Starting binary workload assignment cache at {}, watching current consumer path at {}",
-                    paths.consumersWorkloadCurrentClusterRuntimeBinaryPath(), paths.consumerWorkloadPath(consumerId));
-            workloadNodeCache.start(true);
-        } catch (Exception e) {
-            throw new IllegalStateException("Could not start node cache for consumer workload", e);
-        }
-        refreshConsumerWorkload();
+  private static final Logger logger = getLogger(ConsumerAssignmentCache.class);
+
+  private final WorkloadRegistryPaths paths;
+  private final String consumerId;
+  private final NodeCache workloadNodeCache;
+  private final ConsumerWorkloadDecoder consumerWorkloadDecoder;
+  private final Set<SubscriptionName> currentlyAssignedSubscriptions =
+      Collections.newSetFromMap(new ConcurrentHashMap<>());
+  private final Set<SubscriptionAssignmentAware> callbacks =
+      Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+  public ConsumerAssignmentCache(
+      CuratorFramework curator,
+      String consumerId,
+      String clusterName,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionIds subscriptionIds) {
+    this.paths = new WorkloadRegistryPaths(zookeeperPaths, clusterName);
+    this.consumerId = consumerId;
+
+    String path = paths.consumerWorkloadPath(consumerId);
+    this.workloadNodeCache = new NodeCache(curator, path);
+    workloadNodeCache.getListenable().addListener(this);
+
+    this.consumerWorkloadDecoder = new ConsumerWorkloadDecoder(subscriptionIds);
+  }
+
+  public void start() throws Exception {
+    try {
+      logger.info(
+          "Starting binary workload assignment cache at {}, watching current consumer path at {}",
+          paths.consumersWorkloadCurrentClusterRuntimeBinaryPath(),
+          paths.consumerWorkloadPath(consumerId));
+      workloadNodeCache.start(true);
+    } catch (Exception e) {
+      throw new IllegalStateException("Could not start node cache for consumer workload", e);
     }
-
-    private void refreshConsumerWorkload() {
-        ChildData nodeData = workloadNodeCache.getCurrentData();
-        if (nodeData != null) {
-            byte[] data = nodeData.getData();
-            Set<SubscriptionName> subscriptions = consumerWorkloadDecoder.decode(data);
-            updateAssignedSubscriptions(subscriptions);
-        } else {
-            logger.info("No workload data available for consumer");
-        }
+    refreshConsumerWorkload();
+  }
+
+  private void refreshConsumerWorkload() {
+    ChildData nodeData = workloadNodeCache.getCurrentData();
+    if (nodeData != null) {
+      byte[] data = nodeData.getData();
+      Set<SubscriptionName> subscriptions = consumerWorkloadDecoder.decode(data);
+      updateAssignedSubscriptions(subscriptions);
+    } else {
+      logger.info("No workload data available for consumer");
     }
-
-    private void updateAssignedSubscriptions(Set<SubscriptionName> targetAssignments) {
-        ImmutableSet<SubscriptionName> assignmentDeletions = Sets.difference(currentlyAssignedSubscriptions, targetAssignments)
-                .immutableCopy();
-        ImmutableSet<SubscriptionName> assignmentsAdditions = Sets.difference(targetAssignments, currentlyAssignedSubscriptions)
-                .immutableCopy();
-
-
-        assignmentDeletions.forEach(s -> logger.info("Assignment deletion for subscription {}", s.getQualifiedName()));
-        assignmentsAdditions.forEach(s -> logger.info("Assignment addition for subscription {}", s.getQualifiedName()));
-
-        currentlyAssignedSubscriptions.clear();
-        currentlyAssignedSubscriptions.addAll(targetAssignments);
-
-        callbacks.forEach(callback -> {
-            if (!callback.watchedConsumerId().isPresent() || callback.watchedConsumerId().get().equals(consumerId)) {
-                assignmentDeletions.forEach(callback::onAssignmentRemoved);
-                assignmentsAdditions.forEach(callback::onSubscriptionAssigned);
-            }
+  }
+
+  private void updateAssignedSubscriptions(Set<SubscriptionName> targetAssignments) {
+    ImmutableSet<SubscriptionName> assignmentDeletions =
+        Sets.difference(currentlyAssignedSubscriptions, targetAssignments).immutableCopy();
+    ImmutableSet<SubscriptionName> assignmentsAdditions =
+        Sets.difference(targetAssignments, currentlyAssignedSubscriptions).immutableCopy();
+
+    assignmentDeletions.forEach(
+        s -> logger.info("Assignment deletion for subscription {}", s.getQualifiedName()));
+    assignmentsAdditions.forEach(
+        s -> logger.info("Assignment addition for subscription {}", s.getQualifiedName()));
+
+    currentlyAssignedSubscriptions.clear();
+    currentlyAssignedSubscriptions.addAll(targetAssignments);
+
+    callbacks.forEach(
+        callback -> {
+          if (!callback.watchedConsumerId().isPresent()
+              || callback.watchedConsumerId().get().equals(consumerId)) {
+            assignmentDeletions.forEach(callback::onAssignmentRemoved);
+            assignmentsAdditions.forEach(callback::onSubscriptionAssigned);
+          }
         });
+  }
+
+  public void stop() throws Exception {
+    try {
+      logger.info("Stopping binary workload assignment cache");
+      workloadNodeCache.close();
+    } catch (IOException e) {
+      throw new RuntimeException("Could not stop node cache for consumer workload", e);
     }
+  }
 
-    public void stop() throws Exception {
-        try {
-            logger.info("Stopping binary workload assignment cache");
-            workloadNodeCache.close();
-        } catch (IOException e) {
-            throw new RuntimeException("Could not stop node cache for consumer workload", e);
-        }
-    }
+  public boolean isAssignedTo(SubscriptionName subscription) {
+    return currentlyAssignedSubscriptions.contains(subscription);
+  }
 
-    public boolean isAssignedTo(SubscriptionName subscription) {
-        return currentlyAssignedSubscriptions.contains(subscription);
-    }
+  public void registerAssignmentCallback(SubscriptionAssignmentAware callback) {
+    callbacks.add(callback);
+  }
 
-    public void registerAssignmentCallback(SubscriptionAssignmentAware callback) {
-        callbacks.add(callback);
-    }
+  public Set<SubscriptionName> getConsumerSubscriptions() {
+    return ImmutableSet.copyOf(currentlyAssignedSubscriptions);
+  }
 
-    public Set<SubscriptionName> getConsumerSubscriptions() {
-        return ImmutableSet.copyOf(currentlyAssignedSubscriptions);
-    }
-
-    @Override
-    public void nodeChanged() {
-        refreshConsumerWorkload();
-    }
+  @Override
+  public void nodeChanged() {
+    refreshConsumerWorkload();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerAssignmentRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerAssignmentRegistry.java
index e179e30e40..34475cb806 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerAssignmentRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerAssignmentRegistry.java
@@ -1,40 +1,41 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.util.Set;
 import org.apache.curator.framework.CuratorFramework;
 import org.slf4j.Logger;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.util.Set;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
 public class ConsumerAssignmentRegistry {
-    private static final Logger logger = getLogger(ConsumerAssignmentRegistry.class);
-
-    private final ZookeeperOperations zookeeper;
-    private final ConsumerWorkloadEncoder consumerAssignmentsEncoder;
-    private final WorkloadRegistryPaths paths;
-
-    public ConsumerAssignmentRegistry(CuratorFramework curator,
-                                      int assignmentsEncoderBufferSize,
-                                      String clusterName,
-                                      ZookeeperPaths zookeeperPaths,
-                                      SubscriptionIds subscriptionIds) {
-        this.zookeeper = new ZookeeperOperations(curator);
-        this.consumerAssignmentsEncoder = new ConsumerWorkloadEncoder(subscriptionIds, assignmentsEncoderBufferSize);
-
-        this.paths = new WorkloadRegistryPaths(zookeeperPaths, clusterName);
-    }
-
-    public void updateAssignments(String consumerNode, Set<SubscriptionName> subscriptions) {
-        byte[] encoded = consumerAssignmentsEncoder.encode(subscriptions);
-        try {
-            String path = paths.consumerWorkloadPath(consumerNode);
-            zookeeper.writeOrCreatePersistent(path, encoded);
-        } catch (Exception e) {
-            logger.error("Could not write consumer workload for {}", consumerNode);
-        }
+  private static final Logger logger = getLogger(ConsumerAssignmentRegistry.class);
+
+  private final ZookeeperOperations zookeeper;
+  private final ConsumerWorkloadEncoder consumerAssignmentsEncoder;
+  private final WorkloadRegistryPaths paths;
+
+  public ConsumerAssignmentRegistry(
+      CuratorFramework curator,
+      int assignmentsEncoderBufferSize,
+      String clusterName,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionIds subscriptionIds) {
+    this.zookeeper = new ZookeeperOperations(curator);
+    this.consumerAssignmentsEncoder =
+        new ConsumerWorkloadEncoder(subscriptionIds, assignmentsEncoderBufferSize);
+
+    this.paths = new WorkloadRegistryPaths(zookeeperPaths, clusterName);
+  }
+
+  public void updateAssignments(String consumerNode, Set<SubscriptionName> subscriptions) {
+    byte[] encoded = consumerAssignmentsEncoder.encode(subscriptions);
+    try {
+      String path = paths.consumerWorkloadPath(consumerNode);
+      zookeeper.writeOrCreatePersistent(path, encoded);
+    } catch (Exception e) {
+      logger.error("Could not write consumer workload for {}", consumerNode);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerWorkloadDecoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerWorkloadDecoder.java
index 59c7de54ff..87265af541 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerWorkloadDecoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerWorkloadDecoder.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import org.agrona.concurrent.UnsafeBuffer;
 import org.slf4j.Logger;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -8,46 +13,45 @@
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.AssignmentsDecoder;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.MessageHeaderDecoder;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+class ConsumerWorkloadDecoder {
 
-import static org.slf4j.LoggerFactory.getLogger;
+  private static final Logger logger = getLogger(ConsumerWorkloadDecoder.class);
 
-class ConsumerWorkloadDecoder {
+  private final SubscriptionIds subscriptionIds;
 
-    private static final Logger logger = getLogger(ConsumerWorkloadDecoder.class);
+  ConsumerWorkloadDecoder(SubscriptionIds subscriptionIds) {
+    this.subscriptionIds = subscriptionIds;
+  }
 
-    private final SubscriptionIds subscriptionIds;
+  Set<SubscriptionName> decode(byte[] data) {
+    MessageHeaderDecoder header = new MessageHeaderDecoder();
+    AssignmentsDecoder body = new AssignmentsDecoder();
 
-    ConsumerWorkloadDecoder(SubscriptionIds subscriptionIds) {
-        this.subscriptionIds = subscriptionIds;
-    }
+    UnsafeBuffer buffer = new UnsafeBuffer(data);
+    header.wrap(buffer, 0);
 
-    Set<SubscriptionName> decode(byte[] data) {
-        MessageHeaderDecoder header = new MessageHeaderDecoder();
-        AssignmentsDecoder body = new AssignmentsDecoder();
-
-        UnsafeBuffer buffer = new UnsafeBuffer(data);
-        header.wrap(buffer, 0);
-
-        if (header.schemaId() != AssignmentsDecoder.SCHEMA_ID || header.templateId() != AssignmentsDecoder.TEMPLATE_ID) {
-            logger.warn("Unable to decode assignments, schema or template id mismatch. "
-                            + "Required by decoder: [schema id={}, template id={}], "
-                            + "encoded in payload: [schema id={}, template id={}]",
-                    AssignmentsDecoder.SCHEMA_ID, AssignmentsDecoder.TEMPLATE_ID,
-                    header.schemaId(), header.templateId());
-            return Collections.emptySet();
-        }
-        body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
-
-        Set<SubscriptionName> subscriptions = new HashSet<>();
-        for (AssignmentsDecoder.SubscriptionsDecoder subscriptionDecoder : body.subscriptions()) {
-            long id = subscriptionDecoder.id();
-            subscriptionIds.getSubscriptionId(id)
-                    .map(SubscriptionId::getSubscriptionName)
-                    .ifPresent(subscriptions::add);
-        }
-        return subscriptions;
+    if (header.schemaId() != AssignmentsDecoder.SCHEMA_ID
+        || header.templateId() != AssignmentsDecoder.TEMPLATE_ID) {
+      logger.warn(
+          "Unable to decode assignments, schema or template id mismatch. "
+              + "Required by decoder: [schema id={}, template id={}], "
+              + "encoded in payload: [schema id={}, template id={}]",
+          AssignmentsDecoder.SCHEMA_ID,
+          AssignmentsDecoder.TEMPLATE_ID,
+          header.schemaId(),
+          header.templateId());
+      return Collections.emptySet();
+    }
+    body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
+
+    Set<SubscriptionName> subscriptions = new HashSet<>();
+    for (AssignmentsDecoder.SubscriptionsDecoder subscriptionDecoder : body.subscriptions()) {
+      long id = subscriptionDecoder.id();
+      subscriptionIds
+          .getSubscriptionId(id)
+          .map(SubscriptionId::getSubscriptionName)
+          .ifPresent(subscriptions::add);
     }
+    return subscriptions;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerWorkloadEncoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerWorkloadEncoder.java
index d63e089a4b..4de977276f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerWorkloadEncoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerWorkloadEncoder.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 import org.agrona.ExpandableDirectByteBuffer;
 import org.agrona.MutableDirectBuffer;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -8,40 +12,35 @@
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.AssignmentsEncoder;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.MessageHeaderEncoder;
 
-import java.util.Collection;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 class ConsumerWorkloadEncoder {
 
-    private final SubscriptionIds subscriptionIds;
-    private final MutableDirectBuffer buffer;
+  private final SubscriptionIds subscriptionIds;
+  private final MutableDirectBuffer buffer;
 
-    ConsumerWorkloadEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
-        this.subscriptionIds = subscriptionIds;
-        this.buffer = new ExpandableDirectByteBuffer(bufferSize);
-    }
+  ConsumerWorkloadEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
+    this.subscriptionIds = subscriptionIds;
+    this.buffer = new ExpandableDirectByteBuffer(bufferSize);
+  }
 
-    byte[] encode(Collection<SubscriptionName> subscriptions) {
-        MessageHeaderEncoder headerEncoder = new MessageHeaderEncoder();
-        AssignmentsEncoder body = new AssignmentsEncoder();
+  byte[] encode(Collection<SubscriptionName> subscriptions) {
+    MessageHeaderEncoder headerEncoder = new MessageHeaderEncoder();
+    AssignmentsEncoder body = new AssignmentsEncoder();
 
-        Set<SubscriptionId> ids = subscriptions.stream()
-                .map(this.subscriptionIds::getSubscriptionId)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.toSet());
+    Set<SubscriptionId> ids =
+        subscriptions.stream()
+            .map(this.subscriptionIds::getSubscriptionId)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .collect(Collectors.toSet());
 
-        AssignmentsEncoder.SubscriptionsEncoder subscriptionsEncoder = body.wrapAndApplyHeader(buffer, 0, headerEncoder)
-                .subscriptionsCount(ids.size());
-        ids.forEach(id -> subscriptionsEncoder.next()
-                .id(id.getValue()));
+    AssignmentsEncoder.SubscriptionsEncoder subscriptionsEncoder =
+        body.wrapAndApplyHeader(buffer, 0, headerEncoder).subscriptionsCount(ids.size());
+    ids.forEach(id -> subscriptionsEncoder.next().id(id.getValue()));
 
-        int len = headerEncoder.encodedLength() + body.encodedLength();
+    int len = headerEncoder.encodedLength() + body.encodedLength();
 
-        byte[] dst = new byte[len];
-        buffer.getBytes(0, dst);
-        return dst;
-    }
+    byte[] dst = new byte[len];
+    buffer.getBytes(0, dst);
+    return dst;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/NoOpBalancingListener.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/NoOpBalancingListener.java
index 6c4b08f0fc..e252bb228a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/NoOpBalancingListener.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/NoOpBalancingListener.java
@@ -4,18 +4,12 @@
 
 public class NoOpBalancingListener implements BalancingListener {
 
-    @Override
-    public void onBeforeBalancing(List<String> activeConsumers) {
+  @Override
+  public void onBeforeBalancing(List<String> activeConsumers) {}
 
-    }
+  @Override
+  public void onAfterBalancing(WorkDistributionChanges changes) {}
 
-    @Override
-    public void onAfterBalancing(WorkDistributionChanges changes) {
-
-    }
-
-    @Override
-    public void onBalancingSkipped() {
-
-    }
+  @Override
+  public void onBalancingSkipped() {}
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignment.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignment.java
index 96f8626c01..dd684180a8 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignment.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignment.java
@@ -1,41 +1,40 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Objects;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class SubscriptionAssignment {
-    private final String consumerNodeId;
-    private final SubscriptionName subscriptionName;
-
-    public SubscriptionAssignment(String consumerNodeId, SubscriptionName subscriptionName) {
-        this.consumerNodeId = consumerNodeId;
-        this.subscriptionName = subscriptionName;
-    }
-
-    public String getConsumerNodeId() {
-        return consumerNodeId;
+  private final String consumerNodeId;
+  private final SubscriptionName subscriptionName;
+
+  public SubscriptionAssignment(String consumerNodeId, SubscriptionName subscriptionName) {
+    this.consumerNodeId = consumerNodeId;
+    this.subscriptionName = subscriptionName;
+  }
+
+  public String getConsumerNodeId() {
+    return consumerNodeId;
+  }
+
+  public SubscriptionName getSubscriptionName() {
+    return subscriptionName;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    public SubscriptionName getSubscriptionName() {
-        return subscriptionName;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionAssignment that = (SubscriptionAssignment) o;
-        return Objects.equals(consumerNodeId, that.consumerNodeId)
-                && Objects.equals(subscriptionName, that.subscriptionName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(consumerNodeId, subscriptionName);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SubscriptionAssignment that = (SubscriptionAssignment) o;
+    return Objects.equals(consumerNodeId, that.consumerNodeId)
+        && Objects.equals(subscriptionName, that.subscriptionName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(consumerNodeId, subscriptionName);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentAware.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentAware.java
index a53c618075..0e069c8232 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentAware.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentAware.java
@@ -1,13 +1,12 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Optional;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public interface SubscriptionAssignmentAware {
-    default void onSubscriptionAssigned(SubscriptionName subscriptionName) {}
+  default void onSubscriptionAssigned(SubscriptionName subscriptionName) {}
 
-    default void onAssignmentRemoved(SubscriptionName subscriptionName) {}
+  default void onAssignmentRemoved(SubscriptionName subscriptionName) {}
 
-    Optional<String> watchedConsumerId();
+  Optional<String> watchedConsumerId();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentView.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentView.java
index 098aa2b677..229bafc4dc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentView.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentView.java
@@ -1,8 +1,9 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import com.google.common.collect.Sets;
-import pl.allegro.tech.hermes.api.SubscriptionName;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
 
+import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -11,229 +12,251 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
-
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class SubscriptionAssignmentView {
 
-    private final Map<SubscriptionName, Set<SubscriptionAssignment>> subscriptionAssignments;
-    private final Map<String, Set<SubscriptionAssignment>> consumerNodeAssignments;
-
-    public SubscriptionAssignmentView(Map<SubscriptionName, Set<SubscriptionAssignment>> view) {
-        this.subscriptionAssignments = setupSubscriptionAssignments(view);
-        this.consumerNodeAssignments = setupConsumerNodeAssignments(view);
-    }
-
-    private Map<SubscriptionName, Set<SubscriptionAssignment>> setupSubscriptionAssignments(
-            Map<SubscriptionName, Set<SubscriptionAssignment>> view
-    ) {
-        Map<SubscriptionName, Set<SubscriptionAssignment>> map = new HashMap<>();
-        view.entrySet().forEach(entry -> map.put(entry.getKey(), new HashSet<>(entry.getValue())));
-        return map;
-    }
-
-    private Map<String, Set<SubscriptionAssignment>> setupConsumerNodeAssignments(Map<SubscriptionName, Set<SubscriptionAssignment>> view) {
-        Map<String, Set<SubscriptionAssignment>> map = new HashMap<>();
-        view.values().stream().flatMap(Set::stream).forEach(assignment -> {
-            if (!map.containsKey(assignment.getConsumerNodeId())) {
+  private final Map<SubscriptionName, Set<SubscriptionAssignment>> subscriptionAssignments;
+  private final Map<String, Set<SubscriptionAssignment>> consumerNodeAssignments;
+
+  public SubscriptionAssignmentView(Map<SubscriptionName, Set<SubscriptionAssignment>> view) {
+    this.subscriptionAssignments = setupSubscriptionAssignments(view);
+    this.consumerNodeAssignments = setupConsumerNodeAssignments(view);
+  }
+
+  private Map<SubscriptionName, Set<SubscriptionAssignment>> setupSubscriptionAssignments(
+      Map<SubscriptionName, Set<SubscriptionAssignment>> view) {
+    Map<SubscriptionName, Set<SubscriptionAssignment>> map = new HashMap<>();
+    view.entrySet().forEach(entry -> map.put(entry.getKey(), new HashSet<>(entry.getValue())));
+    return map;
+  }
+
+  private Map<String, Set<SubscriptionAssignment>> setupConsumerNodeAssignments(
+      Map<SubscriptionName, Set<SubscriptionAssignment>> view) {
+    Map<String, Set<SubscriptionAssignment>> map = new HashMap<>();
+    view.values().stream()
+        .flatMap(Set::stream)
+        .forEach(
+            assignment -> {
+              if (!map.containsKey(assignment.getConsumerNodeId())) {
                 map.put(assignment.getConsumerNodeId(), new HashSet<>());
-            }
-            map.get(assignment.getConsumerNodeId()).add(assignment);
-        });
-        return map;
-    }
-
-    public Set<SubscriptionName> getSubscriptions() {
-        return subscriptionAssignments.keySet();
-    }
-
-    public int getSubscriptionsCount() {
-        return subscriptionAssignments.size();
-    }
-
-    public Set<String> getConsumerNodes() {
-        return consumerNodeAssignments.keySet();
-    }
-
-    public List<SubscriptionAssignment> getAllAssignments() {
-        return subscriptionAssignments.values().stream().flatMap(Set::stream).collect(toList());
-    }
-
-    public Set<String> getConsumerNodesForSubscription(SubscriptionName subscriptionName) {
-        return getAssignmentsForSubscription(subscriptionName).stream().map(SubscriptionAssignment::getConsumerNodeId).collect(toSet());
-    }
-
-    public Set<SubscriptionAssignment> getAssignmentsForSubscription(SubscriptionName subscriptionName) {
-        return Collections.unmodifiableSet(subscriptionAssignments.getOrDefault(subscriptionName, Collections.emptySet()));
-    }
-
-    public Set<SubscriptionName> getSubscriptionsForConsumerNode(String nodeId) {
-        return getAssignmentsForConsumerNode(nodeId).stream().map(SubscriptionAssignment::getSubscriptionName).collect(toSet());
-    }
-
-    public Set<SubscriptionAssignment> getAssignmentsForConsumerNode(String nodeId) {
-        return Collections.unmodifiableSet(consumerNodeAssignments.getOrDefault(nodeId, Collections.emptySet()));
-    }
-
-    private void removeSubscription(SubscriptionName subscription) {
-        consumerNodeAssignments.values()
-                .forEach(assignments -> assignments.removeIf(assignment -> assignment.getSubscriptionName().equals(subscription)));
-        subscriptionAssignments.remove(subscription);
-    }
-
-    private void removeConsumerNode(String nodeId) {
-        subscriptionAssignments.values()
-                .forEach(assignments -> assignments.removeIf(assignment -> assignment.getConsumerNodeId().equals(nodeId)));
-        consumerNodeAssignments.remove(nodeId);
-    }
-
-    private void addSubscription(SubscriptionName subscriptionName) {
-        subscriptionAssignments.putIfAbsent(subscriptionName, new HashSet<>());
-    }
-
-    private void addConsumerNode(String nodeId) {
-        consumerNodeAssignments.putIfAbsent(nodeId, new HashSet<>());
-    }
-
-    private void addAssignment(SubscriptionAssignment assignment) {
-        subscriptionAssignments.get(assignment.getSubscriptionName()).add(assignment);
-        if (!consumerNodeAssignments.containsKey(assignment.getConsumerNodeId())) {
-            addConsumerNode(assignment.getConsumerNodeId());
-        }
-        consumerNodeAssignments.get(assignment.getConsumerNodeId()).add(assignment);
-    }
-
-    private void removeAssignment(SubscriptionAssignment assignment) {
-        subscriptionAssignments.get(assignment.getSubscriptionName()).remove(assignment);
-        consumerNodeAssignments.get(assignment.getConsumerNodeId()).remove(assignment);
-    }
-
-    private void transferAssignment(String from, String to, SubscriptionName subscriptionName) {
-        removeAssignment(new SubscriptionAssignment(from, subscriptionName));
-        addAssignment(new SubscriptionAssignment(to, subscriptionName));
-    }
-
-    public SubscriptionAssignmentView deletions(SubscriptionAssignmentView target) {
-        return difference(this, target);
-    }
-
-    public SubscriptionAssignmentView additions(SubscriptionAssignmentView target) {
-        return difference(target, this);
-    }
-
-    private static SubscriptionAssignmentView difference(SubscriptionAssignmentView first, SubscriptionAssignmentView second) {
-        HashMap<SubscriptionName, Set<SubscriptionAssignment>> result = new HashMap<>();
-        for (SubscriptionName subscription : first.getSubscriptions()) {
-            Set<SubscriptionAssignment> assignments = first.getAssignmentsForSubscription(subscription);
-            if (!second.getSubscriptions().contains(subscription)) {
-                result.put(subscription, assignments);
-            } else {
-                Sets.SetView<SubscriptionAssignment> difference =
-                        Sets.difference(assignments, second.getAssignmentsForSubscription(subscription));
-                if (!difference.isEmpty()) {
-                    result.put(subscription, difference);
-                }
-            }
-        }
-        return new SubscriptionAssignmentView(result);
-    }
-
-    public static SubscriptionAssignmentView of(Set<SubscriptionAssignment> assignments) {
-        Map<SubscriptionName, Set<SubscriptionAssignment>> snapshot = new HashMap<>();
-        for (SubscriptionAssignment assignment : assignments) {
-            snapshot.compute(assignment.getSubscriptionName(), (k, v) -> {
-                v = (v == null ? new HashSet<>() : v);
-                v.add(assignment);
-                return v;
+              }
+              map.get(assignment.getConsumerNodeId()).add(assignment);
             });
-        }
-        return new SubscriptionAssignmentView(snapshot);
+    return map;
+  }
+
+  public Set<SubscriptionName> getSubscriptions() {
+    return subscriptionAssignments.keySet();
+  }
+
+  public int getSubscriptionsCount() {
+    return subscriptionAssignments.size();
+  }
+
+  public Set<String> getConsumerNodes() {
+    return consumerNodeAssignments.keySet();
+  }
+
+  public List<SubscriptionAssignment> getAllAssignments() {
+    return subscriptionAssignments.values().stream().flatMap(Set::stream).collect(toList());
+  }
+
+  public Set<String> getConsumerNodesForSubscription(SubscriptionName subscriptionName) {
+    return getAssignmentsForSubscription(subscriptionName).stream()
+        .map(SubscriptionAssignment::getConsumerNodeId)
+        .collect(toSet());
+  }
+
+  public Set<SubscriptionAssignment> getAssignmentsForSubscription(
+      SubscriptionName subscriptionName) {
+    return Collections.unmodifiableSet(
+        subscriptionAssignments.getOrDefault(subscriptionName, Collections.emptySet()));
+  }
+
+  public Set<SubscriptionName> getSubscriptionsForConsumerNode(String nodeId) {
+    return getAssignmentsForConsumerNode(nodeId).stream()
+        .map(SubscriptionAssignment::getSubscriptionName)
+        .collect(toSet());
+  }
+
+  public Set<SubscriptionAssignment> getAssignmentsForConsumerNode(String nodeId) {
+    return Collections.unmodifiableSet(
+        consumerNodeAssignments.getOrDefault(nodeId, Collections.emptySet()));
+  }
+
+  private void removeSubscription(SubscriptionName subscription) {
+    consumerNodeAssignments
+        .values()
+        .forEach(
+            assignments ->
+                assignments.removeIf(
+                    assignment -> assignment.getSubscriptionName().equals(subscription)));
+    subscriptionAssignments.remove(subscription);
+  }
+
+  private void removeConsumerNode(String nodeId) {
+    subscriptionAssignments
+        .values()
+        .forEach(
+            assignments ->
+                assignments.removeIf(assignment -> assignment.getConsumerNodeId().equals(nodeId)));
+    consumerNodeAssignments.remove(nodeId);
+  }
+
+  private void addSubscription(SubscriptionName subscriptionName) {
+    subscriptionAssignments.putIfAbsent(subscriptionName, new HashSet<>());
+  }
+
+  private void addConsumerNode(String nodeId) {
+    consumerNodeAssignments.putIfAbsent(nodeId, new HashSet<>());
+  }
+
+  private void addAssignment(SubscriptionAssignment assignment) {
+    subscriptionAssignments.get(assignment.getSubscriptionName()).add(assignment);
+    if (!consumerNodeAssignments.containsKey(assignment.getConsumerNodeId())) {
+      addConsumerNode(assignment.getConsumerNodeId());
     }
-
-    public static SubscriptionAssignmentView copyOf(SubscriptionAssignmentView currentState) {
-        return new SubscriptionAssignmentView(currentState.subscriptionAssignments);
+    consumerNodeAssignments.get(assignment.getConsumerNodeId()).add(assignment);
+  }
+
+  private void removeAssignment(SubscriptionAssignment assignment) {
+    subscriptionAssignments.get(assignment.getSubscriptionName()).remove(assignment);
+    consumerNodeAssignments.get(assignment.getConsumerNodeId()).remove(assignment);
+  }
+
+  private void transferAssignment(String from, String to, SubscriptionName subscriptionName) {
+    removeAssignment(new SubscriptionAssignment(from, subscriptionName));
+    addAssignment(new SubscriptionAssignment(to, subscriptionName));
+  }
+
+  public SubscriptionAssignmentView deletions(SubscriptionAssignmentView target) {
+    return difference(this, target);
+  }
+
+  public SubscriptionAssignmentView additions(SubscriptionAssignmentView target) {
+    return difference(target, this);
+  }
+
+  private static SubscriptionAssignmentView difference(
+      SubscriptionAssignmentView first, SubscriptionAssignmentView second) {
+    HashMap<SubscriptionName, Set<SubscriptionAssignment>> result = new HashMap<>();
+    for (SubscriptionName subscription : first.getSubscriptions()) {
+      Set<SubscriptionAssignment> assignments = first.getAssignmentsForSubscription(subscription);
+      if (!second.getSubscriptions().contains(subscription)) {
+        result.put(subscription, assignments);
+      } else {
+        Sets.SetView<SubscriptionAssignment> difference =
+            Sets.difference(assignments, second.getAssignmentsForSubscription(subscription));
+        if (!difference.isEmpty()) {
+          result.put(subscription, difference);
+        }
+      }
     }
-
-    public int getAssignmentsCountForSubscription(SubscriptionName subscription) {
-        return subscriptionAssignments.get(subscription).size();
+    return new SubscriptionAssignmentView(result);
+  }
+
+  public static SubscriptionAssignmentView of(Set<SubscriptionAssignment> assignments) {
+    Map<SubscriptionName, Set<SubscriptionAssignment>> snapshot = new HashMap<>();
+    for (SubscriptionAssignment assignment : assignments) {
+      snapshot.compute(
+          assignment.getSubscriptionName(),
+          (k, v) -> {
+            v = (v == null ? new HashSet<>() : v);
+            v.add(assignment);
+            return v;
+          });
     }
-
-    public int getAssignmentsCountForConsumerNode(String nodeId) {
-        return consumerNodeAssignments.get(nodeId).size();
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(subscriptionAssignments);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionAssignmentView that = (SubscriptionAssignmentView) o;
-        return Objects.equals(subscriptionAssignments, that.subscriptionAssignments);
+    return new SubscriptionAssignmentView(snapshot);
+  }
+
+  public static SubscriptionAssignmentView copyOf(SubscriptionAssignmentView currentState) {
+    return new SubscriptionAssignmentView(currentState.subscriptionAssignments);
+  }
+
+  public int getAssignmentsCountForSubscription(SubscriptionName subscription) {
+    return subscriptionAssignments.get(subscription).size();
+  }
+
+  public int getAssignmentsCountForConsumerNode(String nodeId) {
+    return consumerNodeAssignments.get(nodeId).size();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(subscriptionAssignments);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    public interface Transformer {
-        void removeSubscription(SubscriptionName subscriptionName);
-
-        void removeConsumerNode(String nodeId);
-
-        void addSubscription(SubscriptionName subscriptionName);
-
-        void addConsumerNode(String nodeId);
-
-        void addAssignment(SubscriptionAssignment assignment);
-
-        void removeAssignment(SubscriptionAssignment assignment);
-
-        void transferAssignment(String from, String to, SubscriptionName subscriptionName);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
-
-    public SubscriptionAssignmentView transform(BiConsumer<SubscriptionAssignmentView, Transformer> consumer) {
-        SubscriptionAssignmentView view = SubscriptionAssignmentView.copyOf(this);
-        consumer.accept(view, new Transformer() {
-            @Override
-            public void removeSubscription(SubscriptionName subscriptionName) {
-                view.removeSubscription(subscriptionName);
-            }
-
-            @Override
-            public void removeConsumerNode(String nodeId) {
-                view.removeConsumerNode(nodeId);
-            }
-
-            @Override
-            public void addSubscription(SubscriptionName subscriptionName) {
-                view.addSubscription(subscriptionName);
-            }
-
-            @Override
-            public void addConsumerNode(String nodeId) {
-                view.addConsumerNode(nodeId);
-            }
-
-            @Override
-            public void addAssignment(SubscriptionAssignment assignment) {
-                view.addAssignment(assignment);
-            }
-
-            @Override
-            public void removeAssignment(SubscriptionAssignment assignment) {
-                view.removeAssignment(assignment);
-            }
-
-            @Override
-            public void transferAssignment(String from, String to, SubscriptionName subscriptionName) {
-                view.transferAssignment(from, to, subscriptionName);
-            }
+    SubscriptionAssignmentView that = (SubscriptionAssignmentView) o;
+    return Objects.equals(subscriptionAssignments, that.subscriptionAssignments);
+  }
+
+  public interface Transformer {
+    void removeSubscription(SubscriptionName subscriptionName);
+
+    void removeConsumerNode(String nodeId);
+
+    void addSubscription(SubscriptionName subscriptionName);
+
+    void addConsumerNode(String nodeId);
+
+    void addAssignment(SubscriptionAssignment assignment);
+
+    void removeAssignment(SubscriptionAssignment assignment);
+
+    void transferAssignment(String from, String to, SubscriptionName subscriptionName);
+  }
+
+  public SubscriptionAssignmentView transform(
+      BiConsumer<SubscriptionAssignmentView, Transformer> consumer) {
+    SubscriptionAssignmentView view = SubscriptionAssignmentView.copyOf(this);
+    consumer.accept(
+        view,
+        new Transformer() {
+          @Override
+          public void removeSubscription(SubscriptionName subscriptionName) {
+            view.removeSubscription(subscriptionName);
+          }
+
+          @Override
+          public void removeConsumerNode(String nodeId) {
+            view.removeConsumerNode(nodeId);
+          }
+
+          @Override
+          public void addSubscription(SubscriptionName subscriptionName) {
+            view.addSubscription(subscriptionName);
+          }
+
+          @Override
+          public void addConsumerNode(String nodeId) {
+            view.addConsumerNode(nodeId);
+          }
+
+          @Override
+          public void addAssignment(SubscriptionAssignment assignment) {
+            view.addAssignment(assignment);
+          }
+
+          @Override
+          public void removeAssignment(SubscriptionAssignment assignment) {
+            view.removeAssignment(assignment);
+          }
+
+          @Override
+          public void transferAssignment(
+              String from, String to, SubscriptionName subscriptionName) {
+            view.transferAssignment(from, to, subscriptionName);
+          }
         });
-        return copyOf(view);
-    }
+    return copyOf(view);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancer.java
index b8a73af77b..5e8555c0e1 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancer.java
@@ -1,13 +1,13 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.List;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public interface WorkBalancer {
 
-    WorkBalancingResult balance(List<SubscriptionName> subscriptions,
-                                List<String> activeConsumerNodes,
-                                SubscriptionAssignmentView currentState,
-                                WorkloadConstraints constraints);
+  WorkBalancingResult balance(
+      List<SubscriptionName> subscriptions,
+      List<String> activeConsumerNodes,
+      SubscriptionAssignmentView currentState,
+      WorkloadConstraints constraints);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancingParameters.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancingParameters.java
index 0e42c7ab4e..0186a5b779 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancingParameters.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancingParameters.java
@@ -4,11 +4,11 @@
 
 public interface WorkBalancingParameters {
 
-    Duration getRebalanceInterval();
+  Duration getRebalanceInterval();
 
-    int getConsumersPerSubscription();
+  int getConsumersPerSubscription();
 
-    int getMaxSubscriptionsPerConsumer();
+  int getMaxSubscriptionsPerConsumer();
 
-    boolean isAutoRebalance();
+  boolean isAutoRebalance();
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancingResult.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancingResult.java
index 563bdf2c6a..5753192f37 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancingResult.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkBalancingResult.java
@@ -2,19 +2,19 @@
 
 public class WorkBalancingResult {
 
-    private final SubscriptionAssignmentView state;
-    private final int missingResources;
+  private final SubscriptionAssignmentView state;
+  private final int missingResources;
 
-    public WorkBalancingResult(SubscriptionAssignmentView balancedState, int missingResources) {
-        this.state = balancedState;
-        this.missingResources = missingResources;
-    }
+  public WorkBalancingResult(SubscriptionAssignmentView balancedState, int missingResources) {
+    this.state = balancedState;
+    this.missingResources = missingResources;
+  }
 
-    public SubscriptionAssignmentView getAssignmentsView() {
-        return state;
-    }
+  public SubscriptionAssignmentView getAssignmentsView() {
+    return state;
+  }
 
-    public int getMissingResources() {
-        return missingResources;
-    }
+  public int getMissingResources() {
+    return missingResources;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkDistributionChanges.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkDistributionChanges.java
index b0f90b57bf..ea28327d46 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkDistributionChanges.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkDistributionChanges.java
@@ -1,44 +1,41 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import com.google.common.collect.Sets;
-import pl.allegro.tech.hermes.api.SubscriptionName;
+import static java.util.stream.Collectors.toSet;
 
+import com.google.common.collect.Sets;
 import java.util.Set;
 import java.util.stream.Stream;
-
-import static java.util.stream.Collectors.toSet;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class WorkDistributionChanges {
 
-    private final SubscriptionAssignmentView deletions;
-    private final SubscriptionAssignmentView additions;
-    private final Set<String> modifiedConsumerNodes;
-
-    WorkDistributionChanges(SubscriptionAssignmentView deletions, SubscriptionAssignmentView additions) {
-        this.deletions = deletions;
-        this.additions = additions;
-        this.modifiedConsumerNodes = Sets.union(
-                deletions.getConsumerNodes(),
-                additions.getConsumerNodes()
-        );
-    }
-
-    int getDeletedAssignmentsCount() {
-        return deletions.getAllAssignments().size();
-    }
-
-    int getCreatedAssignmentsCount() {
-        return additions.getAllAssignments().size();
-    }
-
-    Set<String> getModifiedConsumerNodes() {
-        return modifiedConsumerNodes;
-    }
-
-    public Set<SubscriptionName> getRebalancedSubscriptions() {
-        return Stream.concat(
-                additions.getSubscriptions().stream(),
-                deletions.getSubscriptions().stream()
-        ).collect(toSet());
-    }
+  private final SubscriptionAssignmentView deletions;
+  private final SubscriptionAssignmentView additions;
+  private final Set<String> modifiedConsumerNodes;
+
+  WorkDistributionChanges(
+      SubscriptionAssignmentView deletions, SubscriptionAssignmentView additions) {
+    this.deletions = deletions;
+    this.additions = additions;
+    this.modifiedConsumerNodes =
+        Sets.union(deletions.getConsumerNodes(), additions.getConsumerNodes());
+  }
+
+  int getDeletedAssignmentsCount() {
+    return deletions.getAllAssignments().size();
+  }
+
+  int getCreatedAssignmentsCount() {
+    return additions.getAllAssignments().size();
+  }
+
+  Set<String> getModifiedConsumerNodes() {
+    return modifiedConsumerNodes;
+  }
+
+  public Set<SubscriptionName> getRebalancedSubscriptions() {
+    return Stream.concat(
+            additions.getSubscriptions().stream(), deletions.getSubscriptions().stream())
+        .collect(toSet());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadConstraints.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadConstraints.java
index d34b1ae046..f0a82bf9ea 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadConstraints.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadConstraints.java
@@ -1,93 +1,94 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import pl.allegro.tech.hermes.api.Constraints;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.api.TopicName;
+import static java.util.Collections.emptyMap;
 
 import java.util.HashMap;
 import java.util.Map;
-
-import static java.util.Collections.emptyMap;
+import pl.allegro.tech.hermes.api.Constraints;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public class WorkloadConstraints {
 
-    private final int activeConsumerCount;
-    private final int consumersPerSubscription;
-    private final int maxSubscriptionsPerConsumer;
-    private final Map<SubscriptionName, Constraints> subscriptionConstraints;
-    private final Map<TopicName, Constraints> topicConstraints;
-
-    private WorkloadConstraints(int activeConsumerCount,
-                               int consumersPerSubscription,
-                               int maxSubscriptionsPerConsumer,
-                               Map<SubscriptionName, Constraints> subscriptionConstraints,
-                               Map<TopicName, Constraints> topicConstraints) {
-        this.activeConsumerCount = activeConsumerCount;
-        this.consumersPerSubscription = consumersPerSubscription;
-        this.maxSubscriptionsPerConsumer = maxSubscriptionsPerConsumer;
-        this.subscriptionConstraints = subscriptionConstraints != null ? subscriptionConstraints : emptyMap();
-        this.topicConstraints = topicConstraints != null ? topicConstraints : emptyMap();
+  private final int activeConsumerCount;
+  private final int consumersPerSubscription;
+  private final int maxSubscriptionsPerConsumer;
+  private final Map<SubscriptionName, Constraints> subscriptionConstraints;
+  private final Map<TopicName, Constraints> topicConstraints;
+
+  private WorkloadConstraints(
+      int activeConsumerCount,
+      int consumersPerSubscription,
+      int maxSubscriptionsPerConsumer,
+      Map<SubscriptionName, Constraints> subscriptionConstraints,
+      Map<TopicName, Constraints> topicConstraints) {
+    this.activeConsumerCount = activeConsumerCount;
+    this.consumersPerSubscription = consumersPerSubscription;
+    this.maxSubscriptionsPerConsumer = maxSubscriptionsPerConsumer;
+    this.subscriptionConstraints =
+        subscriptionConstraints != null ? subscriptionConstraints : emptyMap();
+    this.topicConstraints = topicConstraints != null ? topicConstraints : emptyMap();
+  }
+
+  public int getConsumerCount(SubscriptionName subscriptionName) {
+    Constraints requiredConsumers = subscriptionConstraints.get(subscriptionName);
+    if (requiredConsumers == null) {
+      requiredConsumers = topicConstraints.get(subscriptionName.getTopicName());
     }
-
-    public int getConsumerCount(SubscriptionName subscriptionName) {
-        Constraints requiredConsumers = subscriptionConstraints.get(subscriptionName);
-        if (requiredConsumers == null) {
-            requiredConsumers = topicConstraints.get(subscriptionName.getTopicName());
-        }
-        if (requiredConsumers != null && requiredConsumers.getConsumersNumber() > 0) {
-            return Math.min(requiredConsumers.getConsumersNumber(), activeConsumerCount);
-        }
-        return Math.min(consumersPerSubscription, activeConsumerCount);
+    if (requiredConsumers != null && requiredConsumers.getConsumersNumber() > 0) {
+      return Math.min(requiredConsumers.getConsumersNumber(), activeConsumerCount);
     }
-
-    public int getMaxSubscriptionsPerConsumer() {
-        return maxSubscriptionsPerConsumer;
+    return Math.min(consumersPerSubscription, activeConsumerCount);
+  }
+
+  public int getMaxSubscriptionsPerConsumer() {
+    return maxSubscriptionsPerConsumer;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static class Builder {
+    private int activeConsumerCount;
+    private int consumersPerSubscription;
+    private int maxSubscriptionsPerConsumer;
+    private Map<SubscriptionName, Constraints> subscriptionConstraints = new HashMap<>();
+    private Map<TopicName, Constraints> topicConstraints = new HashMap<>();
+
+    public Builder withActiveConsumers(int activeConsumerCount) {
+      this.activeConsumerCount = activeConsumerCount;
+      return this;
     }
 
-    public static Builder builder() {
-        return new Builder();
+    public Builder withConsumersPerSubscription(int consumersPerSubscription) {
+      this.consumersPerSubscription = consumersPerSubscription;
+      return this;
     }
 
-    public static class Builder {
-        private int activeConsumerCount;
-        private int consumersPerSubscription;
-        private int maxSubscriptionsPerConsumer;
-        private Map<SubscriptionName, Constraints> subscriptionConstraints = new HashMap<>();
-        private Map<TopicName, Constraints> topicConstraints = new HashMap<>();
-
-        public Builder withActiveConsumers(int activeConsumerCount) {
-            this.activeConsumerCount = activeConsumerCount;
-            return this;
-        }
-
-        public Builder withConsumersPerSubscription(int consumersPerSubscription) {
-            this.consumersPerSubscription = consumersPerSubscription;
-            return this;
-        }
-
-        public Builder withMaxSubscriptionsPerConsumer(int maxSubscriptionsPerConsumer) {
-            this.maxSubscriptionsPerConsumer = maxSubscriptionsPerConsumer;
-            return this;
-        }
+    public Builder withMaxSubscriptionsPerConsumer(int maxSubscriptionsPerConsumer) {
+      this.maxSubscriptionsPerConsumer = maxSubscriptionsPerConsumer;
+      return this;
+    }
 
-        public Builder withSubscriptionConstraints(Map<SubscriptionName, Constraints> subscriptionConstraints) {
-            this.subscriptionConstraints = subscriptionConstraints;
-            return this;
-        }
+    public Builder withSubscriptionConstraints(
+        Map<SubscriptionName, Constraints> subscriptionConstraints) {
+      this.subscriptionConstraints = subscriptionConstraints;
+      return this;
+    }
 
-        public Builder withTopicConstraints(Map<TopicName, Constraints> topicConstraints) {
-            this.topicConstraints = topicConstraints;
-            return this;
-        }
+    public Builder withTopicConstraints(Map<TopicName, Constraints> topicConstraints) {
+      this.topicConstraints = topicConstraints;
+      return this;
+    }
 
-        public WorkloadConstraints build() {
-            return new WorkloadConstraints(
-                    activeConsumerCount,
-                    consumersPerSubscription,
-                    maxSubscriptionsPerConsumer,
-                    subscriptionConstraints,
-                    topicConstraints
-            );
-        }
+    public WorkloadConstraints build() {
+      return new WorkloadConstraints(
+          activeConsumerCount,
+          consumersPerSubscription,
+          maxSubscriptionsPerConsumer,
+          subscriptionConstraints,
+          topicConstraints);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadRegistryPaths.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadRegistryPaths.java
index d562ae7ef4..beed7e2828 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadRegistryPaths.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadRegistryPaths.java
@@ -1,26 +1,27 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
-
 import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.CONSUMERS_WORKLOAD_PATH;
 
+import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
+
 class WorkloadRegistryPaths {
 
-    private static final String WORKLOAD_RUNTIME_PATH = "runtime-bin";
+  private static final String WORKLOAD_RUNTIME_PATH = "runtime-bin";
 
-    private final ZookeeperPaths zookeeperPaths;
-    private final String clusterName;
+  private final ZookeeperPaths zookeeperPaths;
+  private final String clusterName;
 
-    WorkloadRegistryPaths(ZookeeperPaths zookeeperPaths, String clusterName) {
-        this.zookeeperPaths = zookeeperPaths;
-        this.clusterName = clusterName;
-    }
+  WorkloadRegistryPaths(ZookeeperPaths zookeeperPaths, String clusterName) {
+    this.zookeeperPaths = zookeeperPaths;
+    this.clusterName = clusterName;
+  }
 
-    String consumerWorkloadPath(String consumerId) {
-        return zookeeperPaths.join(consumersWorkloadCurrentClusterRuntimeBinaryPath(), consumerId);
-    }
+  String consumerWorkloadPath(String consumerId) {
+    return zookeeperPaths.join(consumersWorkloadCurrentClusterRuntimeBinaryPath(), consumerId);
+  }
 
-    String consumersWorkloadCurrentClusterRuntimeBinaryPath() {
-        return zookeeperPaths.join(zookeeperPaths.basePath(), CONSUMERS_WORKLOAD_PATH, clusterName, WORKLOAD_RUNTIME_PATH);
-    }
+  String consumersWorkloadCurrentClusterRuntimeBinaryPath() {
+    return zookeeperPaths.join(
+        zookeeperPaths.basePath(), CONSUMERS_WORKLOAD_PATH, clusterName, WORKLOAD_RUNTIME_PATH);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadSupervisor.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadSupervisor.java
index be74d37319..6556872cc2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadSupervisor.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadSupervisor.java
@@ -1,6 +1,15 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -17,162 +26,158 @@
 import pl.allegro.tech.hermes.domain.notifications.TopicCallback;
 import pl.allegro.tech.hermes.domain.workload.constraints.WorkloadConstraintsRepository;
 
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-public class WorkloadSupervisor implements SubscriptionCallback, TopicCallback, SubscriptionAssignmentAware, AdminOperationsCallback {
-
-    private static final Logger logger = LoggerFactory.getLogger(WorkloadSupervisor.class);
-
-    private final ConsumersSupervisor supervisor;
-    private final InternalNotificationsBus notificationsBus;
-    private final SubscriptionsCache subscriptionsCache;
-    private final ConsumerAssignmentCache assignmentCache;
-    private final ConsumerNodesRegistry consumersRegistry;
-    private final BalancingJob balancingJob;
-    private final ZookeeperAdminCache adminCache;
-    private final WorkBalancingParameters workBalancingParameters;
-    private final ExecutorService assignmentExecutor;
-    private final ScheduledExecutorService rebalanceScheduler;
-
-    public WorkloadSupervisor(ConsumersSupervisor supervisor,
-                              InternalNotificationsBus notificationsBus,
-                              SubscriptionsCache subscriptionsCache,
-                              ConsumerAssignmentCache assignmentCache,
-                              ConsumerAssignmentRegistry consumerAssignmentRegistry,
-                              ClusterAssignmentCache clusterAssignmentCache,
-                              ConsumerNodesRegistry consumersRegistry,
-                              ZookeeperAdminCache adminCache,
-                              ExecutorService assignmentExecutor,
-                              WorkBalancingParameters workBalancingParameters,
-                              String kafkaClusterName,
-                              MetricsFacade metrics,
-                              WorkloadConstraintsRepository workloadConstraintsRepository,
-                              WorkBalancer workBalancer,
-                              BalancingListener balancingListener) {
-        this.supervisor = supervisor;
-        this.notificationsBus = notificationsBus;
-        this.subscriptionsCache = subscriptionsCache;
-        this.assignmentCache = assignmentCache;
-        this.consumersRegistry = consumersRegistry;
-        this.adminCache = adminCache;
-        this.assignmentExecutor = assignmentExecutor;
-        this.workBalancingParameters = workBalancingParameters;
-        this.balancingJob = new BalancingJob(
-                consumersRegistry,
-                workBalancingParameters,
-                subscriptionsCache,
-                clusterAssignmentCache,
-                consumerAssignmentRegistry,
-                workBalancer,
-                metrics,
-                kafkaClusterName,
-                workloadConstraintsRepository,
-                balancingListener
-        );
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("balancing-executor-%d").build();
-        this.rebalanceScheduler = Executors.newSingleThreadScheduledExecutor(threadFactory);
-    }
-
-    @Override
-    public void onSubscriptionAssigned(SubscriptionName subscriptionName) {
-        Subscription subscription = subscriptionsCache.getSubscription(subscriptionName);
-        logger.info("Scheduling assignment consumer for {}", subscription.getQualifiedName());
-        assignmentExecutor.execute(() -> {
-            logger.info("Assigning consumer for {}", subscription.getQualifiedName());
-            supervisor.assignConsumerForSubscription(subscription);
-            logger.info("Consumer assigned for {}", subscription.getQualifiedName());
+public class WorkloadSupervisor
+    implements SubscriptionCallback,
+        TopicCallback,
+        SubscriptionAssignmentAware,
+        AdminOperationsCallback {
+
+  private static final Logger logger = LoggerFactory.getLogger(WorkloadSupervisor.class);
+
+  private final ConsumersSupervisor supervisor;
+  private final InternalNotificationsBus notificationsBus;
+  private final SubscriptionsCache subscriptionsCache;
+  private final ConsumerAssignmentCache assignmentCache;
+  private final ConsumerNodesRegistry consumersRegistry;
+  private final BalancingJob balancingJob;
+  private final ZookeeperAdminCache adminCache;
+  private final WorkBalancingParameters workBalancingParameters;
+  private final ExecutorService assignmentExecutor;
+  private final ScheduledExecutorService rebalanceScheduler;
+
+  public WorkloadSupervisor(
+      ConsumersSupervisor supervisor,
+      InternalNotificationsBus notificationsBus,
+      SubscriptionsCache subscriptionsCache,
+      ConsumerAssignmentCache assignmentCache,
+      ConsumerAssignmentRegistry consumerAssignmentRegistry,
+      ClusterAssignmentCache clusterAssignmentCache,
+      ConsumerNodesRegistry consumersRegistry,
+      ZookeeperAdminCache adminCache,
+      ExecutorService assignmentExecutor,
+      WorkBalancingParameters workBalancingParameters,
+      String kafkaClusterName,
+      MetricsFacade metrics,
+      WorkloadConstraintsRepository workloadConstraintsRepository,
+      WorkBalancer workBalancer,
+      BalancingListener balancingListener) {
+    this.supervisor = supervisor;
+    this.notificationsBus = notificationsBus;
+    this.subscriptionsCache = subscriptionsCache;
+    this.assignmentCache = assignmentCache;
+    this.consumersRegistry = consumersRegistry;
+    this.adminCache = adminCache;
+    this.assignmentExecutor = assignmentExecutor;
+    this.workBalancingParameters = workBalancingParameters;
+    this.balancingJob =
+        new BalancingJob(
+            consumersRegistry,
+            workBalancingParameters,
+            subscriptionsCache,
+            clusterAssignmentCache,
+            consumerAssignmentRegistry,
+            workBalancer,
+            metrics,
+            kafkaClusterName,
+            workloadConstraintsRepository,
+            balancingListener);
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat("balancing-executor-%d").build();
+    this.rebalanceScheduler = Executors.newSingleThreadScheduledExecutor(threadFactory);
+  }
+
+  @Override
+  public void onSubscriptionAssigned(SubscriptionName subscriptionName) {
+    Subscription subscription = subscriptionsCache.getSubscription(subscriptionName);
+    logger.info("Scheduling assignment consumer for {}", subscription.getQualifiedName());
+    assignmentExecutor.execute(
+        () -> {
+          logger.info("Assigning consumer for {}", subscription.getQualifiedName());
+          supervisor.assignConsumerForSubscription(subscription);
+          logger.info("Consumer assigned for {}", subscription.getQualifiedName());
         });
-    }
-
-    @Override
-    public void onAssignmentRemoved(SubscriptionName subscription) {
-        logger.info("Scheduling assignment removal consumer for {}", subscription.getQualifiedName());
-        assignmentExecutor.execute(() -> {
-            logger.info("Removing assignment from consumer for {}", subscription.getQualifiedName());
-            supervisor.deleteConsumerForSubscriptionName(subscription);
-            logger.info("Consumer removed for {}", subscription.getName());
+  }
+
+  @Override
+  public void onAssignmentRemoved(SubscriptionName subscription) {
+    logger.info("Scheduling assignment removal consumer for {}", subscription.getQualifiedName());
+    assignmentExecutor.execute(
+        () -> {
+          logger.info("Removing assignment from consumer for {}", subscription.getQualifiedName());
+          supervisor.deleteConsumerForSubscriptionName(subscription);
+          logger.info("Consumer removed for {}", subscription.getName());
         });
-    }
-
-    @Override
-    public void onSubscriptionChanged(Subscription subscription) {
-        if (assignmentCache.isAssignedTo(subscription.getQualifiedName())) {
-            logger.info("Updating subscription {}", subscription.getName());
-            supervisor.updateSubscription(subscription);
-        }
-    }
-
-    @Override
-    public void onTopicChanged(Topic topic) {
-        for (Subscription subscription : subscriptionsCache.subscriptionsOfTopic(topic.getName())) {
-            if (assignmentCache.isAssignedTo(subscription.getQualifiedName())) {
-                supervisor.updateTopic(subscription, topic);
-            }
-        }
-    }
+  }
 
-    public void start() throws Exception {
-        final long startTime = System.currentTimeMillis();
-
-        adminCache.start();
-        adminCache.addCallback(this);
-
-        notificationsBus.registerSubscriptionCallback(this);
-        notificationsBus.registerTopicCallback(this);
-        assignmentCache.registerAssignmentCallback(this);
-
-        supervisor.start();
-        if (workBalancingParameters.isAutoRebalance()) {
-            rebalanceScheduler.scheduleWithFixedDelay(
-                    balancingJob,
-                    workBalancingParameters.getRebalanceInterval().toMillis(),
-                    workBalancingParameters.getRebalanceInterval().toMillis(),
-                    MILLISECONDS
-            );
-        } else {
-            logger.info("Automatic workload rebalancing is disabled.");
-        }
-
-        logger.info("Consumer boot complete in {} ms.", System.currentTimeMillis() - startTime);
+  @Override
+  public void onSubscriptionChanged(Subscription subscription) {
+    if (assignmentCache.isAssignedTo(subscription.getQualifiedName())) {
+      logger.info("Updating subscription {}", subscription.getName());
+      supervisor.updateSubscription(subscription);
     }
-
-    public Set<SubscriptionName> assignedSubscriptions() {
-        return assignmentCache.getConsumerSubscriptions();
+  }
+
+  @Override
+  public void onTopicChanged(Topic topic) {
+    for (Subscription subscription : subscriptionsCache.subscriptionsOfTopic(topic.getName())) {
+      if (assignmentCache.isAssignedTo(subscription.getQualifiedName())) {
+        supervisor.updateTopic(subscription, topic);
+      }
     }
-
-    public void shutdown() throws Exception {
-        rebalanceScheduler.shutdown();
-        rebalanceScheduler.awaitTermination(1, TimeUnit.MINUTES);
-        supervisor.shutdown();
-    }
-
-    @Override
-    public Optional<String> watchedConsumerId() {
-        return Optional.of(consumersRegistry.getConsumerId());
-    }
-
-    public String consumerId() {
-        return consumersRegistry.getConsumerId();
-    }
-
-    public boolean isLeader() {
-        return consumersRegistry.isLeader();
+  }
+
+  public void start() throws Exception {
+    final long startTime = System.currentTimeMillis();
+
+    adminCache.start();
+    adminCache.addCallback(this);
+
+    notificationsBus.registerSubscriptionCallback(this);
+    notificationsBus.registerTopicCallback(this);
+    assignmentCache.registerAssignmentCallback(this);
+
+    supervisor.start();
+    if (workBalancingParameters.isAutoRebalance()) {
+      rebalanceScheduler.scheduleWithFixedDelay(
+          balancingJob,
+          workBalancingParameters.getRebalanceInterval().toMillis(),
+          workBalancingParameters.getRebalanceInterval().toMillis(),
+          MILLISECONDS);
+    } else {
+      logger.info("Automatic workload rebalancing is disabled.");
     }
 
-    @Override
-    public void onRetransmissionStarts(SubscriptionName subscription) throws Exception {
-        logger.info("Triggering retransmission for subscription {}", subscription);
-        if (assignmentCache.isAssignedTo(subscription)) {
-            supervisor.retransmit(subscription);
-        }
+    logger.info("Consumer boot complete in {} ms.", System.currentTimeMillis() - startTime);
+  }
+
+  public Set<SubscriptionName> assignedSubscriptions() {
+    return assignmentCache.getConsumerSubscriptions();
+  }
+
+  public void shutdown() throws Exception {
+    rebalanceScheduler.shutdown();
+    rebalanceScheduler.awaitTermination(1, TimeUnit.MINUTES);
+    supervisor.shutdown();
+  }
+
+  @Override
+  public Optional<String> watchedConsumerId() {
+    return Optional.of(consumersRegistry.getConsumerId());
+  }
+
+  public String consumerId() {
+    return consumersRegistry.getConsumerId();
+  }
+
+  public boolean isLeader() {
+    return consumersRegistry.isLeader();
+  }
+
+  @Override
+  public void onRetransmissionStarts(SubscriptionName subscription) throws Exception {
+    if (assignmentCache.isAssignedTo(subscription)) {
+      logger.info("Triggering retransmission for subscription {}", subscription);
+      supervisor.retransmit(subscription);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ZookeeperOperations.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ZookeeperOperations.java
index b2743ee15d..3701572966 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ZookeeperOperations.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ZookeeperOperations.java
@@ -1,69 +1,71 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import java.util.List;
+import java.util.Optional;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
-import java.util.List;
-import java.util.Optional;
-
 class ZookeeperOperations {
 
-    private final CuratorFramework curator;
+  private final CuratorFramework curator;
 
-    ZookeeperOperations(CuratorFramework curator) {
-        this.curator = curator;
-    }
+  ZookeeperOperations(CuratorFramework curator) {
+    this.curator = curator;
+  }
 
-    void writeOrCreatePersistent(String path, byte[] serializedData) throws Exception {
-        try {
-            curator.setData().forPath(path, serializedData);
-        } catch (KeeperException.NoNodeException e) {
-            try {
-                curator.create().creatingParentContainersIfNeeded()
-                        .withMode(CreateMode.PERSISTENT)
-                        .forPath(path, serializedData);
-            } catch (KeeperException.NodeExistsException ex) {
-                // ignore
-            }
-        }
+  void writeOrCreatePersistent(String path, byte[] serializedData) throws Exception {
+    try {
+      curator.setData().forPath(path, serializedData);
+    } catch (KeeperException.NoNodeException e) {
+      try {
+        curator
+            .create()
+            .creatingParentContainersIfNeeded()
+            .withMode(CreateMode.PERSISTENT)
+            .forPath(path, serializedData);
+      } catch (KeeperException.NodeExistsException ex) {
+        // ignore
+      }
     }
+  }
 
-    Optional<byte[]> getNodeData(String path) {
-        try {
-            if (curator.checkExists().forPath(path) != null) {
-                return Optional.of(curator.getData().forPath(path));
-            }
-        } catch (Exception e) {
-            throw new InternalProcessingException(String.format("Could not read node data on path %s", path), e);
-        }
-        return Optional.empty();
+  Optional<byte[]> getNodeData(String path) {
+    try {
+      if (curator.checkExists().forPath(path) != null) {
+        return Optional.of(curator.getData().forPath(path));
+      }
+    } catch (Exception e) {
+      throw new InternalProcessingException(
+          String.format("Could not read node data on path %s", path), e);
     }
+    return Optional.empty();
+  }
 
-    void deleteNode(String path) {
-        try {
-            if (curator.checkExists().forPath(path) != null) {
-                curator.delete().forPath(path);
-            }
-        } catch (Exception e) {
-            throw new InternalProcessingException("Could not delete node " + path, e);
-        }
+  void deleteNode(String path) {
+    try {
+      if (curator.checkExists().forPath(path) != null) {
+        curator.delete().forPath(path);
+      }
+    } catch (Exception e) {
+      throw new InternalProcessingException("Could not delete node " + path, e);
     }
+  }
 
-    List<String> getNodeChildren(String path) {
-        try {
-            return curator.getChildren().forPath(path);
-        } catch (Exception e) {
-            throw new InternalProcessingException("Could not get children of node " + path, e);
-        }
+  List<String> getNodeChildren(String path) {
+    try {
+      return curator.getChildren().forPath(path);
+    } catch (Exception e) {
+      throw new InternalProcessingException("Could not get children of node " + path, e);
     }
+  }
 
-    boolean exists(String path) {
-        try {
-            return curator.checkExists().forPath(path) != null;
-        } catch (Exception e) {
-            throw new InternalProcessingException("Unable to check existence of node " + path, e);
-        }
+  boolean exists(String path) {
+    try {
+      return curator.checkExists().forPath(path) != null;
+    } catch (Exception e) {
+      throw new InternalProcessingException("Unable to check existence of node " + path, e);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/selective/AvailableWork.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/selective/AvailableWork.java
index 6e411e668a..d77969beab 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/selective/AvailableWork.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/selective/AvailableWork.java
@@ -1,11 +1,8 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.selective;
 
-import com.google.common.collect.Sets;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.SubscriptionAssignment;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.SubscriptionAssignmentView;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkloadConstraints;
+import static java.util.stream.Collectors.toSet;
 
+import com.google.common.collect.Sets;
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.Set;
@@ -13,59 +10,73 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-
-import static java.util.stream.Collectors.toSet;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.SubscriptionAssignment;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.SubscriptionAssignmentView;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkloadConstraints;
 
 class AvailableWork extends Spliterators.AbstractSpliterator<SubscriptionAssignment> {
-    private final SubscriptionAssignmentView state;
-    private final WorkloadConstraints constraints;
+  private final SubscriptionAssignmentView state;
+  private final WorkloadConstraints constraints;
 
-    private AvailableWork(SubscriptionAssignmentView state, WorkloadConstraints constraints) {
-        super(Long.MAX_VALUE, 0);
-        this.state = state;
-        this.constraints = constraints;
-    }
+  private AvailableWork(SubscriptionAssignmentView state, WorkloadConstraints constraints) {
+    super(Long.MAX_VALUE, 0);
+    this.state = state;
+    this.constraints = constraints;
+  }
 
-    @Override
-    public boolean tryAdvance(Consumer<? super SubscriptionAssignment> action) {
-        Set<String> availableConsumers = availableConsumerNodes(state);
-        if (!availableConsumers.isEmpty()) {
-            Optional<SubscriptionAssignment> subscriptionAssignment = getNextSubscription(state, availableConsumers)
-                    .map(subscription -> getNextSubscriptionAssignment(state, availableConsumers, subscription));
-            if (subscriptionAssignment.isPresent()) {
-                action.accept(subscriptionAssignment.get());
-                return true;
-            }
-        }
-        return false;
+  @Override
+  public boolean tryAdvance(Consumer<? super SubscriptionAssignment> action) {
+    Set<String> availableConsumers = availableConsumerNodes(state);
+    if (!availableConsumers.isEmpty()) {
+      Optional<SubscriptionAssignment> subscriptionAssignment =
+          getNextSubscription(state, availableConsumers)
+              .map(
+                  subscription ->
+                      getNextSubscriptionAssignment(state, availableConsumers, subscription));
+      if (subscriptionAssignment.isPresent()) {
+        action.accept(subscriptionAssignment.get());
+        return true;
+      }
     }
+    return false;
+  }
 
-    private Optional<SubscriptionName> getNextSubscription(SubscriptionAssignmentView state, Set<String> availableConsumerNodes) {
-        return state.getSubscriptions().stream()
-                .filter(s -> state.getAssignmentsCountForSubscription(s) < constraints.getConsumerCount(s))
-                .filter(s -> !Sets.difference(availableConsumerNodes, state.getConsumerNodesForSubscription(s)).isEmpty())
-                .min(Comparator.comparingInt(state::getAssignmentsCountForSubscription));
-    }
+  private Optional<SubscriptionName> getNextSubscription(
+      SubscriptionAssignmentView state, Set<String> availableConsumerNodes) {
+    return state.getSubscriptions().stream()
+        .filter(s -> state.getAssignmentsCountForSubscription(s) < constraints.getConsumerCount(s))
+        .filter(
+            s ->
+                !Sets.difference(availableConsumerNodes, state.getConsumerNodesForSubscription(s))
+                    .isEmpty())
+        .min(Comparator.comparingInt(state::getAssignmentsCountForSubscription));
+  }
 
-    private SubscriptionAssignment getNextSubscriptionAssignment(SubscriptionAssignmentView state,
-                                                                 Set<String> availableConsumerNodes,
-                                                                 SubscriptionName subscriptionName) {
-        return availableConsumerNodes.stream()
-                .filter(s -> !state.getSubscriptionsForConsumerNode(s).contains(subscriptionName))
-                .min(Comparator.comparingInt(state::getAssignmentsCountForConsumerNode))
-                .map(s -> new SubscriptionAssignment(s, subscriptionName))
-                .get();
-    }
+  private SubscriptionAssignment getNextSubscriptionAssignment(
+      SubscriptionAssignmentView state,
+      Set<String> availableConsumerNodes,
+      SubscriptionName subscriptionName) {
+    return availableConsumerNodes.stream()
+        .filter(s -> !state.getSubscriptionsForConsumerNode(s).contains(subscriptionName))
+        .min(Comparator.comparingInt(state::getAssignmentsCountForConsumerNode))
+        .map(s -> new SubscriptionAssignment(s, subscriptionName))
+        .get();
+  }
 
-    private Set<String> availableConsumerNodes(SubscriptionAssignmentView state) {
-        return state.getConsumerNodes().stream()
-                .filter(s -> state.getAssignmentsCountForConsumerNode(s) < constraints.getMaxSubscriptionsPerConsumer())
-                .filter(s -> state.getAssignmentsCountForConsumerNode(s) < state.getSubscriptionsCount())
-                .collect(toSet());
-    }
+  private Set<String> availableConsumerNodes(SubscriptionAssignmentView state) {
+    return state.getConsumerNodes().stream()
+        .filter(
+            s ->
+                state.getAssignmentsCountForConsumerNode(s)
+                    < constraints.getMaxSubscriptionsPerConsumer())
+        .filter(s -> state.getAssignmentsCountForConsumerNode(s) < state.getSubscriptionsCount())
+        .collect(toSet());
+  }
 
-    static Stream<SubscriptionAssignment> stream(SubscriptionAssignmentView state, WorkloadConstraints constraints) {
-        AvailableWork work = new AvailableWork(state, constraints);
-        return StreamSupport.stream(work, false);
-    }
+  static Stream<SubscriptionAssignment> stream(
+      SubscriptionAssignmentView state, WorkloadConstraints constraints) {
+    AvailableWork work = new AvailableWork(state, constraints);
+    return StreamSupport.stream(work, false);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/selective/SelectiveWorkBalancer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/selective/SelectiveWorkBalancer.java
index 964efc40ce..ca71507a89 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/selective/SelectiveWorkBalancer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/selective/SelectiveWorkBalancer.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.selective;
 
+import static java.util.Comparator.comparingInt;
+import static java.util.stream.Collectors.toList;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -9,171 +16,197 @@
 import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkBalancingResult;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkloadConstraints;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import static java.util.Comparator.comparingInt;
-import static java.util.stream.Collectors.toList;
-
 public class SelectiveWorkBalancer implements WorkBalancer {
 
-    private static final Logger logger = LoggerFactory.getLogger(SelectiveWorkBalancer.class);
-
-    @Override
-    public WorkBalancingResult balance(List<SubscriptionName> subscriptions,
-                                       List<String> activeConsumerNodes,
-                                       SubscriptionAssignmentView currentState,
-                                       WorkloadConstraints constraints) {
-
-        List<SubscriptionName> removedSubscriptions = findRemovedSubscriptions(currentState, subscriptions);
-        List<String> inactiveConsumers = findInactiveConsumers(currentState, activeConsumerNodes);
-        List<SubscriptionName> newSubscriptions = findNewSubscriptions(currentState, subscriptions);
-        List<String> newConsumers = findNewConsumers(currentState, activeConsumerNodes);
-
-        SubscriptionAssignmentView balancedState =
-                balance(currentState, removedSubscriptions, inactiveConsumers, newSubscriptions, newConsumers, constraints);
-
-        log(subscriptions, activeConsumerNodes, currentState, balancedState);
-
-        return new WorkBalancingResult(
-                balancedState,
-                countMissingResources(subscriptions, balancedState, constraints)
-        );
-    }
-
-    private SubscriptionAssignmentView balance(SubscriptionAssignmentView currentState,
-                                               List<SubscriptionName> removedSubscriptions,
-                                               List<String> inactiveConsumers,
-                                               List<SubscriptionName> newSubscriptions,
-                                               List<String> newConsumers,
-                                               WorkloadConstraints constraints) {
-        return currentState.transform((state, transformer) -> {
-            removedSubscriptions.forEach(transformer::removeSubscription);
-            inactiveConsumers.forEach(transformer::removeConsumerNode);
-            newSubscriptions.forEach(transformer::addSubscription);
-            newConsumers.forEach(transformer::addConsumerNode);
-            minimizeWorkload(state, transformer, constraints);
-            AvailableWork.stream(state, constraints)
-                    .forEach(transformer::addAssignment);
-            equalizeWorkload(state, transformer);
+  private static final Logger logger = LoggerFactory.getLogger(SelectiveWorkBalancer.class);
+
+  @Override
+  public WorkBalancingResult balance(
+      List<SubscriptionName> subscriptions,
+      List<String> activeConsumerNodes,
+      SubscriptionAssignmentView currentState,
+      WorkloadConstraints constraints) {
+
+    List<SubscriptionName> removedSubscriptions =
+        findRemovedSubscriptions(currentState, subscriptions);
+    List<String> inactiveConsumers = findInactiveConsumers(currentState, activeConsumerNodes);
+    List<SubscriptionName> newSubscriptions = findNewSubscriptions(currentState, subscriptions);
+    List<String> newConsumers = findNewConsumers(currentState, activeConsumerNodes);
+
+    SubscriptionAssignmentView balancedState =
+        balance(
+            currentState,
+            removedSubscriptions,
+            inactiveConsumers,
+            newSubscriptions,
+            newConsumers,
+            constraints);
+
+    log(subscriptions, activeConsumerNodes, currentState, balancedState);
+
+    return new WorkBalancingResult(
+        balancedState, countMissingResources(subscriptions, balancedState, constraints));
+  }
+
+  private SubscriptionAssignmentView balance(
+      SubscriptionAssignmentView currentState,
+      List<SubscriptionName> removedSubscriptions,
+      List<String> inactiveConsumers,
+      List<SubscriptionName> newSubscriptions,
+      List<String> newConsumers,
+      WorkloadConstraints constraints) {
+    return currentState.transform(
+        (state, transformer) -> {
+          removedSubscriptions.forEach(transformer::removeSubscription);
+          inactiveConsumers.forEach(transformer::removeConsumerNode);
+          newSubscriptions.forEach(transformer::addSubscription);
+          newConsumers.forEach(transformer::addConsumerNode);
+          minimizeWorkload(state, transformer, constraints);
+          AvailableWork.stream(state, constraints).forEach(transformer::addAssignment);
+          equalizeWorkload(state, transformer);
         });
+  }
+
+  private void minimizeWorkload(
+      SubscriptionAssignmentView state,
+      SubscriptionAssignmentView.Transformer transformer,
+      WorkloadConstraints workloadConstraints) {
+    state.getSubscriptions().stream()
+        .flatMap(
+            subscriptionName ->
+                findRedundantAssignments(state, subscriptionName, workloadConstraints))
+        .forEach(transformer::removeAssignment);
+  }
+
+  private Stream<SubscriptionAssignment> findRedundantAssignments(
+      SubscriptionAssignmentView state,
+      SubscriptionName subscriptionName,
+      WorkloadConstraints constraints) {
+    final int assignedConsumers = state.getAssignmentsCountForSubscription(subscriptionName);
+    final int requiredConsumers = constraints.getConsumerCount(subscriptionName);
+    int redundantConsumers = assignedConsumers - requiredConsumers;
+    if (redundantConsumers > 0) {
+      Stream.Builder<SubscriptionAssignment> redundant = Stream.builder();
+      Iterator<SubscriptionAssignment> iterator =
+          state.getAssignmentsForSubscription(subscriptionName).iterator();
+      while (redundantConsumers > 0 && iterator.hasNext()) {
+        SubscriptionAssignment assignment = iterator.next();
+        redundant.add(assignment);
+        redundantConsumers--;
+      }
+      return redundant.build();
     }
-
-    private void minimizeWorkload(SubscriptionAssignmentView state,
-                                  SubscriptionAssignmentView.Transformer transformer,
-                                  WorkloadConstraints workloadConstraints) {
-        state.getSubscriptions()
-                .stream()
-                .flatMap(subscriptionName -> findRedundantAssignments(state, subscriptionName, workloadConstraints))
-                .forEach(transformer::removeAssignment);
-    }
-
-    private Stream<SubscriptionAssignment> findRedundantAssignments(SubscriptionAssignmentView state,
-                                                                    SubscriptionName subscriptionName,
-                                                                    WorkloadConstraints constraints) {
-        final int assignedConsumers = state.getAssignmentsCountForSubscription(subscriptionName);
-        final int requiredConsumers = constraints.getConsumerCount(subscriptionName);
-        int redundantConsumers = assignedConsumers - requiredConsumers;
-        if (redundantConsumers > 0) {
-            Stream.Builder<SubscriptionAssignment> redundant = Stream.builder();
-            Iterator<SubscriptionAssignment> iterator = state.getAssignmentsForSubscription(subscriptionName).iterator();
-            while (redundantConsumers > 0 && iterator.hasNext()) {
-                SubscriptionAssignment assignment = iterator.next();
-                redundant.add(assignment);
-                redundantConsumers--;
-            }
-            return redundant.build();
-        }
-        return Stream.empty();
-    }
-
-    private int countMissingResources(List<SubscriptionName> subscriptions,
-                                      SubscriptionAssignmentView state,
-                                      WorkloadConstraints constraints) {
-        return subscriptions.stream()
-                .mapToInt(s -> {
-                    int requiredConsumers = constraints.getConsumerCount(s);
-                    int subscriptionAssignments = state.getAssignmentsCountForSubscription(s);
-                    int missing = requiredConsumers - subscriptionAssignments;
-                    if (missing != 0) {
-                        logger.info("Subscription {} has {} != {} (default) assignments",
-                                s, subscriptionAssignments, requiredConsumers);
-                    }
-                    return missing;
-                })
-                .sum();
-    }
-
-    private void equalizeWorkload(SubscriptionAssignmentView state,
-                                  SubscriptionAssignmentView.Transformer transformer) {
-        if (state.getSubscriptionsCount() > 1 && !state.getConsumerNodes().isEmpty()) {
-            boolean transferred;
-            do {
-                transferred = false;
-
-                String maxLoaded = maxLoadedConsumerNode(state);
-                String minLoaded = minLoadedConsumerNode(state);
-                int maxLoad = state.getAssignmentsCountForConsumerNode(maxLoaded);
-                int minLoad = state.getAssignmentsCountForConsumerNode(minLoaded);
-
-                while (maxLoad > minLoad + 1) {
-                    Optional<SubscriptionName> subscription = getSubscriptionForTransfer(state, maxLoaded, minLoaded);
-                    if (subscription.isPresent()) {
-                        transformer.transferAssignment(maxLoaded, minLoaded, subscription.get());
-                        transferred = true;
-                    } else {
-                        break;
-                    }
-                    maxLoad--;
-                    minLoad++;
-                }
-            } while (transferred);
+    return Stream.empty();
+  }
+
+  private int countMissingResources(
+      List<SubscriptionName> subscriptions,
+      SubscriptionAssignmentView state,
+      WorkloadConstraints constraints) {
+    return subscriptions.stream()
+        .mapToInt(
+            s -> {
+              int requiredConsumers = constraints.getConsumerCount(s);
+              int subscriptionAssignments = state.getAssignmentsCountForSubscription(s);
+              int missing = requiredConsumers - subscriptionAssignments;
+              if (missing != 0) {
+                logger.info(
+                    "Subscription {} has {} != {} (default) assignments",
+                    s,
+                    subscriptionAssignments,
+                    requiredConsumers);
+              }
+              return missing;
+            })
+        .sum();
+  }
+
+  private void equalizeWorkload(
+      SubscriptionAssignmentView state, SubscriptionAssignmentView.Transformer transformer) {
+    if (state.getSubscriptionsCount() > 1 && !state.getConsumerNodes().isEmpty()) {
+      boolean transferred;
+      do {
+        transferred = false;
+
+        String maxLoaded = maxLoadedConsumerNode(state);
+        String minLoaded = minLoadedConsumerNode(state);
+        int maxLoad = state.getAssignmentsCountForConsumerNode(maxLoaded);
+        int minLoad = state.getAssignmentsCountForConsumerNode(minLoaded);
+
+        while (maxLoad > minLoad + 1) {
+          Optional<SubscriptionName> subscription =
+              getSubscriptionForTransfer(state, maxLoaded, minLoaded);
+          if (subscription.isPresent()) {
+            transformer.transferAssignment(maxLoaded, minLoaded, subscription.get());
+            transferred = true;
+          } else {
+            break;
+          }
+          maxLoad--;
+          minLoad++;
         }
+      } while (transferred);
     }
-
-    private String maxLoadedConsumerNode(SubscriptionAssignmentView state) {
-        return state.getConsumerNodes().stream().max(comparingInt(state::getAssignmentsCountForConsumerNode)).get();
-    }
-
-    private String minLoadedConsumerNode(SubscriptionAssignmentView state) {
-        return state.getConsumerNodes().stream().min(comparingInt(state::getAssignmentsCountForConsumerNode)).get();
-    }
-
-    private Optional<SubscriptionName> getSubscriptionForTransfer(SubscriptionAssignmentView state,
-                                                                  String maxLoaded,
-                                                                  String minLoaded) {
-        return state.getSubscriptionsForConsumerNode(maxLoaded).stream()
-                .filter(s -> !state.getConsumerNodesForSubscription(s).contains(minLoaded))
-                .findAny();
-    }
-
-    private List<SubscriptionName> findRemovedSubscriptions(SubscriptionAssignmentView state,
-                                                            List<SubscriptionName> subscriptions) {
-        return state.getSubscriptions().stream().filter(s -> !subscriptions.contains(s)).collect(toList());
-    }
-
-    private List<String> findInactiveConsumers(SubscriptionAssignmentView state, List<String> activeConsumers) {
-        return state.getConsumerNodes().stream().filter(c -> !activeConsumers.contains(c)).collect(toList());
-    }
-
-    private List<SubscriptionName> findNewSubscriptions(SubscriptionAssignmentView state,
-                                                        List<SubscriptionName> subscriptions) {
-        return subscriptions.stream().filter(s -> !state.getSubscriptions().contains(s)).collect(toList());
-    }
-
-    private List<String> findNewConsumers(SubscriptionAssignmentView state, List<String> activeConsumers) {
-        return activeConsumers.stream().filter(c -> !state.getConsumerNodes().contains(c)).collect(toList());
-    }
-
-    private void log(List<SubscriptionName> subscriptions, List<String> activeConsumerNodes,
-                     SubscriptionAssignmentView currentState, SubscriptionAssignmentView balancedState) {
-        logger.info("Balancing {} subscriptions across {} nodes with previous {} assignments"
-                        + " produced {} assignments",
-                subscriptions.size(),
-                activeConsumerNodes.size(),
-                currentState.getAllAssignments().size(),
-                balancedState.getAllAssignments().size());
-    }
+  }
+
+  private String maxLoadedConsumerNode(SubscriptionAssignmentView state) {
+    return state.getConsumerNodes().stream()
+        .max(comparingInt(state::getAssignmentsCountForConsumerNode))
+        .get();
+  }
+
+  private String minLoadedConsumerNode(SubscriptionAssignmentView state) {
+    return state.getConsumerNodes().stream()
+        .min(comparingInt(state::getAssignmentsCountForConsumerNode))
+        .get();
+  }
+
+  private Optional<SubscriptionName> getSubscriptionForTransfer(
+      SubscriptionAssignmentView state, String maxLoaded, String minLoaded) {
+    return state.getSubscriptionsForConsumerNode(maxLoaded).stream()
+        .filter(s -> !state.getConsumerNodesForSubscription(s).contains(minLoaded))
+        .findAny();
+  }
+
+  private List<SubscriptionName> findRemovedSubscriptions(
+      SubscriptionAssignmentView state, List<SubscriptionName> subscriptions) {
+    return state.getSubscriptions().stream()
+        .filter(s -> !subscriptions.contains(s))
+        .collect(toList());
+  }
+
+  private List<String> findInactiveConsumers(
+      SubscriptionAssignmentView state, List<String> activeConsumers) {
+    return state.getConsumerNodes().stream()
+        .filter(c -> !activeConsumers.contains(c))
+        .collect(toList());
+  }
+
+  private List<SubscriptionName> findNewSubscriptions(
+      SubscriptionAssignmentView state, List<SubscriptionName> subscriptions) {
+    return subscriptions.stream()
+        .filter(s -> !state.getSubscriptions().contains(s))
+        .collect(toList());
+  }
+
+  private List<String> findNewConsumers(
+      SubscriptionAssignmentView state, List<String> activeConsumers) {
+    return activeConsumers.stream()
+        .filter(c -> !state.getConsumerNodes().contains(c))
+        .collect(toList());
+  }
+
+  private void log(
+      List<SubscriptionName> subscriptions,
+      List<String> activeConsumerNodes,
+      SubscriptionAssignmentView currentState,
+      SubscriptionAssignmentView balancedState) {
+    logger.info(
+        "Balancing {} subscriptions across {} nodes with previous {} assignments"
+            + " produced {} assignments",
+        subscriptions.size(),
+        activeConsumerNodes.size(),
+        currentState.getAllAssignments().size(),
+        balancedState.getAllAssignments().size());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/AvgTargetWeightCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/AvgTargetWeightCalculator.java
index 3372d146c1..4e4d83f019 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/AvgTargetWeightCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/AvgTargetWeightCalculator.java
@@ -1,33 +1,31 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static java.util.stream.Collectors.toMap;
+
 import java.util.Collection;
 import java.util.Map;
 
-import static java.util.stream.Collectors.toMap;
-
 public class AvgTargetWeightCalculator implements TargetWeightCalculator {
 
-    private final WeightedWorkloadMetricsReporter metrics;
+  private final WeightedWorkloadMetricsReporter metrics;
 
-    public AvgTargetWeightCalculator(WeightedWorkloadMetricsReporter metrics) {
-        this.metrics = metrics;
-    }
+  public AvgTargetWeightCalculator(WeightedWorkloadMetricsReporter metrics) {
+    this.metrics = metrics;
+  }
 
-    @Override
-    public Map<String, Weight> calculate(Collection<ConsumerNode> consumers) {
-        if (consumers.isEmpty()) {
-            return Map.of();
-        }
-
-        metrics.reportCurrentWeights(consumers);
-        Weight sum = consumers.stream()
-                .map(ConsumerNode::getWeight)
-                .reduce(Weight.ZERO, Weight::add);
-        Weight average = sum.divide(consumers.size());
-
-        Map<String, Weight> newWeights = consumers.stream()
-                .collect(toMap(ConsumerNode::getConsumerId, ignore -> average));
-        metrics.reportProposedWeights(newWeights);
-        return newWeights;
+  @Override
+  public Map<String, Weight> calculate(Collection<ConsumerNode> consumers) {
+    if (consumers.isEmpty()) {
+      return Map.of();
     }
+
+    metrics.reportCurrentWeights(consumers);
+    Weight sum = consumers.stream().map(ConsumerNode::getWeight).reduce(Weight.ZERO, Weight::add);
+    Weight average = sum.divide(consumers.size());
+
+    Map<String, Weight> newWeights =
+        consumers.stream().collect(toMap(ConsumerNode::getConsumerId, ignore -> average));
+    metrics.reportProposedWeights(newWeights);
+    return newWeights;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNode.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNode.java
index 875a63188b..9340186787 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNode.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNode.java
@@ -1,90 +1,90 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static java.util.Comparator.comparing;
+
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-import static java.util.Comparator.comparing;
-
 class ConsumerNode {
 
-    static Comparator<ConsumerNode> LIGHTEST_CONSUMER_FIRST = comparing(ConsumerNode::getWeight);
-
-    private final String consumerId;
-    private final ConsumerNodeLoad initialLoad;
-    private final int maxSubscriptionsPerConsumer;
-    private final Set<ConsumerTask> tasks = new HashSet<>();
-    private Weight weight = Weight.ZERO;
-
-    ConsumerNode(String consumerId, ConsumerNodeLoad initialLoad, int maxSubscriptionsPerConsumer) {
-        this.consumerId = consumerId;
-        this.initialLoad = initialLoad;
-        this.maxSubscriptionsPerConsumer = maxSubscriptionsPerConsumer;
-    }
-
-    String getConsumerId() {
-        return consumerId;
-    }
-
-    void assign(ConsumerTask task) {
-        tasks.add(task);
-        weight = weight.add(task.getWeight());
-    }
-
-    void unassign(ConsumerTask task) {
-        tasks.remove(task);
-        weight = weight.subtract(task.getWeight());
-    }
-
-    void swap(ConsumerTask moveOut, ConsumerTask moveIn) {
-        unassign(moveOut);
-        assign(moveIn);
-    }
-
-    Set<ConsumerTask> getAssignedTasks() {
-        return tasks;
+  static Comparator<ConsumerNode> LIGHTEST_CONSUMER_FIRST = comparing(ConsumerNode::getWeight);
+
+  private final String consumerId;
+  private final ConsumerNodeLoad initialLoad;
+  private final int maxSubscriptionsPerConsumer;
+  private final Set<ConsumerTask> tasks = new HashSet<>();
+  private Weight weight = Weight.ZERO;
+
+  ConsumerNode(String consumerId, ConsumerNodeLoad initialLoad, int maxSubscriptionsPerConsumer) {
+    this.consumerId = consumerId;
+    this.initialLoad = initialLoad;
+    this.maxSubscriptionsPerConsumer = maxSubscriptionsPerConsumer;
+  }
+
+  String getConsumerId() {
+    return consumerId;
+  }
+
+  void assign(ConsumerTask task) {
+    tasks.add(task);
+    weight = weight.add(task.getWeight());
+  }
+
+  void unassign(ConsumerTask task) {
+    tasks.remove(task);
+    weight = weight.subtract(task.getWeight());
+  }
+
+  void swap(ConsumerTask moveOut, ConsumerTask moveIn) {
+    unassign(moveOut);
+    assign(moveIn);
+  }
+
+  Set<ConsumerTask> getAssignedTasks() {
+    return tasks;
+  }
+
+  int getAssignedTaskCount() {
+    return tasks.size();
+  }
+
+  boolean isNotAssigned(ConsumerTask consumerTask) {
+    return !tasks.contains(consumerTask);
+  }
+
+  boolean isFull() {
+    return tasks.size() >= maxSubscriptionsPerConsumer;
+  }
+
+  Weight getWeight() {
+    return weight;
+  }
+
+  ConsumerNodeLoad getInitialLoad() {
+    return initialLoad;
+  }
+
+  @Override
+  public String toString() {
+    return consumerId;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    int getAssignedTaskCount() {
-        return tasks.size();
-    }
-
-    boolean isNotAssigned(ConsumerTask consumerTask) {
-        return !tasks.contains(consumerTask);
-    }
-
-    boolean isFull() {
-        return tasks.size() >= maxSubscriptionsPerConsumer;
-    }
-
-    Weight getWeight() {
-        return weight;
-    }
-
-    ConsumerNodeLoad getInitialLoad() {
-        return initialLoad;
-    }
-
-    @Override
-    public String toString() {
-        return consumerId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerNode that = (ConsumerNode) o;
-        return Objects.equals(consumerId, that.consumerId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(consumerId);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumerNode that = (ConsumerNode) o;
+    return Objects.equals(consumerId, that.consumerId);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(consumerId);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoad.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoad.java
index 4c6000b515..24087e19be 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoad.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoad.java
@@ -1,36 +1,36 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Map;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 class ConsumerNodeLoad {
 
-    static final ConsumerNodeLoad UNDEFINED = new ConsumerNodeLoad(-1d, Map.of());
+  static final ConsumerNodeLoad UNDEFINED = new ConsumerNodeLoad(-1d, Map.of());
 
-    private final double cpuUtilization;
-    private final Map<SubscriptionName, SubscriptionLoad> loadPerSubscription;
+  private final double cpuUtilization;
+  private final Map<SubscriptionName, SubscriptionLoad> loadPerSubscription;
 
-    ConsumerNodeLoad(double cpuUtilization, Map<SubscriptionName, SubscriptionLoad> loadPerSubscription) {
-        this.cpuUtilization = cpuUtilization;
-        this.loadPerSubscription = loadPerSubscription;
-    }
+  ConsumerNodeLoad(
+      double cpuUtilization, Map<SubscriptionName, SubscriptionLoad> loadPerSubscription) {
+    this.cpuUtilization = cpuUtilization;
+    this.loadPerSubscription = loadPerSubscription;
+  }
 
-    Map<SubscriptionName, SubscriptionLoad> getLoadPerSubscription() {
-        return loadPerSubscription;
-    }
+  Map<SubscriptionName, SubscriptionLoad> getLoadPerSubscription() {
+    return loadPerSubscription;
+  }
 
-    double getCpuUtilization() {
-        return cpuUtilization;
-    }
+  double getCpuUtilization() {
+    return cpuUtilization;
+  }
 
-    double sumOperationsPerSecond() {
-        return loadPerSubscription.values().stream()
-                .mapToDouble(SubscriptionLoad::getOperationsPerSecond)
-                .sum();
-    }
+  double sumOperationsPerSecond() {
+    return loadPerSubscription.values().stream()
+        .mapToDouble(SubscriptionLoad::getOperationsPerSecond)
+        .sum();
+  }
 
-    boolean isDefined() {
-        return cpuUtilization != UNDEFINED.getCpuUtilization();
-    }
+  boolean isDefined() {
+    return cpuUtilization != UNDEFINED.getCpuUtilization();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadDecoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadDecoder.java
index c9dee485ae..63b8a7dddf 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadDecoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadDecoder.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 import org.agrona.concurrent.UnsafeBuffer;
 import org.slf4j.Logger;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -9,54 +14,53 @@
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.ConsumerLoadDecoder.SubscriptionsDecoder;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.MessageHeaderDecoder;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
 class ConsumerNodeLoadDecoder {
 
-    private static final Logger logger = getLogger(ConsumerNodeLoadDecoder.class);
+  private static final Logger logger = getLogger(ConsumerNodeLoadDecoder.class);
 
-    private final SubscriptionIds subscriptionIds;
+  private final SubscriptionIds subscriptionIds;
 
-    ConsumerNodeLoadDecoder(SubscriptionIds subscriptionIds) {
-        this.subscriptionIds = subscriptionIds;
-    }
+  ConsumerNodeLoadDecoder(SubscriptionIds subscriptionIds) {
+    this.subscriptionIds = subscriptionIds;
+  }
 
-    ConsumerNodeLoad decode(byte[] bytes) {
-        MessageHeaderDecoder header = new MessageHeaderDecoder();
-        ConsumerLoadDecoder body = new ConsumerLoadDecoder();
+  ConsumerNodeLoad decode(byte[] bytes) {
+    MessageHeaderDecoder header = new MessageHeaderDecoder();
+    ConsumerLoadDecoder body = new ConsumerLoadDecoder();
 
-        UnsafeBuffer buffer = new UnsafeBuffer(bytes);
-        header.wrap(buffer, 0);
+    UnsafeBuffer buffer = new UnsafeBuffer(bytes);
+    header.wrap(buffer, 0);
 
-        if (header.schemaId() != ConsumerLoadDecoder.SCHEMA_ID || header.templateId() != ConsumerLoadDecoder.TEMPLATE_ID) {
-            logger.warn("Unable to decode consumer node load, schema or template id mismatch. "
-                            + "Required by decoder: [schema id={}, template id={}], "
-                            + "encoded in payload: [schema id={}, template id={}]",
-                    ConsumerLoadDecoder.SCHEMA_ID, ConsumerLoadDecoder.TEMPLATE_ID,
-                    header.schemaId(), header.templateId());
-            return ConsumerNodeLoad.UNDEFINED;
-        }
+    if (header.schemaId() != ConsumerLoadDecoder.SCHEMA_ID
+        || header.templateId() != ConsumerLoadDecoder.TEMPLATE_ID) {
+      logger.warn(
+          "Unable to decode consumer node load, schema or template id mismatch. "
+              + "Required by decoder: [schema id={}, template id={}], "
+              + "encoded in payload: [schema id={}, template id={}]",
+          ConsumerLoadDecoder.SCHEMA_ID,
+          ConsumerLoadDecoder.TEMPLATE_ID,
+          header.schemaId(),
+          header.templateId());
+      return ConsumerNodeLoad.UNDEFINED;
+    }
 
-        body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
+    body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
 
-        return new ConsumerNodeLoad(body.cpuUtilization(), decodeSubscriptionLoads(body));
-    }
+    return new ConsumerNodeLoad(body.cpuUtilization(), decodeSubscriptionLoads(body));
+  }
 
-    private Map<SubscriptionName, SubscriptionLoad> decodeSubscriptionLoads(ConsumerLoadDecoder body) {
-        Map<SubscriptionName, SubscriptionLoad> subscriptionLoads = new HashMap<>();
-        for (SubscriptionsDecoder loadPerSubscriptionDecoder : body.subscriptions()) {
-            long id = loadPerSubscriptionDecoder.id();
-            Optional<SubscriptionId> subscriptionId = subscriptionIds.getSubscriptionId(id);
-            if (subscriptionId.isPresent()) {
-                double operationsPerSecond = loadPerSubscriptionDecoder.operationsPerSecond();
-                SubscriptionLoad load = new SubscriptionLoad(operationsPerSecond);
-                subscriptionLoads.put(subscriptionId.get().getSubscriptionName(), load);
-            }
-        }
-        return subscriptionLoads;
+  private Map<SubscriptionName, SubscriptionLoad> decodeSubscriptionLoads(
+      ConsumerLoadDecoder body) {
+    Map<SubscriptionName, SubscriptionLoad> subscriptionLoads = new HashMap<>();
+    for (SubscriptionsDecoder loadPerSubscriptionDecoder : body.subscriptions()) {
+      long id = loadPerSubscriptionDecoder.id();
+      Optional<SubscriptionId> subscriptionId = subscriptionIds.getSubscriptionId(id);
+      if (subscriptionId.isPresent()) {
+        double operationsPerSecond = loadPerSubscriptionDecoder.operationsPerSecond();
+        SubscriptionLoad load = new SubscriptionLoad(operationsPerSecond);
+        subscriptionLoads.put(subscriptionId.get().getSubscriptionName(), load);
+      }
     }
+    return subscriptionLoads;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadEncoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadEncoder.java
index 83c20cc474..a2a83f3f0a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadEncoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadEncoder.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 import org.agrona.ExpandableDirectByteBuffer;
 import org.agrona.MutableDirectBuffer;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -9,52 +12,51 @@
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.ConsumerLoadEncoder.SubscriptionsEncoder;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.MessageHeaderEncoder;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
 class ConsumerNodeLoadEncoder {
 
-    private final SubscriptionIds subscriptionIds;
-    private final MutableDirectBuffer buffer;
-
-    ConsumerNodeLoadEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
-        this.subscriptionIds = subscriptionIds;
-        this.buffer = new ExpandableDirectByteBuffer(bufferSize);
+  private final SubscriptionIds subscriptionIds;
+  private final MutableDirectBuffer buffer;
+
+  ConsumerNodeLoadEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
+    this.subscriptionIds = subscriptionIds;
+    this.buffer = new ExpandableDirectByteBuffer(bufferSize);
+  }
+
+  byte[] encode(ConsumerNodeLoad consumerNodeLoad) {
+    Map<SubscriptionId, SubscriptionLoad> subscriptionLoads =
+        mapToSubscriptionIds(consumerNodeLoad);
+
+    MessageHeaderEncoder headerEncoder = new MessageHeaderEncoder();
+    ConsumerLoadEncoder body =
+        new ConsumerLoadEncoder().wrapAndApplyHeader(buffer, 0, headerEncoder);
+
+    SubscriptionsEncoder loadPerSubscriptionEncoder =
+        body.cpuUtilization(consumerNodeLoad.getCpuUtilization())
+            .subscriptionsCount(subscriptionLoads.size());
+
+    for (Map.Entry<SubscriptionId, SubscriptionLoad> entry : subscriptionLoads.entrySet()) {
+      SubscriptionId subscriptionId = entry.getKey();
+      SubscriptionLoad load = entry.getValue();
+      loadPerSubscriptionEncoder
+          .next()
+          .id(subscriptionId.getValue())
+          .operationsPerSecond(load.getOperationsPerSecond());
     }
 
-    byte[] encode(ConsumerNodeLoad consumerNodeLoad) {
-        Map<SubscriptionId, SubscriptionLoad> subscriptionLoads = mapToSubscriptionIds(consumerNodeLoad);
-
-        MessageHeaderEncoder headerEncoder = new MessageHeaderEncoder();
-        ConsumerLoadEncoder body = new ConsumerLoadEncoder()
-                .wrapAndApplyHeader(buffer, 0, headerEncoder);
-
-        SubscriptionsEncoder loadPerSubscriptionEncoder = body
-                .cpuUtilization(consumerNodeLoad.getCpuUtilization())
-                .subscriptionsCount(subscriptionLoads.size());
+    int len = headerEncoder.encodedLength() + body.encodedLength();
 
-        for (Map.Entry<SubscriptionId, SubscriptionLoad> entry : subscriptionLoads.entrySet()) {
-            SubscriptionId subscriptionId = entry.getKey();
-            SubscriptionLoad load = entry.getValue();
-            loadPerSubscriptionEncoder.next()
-                    .id(subscriptionId.getValue())
-                    .operationsPerSecond(load.getOperationsPerSecond());
-        }
-
-        int len = headerEncoder.encodedLength() + body.encodedLength();
-
-        byte[] dst = new byte[len];
-        buffer.getBytes(0, dst);
-        return dst;
-    }
+    byte[] dst = new byte[len];
+    buffer.getBytes(0, dst);
+    return dst;
+  }
 
-    private Map<SubscriptionId, SubscriptionLoad> mapToSubscriptionIds(ConsumerNodeLoad metrics) {
-        Map<SubscriptionId, SubscriptionLoad> subscriptionLoads = new HashMap<>();
-        for (Map.Entry<SubscriptionName, SubscriptionLoad> entry : metrics.getLoadPerSubscription().entrySet()) {
-            Optional<SubscriptionId> subscriptionId = subscriptionIds.getSubscriptionId(entry.getKey());
-            subscriptionId.ifPresent(id -> subscriptionLoads.put(id, entry.getValue()));
-        }
-        return subscriptionLoads;
+  private Map<SubscriptionId, SubscriptionLoad> mapToSubscriptionIds(ConsumerNodeLoad metrics) {
+    Map<SubscriptionId, SubscriptionLoad> subscriptionLoads = new HashMap<>();
+    for (Map.Entry<SubscriptionName, SubscriptionLoad> entry :
+        metrics.getLoadPerSubscription().entrySet()) {
+      Optional<SubscriptionId> subscriptionId = subscriptionIds.getSubscriptionId(entry.getKey());
+      subscriptionId.ifPresent(id -> subscriptionLoads.put(id, entry.getValue()));
     }
+    return subscriptionLoads;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadRegistry.java
index 66ab51c634..3e64ce60fa 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerNodeLoadRegistry.java
@@ -4,9 +4,9 @@
 
 public interface ConsumerNodeLoadRegistry extends SubscriptionLoadRecordersRegistry {
 
-    void start();
+  void start();
 
-    void stop();
+  void stop();
 
-    ConsumerNodeLoad get(String consumerId);
+  ConsumerNodeLoad get(String consumerId);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerTask.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerTask.java
index a231f76fd6..78ac8f90ad 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerTask.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ConsumerTask.java
@@ -1,53 +1,53 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
+import static java.util.Comparator.comparing;
 
 import java.time.Instant;
 import java.util.Comparator;
 import java.util.Objects;
-
-import static java.util.Comparator.comparing;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 class ConsumerTask {
 
-    static Comparator<ConsumerTask> HEAVIEST_TASK_FIRST = comparing(ConsumerTask::getWeight).reversed();
+  static Comparator<ConsumerTask> HEAVIEST_TASK_FIRST =
+      comparing(ConsumerTask::getWeight).reversed();
 
-    private final SubscriptionName subscriptionName;
-    private final Instant lastRebalanceTimestamp;
-    private final Weight weight;
+  private final SubscriptionName subscriptionName;
+  private final Instant lastRebalanceTimestamp;
+  private final Weight weight;
 
-    ConsumerTask(SubscriptionName subscriptionName, SubscriptionProfile subscriptionProfile) {
-        this.subscriptionName = subscriptionName;
-        this.lastRebalanceTimestamp = subscriptionProfile.getLastRebalanceTimestamp();
-        this.weight = subscriptionProfile.getWeight();
-    }
+  ConsumerTask(SubscriptionName subscriptionName, SubscriptionProfile subscriptionProfile) {
+    this.subscriptionName = subscriptionName;
+    this.lastRebalanceTimestamp = subscriptionProfile.getLastRebalanceTimestamp();
+    this.weight = subscriptionProfile.getWeight();
+  }
 
-    SubscriptionName getSubscriptionName() {
-        return subscriptionName;
-    }
+  SubscriptionName getSubscriptionName() {
+    return subscriptionName;
+  }
 
-    Weight getWeight() {
-        return weight;
-    }
+  Weight getWeight() {
+    return weight;
+  }
 
-    Instant getLastRebalanceTimestamp() {
-        return lastRebalanceTimestamp;
-    }
+  Instant getLastRebalanceTimestamp() {
+    return lastRebalanceTimestamp;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConsumerTask that = (ConsumerTask) o;
-        return Objects.equals(subscriptionName, that.subscriptionName);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(subscriptionName);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    ConsumerTask that = (ConsumerTask) o;
+    return Objects.equals(subscriptionName, that.subscriptionName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(subscriptionName);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/CurrentLoadProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/CurrentLoadProvider.java
index e23674e2b9..b5b5bd8f7f 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/CurrentLoadProvider.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/CurrentLoadProvider.java
@@ -5,28 +5,28 @@
 
 public class CurrentLoadProvider {
 
-    private final Map<String, ConsumerNodeLoad> consumerLoads = new ConcurrentHashMap<>();
-    private volatile SubscriptionProfiles profiles = SubscriptionProfiles.EMPTY;
-
-    SubscriptionProfiles getProfiles() {
-        return profiles;
-    }
-
-    ConsumerNodeLoad getConsumerNodeLoad(String consumerId) {
-        return consumerLoads.getOrDefault(consumerId, ConsumerNodeLoad.UNDEFINED);
-    }
-
-    void updateConsumerNodeLoads(Map<String, ConsumerNodeLoad> newConsumerLoads) {
-        consumerLoads.clear();
-        consumerLoads.putAll(newConsumerLoads);
-    }
-
-    void updateProfiles(SubscriptionProfiles newProfiles) {
-        profiles = newProfiles;
-    }
-
-    void clear() {
-        consumerLoads.clear();
-        profiles = SubscriptionProfiles.EMPTY;
-    }
+  private final Map<String, ConsumerNodeLoad> consumerLoads = new ConcurrentHashMap<>();
+  private volatile SubscriptionProfiles profiles = SubscriptionProfiles.EMPTY;
+
+  SubscriptionProfiles getProfiles() {
+    return profiles;
+  }
+
+  ConsumerNodeLoad getConsumerNodeLoad(String consumerId) {
+    return consumerLoads.getOrDefault(consumerId, ConsumerNodeLoad.UNDEFINED);
+  }
+
+  void updateConsumerNodeLoads(Map<String, ConsumerNodeLoad> newConsumerLoads) {
+    consumerLoads.clear();
+    consumerLoads.putAll(newConsumerLoads);
+  }
+
+  void updateProfiles(SubscriptionProfiles newProfiles) {
+    profiles = newProfiles;
+  }
+
+  void clear() {
+    consumerLoads.clear();
+    profiles = SubscriptionProfiles.EMPTY;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ExponentiallyWeightedMovingAverage.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ExponentiallyWeightedMovingAverage.java
index 4c2782059c..3d43e0168b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ExponentiallyWeightedMovingAverage.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ExponentiallyWeightedMovingAverage.java
@@ -6,27 +6,27 @@
 
 class ExponentiallyWeightedMovingAverage {
 
-    private final Duration windowSize;
+  private final Duration windowSize;
 
-    private Instant previousUpdateTimestamp;
-    private double currentAverage = 0d;
+  private Instant previousUpdateTimestamp;
+  private double currentAverage = 0d;
 
-    ExponentiallyWeightedMovingAverage(Duration windowSize) {
-        this.windowSize = windowSize;
-    }
+  ExponentiallyWeightedMovingAverage(Duration windowSize) {
+    this.windowSize = windowSize;
+  }
 
-    double update(double sample, Instant now) {
-        if (previousUpdateTimestamp == null) {
-            currentAverage = sample;
-        } else {
-            // This calculation is done in the same way as the Linux load average is calculated.
-            // See: https://www.helpsystems.com/resources/guides/unix-load-average-part-1-how-it-works
-            Duration elapsed = Duration.between(previousUpdateTimestamp, now);
-            long elapsedMillis = Math.max(TimeUnit.MILLISECONDS.convert(elapsed), 0);
-            double alpha = 1.0 - Math.exp(-1.0 * ((double) elapsedMillis / windowSize.toMillis()));
-            currentAverage = (sample * alpha) + (currentAverage * (1.0 - alpha));
-        }
-        previousUpdateTimestamp = now;
-        return currentAverage;
+  double update(double sample, Instant now) {
+    if (previousUpdateTimestamp == null) {
+      currentAverage = sample;
+    } else {
+      // This calculation is done in the same way as the Linux load average is calculated.
+      // See: https://www.helpsystems.com/resources/guides/unix-load-average-part-1-how-it-works
+      Duration elapsed = Duration.between(previousUpdateTimestamp, now);
+      long elapsedMillis = Math.max(TimeUnit.MILLISECONDS.convert(elapsed), 0);
+      double alpha = 1.0 - Math.exp(-1.0 * ((double) elapsedMillis / windowSize.toMillis()));
+      currentAverage = (sample * alpha) + (currentAverage * (1.0 - alpha));
     }
+    previousUpdateTimestamp = now;
+    return currentAverage;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/NoOpConsumerNodeLoadRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/NoOpConsumerNodeLoadRegistry.java
index c2d4dc04d7..41eea86a47 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/NoOpConsumerNodeLoadRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/NoOpConsumerNodeLoadRegistry.java
@@ -5,43 +5,34 @@
 
 public class NoOpConsumerNodeLoadRegistry implements ConsumerNodeLoadRegistry {
 
-    private static final NoOpSubscriptionLoadRecorder SUBSCRIPTION_LOAD_RECORDER = new NoOpSubscriptionLoadRecorder();
+  private static final NoOpSubscriptionLoadRecorder SUBSCRIPTION_LOAD_RECORDER =
+      new NoOpSubscriptionLoadRecorder();
 
-    @Override
-    public void start() {
+  @Override
+  public void start() {}
 
-    }
+  @Override
+  public void stop() {}
 
-    @Override
-    public void stop() {
+  @Override
+  public ConsumerNodeLoad get(String consumerId) {
+    return ConsumerNodeLoad.UNDEFINED;
+  }
 
-    }
+  @Override
+  public SubscriptionLoadRecorder register(SubscriptionName subscriptionName) {
+    return SUBSCRIPTION_LOAD_RECORDER;
+  }
 
-    @Override
-    public ConsumerNodeLoad get(String consumerId) {
-        return ConsumerNodeLoad.UNDEFINED;
-    }
+  private static class NoOpSubscriptionLoadRecorder implements SubscriptionLoadRecorder {
 
     @Override
-    public SubscriptionLoadRecorder register(SubscriptionName subscriptionName) {
-        return SUBSCRIPTION_LOAD_RECORDER;
-    }
-
-    private static class NoOpSubscriptionLoadRecorder implements SubscriptionLoadRecorder {
-
-        @Override
-        public void initialize() {
+    public void initialize() {}
 
-        }
-
-        @Override
-        public void recordSingleOperation() {
-
-        }
-
-        @Override
-        public void shutdown() {
+    @Override
+    public void recordSingleOperation() {}
 
-        }
-    }
+    @Override
+    public void shutdown() {}
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ScoringTargetWeightCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ScoringTargetWeightCalculator.java
index 8ba1210f50..2c92fb6cf2 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ScoringTargetWeightCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ScoringTargetWeightCalculator.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+
 import java.time.Clock;
 import java.time.Duration;
 import java.util.Collection;
@@ -8,135 +12,129 @@
 import java.util.Map;
 import java.util.Set;
 
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toMap;
-import static java.util.stream.Collectors.toSet;
-
 public class ScoringTargetWeightCalculator implements TargetWeightCalculator {
 
-    private static final double MIN_SCORE = 0.01d;
-    private static final double MAX_SCORE = 1.0d;
-
-    private final WeightedWorkloadMetricsReporter metrics;
-    private final Clock clock;
-    private final Duration scoringWindowSize;
-    private final double scoringGain;
-    private final Map<String, ExponentiallyWeightedMovingAverage> scores = new HashMap<>();
-
-    public ScoringTargetWeightCalculator(WeightedWorkloadMetricsReporter metrics,
-                                         Clock clock,
-                                         Duration scoringWindowSize,
-                                         double scoringGain) {
-        this.metrics = metrics;
-        this.clock = clock;
-        this.scoringWindowSize = scoringWindowSize;
-        this.scoringGain = scoringGain;
-    }
-
-    @Override
-    public Map<String, Weight> calculate(Collection<ConsumerNode> consumers) {
-        removeScoresForInactiveConsumers(consumers);
-
-        metrics.reportCurrentWeights(consumers);
-        Map<String, ConsumerNodeLoad> loadPerConsumer = mapConsumerIdToLoad(consumers);
-        double targetCpuUtilization = calculateTargetCpuUtilization(loadPerConsumer);
-        Map<String, Double> currentScores = calculateCurrentScores(loadPerConsumer);
-
-        Map<String, Double> newScores = new HashMap<>();
-        for (Map.Entry<String, Double> entry : currentScores.entrySet()) {
-            String consumerId = entry.getKey();
-            double cpuUtilization = loadPerConsumer.get(consumerId).getCpuUtilization();
-            double error = targetCpuUtilization - cpuUtilization;
-            double currentScore = entry.getValue();
-            double newScore = calculateNewScore(consumerId, currentScore, error);
-            newScores.put(consumerId, newScore);
-            metrics.reportCurrentScore(consumerId, currentScore);
-            metrics.reportProposedScore(consumerId, newScore);
-            metrics.reportScoringError(consumerId, error);
-        }
-
-        Map<String, Weight> newWeights = calculateWeights(consumers, newScores);
-        metrics.reportProposedWeights(newWeights);
-        return newWeights;
-    }
-
-    private void removeScoresForInactiveConsumers(Collection<ConsumerNode> consumers) {
-        Set<String> consumerIds = consumers.stream().map(ConsumerNode::getConsumerId).collect(toSet());
-        scores.entrySet().removeIf(e -> !consumerIds.contains(e.getKey()));
-    }
-
-    private Map<String, ConsumerNodeLoad> mapConsumerIdToLoad(Collection<ConsumerNode> consumers) {
-        return consumers.stream()
-                .collect(toMap(ConsumerNode::getConsumerId, ConsumerNode::getInitialLoad));
+  private static final double MIN_SCORE = 0.01d;
+  private static final double MAX_SCORE = 1.0d;
+
+  private final WeightedWorkloadMetricsReporter metrics;
+  private final Clock clock;
+  private final Duration scoringWindowSize;
+  private final double scoringGain;
+  private final Map<String, ExponentiallyWeightedMovingAverage> scores = new HashMap<>();
+
+  public ScoringTargetWeightCalculator(
+      WeightedWorkloadMetricsReporter metrics,
+      Clock clock,
+      Duration scoringWindowSize,
+      double scoringGain) {
+    this.metrics = metrics;
+    this.clock = clock;
+    this.scoringWindowSize = scoringWindowSize;
+    this.scoringGain = scoringGain;
+  }
+
+  @Override
+  public Map<String, Weight> calculate(Collection<ConsumerNode> consumers) {
+    removeScoresForInactiveConsumers(consumers);
+
+    metrics.reportCurrentWeights(consumers);
+    Map<String, ConsumerNodeLoad> loadPerConsumer = mapConsumerIdToLoad(consumers);
+    double targetCpuUtilization = calculateTargetCpuUtilization(loadPerConsumer);
+    Map<String, Double> currentScores = calculateCurrentScores(loadPerConsumer);
+
+    Map<String, Double> newScores = new HashMap<>();
+    for (Map.Entry<String, Double> entry : currentScores.entrySet()) {
+      String consumerId = entry.getKey();
+      double cpuUtilization = loadPerConsumer.get(consumerId).getCpuUtilization();
+      double error = targetCpuUtilization - cpuUtilization;
+      double currentScore = entry.getValue();
+      double newScore = calculateNewScore(consumerId, currentScore, error);
+      newScores.put(consumerId, newScore);
+      metrics.reportCurrentScore(consumerId, currentScore);
+      metrics.reportProposedScore(consumerId, newScore);
+      metrics.reportScoringError(consumerId, error);
     }
 
-    private double calculateTargetCpuUtilization(Map<String, ConsumerNodeLoad> loadPerConsumer) {
-        return loadPerConsumer.values().stream()
-                .filter(ConsumerNodeLoad::isDefined)
-                .mapToDouble(ConsumerNodeLoad::getCpuUtilization)
-                .average()
-                .orElse(0d);
+    Map<String, Weight> newWeights = calculateWeights(consumers, newScores);
+    metrics.reportProposedWeights(newWeights);
+    return newWeights;
+  }
+
+  private void removeScoresForInactiveConsumers(Collection<ConsumerNode> consumers) {
+    Set<String> consumerIds = consumers.stream().map(ConsumerNode::getConsumerId).collect(toSet());
+    scores.entrySet().removeIf(e -> !consumerIds.contains(e.getKey()));
+  }
+
+  private Map<String, ConsumerNodeLoad> mapConsumerIdToLoad(Collection<ConsumerNode> consumers) {
+    return consumers.stream()
+        .collect(toMap(ConsumerNode::getConsumerId, ConsumerNode::getInitialLoad));
+  }
+
+  private double calculateTargetCpuUtilization(Map<String, ConsumerNodeLoad> loadPerConsumer) {
+    return loadPerConsumer.values().stream()
+        .filter(ConsumerNodeLoad::isDefined)
+        .mapToDouble(ConsumerNodeLoad::getCpuUtilization)
+        .average()
+        .orElse(0d);
+  }
+
+  private Map<String, Double> calculateCurrentScores(
+      Map<String, ConsumerNodeLoad> loadPerConsumer) {
+    Map<String, Double> opsPerConsumer =
+        loadPerConsumer.entrySet().stream()
+            .filter(e -> e.getValue().isDefined())
+            .collect(toMap(Map.Entry::getKey, e -> e.getValue().sumOperationsPerSecond()));
+    double opsSum = opsPerConsumer.values().stream().mapToDouble(ops -> ops).sum();
+    return opsPerConsumer.entrySet().stream()
+        .collect(toMap(Map.Entry::getKey, e -> calculateCurrentScore(e.getValue(), opsSum)));
+  }
+
+  private double calculateCurrentScore(double ops, double opsSum) {
+    if (opsSum > 0) {
+      return ops / opsSum;
     }
-
-    private Map<String, Double> calculateCurrentScores(Map<String, ConsumerNodeLoad> loadPerConsumer) {
-        Map<String, Double> opsPerConsumer = loadPerConsumer.entrySet().stream()
-                .filter(e -> e.getValue().isDefined())
-                .collect(toMap(Map.Entry::getKey, e -> e.getValue().sumOperationsPerSecond()));
-        double opsSum = opsPerConsumer.values().stream()
-                .mapToDouble(ops -> ops)
-                .sum();
-        return opsPerConsumer.entrySet().stream()
-                .collect(toMap(Map.Entry::getKey, e -> calculateCurrentScore(e.getValue(), opsSum)));
-    }
-
-    private double calculateCurrentScore(double ops, double opsSum) {
-        if (opsSum > 0) {
-            return ops / opsSum;
-        }
-        return 0;
+    return 0;
+  }
+
+  private double calculateNewScore(String consumerId, double currentScore, double error) {
+    double rawScore = currentScore + scoringGain * error;
+    ExponentiallyWeightedMovingAverage average =
+        scores.computeIfAbsent(
+            consumerId, ignore -> new ExponentiallyWeightedMovingAverage(scoringWindowSize));
+    double avg = average.update(rawScore, clock.instant());
+    return ensureScoreRanges(avg);
+  }
+
+  private double ensureScoreRanges(double score) {
+    return Math.max(Math.min(score, MAX_SCORE), MIN_SCORE);
+  }
+
+  private Map<String, Weight> calculateWeights(
+      Collection<ConsumerNode> consumers, Map<String, Double> newScores) {
+    Weight sum = consumers.stream().map(ConsumerNode::getWeight).reduce(Weight.ZERO, Weight::add);
+    Weight avgWeight = calculateAvgWeight(sum, consumers.size());
+    List<ConsumerNode> consumersWithoutScore =
+        consumers.stream()
+            .filter(consumerNode -> !newScores.containsKey(consumerNode.getConsumerId()))
+            .collect(toList());
+    Map<String, Weight> newWeights = new HashMap<>();
+    for (ConsumerNode consumerNode : consumersWithoutScore) {
+      newWeights.put(consumerNode.getConsumerId(), avgWeight);
+      sum = sum.subtract(avgWeight);
     }
-
-    private double calculateNewScore(String consumerId, double currentScore, double error) {
-        double rawScore = currentScore + scoringGain * error;
-        ExponentiallyWeightedMovingAverage average = scores.computeIfAbsent(
-                consumerId,
-                ignore -> new ExponentiallyWeightedMovingAverage(scoringWindowSize)
-        );
-        double avg = average.update(rawScore, clock.instant());
-        return ensureScoreRanges(avg);
-    }
-
-    private double ensureScoreRanges(double score) {
-        return Math.max(Math.min(score, MAX_SCORE), MIN_SCORE);
-    }
-
-    private Map<String, Weight> calculateWeights(Collection<ConsumerNode> consumers, Map<String, Double> newScores) {
-        Weight sum = consumers.stream()
-                .map(ConsumerNode::getWeight)
-                .reduce(Weight.ZERO, Weight::add);
-        Weight avgWeight = calculateAvgWeight(sum, consumers.size());
-        List<ConsumerNode> consumersWithoutScore = consumers.stream()
-                .filter(consumerNode -> !newScores.containsKey(consumerNode.getConsumerId()))
-                .collect(toList());
-        Map<String, Weight> newWeights = new HashMap<>();
-        for (ConsumerNode consumerNode : consumersWithoutScore) {
-            newWeights.put(consumerNode.getConsumerId(), avgWeight);
-            sum = sum.subtract(avgWeight);
-        }
-        double newScoresSum = newScores.values().stream()
-                .mapToDouble(score -> score)
-                .sum();
-        for (Map.Entry<String, Double> entry : newScores.entrySet()) {
-            Weight weight = sum.multiply(entry.getValue() / newScoresSum);
-            newWeights.put(entry.getKey(), weight);
-        }
-        return newWeights;
+    double newScoresSum = newScores.values().stream().mapToDouble(score -> score).sum();
+    for (Map.Entry<String, Double> entry : newScores.entrySet()) {
+      Weight weight = sum.multiply(entry.getValue() / newScoresSum);
+      newWeights.put(entry.getKey(), weight);
     }
+    return newWeights;
+  }
 
-    private Weight calculateAvgWeight(Weight sum, int consumerCount) {
-        if (consumerCount == 0) {
-            return Weight.ZERO;
-        }
-        return sum.divide(consumerCount);
+  private Weight calculateAvgWeight(Weight sum, int consumerCount) {
+    if (consumerCount == 0) {
+      return Weight.ZERO;
     }
+    return sum.divide(consumerCount);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionLoad.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionLoad.java
index b1eaaffc30..92dea02ca0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionLoad.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionLoad.java
@@ -4,30 +4,30 @@
 
 class SubscriptionLoad {
 
-    private final double operationsPerSecond;
+  private final double operationsPerSecond;
 
-    SubscriptionLoad(double operationsPerSecond) {
-        this.operationsPerSecond = operationsPerSecond;
-    }
+  SubscriptionLoad(double operationsPerSecond) {
+    this.operationsPerSecond = operationsPerSecond;
+  }
 
-    double getOperationsPerSecond() {
-        return operationsPerSecond;
-    }
+  double getOperationsPerSecond() {
+    return operationsPerSecond;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SubscriptionLoad that = (SubscriptionLoad) o;
-        return Double.compare(that.operationsPerSecond, operationsPerSecond) == 0;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(operationsPerSecond);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SubscriptionLoad that = (SubscriptionLoad) o;
+    return Double.compare(that.operationsPerSecond, operationsPerSecond) == 0;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(operationsPerSecond);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfile.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfile.java
index ddcb1ae53a..2b0bacf9a0 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfile.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfile.java
@@ -4,21 +4,21 @@
 
 class SubscriptionProfile {
 
-    static SubscriptionProfile UNDEFINED = new SubscriptionProfile(Instant.MIN, Weight.ZERO);
+  static SubscriptionProfile UNDEFINED = new SubscriptionProfile(Instant.MIN, Weight.ZERO);
 
-    private final Instant lastRebalanceTimestamp;
-    private final Weight weight;
+  private final Instant lastRebalanceTimestamp;
+  private final Weight weight;
 
-    SubscriptionProfile(Instant lastRebalanceTimestamp, Weight weight) {
-        this.lastRebalanceTimestamp = lastRebalanceTimestamp;
-        this.weight = weight;
-    }
+  SubscriptionProfile(Instant lastRebalanceTimestamp, Weight weight) {
+    this.lastRebalanceTimestamp = lastRebalanceTimestamp;
+    this.weight = weight;
+  }
 
-    Weight getWeight() {
-        return weight;
-    }
+  Weight getWeight() {
+    return weight;
+  }
 
-    Instant getLastRebalanceTimestamp() {
-        return lastRebalanceTimestamp;
-    }
+  Instant getLastRebalanceTimestamp() {
+    return lastRebalanceTimestamp;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfileRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfileRegistry.java
index a33a6121d6..d63d2a0def 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfileRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfileRegistry.java
@@ -2,7 +2,7 @@
 
 public interface SubscriptionProfileRegistry {
 
-    SubscriptionProfiles fetch();
+  SubscriptionProfiles fetch();
 
-    void persist(SubscriptionProfiles profiles);
+  void persist(SubscriptionProfiles profiles);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfiles.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfiles.java
index 32f205485b..7838b9fbad 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfiles.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfiles.java
@@ -1,36 +1,36 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.time.Instant;
 import java.util.Map;
 import java.util.Set;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 class SubscriptionProfiles {
 
-    static final SubscriptionProfiles EMPTY = new SubscriptionProfiles(Map.of(), Instant.MIN);
+  static final SubscriptionProfiles EMPTY = new SubscriptionProfiles(Map.of(), Instant.MIN);
 
-    private final Map<SubscriptionName, SubscriptionProfile> profiles;
-    private final Instant updateTimestamp;
+  private final Map<SubscriptionName, SubscriptionProfile> profiles;
+  private final Instant updateTimestamp;
 
-    SubscriptionProfiles(Map<SubscriptionName, SubscriptionProfile> profiles, Instant updateTimestamp) {
-        this.profiles = profiles;
-        this.updateTimestamp = updateTimestamp;
-    }
+  SubscriptionProfiles(
+      Map<SubscriptionName, SubscriptionProfile> profiles, Instant updateTimestamp) {
+    this.profiles = profiles;
+    this.updateTimestamp = updateTimestamp;
+  }
 
-    Instant getUpdateTimestamp() {
-        return updateTimestamp;
-    }
+  Instant getUpdateTimestamp() {
+    return updateTimestamp;
+  }
 
-    Set<SubscriptionName> getSubscriptions() {
-        return profiles.keySet();
-    }
+  Set<SubscriptionName> getSubscriptions() {
+    return profiles.keySet();
+  }
 
-    SubscriptionProfile getProfile(SubscriptionName subscriptionName) {
-        return profiles.getOrDefault(subscriptionName, SubscriptionProfile.UNDEFINED);
-    }
+  SubscriptionProfile getProfile(SubscriptionName subscriptionName) {
+    return profiles.getOrDefault(subscriptionName, SubscriptionProfile.UNDEFINED);
+  }
 
-    Map<SubscriptionName, SubscriptionProfile> getProfiles() {
-        return profiles;
-    }
+  Map<SubscriptionName, SubscriptionProfile> getProfiles() {
+    return profiles;
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesCalculator.java
index 2e8c12bacf..4a839abcfe 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesCalculator.java
@@ -1,60 +1,66 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 class SubscriptionProfilesCalculator {
 
-    private final Clock clock;
-    private final Duration weightWindowSize;
+  private final Clock clock;
+  private final Duration weightWindowSize;
 
-    SubscriptionProfilesCalculator(Clock clock, Duration weightWindowSize) {
-        this.clock = clock;
-        this.weightWindowSize = weightWindowSize;
-    }
+  SubscriptionProfilesCalculator(Clock clock, Duration weightWindowSize) {
+    this.clock = clock;
+    this.weightWindowSize = weightWindowSize;
+  }
 
-    SubscriptionProfiles calculate(Collection<ConsumerNodeLoad> consumerLoads, SubscriptionProfiles previousProfiles) {
-        Map<SubscriptionName, Weight> currentWeights = calculateCurrentWeights(consumerLoads);
-        Map<SubscriptionName, SubscriptionProfile> newProfiles = new HashMap<>();
-        Instant now = clock.instant();
-        for (Map.Entry<SubscriptionName, Weight> entry : currentWeights.entrySet()) {
-            SubscriptionName subscriptionName = entry.getKey();
-            Weight currentWeight = entry.getValue();
-            SubscriptionProfile newProfile = applyCurrentWeight(previousProfiles, subscriptionName, currentWeight, now);
-            newProfiles.put(subscriptionName, newProfile);
-        }
-        return new SubscriptionProfiles(newProfiles, now);
+  SubscriptionProfiles calculate(
+      Collection<ConsumerNodeLoad> consumerLoads, SubscriptionProfiles previousProfiles) {
+    Map<SubscriptionName, Weight> currentWeights = calculateCurrentWeights(consumerLoads);
+    Map<SubscriptionName, SubscriptionProfile> newProfiles = new HashMap<>();
+    Instant now = clock.instant();
+    for (Map.Entry<SubscriptionName, Weight> entry : currentWeights.entrySet()) {
+      SubscriptionName subscriptionName = entry.getKey();
+      Weight currentWeight = entry.getValue();
+      SubscriptionProfile newProfile =
+          applyCurrentWeight(previousProfiles, subscriptionName, currentWeight, now);
+      newProfiles.put(subscriptionName, newProfile);
     }
+    return new SubscriptionProfiles(newProfiles, now);
+  }
 
-    private Map<SubscriptionName, Weight> calculateCurrentWeights(Collection<ConsumerNodeLoad> consumerLoads) {
-        Map<SubscriptionName, Weight> currentWeights = new HashMap<>();
-        for (ConsumerNodeLoad consumerLoad : consumerLoads) {
-            for (Map.Entry<SubscriptionName, SubscriptionLoad> entry : consumerLoad.getLoadPerSubscription().entrySet()) {
-                SubscriptionName subscriptionName = entry.getKey();
-                Weight currentConsumerWeight = new Weight(entry.getValue().getOperationsPerSecond());
-                Weight currentMaxWeight = currentWeights.computeIfAbsent(subscriptionName, subscription -> Weight.ZERO);
-                Weight newMaxWeight = Weight.max(currentMaxWeight, currentConsumerWeight);
-                currentWeights.put(subscriptionName, newMaxWeight);
-            }
-        }
-        return currentWeights;
+  private Map<SubscriptionName, Weight> calculateCurrentWeights(
+      Collection<ConsumerNodeLoad> consumerLoads) {
+    Map<SubscriptionName, Weight> currentWeights = new HashMap<>();
+    for (ConsumerNodeLoad consumerLoad : consumerLoads) {
+      for (Map.Entry<SubscriptionName, SubscriptionLoad> entry :
+          consumerLoad.getLoadPerSubscription().entrySet()) {
+        SubscriptionName subscriptionName = entry.getKey();
+        Weight currentConsumerWeight = new Weight(entry.getValue().getOperationsPerSecond());
+        Weight currentMaxWeight =
+            currentWeights.computeIfAbsent(subscriptionName, subscription -> Weight.ZERO);
+        Weight newMaxWeight = Weight.max(currentMaxWeight, currentConsumerWeight);
+        currentWeights.put(subscriptionName, newMaxWeight);
+      }
     }
+    return currentWeights;
+  }
 
-    private SubscriptionProfile applyCurrentWeight(SubscriptionProfiles previousProfiles,
-                                                   SubscriptionName subscriptionName,
-                                                   Weight currentWeight,
-                                                   Instant now) {
-        SubscriptionProfile previousProfile = previousProfiles.getProfile(subscriptionName);
-        Weight previousWeight = previousProfile.getWeight();
-        ExponentiallyWeightedMovingAverage average = new ExponentiallyWeightedMovingAverage(weightWindowSize);
-        average.update(previousWeight.getOperationsPerSecond(), previousProfiles.getUpdateTimestamp());
-        double opsAvg = average.update(currentWeight.getOperationsPerSecond(), now);
-        return new SubscriptionProfile(previousProfile.getLastRebalanceTimestamp(), new Weight(opsAvg));
-    }
+  private SubscriptionProfile applyCurrentWeight(
+      SubscriptionProfiles previousProfiles,
+      SubscriptionName subscriptionName,
+      Weight currentWeight,
+      Instant now) {
+    SubscriptionProfile previousProfile = previousProfiles.getProfile(subscriptionName);
+    Weight previousWeight = previousProfile.getWeight();
+    ExponentiallyWeightedMovingAverage average =
+        new ExponentiallyWeightedMovingAverage(weightWindowSize);
+    average.update(previousWeight.getOperationsPerSecond(), previousProfiles.getUpdateTimestamp());
+    double opsAvg = average.update(currentWeight.getOperationsPerSecond(), now);
+    return new SubscriptionProfile(previousProfile.getLastRebalanceTimestamp(), new Weight(opsAvg));
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesDecoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesDecoder.java
index e89d820222..5dc9fa755b 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesDecoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesDecoder.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 import org.agrona.concurrent.UnsafeBuffer;
 import org.slf4j.Logger;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -9,67 +15,62 @@
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.ProfilesDecoder;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.ProfilesDecoder.SubscriptionsDecoder;
 
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
 class SubscriptionProfilesDecoder {
 
-    private static final Logger logger = getLogger(SubscriptionProfilesDecoder.class);
+  private static final Logger logger = getLogger(SubscriptionProfilesDecoder.class);
 
-    private final SubscriptionIds subscriptionIds;
+  private final SubscriptionIds subscriptionIds;
 
-    SubscriptionProfilesDecoder(SubscriptionIds subscriptionIds) {
-        this.subscriptionIds = subscriptionIds;
-    }
+  SubscriptionProfilesDecoder(SubscriptionIds subscriptionIds) {
+    this.subscriptionIds = subscriptionIds;
+  }
 
-    SubscriptionProfiles decode(byte[] bytes) {
-        MessageHeaderDecoder header = new MessageHeaderDecoder();
-        ProfilesDecoder body = new ProfilesDecoder();
+  SubscriptionProfiles decode(byte[] bytes) {
+    MessageHeaderDecoder header = new MessageHeaderDecoder();
+    ProfilesDecoder body = new ProfilesDecoder();
 
-        UnsafeBuffer buffer = new UnsafeBuffer(bytes);
-        header.wrap(buffer, 0);
+    UnsafeBuffer buffer = new UnsafeBuffer(bytes);
+    header.wrap(buffer, 0);
 
-        if (header.schemaId() != ProfilesDecoder.SCHEMA_ID || header.templateId() != ProfilesDecoder.TEMPLATE_ID) {
-            logger.warn("Unable to decode subscription profiles, schema or template id mismatch. "
-                            + "Required by decoder: [schema id={}, template id={}], "
-                            + "encoded in payload: [schema id={}, template id={}]",
-                    ProfilesDecoder.SCHEMA_ID, ProfilesDecoder.TEMPLATE_ID,
-                    header.schemaId(), header.templateId());
-            return SubscriptionProfiles.EMPTY;
-        }
+    if (header.schemaId() != ProfilesDecoder.SCHEMA_ID
+        || header.templateId() != ProfilesDecoder.TEMPLATE_ID) {
+      logger.warn(
+          "Unable to decode subscription profiles, schema or template id mismatch. "
+              + "Required by decoder: [schema id={}, template id={}], "
+              + "encoded in payload: [schema id={}, template id={}]",
+          ProfilesDecoder.SCHEMA_ID,
+          ProfilesDecoder.TEMPLATE_ID,
+          header.schemaId(),
+          header.templateId());
+      return SubscriptionProfiles.EMPTY;
+    }
 
-        body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
+    body.wrap(buffer, header.encodedLength(), header.blockLength(), header.version());
 
-        return decodeSubscriptionProfiles(body);
-    }
+    return decodeSubscriptionProfiles(body);
+  }
 
-    private SubscriptionProfiles decodeSubscriptionProfiles(ProfilesDecoder body) {
-        Instant updateTimestamp = toInstant(body.updateTimestamp());
-        Map<SubscriptionName, SubscriptionProfile> subscriptionProfiles = new HashMap<>();
-        for (SubscriptionsDecoder subscriptionsDecoder : body.subscriptions()) {
-            long id = subscriptionsDecoder.id();
-            Optional<SubscriptionId> subscriptionId = subscriptionIds.getSubscriptionId(id);
-            if (subscriptionId.isPresent()) {
-                double operationsPerSecond = subscriptionsDecoder.operationsPerSecond();
-                Instant lastRebalance = toInstant(subscriptionsDecoder.lastRebalanceTimestamp());
-                SubscriptionProfile profile = new SubscriptionProfile(
-                        lastRebalance,
-                        new Weight(operationsPerSecond)
-                );
-                subscriptionProfiles.put(subscriptionId.get().getSubscriptionName(), profile);
-            }
-        }
-        return new SubscriptionProfiles(subscriptionProfiles, updateTimestamp);
+  private SubscriptionProfiles decodeSubscriptionProfiles(ProfilesDecoder body) {
+    Instant updateTimestamp = toInstant(body.updateTimestamp());
+    Map<SubscriptionName, SubscriptionProfile> subscriptionProfiles = new HashMap<>();
+    for (SubscriptionsDecoder subscriptionsDecoder : body.subscriptions()) {
+      long id = subscriptionsDecoder.id();
+      Optional<SubscriptionId> subscriptionId = subscriptionIds.getSubscriptionId(id);
+      if (subscriptionId.isPresent()) {
+        double operationsPerSecond = subscriptionsDecoder.operationsPerSecond();
+        Instant lastRebalance = toInstant(subscriptionsDecoder.lastRebalanceTimestamp());
+        SubscriptionProfile profile =
+            new SubscriptionProfile(lastRebalance, new Weight(operationsPerSecond));
+        subscriptionProfiles.put(subscriptionId.get().getSubscriptionName(), profile);
+      }
     }
+    return new SubscriptionProfiles(subscriptionProfiles, updateTimestamp);
+  }
 
-    private Instant toInstant(long millis) {
-        if (millis < 0) {
-            return Instant.MIN;
-        }
-        return Instant.ofEpochMilli(millis);
+  private Instant toInstant(long millis) {
+    if (millis < 0) {
+      return Instant.MIN;
     }
+    return Instant.ofEpochMilli(millis);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesEncoder.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesEncoder.java
index 63dafb023b..a89afc0c58 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesEncoder.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/SubscriptionProfilesEncoder.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 import org.agrona.ExpandableDirectByteBuffer;
 import org.agrona.MutableDirectBuffer;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -8,61 +12,58 @@
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.MessageHeaderEncoder;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.sbe.stubs.ProfilesEncoder;
 
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
 class SubscriptionProfilesEncoder {
 
-    private final SubscriptionIds subscriptionIds;
-    private final MutableDirectBuffer buffer;
+  private final SubscriptionIds subscriptionIds;
+  private final MutableDirectBuffer buffer;
 
-    SubscriptionProfilesEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
-        this.subscriptionIds = subscriptionIds;
-        this.buffer = new ExpandableDirectByteBuffer(bufferSize);
-    }
+  SubscriptionProfilesEncoder(SubscriptionIds subscriptionIds, int bufferSize) {
+    this.subscriptionIds = subscriptionIds;
+    this.buffer = new ExpandableDirectByteBuffer(bufferSize);
+  }
 
-    byte[] encode(SubscriptionProfiles profiles) {
-        Map<SubscriptionId, SubscriptionProfile> subscriptionProfiles = mapToSubscriptionIds(profiles);
+  byte[] encode(SubscriptionProfiles profiles) {
+    Map<SubscriptionId, SubscriptionProfile> subscriptionProfiles = mapToSubscriptionIds(profiles);
 
-        MessageHeaderEncoder headerEncoder = new MessageHeaderEncoder();
-        ProfilesEncoder body = new ProfilesEncoder()
-                .wrapAndApplyHeader(buffer, 0, headerEncoder);
+    MessageHeaderEncoder headerEncoder = new MessageHeaderEncoder();
+    ProfilesEncoder body = new ProfilesEncoder().wrapAndApplyHeader(buffer, 0, headerEncoder);
 
-        ProfilesEncoder.SubscriptionsEncoder subscriptionsEncoder = body
-                .updateTimestamp(toMillis(profiles.getUpdateTimestamp()))
-                .subscriptionsCount(subscriptionProfiles.size());
+    ProfilesEncoder.SubscriptionsEncoder subscriptionsEncoder =
+        body.updateTimestamp(toMillis(profiles.getUpdateTimestamp()))
+            .subscriptionsCount(subscriptionProfiles.size());
 
-        for (Map.Entry<SubscriptionId, SubscriptionProfile> entry : subscriptionProfiles.entrySet()) {
-            SubscriptionId subscriptionId = entry.getKey();
-            SubscriptionProfile profile = entry.getValue();
-            subscriptionsEncoder.next()
-                    .id(subscriptionId.getValue())
-                    .operationsPerSecond(profile.getWeight().getOperationsPerSecond())
-                    .lastRebalanceTimestamp(toMillis(profile.getLastRebalanceTimestamp()));
-        }
+    for (Map.Entry<SubscriptionId, SubscriptionProfile> entry : subscriptionProfiles.entrySet()) {
+      SubscriptionId subscriptionId = entry.getKey();
+      SubscriptionProfile profile = entry.getValue();
+      subscriptionsEncoder
+          .next()
+          .id(subscriptionId.getValue())
+          .operationsPerSecond(profile.getWeight().getOperationsPerSecond())
+          .lastRebalanceTimestamp(toMillis(profile.getLastRebalanceTimestamp()));
+    }
 
-        int len = headerEncoder.encodedLength() + body.encodedLength();
+    int len = headerEncoder.encodedLength() + body.encodedLength();
 
-        byte[] dst = new byte[len];
-        buffer.getBytes(0, dst);
-        return dst;
-    }
+    byte[] dst = new byte[len];
+    buffer.getBytes(0, dst);
+    return dst;
+  }
 
-    private Map<SubscriptionId, SubscriptionProfile> mapToSubscriptionIds(SubscriptionProfiles profiles) {
-        Map<SubscriptionId, SubscriptionProfile> subscriptionProfiles = new HashMap<>();
-        for (SubscriptionName subscriptionName : profiles.getSubscriptions()) {
-            Optional<SubscriptionId> subscriptionId = subscriptionIds.getSubscriptionId(subscriptionName);
-            subscriptionId.ifPresent(id -> subscriptionProfiles.put(id, profiles.getProfile(subscriptionName)));
-        }
-        return subscriptionProfiles;
+  private Map<SubscriptionId, SubscriptionProfile> mapToSubscriptionIds(
+      SubscriptionProfiles profiles) {
+    Map<SubscriptionId, SubscriptionProfile> subscriptionProfiles = new HashMap<>();
+    for (SubscriptionName subscriptionName : profiles.getSubscriptions()) {
+      Optional<SubscriptionId> subscriptionId = subscriptionIds.getSubscriptionId(subscriptionName);
+      subscriptionId.ifPresent(
+          id -> subscriptionProfiles.put(id, profiles.getProfile(subscriptionName)));
     }
+    return subscriptionProfiles;
+  }
 
-    private long toMillis(Instant timestamp) {
-        if (timestamp == Instant.MIN) {
-            return -1;
-        }
-        return timestamp.toEpochMilli();
+  private long toMillis(Instant timestamp) {
+    if (timestamp == Instant.MIN) {
+      return -1;
     }
+    return timestamp.toEpochMilli();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/TargetWeightCalculator.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/TargetWeightCalculator.java
index a8ea650fab..10e68c67b4 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/TargetWeightCalculator.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/TargetWeightCalculator.java
@@ -5,5 +5,5 @@
 
 public interface TargetWeightCalculator {
 
-    Map<String, Weight> calculate(Collection<ConsumerNode> consumers);
+  Map<String, Weight> calculate(Collection<ConsumerNode> consumers);
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/Weight.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/Weight.java
index 809f98a678..b2e787ce63 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/Weight.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/Weight.java
@@ -1,93 +1,96 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
-import java.util.Objects;
-
 import static com.google.common.base.Preconditions.checkArgument;
 
-class Weight implements Comparable<Weight> {
-
-    static final Weight ZERO = new Weight(0d);
-
-    private final double operationsPerSecond;
-
-    Weight(double operationsPerSecond) {
-        checkArgument(operationsPerSecond >= 0d, "operationsPerSecond should be greater than or equal to zero");
-        this.operationsPerSecond = operationsPerSecond;
-    }
-
-    static double calculatePercentageChange(Weight initialWeight, Weight finalWeight) {
-        checkArgument(initialWeight.operationsPerSecond > 0d, "initialWeight.operationsPerSecond should be greater than zero");
-        double delta = Math.abs(finalWeight.operationsPerSecond - initialWeight.operationsPerSecond);
-        return (delta / initialWeight.operationsPerSecond) * 100;
-    }
-
-    static Weight max(Weight first, Weight second) {
-        if (first.operationsPerSecond > second.operationsPerSecond) {
-            return first;
-        }
-        return second;
-    }
-
-    Weight add(Weight addend) {
-        return new Weight(operationsPerSecond + addend.operationsPerSecond);
-    }
-
-    Weight subtract(Weight subtrahend) {
-        return new Weight(Math.max(operationsPerSecond - subtrahend.operationsPerSecond, 0d));
-    }
-
-    Weight multiply(double multiplicand) {
-        return new Weight(operationsPerSecond * multiplicand);
-    }
-
-    Weight divide(int divisor) {
-        return new Weight(operationsPerSecond / divisor);
-    }
-
-    boolean isGreaterThan(Weight other) {
-        return operationsPerSecond > other.operationsPerSecond;
-    }
-
-    boolean isGreaterThanOrEqualTo(Weight other) {
-        return isGreaterThan(other) || isEqualTo(other);
-    }
-
-    boolean isLessThan(Weight other) {
-        return operationsPerSecond < other.operationsPerSecond;
-    }
-
-    boolean isEqualTo(Weight other) {
-        return Double.compare(operationsPerSecond, other.operationsPerSecond) == 0;
-    }
-
-    double getOperationsPerSecond() {
-        return operationsPerSecond;
-    }
-
-    @Override
-    public int compareTo(Weight o) {
-        return Double.compare(operationsPerSecond, o.operationsPerSecond);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Weight weight = (Weight) o;
-        return Double.compare(weight.operationsPerSecond, operationsPerSecond) == 0;
-    }
+import java.util.Objects;
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(operationsPerSecond);
-    }
+class Weight implements Comparable<Weight> {
 
-    @Override
-    public String toString() {
-        return "(ops=" + operationsPerSecond + ")";
-    }
+  static final Weight ZERO = new Weight(0d);
+
+  private final double operationsPerSecond;
+
+  Weight(double operationsPerSecond) {
+    checkArgument(
+        operationsPerSecond >= 0d, "operationsPerSecond should be greater than or equal to zero");
+    this.operationsPerSecond = operationsPerSecond;
+  }
+
+  static double calculatePercentageChange(Weight initialWeight, Weight finalWeight) {
+    checkArgument(
+        initialWeight.operationsPerSecond > 0d,
+        "initialWeight.operationsPerSecond should be greater than zero");
+    double delta = Math.abs(finalWeight.operationsPerSecond - initialWeight.operationsPerSecond);
+    return (delta / initialWeight.operationsPerSecond) * 100;
+  }
+
+  static Weight max(Weight first, Weight second) {
+    if (first.operationsPerSecond > second.operationsPerSecond) {
+      return first;
+    }
+    return second;
+  }
+
+  Weight add(Weight addend) {
+    return new Weight(operationsPerSecond + addend.operationsPerSecond);
+  }
+
+  Weight subtract(Weight subtrahend) {
+    return new Weight(Math.max(operationsPerSecond - subtrahend.operationsPerSecond, 0d));
+  }
+
+  Weight multiply(double multiplicand) {
+    return new Weight(operationsPerSecond * multiplicand);
+  }
+
+  Weight divide(int divisor) {
+    return new Weight(operationsPerSecond / divisor);
+  }
+
+  boolean isGreaterThan(Weight other) {
+    return operationsPerSecond > other.operationsPerSecond;
+  }
+
+  boolean isGreaterThanOrEqualTo(Weight other) {
+    return isGreaterThan(other) || isEqualTo(other);
+  }
+
+  boolean isLessThan(Weight other) {
+    return operationsPerSecond < other.operationsPerSecond;
+  }
+
+  boolean isEqualTo(Weight other) {
+    return Double.compare(operationsPerSecond, other.operationsPerSecond) == 0;
+  }
+
+  double getOperationsPerSecond() {
+    return operationsPerSecond;
+  }
+
+  @Override
+  public int compareTo(Weight o) {
+    return Double.compare(operationsPerSecond, o.operationsPerSecond);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Weight weight = (Weight) o;
+    return Double.compare(weight.operationsPerSecond, operationsPerSecond) == 0;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(operationsPerSecond);
+  }
+
+  @Override
+  public String toString() {
+    return "(ops=" + operationsPerSecond + ")";
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancer.java
index 47aec5f7cc..73e34a72d7 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancer.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancer.java
@@ -1,13 +1,10 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.SubscriptionAssignment;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.SubscriptionAssignmentView;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkBalancer;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkBalancingResult;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkloadConstraints;
+import static java.util.stream.Collectors.toCollection;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static pl.allegro.tech.hermes.consumers.supervisor.workload.weighted.ConsumerNode.LIGHTEST_CONSUMER_FIRST;
+import static pl.allegro.tech.hermes.consumers.supervisor.workload.weighted.ConsumerTask.HEAVIEST_TASK_FIRST;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -26,393 +23,435 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.IntStream;
-
-import static java.util.stream.Collectors.toCollection;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toMap;
-import static pl.allegro.tech.hermes.consumers.supervisor.workload.weighted.ConsumerNode.LIGHTEST_CONSUMER_FIRST;
-import static pl.allegro.tech.hermes.consumers.supervisor.workload.weighted.ConsumerTask.HEAVIEST_TASK_FIRST;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.SubscriptionAssignment;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.SubscriptionAssignmentView;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkBalancer;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkBalancingResult;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkloadConstraints;
 
 public class WeightedWorkBalancer implements WorkBalancer {
 
-    private static final Logger logger = LoggerFactory.getLogger(WeightedWorkBalancer.class);
-
-    private final Clock clock;
-    private final Duration stabilizationWindowSize;
-    private final double minSignificantChangePercent;
-    private final CurrentLoadProvider currentLoadProvider;
-    private final TargetWeightCalculator targetWeightCalculator;
-
-    public WeightedWorkBalancer(Clock clock,
-                                Duration stabilizationWindowSize,
-                                double minSignificantChangePercent,
-                                CurrentLoadProvider currentLoadProvider,
-                                TargetWeightCalculator targetWeightCalculator) {
-        this.clock = clock;
-        this.stabilizationWindowSize = stabilizationWindowSize;
-        this.minSignificantChangePercent = minSignificantChangePercent;
-        this.currentLoadProvider = currentLoadProvider;
-        this.targetWeightCalculator = targetWeightCalculator;
+  private static final Logger logger = LoggerFactory.getLogger(WeightedWorkBalancer.class);
+
+  private final Clock clock;
+  private final Duration stabilizationWindowSize;
+  private final double minSignificantChangePercent;
+  private final CurrentLoadProvider currentLoadProvider;
+  private final TargetWeightCalculator targetWeightCalculator;
+
+  public WeightedWorkBalancer(
+      Clock clock,
+      Duration stabilizationWindowSize,
+      double minSignificantChangePercent,
+      CurrentLoadProvider currentLoadProvider,
+      TargetWeightCalculator targetWeightCalculator) {
+    this.clock = clock;
+    this.stabilizationWindowSize = stabilizationWindowSize;
+    this.minSignificantChangePercent = minSignificantChangePercent;
+    this.currentLoadProvider = currentLoadProvider;
+    this.targetWeightCalculator = targetWeightCalculator;
+  }
+
+  @Override
+  public WorkBalancingResult balance(
+      List<SubscriptionName> subscriptions,
+      List<String> activeConsumerNodes,
+      SubscriptionAssignmentView currentState,
+      WorkloadConstraints constraints) {
+    AssignmentPlan initialPlan =
+        restoreValidAssignments(subscriptions, activeConsumerNodes, currentState, constraints);
+    AssignmentPlan planWithAllPossibleAssignments = tryAssignUnassignedTasks(initialPlan);
+    AssignmentPlan finalPlan = rebalance(planWithAllPossibleAssignments);
+    return finalPlan.toWorkBalancingResult();
+  }
+
+  private AssignmentPlan restoreValidAssignments(
+      List<SubscriptionName> subscriptions,
+      List<String> activeConsumerNodes,
+      SubscriptionAssignmentView currentState,
+      WorkloadConstraints constraints) {
+    Map<String, ConsumerNode> consumers = createConsumers(activeConsumerNodes, constraints);
+    List<ConsumerTask> unassignedTasks = new ArrayList<>();
+    SubscriptionProfiles profiles = currentLoadProvider.getProfiles();
+    for (SubscriptionName subscriptionName : subscriptions) {
+      SubscriptionProfile subscriptionProfile = profiles.getProfile(subscriptionName);
+      Queue<ConsumerTask> consumerTasks =
+          createConsumerTasks(subscriptionName, subscriptionProfile, constraints);
+      Set<String> consumerNodesForSubscription =
+          currentState.getConsumerNodesForSubscription(subscriptionName);
+      for (String consumerId : consumerNodesForSubscription) {
+        ConsumerNode consumerNode = consumers.get(consumerId);
+        if (consumerNode != null && !consumerTasks.isEmpty()) {
+          ConsumerTask consumerTask = consumerTasks.poll();
+          consumerNode.assign(consumerTask);
+        }
+      }
+      unassignedTasks.addAll(consumerTasks);
     }
-
-    @Override
-    public WorkBalancingResult balance(List<SubscriptionName> subscriptions,
-                                       List<String> activeConsumerNodes,
-                                       SubscriptionAssignmentView currentState,
-                                       WorkloadConstraints constraints) {
-        AssignmentPlan initialPlan = restoreValidAssignments(subscriptions, activeConsumerNodes, currentState, constraints);
-        AssignmentPlan planWithAllPossibleAssignments = tryAssignUnassignedTasks(initialPlan);
-        AssignmentPlan finalPlan = rebalance(planWithAllPossibleAssignments);
-        return finalPlan.toWorkBalancingResult();
-    }
-
-    private AssignmentPlan restoreValidAssignments(List<SubscriptionName> subscriptions,
-                                                   List<String> activeConsumerNodes,
-                                                   SubscriptionAssignmentView currentState,
-                                                   WorkloadConstraints constraints) {
-        Map<String, ConsumerNode> consumers = createConsumers(activeConsumerNodes, constraints);
-        List<ConsumerTask> unassignedTasks = new ArrayList<>();
-        SubscriptionProfiles profiles = currentLoadProvider.getProfiles();
-        for (SubscriptionName subscriptionName : subscriptions) {
-            SubscriptionProfile subscriptionProfile = profiles.getProfile(subscriptionName);
-            Queue<ConsumerTask> consumerTasks = createConsumerTasks(subscriptionName, subscriptionProfile, constraints);
-            Set<String> consumerNodesForSubscription = currentState.getConsumerNodesForSubscription(subscriptionName);
-            for (String consumerId : consumerNodesForSubscription) {
-                ConsumerNode consumerNode = consumers.get(consumerId);
-                if (consumerNode != null && !consumerTasks.isEmpty()) {
-                    ConsumerTask consumerTask = consumerTasks.poll();
-                    consumerNode.assign(consumerTask);
-                }
-            }
-            unassignedTasks.addAll(consumerTasks);
-        }
-        return new AssignmentPlan(unassignedTasks, consumers.values());
-    }
-
-    private Map<String, ConsumerNode> createConsumers(List<String> activeConsumerNodes, WorkloadConstraints constraints) {
-        return activeConsumerNodes.stream()
-                .map(consumerId -> {
-                    ConsumerNodeLoad consumerNodeLoad = currentLoadProvider.getConsumerNodeLoad(consumerId);
-                    return new ConsumerNode(consumerId, consumerNodeLoad, constraints.getMaxSubscriptionsPerConsumer());
-                })
-                .collect(toMap(ConsumerNode::getConsumerId, Function.identity()));
-    }
-
-    private Queue<ConsumerTask> createConsumerTasks(SubscriptionName subscriptionName,
-                                                    SubscriptionProfile subscriptionProfile,
-                                                    WorkloadConstraints constraints) {
-        int consumerCount = constraints.getConsumerCount(subscriptionName);
-        return IntStream.range(0, consumerCount)
-                .mapToObj(ignore -> new ConsumerTask(subscriptionName, subscriptionProfile))
-                .collect(toCollection(ArrayDeque::new));
-    }
-
-    private AssignmentPlan tryAssignUnassignedTasks(AssignmentPlan assignmentPlan) {
-        PriorityQueue<ConsumerTask> tasksToAssign = new PriorityQueue<>(HEAVIEST_TASK_FIRST);
-        tasksToAssign.addAll(assignmentPlan.getUnassignedTasks());
-        List<ConsumerTask> unassignedTasks = new ArrayList<>();
-        while (!tasksToAssign.isEmpty()) {
-            ConsumerTask consumerTask = tasksToAssign.poll();
-            Optional<ConsumerNode> candidate = selectConsumerNode(consumerTask, assignmentPlan.getConsumers());
-            if (candidate.isPresent()) {
-                candidate.get().assign(consumerTask);
-            } else {
-                unassignedTasks.add(consumerTask);
-            }
-        }
-        return new AssignmentPlan(unassignedTasks, assignmentPlan.getConsumers());
-    }
-
-    private Optional<ConsumerNode> selectConsumerNode(ConsumerTask consumerTask, Collection<ConsumerNode> consumers) {
-        return consumers.stream()
-                .filter(consumerNode -> consumerNode.isNotAssigned(consumerTask))
-                .filter(consumerNode -> !consumerNode.isFull())
-                .min(LIGHTEST_CONSUMER_FIRST);
-    }
-
-    private AssignmentPlan rebalance(AssignmentPlan plan) {
-        Collection<ConsumerNode> consumers = plan.getConsumers();
-        TargetConsumerLoad targetLoad = calculateTargetConsumerLoad(consumers);
-        List<ConsumerNode> overloadedConsumers = consumers.stream()
-                .filter(consumerNode -> isOverloaded(consumerNode, targetLoad))
-                .sorted(new MostOverloadedConsumerFirst(targetLoad))
-                .collect(toList());
-        for (ConsumerNode overloaded : overloadedConsumers) {
-            List<ConsumerNode> candidates = consumers.stream()
-                    .filter(consumer -> !consumer.equals(overloaded))
-                    .collect(toList());
-            for (ConsumerNode candidate : candidates) {
-                tryMoveOutTasks(overloaded, candidate, targetLoad);
-                trySwapTasks(overloaded, candidate, targetLoad);
-                if (isBalanced(overloaded, targetLoad)) {
-                    break;
-                }
-            }
-        }
-        return new AssignmentPlan(plan.getUnassignedTasks(), consumers);
+    return new AssignmentPlan(unassignedTasks, consumers.values());
+  }
+
+  private Map<String, ConsumerNode> createConsumers(
+      List<String> activeConsumerNodes, WorkloadConstraints constraints) {
+    return activeConsumerNodes.stream()
+        .map(
+            consumerId -> {
+              ConsumerNodeLoad consumerNodeLoad =
+                  currentLoadProvider.getConsumerNodeLoad(consumerId);
+              return new ConsumerNode(
+                  consumerId, consumerNodeLoad, constraints.getMaxSubscriptionsPerConsumer());
+            })
+        .collect(toMap(ConsumerNode::getConsumerId, Function.identity()));
+  }
+
+  private Queue<ConsumerTask> createConsumerTasks(
+      SubscriptionName subscriptionName,
+      SubscriptionProfile subscriptionProfile,
+      WorkloadConstraints constraints) {
+    int consumerCount = constraints.getConsumerCount(subscriptionName);
+    return IntStream.range(0, consumerCount)
+        .mapToObj(ignore -> new ConsumerTask(subscriptionName, subscriptionProfile))
+        .collect(toCollection(ArrayDeque::new));
+  }
+
+  private AssignmentPlan tryAssignUnassignedTasks(AssignmentPlan assignmentPlan) {
+    PriorityQueue<ConsumerTask> tasksToAssign = new PriorityQueue<>(HEAVIEST_TASK_FIRST);
+    tasksToAssign.addAll(assignmentPlan.getUnassignedTasks());
+    List<ConsumerTask> unassignedTasks = new ArrayList<>();
+    while (!tasksToAssign.isEmpty()) {
+      ConsumerTask consumerTask = tasksToAssign.poll();
+      Optional<ConsumerNode> candidate =
+          selectConsumerNode(consumerTask, assignmentPlan.getConsumers());
+      if (candidate.isPresent()) {
+        candidate.get().assign(consumerTask);
+      } else {
+        unassignedTasks.add(consumerTask);
+      }
     }
-
-    private TargetConsumerLoad calculateTargetConsumerLoad(Collection<ConsumerNode> consumers) {
-        int totalNumberOfTasks = consumers.stream().mapToInt(ConsumerNode::getAssignedTaskCount).sum();
-        int consumerCount = consumers.size();
-        int maxNumberOfTasksPerConsumer = consumerCount == 0 ? 0 : divideWithRoundingUp(totalNumberOfTasks, consumerCount);
-        Map<String, Weight> targetWeights = targetWeightCalculator.calculate(consumers);
-        return new TargetConsumerLoad(targetWeights, maxNumberOfTasksPerConsumer);
+    return new AssignmentPlan(unassignedTasks, assignmentPlan.getConsumers());
+  }
+
+  private Optional<ConsumerNode> selectConsumerNode(
+      ConsumerTask consumerTask, Collection<ConsumerNode> consumers) {
+    return consumers.stream()
+        .filter(consumerNode -> consumerNode.isNotAssigned(consumerTask))
+        .filter(consumerNode -> !consumerNode.isFull())
+        .min(LIGHTEST_CONSUMER_FIRST);
+  }
+
+  private AssignmentPlan rebalance(AssignmentPlan plan) {
+    Collection<ConsumerNode> consumers = plan.getConsumers();
+    TargetConsumerLoad targetLoad = calculateTargetConsumerLoad(consumers);
+    List<ConsumerNode> overloadedConsumers =
+        consumers.stream()
+            .filter(consumerNode -> isOverloaded(consumerNode, targetLoad))
+            .sorted(new MostOverloadedConsumerFirst(targetLoad))
+            .collect(toList());
+    for (ConsumerNode overloaded : overloadedConsumers) {
+      List<ConsumerNode> candidates =
+          consumers.stream().filter(consumer -> !consumer.equals(overloaded)).collect(toList());
+      for (ConsumerNode candidate : candidates) {
+        tryMoveOutTasks(overloaded, candidate, targetLoad);
+        trySwapTasks(overloaded, candidate, targetLoad);
+        if (isBalanced(overloaded, targetLoad)) {
+          break;
+        }
+      }
     }
-
-    private int divideWithRoundingUp(int dividend, int divisor) {
-        return (dividend / divisor) + (dividend % divisor > 0 ? 1 : 0);
+    return new AssignmentPlan(plan.getUnassignedTasks(), consumers);
+  }
+
+  private TargetConsumerLoad calculateTargetConsumerLoad(Collection<ConsumerNode> consumers) {
+    int totalNumberOfTasks = consumers.stream().mapToInt(ConsumerNode::getAssignedTaskCount).sum();
+    int consumerCount = consumers.size();
+    int maxNumberOfTasksPerConsumer =
+        consumerCount == 0 ? 0 : divideWithRoundingUp(totalNumberOfTasks, consumerCount);
+    Map<String, Weight> targetWeights = targetWeightCalculator.calculate(consumers);
+    return new TargetConsumerLoad(targetWeights, maxNumberOfTasksPerConsumer);
+  }
+
+  private int divideWithRoundingUp(int dividend, int divisor) {
+    return (dividend / divisor) + (dividend % divisor > 0 ? 1 : 0);
+  }
+
+  private void tryMoveOutTasks(
+      ConsumerNode overloaded, ConsumerNode candidate, TargetConsumerLoad targetLoad) {
+    List<ConsumerTask> candidatesToMoveOut =
+        overloaded.getAssignedTasks().stream().filter(candidate::isNotAssigned).collect(toList());
+    ListIterator<ConsumerTask> consumerTaskIterator = candidatesToMoveOut.listIterator();
+    while (consumerTaskIterator.hasNext()
+        && hasTooManyTasks(overloaded, targetLoad)
+        && !hasTooManyTasks(candidate, targetLoad)) {
+      ConsumerTask taskFromOverloaded = consumerTaskIterator.next();
+      MoveOutProposal proposal = new MoveOutProposal(overloaded, candidate, taskFromOverloaded);
+      if (isProfitable(proposal, targetLoad)) {
+        overloaded.unassign(taskFromOverloaded);
+        candidate.assign(taskFromOverloaded);
+      }
     }
-
-    private void tryMoveOutTasks(ConsumerNode overloaded, ConsumerNode candidate, TargetConsumerLoad targetLoad) {
-        List<ConsumerTask> candidatesToMoveOut = overloaded.getAssignedTasks().stream()
-                .filter(candidate::isNotAssigned)
-                .collect(toList());
-        ListIterator<ConsumerTask> consumerTaskIterator = candidatesToMoveOut.listIterator();
-        while (consumerTaskIterator.hasNext() && hasTooManyTasks(overloaded, targetLoad) && !hasTooManyTasks(candidate, targetLoad)) {
-            ConsumerTask taskFromOverloaded = consumerTaskIterator.next();
-            MoveOutProposal proposal = new MoveOutProposal(overloaded, candidate, taskFromOverloaded);
-            if (isProfitable(proposal, targetLoad)) {
-                overloaded.unassign(taskFromOverloaded);
-                candidate.assign(taskFromOverloaded);
-            }
-        }
+  }
+
+  private boolean hasTooManyTasks(
+      ConsumerNode consumerNode, TargetConsumerLoad targetConsumerLoad) {
+    return consumerNode.getAssignedTaskCount() >= targetConsumerLoad.getNumberOfTasks();
+  }
+
+  private boolean isProfitable(MoveOutProposal proposal, TargetConsumerLoad targetLoad) {
+    Weight targetWeight = targetLoad.getWeightForConsumer(proposal.getCandidateId());
+    if (targetWeight.isGreaterThanOrEqualTo(proposal.getFinalCandidateWeight())) {
+      logger.debug("MoveOut proposal will be applied:\n{}", proposal);
+      return true;
     }
-
-    private boolean hasTooManyTasks(ConsumerNode consumerNode, TargetConsumerLoad targetConsumerLoad) {
-        return consumerNode.getAssignedTaskCount() >= targetConsumerLoad.getNumberOfTasks();
+    return false;
+  }
+
+  private boolean isProfitable(SwapProposal proposal, TargetConsumerLoad targetLoad) {
+    Weight initialOverloadedWeight = proposal.getOverloadedWeight();
+    Weight finalOverloadedWeight = proposal.getFinalOverloadedWeight();
+    Weight finalCandidateWeight = proposal.getFinalCandidateWeight();
+    Weight overloadedTargetWeight = targetLoad.getWeightForConsumer(proposal.getOverloadedId());
+    Weight candidateTargetWeight = targetLoad.getWeightForConsumer(proposal.getCandidateId());
+
+    if (initialOverloadedWeight.isLessThan(overloadedTargetWeight)) {
+      return false;
     }
-
-    private boolean isProfitable(MoveOutProposal proposal, TargetConsumerLoad targetLoad) {
-        Weight targetWeight = targetLoad.getWeightForConsumer(proposal.getCandidateId());
-        if (targetWeight.isGreaterThanOrEqualTo(proposal.getFinalCandidateWeight())) {
-            logger.debug("MoveOut proposal will be applied:\n{}", proposal);
-            return true;
-        }
-        return false;
+    if (finalCandidateWeight.isGreaterThan(candidateTargetWeight)) {
+      return false;
     }
-
-    private boolean isProfitable(SwapProposal proposal, TargetConsumerLoad targetLoad) {
-        Weight initialOverloadedWeight = proposal.getOverloadedWeight();
-        Weight finalOverloadedWeight = proposal.getFinalOverloadedWeight();
-        Weight finalCandidateWeight = proposal.getFinalCandidateWeight();
-        Weight overloadedTargetWeight = targetLoad.getWeightForConsumer(proposal.getOverloadedId());
-        Weight candidateTargetWeight = targetLoad.getWeightForConsumer(proposal.getCandidateId());
-
-        if (initialOverloadedWeight.isLessThan(overloadedTargetWeight)) {
-            return false;
-        }
-        if (finalCandidateWeight.isGreaterThan(candidateTargetWeight)) {
-            return false;
-        }
-        if (finalOverloadedWeight.isGreaterThan(initialOverloadedWeight)) {
-            return false;
-        }
-        if (initialOverloadedWeight.isEqualTo(Weight.ZERO)) {
-            return false;
-        }
-        double percentageChange = Weight.calculatePercentageChange(initialOverloadedWeight, finalOverloadedWeight);
-        if (percentageChange >= minSignificantChangePercent) {
-            logger.debug("Swap proposal will be applied:\n{}", proposal);
-            return true;
-        }
-        return false;
-    }
-
-    private void trySwapTasks(ConsumerNode overloaded, ConsumerNode candidate, TargetConsumerLoad targetLoad) {
-        List<ConsumerTask> tasksFromOverloaded = findTasksForMovingOut(overloaded, candidate);
-        List<ConsumerTask> tasksFromCandidate = findTasksForMovingOut(candidate, overloaded);
-        for (ConsumerTask taskFromOverloaded : tasksFromOverloaded) {
-            ListIterator<ConsumerTask> tasksFromCandidateIterator = tasksFromCandidate.listIterator();
-            while (tasksFromCandidateIterator.hasNext()) {
-                ConsumerTask taskFromCandidate = tasksFromCandidateIterator.next();
-                SwapProposal proposal = new SwapProposal(overloaded, candidate, taskFromOverloaded, taskFromCandidate);
-                if (isProfitable(proposal, targetLoad)) {
-                    overloaded.swap(taskFromOverloaded, taskFromCandidate);
-                    candidate.swap(taskFromCandidate, taskFromOverloaded);
-                    tasksFromCandidateIterator.remove();
-                }
-                if (isBalanced(overloaded, targetLoad)) {
-                    return;
-                }
-            }
-        }
+    if (finalOverloadedWeight.isGreaterThan(initialOverloadedWeight)) {
+      return false;
     }
-
-    private List<ConsumerTask> findTasksForMovingOut(ConsumerNode source, ConsumerNode destination) {
-        return source.getAssignedTasks().stream()
-                .filter(destination::isNotAssigned)
-                .filter(this::isStable)
-                .sorted(HEAVIEST_TASK_FIRST)
-                .collect(toList());
+    if (initialOverloadedWeight.isEqualTo(Weight.ZERO)) {
+      return false;
     }
-
-    private boolean isStable(ConsumerTask task) {
-        return clock.instant().isAfter(task.getLastRebalanceTimestamp().plus(stabilizationWindowSize));
+    double percentageChange =
+        Weight.calculatePercentageChange(initialOverloadedWeight, finalOverloadedWeight);
+    if (percentageChange >= minSignificantChangePercent) {
+      logger.debug("Swap proposal will be applied:\n{}", proposal);
+      return true;
     }
-
-    private boolean isOverloaded(ConsumerNode consumerNode, TargetConsumerLoad targetLoad) {
-        Weight targetWeight = targetLoad.getWeightForConsumer(consumerNode.getConsumerId());
-        return consumerNode.getWeight().isGreaterThan(targetWeight)
-                || consumerNode.getAssignedTaskCount() > targetLoad.getNumberOfTasks();
+    return false;
+  }
+
+  private void trySwapTasks(
+      ConsumerNode overloaded, ConsumerNode candidate, TargetConsumerLoad targetLoad) {
+    List<ConsumerTask> tasksFromOverloaded = findTasksForMovingOut(overloaded, candidate);
+    List<ConsumerTask> tasksFromCandidate = findTasksForMovingOut(candidate, overloaded);
+    for (ConsumerTask taskFromOverloaded : tasksFromOverloaded) {
+      ListIterator<ConsumerTask> tasksFromCandidateIterator = tasksFromCandidate.listIterator();
+      while (tasksFromCandidateIterator.hasNext()) {
+        ConsumerTask taskFromCandidate = tasksFromCandidateIterator.next();
+        SwapProposal proposal =
+            new SwapProposal(overloaded, candidate, taskFromOverloaded, taskFromCandidate);
+        if (isProfitable(proposal, targetLoad)) {
+          overloaded.swap(taskFromOverloaded, taskFromCandidate);
+          candidate.swap(taskFromCandidate, taskFromOverloaded);
+          tasksFromCandidateIterator.remove();
+        }
+        if (isBalanced(overloaded, targetLoad)) {
+          return;
+        }
+      }
     }
-
-    private boolean isBalanced(ConsumerNode consumerNode, TargetConsumerLoad targetLoad) {
-        Weight targetWeight = targetLoad.getWeightForConsumer(consumerNode.getConsumerId());
-        return consumerNode.getWeight().isEqualTo(targetWeight)
-                && consumerNode.getAssignedTaskCount() <= targetLoad.getNumberOfTasks();
+  }
+
+  private List<ConsumerTask> findTasksForMovingOut(ConsumerNode source, ConsumerNode destination) {
+    return source.getAssignedTasks().stream()
+        .filter(destination::isNotAssigned)
+        .filter(this::isStable)
+        .sorted(HEAVIEST_TASK_FIRST)
+        .collect(toList());
+  }
+
+  private boolean isStable(ConsumerTask task) {
+    return clock.instant().isAfter(task.getLastRebalanceTimestamp().plus(stabilizationWindowSize));
+  }
+
+  private boolean isOverloaded(ConsumerNode consumerNode, TargetConsumerLoad targetLoad) {
+    Weight targetWeight = targetLoad.getWeightForConsumer(consumerNode.getConsumerId());
+    return consumerNode.getWeight().isGreaterThan(targetWeight)
+        || consumerNode.getAssignedTaskCount() > targetLoad.getNumberOfTasks();
+  }
+
+  private boolean isBalanced(ConsumerNode consumerNode, TargetConsumerLoad targetLoad) {
+    Weight targetWeight = targetLoad.getWeightForConsumer(consumerNode.getConsumerId());
+    return consumerNode.getWeight().isEqualTo(targetWeight)
+        && consumerNode.getAssignedTaskCount() <= targetLoad.getNumberOfTasks();
+  }
+
+  private static class AssignmentPlan {
+
+    private final List<ConsumerTask> unassignedTasks;
+    private final Collection<ConsumerNode> consumers;
+
+    AssignmentPlan(List<ConsumerTask> unassignedTasks, Collection<ConsumerNode> consumers) {
+      this.unassignedTasks = unassignedTasks;
+      this.consumers = consumers;
     }
 
-    private static class AssignmentPlan {
-
-        private final List<ConsumerTask> unassignedTasks;
-        private final Collection<ConsumerNode> consumers;
-
-        AssignmentPlan(List<ConsumerTask> unassignedTasks, Collection<ConsumerNode> consumers) {
-            this.unassignedTasks = unassignedTasks;
-            this.consumers = consumers;
-        }
-
-        Collection<ConsumerNode> getConsumers() {
-            return consumers;
-        }
-
-        List<ConsumerTask> getUnassignedTasks() {
-            return unassignedTasks;
-        }
+    Collection<ConsumerNode> getConsumers() {
+      return consumers;
+    }
 
-        WorkBalancingResult toWorkBalancingResult() {
-            Map<SubscriptionName, Set<SubscriptionAssignment>> targetView = new HashMap<>();
-            for (ConsumerNode consumer : consumers) {
-                for (ConsumerTask consumerTask : consumer.getAssignedTasks()) {
-                    SubscriptionName subscriptionName = consumerTask.getSubscriptionName();
-                    Set<SubscriptionAssignment> assignments = targetView.computeIfAbsent(subscriptionName, ignore -> new HashSet<>());
-                    assignments.add(new SubscriptionAssignment(consumer.getConsumerId(), subscriptionName));
-                }
-            }
-            return new WorkBalancingResult(new SubscriptionAssignmentView(targetView), unassignedTasks.size());
-        }
+    List<ConsumerTask> getUnassignedTasks() {
+      return unassignedTasks;
     }
 
-    private static class MoveOutProposal {
+    WorkBalancingResult toWorkBalancingResult() {
+      Map<SubscriptionName, Set<SubscriptionAssignment>> targetView = new HashMap<>();
+      for (ConsumerNode consumer : consumers) {
+        for (ConsumerTask consumerTask : consumer.getAssignedTasks()) {
+          SubscriptionName subscriptionName = consumerTask.getSubscriptionName();
+          Set<SubscriptionAssignment> assignments =
+              targetView.computeIfAbsent(subscriptionName, ignore -> new HashSet<>());
+          assignments.add(new SubscriptionAssignment(consumer.getConsumerId(), subscriptionName));
+        }
+      }
+      return new WorkBalancingResult(
+          new SubscriptionAssignmentView(targetView), unassignedTasks.size());
+    }
+  }
 
-        private final ConsumerNode overloaded;
-        private final ConsumerNode candidate;
-        private final Weight finalOverloadedWeight;
-        private final Weight finalCandidateWeight;
+  private static class MoveOutProposal {
 
-        MoveOutProposal(ConsumerNode overloaded, ConsumerNode candidate, ConsumerTask taskFromOverloaded) {
-            this.overloaded = overloaded;
-            this.candidate = candidate;
-            this.finalOverloadedWeight = overloaded.getWeight()
-                    .subtract(taskFromOverloaded.getWeight());
-            this.finalCandidateWeight = candidate.getWeight()
-                    .add(taskFromOverloaded.getWeight());
-        }
+    private final ConsumerNode overloaded;
+    private final ConsumerNode candidate;
+    private final Weight finalOverloadedWeight;
+    private final Weight finalCandidateWeight;
 
-        Weight getFinalCandidateWeight() {
-            return finalCandidateWeight;
-        }
+    MoveOutProposal(
+        ConsumerNode overloaded, ConsumerNode candidate, ConsumerTask taskFromOverloaded) {
+      this.overloaded = overloaded;
+      this.candidate = candidate;
+      this.finalOverloadedWeight = overloaded.getWeight().subtract(taskFromOverloaded.getWeight());
+      this.finalCandidateWeight = candidate.getWeight().add(taskFromOverloaded.getWeight());
+    }
 
-        String getCandidateId() {
-            return candidate.getConsumerId();
-        }
+    Weight getFinalCandidateWeight() {
+      return finalCandidateWeight;
+    }
 
-        @Override
-        public String toString() {
-            return toString(overloaded, finalOverloadedWeight) + "\n" + toString(candidate, finalCandidateWeight);
-        }
+    String getCandidateId() {
+      return candidate.getConsumerId();
+    }
 
-        private String toString(ConsumerNode consumerNode, Weight newWeight) {
-            return consumerNode + " (old weight = " + consumerNode.getWeight() + ", new weight = " + newWeight + ")";
-        }
+    @Override
+    public String toString() {
+      return toString(overloaded, finalOverloadedWeight)
+          + "\n"
+          + toString(candidate, finalCandidateWeight);
     }
 
-    private static class SwapProposal {
-
-        private final ConsumerNode overloaded;
-        private final ConsumerNode candidate;
-        private final Weight finalOverloadedWeight;
-        private final Weight finalCandidateWeight;
-
-        SwapProposal(ConsumerNode overloaded,
-                     ConsumerNode candidate,
-                     ConsumerTask taskFromOverloaded,
-                     ConsumerTask taskFromCandidate) {
-            this.overloaded = overloaded;
-            this.candidate = candidate;
-            this.finalOverloadedWeight = overloaded.getWeight()
-                    .add(taskFromCandidate.getWeight())
-                    .subtract(taskFromOverloaded.getWeight());
-            this.finalCandidateWeight = candidate.getWeight()
-                    .add(taskFromOverloaded.getWeight())
-                    .subtract(taskFromCandidate.getWeight());
-        }
+    private String toString(ConsumerNode consumerNode, Weight newWeight) {
+      return consumerNode
+          + " (old weight = "
+          + consumerNode.getWeight()
+          + ", new weight = "
+          + newWeight
+          + ")";
+    }
+  }
+
+  private static class SwapProposal {
+
+    private final ConsumerNode overloaded;
+    private final ConsumerNode candidate;
+    private final Weight finalOverloadedWeight;
+    private final Weight finalCandidateWeight;
+
+    SwapProposal(
+        ConsumerNode overloaded,
+        ConsumerNode candidate,
+        ConsumerTask taskFromOverloaded,
+        ConsumerTask taskFromCandidate) {
+      this.overloaded = overloaded;
+      this.candidate = candidate;
+      this.finalOverloadedWeight =
+          overloaded
+              .getWeight()
+              .add(taskFromCandidate.getWeight())
+              .subtract(taskFromOverloaded.getWeight());
+      this.finalCandidateWeight =
+          candidate
+              .getWeight()
+              .add(taskFromOverloaded.getWeight())
+              .subtract(taskFromCandidate.getWeight());
+    }
 
-        Weight getOverloadedWeight() {
-            return overloaded.getWeight();
-        }
+    Weight getOverloadedWeight() {
+      return overloaded.getWeight();
+    }
 
-        Weight getFinalOverloadedWeight() {
-            return finalOverloadedWeight;
-        }
+    Weight getFinalOverloadedWeight() {
+      return finalOverloadedWeight;
+    }
 
-        Weight getFinalCandidateWeight() {
-            return finalCandidateWeight;
-        }
+    Weight getFinalCandidateWeight() {
+      return finalCandidateWeight;
+    }
 
-        String getCandidateId() {
-            return candidate.getConsumerId();
-        }
+    String getCandidateId() {
+      return candidate.getConsumerId();
+    }
 
-        String getOverloadedId() {
-            return overloaded.getConsumerId();
-        }
+    String getOverloadedId() {
+      return overloaded.getConsumerId();
+    }
 
-        @Override
-        public String toString() {
-            return toString(overloaded, finalOverloadedWeight) + "\n" + toString(candidate, finalCandidateWeight);
-        }
+    @Override
+    public String toString() {
+      return toString(overloaded, finalOverloadedWeight)
+          + "\n"
+          + toString(candidate, finalCandidateWeight);
+    }
 
-        private String toString(ConsumerNode consumerNode, Weight newWeight) {
-            return consumerNode + " (old weight = " + consumerNode.getWeight() + ", new weight = " + newWeight + ")";
-        }
+    private String toString(ConsumerNode consumerNode, Weight newWeight) {
+      return consumerNode
+          + " (old weight = "
+          + consumerNode.getWeight()
+          + ", new weight = "
+          + newWeight
+          + ")";
     }
+  }
 
-    private static class TargetConsumerLoad {
+  private static class TargetConsumerLoad {
 
-        private final Map<String, Weight> weights;
-        private final int numberOfTasks;
+    private final Map<String, Weight> weights;
+    private final int numberOfTasks;
 
-        TargetConsumerLoad(Map<String, Weight> weights, int numberOfTasks) {
-            this.weights = weights;
-            this.numberOfTasks = numberOfTasks;
-        }
+    TargetConsumerLoad(Map<String, Weight> weights, int numberOfTasks) {
+      this.weights = weights;
+      this.numberOfTasks = numberOfTasks;
+    }
 
-        Weight getWeightForConsumer(String consumerId) {
-            return weights.get(consumerId);
-        }
+    Weight getWeightForConsumer(String consumerId) {
+      return weights.get(consumerId);
+    }
 
-        int getNumberOfTasks() {
-            return numberOfTasks;
-        }
+    int getNumberOfTasks() {
+      return numberOfTasks;
     }
+  }
 
-    private static class MostOverloadedConsumerFirst implements Comparator<ConsumerNode> {
+  private static class MostOverloadedConsumerFirst implements Comparator<ConsumerNode> {
 
-        private final TargetConsumerLoad targetLoad;
+    private final TargetConsumerLoad targetLoad;
 
-        MostOverloadedConsumerFirst(TargetConsumerLoad targetLoad) {
-            this.targetLoad = targetLoad;
-        }
+    MostOverloadedConsumerFirst(TargetConsumerLoad targetLoad) {
+      this.targetLoad = targetLoad;
+    }
 
-        @Override
-        public int compare(ConsumerNode first, ConsumerNode second) {
-            Weight firstTargetLoad = targetLoad.getWeightForConsumer(first.getConsumerId());
-            Weight secondTargetLoad = targetLoad.getWeightForConsumer(second.getConsumerId());
-            Weight firstError = first.getWeight().subtract(firstTargetLoad);
-            Weight secondError = second.getWeight().subtract(secondTargetLoad);
-            return secondError.compareTo(firstError);
-        }
+    @Override
+    public int compare(ConsumerNode first, ConsumerNode second) {
+      Weight firstTargetLoad = targetLoad.getWeightForConsumer(first.getConsumerId());
+      Weight secondTargetLoad = targetLoad.getWeightForConsumer(second.getConsumerId());
+      Weight firstError = first.getWeight().subtract(firstTargetLoad);
+      Weight secondError = second.getWeight().subtract(secondTargetLoad);
+      return secondError.compareTo(firstError);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancingListener.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancingListener.java
index 3cf6c6f745..933cb64924 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancingListener.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancingListener.java
@@ -1,8 +1,6 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.BalancingListener;
-import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkDistributionChanges;
+import static java.util.stream.Collectors.toMap;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -13,73 +11,82 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
-
-import static java.util.stream.Collectors.toMap;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.BalancingListener;
+import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkDistributionChanges;
 
 public class WeightedWorkBalancingListener implements BalancingListener {
 
-    private final ConsumerNodeLoadRegistry consumerNodeLoadRegistry;
-    private final SubscriptionProfileRegistry subscriptionProfileRegistry;
-    private final CurrentLoadProvider currentLoadProvider;
-    private final WeightedWorkloadMetricsReporter weightedWorkloadMetrics;
-    private final SubscriptionProfilesCalculator subscriptionProfilesCalculator;
-    private final Clock clock;
+  private final ConsumerNodeLoadRegistry consumerNodeLoadRegistry;
+  private final SubscriptionProfileRegistry subscriptionProfileRegistry;
+  private final CurrentLoadProvider currentLoadProvider;
+  private final WeightedWorkloadMetricsReporter weightedWorkloadMetrics;
+  private final SubscriptionProfilesCalculator subscriptionProfilesCalculator;
+  private final Clock clock;
 
-    public WeightedWorkBalancingListener(ConsumerNodeLoadRegistry consumerNodeLoadRegistry,
-                                         SubscriptionProfileRegistry subscriptionProfileRegistry,
-                                         CurrentLoadProvider currentLoadProvider,
-                                         WeightedWorkloadMetricsReporter weightedWorkloadMetrics,
-                                         Clock clock,
-                                         Duration weightWindowSize) {
-        this.consumerNodeLoadRegistry = consumerNodeLoadRegistry;
-        this.subscriptionProfileRegistry = subscriptionProfileRegistry;
-        this.currentLoadProvider = currentLoadProvider;
-        this.weightedWorkloadMetrics = weightedWorkloadMetrics;
-        this.subscriptionProfilesCalculator = new SubscriptionProfilesCalculator(clock, weightWindowSize);
-        this.clock = clock;
-    }
+  public WeightedWorkBalancingListener(
+      ConsumerNodeLoadRegistry consumerNodeLoadRegistry,
+      SubscriptionProfileRegistry subscriptionProfileRegistry,
+      CurrentLoadProvider currentLoadProvider,
+      WeightedWorkloadMetricsReporter weightedWorkloadMetrics,
+      Clock clock,
+      Duration weightWindowSize) {
+    this.consumerNodeLoadRegistry = consumerNodeLoadRegistry;
+    this.subscriptionProfileRegistry = subscriptionProfileRegistry;
+    this.currentLoadProvider = currentLoadProvider;
+    this.weightedWorkloadMetrics = weightedWorkloadMetrics;
+    this.subscriptionProfilesCalculator =
+        new SubscriptionProfilesCalculator(clock, weightWindowSize);
+    this.clock = clock;
+  }
 
-    @Override
-    public void onBeforeBalancing(List<String> activeConsumers) {
-        weightedWorkloadMetrics.unregisterMetricsForConsumersOtherThan(new HashSet<>(activeConsumers));
-        Map<String, ConsumerNodeLoad> newConsumerLoads = fetchConsumerNodeLoads(activeConsumers);
-        currentLoadProvider.updateConsumerNodeLoads(newConsumerLoads);
-        SubscriptionProfiles currentProfiles = recalculateSubscriptionProfiles(newConsumerLoads.values());
-        currentLoadProvider.updateProfiles(currentProfiles);
-    }
+  @Override
+  public void onBeforeBalancing(List<String> activeConsumers) {
+    weightedWorkloadMetrics.unregisterMetricsForConsumersOtherThan(new HashSet<>(activeConsumers));
+    Map<String, ConsumerNodeLoad> newConsumerLoads = fetchConsumerNodeLoads(activeConsumers);
+    currentLoadProvider.updateConsumerNodeLoads(newConsumerLoads);
+    SubscriptionProfiles currentProfiles =
+        recalculateSubscriptionProfiles(newConsumerLoads.values());
+    currentLoadProvider.updateProfiles(currentProfiles);
+  }
 
-    private Map<String, ConsumerNodeLoad> fetchConsumerNodeLoads(List<String> activeConsumers) {
-        return activeConsumers.stream()
-                .collect(toMap(Function.identity(), consumerNodeLoadRegistry::get));
-    }
+  private Map<String, ConsumerNodeLoad> fetchConsumerNodeLoads(List<String> activeConsumers) {
+    return activeConsumers.stream()
+        .collect(toMap(Function.identity(), consumerNodeLoadRegistry::get));
+  }
 
-    private SubscriptionProfiles recalculateSubscriptionProfiles(Collection<ConsumerNodeLoad> consumerNodeLoads) {
-        SubscriptionProfiles previousProfiles = subscriptionProfileRegistry.fetch();
-        return subscriptionProfilesCalculator.calculate(consumerNodeLoads, previousProfiles);
-    }
+  private SubscriptionProfiles recalculateSubscriptionProfiles(
+      Collection<ConsumerNodeLoad> consumerNodeLoads) {
+    SubscriptionProfiles previousProfiles = subscriptionProfileRegistry.fetch();
+    return subscriptionProfilesCalculator.calculate(consumerNodeLoads, previousProfiles);
+  }
 
-    @Override
-    public void onAfterBalancing(WorkDistributionChanges changes) {
-        applyRebalanceTimestampToSubscriptionProfiles(changes.getRebalancedSubscriptions());
-    }
+  @Override
+  public void onAfterBalancing(WorkDistributionChanges changes) {
+    applyRebalanceTimestampToSubscriptionProfiles(changes.getRebalancedSubscriptions());
+  }
 
-    private void applyRebalanceTimestampToSubscriptionProfiles(Set<SubscriptionName> rebalancedSubscriptions) {
-        SubscriptionProfiles currentProfiles = currentLoadProvider.getProfiles();
-        Map<SubscriptionName, SubscriptionProfile> profilePerSubscription = new HashMap<>(currentProfiles.getProfiles());
-        for (SubscriptionName subscriptionName : rebalancedSubscriptions) {
-            SubscriptionProfile profile = profilePerSubscription.get(subscriptionName);
-            if (profile != null) {
-                profilePerSubscription.put(subscriptionName, new SubscriptionProfile(clock.instant(), profile.getWeight()));
-            }
-        }
-        SubscriptionProfiles finalProfiles = new SubscriptionProfiles(profilePerSubscription, currentProfiles.getUpdateTimestamp());
-        subscriptionProfileRegistry.persist(finalProfiles);
-        currentLoadProvider.updateProfiles(finalProfiles);
+  private void applyRebalanceTimestampToSubscriptionProfiles(
+      Set<SubscriptionName> rebalancedSubscriptions) {
+    SubscriptionProfiles currentProfiles = currentLoadProvider.getProfiles();
+    Map<SubscriptionName, SubscriptionProfile> profilePerSubscription =
+        new HashMap<>(currentProfiles.getProfiles());
+    for (SubscriptionName subscriptionName : rebalancedSubscriptions) {
+      SubscriptionProfile profile = profilePerSubscription.get(subscriptionName);
+      if (profile != null) {
+        profilePerSubscription.put(
+            subscriptionName, new SubscriptionProfile(clock.instant(), profile.getWeight()));
+      }
     }
+    SubscriptionProfiles finalProfiles =
+        new SubscriptionProfiles(profilePerSubscription, currentProfiles.getUpdateTimestamp());
+    subscriptionProfileRegistry.persist(finalProfiles);
+    currentLoadProvider.updateProfiles(finalProfiles);
+  }
 
-    @Override
-    public void onBalancingSkipped() {
-        weightedWorkloadMetrics.unregisterLeaderMetrics();
-        currentLoadProvider.clear();
-    }
+  @Override
+  public void onBalancingSkipped() {
+    weightedWorkloadMetrics.unregisterLeaderMetrics();
+    currentLoadProvider.clear();
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkloadMetricsReporter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkloadMetricsReporter.java
index a5138ded40..acfdd792d3 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkloadMetricsReporter.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkloadMetricsReporter.java
@@ -1,92 +1,94 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static java.util.Collections.emptySet;
+import static java.util.stream.Collectors.toSet;
+
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.common.metric.WorkloadMetrics;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
-import static java.util.Collections.emptySet;
-import static java.util.stream.Collectors.toSet;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.common.metric.WorkloadMetrics;
 
 public class WeightedWorkloadMetricsReporter {
 
-    private final WorkloadMetrics metrics;
-    private final Map<String, Double> currentWeights = new ConcurrentHashMap<>();
-    private final Map<String, Double> proposedWeights = new ConcurrentHashMap<>();
-    private final Map<String, Double> currentScores = new ConcurrentHashMap<>();
-    private final Map<String, Double> proposedScores = new ConcurrentHashMap<>();
-    private final Map<String, Double> scoringErrors = new ConcurrentHashMap<>();
+  private final WorkloadMetrics metrics;
+  private final Map<String, Double> currentWeights = new ConcurrentHashMap<>();
+  private final Map<String, Double> proposedWeights = new ConcurrentHashMap<>();
+  private final Map<String, Double> currentScores = new ConcurrentHashMap<>();
+  private final Map<String, Double> proposedScores = new ConcurrentHashMap<>();
+  private final Map<String, Double> scoringErrors = new ConcurrentHashMap<>();
 
-    public WeightedWorkloadMetricsReporter(MetricsFacade metrics) {
-        this.metrics = metrics.workload();
-    }
+  public WeightedWorkloadMetricsReporter(MetricsFacade metrics) {
+    this.metrics = metrics.workload();
+  }
 
-    void reportCurrentScore(String consumerId, double score) {
-        if (!currentScores.containsKey(consumerId)) {
-            metrics.registerCurrentScoreGauge(consumerId, currentScores, scores -> scores.getOrDefault(consumerId, 0d));
-        }
-        currentScores.put(consumerId, score);
+  void reportCurrentScore(String consumerId, double score) {
+    if (!currentScores.containsKey(consumerId)) {
+      metrics.registerCurrentScoreGauge(
+          consumerId, currentScores, scores -> scores.getOrDefault(consumerId, 0d));
     }
+    currentScores.put(consumerId, score);
+  }
 
-    void reportProposedScore(String consumerId, double score) {
-        if (!currentScores.containsKey(consumerId)) {
-            metrics.registerProposedErrorGauge(consumerId, proposedScores, scores -> scores.getOrDefault(consumerId, 0d));
-        }
-        proposedScores.put(consumerId, score);
+  void reportProposedScore(String consumerId, double score) {
+    if (!currentScores.containsKey(consumerId)) {
+      metrics.registerProposedErrorGauge(
+          consumerId, proposedScores, scores -> scores.getOrDefault(consumerId, 0d));
     }
+    proposedScores.put(consumerId, score);
+  }
 
-    void reportScoringError(String consumerId, double error) {
-        if (!scoringErrors.containsKey(consumerId)) {
-            metrics.registerScoringErrorGauge(consumerId, scoringErrors, errors -> errors.getOrDefault(consumerId, 0d));
-        }
-        scoringErrors.put(consumerId, error);
+  void reportScoringError(String consumerId, double error) {
+    if (!scoringErrors.containsKey(consumerId)) {
+      metrics.registerScoringErrorGauge(
+          consumerId, scoringErrors, errors -> errors.getOrDefault(consumerId, 0d));
     }
+    scoringErrors.put(consumerId, error);
+  }
 
-    void reportCurrentWeights(Collection<ConsumerNode> consumers) {
-        for (ConsumerNode consumerNode : consumers) {
-            String consumerId = consumerNode.getConsumerId();
-            if (!currentWeights.containsKey(consumerId)) {
-                metrics.registerCurrentWeightGauge(consumerId, currentWeights, weights -> weights.getOrDefault(consumerId, 0d));
-            }
-            currentWeights.put(consumerId, consumerNode.getWeight().getOperationsPerSecond());
-        }
+  void reportCurrentWeights(Collection<ConsumerNode> consumers) {
+    for (ConsumerNode consumerNode : consumers) {
+      String consumerId = consumerNode.getConsumerId();
+      if (!currentWeights.containsKey(consumerId)) {
+        metrics.registerCurrentWeightGauge(
+            consumerId, currentWeights, weights -> weights.getOrDefault(consumerId, 0d));
+      }
+      currentWeights.put(consumerId, consumerNode.getWeight().getOperationsPerSecond());
     }
+  }
 
-    void reportProposedWeights(Map<String, Weight> newWeights) {
-        for (Map.Entry<String, Weight> entry : newWeights.entrySet()) {
-            String consumerId = entry.getKey();
-            if (!proposedWeights.containsKey(consumerId)) {
-                metrics.registerProposedWeightGauge(consumerId, proposedWeights, weights -> weights.getOrDefault(consumerId, 0d));
-            }
-            proposedWeights.put(consumerId, entry.getValue().getOperationsPerSecond());
-        }
+  void reportProposedWeights(Map<String, Weight> newWeights) {
+    for (Map.Entry<String, Weight> entry : newWeights.entrySet()) {
+      String consumerId = entry.getKey();
+      if (!proposedWeights.containsKey(consumerId)) {
+        metrics.registerProposedWeightGauge(
+            consumerId, proposedWeights, weights -> weights.getOrDefault(consumerId, 0d));
+      }
+      proposedWeights.put(consumerId, entry.getValue().getOperationsPerSecond());
     }
+  }
 
-    void unregisterLeaderMetrics() {
-        unregisterMetricsForConsumersOtherThan(emptySet());
-    }
+  void unregisterLeaderMetrics() {
+    unregisterMetricsForConsumersOtherThan(emptySet());
+  }
 
-    void unregisterMetricsForConsumersOtherThan(Set<String> consumerIds) {
-        metrics.unregisterAllWorkloadWeightedGaugesForConsumerIds(findConsumerIdsToRemove(consumerIds));
-    }
+  void unregisterMetricsForConsumersOtherThan(Set<String> consumerIds) {
+    metrics.unregisterAllWorkloadWeightedGaugesForConsumerIds(findConsumerIdsToRemove(consumerIds));
+  }
 
-    private Set<String> findConsumerIdsToRemove(Set<String> activeIds) {
-        return Sets.newHashSet(
-                        Iterables.concat(
-                                currentScores.keySet(),
-                                proposedScores.keySet(),
-                                scoringErrors.keySet(),
-                                currentWeights.keySet(),
-                                proposedWeights.keySet()
-                        )
-                )
-                .stream()
-                .filter(consumerId -> !activeIds.contains(consumerId))
-                .collect(toSet());
-    }
+  private Set<String> findConsumerIdsToRemove(Set<String> activeIds) {
+    return Sets.newHashSet(
+            Iterables.concat(
+                currentScores.keySet(),
+                proposedScores.keySet(),
+                scoringErrors.keySet(),
+                currentWeights.keySet(),
+                proposedWeights.keySet()))
+        .stream()
+        .filter(consumerId -> !activeIds.contains(consumerId))
+        .collect(toSet());
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperConsumerNodeLoadRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperConsumerNodeLoadRegistry.java
index e2740e2f44..3606784abc 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperConsumerNodeLoadRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperConsumerNodeLoadRegistry.java
@@ -1,6 +1,21 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static java.util.Collections.newSetFromMap;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.stream.Collectors.toMap;
+import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.CONSUMERS_WORKLOAD_PATH;
+import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.CONSUMER_LOAD_PATH;
+
 import com.sun.management.OperatingSystemMXBean;
+import java.lang.management.ManagementFactory;
+import java.time.Clock;
+import java.time.Duration;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.LongAdder;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
@@ -13,191 +28,191 @@
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.lang.management.ManagementFactory;
-import java.time.Clock;
-import java.time.Duration;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.LongAdder;
+public class ZookeeperConsumerNodeLoadRegistry implements ConsumerNodeLoadRegistry {
 
-import static java.util.Collections.newSetFromMap;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.stream.Collectors.toMap;
-import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.CONSUMERS_WORKLOAD_PATH;
-import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.CONSUMER_LOAD_PATH;
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperConsumerNodeLoadRegistry.class);
+
+  private final Duration interval;
+  private final CuratorFramework curator;
+  private final ZookeeperPaths zookeeperPaths;
+  private final Clock clock;
+  private final String basePath;
+  private final String currentConsumerPath;
+  private final ConsumerNodeLoadEncoder encoder;
+  private final ConsumerNodeLoadDecoder decoder;
+  private final ScheduledExecutorService executor;
+  private final OperatingSystemMXBean platformMXBean =
+      ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class);
+
+  private final Set<ZookeeperSubscriptionLoadRecorder> subscriptionLoadRecorders =
+      newSetFromMap(new ConcurrentHashMap<>());
+  private volatile long lastReset;
+  private volatile double currentOperationsPerSecond = 0d;
+  private volatile double cpuUtilization = -1;
+
+  public ZookeeperConsumerNodeLoadRegistry(
+      CuratorFramework curator,
+      SubscriptionIds subscriptionIds,
+      ZookeeperPaths zookeeperPaths,
+      String currentConsumerId,
+      String clusterName,
+      Duration interval,
+      ExecutorServiceFactory executorServiceFactory,
+      Clock clock,
+      MetricsFacade metrics,
+      int consumerLoadEncoderBufferSizeBytes) {
+    this.curator = curator;
+    this.zookeeperPaths = zookeeperPaths;
+    this.clock = clock;
+    this.basePath =
+        zookeeperPaths.join(
+            zookeeperPaths.basePath(), CONSUMERS_WORKLOAD_PATH, clusterName, CONSUMER_LOAD_PATH);
+    this.currentConsumerPath = resolveConsumerLoadPath(currentConsumerId);
+    this.interval = interval;
+    this.encoder = new ConsumerNodeLoadEncoder(subscriptionIds, consumerLoadEncoderBufferSizeBytes);
+    this.decoder = new ConsumerNodeLoadDecoder(subscriptionIds);
+    this.executor =
+        executorServiceFactory.createSingleThreadScheduledExecutor(
+            "consumer-node-load-reporter-%d");
+    this.lastReset = clock.millis();
+    metrics
+        .workload()
+        .registerOperationsPerSecondGauge(this, registry -> registry.currentOperationsPerSecond);
+    metrics.workload().registerCpuUtilizationGauge(this, registry -> registry.cpuUtilization);
+    if (platformMXBean.getProcessCpuLoad() < 0d) {
+      logger.warn("Process CPU load is not available.");
+    }
+  }
+
+  @Override
+  public void start() {
+    executor.scheduleWithFixedDelay(this::report, 0, interval.toMillis(), MILLISECONDS);
+  }
+
+  @Override
+  public void stop() {
+    executor.shutdown();
+  }
+
+  private void report() {
+    try {
+      ConsumerNodeLoad consumerNodeLoad = calculateConsumerNodeLoad();
+      currentOperationsPerSecond =
+          consumerNodeLoad.getLoadPerSubscription().values().stream()
+              .mapToDouble(SubscriptionLoad::getOperationsPerSecond)
+              .sum();
+      persist(consumerNodeLoad);
+    } catch (Exception e) {
+      logger.error("Error while reporting consumer node load", e);
+    }
+  }
+
+  private ConsumerNodeLoad calculateConsumerNodeLoad() {
+    long now = clock.millis();
+    long elapsedMillis = now - lastReset;
+    long elapsedSeconds = Math.max(MILLISECONDS.toSeconds(elapsedMillis), 1);
+    lastReset = now;
+    cpuUtilization = platformMXBean.getProcessCpuLoad();
+    Map<SubscriptionName, SubscriptionLoad> loadPerSubscription =
+        subscriptionLoadRecorders.stream()
+            .collect(
+                toMap(
+                    ZookeeperSubscriptionLoadRecorder::getSubscriptionName,
+                    recorder -> recorder.calculate(elapsedSeconds)));
+    return new ConsumerNodeLoad(cpuUtilization, loadPerSubscription);
+  }
+
+  private void persist(ConsumerNodeLoad metrics) throws Exception {
+    byte[] encoded = encoder.encode(metrics);
+    try {
+      curator.setData().forPath(currentConsumerPath, encoded);
+    } catch (KeeperException.NoNodeException e) {
+      try {
+        curator
+            .create()
+            .creatingParentContainersIfNeeded()
+            .withMode(CreateMode.EPHEMERAL)
+            .forPath(currentConsumerPath, encoded);
+      } catch (KeeperException.NodeExistsException ex) {
+        // ignore
+      }
+    }
+  }
+
+  @Override
+  public ConsumerNodeLoad get(String consumerId) {
+    String consumerLoadPath = resolveConsumerLoadPath(consumerId);
+    try {
+      if (curator.checkExists().forPath(consumerLoadPath) != null) {
+        byte[] bytes = curator.getData().forPath(consumerLoadPath);
+        return decoder.decode(bytes);
+      }
+    } catch (Exception e) {
+      logger.warn("Could not read node data on path " + consumerLoadPath, e);
+    }
+    return ConsumerNodeLoad.UNDEFINED;
+  }
 
-public class ZookeeperConsumerNodeLoadRegistry implements ConsumerNodeLoadRegistry {
+  private String resolveConsumerLoadPath(String consumerId) {
+    return zookeeperPaths.join(basePath, consumerId);
+  }
+
+  @Override
+  public SubscriptionLoadRecorder register(SubscriptionName subscriptionName) {
+    return new ZookeeperSubscriptionLoadRecorder(subscriptionName);
+  }
+
+  private class ZookeeperSubscriptionLoadRecorder implements SubscriptionLoadRecorder {
+
+    private final SubscriptionName subscriptionName;
+    private final LongAdder operationsCounter = new LongAdder();
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperConsumerNodeLoadRegistry.class);
-
-    private final Duration interval;
-    private final CuratorFramework curator;
-    private final ZookeeperPaths zookeeperPaths;
-    private final Clock clock;
-    private final String basePath;
-    private final String currentConsumerPath;
-    private final ConsumerNodeLoadEncoder encoder;
-    private final ConsumerNodeLoadDecoder decoder;
-    private final ScheduledExecutorService executor;
-    private final OperatingSystemMXBean platformMXBean = ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class);
-
-    private final Set<ZookeeperSubscriptionLoadRecorder> subscriptionLoadRecorders = newSetFromMap(new ConcurrentHashMap<>());
-    private volatile long lastReset;
-    private volatile double currentOperationsPerSecond = 0d;
-    private volatile double cpuUtilization = -1;
-
-    public ZookeeperConsumerNodeLoadRegistry(CuratorFramework curator,
-                                             SubscriptionIds subscriptionIds,
-                                             ZookeeperPaths zookeeperPaths,
-                                             String currentConsumerId,
-                                             String clusterName,
-                                             Duration interval,
-                                             ExecutorServiceFactory executorServiceFactory,
-                                             Clock clock,
-                                             MetricsFacade metrics,
-                                             int consumerLoadEncoderBufferSizeBytes) {
-        this.curator = curator;
-        this.zookeeperPaths = zookeeperPaths;
-        this.clock = clock;
-        this.basePath = zookeeperPaths.join(zookeeperPaths.basePath(), CONSUMERS_WORKLOAD_PATH, clusterName, CONSUMER_LOAD_PATH);
-        this.currentConsumerPath = resolveConsumerLoadPath(currentConsumerId);
-        this.interval = interval;
-        this.encoder = new ConsumerNodeLoadEncoder(subscriptionIds, consumerLoadEncoderBufferSizeBytes);
-        this.decoder = new ConsumerNodeLoadDecoder(subscriptionIds);
-        this.executor = executorServiceFactory.createSingleThreadScheduledExecutor("consumer-node-load-reporter-%d");
-        this.lastReset = clock.millis();
-        metrics.workload().registerOperationsPerSecondGauge(this, registry -> registry.currentOperationsPerSecond);
-        metrics.workload().registerCpuUtilizationGauge(this, registry -> registry.cpuUtilization);
-        if (platformMXBean.getProcessCpuLoad() < 0d) {
-            logger.warn("Process CPU load is not available.");
-        }
+    ZookeeperSubscriptionLoadRecorder(SubscriptionName subscriptionName) {
+      this.subscriptionName = subscriptionName;
     }
 
     @Override
-    public void start() {
-        executor.scheduleWithFixedDelay(this::report, 0, interval.toMillis(), MILLISECONDS);
+    public void initialize() {
+      operationsCounter.reset();
+      subscriptionLoadRecorders.add(this);
     }
 
     @Override
-    public void stop() {
-        executor.shutdown();
+    public void recordSingleOperation() {
+      operationsCounter.increment();
     }
 
-    private void report() {
-        try {
-            ConsumerNodeLoad consumerNodeLoad = calculateConsumerNodeLoad();
-            currentOperationsPerSecond = consumerNodeLoad.getLoadPerSubscription().values().stream()
-                    .mapToDouble(SubscriptionLoad::getOperationsPerSecond)
-                    .sum();
-            persist(consumerNodeLoad);
-        } catch (Exception e) {
-            logger.error("Error while reporting consumer node load", e);
-        }
+    @Override
+    public void shutdown() {
+      operationsCounter.reset();
+      subscriptionLoadRecorders.remove(this);
     }
 
-    private ConsumerNodeLoad calculateConsumerNodeLoad() {
-        long now = clock.millis();
-        long elapsedMillis = now - lastReset;
-        long elapsedSeconds = Math.max(MILLISECONDS.toSeconds(elapsedMillis), 1);
-        lastReset = now;
-        cpuUtilization = platformMXBean.getProcessCpuLoad();
-        Map<SubscriptionName, SubscriptionLoad> loadPerSubscription = subscriptionLoadRecorders.stream()
-                .collect(toMap(ZookeeperSubscriptionLoadRecorder::getSubscriptionName, recorder -> recorder.calculate(elapsedSeconds)));
-        return new ConsumerNodeLoad(cpuUtilization, loadPerSubscription);
+    SubscriptionName getSubscriptionName() {
+      return subscriptionName;
     }
 
-    private void persist(ConsumerNodeLoad metrics) throws Exception {
-        byte[] encoded = encoder.encode(metrics);
-        try {
-            curator.setData().forPath(currentConsumerPath, encoded);
-        } catch (KeeperException.NoNodeException e) {
-            try {
-                curator.create()
-                        .creatingParentContainersIfNeeded()
-                        .withMode(CreateMode.EPHEMERAL)
-                        .forPath(currentConsumerPath, encoded);
-            } catch (KeeperException.NodeExistsException ex) {
-                // ignore
-            }
-        }
+    SubscriptionLoad calculate(long elapsedSeconds) {
+      double operationsPerSecond = (double) operationsCounter.sumThenReset() / elapsedSeconds;
+      return new SubscriptionLoad(operationsPerSecond);
     }
 
     @Override
-    public ConsumerNodeLoad get(String consumerId) {
-        String consumerLoadPath = resolveConsumerLoadPath(consumerId);
-        try {
-            if (curator.checkExists().forPath(consumerLoadPath) != null) {
-                byte[] bytes = curator.getData().forPath(consumerLoadPath);
-                return decoder.decode(bytes);
-            }
-        } catch (Exception e) {
-            logger.warn("Could not read node data on path " + consumerLoadPath, e);
-        }
-        return ConsumerNodeLoad.UNDEFINED;
-    }
-
-    private String resolveConsumerLoadPath(String consumerId) {
-        return zookeeperPaths.join(basePath, consumerId);
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      ZookeeperSubscriptionLoadRecorder that = (ZookeeperSubscriptionLoadRecorder) o;
+      return subscriptionName.equals(that.subscriptionName);
     }
 
     @Override
-    public SubscriptionLoadRecorder register(SubscriptionName subscriptionName) {
-        return new ZookeeperSubscriptionLoadRecorder(subscriptionName);
-    }
-
-    private class ZookeeperSubscriptionLoadRecorder implements SubscriptionLoadRecorder {
-
-        private final SubscriptionName subscriptionName;
-        private final LongAdder operationsCounter = new LongAdder();
-
-        ZookeeperSubscriptionLoadRecorder(SubscriptionName subscriptionName) {
-            this.subscriptionName = subscriptionName;
-        }
-
-        @Override
-        public void initialize() {
-            operationsCounter.reset();
-            subscriptionLoadRecorders.add(this);
-        }
-
-        @Override
-        public void recordSingleOperation() {
-            operationsCounter.increment();
-        }
-
-        @Override
-        public void shutdown() {
-            operationsCounter.reset();
-            subscriptionLoadRecorders.remove(this);
-        }
-
-        SubscriptionName getSubscriptionName() {
-            return subscriptionName;
-        }
-
-        SubscriptionLoad calculate(long elapsedSeconds) {
-            double operationsPerSecond = (double) operationsCounter.sumThenReset() / elapsedSeconds;
-            return new SubscriptionLoad(operationsPerSecond);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            ZookeeperSubscriptionLoadRecorder that = (ZookeeperSubscriptionLoadRecorder) o;
-            return subscriptionName.equals(that.subscriptionName);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(subscriptionName);
-        }
+    public int hashCode() {
+      return Objects.hash(subscriptionName);
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperSubscriptionProfileRegistry.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperSubscriptionProfileRegistry.java
index f48d70bfe1..f795bc7f9a 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperSubscriptionProfileRegistry.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperSubscriptionProfileRegistry.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.CONSUMERS_WORKLOAD_PATH;
+import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.SUBSCRIPTION_PROFILES_PATH;
+
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
@@ -8,65 +11,71 @@
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.CONSUMERS_WORKLOAD_PATH;
-import static pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths.SUBSCRIPTION_PROFILES_PATH;
-
 public class ZookeeperSubscriptionProfileRegistry implements SubscriptionProfileRegistry {
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperSubscriptionProfileRegistry.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperSubscriptionProfileRegistry.class);
 
-    private final CuratorFramework curator;
-    private final SubscriptionProfilesEncoder encoder;
-    private final SubscriptionProfilesDecoder decoder;
-    private final String profilesPath;
+  private final CuratorFramework curator;
+  private final SubscriptionProfilesEncoder encoder;
+  private final SubscriptionProfilesDecoder decoder;
+  private final String profilesPath;
 
-    public ZookeeperSubscriptionProfileRegistry(CuratorFramework curator,
-                                                SubscriptionIds subscriptionIds,
-                                                ZookeeperPaths zookeeperPaths,
-                                                String clusterName,
-                                                int subscriptionProfilesEncoderBufferSizeBytes) {
-        this.curator = curator;
-        this.encoder = new SubscriptionProfilesEncoder(subscriptionIds, subscriptionProfilesEncoderBufferSizeBytes);
-        this.decoder = new SubscriptionProfilesDecoder(subscriptionIds);
-        this.profilesPath =
-                zookeeperPaths.join(zookeeperPaths.basePath(), CONSUMERS_WORKLOAD_PATH, clusterName, SUBSCRIPTION_PROFILES_PATH);
-    }
+  public ZookeeperSubscriptionProfileRegistry(
+      CuratorFramework curator,
+      SubscriptionIds subscriptionIds,
+      ZookeeperPaths zookeeperPaths,
+      String clusterName,
+      int subscriptionProfilesEncoderBufferSizeBytes) {
+    this.curator = curator;
+    this.encoder =
+        new SubscriptionProfilesEncoder(
+            subscriptionIds, subscriptionProfilesEncoderBufferSizeBytes);
+    this.decoder = new SubscriptionProfilesDecoder(subscriptionIds);
+    this.profilesPath =
+        zookeeperPaths.join(
+            zookeeperPaths.basePath(),
+            CONSUMERS_WORKLOAD_PATH,
+            clusterName,
+            SUBSCRIPTION_PROFILES_PATH);
+  }
 
-    @Override
-    public SubscriptionProfiles fetch() {
-        try {
-            if (curator.checkExists().forPath(profilesPath) != null) {
-                byte[] bytes = curator.getData().forPath(profilesPath);
-                return decoder.decode(bytes);
-            }
-        } catch (Exception e) {
-            logger.warn("Could not read node data on path " + profilesPath, e);
-        }
-        return SubscriptionProfiles.EMPTY;
+  @Override
+  public SubscriptionProfiles fetch() {
+    try {
+      if (curator.checkExists().forPath(profilesPath) != null) {
+        byte[] bytes = curator.getData().forPath(profilesPath);
+        return decoder.decode(bytes);
+      }
+    } catch (Exception e) {
+      logger.warn("Could not read node data on path " + profilesPath, e);
     }
+    return SubscriptionProfiles.EMPTY;
+  }
 
-    @Override
-    public void persist(SubscriptionProfiles profiles) {
-        byte[] encoded = encoder.encode(profiles);
-        try {
-            updateOrCreate(encoded);
-        } catch (Exception e) {
-            logger.error("An error while saving subscription profiles", e);
-        }
+  @Override
+  public void persist(SubscriptionProfiles profiles) {
+    byte[] encoded = encoder.encode(profiles);
+    try {
+      updateOrCreate(encoded);
+    } catch (Exception e) {
+      logger.error("An error while saving subscription profiles", e);
     }
+  }
 
-    private void updateOrCreate(byte[] encoded) throws Exception {
-        try {
-            curator.setData().forPath(profilesPath, encoded);
-        } catch (KeeperException.NoNodeException e) {
-            try {
-                curator.create()
-                        .creatingParentContainersIfNeeded()
-                        .withMode(CreateMode.PERSISTENT)
-                        .forPath(profilesPath, encoded);
-            } catch (KeeperException.NodeExistsException ex) {
-                // ignore
-            }
-        }
+  private void updateOrCreate(byte[] encoded) throws Exception {
+    try {
+      curator.setData().forPath(profilesPath, encoded);
+    } catch (KeeperException.NoNodeException e) {
+      try {
+        curator
+            .create()
+            .creatingParentContainersIfNeeded()
+            .withMode(CreateMode.PERSISTENT)
+            .forPath(profilesPath, encoded);
+      } catch (KeeperException.NodeExistsException ex) {
+        // ignore
+      }
     }
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/uri/InvalidHostException.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/uri/InvalidHostException.java
index 8abbea1d78..af19729441 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/uri/InvalidHostException.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/uri/InvalidHostException.java
@@ -2,8 +2,7 @@
 
 public class InvalidHostException extends RuntimeException {
 
-    public InvalidHostException(String message) {
-        super(message);
-    }
-
+  public InvalidHostException(String message) {
+    super(message);
+  }
 }
diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/uri/UriUtils.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/uri/UriUtils.java
index 654fd535c0..8e98518e11 100644
--- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/uri/UriUtils.java
+++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/uri/UriUtils.java
@@ -1,77 +1,74 @@
 package pl.allegro.tech.hermes.consumers.uri;
 
 import com.google.common.base.Splitter;
-import org.apache.commons.lang.StringUtils;
-
 import java.net.URI;
 import java.util.List;
 import java.util.Optional;
+import org.apache.commons.lang3.StringUtils;
 
 public final class UriUtils {
 
-    private UriUtils() {
-    }
+  private UriUtils() {}
 
-    public static String extractHostFromUri(URI uri) {
-        // we are handling here bug from jdk http://bugs.java.com/view_bug.do?bug_id=6587184
-        return Optional
-            .ofNullable(uri.getHost())
-            .orElseThrow(() -> new InvalidHostException("Host name contains invalid chars. Underscore is one of them."))
-            .replace("/", "");
-    }
+  public static String extractHostFromUri(URI uri) {
+    // we are handling here bug from jdk http://bugs.java.com/view_bug.do?bug_id=6587184
+    return Optional.ofNullable(uri.getHost())
+        .orElseThrow(
+            () ->
+                new InvalidHostException(
+                    "Host name contains invalid chars. Underscore is one of them."))
+        .replace("/", "");
+  }
 
-    public static Integer extractPortFromUri(URI uri) {
-        return uri.getPort() > 0 ? uri.getPort() : null;
-    }
+  public static Integer extractPortFromUri(URI uri) {
+    return uri.getPort() > 0 ? uri.getPort() : null;
+  }
 
-    public static String extractAddressFromUri(URI uri) {
-        String address = extractHostFromUri(uri);
-        if (uri.getPort() > 0) {
-            address += ":" + uri.getPort();
-        }
-        return address;
+  public static String extractAddressFromUri(URI uri) {
+    String address = extractHostFromUri(uri);
+    if (uri.getPort() > 0) {
+      address += ":" + uri.getPort();
     }
+    return address;
+  }
 
-    public static String extractUserNameFromUri(URI uri) {
-        if (uri.getRawUserInfo() == null) {
-            return null;
-        }
-        List<String> userInfoParts = splitUserInfo(uri);
-        if (userInfoParts.isEmpty()) {
-            return null;
-        }
-        return userInfoParts.get(0);
+  public static String extractUserNameFromUri(URI uri) {
+    if (uri.getRawUserInfo() == null) {
+      return null;
     }
-
-    public static String extractPasswordFromUri(URI uri) {
-        if (uri.getRawUserInfo() == null) {
-            return null;
-        }
-        List<String> userInfoParts = splitUserInfo(uri);
-        if (userInfoParts.size() <= 1) {
-            return null;
-        }
-
-        return userInfoParts.get(1);
+    List<String> userInfoParts = splitUserInfo(uri);
+    if (userInfoParts.isEmpty()) {
+      return null;
     }
+    return userInfoParts.get(0);
+  }
 
-    public static String extractContextFromUri(URI uri) {
-        return StringUtils.substringAfter(uri.toString(), uri.getAuthority());
+  public static String extractPasswordFromUri(URI uri) {
+    if (uri.getRawUserInfo() == null) {
+      return null;
     }
-
-    public static String extractDestinationTopicFromUri(URI uri) {
-        return uri.getPath().replace("/", "");
+    List<String> userInfoParts = splitUserInfo(uri);
+    if (userInfoParts.size() <= 1) {
+      return null;
     }
 
-    public static URI appendContext(URI uri, String context) {
-        return URI.create(StringUtils.removeEnd(uri.toString(), "/")
-                + "/"
-                + StringUtils.removeStart(context, "/")
-        );
-    }
+    return userInfoParts.get(1);
+  }
 
-    private static List<String> splitUserInfo(URI uri) {
-        return Splitter.on(":").splitToList(uri.getRawUserInfo());
-    }
+  public static String extractContextFromUri(URI uri) {
+    return StringUtils.substringAfter(uri.toString(), uri.getAuthority());
+  }
+
+  public static String extractDestinationTopicFromUri(URI uri) {
+    return uri.getPath().replace("/", "");
+  }
+
+  public static URI appendContext(URI uri, String context) {
+    return URI.create(
+        StringUtils.removeEnd(uri.toString(), "/") + "/" + StringUtils.removeStart(context, "/"));
+  }
 
+  private static List<String> splitUserInfo(URI uri) {
+    return Splitter.on(":").splitToList(uri.getRawUserInfo());
+  }
 }
diff --git a/hermes-consumers/src/main/resources/application-integration.yaml b/hermes-consumers/src/main/resources/application-integration.yaml
index 11e0d59de2..a79777f93c 100644
--- a/hermes-consumers/src/main/resources/application-integration.yaml
+++ b/hermes-consumers/src/main/resources/application-integration.yaml
@@ -73,12 +73,6 @@ consumer:
   workload:
     rebalanceInterval: 1s
     consumerPerSubscription: 1
-  metrics:
-    metric-registry:
-      graphiteReporterEnabled: true
-      reportPeriod: 1s
-  graphite:
-    port: 18023
   schema:
     cache:
       refreshAfterWrite: 1m
diff --git a/hermes-consumers/src/main/resources/application-local.yaml b/hermes-consumers/src/main/resources/application-local.yaml
index 08db5b9583..8777e70205 100644
--- a/hermes-consumers/src/main/resources/application-local.yaml
+++ b/hermes-consumers/src/main/resources/application-local.yaml
@@ -9,11 +9,6 @@ consumer:
     clusters:
       - datacenter: "dc"
         brokerList: "localhost:9092"
-  graphite:
-    host: "localhost"
-  metrics:
-    metrics-registry:
-      graphiteReporterEnabled: true
   workload:
     consumerPerSubscription: 1
   schema:
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/ResilientMessageSenderTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/ResilientMessageSenderTest.groovy
index 07eada26f4..5e9eff443d 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/ResilientMessageSenderTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/ResilientMessageSenderTest.groovy
@@ -14,8 +14,8 @@ import java.util.concurrent.Executors
 import java.util.function.Consumer
 import java.util.function.Function
 
-import static io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE;
-import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS;
+import static io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE
+import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS
 import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy
 import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription
 
@@ -63,7 +63,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should report successful sending"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerSuccessfulSending()
         }
         ResilientMessageSender rateLimitingMessageSender = new ResilientMessageSender(
@@ -84,7 +83,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should asynchronously time out send future and report failed sending"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerFailedSending()
         }
         ResilientMessageSender rateLimitingMessageSender = new ResilientMessageSender(
@@ -105,7 +103,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should treat 4xx response for subscription with no 4xx retry as success"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerSuccessfulSending()
         }
 
@@ -127,7 +124,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should report failed sending on error response other than 4xx for subscription with no 4xx retry"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerFailedSending()
         }
 
@@ -149,7 +145,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should report failed sending on 4xx response for subscription with 4xx retry"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerFailedSending()
         }
         def subscription = subscription(SubscriptionName.fromString("group.topic\$subscription"))
@@ -175,7 +170,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should report successful sending on retry after"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerSuccessfulSending()
         }
 
@@ -197,7 +191,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should report failed sending on service unavailable without retry after"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerFailedSending()
         }
 
@@ -219,7 +212,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should not report failed sending on too many requests without retry after"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerSuccessfulSending()
         }
 
@@ -241,7 +233,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should report failed sending when future completes exceptionally"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerFailedSending()
         }
         ResilientMessageSender rateLimitingMessageSender = new ResilientMessageSender(
@@ -266,7 +257,6 @@ class ResilientMessageSenderTest extends Specification {
     def "should report failed sending when consumer throws exception"() {
         given:
         SerialConsumerRateLimiter serialConsumerRateLimiter = Mock(SerialConsumerRateLimiter) {
-            1 * acquire()
             1 * registerFailedSending()
         }
         ResilientMessageSender rateLimitingMessageSender = new ResilientMessageSender(
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterTest.groovy
index a668980afb..6c763c4b71 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterTest.groovy
@@ -14,9 +14,9 @@ class OffsetCommitterTest extends Specification {
     @Shared
     KafkaTopicName KAFKA_TOPIC_NAME = KafkaTopicName.valueOf("group_topic")
 
-    private OffsetQueue queue = new OffsetQueue(TestMetricsFacadeFactory.create(), 200_000)
+    private PendingOffsets offsetsSlots = new PendingOffsets(SUBSCRIPTION_NAME, TestMetricsFacadeFactory.create(), 50, 2000)
 
-    private MockMessageCommitter messageCommitter = new MockMessageCommitter()
+    private OffsetCommitterTestHelper offsetCommitterTestHelper = new OffsetCommitterTestHelper()
 
     private ConsumerPartitionAssignmentState state
 
@@ -24,318 +24,318 @@ class OffsetCommitterTest extends Specification {
 
     def setup() {
         state = new ConsumerPartitionAssignmentState()
-        def commitInterval = 10
 
-        committer = new OffsetCommitter(queue, state, messageCommitter, commitInterval, TestMetricsFacadeFactory.create())
+        committer = new OffsetCommitter(state, TestMetricsFacadeFactory.create())
     }
 
     def "should not commit offsets with negative values"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, -123))
-        queue.offerCommittedOffset(offset(1, -123))
+        offsetsSlots.markAsInflight(offset(1, -123))
+        offsetsSlots.markAsProcessed(offset(1, -123))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(1)
+        offsetCommitterTestHelper.nothingCommitted(1)
     }
 
     def "should not commit offset with long max value"() {
         given:
         assignPartitions(1)
         def offsetTooLarge = Long.MAX_VALUE - 1 // we actually commit the offset we want to read next, so it'll be +1
-        queue.offerInflightOffset(offset(1, offsetTooLarge))
-        queue.offerCommittedOffset(offset(1, offsetTooLarge))
+        offsetsSlots.markAsInflight(offset(1, offsetTooLarge))
+        offsetsSlots.markAsProcessed(offset(1, offsetTooLarge))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(1)
+        offsetCommitterTestHelper.nothingCommitted(1)
     }
 
     def "should commit smallest offset of uncommitted message"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 1))
-        queue.offerInflightOffset(offset(1, 2))
-        queue.offerInflightOffset(offset(1, 3))
-        queue.offerInflightOffset(offset(1, 4))
+        offsetsSlots.markAsInflight(offset(1, 1))
+        offsetsSlots.markAsInflight(offset(1, 2))
+        offsetsSlots.markAsInflight(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 4))
 
-        queue.offerCommittedOffset(offset(1, 1))
-        queue.offerCommittedOffset(offset(1, 4))
+        offsetsSlots.markAsProcessed(offset(1, 1))
+        offsetsSlots.markAsProcessed(offset(1, 4))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 2))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 2))
     }
 
     def "should increment offset by 1 only if it comes from committed offsets to match Kafka offset definition"() {
         given:
         assignPartitions(1, 2)
-        queue.offerInflightOffset(offset(1, 1))
-        queue.offerCommittedOffset(offset(1, 1))
+        offsetsSlots.markAsInflight(offset(1, 1))
+        offsetsSlots.markAsProcessed(offset(1, 1))
 
-        queue.offerInflightOffset(offset(2, 1))
+        offsetsSlots.markAsInflight(offset(2, 1))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 2), offset(2, 1))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 2), offset(2, 1))
     }
 
     def "should commit max offset of committed offsets when no smaller inflights exist"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 3))
-        queue.offerInflightOffset(offset(1, 4))
+        offsetsSlots.markAsInflight(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 4))
 
-        queue.offerCommittedOffset(offset(1, 3))
-        queue.offerCommittedOffset(offset(1, 4))
+        offsetsSlots.markAsProcessed(offset(1, 3))
+        offsetsSlots.markAsProcessed(offset(1, 4))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 5))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 5))
     }
 
     def "should commit same offset twice when there are no new offsets to commit"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 5))
+        offsetsSlots.markAsInflight(offset(1, 5))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 5))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 5))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(2, offset(1, 5))
+        offsetCommitterTestHelper.wereCommitted(2, offset(1, 5))
     }
 
     def "should not mix offsets from different partitions and topics"() {
         given:
         assignPartitions(1, 2)
 
-        queue.offerInflightOffset(offset(1, 3))
-        queue.offerInflightOffset(offset(1, 4))
+        offsetsSlots.markAsInflight(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 4))
 
-        queue.offerInflightOffset(offset(2, 10))
-        queue.offerInflightOffset(offset(2, 11))
+        offsetsSlots.markAsInflight(offset(2, 10))
+        offsetsSlots.markAsInflight(offset(2, 11))
 
-        queue.offerCommittedOffset(offset(1, 3))
-        queue.offerCommittedOffset(offset(1, 4))
-        queue.offerCommittedOffset(offset(2, 11))
+        offsetsSlots.markAsProcessed(offset(1, 3))
+        offsetsSlots.markAsProcessed(offset(1, 4))
+        offsetsSlots.markAsProcessed(offset(2, 11))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 5), offset(2, 10))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 5), offset(2, 10))
     }
 
     def "should get rid of leftover inflight offsets when revoked from topic partitions"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 3))
 
         when:
         revokeAllPartitions()
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(1)
+        offsetCommitterTestHelper.nothingCommitted(1)
     }
 
     def "should get rid of inflight offsets from revoked partitions"() {
         given:
         assignPartitions(1, 2)
-        queue.offerInflightOffset(offset(1, 3))
-        queue.offerInflightOffset(offset(2, 3))
+        offsetsSlots.markAsInflight(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(2, 3))
 
         when:
         revokePartitions(1)
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(2, 3))
+        offsetCommitterTestHelper.wereCommitted(1, offset(2, 3))
     }
 
     def "should get rid of committed offsets from revoked partitions"() {
         given:
         assignPartitions(1)
-        queue.offerCommittedOffset(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 3))
+        offsetsSlots.markAsProcessed(offset(1, 3))
 
         when:
         revokePartitions(1)
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(1)
+        offsetCommitterTestHelper.nothingCommitted(1)
     }
 
     def "should get rid of leftover committed offsets when revoked from topic partitions"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 3))
-        queue.offerCommittedOffset(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 3))
+        offsetsSlots.markAsProcessed(offset(1, 3))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 4))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 4))
 
         when:
-        queue.offerInflightOffset(offset(1, 4))
-        queue.offerCommittedOffset(offset(1, 4))
+        offsetsSlots.markAsInflight(offset(1, 4))
+        offsetsSlots.markAsProcessed(offset(1, 4))
 
         and:
         revokeAllPartitions()
 
         and:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(2)
+        offsetCommitterTestHelper.nothingCommitted(2)
     }
 
     def "should not commit offsets in next iteration after reassigning partition"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 3))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 3))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 3))
 
         when:
         revokePartitions(1)
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(2)
+        offsetCommitterTestHelper.nothingCommitted(2)
 
         when:
         assignPartitions(1)
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(3)
+        offsetCommitterTestHelper.nothingCommitted(3)
     }
 
     def "should commit only offsets from current term"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 3))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 3))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 3))
 
         when:
-        queue.offerCommittedOffset(offset(1, 3))
-        queue.offerInflightOffset(offset(1, 4))
-        queue.offerCommittedOffset(offset(1, 4))
+        offsetsSlots.markAsProcessed(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 4))
+        offsetsSlots.markAsProcessed(offset(1, 4))
         revokePartitions(1)
         assignPartitions(1)
 
         and:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(2)
+        offsetCommitterTestHelper.nothingCommitted(2)
 
         when:
-        queue.offerCommittedOffset(offsetFromTerm(1, 4, 0)) // message from previous term=0
+        offsetsSlots.markAsProcessed(offsetFromTerm(1, 4, 0)) // message from previous term=0
 
         and:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(3)
+        offsetCommitterTestHelper.nothingCommitted(3)
     }
 
     def "should commit maximum commited offset no matter what order committed offset return"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 3))
-        queue.offerInflightOffset(offset(1, 4))
-        queue.offerInflightOffset(offset(1, 5))
+        offsetsSlots.markAsInflight(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 4))
+        offsetsSlots.markAsInflight(offset(1, 5))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 3))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 3))
 
         when:
-        queue.offerCommittedOffset(offset(1, 4))
-        queue.offerCommittedOffset(offset(1, 5))
+        offsetsSlots.markAsProcessed(offset(1, 4))
+        offsetsSlots.markAsProcessed(offset(1, 5))
 
         and:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(2, offset(1, 3))
+        offsetCommitterTestHelper.wereCommitted(2, offset(1, 3))
 
         when:
-        queue.offerCommittedOffset(offset(1, 3))
+        offsetsSlots.markAsProcessed(offset(1, 3))
 
         and:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(3, offset(1, 6))
+        offsetCommitterTestHelper.wereCommitted(3, offset(1, 6))
     }
 
     def "should drop maximum committed offset when lost partition assignment"() {
         given:
         assignPartitions(1)
-        queue.offerInflightOffset(offset(1, 3))
-        queue.offerInflightOffset(offset(1, 4))
-        queue.offerInflightOffset(offset(1, 5))
+        offsetsSlots.markAsInflight(offset(1, 3))
+        offsetsSlots.markAsInflight(offset(1, 4))
+        offsetsSlots.markAsInflight(offset(1, 5))
 
         when:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(1, offset(1, 3))
+        offsetCommitterTestHelper.wereCommitted(1, offset(1, 3))
 
         when:
-        queue.offerCommittedOffset(offset(1, 4))
-        queue.offerCommittedOffset(offset(1, 5))
+        offsetsSlots.markAsProcessed(offset(1, 4))
+        offsetsSlots.markAsProcessed(offset(1, 5))
 
         and:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.wereCommitted(2, offset(1, 3))
+        offsetCommitterTestHelper.wereCommitted(2, offset(1, 3))
 
         when:
-        queue.offerCommittedOffset(offset(1, 3))
+        offsetsSlots.markAsProcessed(offset(1, 3))
         revokePartitions(1)
         assignPartitions(1)
 
         and:
-        committer.run()
+        offsetCommitterTestHelper.markCommittedOffsets(committer.calculateOffsetsToBeCommitted(offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()))
 
         then:
-        messageCommitter.nothingCommitted(3)
+        offsetCommitterTestHelper.nothingCommitted(3)
     }
 
     private SubscriptionPartitionOffset offset(int partition, long offset) {
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/MockMessageCommitter.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterTestHelper.groovy
similarity index 51%
rename from hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/MockMessageCommitter.groovy
rename to hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterTestHelper.groovy
index 3b68cc5731..0a93df3fd6 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/MockMessageCommitter.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/OffsetCommitterTestHelper.groovy
@@ -1,10 +1,8 @@
 package pl.allegro.tech.hermes.consumers.consumer.offset
 
-import pl.allegro.tech.hermes.consumers.consumer.receiver.MessageCommitter
+class OffsetCommitterTestHelper {
 
-class MockMessageCommitter implements MessageCommitter {
-
-    private final List<OffsetsToCommit> recordedValues = []
+    private final List<Set<SubscriptionPartitionOffset>> recordedValues = []
 
     private int iteration = -1
 
@@ -13,11 +11,8 @@ class MockMessageCommitter implements MessageCommitter {
     }
 
     boolean wereCommitted(int iteration, SubscriptionPartitionOffset... expectedOffsets) {
-        OffsetsToCommit offsetsToCommit = recordedValues[iteration - 1]
         Set<SubscriptionPartitionOffset> allOffsets = [] as Set
-        offsetsToCommit.subscriptionNames().each { subscription ->
-            allOffsets.addAll(offsetsToCommit.batchFor(subscription))
-        }
+        recordedValues[iteration - 1].each {allOffsets.add(it)}
 
         Set<SubscriptionPartitionOffset> expectedOffsetsSet = [] as Set
         expectedOffsets.each { expectedOffsetsSet.add(it) }
@@ -25,9 +20,8 @@ class MockMessageCommitter implements MessageCommitter {
         allOffsets == expectedOffsetsSet
     }
 
-    @Override
-    void commitOffsets(OffsetsToCommit offsetsToCommit) {
-        recordedValues.add(offsetsToCommit)
+    void markCommittedOffsets(Set<SubscriptionPartitionOffset> subscriptionPartitionOffsets) {
+        recordedValues.add(subscriptionPartitionOffsets)
         iteration++
     }
 }
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsetsTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsetsTest.groovy
new file mode 100644
index 0000000000..9effb38965
--- /dev/null
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/offset/PendingOffsetsTest.groovy
@@ -0,0 +1,113 @@
+package pl.allegro.tech.hermes.consumers.consumer.offset
+
+import pl.allegro.tech.hermes.api.SubscriptionName
+import pl.allegro.tech.hermes.common.kafka.KafkaTopicName
+import pl.allegro.tech.hermes.common.metric.MetricsFacade
+import pl.allegro.tech.hermes.test.helper.metrics.TestMetricsFacadeFactory
+import spock.lang.Shared
+import spock.lang.Specification
+
+import java.time.Duration
+
+class PendingOffsetsTest extends Specification {
+
+    @Shared
+    SubscriptionName SUBSCRIPTION_NAME = SubscriptionName.fromString('group.topic$sub')
+
+    @Shared
+    KafkaTopicName KAFKA_TOPIC_NAME = KafkaTopicName.valueOf("group_topic")
+
+    @Shared
+    Duration ACQUIRE_DURATION = Duration.ofMillis(100)
+
+    private MetricsFacade testMetricsFacade = TestMetricsFacadeFactory.create()
+
+    private ConsumerPartitionAssignmentState state = new ConsumerPartitionAssignmentState()
+
+    def "should not allow for more inflight offsets than allowed"() {
+        given:
+        PendingOffsets offsetsSlots = createOffsetsSlots(2, 10)
+        2.times {offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)}
+
+        when:
+        boolean isAcquired = offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)
+
+        then:
+        !isAcquired
+    }
+
+    def "should not allow for more total offsets than allowed"() {
+        given:
+        PendingOffsets offsetsSlots = createOffsetsSlots(2, 3)
+        2.times {offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)}
+        offsetsSlots.markAsInflight(offset(1, 1))
+        offsetsSlots.markAsInflight(offset(1, 2))
+        offsetsSlots.markAsProcessed(offset(1, 1))
+        offsetsSlots.markAsProcessed(offset(1, 2))
+        offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)
+
+        when:
+        boolean isAcquired = offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)
+
+        then:
+        !isAcquired
+    }
+
+    def "should free inflight offsets"() {
+        given:
+        PendingOffsets offsetsSlots = createOffsetsSlots(1, 10)
+        offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)
+        offsetsSlots.markAsInflight(offset(1, 1))
+
+        when:
+        boolean isAcquired = offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)
+
+        then:
+        !isAcquired
+
+        when:
+        offsetsSlots.markAsProcessed(offset(1, 1))
+        boolean isAcquiredAfterRelease = offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)
+
+        then:
+        isAcquiredAfterRelease
+    }
+
+    def "should free offsetQueue and return offset snapshot"() {
+        given:
+        Map<SubscriptionPartitionOffset, MessageState> expectedOffsetSnapshot = Map.of(offset(1, 1), MessageState.PROCESSED, offset(1, 2), MessageState.PROCESSED)
+        PendingOffsets offsetsSlots = createOffsetsSlots(2, 2)
+        2.times{offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)}
+        offsetsSlots.markAsInflight(offset(1, 1))
+        offsetsSlots.markAsInflight(offset(1, 2))
+        offsetsSlots.markAsProcessed(offset(1, 1))
+        offsetsSlots.markAsProcessed(offset(1, 2))
+
+        when:
+        boolean isAcquired = offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)
+
+        then:
+        !isAcquired
+
+        when:
+        Map<SubscriptionPartitionOffset,MessageState> offsetSnapshot = offsetsSlots.getOffsetsSnapshotAndReleaseProcessedSlots()
+        boolean isAcquiredAfterRelease = offsetsSlots.tryAcquireSlot(ACQUIRE_DURATION)
+
+        then:
+        offsetSnapshot == expectedOffsetSnapshot
+        isAcquiredAfterRelease
+    }
+
+    private PendingOffsets createOffsetsSlots(int inflightSize, int offsetQueueSize) {
+        return new PendingOffsets(SUBSCRIPTION_NAME, testMetricsFacade, inflightSize, offsetQueueSize)
+    }
+
+    private SubscriptionPartitionOffset offset(int partition, long offset) {
+        offsetFromTerm(partition, offset, state.currentTerm(SUBSCRIPTION_NAME))
+    }
+
+    private SubscriptionPartitionOffset offsetFromTerm(int partition, long offset, long term) {
+        def partitionOffset = new SubscriptionPartition(KAFKA_TOPIC_NAME, SUBSCRIPTION_NAME, partition, term)
+        return new SubscriptionPartitionOffset(partitionOffset, offset)
+    }
+}
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/result/DefaultErrorHandlerTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/result/DefaultErrorHandlerTest.groovy
index ab5bc5225f..78cc25efd7 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/result/DefaultErrorHandlerTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/result/DefaultErrorHandlerTest.groovy
@@ -5,10 +5,8 @@ import pl.allegro.tech.hermes.api.TrackingMode
 import pl.allegro.tech.hermes.common.message.undelivered.UndeliveredMessageLog
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
 import pl.allegro.tech.hermes.consumers.consumer.Message
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult
 import pl.allegro.tech.hermes.consumers.test.MessageBuilder
-import pl.allegro.tech.hermes.test.helper.metrics.TestMetricsFacadeFactory
 import pl.allegro.tech.hermes.tracker.consumers.Trackers
 import spock.lang.Specification
 
@@ -18,8 +16,6 @@ import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.sub
 
 class DefaultErrorHandlerTest extends Specification {
 
-    private OffsetQueue offsetQueue = new OffsetQueue(TestMetricsFacadeFactory.create(), 200_000)
-
     private UndeliveredMessageLog undeliveredLog = Mock(UndeliveredMessageLog)
 
     private InMemoryLogRepository sendingTracker = new InMemoryLogRepository()
@@ -30,9 +26,9 @@ class DefaultErrorHandlerTest extends Specification {
             .withTrackingMode(TrackingMode.TRACK_ALL).build()
 
     private DefaultErrorHandler handler = new DefaultErrorHandler(
-            offsetQueue, Stub(MetricsFacade), undeliveredLog, Clock.systemUTC(), trackers, "cluster", subscription.qualifiedName)
+            Stub(MetricsFacade), undeliveredLog, Clock.systemUTC(), trackers, "cluster", subscription.qualifiedName)
 
-    def "should save tracking information on message failure but not commit message"() {
+    def "should save tracking information on message failure"() {
         given:
         Message message = MessageBuilder.withTestMessage().withPartitionOffset('kafka_topic', 0, 123L).build()
         MessageSendingResult result = MessageSendingResult.failedResult(500)
@@ -42,10 +38,9 @@ class DefaultErrorHandlerTest extends Specification {
 
         then:
         sendingTracker.hasFailedLog('kafka_topic', 0, 123L)
-        offsetQueue.drainCommittedOffsets({ o -> assert !(o.partition == 0 && o.offset == 123L) })
     }
 
-    def "should commit message and save tracking information on message discard"() {
+    def "should save tracking information on message discard"() {
         given:
         Message message = MessageBuilder.withTestMessage().withPartitionOffset('kafka_topic', 0, 123L).build()
         MessageSendingResult result = MessageSendingResult.failedResult(500)
@@ -55,6 +50,5 @@ class DefaultErrorHandlerTest extends Specification {
 
         then:
         sendingTracker.hasDiscardedLog('kafka_topic', 0, 123L)
-        offsetQueue.drainCommittedOffsets({ o -> assert o.partition == 0 && o.offset == 123L })
     }
 }
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/result/DefaultSuccessHandlerTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/result/DefaultSuccessHandlerTest.groovy
index 68241e20f0..7a6166cbb9 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/result/DefaultSuccessHandlerTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/result/DefaultSuccessHandlerTest.groovy
@@ -4,10 +4,8 @@ import pl.allegro.tech.hermes.api.Subscription
 import pl.allegro.tech.hermes.api.TrackingMode
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
 import pl.allegro.tech.hermes.consumers.consumer.Message
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult
 import pl.allegro.tech.hermes.consumers.test.MessageBuilder
-import pl.allegro.tech.hermes.test.helper.metrics.TestMetricsFacadeFactory
 import pl.allegro.tech.hermes.tracker.consumers.Trackers
 import spock.lang.Specification
 
@@ -15,7 +13,6 @@ import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.sub
 
 class DefaultSuccessHandlerTest extends Specification {
 
-    private OffsetQueue offsetQueue = new OffsetQueue(TestMetricsFacadeFactory.create(), 200_000)
 
     private InMemoryLogRepository sendingTracker = new InMemoryLogRepository()
 
@@ -24,9 +21,9 @@ class DefaultSuccessHandlerTest extends Specification {
     private Subscription subscription = subscription('group.topic', 'subscription')
             .withTrackingMode(TrackingMode.TRACK_ALL).build()
 
-    private DefaultSuccessHandler handler = new DefaultSuccessHandler(offsetQueue, Stub(MetricsFacade), trackers, subscription.qualifiedName)
+    private DefaultSuccessHandler handler = new DefaultSuccessHandler(Stub(MetricsFacade), trackers, subscription.qualifiedName)
 
-    def "should commit message and save tracking information on message success"() {
+    def "should save tracking information on message success"() {
         given:
         Message message = MessageBuilder.withTestMessage().withPartitionOffset('kafka_topic', 0, 123L).build()
         MessageSendingResult result = MessageSendingResult.failedResult(500)
@@ -36,6 +33,5 @@ class DefaultSuccessHandlerTest extends Specification {
 
         then:
         sendingTracker.hasSuccessfulLog('kafka_topic', 0, 123L)
-        offsetQueue.drainCommittedOffsets({ o -> assert o.partition == 0 && o.offset == 123L })
     }
 }
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/SingleRecipientMessageSenderAdapterTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/SingleRecipientMessageSenderAdapterTest.groovy
index 9a444d1be5..79eec88352 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/SingleRecipientMessageSenderAdapterTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/SingleRecipientMessageSenderAdapterTest.groovy
@@ -49,7 +49,6 @@ class SingleRecipientMessageSenderAdapterTest extends Specification {
     def "should register successful send in rate limiter"() {
         given:
         ConsumerRateLimiter consumerRateLimiter = Mock(ConsumerRateLimiter) {
-            1 * acquire()
             1 * registerSuccessfulSending()
         }
         ResilientMessageSender rateLimitingMessageSender = rateLimitingMessageSender(consumerRateLimiter)
@@ -65,7 +64,6 @@ class SingleRecipientMessageSenderAdapterTest extends Specification {
     def "should register unsuccessful send in rate limiter"() {
         given:
         ConsumerRateLimiter consumerRateLimiter = Mock(ConsumerRateLimiter) {
-            1 * acquire()
             1 * registerFailedSending()
         }
         ResilientMessageSender rateLimitingMessageSender = rateLimitingMessageSender(consumerRateLimiter)
@@ -77,7 +75,5 @@ class SingleRecipientMessageSenderAdapterTest extends Specification {
 
         then:
         !future.get().succeeded()
-
     }
-
 }
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientConnectionMonitoringTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientConnectionMonitoringTest.groovy
index e6ad62185c..8c686cc39c 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientConnectionMonitoringTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientConnectionMonitoringTest.groovy
@@ -1,19 +1,15 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http
 
-import com.codahale.metrics.MetricRegistry
 import com.github.tomakehurst.wiremock.WireMockServer
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.search.Search
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import org.eclipse.jetty.client.HttpClient
-import pl.allegro.tech.hermes.common.metric.HermesMetrics
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
 import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory
-import pl.allegro.tech.hermes.common.metric.executor.ThreadPoolMetrics
 import pl.allegro.tech.hermes.consumers.config.ConsumerSenderConfiguration
 import pl.allegro.tech.hermes.consumers.config.Http1ClientProperties
 import pl.allegro.tech.hermes.consumers.config.SslContextProperties
-import pl.allegro.tech.hermes.metrics.PathsCompiler
 import pl.allegro.tech.hermes.test.helper.util.Ports
 import spock.lang.Shared
 import spock.lang.Specification
@@ -28,11 +24,8 @@ class HttpClientConnectionMonitoringTest extends Specification {
 
     HttpClient client
     HttpClient batchClient
-    MetricRegistry metricRegistry = new MetricRegistry()
-    HermesMetrics hermesMetrics = new HermesMetrics(metricRegistry, new PathsCompiler("localhost"))
     MeterRegistry meterRegistry = new SimpleMeterRegistry()
-    MetricsFacade metrics = new MetricsFacade(meterRegistry, hermesMetrics)
-    ThreadPoolMetrics threadPoolMetrics = new ThreadPoolMetrics(metrics)
+    MetricsFacade metrics = new MetricsFacade(meterRegistry)
 
     def setupSpec() {
         port = Ports.nextAvailable()
@@ -45,7 +38,7 @@ class HttpClientConnectionMonitoringTest extends Specification {
         SslContextFactoryProvider sslContextFactoryProvider = new SslContextFactoryProvider(null, new SslContextProperties())
         ConsumerSenderConfiguration consumerConfiguration = new ConsumerSenderConfiguration();
         client = consumerConfiguration.http1SerialClient(new HttpClientsFactory(
-                new InstrumentedExecutorServiceFactory(threadPoolMetrics),
+                new InstrumentedExecutorServiceFactory(metrics),
                 sslContextFactoryProvider), new Http1ClientProperties()
         )
         batchClient = Mock(HttpClient)
@@ -61,13 +54,10 @@ class HttpClientConnectionMonitoringTest extends Specification {
         client.POST("http://localhost:${port}/hello").send()
 
         and:
-        def idleDropwizard = metricRegistry.gauges['http-clients.serial.http1.idle-connections'].value
-        def activeDropwizard = metricRegistry.gauges['http-clients.serial.http1.active-connections'].value
         def idleMicrometer = Search.in(meterRegistry).name("http-clients.serial.http1.idle-connections").gauge().value()
         def activeMicrometer = Search.in(meterRegistry).name("http-clients.serial.http1.active-connections").gauge().value()
 
         then:
-        idleDropwizard + activeDropwizard > 0
         idleMicrometer + activeMicrometer > 0
     }
 
@@ -79,7 +69,6 @@ class HttpClientConnectionMonitoringTest extends Specification {
         reporter.start()
 
         then:
-        metricRegistry.gauges.size() == 0
         Search.in(meterRegistry).gauges().size() == 0
     }
 }
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporterTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporterTest.groovy
index e573c84281..8f653948f8 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporterTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporterTest.groovy
@@ -1,8 +1,8 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http
 
 import org.eclipse.jetty.client.HttpClient
-import org.eclipse.jetty.client.HttpDestination
-import org.eclipse.jetty.client.HttpExchange
+import org.eclipse.jetty.client.transport.HttpDestination
+import org.eclipse.jetty.client.transport.HttpExchange
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
 import spock.lang.Specification
 
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastMessageSenderTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastMessageSenderTest.groovy
index b565f11801..10688bb01a 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastMessageSenderTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyBroadCastMessageSenderTest.groovy
@@ -2,17 +2,17 @@ package pl.allegro.tech.hermes.consumers.consumer.sender.http
 
 import com.github.tomakehurst.wiremock.WireMockServer
 import org.eclipse.jetty.client.HttpClient
-import org.eclipse.jetty.util.HttpCookieStore
+import org.eclipse.jetty.http.HttpCookieStore
 import pl.allegro.tech.hermes.api.EndpointAddress
 import pl.allegro.tech.hermes.api.EndpointAddressResolverMetadata
 import pl.allegro.tech.hermes.api.Subscription
 import pl.allegro.tech.hermes.api.SubscriptionName
 import pl.allegro.tech.hermes.consumers.consumer.Message
+import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender
 import pl.allegro.tech.hermes.consumers.consumer.rate.ConsumerRateLimiter
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSender
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult
 import pl.allegro.tech.hermes.consumers.consumer.sender.MultiMessageSendingResult
-import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.AuthHeadersProvider
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.HermesHeadersProvider
 import pl.allegro.tech.hermes.consumers.consumer.sender.http.headers.Http1HeadersProvider
@@ -61,7 +61,7 @@ class JettyBroadCastMessageSenderTest extends Specification {
         wireMockServers.forEach { it.start() }
 
         client = new HttpClient()
-        client.setCookieStore(new HttpCookieStore.Empty())
+        client.setHttpCookieStore(new HttpCookieStore.Empty())
         client.setConnectTimeout(1000)
         client.setIdleTimeout(1000)
         client.start()
@@ -71,7 +71,7 @@ class JettyBroadCastMessageSenderTest extends Specification {
 
     MessageSender getSender(ConsumerRateLimiter rateLimiter) {
         def address = new ResolvableEndpointAddress(endpoint, new MultiUrlEndpointAddressResolver(),
-                EndpointAddressResolverMetadata.empty());
+                EndpointAddressResolverMetadata.empty())
         def httpRequestFactory = new DefaultHttpRequestFactory(client, 1000, 1000, new DefaultHttpMetadataAppender())
 
         Subscription subscription = subscription(SubscriptionName.fromString("group.topic\$subscription")).build()
@@ -87,14 +87,13 @@ class JettyBroadCastMessageSenderTest extends Specification {
     def "should send message successfully in parallel to all urls"() {
         given:
         ConsumerRateLimiter rateLimiter = Mock(ConsumerRateLimiter) {
-            4 * acquire()
             4 * registerSuccessfulSending()
         }
 
         serviceEndpoints.forEach { endpoint -> endpoint.setDelay(300).expectMessages(TEST_MESSAGE_CONTENT) }
 
         when:
-        def future = getSender(rateLimiter).send(testMessage());
+        def future = getSender(rateLimiter).send(testMessage())
 
         then:
         future.get(10, TimeUnit.SECONDS).succeeded()
@@ -107,7 +106,6 @@ class JettyBroadCastMessageSenderTest extends Specification {
     def "should return not succeeded when sending to one of urls fails"() {
         given:
         ConsumerRateLimiter rateLimiter = Mock(ConsumerRateLimiter) {
-            4 * acquire()
             3 * registerSuccessfulSending()
             1 * registerFailedSending()
         }
@@ -133,15 +131,14 @@ class JettyBroadCastMessageSenderTest extends Specification {
     def "should not send to already sent url on retry"() {
         given:
         ConsumerRateLimiter rateLimiter = Mock(ConsumerRateLimiter) {
-            3 * acquire()
             3 * registerSuccessfulSending()
         }
 
         serviceEndpoints.forEach { endpoint -> endpoint.expectMessages(TEST_MESSAGE_CONTENT) }
         def alreadySentServiceEndpoint = serviceEndpoints[0]
 
-        Message message = testMessage();
-        message.incrementRetryCounter([alreadySentServiceEndpoint.url]);
+        Message message = testMessage()
+        message.incrementRetryCounter([alreadySentServiceEndpoint.url])
 
         when:
         def future = getSender(rateLimiter).send(message)
@@ -153,7 +150,7 @@ class JettyBroadCastMessageSenderTest extends Specification {
         future.get(1, TimeUnit.SECONDS).succeeded()
     }
 
-    def "should return not succeeded and retry later when endpoint resolver return no hosts"() {
+    def "should return not succeeded and retry later when endpoint resolver return no hosts and no message was sent previously"() {
         given:
         def address = Stub(ResolvableEndpointAddress) {
             resolveAllFor(_ as Message) >> []
@@ -176,6 +173,49 @@ class JettyBroadCastMessageSenderTest extends Specification {
         messageSendingResult.isRetryLater()
     }
 
+    def "should return succeeded when endpoint resolver return no hosts and but message was sent previously"() {
+        given:
+        Message message = testMessage()
+        message.incrementRetryCounter([serviceEndpoints[0].url])
+        def address = Stub(ResolvableEndpointAddress) {
+            resolveAllFor(_ as Message) >> []
+
+            getRawAddress() >> endpoint
+        }
+
+        def httpRequestFactory = new DefaultHttpRequestFactory(client, 1000, 1000, new DefaultHttpMetadataAppender())
+        MessageSender messageSender = new JettyBroadCastMessageSender(httpRequestFactory, address,
+                requestHeadersProvider, resultHandlersProvider, Mock(ResilientMessageSender))
+
+        when:
+        def future =  messageSender.send(message)
+
+        then:
+        MessageSendingResult messageSendingResult = future.get(1, TimeUnit.SECONDS)
+
+        messageSendingResult.succeeded()
+    }
+
+
+    def "should return succeeded when endpoint resolver returns the same urls that the message was already sent to"() {
+        given: "a message that was sent"
+        ConsumerRateLimiter rateLimiter = Mock(ConsumerRateLimiter) {
+            0 * registerSuccessfulSending()
+        }
+
+        serviceEndpoints.forEach { endpoint -> endpoint.expectMessages(TEST_MESSAGE_CONTENT) }
+
+        Message message = testMessage()
+        message.incrementRetryCounter(serviceEndpoints.collect { it.url })
+
+        when:
+        def future = getSender(rateLimiter).send(message)
+
+        then:
+        MessageSendingResult messageSendingResult = future.get(1, TimeUnit.SECONDS)
+        messageSendingResult.succeeded()
+    }
+
     def cleanupSpec() {
         wireMockServers.forEach { it.stop() }
         client.stop()
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupervisorTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupervisorTest.groovy
index 30df929486..70f41b34e5 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupervisorTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/process/ConsumerProcessSupervisorTest.groovy
@@ -1,20 +1,17 @@
 package pl.allegro.tech.hermes.consumers.supervisor.process
 
-import com.codahale.metrics.MetricRegistry
-import com.jayway.awaitility.Awaitility
-import com.jayway.awaitility.core.ConditionFactory
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.search.Search
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry
+import org.awaitility.Awaitility
+import org.awaitility.core.ConditionFactory
 import pl.allegro.tech.hermes.api.DeliveryType
 import pl.allegro.tech.hermes.api.Subscription
 import pl.allegro.tech.hermes.api.SubscriptionName
 import pl.allegro.tech.hermes.api.Topic
-import pl.allegro.tech.hermes.common.metric.HermesMetrics
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
 import pl.allegro.tech.hermes.consumers.config.CommonConsumerProperties
 import pl.allegro.tech.hermes.consumers.supervisor.ConsumersExecutorService
-import pl.allegro.tech.hermes.metrics.PathsCompiler
 import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder
 import spock.lang.Specification
 import spock.lang.Unroll
@@ -26,7 +23,6 @@ import java.time.ZoneId
 import java.util.function.Consumer
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.COMMIT
 import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.RETRANSMIT
 import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.START
 import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.STOP
@@ -47,12 +43,10 @@ class ConsumerProcessSupervisorTest extends Specification {
             retransmit        : Signal.of(RETRANSMIT, subscriptionName),
             updateSubscription: Signal.of(UPDATE_SUBSCRIPTION, subscriptionName, subscription1),
             updateTopic       : Signal.of(UPDATE_TOPIC, subscriptionName, topic1),
-            commit            : Signal.of(COMMIT, subscriptionName)
     ]
 
     ConsumerProcessSupervisor supervisor
     MeterRegistry meterRegistry = new SimpleMeterRegistry()
-    MetricRegistry metricRegistry = new MetricRegistry()
     MetricsFacade metrics
     ConsumerStub consumer
 
@@ -70,10 +64,7 @@ class ConsumerProcessSupervisorTest extends Specification {
                 return new ConsumerProcess(startSignal, consumer, Stub(Retransmitter), clock, unhealthyAfter, onConsumerStopped)
         }
 
-        metrics = new MetricsFacade(
-                meterRegistry,
-                new HermesMetrics(metricRegistry, new PathsCompiler("localhost"))
-        )
+        metrics = new MetricsFacade(meterRegistry)
 
         supervisor = new ConsumerProcessSupervisor(
                 new ConsumersExecutorService(new CommonConsumerProperties().getThreadPoolSize(), metrics),
@@ -118,7 +109,7 @@ class ConsumerProcessSupervisorTest extends Specification {
         }
 
         then:
-        await().until {
+        await().untilAsserted {
             supervisor.run()
             assert !supervisor.runningSubscriptionsStatus().isEmpty()
             assert supervisor.runningSubscriptionsStatus().first().signalTimesheet[signals.start.type] == currentTime
@@ -137,7 +128,7 @@ class ConsumerProcessSupervisorTest extends Specification {
         }
 
         then:
-        await().until {
+        await().untilAsserted {
             assert consumer.tearDownCount > 0
             assert consumer.wasInterrupted
         }
@@ -153,7 +144,7 @@ class ConsumerProcessSupervisorTest extends Specification {
         runAndWait(supervisor)
 
         then:
-        await().until {
+        await().untilAsserted {
             assert !supervisor.runningSubscriptionsStatus().isEmpty()
             signalsToPass.forEach {
                 assert supervisor.runningSubscriptionsStatus().first().signalTimesheet[it.type] == currentTime
@@ -176,7 +167,6 @@ class ConsumerProcessSupervisorTest extends Specification {
         then:
         signalsToDrop.forEach {
             String signal = it.type.name()
-            assert metricRegistry.counter("supervisor.signal.dropped." + signal).getCount() == 1
             assert Search.in(meterRegistry)
                     .name {it.startsWith("signals.dropped")}
                     .tag("signal", signal)
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/process/SignalsFilterTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/process/SignalsFilterTest.groovy
index 71df100400..256cd3a7c7 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/process/SignalsFilterTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/process/SignalsFilterTest.groovy
@@ -15,7 +15,6 @@ import java.time.ZoneId
 
 import static pl.allegro.tech.hermes.api.SubscriptionName.fromString
 import static pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset.subscriptionPartitionOffset
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.COMMIT
 import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.RETRANSMIT
 import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.START
 import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.STOP
@@ -91,7 +90,6 @@ class SignalsFilterTest extends Specification {
         signalType          | firstSignalPayload             | secondSignalPayload
         UPDATE_TOPIC        | 'first-update'                 | 'second-update'
         UPDATE_SUBSCRIPTION | 'first-update'                 | 'second-update'
-        COMMIT              | [offset(1, 10), offset(2, 11)] | [offset(1, 11)]
         RETRANSMIT          | null                           | null
     }
 
diff --git a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancingListenerTest.groovy b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancingListenerTest.groovy
index ced5eaa583..5e1f84aec3 100644
--- a/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancingListenerTest.groovy
+++ b/hermes-consumers/src/test/groovy/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/WeightedWorkBalancingListenerTest.groovy
@@ -1,14 +1,11 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted
 
-import com.codahale.metrics.MetricFilter
-import com.codahale.metrics.MetricRegistry
+
 import io.micrometer.core.instrument.search.Search
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import pl.allegro.tech.hermes.api.SubscriptionName
-import pl.allegro.tech.hermes.common.metric.HermesMetrics
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
 import pl.allegro.tech.hermes.consumers.supervisor.workload.WorkDistributionChanges
-import pl.allegro.tech.hermes.metrics.PathsCompiler
 import pl.allegro.tech.hermes.test.helper.time.ModifiableClock
 import spock.lang.Specification
 import spock.lang.Subject
@@ -25,12 +22,10 @@ class WeightedWorkBalancingListenerTest extends Specification {
     def subscriptionProfileRegistry = new MockSubscriptionProfileRegistry()
     def weightWindowSize = Duration.ofMinutes(1)
     def currentLoadProvider = new CurrentLoadProvider()
-    def metricsRegistry = new MetricRegistry()
     def meterRegistry = new SimpleMeterRegistry()
     def metrics = new WeightedWorkloadMetricsReporter(
             new MetricsFacade(
-                    meterRegistry,
-                    new HermesMetrics(metricsRegistry, new PathsCompiler("host"))
+                    meterRegistry
             )
     )
 
@@ -180,8 +175,6 @@ class WeightedWorkBalancingListenerTest extends Specification {
         listener.onBeforeBalancing(["c2"])
 
         then:
-        metricsRegistry.getGauges(MetricFilter.contains(".c2.")).size() == 1
-        metricsRegistry.getGauges(MetricFilter.contains(".c1.")).size() == 0
         Search.in(meterRegistry).tag("consumer-id", "c2").gauges().size() == 1
         Search.in(meterRegistry).tag("consumer-id", "c1").gauges().size() == 0
     }
@@ -195,7 +188,6 @@ class WeightedWorkBalancingListenerTest extends Specification {
         listener.onBalancingSkipped()
 
         then:
-        metricsRegistry.getGauges().size() == 0
         Search.in(meterRegistry).gauges().size() == 0
     }
 
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSenderTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSenderTest.java
index 5c1818aacc..df2cfed1cb 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSenderTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/ConsumerMessageSenderTest.java
@@ -1,14 +1,36 @@
 package pl.allegro.tech.hermes.consumers.consumer;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.passwordGrantOAuthPolicy;
+import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Clock;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.common.metric.SubscriptionMetrics;
-import pl.allegro.tech.hermes.consumers.consumer.rate.AdjustableSemaphore;
+import pl.allegro.tech.hermes.consumers.consumer.offset.PendingOffsets;
+import pl.allegro.tech.hermes.consumers.consumer.offset.SubscriptionPartitionOffset;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.ConsumerProfiler;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.NoOpConsumerProfiler;
 import pl.allegro.tech.hermes.consumers.consumer.rate.SerialConsumerRateLimiter;
 import pl.allegro.tech.hermes.consumers.consumer.result.ErrorHandler;
 import pl.allegro.tech.hermes.consumers.consumer.result.SuccessHandler;
@@ -23,502 +45,569 @@
 import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 import pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder;
 
-import java.nio.charset.StandardCharsets;
-import java.time.Clock;
-import java.util.Arrays;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.passwordGrantOAuthPolicy;
-import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-
 @RunWith(MockitoJUnitRunner.class)
 public class ConsumerMessageSenderTest {
 
-    public static final int ASYNC_TIMEOUT_MS = 2000;
-    private Subscription subscription = subscriptionWithTtl(10);
+  public static final int ASYNC_TIMEOUT_MS = 2000;
+  private final Subscription subscription = subscriptionWithTtl(10);
+
+  private final Subscription subscriptionWith4xxRetry = subscriptionWithTtlAndClientErrorRetry(10);
+
+  @Mock private MessageSender messageSender;
+
+  @Mock private MessageSenderFactory messageSenderFactory;
+
+  @Mock private SuccessHandler successHandler;
+
+  @Mock private ErrorHandler errorHandler;
+
+  @Mock private SerialConsumerRateLimiter rateLimiter;
+
+  @Mock private PendingOffsets pendingOffsets;
+
+  @Mock private HermesTimer consumerLatencyTimer;
+
+  @Mock private HermesCounter retries;
 
-    private Subscription subscriptionWith4xxRetry = subscriptionWithTtlAndClientErrorRetry(10);
+  @Mock private HermesTimer rateLimiterAcquireTimer;
 
-    @Mock
-    private MessageSender messageSender;
+  @Mock private HermesTimerContext consumerLatencyTimerContext;
 
-    @Mock
-    private MessageSenderFactory messageSenderFactory;
-
-    @Mock
-    private SuccessHandler successHandler;
+  @Mock private HermesTimerContext rateLimiterAcquireTimerContext;
+
+  @Mock private HermesCounter failedMeter;
 
-    @Mock
-    private ErrorHandler errorHandler;
+  @Mock private HermesCounter errors;
+
+  private final ConsumerProfiler profiler = new NoOpConsumerProfiler();
 
-    @Mock
-    private SerialConsumerRateLimiter rateLimiter;
-
-    @Mock
-    private HermesTimer consumerLatencyTimer;
-
-    @Mock
-    private HermesTimerContext consumerLatencyTimerContext;
-
-    @Mock
-    private HermesCounter failedMeter;
-
-    @Mock
-    private HermesCounter errors;
-
-    private AdjustableSemaphore inflightSemaphore;
-
-    private ConsumerMessageSender sender;
-
-    @Mock
-    private SubscriptionMetrics subscriptionMetrics;
-
-    @Mock
-    private MetricsFacade metricsFacade;
-
-    @Before
-    public void setUp() {
-        when(metricsFacade.subscriptions()).thenReturn(subscriptionMetrics);
-        setUpMetrics(subscription);
-        setUpMetrics(subscriptionWith4xxRetry);
-        inflightSemaphore = new AdjustableSemaphore(0);
-        sender = consumerMessageSender(subscription);
-    }
-
-    private void setUpMetrics(Subscription subscription) {
-        when(metricsFacade.subscriptions().latency(subscription.getQualifiedName())).thenReturn(consumerLatencyTimer);
-        when(metricsFacade.subscriptions().otherErrorsCounter(subscription.getQualifiedName())).thenReturn(errors);
-        when(consumerLatencyTimer.time()).thenReturn(consumerLatencyTimerContext);
-        when(metricsFacade.subscriptions().failuresCounter(subscription.getQualifiedName())).thenReturn(failedMeter);
-    }
-
-    @Test
-    public void shouldHandleSuccessfulSending() {
-        // given
-        Message message = message();
-        when(messageSender.send(message)).thenReturn(success());
-
-        // when
-        sender.sendAsync(message);
-        verify(successHandler, timeout(1000)).handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
-
-        // then
-        verifySemaphoreReleased();
-        verifyLatencyTimersCountedTimes(subscription, 1, 1);
-        verifyZeroInteractions(errorHandler);
-        verifyZeroInteractions(failedMeter);
-    }
-
-    @Test
-    public void shouldKeepTryingToSendMessageFailedSending() throws InterruptedException {
-        // given
-        Message message = message();
-        doReturn(failure()).doReturn(failure()).doReturn(success()).when(messageSender).send(message);
-
-        // when
-        sender.sendAsync(message);
-        verify(successHandler, timeout(1000)).handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
-
-        // then
-        verifySemaphoreReleased();
-        verifyLatencyTimersCountedTimes(subscription, 3, 3);
-        verifyErrorHandlerHandleFailed(message, subscription, 2);
-    }
-
-    @Test
-    public void shouldDiscardMessageWhenTTLIsExceeded() {
-        // given
-        Message message = messageWithTimestamp(System.currentTimeMillis() - 11000);
-        doReturn(failure()).when(messageSender).send(message);
-
-        // when
-        sender.sendAsync(message);
-
-        // then
-        verify(errorHandler, timeout(1000)).handleDiscarded(eq(message), eq(subscription), any(MessageSendingResult.class));
-        verifySemaphoreReleased();
-        verifyZeroInteractions(successHandler);
-        verifyLatencyTimersCountedTimes(subscription, 1, 1);
-    }
-
-    @Test
-    public void shouldNotKeepTryingToSendMessageFailedWithStatusCode4xx() throws InterruptedException {
-        // given
-        Message message = message();
-        doReturn(failure(403)).doReturn(success()).when(messageSender).send(message);
-
-        // when
-        sender.sendAsync(message);
-
-        // then
-        verify(errorHandler, timeout(1000)).handleDiscarded(eq(message), eq(subscription), any(MessageSendingResult.class));
-        verifySemaphoreReleased();
-        verifyZeroInteractions(successHandler);
-        verifyLatencyTimersCountedTimes(subscription, 1, 1);
-    }
-
-    @Test
-    public void shouldKeepTryingToSendMessageFailedWithStatusCode4xxForSubscriptionWith4xxRetry() throws InterruptedException {
-        // given
-        ConsumerMessageSender sender = consumerMessageSender(subscriptionWith4xxRetry);
-        Message message = message();
-        doReturn(failure(403)).doReturn(failure(403)).doReturn(failure(403)).doReturn(success()).when(messageSender).send(message);
-
-        // when
-        sender.sendAsync(message);
-        verify(successHandler, timeout(1000)).handleSuccess(eq(message), eq(subscriptionWith4xxRetry), any(MessageSendingResult.class));
-
-        // then
-        verifySemaphoreReleased();
-        verify(errorHandler,
-            timeout(1000).times(3)).handleFailed(eq(message),
-            eq(subscriptionWith4xxRetry),
-            any(MessageSendingResult.class)
-        );
-    }
-
-    @Test
-    public void shouldRetryOn401UnauthorizedForOAuthSecuredSubscription() {
-        // given
-        Subscription subscription = subscriptionWithout4xxRetryAndWithOAuthPolicy();
-        setUpMetrics(subscription);
-        ConsumerMessageSender sender = consumerMessageSender(subscription);
-        Message message = message();
-        doReturn(failure(401)).doReturn(failure(401)).doReturn(success()).when(messageSender).send(message);
-
-        // when
-        sender.sendAsync(message);
-
-        // then
-        verifyErrorHandlerHandleFailed(message, subscription, 2);
-        verify(successHandler, timeout(1000)).handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
-    }
-
-    @Test
-    public void shouldBackoffRetriesWhenEndpointFails() throws InterruptedException {
-        // given
-        final int executionTime = 100;
-        int senderBackoffTime = 50;
-        Subscription subscriptionWithBackoff = subscriptionWithBackoff(senderBackoffTime);
-        setUpMetrics(subscriptionWithBackoff);
-
-        sender = consumerMessageSender(subscriptionWithBackoff);
-        Message message = message();
-        doReturn(failure(500)).when(messageSender).send(message);
-
-        //when
-        sender.sendAsync(message);
-
-        //then
-        Thread.sleep(executionTime);
-        verifyErrorHandlerHandleFailed(message, subscriptionWithBackoff, 1 + executionTime / senderBackoffTime);
-    }
-
-    @Test
-    public void shouldNotRetryOnRetryAfterAboveTtl() throws InterruptedException {
-        // given
-        int retrySeconds = subscription.getSerialSubscriptionPolicy().getMessageTtl();
-        Message message = message();
-        doReturn(backoff(retrySeconds)).when(messageSender).send(message);
-
-        // when
-        sender.sendAsync(message);
-
-        // then
-        verifyErrorHandlerHandleDiscarded(message, subscription);
-        verifySemaphoreReleased();
-    }
-
-    @Test
-    public void shouldDeliverToModifiedEndpoint() {
-        // given
-        Message message = message();
-        Subscription subscriptionWithModfiedEndpoint = subscriptionWithEndpoint("http://somewhere:9876");
-        MessageSender otherMessageSender = mock(MessageSender.class);
-
-        when(messageSenderFactory.create(eq(subscriptionWithModfiedEndpoint), any(ResilientMessageSender.class)))
-                .thenReturn(otherMessageSender);
-        when(otherMessageSender.send(message)).thenReturn(success());
-
-        // when
-        sender.updateSubscription(subscriptionWithModfiedEndpoint);
-        sender.sendAsync(message);
-
-        // then
-        verify(otherMessageSender, timeout(1000)).send(message);
-    }
-
-    @Test
-    public void shouldDeliverToNewSenderAfterModifiedTimeout() {
-        // given
-        Message message = message();
-        Subscription subscriptionWithModifiedTimeout = subscriptionWithRequestTimeout(2000);
-        MessageSender otherMessageSender = mock(MessageSender.class);
-
-        when(messageSenderFactory.create(eq(subscriptionWithModifiedTimeout), any(ResilientMessageSender.class)))
-                .thenReturn(otherMessageSender);
-        when(otherMessageSender.send(message)).thenReturn(success());
-
-        // when
-        sender.updateSubscription(subscriptionWithModifiedTimeout);
-        sender.sendAsync(message);
-
-        // then
-        verify(otherMessageSender, timeout(1000)).send(message);
-    }
-
-    @Test
-    public void shouldDelaySendingMessageForHalfSecond() {
-        // given
-        Subscription subscription = subscriptionBuilderWithTestValues()
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults()
-                        .withSendingDelay(500)
-                        .build())
-                .build();
-        setUpMetrics(subscription);
-
-        Message message = message();
-        when(messageSender.send(message)).thenReturn(success());
-        ConsumerMessageSender sender = consumerMessageSender(subscription);
-
-        // when
-        long sendingStartTime = System.currentTimeMillis();
-        sender.sendAsync(message);
-        verify(successHandler, timeout(1000)).handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
-
-        // then
-        long sendingTime = System.currentTimeMillis() - sendingStartTime;
-        assertThat(sendingTime).isGreaterThanOrEqualTo(500);
-    }
-
-    @Test
-    public void shouldCalculateSendingDelayBasingOnPublishingTimestamp() {
-        // given
-        Subscription subscription = subscriptionBuilderWithTestValues()
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults()
-                        .withSendingDelay(2000)
-                        .build())
-                .build();
-        setUpMetrics(subscription);
-
-        Message message = messageWithTimestamp(System.currentTimeMillis() - 1800);
-        when(messageSender.send(message)).thenReturn(success());
-        ConsumerMessageSender sender = consumerMessageSender(subscription);
-
-        // when
-        long sendingStartTime = System.currentTimeMillis();
-        sender.sendAsync(message);
-        verify(successHandler, timeout(500)).handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
-
-        // then
-        long sendingTime = System.currentTimeMillis() - sendingStartTime;
-        assertThat(sendingTime).isLessThan(300);
-    }
-
-    @Test
-    public void shouldIncreaseRetryBackoffExponentially() throws InterruptedException {
-        // given
-        final int backoff = 500;
-        final double multiplier = 2;
-        Subscription subscription = subscriptionWithExponentialRetryBackoff(backoff, multiplier);
-        setUpMetrics(subscription);
-        Message message = message();
-        doReturn(failure()).doReturn(failure()).doReturn(success()).when(messageSender).send(message);
-        ConsumerMessageSender sender = consumerMessageSender(subscription);
-
-        // when
-        sender.sendAsync(message);
-        Thread.sleep(backoff + (long) multiplier * backoff - 100);
-
-        // then
-        verifyZeroInteractions(successHandler);
-    }
-
-    @Test
-    public void shouldIgnoreExponentialRetryBackoffWithRetryAfter() {
-        // given
-        final int retrySeconds = 1;
-        final int backoff = 5000;
-        final double multiplier = 3;
-        Subscription subscription = subscriptionWithExponentialRetryBackoff(backoff, multiplier);
-        setUpMetrics(subscription);
-        Message message = message();
-        doReturn(backoff(retrySeconds)).doReturn(backoff(retrySeconds)).doReturn(success()).when(messageSender).send(message);
-        ConsumerMessageSender sender = consumerMessageSender(subscription);
-
-        // when
-        sender.sendAsync(message);
-
-        //then
-        verify(successHandler, timeout(retrySeconds * 1000 * 2 + 500))
-            .handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
-    }
-
-    @Test
-    public void shouldIgnoreExponentialRetryBackoffAfterExceededTtl() throws InterruptedException {
-        final int backoff = 1000;
-        final double multiplier = 2;
-        final int ttl = 2;
-        Subscription subscription = subscriptionWithExponentialRetryBackoff(backoff, multiplier, ttl);
-        setUpMetrics(subscription);
-        Message message = message();
-        doReturn(failure()).doReturn(failure()).doReturn(success()).when(messageSender).send(message);
-        ConsumerMessageSender sender = consumerMessageSender(subscription);
-
-        // when
-        sender.sendAsync(message);
-        Thread.sleep(backoff + (long) multiplier * backoff + 1000);
-
-        //then
-        verifyZeroInteractions(successHandler);
-    }
-
-    private ConsumerMessageSender consumerMessageSender(Subscription subscription) {
-        when(messageSenderFactory.create(eq(subscription), any(ResilientMessageSender.class))).thenReturn(messageSender);
-        ConsumerMessageSender sender = new ConsumerMessageSender(
-                subscription,
-                messageSenderFactory,
-                Arrays.asList(successHandler),
-                Arrays.asList(errorHandler),
-                rateLimiter,
-                Executors.newSingleThreadExecutor(),
-                () -> inflightSemaphore.release(),
-                metricsFacade,
-                ASYNC_TIMEOUT_MS,
-                new FutureAsyncTimeout(Executors.newSingleThreadScheduledExecutor()),
-                Clock.systemUTC(),
-                new NoOpConsumerNodeLoadRegistry().register(subscription.getQualifiedName())
-        );
-        sender.initialize();
-
-        return sender;
-    }
-
-    private void verifyErrorHandlerHandleFailed(Message message, Subscription subscription, int times) {
-        verifyErrorHandlerHandleFailed(message, subscription, times, 1000);
-    }
-
-    private void verifyErrorHandlerHandleFailed(Message message, Subscription subscription, int times, int timeout) {
-        verify(errorHandler, timeout(timeout).times(times)).handleFailed(eq(message), eq(subscription), any(MessageSendingResult.class));
-    }
-
-    private void verifyErrorHandlerHandleDiscarded(Message message, Subscription subscription) {
-        verify(errorHandler, timeout(1000).times(1)).handleDiscarded(eq(message), eq(subscription), any(MessageSendingResult.class));
-    }
-
-    private void verifyLatencyTimersCountedTimes(Subscription subscription, int timeCount, int closeCount) {
-        verify(metricsFacade.subscriptions(), times(1)).latency(subscription.getQualifiedName());
-        verify(consumerLatencyTimer, times(timeCount)).time();
-        verify(consumerLatencyTimerContext, times(closeCount)).close();
-    }
-
-    private Subscription subscriptionWithTtl(int ttl) {
-        return subscriptionBuilderWithTestValues()
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults()
-                        .withMessageTtl(ttl)
-                        .build())
-                .build();
-    }
-
-    private Subscription subscriptionWithTtlAndClientErrorRetry(int ttl) {
-        return subscriptionBuilderWithTestValues()
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults()
-                        .withMessageTtl(ttl)
-                        .withClientErrorRetry()
-                        .build())
-                .build();
-    }
-
-    private Subscription subscriptionWithBackoff(int backoff) {
-        return subscriptionBuilderWithTestValues()
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults()
-                        .withMessageBackoff(backoff)
-                        .build())
-                .build();
-    }
-
-    private Subscription subscriptionWithout4xxRetryAndWithOAuthPolicy() {
-        return subscriptionBuilderWithTestValues()
-                .withOAuthPolicy(passwordGrantOAuthPolicy("myOAuthProvider")
-                        .withUsername("user1")
-                        .withPassword("abc123")
-                        .build())
-                .build();
-    }
-
-    private Subscription subscriptionWithEndpoint(String endpoint) {
-        return subscriptionBuilderWithTestValues().withEndpoint(endpoint).build();
-    }
-
-    private Subscription subscriptionWithRequestTimeout(int timeout) {
-        return subscriptionBuilderWithTestValues().withRequestTimeout(timeout).build();
-    }
-
-    private Subscription subscriptionWithExponentialRetryBackoff(int messageBackoff, double backoffMultiplier) {
-        return subscriptionWithExponentialRetryBackoff(messageBackoff, backoffMultiplier, 3600);
-    }
-
-    private Subscription subscriptionWithExponentialRetryBackoff(int messageBackoff, double backoffMultiplier, int ttl) {
-        return subscriptionBuilderWithTestValues()
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults()
-                        .withMessageBackoff(messageBackoff)
-                        .withBackoffMultiplier(backoffMultiplier)
-                        .withMessageTtl(ttl)
-                        .build())
-                .build();
-    }
-
-    private SubscriptionBuilder subscriptionBuilderWithTestValues() {
-        return subscription("group.topic", "subscription");
-    }
-
-    private RuntimeException exception() {
-        return new RuntimeException("problem");
-    }
-
-    private CompletableFuture<MessageSendingResult> success() {
-        return CompletableFuture.completedFuture(MessageSendingResult.succeededResult());
-    }
-
-    private CompletableFuture<MessageSendingResult> failure() {
-        return CompletableFuture.completedFuture(MessageSendingResult.failedResult(exception()));
-    }
-
-    private CompletableFuture<MessageSendingResult> failure(int statusCode) {
-        return CompletableFuture.completedFuture(MessageSendingResult.failedResult(statusCode));
-    }
-
-    private CompletableFuture<MessageSendingResult> backoff(int seconds) {
-        return CompletableFuture.completedFuture(MessageSendingResult.retryAfter(seconds));
-    }
-
-    private void verifySemaphoreReleased() {
-        assertThat(inflightSemaphore.availablePermits()).isEqualTo(1);
-    }
-
-
-    private Message message() {
-        return messageWithTimestamp(System.currentTimeMillis());
-    }
-
-    private Message messageWithTimestamp(long timestamp) {
-        return MessageBuilder
-                .withTestMessage()
-                .withContent("{\"username\":\"ala\"}", StandardCharsets.UTF_8)
-                .withReadingTimestamp(timestamp)
-                .withPublishingTimestamp(timestamp)
-                .build();
-    }
+  private ConsumerMessageSender sender;
+
+  @Mock private SubscriptionMetrics subscriptionMetrics;
+
+  @Mock private MetricsFacade metricsFacade;
+
+  @Before
+  public void setUp() {
+    when(metricsFacade.subscriptions()).thenReturn(subscriptionMetrics);
+    setUpMetrics(subscription);
+    setUpMetrics(subscriptionWith4xxRetry);
+    sender = consumerMessageSender(subscription);
+  }
+
+  private void setUpMetrics(Subscription subscription) {
+    when(metricsFacade.subscriptions().latency(subscription.getQualifiedName()))
+        .thenReturn(consumerLatencyTimer);
+    when(metricsFacade.subscriptions().rateLimiterAcquire(subscription.getQualifiedName()))
+        .thenReturn(rateLimiterAcquireTimer);
+    when(metricsFacade.subscriptions().otherErrorsCounter(subscription.getQualifiedName()))
+        .thenReturn(errors);
+    when(consumerLatencyTimer.time()).thenReturn(consumerLatencyTimerContext);
+    when(rateLimiterAcquireTimer.time()).thenReturn(rateLimiterAcquireTimerContext);
+    when(metricsFacade.subscriptions().failuresCounter(subscription.getQualifiedName()))
+        .thenReturn(failedMeter);
+    when(metricsFacade.subscriptions().retries(subscription.getQualifiedName()))
+        .thenReturn(retries);
+  }
+
+  @Test
+  public void shouldHandleSuccessfulSending() {
+    // given
+    Message message = message();
+    when(messageSender.send(message)).thenReturn(success());
+
+    // when
+    sender.sendAsync(message, profiler);
+    verify(successHandler, timeout(1000))
+        .handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
+
+    // then
+    verify(pendingOffsets).markAsProcessed(any(SubscriptionPartitionOffset.class));
+    verifyLatencyTimersCountedTimes(subscription, 1, 1);
+    verifyRateLimiterAcquireTimersCountedTimes(subscription, 1, 1);
+    verifyNoInteractions(errorHandler);
+    verifyNoInteractions(failedMeter);
+    verifyRateLimiterAcquired();
+    verifyNoInteractions(retries);
+  }
+
+  @Test
+  public void shouldKeepTryingToSendMessageFailedSending() {
+    // given
+    Message message = message();
+    doReturn(failure()).doReturn(failure()).doReturn(success()).when(messageSender).send(message);
+
+    // when
+    sender.sendAsync(message, profiler);
+    verify(successHandler, timeout(1000))
+        .handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
+
+    // then
+    verify(pendingOffsets).markAsProcessed(any(SubscriptionPartitionOffset.class));
+    verifyLatencyTimersCountedTimes(subscription, 3, 3);
+    verifyRateLimiterAcquireTimersCountedTimes(subscription, 3, 3);
+    verifyErrorHandlerHandleFailed(message, subscription, 2);
+    verifyRateLimiterAcquired(3);
+    verifyRetryCounted(2);
+  }
+
+  @Test
+  public void shouldDiscardMessageWhenTTLIsExceeded() {
+    // given
+    Message message = messageWithTimestamp(System.currentTimeMillis() - 11000);
+    doReturn(failure()).when(messageSender).send(message);
+
+    // when
+    sender.sendAsync(message, profiler);
+
+    // then
+    verify(errorHandler, timeout(1000))
+        .handleDiscarded(eq(message), eq(subscription), any(MessageSendingResult.class));
+    verify(pendingOffsets).markAsProcessed(any(SubscriptionPartitionOffset.class));
+    verifyNoInteractions(successHandler);
+    verifyLatencyTimersCountedTimes(subscription, 1, 1);
+    verifyRateLimiterAcquireTimersCountedTimes(subscription, 1, 1);
+    verifyRateLimiterAcquired();
+    verifyNoInteractions(retries);
+  }
+
+  @Test
+  public void shouldNotKeepTryingToSendMessageFailedWithStatusCode4xx() {
+    // given
+    Message message = message();
+    doReturn(failure(403)).doReturn(success()).when(messageSender).send(message);
+
+    // when
+    sender.sendAsync(message, profiler);
+
+    // then
+    verify(errorHandler, timeout(1000))
+        .handleDiscarded(eq(message), eq(subscription), any(MessageSendingResult.class));
+    verify(pendingOffsets).markAsProcessed(any(SubscriptionPartitionOffset.class));
+    verifyNoInteractions(successHandler);
+    verifyLatencyTimersCountedTimes(subscription, 1, 1);
+    verifyRateLimiterAcquireTimersCountedTimes(subscription, 1, 1);
+    verifyRateLimiterAcquired();
+    verifyNoInteractions(retries);
+  }
+
+  @Test
+  public void shouldKeepTryingToSendMessageFailedWithStatusCode4xxForSubscriptionWith4xxRetry() {
+    // given
+    final int expectedNumbersOfFailures = 3;
+    ConsumerMessageSender sender = consumerMessageSender(subscriptionWith4xxRetry);
+    Message message = message();
+    doReturn(failure(403))
+        .doReturn(failure(403))
+        .doReturn(failure(403))
+        .doReturn(success())
+        .when(messageSender)
+        .send(message);
+
+    // when
+    sender.sendAsync(message, profiler);
+    verify(successHandler, timeout(1000))
+        .handleSuccess(eq(message), eq(subscriptionWith4xxRetry), any(MessageSendingResult.class));
+
+    // then
+    verify(pendingOffsets).markAsProcessed(any(SubscriptionPartitionOffset.class));
+    verify(errorHandler, timeout(1000).times(expectedNumbersOfFailures))
+        .handleFailed(eq(message), eq(subscriptionWith4xxRetry), any(MessageSendingResult.class));
+    verifyRateLimiterAcquired(expectedNumbersOfFailures + 1);
+    verifyRetryCounted(expectedNumbersOfFailures);
+  }
+
+  @Test
+  public void shouldRetryOn401UnauthorizedForOAuthSecuredSubscription() {
+    // given
+    final int expectedNumbersOfFailures = 2;
+    Subscription subscription = subscriptionWithout4xxRetryAndWithOAuthPolicy();
+    setUpMetrics(subscription);
+    ConsumerMessageSender sender = consumerMessageSender(subscription);
+    Message message = message();
+    doReturn(failure(401))
+        .doReturn(failure(401))
+        .doReturn(success())
+        .when(messageSender)
+        .send(message);
+
+    // when
+    sender.sendAsync(message, profiler);
+
+    // then
+    verifyErrorHandlerHandleFailed(message, subscription, expectedNumbersOfFailures);
+    verify(successHandler, timeout(1000))
+        .handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
+    verifyRetryCounted(expectedNumbersOfFailures);
+    verifyRateLimiterAcquired(expectedNumbersOfFailures + 1);
+  }
+
+  @Test
+  public void shouldBackoffRetriesWhenEndpointFails() throws InterruptedException {
+    // given
+    final int executionTime = 100;
+    final int senderBackoffTime = 50;
+    final int expectedNumberOfFailures = 1 + executionTime / senderBackoffTime;
+    Subscription subscriptionWithBackoff = subscriptionWithBackoff(senderBackoffTime);
+    setUpMetrics(subscriptionWithBackoff);
+
+    sender = consumerMessageSender(subscriptionWithBackoff);
+    Message message = message();
+    doReturn(failure(500)).when(messageSender).send(message);
+
+    // when
+    sender.sendAsync(message, profiler);
+
+    // then
+    Thread.sleep(executionTime);
+    verifyErrorHandlerHandleFailed(message, subscriptionWithBackoff, expectedNumberOfFailures);
+    verifyRateLimiterAcquired(expectedNumberOfFailures);
+    verifyRetryCounted(expectedNumberOfFailures);
+  }
+
+  @Test
+  public void shouldNotRetryOnRetryAfterAboveTtl() {
+    // given
+    int retrySeconds = subscription.getSerialSubscriptionPolicy().getMessageTtl();
+    Message message = messageWithTimestamp(System.currentTimeMillis() - 1);
+    doReturn(backoff(retrySeconds + 1)).doReturn(success()).when(messageSender).send(message);
+
+    // when
+    sender.sendAsync(message, profiler);
+
+    // then
+    verify(errorHandler, timeout(1000))
+        .handleDiscarded(eq(message), eq(subscription), any(MessageSendingResult.class));
+    verify(pendingOffsets).markAsProcessed(any(SubscriptionPartitionOffset.class));
+    verifyNoInteractions(successHandler);
+    verifyLatencyTimersCountedTimes(subscription, 1, 1);
+    verifyRateLimiterAcquireTimersCountedTimes(subscription, 1, 1);
+    verifyRateLimiterAcquired();
+    verifyNoInteractions(retries);
+  }
+
+  @Test
+  public void shouldDeliverToModifiedEndpoint() {
+    // given
+    Message message = message();
+    Subscription subscriptionWithModfiedEndpoint =
+        subscriptionWithEndpoint("http://somewhere:9876");
+    MessageSender otherMessageSender = mock(MessageSender.class);
+
+    when(messageSenderFactory.create(
+            eq(subscriptionWithModfiedEndpoint), any(ResilientMessageSender.class)))
+        .thenReturn(otherMessageSender);
+    when(otherMessageSender.send(message)).thenReturn(success());
+
+    // when
+    sender.updateSubscription(subscriptionWithModfiedEndpoint);
+    sender.sendAsync(message, profiler);
+
+    // then
+    verify(otherMessageSender, timeout(1000)).send(message);
+    verifyRateLimiterAcquired();
+    verifyNoInteractions(retries);
+  }
+
+  @Test
+  public void shouldDeliverToNewSenderAfterModifiedTimeout() {
+    // given
+    Message message = message();
+    Subscription subscriptionWithModifiedTimeout = subscriptionWithRequestTimeout(2000);
+    MessageSender otherMessageSender = mock(MessageSender.class);
+
+    when(messageSenderFactory.create(
+            eq(subscriptionWithModifiedTimeout), any(ResilientMessageSender.class)))
+        .thenReturn(otherMessageSender);
+    when(otherMessageSender.send(message)).thenReturn(success());
+
+    // when
+    sender.updateSubscription(subscriptionWithModifiedTimeout);
+    sender.sendAsync(message, profiler);
+
+    // then
+    verify(otherMessageSender, timeout(1000)).send(message);
+    verifyRateLimiterAcquired();
+    verifyNoInteractions(retries);
+  }
+
+  @Test
+  public void shouldDelaySendingMessageForHalfSecond() {
+    // given
+    Subscription subscription =
+        subscriptionBuilderWithTestValues()
+            .withSubscriptionPolicy(
+                subscriptionPolicy().applyDefaults().withSendingDelay(500).build())
+            .build();
+    setUpMetrics(subscription);
+
+    Message message = message();
+    when(messageSender.send(message)).thenReturn(success());
+    ConsumerMessageSender sender = consumerMessageSender(subscription);
+
+    // when
+    long sendingStartTime = System.currentTimeMillis();
+    sender.sendAsync(message, profiler);
+    verify(successHandler, timeout(1000))
+        .handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
+
+    // then
+    long sendingTime = System.currentTimeMillis() - sendingStartTime;
+    assertThat(sendingTime).isGreaterThanOrEqualTo(500);
+    verifyRateLimiterAcquired();
+    verifyNoInteractions(retries);
+  }
+
+  @Test
+  public void shouldCalculateSendingDelayBasingOnPublishingTimestamp() {
+    // given
+    Subscription subscription =
+        subscriptionBuilderWithTestValues()
+            .withSubscriptionPolicy(
+                subscriptionPolicy().applyDefaults().withSendingDelay(2000).build())
+            .build();
+    setUpMetrics(subscription);
+
+    Message message = messageWithTimestamp(System.currentTimeMillis() - 1800);
+    when(messageSender.send(message)).thenReturn(success());
+    ConsumerMessageSender sender = consumerMessageSender(subscription);
+
+    // when
+    long sendingStartTime = System.currentTimeMillis();
+    sender.sendAsync(message, profiler);
+    verify(successHandler, timeout(500))
+        .handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
+
+    // then
+    long sendingTime = System.currentTimeMillis() - sendingStartTime;
+    assertThat(sendingTime).isLessThan(300);
+    verifyRateLimiterAcquired();
+    verifyNoInteractions(retries);
+  }
+
+  @Test
+  public void shouldIncreaseRetryBackoffExponentially() throws InterruptedException {
+    // given
+    final int expectedNumberOfFailures = 2;
+    final int backoff = 500;
+    final double multiplier = 2;
+    Subscription subscription = subscriptionWithExponentialRetryBackoff(backoff, multiplier);
+    setUpMetrics(subscription);
+    Message message = message();
+    doReturn(failure()).doReturn(failure()).doReturn(success()).when(messageSender).send(message);
+    ConsumerMessageSender sender = consumerMessageSender(subscription);
+
+    // when
+    sender.sendAsync(message, profiler);
+    Thread.sleep(backoff + (long) multiplier * backoff - 100);
+
+    // then
+    verifyNoInteractions(successHandler);
+    verifyRateLimiterAcquired(expectedNumberOfFailures);
+    verifyRetryCounted(expectedNumberOfFailures);
+  }
+
+  @Test
+  public void shouldIgnoreExponentialRetryBackoffWithRetryAfter() {
+    // given
+    final int expectedNumberOfRetries = 2;
+    final int retrySeconds = 1;
+    final int backoff = 5000;
+    final double multiplier = 3;
+    Subscription subscription = subscriptionWithExponentialRetryBackoff(backoff, multiplier);
+    setUpMetrics(subscription);
+    Message message = message();
+    doReturn(backoff(retrySeconds))
+        .doReturn(backoff(retrySeconds))
+        .doReturn(success())
+        .when(messageSender)
+        .send(message);
+    ConsumerMessageSender sender = consumerMessageSender(subscription);
+
+    // when
+    sender.sendAsync(message, profiler);
+
+    // then
+    verify(successHandler, timeout(retrySeconds * 1000 * 2 + 500))
+        .handleSuccess(eq(message), eq(subscription), any(MessageSendingResult.class));
+    verifyRateLimiterAcquired(expectedNumberOfRetries + 1);
+    verifyRetryCounted(expectedNumberOfRetries);
+  }
+
+  @Test
+  public void shouldIgnoreExponentialRetryBackoffAfterExceededTtl() throws InterruptedException {
+    final int backoff = 1000;
+    final double multiplier = 2;
+    final int ttl = 2;
+    Subscription subscription = subscriptionWithExponentialRetryBackoff(backoff, multiplier, ttl);
+    setUpMetrics(subscription);
+    Message message = message();
+    doReturn(failure()).doReturn(failure()).doReturn(success()).when(messageSender).send(message);
+    ConsumerMessageSender sender = consumerMessageSender(subscription);
+
+    // when
+    sender.sendAsync(message, profiler);
+    Thread.sleep(backoff + (long) multiplier * backoff + 1000);
+
+    // then
+    verifyNoInteractions(successHandler);
+    verifyRateLimiterAcquired(2);
+    verifyRetryCounted();
+  }
+
+  private ConsumerMessageSender consumerMessageSender(Subscription subscription) {
+    when(messageSenderFactory.create(eq(subscription), any(ResilientMessageSender.class)))
+        .thenReturn(messageSender);
+    ConsumerMessageSender sender =
+        new ConsumerMessageSender(
+            subscription,
+            messageSenderFactory,
+            List.of(successHandler),
+            List.of(errorHandler),
+            rateLimiter,
+            Executors.newSingleThreadExecutor(),
+            pendingOffsets,
+            metricsFacade,
+            ASYNC_TIMEOUT_MS,
+            new FutureAsyncTimeout(Executors.newSingleThreadScheduledExecutor()),
+            Clock.systemUTC(),
+            new NoOpConsumerNodeLoadRegistry().register(subscription.getQualifiedName()));
+    sender.initialize();
+
+    return sender;
+  }
+
+  private void verifyErrorHandlerHandleFailed(
+      Message message, Subscription subscription, int times) {
+    verifyErrorHandlerHandleFailed(message, subscription, times, 1000);
+  }
+
+  private void verifyErrorHandlerHandleFailed(
+      Message message, Subscription subscription, int times, int timeout) {
+    verify(errorHandler, timeout(timeout).times(times))
+        .handleFailed(eq(message), eq(subscription), any(MessageSendingResult.class));
+  }
+
+  private void verifyLatencyTimersCountedTimes(
+      Subscription subscription, int timeCount, int closeCount) {
+    verify(metricsFacade.subscriptions(), times(1)).latency(subscription.getQualifiedName());
+    verify(consumerLatencyTimer, times(timeCount)).time();
+    verify(consumerLatencyTimerContext, times(closeCount)).close();
+  }
+
+  private void verifyRateLimiterAcquireTimersCountedTimes(
+      Subscription subscription, int timeCount, int closeCount) {
+    verify(metricsFacade.subscriptions(), times(1))
+        .rateLimiterAcquire(subscription.getQualifiedName());
+    verify(rateLimiterAcquireTimer, times(timeCount)).time();
+    verify(rateLimiterAcquireTimerContext, times(closeCount)).close();
+  }
+
+  private Subscription subscriptionWithTtl(int ttl) {
+    return subscriptionBuilderWithTestValues()
+        .withSubscriptionPolicy(subscriptionPolicy().applyDefaults().withMessageTtl(ttl).build())
+        .build();
+  }
+
+  private Subscription subscriptionWithTtlAndClientErrorRetry(int ttl) {
+    return subscriptionBuilderWithTestValues()
+        .withSubscriptionPolicy(
+            subscriptionPolicy().applyDefaults().withMessageTtl(ttl).withClientErrorRetry().build())
+        .build();
+  }
+
+  private Subscription subscriptionWithBackoff(int backoff) {
+    return subscriptionBuilderWithTestValues()
+        .withSubscriptionPolicy(
+            subscriptionPolicy().applyDefaults().withMessageBackoff(backoff).build())
+        .build();
+  }
+
+  private Subscription subscriptionWithout4xxRetryAndWithOAuthPolicy() {
+    return subscriptionBuilderWithTestValues()
+        .withOAuthPolicy(
+            passwordGrantOAuthPolicy("myOAuthProvider")
+                .withUsername("user1")
+                .withPassword("abc123")
+                .build())
+        .build();
+  }
+
+  private Subscription subscriptionWithEndpoint(String endpoint) {
+    return subscriptionBuilderWithTestValues().withEndpoint(endpoint).build();
+  }
+
+  private Subscription subscriptionWithRequestTimeout(int timeout) {
+    return subscriptionBuilderWithTestValues().withRequestTimeout(timeout).build();
+  }
+
+  private Subscription subscriptionWithExponentialRetryBackoff(
+      int messageBackoff, double backoffMultiplier) {
+    return subscriptionWithExponentialRetryBackoff(messageBackoff, backoffMultiplier, 3600);
+  }
+
+  private Subscription subscriptionWithExponentialRetryBackoff(
+      int messageBackoff, double backoffMultiplier, int ttl) {
+    return subscriptionBuilderWithTestValues()
+        .withSubscriptionPolicy(
+            subscriptionPolicy()
+                .applyDefaults()
+                .withMessageBackoff(messageBackoff)
+                .withBackoffMultiplier(backoffMultiplier)
+                .withMessageTtl(ttl)
+                .build())
+        .build();
+  }
+
+  private SubscriptionBuilder subscriptionBuilderWithTestValues() {
+    return subscription("group.topic", "subscription");
+  }
+
+  private RuntimeException exception() {
+    return new RuntimeException("problem");
+  }
+
+  private CompletableFuture<MessageSendingResult> success() {
+    return CompletableFuture.completedFuture(MessageSendingResult.succeededResult());
+  }
+
+  private CompletableFuture<MessageSendingResult> failure() {
+    return CompletableFuture.completedFuture(MessageSendingResult.failedResult(exception()));
+  }
+
+  private CompletableFuture<MessageSendingResult> failure(int statusCode) {
+    return CompletableFuture.completedFuture(MessageSendingResult.failedResult(statusCode));
+  }
+
+  private CompletableFuture<MessageSendingResult> backoff(int seconds) {
+    return CompletableFuture.completedFuture(MessageSendingResult.retryAfter(seconds));
+  }
+
+  private void verifyRateLimiterAcquired() {
+    verifyRateLimiterAcquired(1);
+  }
+
+  private void verifyRateLimiterAcquired(int times) {
+    verify(rateLimiter, times(times)).acquire();
+  }
+
+  private void verifyRetryCounted() {
+    verifyRetryCounted(1);
+  }
+
+  private void verifyRetryCounted(int times) {
+    verify(retries, times(times)).increment();
+  }
+
+  private Message message() {
+    return messageWithTimestamp(System.currentTimeMillis());
+  }
+
+  private Message messageWithTimestamp(long timestamp) {
+    return MessageBuilder.withTestMessage()
+        .withContent("{\"username\":\"ala\"}", StandardCharsets.UTF_8)
+        .withReadingTimestamp(timestamp)
+        .withPublishingTimestamp(timestamp)
+        .build();
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferPoolTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferPoolTest.java
index fc5b54a42a..37fc9901c3 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferPoolTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferPoolTest.java
@@ -1,8 +1,7 @@
 package pl.allegro.tech.hermes.consumers.consumer.batch;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
@@ -12,207 +11,218 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class DirectBufferPoolTest {
-    long totalMemory = 10 * 1024;
-    int poolableSize = 1024;
-
-    DirectBufferPool pool;
-    ByteBuffer buffer;
-
-    @Before
-    public void setup() {
-        this.pool = new DirectBufferPool(totalMemory, poolableSize, false);
-    }
-
-
-    @After
-    public void cleanup() {
-        if (buffer != null) {
-            pool.deallocate(buffer);
-        }
-    }
-
-    @Test
-    public void shouldAllocateGivenAmountOfBytes() throws InterruptedException {
-        // given
-        int size = 512;
-
-        // when
-        buffer = pool.allocate(size);
-
-        // then
-        assertEquals("Buffer size should equal requested size.", size, buffer.limit());
-        assertEquals("Unallocated memory should have shrunk", totalMemory - size, pool.unallocatedMemory());
-        assertEquals("Available memory should have shrunk", totalMemory - size, pool.availableMemory());
-    }
-
-    @Test
-    public void shouldDeallocateAllMemoryFromBuffer() throws InterruptedException {
-        // given
-        buffer = pool.allocate(512).putInt(1);
-        buffer.flip();
-
-        // when
-        pool.deallocate(buffer);
-
-        // then
-        assertEquals("All memory should be available", totalMemory, pool.availableMemory());
-        assertEquals("Nothing is on a free list", totalMemory, pool.unallocatedMemory());
-    }
-
-    @Test
-    public void shouldRecycleBuffersOfPoolableSize() throws InterruptedException {
-        // given
-        pool.deallocate(pool.allocate(poolableSize));
-
-        // when
-        buffer = pool.allocate(poolableSize);
-
-        // then
-        assertEquals("Recycled buffer should be cleared.", 0, buffer.position());
-        assertEquals("Recycled buffer should be cleared.", buffer.capacity(), buffer.limit());
-        assertEquals("Still a single buffer on the free list", totalMemory - poolableSize, pool.unallocatedMemory());
-    }
-
-    @Test
-    public void shouldDeallocateNonStandardBufferSize() throws InterruptedException {
-        // given
-        buffer = pool.allocate(2 * poolableSize);
-
-        // when
-        pool.deallocate(buffer);
-
-        // then
-        assertEquals("All memory should be available", totalMemory, pool.availableMemory());
-        assertEquals("Non-standard size didn't go to the free list.", totalMemory, pool.unallocatedMemory());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotAllocateMoreMemoryThanTotalMemoryWeHave() throws InterruptedException {
-        // given
-        DirectBufferPool pool = new DirectBufferPool(1024, 512, true);
+  long totalMemory = 10 * 1024;
+  int poolableSize = 1024;
 
-        // when
-        pool.allocate(1025);
-    }
+  DirectBufferPool pool;
+  ByteBuffer buffer;
 
-    @Test(expected = BufferOverflowException.class)
-    public void shouldThrowExceptionOnBufferExhaustion() throws InterruptedException {
-        // given
-        DirectBufferPool pool = new DirectBufferPool(1024, 512, false);
+  @Before
+  public void setup() {
+    this.pool = new DirectBufferPool(totalMemory, poolableSize, false);
+  }
 
-        // when
-        pool.allocate(512);
-        pool.allocate(768);
+  @After
+  public void cleanup() {
+    if (buffer != null) {
+      pool.deallocate(buffer);
     }
-
-    @Test
-    public void shouldBlockOnAllocationUntilMemoryIsAvailable() throws Exception {
-        // given
-        int total = 5 * 1024;
-        DirectBufferPool pool = new DirectBufferPool(total, 1024, true);
-        ByteBuffer buffer = pool.allocate(1024);
-
-        // when
-        CountDownLatch doDeallocation = asyncDeallocate(pool, buffer);
-        CountDownLatch allocation = asyncAllocate(pool, total);
-
-        // then
-        assertEquals("Allocation shouldn't have happened yet, waiting on memory.", 1L, allocation.getCount());
-        doDeallocation.countDown();
-        allocation.await();
-    }
-
-    private CountDownLatch asyncDeallocate(final DirectBufferPool pool, final ByteBuffer buffer) {
-        final CountDownLatch latch = new CountDownLatch(1);
-        Thread thread = new Thread() {
-            public void run() {
-                try {
-                    latch.await();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                pool.deallocate(buffer);
+  }
+
+  @Test
+  public void shouldAllocateGivenAmountOfBytes() throws InterruptedException {
+    // given
+    int size = 512;
+
+    // when
+    buffer = pool.allocate(size);
+
+    // then
+    assertEquals("Buffer size should equal requested size.", size, buffer.limit());
+    assertEquals(
+        "Unallocated memory should have shrunk", totalMemory - size, pool.unallocatedMemory());
+    assertEquals("Available memory should have shrunk", totalMemory - size, pool.availableMemory());
+  }
+
+  @Test
+  public void shouldDeallocateAllMemoryFromBuffer() throws InterruptedException {
+    // given
+    buffer = pool.allocate(512).putInt(1);
+    buffer.flip();
+
+    // when
+    pool.deallocate(buffer);
+
+    // then
+    assertEquals("All memory should be available", totalMemory, pool.availableMemory());
+    assertEquals("Nothing is on a free list", totalMemory, pool.unallocatedMemory());
+  }
+
+  @Test
+  public void shouldRecycleBuffersOfPoolableSize() throws InterruptedException {
+    // given
+    pool.deallocate(pool.allocate(poolableSize));
+
+    // when
+    buffer = pool.allocate(poolableSize);
+
+    // then
+    assertEquals("Recycled buffer should be cleared.", 0, buffer.position());
+    assertEquals("Recycled buffer should be cleared.", buffer.capacity(), buffer.limit());
+    assertEquals(
+        "Still a single buffer on the free list",
+        totalMemory - poolableSize,
+        pool.unallocatedMemory());
+  }
+
+  @Test
+  public void shouldDeallocateNonStandardBufferSize() throws InterruptedException {
+    // given
+    buffer = pool.allocate(2 * poolableSize);
+
+    // when
+    pool.deallocate(buffer);
+
+    // then
+    assertEquals("All memory should be available", totalMemory, pool.availableMemory());
+    assertEquals(
+        "Non-standard size didn't go to the free list.", totalMemory, pool.unallocatedMemory());
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void shouldNotAllocateMoreMemoryThanTotalMemoryWeHave() throws InterruptedException {
+    // given
+    DirectBufferPool pool = new DirectBufferPool(1024, 512, true);
+
+    // when
+    pool.allocate(1025);
+  }
+
+  @Test(expected = BufferOverflowException.class)
+  public void shouldThrowExceptionOnBufferExhaustion() throws InterruptedException {
+    // given
+    DirectBufferPool pool = new DirectBufferPool(1024, 512, false);
+
+    // when
+    pool.allocate(512);
+    pool.allocate(768);
+  }
+
+  @Test
+  public void shouldBlockOnAllocationUntilMemoryIsAvailable() throws Exception {
+    // given
+    int total = 5 * 1024;
+    DirectBufferPool pool = new DirectBufferPool(total, 1024, true);
+    ByteBuffer buffer = pool.allocate(1024);
+
+    // when
+    CountDownLatch doDeallocation = asyncDeallocate(pool, buffer);
+    CountDownLatch allocation = asyncAllocate(pool, total);
+
+    // then
+    assertEquals(
+        "Allocation shouldn't have happened yet, waiting on memory.", 1L, allocation.getCount());
+    doDeallocation.countDown();
+    allocation.await();
+  }
+
+  private CountDownLatch asyncDeallocate(final DirectBufferPool pool, final ByteBuffer buffer) {
+    final CountDownLatch latch = new CountDownLatch(1);
+    Thread thread =
+        new Thread() {
+          public void run() {
+            try {
+              latch.await();
+            } catch (InterruptedException e) {
+              e.printStackTrace();
             }
+            pool.deallocate(buffer);
+          }
         };
-        thread.start();
-        return latch;
-    }
-
-    private CountDownLatch asyncAllocate(final DirectBufferPool pool, final int size) {
-        final CountDownLatch completed = new CountDownLatch(1);
-        Thread thread = new Thread() {
-            public void run() {
-                try {
-                    pool.allocate(size);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                } finally {
-                    completed.countDown();
-                }
+    thread.start();
+    return latch;
+  }
+
+  private CountDownLatch asyncAllocate(final DirectBufferPool pool, final int size) {
+    final CountDownLatch completed = new CountDownLatch(1);
+    Thread thread =
+        new Thread() {
+          public void run() {
+            try {
+              pool.allocate(size);
+            } catch (InterruptedException e) {
+              e.printStackTrace();
+            } finally {
+              completed.countDown();
             }
+          }
         };
-        thread.start();
-        return completed;
-    }
-
-    @Test
-    public void shouldSurviveHammeringOfLotsOfThreadsOnBufferPool() throws Exception {
-        // given
-        int numThreads = 10;
-        final int iterations = 50000;
-        final int poolableSize = 1024;
-        final int totalMemory = numThreads / 2 * poolableSize;
-        final DirectBufferPool pool = new DirectBufferPool(totalMemory, poolableSize, true);
-
-        List<StressTestThread> threads = IntStream.range(0, numThreads)
-                .mapToObj(i -> new StressTestThread(pool, iterations))
-                .collect(Collectors.toList());
-
-        // when
-        threads.forEach(StressTestThread::start);
-        threads.forEach(StressTestThread::joinQuietly);
-
-        // then
-        threads.forEach(thread ->
-                assertTrue("Thread should have completed all iterations successfully.", thread.success.get()));
-        assertEquals(totalMemory, pool.availableMemory());
+    thread.start();
+    return completed;
+  }
+
+  @Test
+  public void shouldSurviveHammeringOfLotsOfThreadsOnBufferPool() throws Exception {
+    // given
+    int numThreads = 10;
+    final int iterations = 50000;
+    final int poolableSize = 1024;
+    final int totalMemory = numThreads / 2 * poolableSize;
+    final DirectBufferPool pool = new DirectBufferPool(totalMemory, poolableSize, true);
+
+    List<StressTestThread> threads =
+        IntStream.range(0, numThreads)
+            .mapToObj(i -> new StressTestThread(pool, iterations))
+            .collect(Collectors.toList());
+
+    // when
+    threads.forEach(StressTestThread::start);
+    threads.forEach(StressTestThread::joinQuietly);
+
+    // then
+    threads.forEach(
+        thread ->
+            assertTrue(
+                "Thread should have completed all iterations successfully.", thread.success.get()));
+    assertEquals(totalMemory, pool.availableMemory());
+  }
+
+  public static class StressTestThread extends Thread {
+    private final int iterations;
+    private final DirectBufferPool pool;
+    public final AtomicBoolean success = new AtomicBoolean(false);
+    Random random = new Random();
+
+    public StressTestThread(DirectBufferPool pool, int iterations) {
+      this.iterations = iterations;
+      this.pool = pool;
     }
 
-    public static class StressTestThread extends Thread {
-        private final int iterations;
-        private final DirectBufferPool pool;
-        public final AtomicBoolean success = new AtomicBoolean(false);
-        Random random = new Random();
-
-        public StressTestThread(DirectBufferPool pool, int iterations) {
-            this.iterations = iterations;
-            this.pool = pool;
-        }
-
-        public void run() {
-            try {
-                for (int i = 0; i < iterations; i++) {
-                    int size = random.nextBoolean() ? pool.poolableSize() : random.nextInt((int) pool.totalMemory());
-                    ByteBuffer buffer = pool.allocate(size);
-                    pool.deallocate(buffer);
-                }
-                success.set(true);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
+    public void run() {
+      try {
+        for (int i = 0; i < iterations; i++) {
+          int size =
+              random.nextBoolean() ? pool.poolableSize() : random.nextInt((int) pool.totalMemory());
+          ByteBuffer buffer = pool.allocate(size);
+          pool.deallocate(buffer);
         }
+        success.set(true);
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
+      }
+    }
 
-        public void joinQuietly() {
-            try {
-                join();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
+    public void joinQuietly() {
+      try {
+        join();
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
+      }
     }
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferUtilsTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferUtilsTest.java
index eb0e7ea56a..2723d76154 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferUtilsTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/batch/DirectBufferUtilsTest.java
@@ -1,32 +1,29 @@
 package pl.allegro.tech.hermes.consumers.consumer.batch;
 
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
-
-import static org.junit.Assert.assertEquals;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
 
 public class DirectBufferUtilsTest {
-    @Test
-    public void shouldReleaseDirectByteBuffer() {
-        // given
-        ByteBuffer buffer = ByteBuffer.allocateDirect(128);
+  @Test
+  public void shouldReleaseDirectByteBuffer() {
+    // given
+    ByteBuffer buffer = ByteBuffer.allocateDirect(128);
 
-        // when & then
-        assertEquals(DirectBufferUtils.supportsReleasing(), true);
-        Assertions.assertThatCode(() -> DirectBufferUtils.release(buffer))
-                .doesNotThrowAnyException();
-    }
+    // when & then
+    assertEquals(DirectBufferUtils.supportsReleasing(), true);
+    Assertions.assertThatCode(() -> DirectBufferUtils.release(buffer)).doesNotThrowAnyException();
+  }
 
-    @Test
-    public void shouldNotReleaseByteBuffer() {
-        // given
-        ByteBuffer buffer = ByteBuffer.allocate(128);
+  @Test
+  public void shouldNotReleaseByteBuffer() {
+    // given
+    ByteBuffer buffer = ByteBuffer.allocate(128);
 
-        // when & then
-        assertEquals(DirectBufferUtils.supportsReleasing(), true);
-        Assertions.assertThatCode(() -> DirectBufferUtils.release(buffer))
-                .doesNotThrowAnyException();
-    }
+    // when & then
+    assertEquals(DirectBufferUtils.supportsReleasing(), true);
+    Assertions.assertThatCode(() -> DirectBufferUtils.release(buffer)).doesNotThrowAnyException();
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/converter/AvroToJsonMessageConverterTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/converter/AvroToJsonMessageConverterTest.java
index 9c759cdba2..8a6e56a28a 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/converter/AvroToJsonMessageConverterTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/converter/AvroToJsonMessageConverterTest.java
@@ -1,40 +1,40 @@
 package pl.allegro.tech.hermes.consumers.consumer.converter;
 
+import static com.google.common.collect.ImmutableMap.of;
+import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
+import static pl.allegro.tech.hermes.consumers.consumer.Message.message;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
+import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 
-import java.io.IOException;
-
-import static com.google.common.collect.ImmutableMap.of;
-import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
-import static pl.allegro.tech.hermes.consumers.consumer.Message.message;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
 @RunWith(MockitoJUnitRunner.class)
 public class AvroToJsonMessageConverterTest {
 
-    @Test
-    public void shouldConvertToJsonWithoutMetadata() throws IOException {
-        // given
-        Topic topic = topic("group.topic").build();
-        AvroUser avroUser = new AvroUser("Bob", 18, "blue");
-        Message source = message()
-                .withData(avroUser.asBytes())
-                .withSchema(CompiledSchema.of(avroUser.getSchema(), 1, 0))
-                .withExternalMetadata(of())
-                .build();
-        AvroToJsonMessageConverter converter = new AvroToJsonMessageConverter();
-
-        // when
-        Message target = converter.convert(source, topic);
-
-        // then
-        assertThatJson(new String(target.getData())).isEqualTo("{\"name\": \"Bob\", \"age\": 18, \"favoriteColor\": \"blue\"}");
-    }
-
+  @Test
+  public void shouldConvertToJsonWithoutMetadata() throws IOException {
+    // given
+    Topic topic = topic("group.topic").build();
+    AvroUser avroUser = new AvroUser("Bob", 18, "blue");
+    Message source =
+        message()
+            .withData(avroUser.asBytes())
+            .withSchema(CompiledSchema.of(avroUser.getSchema(), 1, 0))
+            .withExternalMetadata(of())
+            .build();
+    AvroToJsonMessageConverter converter = new AvroToJsonMessageConverter();
+
+    // when
+    Message target = converter.convert(source, topic);
+
+    // then
+    assertThatJson(new String(target.getData()))
+        .isEqualTo("{\"name\": \"Bob\", \"age\": 18, \"favoriteColor\": \"blue\"}");
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/MessageBodyInterpolatorTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/MessageBodyInterpolatorTest.java
index c34170a0c3..64cec1d44f 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/MessageBodyInterpolatorTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/interpolation/MessageBodyInterpolatorTest.java
@@ -1,131 +1,138 @@
 package pl.allegro.tech.hermes.consumers.consumer.interpolation;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.withTestMessage;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import org.junit.Test;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.withTestMessage;
-
 public class MessageBodyInterpolatorTest {
 
-    private static final Message SAMPLE_MSG = withTestMessage()
+  private static final Message SAMPLE_MSG =
+      withTestMessage()
+          .withTopic("some.topic")
+          .withContent("{\"a\": \"b\"}", StandardCharsets.UTF_8)
+          .withPublishingTimestamp(214312123L)
+          .withReadingTimestamp(2143121233L)
+          .withPartitionOffset(new PartitionOffset(KafkaTopicName.valueOf("kafka_topic"), 0, 0))
+          .build();
+
+  private static final KafkaTopicName KAFKA_TOPIC = KafkaTopicName.valueOf("kafka_topic");
+
+  @Test
+  public void willReturnURIAsIsIfNoTemplate() throws InterpolationException {
+    // given
+    EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/");
+
+    // when
+    URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, SAMPLE_MSG);
+
+    // then
+    assertThat(interpolated).isEqualTo(endpoint.getUri());
+  }
+
+  @Test
+  public void willInterpolateJsonPathFromTemplate() throws InterpolationException {
+    // given
+    EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/{some.object}");
+    URI expectedEndpoint = URI.create("http://some.endpoint.com/100");
+    String jsonMessage = "{\"some\": {\"object\": 100}}";
+    Message msg =
+        withTestMessage()
             .withTopic("some.topic")
-            .withContent("{\"a\": \"b\"}", StandardCharsets.UTF_8)
-            .withPublishingTimestamp(214312123L)
-            .withReadingTimestamp(2143121233L)
+            .withContent(jsonMessage, StandardCharsets.UTF_8)
+            .withPublishingTimestamp(121422L)
+            .withReadingTimestamp(121423L)
             .withPartitionOffset(new PartitionOffset(KafkaTopicName.valueOf("kafka_topic"), 0, 0))
             .build();
 
-    private static final KafkaTopicName KAFKA_TOPIC = KafkaTopicName.valueOf("kafka_topic");
-
-    @Test
-    public void willReturnURIAsIsIfNoTemplate() throws InterpolationException {
-        // given
-        EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/");
-
-        // when
-        URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, SAMPLE_MSG);
-
-        // then
-        assertThat(interpolated).isEqualTo(endpoint.getUri());
-    }
-
-    @Test
-    public void willInterpolateJsonPathFromTemplate() throws InterpolationException {
-        // given
-        EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/{some.object}");
-        URI expectedEndpoint = URI.create("http://some.endpoint.com/100");
-        String jsonMessage = "{\"some\": {\"object\": 100}}";
-        Message msg = withTestMessage()
-                .withTopic("some.topic")
-                .withContent(jsonMessage, StandardCharsets.UTF_8)
-                .withPublishingTimestamp(121422L)
-                .withReadingTimestamp(121423L)
-                .withPartitionOffset(new PartitionOffset(KafkaTopicName.valueOf("kafka_topic"), 0, 0))
-                .build();
-
-        // when
-        URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, msg);
-
-        // then
-        assertThat(interpolated).isEqualTo(expectedEndpoint);
-    }
-
-    @Test
-    public void willReturnURIOnEmptyEndpoint() throws InterpolationException {
-        // given
-        EndpointAddress endpoint = EndpointAddress.of("");
-        URI expectedEndpoint = URI.create("");
-
-        // when
-        URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, SAMPLE_MSG);
-
-        // then
-        assertThat(interpolated).isEqualTo(expectedEndpoint);
-    }
-
-    @Test
-    public void willInterpolateMultipleJsonPathsFromTemplate() throws InterpolationException {
-        // given
-        EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/{some.object}?test={some.test}");
-        URI expectedEndpoint = URI.create("http://some.endpoint.com/100?test=hello");
-        String jsonMessage = "{\"some\": {\"object\": 100, \"test\": \"hello\"}}";
-        Message msg = withTestMessage()
-                .withTopic("some.topic")
-                .withContent(jsonMessage, StandardCharsets.UTF_8)
-                .withPublishingTimestamp(12323L)
-                .withReadingTimestamp(123234L)
-                .build();
-
-        // when
-        URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, msg);
-
-        // then
-        assertThat(interpolated).isEqualTo(expectedEndpoint);
-    }
-
-    @Test(expected = InterpolationException.class)
-    public void willThrowExceptionOnInvalidPayload() throws InterpolationException {
-        // given
-        EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/{some.object}");
-
-        // when
-        new MessageBodyInterpolator().interpolate(endpoint, SAMPLE_MSG);
-    }
-
-    @Test(expected = InterpolationException.class)
-    public void willThrowExceptionOnInterpolationException() throws InterpolationException {
-        // given
-        EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/{some.object}?test={some.test}");
-
-        // when
-        new MessageBodyInterpolator().interpolate(endpoint, SAMPLE_MSG);
-    }
-
-    @Test
-    public void willInterpolateMultipleJsonPathsFromTemplateInReverseOrder() throws InterpolationException {
-        // given
-        EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/{some.object}?test={some.test}");
-        URI expectedEndpoint = URI.create("http://some.endpoint.com/100?test=hello");
-        String jsonMessage = "{\"some\": {\"test\": \"hello\", \"object\": 100}}";
-        Message msg = withTestMessage()
-                .withTopic("some.topic")
-                .withContent(jsonMessage, StandardCharsets.UTF_8)
-                .withPublishingTimestamp(1232443L)
-                .withReadingTimestamp(12324434L)
-                .withPartitionOffset(new PartitionOffset(KAFKA_TOPIC, 0, 0))
-                .build();
-
-        // when
-        URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, msg);
-
-        // then
-        assertThat(interpolated).isEqualTo(expectedEndpoint);
-    }
+    // when
+    URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, msg);
+
+    // then
+    assertThat(interpolated).isEqualTo(expectedEndpoint);
+  }
+
+  @Test
+  public void willReturnURIOnEmptyEndpoint() throws InterpolationException {
+    // given
+    EndpointAddress endpoint = EndpointAddress.of("");
+    URI expectedEndpoint = URI.create("");
+
+    // when
+    URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, SAMPLE_MSG);
+
+    // then
+    assertThat(interpolated).isEqualTo(expectedEndpoint);
+  }
+
+  @Test
+  public void willInterpolateMultipleJsonPathsFromTemplate() throws InterpolationException {
+    // given
+    EndpointAddress endpoint =
+        EndpointAddress.of("http://some.endpoint.com/{some.object}?test={some.test}");
+    URI expectedEndpoint = URI.create("http://some.endpoint.com/100?test=hello");
+    String jsonMessage = "{\"some\": {\"object\": 100, \"test\": \"hello\"}}";
+    Message msg =
+        withTestMessage()
+            .withTopic("some.topic")
+            .withContent(jsonMessage, StandardCharsets.UTF_8)
+            .withPublishingTimestamp(12323L)
+            .withReadingTimestamp(123234L)
+            .build();
+
+    // when
+    URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, msg);
+
+    // then
+    assertThat(interpolated).isEqualTo(expectedEndpoint);
+  }
+
+  @Test(expected = InterpolationException.class)
+  public void willThrowExceptionOnInvalidPayload() throws InterpolationException {
+    // given
+    EndpointAddress endpoint = EndpointAddress.of("http://some.endpoint.com/{some.object}");
+
+    // when
+    new MessageBodyInterpolator().interpolate(endpoint, SAMPLE_MSG);
+  }
+
+  @Test(expected = InterpolationException.class)
+  public void willThrowExceptionOnInterpolationException() throws InterpolationException {
+    // given
+    EndpointAddress endpoint =
+        EndpointAddress.of("http://some.endpoint.com/{some.object}?test={some.test}");
+
+    // when
+    new MessageBodyInterpolator().interpolate(endpoint, SAMPLE_MSG);
+  }
+
+  @Test
+  public void willInterpolateMultipleJsonPathsFromTemplateInReverseOrder()
+      throws InterpolationException {
+    // given
+    EndpointAddress endpoint =
+        EndpointAddress.of("http://some.endpoint.com/{some.object}?test={some.test}");
+    URI expectedEndpoint = URI.create("http://some.endpoint.com/100?test=hello");
+    String jsonMessage = "{\"some\": {\"test\": \"hello\", \"object\": 100}}";
+    Message msg =
+        withTestMessage()
+            .withTopic("some.topic")
+            .withContent(jsonMessage, StandardCharsets.UTF_8)
+            .withPublishingTimestamp(1232443L)
+            .withReadingTimestamp(12324434L)
+            .withPartitionOffset(new PartitionOffset(KAFKA_TOPIC, 0, 0))
+            .build();
+
+    // when
+    URI interpolated = new MessageBodyInterpolator().interpolate(endpoint, msg);
+
+    // then
+    assertThat(interpolated).isEqualTo(expectedEndpoint);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/HeartbeatModeOutputRateCalculatorTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/HeartbeatModeOutputRateCalculatorTest.java
index c5880cf8a5..429db6e643 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/HeartbeatModeOutputRateCalculatorTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/HeartbeatModeOutputRateCalculatorTest.java
@@ -1,36 +1,39 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.calculator;
 
-import org.junit.Test;
-import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
+import static pl.allegro.tech.hermes.consumers.test.HermesConsumersAssertions.assertThat;
 
 import java.time.Clock;
-
-import static pl.allegro.tech.hermes.consumers.test.HermesConsumersAssertions.assertThat;
+import org.junit.Test;
+import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
 
 public class HeartbeatModeOutputRateCalculatorTest {
 
-    private static final int SLOW_RATE = 10;
+  private static final int SLOW_RATE = 10;
 
-    private final HeartbeatModeOutputRateCalculator calculator = new HeartbeatModeOutputRateCalculator(SLOW_RATE);
+  private final HeartbeatModeOutputRateCalculator calculator =
+      new HeartbeatModeOutputRateCalculator(SLOW_RATE);
 
-    private final SendCounters counters = new SendCounters(Clock.systemDefaultZone());
+  private final SendCounters counters = new SendCounters(Clock.systemDefaultZone());
 
-    @Test
-    public void shouldNotChangeAnythingIfThereWereAnyFailures() {
-        // given
-        counters.incrementSuccesses()
-                .incrementFailures();
+  @Test
+  public void shouldNotChangeAnythingIfThereWereAnyFailures() {
+    // given
+    counters.incrementSuccesses().incrementFailures();
 
-        // when then
-        assertThat(calculator.calculateOutputRate(1, 20, counters)).hasRate(1).isInMode(OutputRateCalculator.Mode.HEARTBEAT);
-    }
+    // when then
+    assertThat(calculator.calculateOutputRate(1, 20, counters))
+        .hasRate(1)
+        .isInMode(OutputRateCalculator.Mode.HEARTBEAT);
+  }
 
-    @Test
-    public void shouldSwitchToSlowModeIfOnlySuccesses() {
-        // given
-        counters.incrementSuccesses();
+  @Test
+  public void shouldSwitchToSlowModeIfOnlySuccesses() {
+    // given
+    counters.incrementSuccesses();
 
-        // when then
-        assertThat(calculator.calculateOutputRate(1, 20, counters)).hasRate(SLOW_RATE).isInMode(OutputRateCalculator.Mode.SLOW);
-    }
+    // when then
+    assertThat(calculator.calculateOutputRate(1, 20, counters))
+        .hasRate(SLOW_RATE)
+        .isInMode(OutputRateCalculator.Mode.SLOW);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/NormalModeOutputRateCalculatorTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/NormalModeOutputRateCalculatorTest.java
index 042499ec5f..a1bd8effbf 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/NormalModeOutputRateCalculatorTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/NormalModeOutputRateCalculatorTest.java
@@ -1,83 +1,89 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.calculator;
 
-import org.junit.Test;
-import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
+import static pl.allegro.tech.hermes.consumers.test.HermesConsumersAssertions.assertThat;
 
 import java.time.Clock;
-
-import static pl.allegro.tech.hermes.consumers.test.HermesConsumersAssertions.assertThat;
+import org.junit.Test;
+import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
 
 public class NormalModeOutputRateCalculatorTest {
 
-    private static final int SLOW_RATE = 5;
-
-    private final NormalModeOutputRateCalculator calculator = new NormalModeOutputRateCalculator(0.5, SLOW_RATE, 0.1, 0.4);
-
-    private final SendCounters counters = new SendCounters(Clock.systemDefaultZone());
-
-    @Test
-    public void shouldIncreaseRateWhenFailuresBelowToleranceOccuredAndNotAboveMaximumRate() {
-        // given
-        NormalModeOutputRateCalculator calculator = new NormalModeOutputRateCalculator(0.5, SLOW_RATE, 0.4, 0.5);
-        counters.incrementSuccesses().incrementSuccesses().incrementFailures();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(10, 20, counters).rate()).isEqualTo(15);
-    }
-
-    @Test
-    public void shouldNotIncreaseRateWhenNoFailuresOccuredAndAlreadyAtMaximum() {
-        // given
-        counters.incrementSuccesses();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(20, 20, counters)).hasRate(20);
-    }
-
-    @Test
-    public void shouldNotSlowDownWhenRatioOfFailuresIsBelowGivenThreshold() {
-        // given
-        NormalModeOutputRateCalculator calculator = new NormalModeOutputRateCalculator(0.5, SLOW_RATE, 0.0, 0.38);
-        counters.incrementSuccesses().incrementSuccesses()
-                .incrementFailures();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(20, 20, counters)).hasRate(20);
-    }
-
-    @Test
-    public void shouldSlowDownWhenRatioOfFailuresExceedsGivenThreshold() {
-        // given
-        NormalModeOutputRateCalculator calculator = new NormalModeOutputRateCalculator(0.5, SLOW_RATE, 0.1, 0.38);
-        counters.incrementSuccesses().incrementSuccesses().incrementSuccesses()
-                .incrementFailures().incrementFailures();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(20, 20, counters)).hasRate(10);
-    }
-
-    @Test
-    public void shouldNotLimitRateWhenThereWereNoEvents() {
-        assertThat(calculator.calculateOutputRate(20, 20, counters)).hasRate(20);
-    }
-
-    @Test
-    public void shouldSwitchToSlowModeWhenCalculatedRateIsBelowSlowModeRate() {
-        // given
-        counters.incrementSuccesses()
-                .incrementFailures();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(8, 20, counters)).hasRate(SLOW_RATE);
-    }
-
-    @Test
-    public void shouldSwitchToSlowModeWhenThereWereMoreFailuresThanSuccesses() {
-        // given
-        counters.incrementSuccesses()
-                .incrementFailures().incrementFailures();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(10, 20, counters)).hasRate(5).isInMode(OutputRateCalculator.Mode.SLOW);
-    }
+  private static final int SLOW_RATE = 5;
+
+  private final NormalModeOutputRateCalculator calculator =
+      new NormalModeOutputRateCalculator(0.5, SLOW_RATE, 0.1, 0.4);
+
+  private final SendCounters counters = new SendCounters(Clock.systemDefaultZone());
+
+  @Test
+  public void shouldIncreaseRateWhenFailuresBelowToleranceOccuredAndNotAboveMaximumRate() {
+    // given
+    NormalModeOutputRateCalculator calculator =
+        new NormalModeOutputRateCalculator(0.5, SLOW_RATE, 0.4, 0.5);
+    counters.incrementSuccesses().incrementSuccesses().incrementFailures();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(10, 20, counters).rate()).isEqualTo(15);
+  }
+
+  @Test
+  public void shouldNotIncreaseRateWhenNoFailuresOccuredAndAlreadyAtMaximum() {
+    // given
+    counters.incrementSuccesses();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(20, 20, counters)).hasRate(20);
+  }
+
+  @Test
+  public void shouldNotSlowDownWhenRatioOfFailuresIsBelowGivenThreshold() {
+    // given
+    NormalModeOutputRateCalculator calculator =
+        new NormalModeOutputRateCalculator(0.5, SLOW_RATE, 0.0, 0.38);
+    counters.incrementSuccesses().incrementSuccesses().incrementFailures();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(20, 20, counters)).hasRate(20);
+  }
+
+  @Test
+  public void shouldSlowDownWhenRatioOfFailuresExceedsGivenThreshold() {
+    // given
+    NormalModeOutputRateCalculator calculator =
+        new NormalModeOutputRateCalculator(0.5, SLOW_RATE, 0.1, 0.38);
+    counters
+        .incrementSuccesses()
+        .incrementSuccesses()
+        .incrementSuccesses()
+        .incrementFailures()
+        .incrementFailures();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(20, 20, counters)).hasRate(10);
+  }
+
+  @Test
+  public void shouldNotLimitRateWhenThereWereNoEvents() {
+    assertThat(calculator.calculateOutputRate(20, 20, counters)).hasRate(20);
+  }
+
+  @Test
+  public void shouldSwitchToSlowModeWhenCalculatedRateIsBelowSlowModeRate() {
+    // given
+    counters.incrementSuccesses().incrementFailures();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(8, 20, counters)).hasRate(SLOW_RATE);
+  }
+
+  @Test
+  public void shouldSwitchToSlowModeWhenThereWereMoreFailuresThanSuccesses() {
+    // given
+    counters.incrementSuccesses().incrementFailures().incrementFailures();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(10, 20, counters))
+        .hasRate(5)
+        .isInMode(OutputRateCalculator.Mode.SLOW);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationResultAssert.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationResultAssert.java
index 523e08c0a0..ddd2ecc194 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationResultAssert.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationResultAssert.java
@@ -4,23 +4,23 @@
 import org.assertj.core.api.Assertions;
 
 public final class OutputRateCalculationResultAssert
-        extends AbstractAssert<OutputRateCalculationResultAssert, OutputRateCalculationResult> {
+    extends AbstractAssert<OutputRateCalculationResultAssert, OutputRateCalculationResult> {
 
-    private OutputRateCalculationResultAssert(OutputRateCalculationResult actual) {
-        super(actual, OutputRateCalculationResultAssert.class);
-    }
+  private OutputRateCalculationResultAssert(OutputRateCalculationResult actual) {
+    super(actual, OutputRateCalculationResultAssert.class);
+  }
 
-    public static OutputRateCalculationResultAssert assertThat(OutputRateCalculationResult result) {
-        return new OutputRateCalculationResultAssert(result);
-    }
+  public static OutputRateCalculationResultAssert assertThat(OutputRateCalculationResult result) {
+    return new OutputRateCalculationResultAssert(result);
+  }
 
-    public OutputRateCalculationResultAssert isInMode(OutputRateCalculator.Mode mode) {
-        Assertions.assertThat(actual.mode()).isEqualTo(mode);
-        return this;
-    }
+  public OutputRateCalculationResultAssert isInMode(OutputRateCalculator.Mode mode) {
+    Assertions.assertThat(actual.mode()).isEqualTo(mode);
+    return this;
+  }
 
-    public OutputRateCalculationResultAssert hasRate(double rate) {
-        Assertions.assertThat(actual.rate()).isEqualTo(rate);
-        return this;
-    }
+  public OutputRateCalculationResultAssert hasRate(double rate) {
+    Assertions.assertThat(actual.rate()).isEqualTo(rate);
+    return this;
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationScenario.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationScenario.java
index 177604667b..5d74756671 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationScenario.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculationScenario.java
@@ -1,105 +1,105 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.calculator;
 
+import java.time.Clock;
+import java.util.ArrayList;
+import java.util.List;
 import org.assertj.core.api.Assertions;
 import org.assertj.core.data.Offset;
 import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
 import pl.allegro.tech.hermes.consumers.consumer.rate.calculator.OutputRateCalculator.Mode;
 
-import java.time.Clock;
-import java.util.ArrayList;
-import java.util.List;
-
 public class OutputRateCalculationScenario {
 
-    private final List<OutputRateCalculationResult> results = new ArrayList<>();
+  private final List<OutputRateCalculationResult> results = new ArrayList<>();
 
-    private OutputRateCalculationResult previous;
+  private OutputRateCalculationResult previous;
 
-    private final OutputRateCalculator calculator;
+  private final OutputRateCalculator calculator;
 
-    private final SendCounters counters = new SendCounters(Clock.systemDefaultZone());
+  private final SendCounters counters = new SendCounters(Clock.systemDefaultZone());
 
-    public OutputRateCalculationScenario(OutputRateCalculator calculator) {
-        this.calculator = calculator;
-    }
+  public OutputRateCalculationScenario(OutputRateCalculator calculator) {
+    this.calculator = calculator;
+  }
 
-    public OutputRateCalculationScenario start(double initialRate) {
-        previous = calculator.recalculateRate(counters, OutputRateCalculator.Mode.NORMAL, initialRate);
-        results.add(previous);
-        return this;
-    }
+  public OutputRateCalculationScenario start(double initialRate) {
+    previous = calculator.recalculateRate(counters, OutputRateCalculator.Mode.NORMAL, initialRate);
+    results.add(previous);
+    return this;
+  }
 
-    public OutputRateCalculationScenario nextInteration(int successes, int failures) {
-        incrementSuccesses(successes);
-        incrementFailures(failures);
-        previous = calculator.recalculateRate(counters, previous.mode(), previous.rate());
-        results.add(previous);
-        counters.reset();
-        return this;
-    }
+  public OutputRateCalculationScenario nextInteration(int successes, int failures) {
+    incrementSuccesses(successes);
+    incrementFailures(failures);
+    previous = calculator.recalculateRate(counters, previous.mode(), previous.rate());
+    results.add(previous);
+    counters.reset();
+    return this;
+  }
 
-    private void incrementSuccesses(int times) {
-        for (int i = 0; i < times; ++i) {
-            counters.incrementSuccesses();
-        }
+  private void incrementSuccesses(int times) {
+    for (int i = 0; i < times; ++i) {
+      counters.incrementSuccesses();
     }
+  }
 
-    private void incrementFailures(int times) {
-        for (int i = 0; i < times; ++i) {
-            counters.incrementFailures();
-        }
+  private void incrementFailures(int times) {
+    for (int i = 0; i < times; ++i) {
+      counters.incrementFailures();
     }
+  }
 
-    public OutputRateCalculationScenario nextSuccessIteration() {
-        return nextInteration(1, 0);
-    }
+  public OutputRateCalculationScenario nextSuccessIteration() {
+    return nextInteration(1, 0);
+  }
 
-    public OutputRateCalculationScenario nextFailureIteration() {
-        return nextInteration(0, 1);
-    }
+  public OutputRateCalculationScenario nextFailureIteration() {
+    return nextInteration(0, 1);
+  }
 
-    public OutputRateCalculationScenario fastForwardWithSuccesses(int iterations) {
-        for (int i = 0; i < iterations; ++i) {
-            nextSuccessIteration();
-        }
-        return this;
+  public OutputRateCalculationScenario fastForwardWithSuccesses(int iterations) {
+    for (int i = 0; i < iterations; ++i) {
+      nextSuccessIteration();
     }
+    return this;
+  }
 
-    public OutputRateCalculationScenario fastForwardWithFailures(int iterations) {
-        for (int i = 0; i < iterations; ++i) {
-            nextFailureIteration();
-        }
-        return this;
+  public OutputRateCalculationScenario fastForwardWithFailures(int iterations) {
+    for (int i = 0; i < iterations; ++i) {
+      nextFailureIteration();
     }
+    return this;
+  }
 
-    public void verifyModes(int offset, Mode... modes) {
-        for (int i = offset; i < modes.length; ++i) {
-            Assertions.assertThat(results.get(i).mode()).isEqualTo(modes[i]);
-        }
+  public void verifyModes(int offset, Mode... modes) {
+    for (int i = offset; i < modes.length; ++i) {
+      Assertions.assertThat(results.get(i).mode()).isEqualTo(modes[i]);
     }
+  }
 
-    public void verifyRates(int offset, double... rates) {
-        for (int i = offset; i < rates.length; ++i) {
-            Assertions.assertThat(results.get(i).rate()).isEqualTo(rates[i]);
-        }
+  public void verifyRates(int offset, double... rates) {
+    for (int i = offset; i < rates.length; ++i) {
+      Assertions.assertThat(results.get(i).rate()).isEqualTo(rates[i]);
     }
+  }
 
-    public OutputRateCalculationScenario verifyIntermediateResult(int iteration, double rate, Mode mode) {
-        Assertions.assertThat(results.get(iteration).rate()).isEqualTo(rate, Offset.offset(0.1));
-        Assertions.assertThat(results.get(iteration).mode()).isEqualTo(mode);
-        return this;
-    }
+  public OutputRateCalculationScenario verifyIntermediateResult(
+      int iteration, double rate, Mode mode) {
+    Assertions.assertThat(results.get(iteration).rate()).isEqualTo(rate, Offset.offset(0.1));
+    Assertions.assertThat(results.get(iteration).mode()).isEqualTo(mode);
+    return this;
+  }
 
-    public OutputRateCalculationScenario verifyFinalResult(double rate, Mode mode) {
+  public OutputRateCalculationScenario verifyFinalResult(double rate, Mode mode) {
 
-        Assertions.assertThat(results.get(results.size() - 1).mode()).isEqualTo(mode);
+    Assertions.assertThat(results.get(results.size() - 1).mode()).isEqualTo(mode);
 
-        double actualRate = results.get(results.size() - 1).rate();
-        if (mode == Mode.NORMAL) {
-            Assertions.assertThat(actualRate).isEqualTo(rate, Offset.offset(0.1));
-        } else {
-            Assertions.assertThat(actualRate).isEqualTo(rate);
-        }
-        return this;
+    double actualRate = results.get(results.size() - 1).rate();
+    if (mode == Mode.NORMAL) {
+      Assertions.assertThat(actualRate).isEqualTo(rate, Offset.offset(0.1));
+    } else {
+      Assertions.assertThat(actualRate).isEqualTo(rate);
     }
+    return this;
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculatorTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculatorTest.java
index 92117be21b..8b5e557c65 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculatorTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/OutputRateCalculatorTest.java
@@ -1,95 +1,100 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.calculator;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+
+import java.time.Duration;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import pl.allegro.tech.hermes.api.SubscriptionPolicy;
 import pl.allegro.tech.hermes.consumers.config.RateProperties;
 import pl.allegro.tech.hermes.consumers.consumer.rate.maxrate.NegotiatedMaxRateProvider;
 
-import java.time.Duration;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-
 @RunWith(MockitoJUnitRunner.class)
 public class OutputRateCalculatorTest {
 
-    private static final double HEARTBEAT_RATE = 1.0 / 60.0;
-
-    private static final double MAX_RATE = 100;
-
-
-    private OutputRateCalculator calculator;
-
-    @Before
-    public void setup() {
-        RateProperties rateProperties = new RateProperties();
-        rateProperties.setLimiterSlowModeDelay(Duration.ofSeconds(1));
-        rateProperties.setConvergenceFactor(0.5);
-
-        subscription("group.topic", "subscription").withSubscriptionPolicy(
-                SubscriptionPolicy.Builder.subscriptionPolicy().withRate(200).build()
-        ).build();
-
-        NegotiatedMaxRateProvider maxRateProvider = mock(NegotiatedMaxRateProvider.class);
-        when(maxRateProvider.get()).thenReturn(100D);
-
-        calculator = new OutputRateCalculator(rateProperties, maxRateProvider);
-    }
-
-    @Test
-    public void shouldStartInNormalModeAndGraduallyIncreaseToMaximumWhenOnlySuccessfulDeliveries() {
-        //given
-        OutputRateCalculationScenario scenario = new OutputRateCalculationScenario(calculator);
-
-        // when
-        scenario.start(10).fastForwardWithSuccesses(10);
-
-        // then
-        scenario.verifyFinalResult(MAX_RATE, OutputRateCalculator.Mode.NORMAL);
-    }
-
-    @Test
-    public void shouldStartInNormalModeReachMaximumAndGoToHeartbeatViaSlowWhenDeliveryStartsFailing() {
-        // given
-        OutputRateCalculationScenario scenario = new OutputRateCalculationScenario(calculator);
-
-        // when
-        scenario.start(10).fastForwardWithSuccesses(10).nextInteration(2, 10).fastForwardWithFailures(20);
-
-        // then
-        scenario.verifyIntermediateResult(11, 1, OutputRateCalculator.Mode.SLOW)
-                .verifyFinalResult(HEARTBEAT_RATE, OutputRateCalculator.Mode.HEARTBEAT);
-    }
-
-    @Test
-    public void shouldRecoverFromHeartbeatModeAndGetToMaximumViaSlowWhenDeliveringWithSuccess() {
-        // given
-        OutputRateCalculationScenario scenario = new OutputRateCalculationScenario(calculator);
-
-        // when
-        scenario.start(10).fastForwardWithFailures(10)
-                .fastForwardWithSuccesses(15);
-
-        // then
-        scenario.verifyIntermediateResult(11, 1, OutputRateCalculator.Mode.SLOW)
-                .verifyFinalResult(MAX_RATE, OutputRateCalculator.Mode.NORMAL);
-    }
-
-    @Test
-    public void shouldImmediatelySwitchToHeartbeatModeWhenAllMessagesFail() {
-        // given
-        OutputRateCalculationScenario scenario = new OutputRateCalculationScenario(calculator);
-
-        // when
-        scenario.start(10).fastForwardWithSuccesses(10).fastForwardWithFailures(2);
-
-        // then
-        scenario.verifyIntermediateResult(10, MAX_RATE, OutputRateCalculator.Mode.NORMAL)
-                .verifyFinalResult(HEARTBEAT_RATE, OutputRateCalculator.Mode.HEARTBEAT);
-    }
-
+  private static final double HEARTBEAT_RATE = 1.0 / 60.0;
+
+  private static final double MAX_RATE = 100;
+
+  private OutputRateCalculator calculator;
+
+  @Before
+  public void setup() {
+    RateProperties rateProperties = new RateProperties();
+    rateProperties.setLimiterSlowModeDelay(Duration.ofSeconds(1));
+    rateProperties.setConvergenceFactor(0.5);
+
+    subscription("group.topic", "subscription")
+        .withSubscriptionPolicy(
+            SubscriptionPolicy.Builder.subscriptionPolicy().withRate(200).build())
+        .build();
+
+    NegotiatedMaxRateProvider maxRateProvider = mock(NegotiatedMaxRateProvider.class);
+    when(maxRateProvider.get()).thenReturn(100D);
+
+    calculator = new OutputRateCalculator(rateProperties, maxRateProvider);
+  }
+
+  @Test
+  public void shouldStartInNormalModeAndGraduallyIncreaseToMaximumWhenOnlySuccessfulDeliveries() {
+    // given
+    OutputRateCalculationScenario scenario = new OutputRateCalculationScenario(calculator);
+
+    // when
+    scenario.start(10).fastForwardWithSuccesses(10);
+
+    // then
+    scenario.verifyFinalResult(MAX_RATE, OutputRateCalculator.Mode.NORMAL);
+  }
+
+  @Test
+  public void
+      shouldStartInNormalModeReachMaximumAndGoToHeartbeatViaSlowWhenDeliveryStartsFailing() {
+    // given
+    OutputRateCalculationScenario scenario = new OutputRateCalculationScenario(calculator);
+
+    // when
+    scenario
+        .start(10)
+        .fastForwardWithSuccesses(10)
+        .nextInteration(2, 10)
+        .fastForwardWithFailures(20);
+
+    // then
+    scenario
+        .verifyIntermediateResult(11, 1, OutputRateCalculator.Mode.SLOW)
+        .verifyFinalResult(HEARTBEAT_RATE, OutputRateCalculator.Mode.HEARTBEAT);
+  }
+
+  @Test
+  public void shouldRecoverFromHeartbeatModeAndGetToMaximumViaSlowWhenDeliveringWithSuccess() {
+    // given
+    OutputRateCalculationScenario scenario = new OutputRateCalculationScenario(calculator);
+
+    // when
+    scenario.start(10).fastForwardWithFailures(10).fastForwardWithSuccesses(15);
+
+    // then
+    scenario
+        .verifyIntermediateResult(11, 1, OutputRateCalculator.Mode.SLOW)
+        .verifyFinalResult(MAX_RATE, OutputRateCalculator.Mode.NORMAL);
+  }
+
+  @Test
+  public void shouldImmediatelySwitchToHeartbeatModeWhenAllMessagesFail() {
+    // given
+    OutputRateCalculationScenario scenario = new OutputRateCalculationScenario(calculator);
+
+    // when
+    scenario.start(10).fastForwardWithSuccesses(10).fastForwardWithFailures(2);
+
+    // then
+    scenario
+        .verifyIntermediateResult(10, MAX_RATE, OutputRateCalculator.Mode.NORMAL)
+        .verifyFinalResult(HEARTBEAT_RATE, OutputRateCalculator.Mode.HEARTBEAT);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/SlowModeOutputRateCalculatorTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/SlowModeOutputRateCalculatorTest.java
index 79cc3dbae6..0063025ffa 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/SlowModeOutputRateCalculatorTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/calculator/SlowModeOutputRateCalculatorTest.java
@@ -1,46 +1,50 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.calculator;
 
-import org.junit.Test;
-import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
+import static pl.allegro.tech.hermes.consumers.test.HermesConsumersAssertions.assertThat;
 
 import java.time.Clock;
-
-import static pl.allegro.tech.hermes.consumers.test.HermesConsumersAssertions.assertThat;
+import org.junit.Test;
+import pl.allegro.tech.hermes.consumers.consumer.rate.SendCounters;
 
 public class SlowModeOutputRateCalculatorTest {
 
-    private static final double HEARTBEAT_RATE = 1;
-
-    private final SlowModeOutputRateCalculator calculator = new SlowModeOutputRateCalculator(HEARTBEAT_RATE);
-
-    private final SendCounters counters = new SendCounters(Clock.systemDefaultZone());
-
-    @Test
-    public void shouldStayInSlowModeIfThereWereSomeFailures() {
-        // given
-        counters.incrementSuccesses()
-                .incrementFailures();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(10, 20, counters)).hasRate(10).isInMode(OutputRateCalculator.Mode.SLOW);
-    }
-
-    @Test
-    public void shouldSwitchToNormalModeWithoutModifyingRateWhenOnlySuccesses() {
-        // given
-        counters.incrementSuccesses();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(10, 20, counters)).hasRate(10).isInMode(OutputRateCalculator.Mode.NORMAL);
-    }
-
-    @Test
-    public void shouldSwitchToHeartbeatModeWhenThereWereOnlyFailures() {
-        // given
-        counters.incrementFailures();
-
-        // when then
-        assertThat(calculator.calculateOutputRate(10, 20, counters)).hasRate(HEARTBEAT_RATE).isInMode(OutputRateCalculator.Mode.HEARTBEAT);
-    }
-
+  private static final double HEARTBEAT_RATE = 1;
+
+  private final SlowModeOutputRateCalculator calculator =
+      new SlowModeOutputRateCalculator(HEARTBEAT_RATE);
+
+  private final SendCounters counters = new SendCounters(Clock.systemDefaultZone());
+
+  @Test
+  public void shouldStayInSlowModeIfThereWereSomeFailures() {
+    // given
+    counters.incrementSuccesses().incrementFailures();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(10, 20, counters))
+        .hasRate(10)
+        .isInMode(OutputRateCalculator.Mode.SLOW);
+  }
+
+  @Test
+  public void shouldSwitchToNormalModeWithoutModifyingRateWhenOnlySuccesses() {
+    // given
+    counters.incrementSuccesses();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(10, 20, counters))
+        .hasRate(10)
+        .isInMode(OutputRateCalculator.Mode.NORMAL);
+  }
+
+  @Test
+  public void shouldSwitchToHeartbeatModeWhenThereWereOnlyFailures() {
+    // given
+    counters.incrementFailures();
+
+    // when then
+    assertThat(calculator.calculateOutputRate(10, 20, counters))
+        .hasRate(HEARTBEAT_RATE)
+        .isInMode(OutputRateCalculator.Mode.HEARTBEAT);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistryTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistryTest.java
index d821d0fcfc..5d44bad381 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistryTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/rate/maxrate/MaxRateRegistryTest.java
@@ -1,8 +1,15 @@
 package pl.allegro.tech.hermes.consumers.consumer.rate.maxrate;
 
+import static org.awaitility.Awaitility.await;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -19,183 +26,197 @@
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 import pl.allegro.tech.hermes.test.helper.zookeeper.ZookeeperBaseTest;
 
-import java.util.Collections;
-import java.util.concurrent.TimeUnit;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class MaxRateRegistryTest extends ZookeeperBaseTest {
 
-    private final SubscriptionName subscription1 = SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription");
-    private final SubscriptionId subscriptionId1 = SubscriptionId.from(subscription1, 1L);
-    private final SubscriptionName subscription2 = SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription2");
-    private final SubscriptionId subscriptionId2 = SubscriptionId.from(subscription2, 2L);
-
-    private final SubscriptionsCache subscriptionsCache = mock(SubscriptionsCache.class);
-    private final SubscriptionIds subscriptionIds = new TestSubscriptionIds(ImmutableList.of(subscriptionId1, subscriptionId2));
-
-    private final ZookeeperPaths zookeeperPaths = new ZookeeperPaths("/hermes");
-    private final MaxRateProperties maxRateProperties = new MaxRateProperties();
-    private final String consumerId = new WorkloadProperties().getNodeId();
-    private final String cluster = new KafkaProperties().getClusterName();
-
-    private final ConsumerAssignmentCache consumerAssignmentCache = mock(ConsumerAssignmentCache.class);
-    private final ClusterAssignmentCache clusterAssignmentCache = mock(ClusterAssignmentCache.class);
-
-    private final MaxRateRegistry maxRateRegistry = new MaxRateRegistry(
-            maxRateProperties.getRegistryBinaryEncoder().getHistoryBufferSizeBytes(),
-            maxRateProperties.getRegistryBinaryEncoder().getMaxRateBufferSizeBytes(),
-            consumerId,
-            cluster,
-            clusterAssignmentCache,
-            consumerAssignmentCache,
-            zookeeperClient,
-            zookeeperPaths,
-            subscriptionIds
-    );
-
-    private final MaxRateRegistryPaths paths = new MaxRateRegistryPaths(zookeeperPaths, consumerId, cluster);
-
-    @Before
-    public void setUp() {
-        when(subscriptionsCache.listActiveSubscriptionNames()).thenReturn(ImmutableList.of(subscription1, subscription2));
-
-        when(clusterAssignmentCache.getAssignedConsumers()).thenReturn(ImmutableSet.of(consumerId));
-        when(consumerAssignmentCache.getConsumerSubscriptions()).thenReturn(ImmutableSet.of(subscription1, subscription2));
-        maxRateRegistry.start();
-    }
-
-    @After
-    public void cleanup() {
-        try {
-            deleteAllNodes();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        maxRateRegistry.stop();
-    }
-
-    @Test
-    public void shouldHaveEmptyRateHistoryOnInit() {
-        // given
-        maxRateRegistry.onBeforeMaxRateCalculation(); // read
-
-        // and
-        maxRateRegistry.ensureCorrectAssignments(subscription1, ImmutableSet.of(consumerId));
-
-        // then
-        assertEquals(RateHistory.empty(), maxRateRegistry.getRateHistory(new ConsumerInstance(consumerId, subscription1)));
-    }
-
-    @Test
-    public void shouldWriteAndReadRateHistoryForCurrentConsumer() {
-        // given
-        ConsumerInstance consumer = new ConsumerInstance(consumerId, subscription1);
-
-        RateHistory rateHistory = RateHistory.create(0.5);
-
-        // when
-        maxRateRegistry.writeRateHistory(consumer, rateHistory);
-
-        // and
-        maxRateRegistry.onAfterWriteRateHistories(); // store
-
-        // then
-        wait.untilZookeeperPathIsCreated(paths.currentConsumerRateHistoryPath());
-
-        // when
-        maxRateRegistry.onBeforeMaxRateCalculation(); // read
-
-        // and
-        RateHistory readHistory = maxRateRegistry.getRateHistory(consumer);
-
-        // then
-        assertEquals(rateHistory, readHistory);
+  private final SubscriptionName subscription1 =
+      SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription");
+  private final SubscriptionId subscriptionId1 = SubscriptionId.from(subscription1, 1L);
+  private final SubscriptionName subscription2 =
+      SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription2");
+  private final SubscriptionId subscriptionId2 = SubscriptionId.from(subscription2, 2L);
+
+  private final SubscriptionsCache subscriptionsCache = mock(SubscriptionsCache.class);
+  private final SubscriptionIds subscriptionIds =
+      new TestSubscriptionIds(ImmutableList.of(subscriptionId1, subscriptionId2));
+
+  private final ZookeeperPaths zookeeperPaths = new ZookeeperPaths("/hermes");
+  private final MaxRateProperties maxRateProperties = new MaxRateProperties();
+  private final String consumerId = new WorkloadProperties().getNodeId();
+  private final String cluster = new KafkaProperties().getClusterName();
+
+  private final ConsumerAssignmentCache consumerAssignmentCache =
+      mock(ConsumerAssignmentCache.class);
+  private final ClusterAssignmentCache clusterAssignmentCache = mock(ClusterAssignmentCache.class);
+
+  private final MaxRateRegistry maxRateRegistry =
+      new MaxRateRegistry(
+          maxRateProperties.getRegistryBinaryEncoder().getHistoryBufferSizeBytes(),
+          maxRateProperties.getRegistryBinaryEncoder().getMaxRateBufferSizeBytes(),
+          consumerId,
+          cluster,
+          clusterAssignmentCache,
+          consumerAssignmentCache,
+          zookeeperClient,
+          zookeeperPaths,
+          subscriptionIds);
+
+  private final MaxRateRegistryPaths paths =
+      new MaxRateRegistryPaths(zookeeperPaths, consumerId, cluster);
+
+  @Before
+  public void setUp() {
+    when(subscriptionsCache.listActiveSubscriptionNames())
+        .thenReturn(ImmutableList.of(subscription1, subscription2));
+
+    when(clusterAssignmentCache.getAssignedConsumers()).thenReturn(ImmutableSet.of(consumerId));
+    when(consumerAssignmentCache.getConsumerSubscriptions())
+        .thenReturn(ImmutableSet.of(subscription1, subscription2));
+    maxRateRegistry.start();
+  }
+
+  @After
+  public void cleanup() {
+    try {
+      deleteAllNodes();
+    } catch (Exception e) {
+      e.printStackTrace();
     }
+    maxRateRegistry.stop();
+  }
 
-    @Test
-    public void shouldWriteAndReadMaxRateForCurrentConsumer() {
-        // when
-        maxRateRegistry.update(subscription1, ImmutableMap.of(consumerId, new MaxRate(0.5)));
-        maxRateRegistry.update(subscription2, ImmutableMap.of(consumerId, new MaxRate(350.0)));
-
-        // and
-        maxRateRegistry.onAfterMaxRateCalculation(); // store
+  @Test
+  public void shouldHaveEmptyRateHistoryOnInit() {
+    // given
+    maxRateRegistry.onBeforeMaxRateCalculation(); // read
 
-        // then
-        wait.untilZookeeperPathIsCreated(paths.consumerMaxRatePath(consumerId));
-
-        // when
-        maxRateRegistry.onBeforeMaxRateCalculation(); // read
-
-        // then
-        assertEquals(new MaxRate(0.5), maxRateRegistry.getMaxRate(new ConsumerInstance(consumerId, subscription1)).get());
-        assertEquals(new MaxRate(350.0), maxRateRegistry.getMaxRate(new ConsumerInstance(consumerId, subscription2)).get());
-    }
-
-    @Test
-    public void shouldCleanRegistryFromInactiveConsumerNodes() {
-        // when
-        maxRateRegistry.update(subscription1, ImmutableMap.of(consumerId, new MaxRate(350.0)));
-
-        // and
-        maxRateRegistry.onAfterMaxRateCalculation(); // store
-
-        // then
-        wait.untilZookeeperPathIsCreated(paths.consumerMaxRatePath(consumerId));
-
-        // when
-        when(clusterAssignmentCache.getAssignedConsumers()).thenReturn(Collections.emptySet());
-        maxRateRegistry.onBeforeMaxRateCalculation(); // cleanup
-
-        // then
-        wait.untilZookeeperPathNotExists(paths.consumerMaxRatePath(consumerId));
-    }
+    // and
+    maxRateRegistry.ensureCorrectAssignments(subscription1, ImmutableSet.of(consumerId));
 
-    @Test
-    public void shouldCleanupConsumerMaxRateFromPreviouslyAssignedSubscriptions() {
-        // when
-        maxRateRegistry.update(subscription1, ImmutableMap.of(consumerId, new MaxRate(350.0)));
-        maxRateRegistry.update(subscription2, ImmutableMap.of(consumerId, new MaxRate(5.0)));
-
-        // and
-        maxRateRegistry.onAfterMaxRateCalculation(); // store
-
-        // then
-        wait.untilZookeeperPathIsCreated(paths.consumerMaxRatePath(consumerId));
-
-        // when
-        when(clusterAssignmentCache.getConsumerSubscriptions(consumerId))
-                .thenReturn(Collections.singleton(subscription1));
-
-        // and
-        maxRateRegistry.onBeforeMaxRateCalculation(); // read and cleanup
-        maxRateRegistry.onAfterMaxRateCalculation(); // store
-
-        // then
-        await().atMost(2, TimeUnit.SECONDS)
-                .until((() -> maxRateRegistry.getMaxRate(new ConsumerInstance(consumerId, subscription1)).isPresent()
-                        && maxRateRegistry.getMaxRate(new ConsumerInstance(consumerId, subscription2)).isEmpty()));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void shouldNotAllowForSavingRateHistoryOfOtherThanCurrentConsumerNode() {
-        // when
-        maxRateRegistry.writeRateHistory(new ConsumerInstance("otherConsumer", subscription1), RateHistory.create(0.5));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void shouldNotAllowForReadingRateHistoryOfOtherThanCurrentConsumerNode() {
-        // when
-        maxRateRegistry.getRateHistory(new ConsumerInstance("otherConsumer", subscription1));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void shouldNotAllowForReadingMaxRateOfOtherThanCurrentConsumerNodeConsumerRateHistoriesDecoder() {
-        // when
-        maxRateRegistry.getMaxRate(new ConsumerInstance("otherConsumer", subscription1));
-    }
+    // then
+    assertEquals(
+        RateHistory.empty(),
+        maxRateRegistry.getRateHistory(new ConsumerInstance(consumerId, subscription1)));
+  }
+
+  @Test
+  public void shouldWriteAndReadRateHistoryForCurrentConsumer() {
+    // given
+    ConsumerInstance consumer = new ConsumerInstance(consumerId, subscription1);
+
+    RateHistory rateHistory = RateHistory.create(0.5);
+
+    // when
+    maxRateRegistry.writeRateHistory(consumer, rateHistory);
+
+    // and
+    maxRateRegistry.onAfterWriteRateHistories(); // store
+
+    // then
+    wait.untilZookeeperPathIsCreated(paths.currentConsumerRateHistoryPath());
+
+    // when
+    maxRateRegistry.onBeforeMaxRateCalculation(); // read
+
+    // and
+    RateHistory readHistory = maxRateRegistry.getRateHistory(consumer);
+
+    // then
+    assertEquals(rateHistory, readHistory);
+  }
+
+  @Test
+  public void shouldWriteAndReadMaxRateForCurrentConsumer() {
+    // when
+    maxRateRegistry.update(subscription1, ImmutableMap.of(consumerId, new MaxRate(0.5)));
+    maxRateRegistry.update(subscription2, ImmutableMap.of(consumerId, new MaxRate(350.0)));
+
+    // and
+    maxRateRegistry.onAfterMaxRateCalculation(); // store
+
+    // then
+    wait.untilZookeeperPathIsCreated(paths.consumerMaxRatePath(consumerId));
+
+    // when
+    maxRateRegistry.onBeforeMaxRateCalculation(); // read
+
+    // then
+    assertEquals(
+        new MaxRate(0.5),
+        maxRateRegistry.getMaxRate(new ConsumerInstance(consumerId, subscription1)).get());
+    assertEquals(
+        new MaxRate(350.0),
+        maxRateRegistry.getMaxRate(new ConsumerInstance(consumerId, subscription2)).get());
+  }
+
+  @Test
+  public void shouldCleanRegistryFromInactiveConsumerNodes() {
+    // when
+    maxRateRegistry.update(subscription1, ImmutableMap.of(consumerId, new MaxRate(350.0)));
+
+    // and
+    maxRateRegistry.onAfterMaxRateCalculation(); // store
+
+    // then
+    wait.untilZookeeperPathIsCreated(paths.consumerMaxRatePath(consumerId));
+
+    // when
+    when(clusterAssignmentCache.getAssignedConsumers()).thenReturn(Collections.emptySet());
+    maxRateRegistry.onBeforeMaxRateCalculation(); // cleanup
+
+    // then
+    wait.untilZookeeperPathNotExists(paths.consumerMaxRatePath(consumerId));
+  }
+
+  @Test
+  public void shouldCleanupConsumerMaxRateFromPreviouslyAssignedSubscriptions() {
+    // when
+    maxRateRegistry.update(subscription1, ImmutableMap.of(consumerId, new MaxRate(350.0)));
+    maxRateRegistry.update(subscription2, ImmutableMap.of(consumerId, new MaxRate(5.0)));
+
+    // and
+    maxRateRegistry.onAfterMaxRateCalculation(); // store
+
+    // then
+    wait.untilZookeeperPathIsCreated(paths.consumerMaxRatePath(consumerId));
+
+    // when
+    when(clusterAssignmentCache.getConsumerSubscriptions(consumerId))
+        .thenReturn(Collections.singleton(subscription1));
+
+    // and
+    maxRateRegistry.onBeforeMaxRateCalculation(); // read and cleanup
+    maxRateRegistry.onAfterMaxRateCalculation(); // store
+
+    // then
+    await()
+        .atMost(2, TimeUnit.SECONDS)
+        .until(
+            (() ->
+                maxRateRegistry
+                        .getMaxRate(new ConsumerInstance(consumerId, subscription1))
+                        .isPresent()
+                    && maxRateRegistry
+                        .getMaxRate(new ConsumerInstance(consumerId, subscription2))
+                        .isEmpty()));
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void shouldNotAllowForSavingRateHistoryOfOtherThanCurrentConsumerNode() {
+    // when
+    maxRateRegistry.writeRateHistory(
+        new ConsumerInstance("otherConsumer", subscription1), RateHistory.create(0.5));
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void shouldNotAllowForReadingRateHistoryOfOtherThanCurrentConsumerNode() {
+    // when
+    maxRateRegistry.getRateHistory(new ConsumerInstance("otherConsumer", subscription1));
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void
+      shouldNotAllowForReadingMaxRateOfOtherThanCurrentConsumerNodeConsumerRateHistoriesDecoder() {
+    // when
+    maxRateRegistry.getMaxRate(new ConsumerInstance("otherConsumer", subscription1));
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSenderFactoryTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSenderFactoryTest.java
index b439fff7a8..89caa055a4 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSenderFactoryTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSenderFactoryTest.java
@@ -1,8 +1,12 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.googlecode.catchexception.CatchException;
+import java.util.Set;
 import org.junit.Test;
 import org.mockito.Mockito;
 import pl.allegro.tech.hermes.api.EndpointAddress;
@@ -10,66 +14,61 @@
 import pl.allegro.tech.hermes.common.exception.EndpointProtocolNotSupportedException;
 import pl.allegro.tech.hermes.consumers.consumer.ResilientMessageSender;
 
-import java.util.Set;
-
-import static com.googlecode.catchexception.CatchException.catchException;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-
 public class MessageSenderFactoryTest {
 
-    private final MessageSender referenceMessageSender = Mockito.mock(MessageSender.class);
-    private final ResilientMessageSender resilientMessageSender = Mockito.mock(ResilientMessageSender.class);
-
-    @Test
-    public void shouldCreateCustomProtocolMessageSender() {
-        // given
-        EndpointAddress endpoint = EndpointAddress.of("myProtocol://service");
-        Subscription subscription = subscription("group.topic", "subscription", endpoint).build();
-        MessageSenderFactory factory = new MessageSenderFactory(ImmutableList.of(
-                protocolMessageSenderProviderReturning(referenceMessageSender, "myProtocol"))
-        );
+  private final MessageSender referenceMessageSender = Mockito.mock(MessageSender.class);
+  private final ResilientMessageSender resilientMessageSender =
+      Mockito.mock(ResilientMessageSender.class);
 
-        // when
-        MessageSender sender = factory.create(subscription, resilientMessageSender);
+  @Test
+  public void shouldCreateCustomProtocolMessageSender() {
+    // given
+    EndpointAddress endpoint = EndpointAddress.of("myProtocol://service");
+    Subscription subscription = subscription("group.topic", "subscription", endpoint).build();
+    MessageSenderFactory factory =
+        new MessageSenderFactory(
+            ImmutableList.of(
+                protocolMessageSenderProviderReturning(referenceMessageSender, "myProtocol")));
 
-        // then
-        assertThat(sender).isEqualTo(referenceMessageSender);
-    }
+    // when
+    MessageSender sender = factory.create(subscription, resilientMessageSender);
 
-    @Test
-    public void shouldGetProtocolNotSupportedExceptionWhenPassingUnknownUri() {
-        // given
-        MessageSenderFactory factory = new MessageSenderFactory(ImmutableList.of());
-        Subscription subscription = subscription("group.topic", "subscription", "unknown://localhost:8080/test").build();
+    // then
+    assertThat(sender).isEqualTo(referenceMessageSender);
+  }
 
-        // when
-        catchException(factory).create(subscription, resilientMessageSender);
+  @Test
+  public void shouldGetProtocolNotSupportedExceptionWhenPassingUnknownUri() {
+    // given
+    MessageSenderFactory factory = new MessageSenderFactory(ImmutableList.of());
+    Subscription subscription =
+        subscription("group.topic", "subscription", "unknown://localhost:8080/test").build();
 
-        // then
-        assertThat(CatchException.<EndpointProtocolNotSupportedException>caughtException())
-                .isInstanceOf(EndpointProtocolNotSupportedException.class);
-    }
+    // then
+    assertThrows(
+        EndpointProtocolNotSupportedException.class,
+        () -> factory.create(subscription, resilientMessageSender));
+  }
 
-    private ProtocolMessageSenderProvider protocolMessageSenderProviderReturning(Object createdMessageSender, String protocol) {
-        return new ProtocolMessageSenderProvider() {
-            @Override
-            public MessageSender create(Subscription endpoint, ResilientMessageSender resilientMessageSender) {
-                return (MessageSender) createdMessageSender;
-            }
+  private ProtocolMessageSenderProvider protocolMessageSenderProviderReturning(
+      Object createdMessageSender, String protocol) {
+    return new ProtocolMessageSenderProvider() {
+      @Override
+      public MessageSender create(
+          Subscription endpoint, ResilientMessageSender resilientMessageSender) {
+        return (MessageSender) createdMessageSender;
+      }
 
-            @Override
-            public Set<String> getSupportedProtocols() {
-                return ImmutableSet.of(protocol);
-            }
+      @Override
+      public Set<String> getSupportedProtocols() {
+        return ImmutableSet.of(protocol);
+      }
 
-            @Override
-            public void start() throws Exception {
-            }
+      @Override
+      public void start() throws Exception {}
 
-            @Override
-            public void stop() throws Exception {
-            }
-        };
-    }
+      @Override
+      public void stop() throws Exception {}
+    };
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/ByteBufferEntityTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/ByteBufferEntityTest.java
deleted file mode 100644
index ea6fefce87..0000000000
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/ByteBufferEntityTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package pl.allegro.tech.hermes.consumers.consumer.sender.http;
-
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-/*
- *  CAUTION!
- *  This implementation comes from PR that was merged directly into hc.core5
- *  which is not backwards compatible with http-components version 4. We need
- *  entire http stack and not just the core so we cannot use core5 yet. This
- *  is the last implementation that works on version 4. If it is good enough
- *  for hc.core5 then it should be ok for out use case.
- *
- *  PR: https://github.com/apache/httpcore/pull/13
- *
-* */
-
-import org.apache.http.Consts;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.ByteArrayOutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Unit tests for {@link ByteBufferEntity}.
- *
- */
-public class ByteBufferEntityTest {
-
-    @Test
-    public void testBasics() throws Exception {
-        final ByteBuffer bytes = ByteBuffer.wrap("Message content".getBytes(Consts.ASCII));
-        final ByteBufferEntity httpentity = new ByteBufferEntity(bytes);
-
-        Assert.assertEquals(bytes.capacity(), httpentity.getContentLength());
-        Assert.assertNotNull(httpentity.getContent());
-        Assert.assertTrue(httpentity.isRepeatable());
-        Assert.assertFalse(httpentity.isStreaming());
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testIllegalConstructorNullByteArray() throws Exception {
-        new ByteBufferEntity(null);
-    }
-
-    @Test
-    public void testWriteTo() throws Exception {
-        final ByteBuffer bytes = ByteBuffer.wrap("Message content".getBytes(Consts.ASCII));
-        final ByteBufferEntity httpentity = new ByteBufferEntity(bytes);
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        httpentity.writeTo(out);
-        byte[] bytes2 = out.toByteArray();
-        Assert.assertNotNull(bytes2);
-        Assert.assertEquals(bytes.capacity(), bytes2.length);
-        bytes.position(0);
-        for (int i = 0; i < bytes2.length; i++) {
-            Assert.assertEquals(bytes.get(i), bytes2[i]);
-        }
-
-        out = new ByteArrayOutputStream();
-        httpentity.writeTo(out);
-        bytes2 = out.toByteArray();
-        Assert.assertNotNull(bytes2);
-        Assert.assertEquals(bytes.capacity(), bytes2.length);
-        bytes.position(0);
-        for (int i = 0; i < bytes.capacity(); i++) {
-            Assert.assertEquals(bytes.get(i), bytes2[i]);
-        }
-
-        try {
-            httpentity.writeTo(null);
-            Assert.fail("IllegalArgumentException should have been thrown");
-        } catch (final IllegalArgumentException ex) {
-            // expected
-        }
-    }
-}
\ No newline at end of file
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSenderTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSenderTest.java
index c473a4ffb0..80ad652b60 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSenderTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSenderTest.java
@@ -1,6 +1,19 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.http;
 
+import static jakarta.ws.rs.core.Response.Status.ACCEPTED;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.TEST_MESSAGE_CONTENT;
+import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.testMessage;
+
 import com.github.tomakehurst.wiremock.WireMockServer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import org.eclipse.jetty.client.HttpClient;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -9,7 +22,6 @@
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.api.EndpointAddressResolverMetadata;
 import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory;
-import pl.allegro.tech.hermes.common.metric.executor.ThreadPoolMetrics;
 import pl.allegro.tech.hermes.consumers.config.ConsumerSenderConfiguration;
 import pl.allegro.tech.hermes.consumers.config.Http1ClientProperties;
 import pl.allegro.tech.hermes.consumers.config.SslContextProperties;
@@ -26,234 +38,237 @@
 import pl.allegro.tech.hermes.test.helper.metrics.TestMetricsFacadeFactory;
 import pl.allegro.tech.hermes.test.helper.util.Ports;
 
-import java.util.Collections;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static jakarta.ws.rs.core.Response.Status.ACCEPTED;
-import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-import static java.lang.String.format;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.TEST_MESSAGE_CONTENT;
-import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.testMessage;
-
 public class JettyMessageSenderTest {
 
-    private static final int ENDPOINT_PORT = Ports.nextAvailable();
-    private static final EndpointAddress ENDPOINT = EndpointAddress.of(format("http://localhost:%d/", ENDPOINT_PORT));
-    private static final EndpointAddressResolverMetadata METADATA = EndpointAddressResolverMetadata.empty();
-
-    private static HttpClient client;
-    private static WireMockServer wireMockServer;
-
-    private ResolvableEndpointAddress address;
-    private RemoteServiceEndpoint remoteServiceEndpoint;
-    private JettyMessageSender messageSender;
-
-    private final HttpHeadersProvider headersProvider = new HermesHeadersProvider(Collections.singleton(new Http1HeadersProvider()));
-
-    @BeforeClass
-    public static void setupEnvironment() throws Exception {
-        wireMockServer = new WireMockServer(ENDPOINT_PORT);
-        wireMockServer.start();
-
-        SslContextFactoryProvider sslContextFactoryProvider = new SslContextFactoryProvider(null, new SslContextProperties());
-        ConsumerSenderConfiguration consumerConfiguration = new ConsumerSenderConfiguration();
-        client = consumerConfiguration.http1SerialClient(
-                new HttpClientsFactory(
-                        new InstrumentedExecutorServiceFactory(
-                                new ThreadPoolMetrics(TestMetricsFacadeFactory.create())
-                        ),
-                        sslContextFactoryProvider),
-                new Http1ClientProperties()
-        );
-        client.start();
-    }
-
-    @AfterClass
-    public static void cleanEnvironment() throws Exception {
-        wireMockServer.shutdown();
-        client.stop();
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        remoteServiceEndpoint = new RemoteServiceEndpoint(wireMockServer);
-        address = new ResolvableEndpointAddress(ENDPOINT, new SimpleEndpointAddressResolver(), METADATA);
-        HttpRequestFactory httpRequestFactory = new DefaultHttpRequestFactory(client, 1000, 1000, new DefaultHttpMetadataAppender());
-        messageSender = new JettyMessageSender(httpRequestFactory, address, headersProvider, new DefaultSendingResultHandlers());
-    }
-
-    @Test
-    public void shouldSendMessageSuccessfully() throws Exception {
-        // given
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(testMessage(), future);
-
-        // then
-        remoteServiceEndpoint.waitUntilReceived();
-        assertThat(future.get(1, TimeUnit.SECONDS).succeeded()).isTrue();
-    }
-
-    @Test
-    public void shouldReturnTrueWhenOtherSuccessfulCodeReturned() throws Exception {
-        // given
-        remoteServiceEndpoint.setReturnedStatusCode(ACCEPTED.getStatusCode());
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(testMessage(), future);
-
-        // then
-        assertThat(future.get(1, TimeUnit.SECONDS).succeeded()).isTrue();
-    }
-
-    @Test
-    public void shouldNotRedirectMessage() throws InterruptedException, ExecutionException, TimeoutException {
-        // given
-        final int numberOfExpectedMessages = 1;
-        final int maximumWaitTimeInSeconds = 1;
-        remoteServiceEndpoint.redirectMessage(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(testMessage(), future);
-
-        // then
-        assertThat(future.get(maximumWaitTimeInSeconds, TimeUnit.SECONDS).succeeded()).isFalse();
-        remoteServiceEndpoint.waitUntilReceived(maximumWaitTimeInSeconds, numberOfExpectedMessages);
-    }
-
-    @Test
-    public void shouldReturnFalseWhenSendingFails() throws Exception {
-        // given
-        remoteServiceEndpoint.setReturnedStatusCode(INTERNAL_SERVER_ERROR.getStatusCode());
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(testMessage(), future);
-
-        // then
-        remoteServiceEndpoint.waitUntilReceived();
-        assertThat(future.get(1, TimeUnit.SECONDS).succeeded()).isFalse();
-    }
-
-    @Test
-    public void shouldSendMessageIdHeader() {
-        // given
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(testMessage(), future);
-
-        // then
-        remoteServiceEndpoint.waitUntilReceived();
-        assertThat(remoteServiceEndpoint.getLastReceivedRequest().getHeader("Hermes-Message-Id")).isEqualTo("id");
-    }
-
-    @Test
-    public void shouldSendTraceIdHeader() {
-        // given
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(testMessage(), future);
-
-        // then
-        remoteServiceEndpoint.waitUntilReceived();
-        assertThat(remoteServiceEndpoint.getLastReceivedRequest().getHeader("Trace-Id")).isEqualTo("traceId");
-    }
-
-    @Test
-    public void shouldSendRetryCounterInHeader() throws InterruptedException, ExecutionException, TimeoutException {
-        // given
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(testMessage(), future);
-
-        // then
-        assertThat(future.get(1000, TimeUnit.MILLISECONDS).getStatusCode()).isEqualTo(200);
-        remoteServiceEndpoint.waitUntilReceived();
-        assertThat(remoteServiceEndpoint.getLastReceivedRequest().getHeader("Hermes-Retry-Count")).isEqualTo("0");
-    }
-
-    @Test
-    public void shouldSendAuthorizationHeaderIfAuthorizationProviderAttached() {
-        // given
-        HttpRequestFactory httpRequestFactory = new DefaultHttpRequestFactory(client, 1000, 1000, new DefaultHttpMetadataAppender());
-
-        JettyMessageSender messageSender =
-                new JettyMessageSender(httpRequestFactory, address, new HermesHeadersProvider(Collections.singleton(
-                        new AuthHeadersProvider(
-                                new Http1HeadersProvider(),
-                                () -> Optional.of("Basic Auth Hello!")
-                        ))
-                ), new DefaultSendingResultHandlers());
-        Message message = MessageBuilder.withTestMessage().build();
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(message, future);
-
-        // then
-        remoteServiceEndpoint.waitUntilReceived();
-        assertThat(remoteServiceEndpoint.getLastReceivedRequest().getHeader("Authorization")).isEqualTo("Basic Auth Hello!");
-    }
-
-    @Test
-    public void shouldUseSuppliedRequestTimeout() throws ExecutionException, InterruptedException, TimeoutException {
-        // given
-        HttpRequestFactory httpRequestFactory = new DefaultHttpRequestFactory(client,
-                100, 1000,
-                new DefaultHttpMetadataAppender());
-        remoteServiceEndpoint.setDelay(500);
-
-        JettyMessageSender messageSender =
-                new JettyMessageSender(httpRequestFactory, address, headersProvider, new DefaultSendingResultHandlers());
-        Message message = MessageBuilder.withTestMessage().build();
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(message, future);
-        MessageSendingResult messageSendingResult = future.get(1000, TimeUnit.MILLISECONDS);
-
-        // then
-        assertThat(messageSendingResult.isTimeout()).isTrue();
-    }
-
-    @Test
-    public void shouldUseSuppliedSocketTimeout() throws ExecutionException, InterruptedException, TimeoutException {
-        // given
-        HttpRequestFactory httpRequestFactory = new DefaultHttpRequestFactory(client,
-                1000, 100,
-                new DefaultHttpMetadataAppender());
-        remoteServiceEndpoint.setDelay(200);
-
-        JettyMessageSender messageSender =
-                new JettyMessageSender(httpRequestFactory, address, headersProvider, new DefaultSendingResultHandlers());
-        Message message = MessageBuilder.withTestMessage().build();
-        remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(message, future);
-        MessageSendingResult messageSendingResult = future.get(1000, TimeUnit.MILLISECONDS);
-
-        // then
-        assertThat(messageSendingResult.isTimeout()).isTrue();
-    }
-}
\ No newline at end of file
+  private static final int ENDPOINT_PORT = Ports.nextAvailable();
+  private static final EndpointAddress ENDPOINT =
+      EndpointAddress.of(format("http://localhost:%d/", ENDPOINT_PORT));
+  private static final EndpointAddressResolverMetadata METADATA =
+      EndpointAddressResolverMetadata.empty();
+
+  private static HttpClient client;
+  private static WireMockServer wireMockServer;
+
+  private ResolvableEndpointAddress address;
+  private RemoteServiceEndpoint remoteServiceEndpoint;
+  private JettyMessageSender messageSender;
+
+  private final HttpHeadersProvider headersProvider =
+      new HermesHeadersProvider(Collections.singleton(new Http1HeadersProvider()));
+
+  @BeforeClass
+  public static void setupEnvironment() throws Exception {
+    wireMockServer = new WireMockServer(ENDPOINT_PORT);
+    wireMockServer.start();
+
+    SslContextFactoryProvider sslContextFactoryProvider =
+        new SslContextFactoryProvider(null, new SslContextProperties());
+    ConsumerSenderConfiguration consumerConfiguration = new ConsumerSenderConfiguration();
+    client =
+        consumerConfiguration.http1SerialClient(
+            new HttpClientsFactory(
+                new InstrumentedExecutorServiceFactory(TestMetricsFacadeFactory.create()),
+                sslContextFactoryProvider),
+            new Http1ClientProperties());
+    client.start();
+  }
+
+  @AfterClass
+  public static void cleanEnvironment() throws Exception {
+    wireMockServer.shutdown();
+    client.stop();
+  }
+
+  @Before
+  public void setUp() throws Exception {
+    remoteServiceEndpoint = new RemoteServiceEndpoint(wireMockServer);
+    address =
+        new ResolvableEndpointAddress(ENDPOINT, new SimpleEndpointAddressResolver(), METADATA);
+    HttpRequestFactory httpRequestFactory =
+        new DefaultHttpRequestFactory(client, 1000, 1000, new DefaultHttpMetadataAppender());
+    messageSender =
+        new JettyMessageSender(
+            httpRequestFactory, address, headersProvider, new DefaultSendingResultHandlers());
+  }
+
+  @Test
+  public void shouldSendMessageSuccessfully() throws Exception {
+    // given
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(testMessage(), future);
+
+    // then
+    remoteServiceEndpoint.waitUntilReceived();
+    assertThat(future.get(1, TimeUnit.SECONDS).succeeded()).isTrue();
+  }
+
+  @Test
+  public void shouldReturnTrueWhenOtherSuccessfulCodeReturned() throws Exception {
+    // given
+    remoteServiceEndpoint.setReturnedStatusCode(ACCEPTED.getStatusCode());
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(testMessage(), future);
+
+    // then
+    assertThat(future.get(1, TimeUnit.SECONDS).succeeded()).isTrue();
+  }
+
+  @Test
+  public void shouldNotRedirectMessage()
+      throws InterruptedException, ExecutionException, TimeoutException {
+    // given
+    final int numberOfExpectedMessages = 1;
+    final int maximumWaitTimeInSeconds = 1;
+    remoteServiceEndpoint.redirectMessage(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(testMessage(), future);
+
+    // then
+    assertThat(future.get(maximumWaitTimeInSeconds, TimeUnit.SECONDS).succeeded()).isFalse();
+    remoteServiceEndpoint.waitUntilReceived(maximumWaitTimeInSeconds, numberOfExpectedMessages);
+  }
+
+  @Test
+  public void shouldReturnFalseWhenSendingFails() throws Exception {
+    // given
+    remoteServiceEndpoint.setReturnedStatusCode(INTERNAL_SERVER_ERROR.getStatusCode());
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(testMessage(), future);
+
+    // then
+    remoteServiceEndpoint.waitUntilReceived();
+    assertThat(future.get(1, TimeUnit.SECONDS).succeeded()).isFalse();
+  }
+
+  @Test
+  public void shouldSendMessageIdHeader() {
+    // given
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(testMessage(), future);
+
+    // then
+    remoteServiceEndpoint.waitUntilReceived();
+    assertThat(remoteServiceEndpoint.getLastReceivedRequest().getHeader("Hermes-Message-Id"))
+        .isEqualTo("id");
+  }
+
+  @Test
+  public void shouldSendTraceIdHeader() {
+    // given
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(testMessage(), future);
+
+    // then
+    remoteServiceEndpoint.waitUntilReceived();
+    assertThat(remoteServiceEndpoint.getLastReceivedRequest().getHeader("Trace-Id"))
+        .isEqualTo("traceId");
+  }
+
+  @Test
+  public void shouldSendRetryCounterInHeader()
+      throws InterruptedException, ExecutionException, TimeoutException {
+    // given
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(testMessage(), future);
+
+    // then
+    assertThat(future.get(1000, TimeUnit.MILLISECONDS).getStatusCode()).isEqualTo(200);
+    remoteServiceEndpoint.waitUntilReceived();
+    assertThat(remoteServiceEndpoint.getLastReceivedRequest().getHeader("Hermes-Retry-Count"))
+        .isEqualTo("0");
+  }
+
+  @Test
+  public void shouldSendAuthorizationHeaderIfAuthorizationProviderAttached() {
+    // given
+    HttpRequestFactory httpRequestFactory =
+        new DefaultHttpRequestFactory(client, 1000, 1000, new DefaultHttpMetadataAppender());
+
+    JettyMessageSender messageSender =
+        new JettyMessageSender(
+            httpRequestFactory,
+            address,
+            new HermesHeadersProvider(
+                Collections.singleton(
+                    new AuthHeadersProvider(
+                        new Http1HeadersProvider(), () -> Optional.of("Basic Auth Hello!")))),
+            new DefaultSendingResultHandlers());
+    Message message = MessageBuilder.withTestMessage().build();
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(message, future);
+
+    // then
+    remoteServiceEndpoint.waitUntilReceived();
+    assertThat(remoteServiceEndpoint.getLastReceivedRequest().getHeader("Authorization"))
+        .isEqualTo("Basic Auth Hello!");
+  }
+
+  @Test
+  public void shouldUseSuppliedRequestTimeout()
+      throws ExecutionException, InterruptedException, TimeoutException {
+    // given
+    HttpRequestFactory httpRequestFactory =
+        new DefaultHttpRequestFactory(client, 100, 1000, new DefaultHttpMetadataAppender());
+    remoteServiceEndpoint.setDelay(500);
+
+    JettyMessageSender messageSender =
+        new JettyMessageSender(
+            httpRequestFactory, address, headersProvider, new DefaultSendingResultHandlers());
+    Message message = MessageBuilder.withTestMessage().build();
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(message, future);
+    MessageSendingResult messageSendingResult = future.get(1000, TimeUnit.MILLISECONDS);
+
+    // then
+    assertThat(messageSendingResult.isTimeout()).isTrue();
+  }
+
+  @Test
+  public void shouldUseSuppliedSocketTimeout()
+      throws ExecutionException, InterruptedException, TimeoutException {
+    // given
+    HttpRequestFactory httpRequestFactory =
+        new DefaultHttpRequestFactory(client, 1000, 100, new DefaultHttpMetadataAppender());
+    remoteServiceEndpoint.setDelay(200);
+
+    JettyMessageSender messageSender =
+        new JettyMessageSender(
+            httpRequestFactory, address, headersProvider, new DefaultSendingResultHandlers());
+    Message message = MessageBuilder.withTestMessage().build();
+    remoteServiceEndpoint.expectMessages(TEST_MESSAGE_CONTENT);
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(message, future);
+    MessageSendingResult messageSendingResult = future.get(1000, TimeUnit.MILLISECONDS);
+
+    // then
+    assertThat(messageSendingResult.isTimeout()).isTrue();
+  }
+}
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSenderTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSenderTest.java
index 3c4f6032e5..aa44d32b77 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSenderTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/jms/JmsMessageSenderTest.java
@@ -1,5 +1,21 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.jms;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
+import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.withTestMessage;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import javax.jms.BytesMessage;
+import javax.jms.CompletionListener;
+import javax.jms.JMSContext;
+import javax.jms.JMSException;
+import javax.jms.JMSProducer;
+import javax.jms.JMSRuntimeException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,122 +24,103 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
 import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult;
 
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import javax.jms.BytesMessage;
-import javax.jms.CompletionListener;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
-import javax.jms.JMSProducer;
-import javax.jms.JMSRuntimeException;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
-import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.withTestMessage;
-
 @RunWith(MockitoJUnitRunner.class)
 public class JmsMessageSenderTest {
 
-    private static final Message SOME_MESSAGE = withTestMessage().build();
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private JMSContext jmsContextMock;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private JMSProducer jmsProducerMock;
-
-    @Mock
-    private BytesMessage messageMock;
-
-    @Spy
-    private JmsMetadataAppender metadataAppender;
-
-    @InjectMocks
-    private JmsMessageSender messageSender;
-
-    @Before
-    public void setUp() throws Exception {
-        when(jmsContextMock.createBytesMessage()).thenReturn(messageMock);
-        when(jmsContextMock.createProducer()).thenReturn(jmsProducerMock);
-    }
-
-
-    @Test
-    public void shouldReturnTrueWhenMessageSuccessfullyPublished() throws Exception {
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(SOME_MESSAGE, future);
-
-        // then
-        ArgumentCaptor<CompletionListener> listenerCaptor = ArgumentCaptor.forClass(CompletionListener.class);
-        verify(jmsProducerMock).setAsync(listenerCaptor.capture());
-        listenerCaptor.getValue().onCompletion(messageMock);
-        assertTrue(future.get(1, TimeUnit.SECONDS).succeeded());
-    }
-
-    @Test
-    public void shouldReturnFalseWhenOnExceptionCalledOnListener() throws Exception {
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(SOME_MESSAGE, future);
-
-        // then
-        ArgumentCaptor<CompletionListener> listenerCaptor = ArgumentCaptor.forClass(CompletionListener.class);
-        verify(jmsProducerMock).setAsync(listenerCaptor.capture());
-        listenerCaptor.getValue().onException(messageMock, new RuntimeException());
-        assertFalse(future.get(1, TimeUnit.SECONDS).succeeded());
-    }
-
-    @Test
-    public void shouldReturnFalseWhenJMSThrowsCheckedException() throws Exception {
-        // given
-        doThrow(new JMSException("test")).when(messageMock).writeBytes(SOME_MESSAGE.getData());
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(SOME_MESSAGE, future);
-
-        // then
-        assertFalse(future.get(1, TimeUnit.SECONDS).succeeded());
-    }
-
-    @Test
-    public void shouldReturnFalseWhenJMSThrowsRuntimeException() throws Exception {
-        doThrow(new JMSRuntimeException("test")).when(jmsContextMock).createProducer();
-
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(SOME_MESSAGE, future);
-
-        // then
-        assertFalse(future.get(1, TimeUnit.SECONDS).succeeded());
-    }
-
-    @Test
-    public void shouldSetMessageIdInProperty() throws JMSException {
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(SOME_MESSAGE, future);
-
-        // then
-        verify(messageMock).setStringProperty(MESSAGE_ID.getCamelCaseName(), "id");
-    }
-
-    @Test
-    public void shouldSetMessageTraceIdInProperty() throws JMSException {
-        // when
-        CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
-        messageSender.send(SOME_MESSAGE, future);
-
-        // then
-        verify(messageMock).setStringProperty("TraceId", "traceId");
-    }
-}
\ No newline at end of file
+  private static final Message SOME_MESSAGE = withTestMessage().build();
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private JMSContext jmsContextMock;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private JMSProducer jmsProducerMock;
+
+  @Mock private BytesMessage messageMock;
+
+  @Spy private JmsMetadataAppender metadataAppender;
+
+  @InjectMocks private JmsMessageSender messageSender;
+
+  @Before
+  public void setUp() throws Exception {
+    when(jmsContextMock.createBytesMessage()).thenReturn(messageMock);
+    when(jmsContextMock.createProducer()).thenReturn(jmsProducerMock);
+  }
+
+  @Test
+  public void shouldReturnTrueWhenMessageSuccessfullyPublished() throws Exception {
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(SOME_MESSAGE, future);
+
+    // then
+    ArgumentCaptor<CompletionListener> listenerCaptor =
+        ArgumentCaptor.forClass(CompletionListener.class);
+    verify(jmsProducerMock).setAsync(listenerCaptor.capture());
+    listenerCaptor.getValue().onCompletion(messageMock);
+    assertTrue(future.get(1, TimeUnit.SECONDS).succeeded());
+  }
+
+  @Test
+  public void shouldReturnFalseWhenOnExceptionCalledOnListener() throws Exception {
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(SOME_MESSAGE, future);
+
+    // then
+    ArgumentCaptor<CompletionListener> listenerCaptor =
+        ArgumentCaptor.forClass(CompletionListener.class);
+    verify(jmsProducerMock).setAsync(listenerCaptor.capture());
+    listenerCaptor.getValue().onException(messageMock, new RuntimeException());
+    assertFalse(future.get(1, TimeUnit.SECONDS).succeeded());
+  }
+
+  @Test
+  public void shouldReturnFalseWhenJMSThrowsCheckedException() throws Exception {
+    // given
+    doThrow(new JMSException("test")).when(messageMock).writeBytes(SOME_MESSAGE.getData());
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(SOME_MESSAGE, future);
+
+    // then
+    assertFalse(future.get(1, TimeUnit.SECONDS).succeeded());
+  }
+
+  @Test
+  public void shouldReturnFalseWhenJMSThrowsRuntimeException() throws Exception {
+    doThrow(new JMSRuntimeException("test")).when(jmsContextMock).createProducer();
+
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(SOME_MESSAGE, future);
+
+    // then
+    assertFalse(future.get(1, TimeUnit.SECONDS).succeeded());
+  }
+
+  @Test
+  public void shouldSetMessageIdInProperty() throws JMSException {
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(SOME_MESSAGE, future);
+
+    // then
+    verify(messageMock).setStringProperty(MESSAGE_ID.getCamelCaseName(), "id");
+  }
+
+  @Test
+  public void shouldSetMessageTraceIdInProperty() throws JMSException {
+    // when
+    CompletableFuture<MessageSendingResult> future = new CompletableFuture<>();
+    messageSender.send(SOME_MESSAGE, future);
+
+    // then
+    verify(messageMock).setStringProperty("TraceId", "traceId");
+  }
+}
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/InterpolatingEndpointAddressResolverTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/InterpolatingEndpointAddressResolverTest.java
index b69b4b2410..00b9aac336 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/InterpolatingEndpointAddressResolverTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/resolver/InterpolatingEndpointAddressResolverTest.java
@@ -1,6 +1,13 @@
 package pl.allegro.tech.hermes.consumers.consumer.sender.resolver;
 
-import com.googlecode.catchexception.CatchException;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.withTestMessage;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import org.junit.Test;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.api.EndpointAddressResolverMetadata;
@@ -8,52 +15,49 @@
 import pl.allegro.tech.hermes.consumers.consumer.interpolation.InterpolationException;
 import pl.allegro.tech.hermes.consumers.consumer.interpolation.UriInterpolator;
 
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-
-import static com.googlecode.catchexception.CatchException.catchException;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.withTestMessage;
-
 public class InterpolatingEndpointAddressResolverTest {
 
-    private final UriInterpolator interpolator = mock(UriInterpolator.class);
-
-    private final InterpolatingEndpointAddressResolver resolver = new InterpolatingEndpointAddressResolver(interpolator);
-
-    private final EndpointAddressResolverMetadata metadata = EndpointAddressResolverMetadata.empty();
-
-    @Test
-    public void shouldUseInterpolatorToInterpolateURI() throws InterpolationException, EndpointAddressResolutionException {
-        // given
-        EndpointAddress address = EndpointAddress.of("http://localhost/{a}");
-        Message message = withTestMessage().withContent("content", StandardCharsets.UTF_8).build();
-        when(interpolator.interpolate(address, message)).thenReturn(URI.create("http://localhost/hello"));
-
-        // when
-        URI uri = resolver.resolve(EndpointAddress.of("http://localhost/{a}"),
-                withTestMessage().withContent("content", StandardCharsets.UTF_8).build(), metadata);
-
-        // then
-        assertThat(uri).isEqualTo(URI.create("http://localhost/hello"));
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void shouldThrowResolvingExceptionWhenInterpolationFails() throws EndpointAddressResolutionException, InterpolationException {
-        // given
-        EndpointAddress address = EndpointAddress.of("http://localhost/{a}");
-        Message message = withTestMessage().withContent("content", StandardCharsets.UTF_8).build();
-        when(interpolator.interpolate(address, message)).thenThrow(InterpolationException.class);
-
-        // when
-        catchException(resolver).resolve(EndpointAddress.of("http://localhost/{a}"),
-                withTestMessage().withContent("content", StandardCharsets.UTF_8).build(), metadata);
-
-        // then
-        assertThat(CatchException.<EndpointAddressResolutionException>caughtException())
-            .isInstanceOf(EndpointAddressResolutionException.class);
-    }
+  private final UriInterpolator interpolator = mock(UriInterpolator.class);
+
+  private final InterpolatingEndpointAddressResolver resolver =
+      new InterpolatingEndpointAddressResolver(interpolator);
+
+  private final EndpointAddressResolverMetadata metadata = EndpointAddressResolverMetadata.empty();
+
+  @Test
+  public void shouldUseInterpolatorToInterpolateURI()
+      throws InterpolationException, EndpointAddressResolutionException {
+    // given
+    EndpointAddress address = EndpointAddress.of("http://localhost/{a}");
+    Message message = withTestMessage().withContent("content", StandardCharsets.UTF_8).build();
+    when(interpolator.interpolate(address, message))
+        .thenReturn(URI.create("http://localhost/hello"));
+
+    // when
+    URI uri =
+        resolver.resolve(
+            EndpointAddress.of("http://localhost/{a}"),
+            withTestMessage().withContent("content", StandardCharsets.UTF_8).build(),
+            metadata);
+
+    // then
+    assertThat(uri).isEqualTo(URI.create("http://localhost/hello"));
+  }
+
+  @Test
+  public void shouldThrowResolvingExceptionWhenInterpolationFails() throws InterpolationException {
+    // given
+    EndpointAddress address = EndpointAddress.of("http://localhost/{a}");
+    Message message = withTestMessage().withContent("content", StandardCharsets.UTF_8).build();
+    when(interpolator.interpolate(address, message)).thenThrow(InterpolationException.class);
+
+    // then
+    assertThrows(
+        EndpointAddressResolutionException.class,
+        () ->
+            resolver.resolve(
+                EndpointAddress.of("http://localhost/{a}"),
+                withTestMessage().withContent("content", StandardCharsets.UTF_8).build(),
+                metadata));
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/FullDrainMpscQueueTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/FullDrainMpscQueueTest.java
index c4ea984bab..475c55cf81 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/FullDrainMpscQueueTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/FullDrainMpscQueueTest.java
@@ -2,8 +2,8 @@
 
 public class FullDrainMpscQueueTest extends MpscQueuesAbstractTest {
 
-    @Override
-    protected <T> MpscQueue<T> createMpscQueue(int size) {
-        return new FullDrainMpscQueue<>(size);
-    }
+  @Override
+  protected <T> MpscQueue<T> createMpscQueue(int size) {
+    return new FullDrainMpscQueue<>(size);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/MpscQueuesAbstractTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/MpscQueuesAbstractTest.java
index ee0a22a2d9..e9f262966f 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/MpscQueuesAbstractTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/MpscQueuesAbstractTest.java
@@ -1,51 +1,50 @@
 package pl.allegro.tech.hermes.consumers.queue;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
 
 public abstract class MpscQueuesAbstractTest {
 
-    protected abstract <T> MpscQueue<T> createMpscQueue(int size);
+  protected abstract <T> MpscQueue<T> createMpscQueue(int size);
 
-    @Test
-    public void shouldDrainItemsFromNonEmptyQueue() {
-        // given
-        MpscQueue<Integer> queue = createMpscQueue(16);
-        assertThat(queue.capacity()).isEqualTo(16);
+  @Test
+  public void shouldDrainItemsFromNonEmptyQueue() {
+    // given
+    MpscQueue<Integer> queue = createMpscQueue(16);
+    assertThat(queue.capacity()).isEqualTo(16);
 
-        // when
-        queue.offer(1);
-        queue.offer(2);
-        queue.offer(3);
+    // when
+    queue.offer(1);
+    queue.offer(2);
+    queue.offer(3);
 
-        // then
-        assertThat(queue.size()).isEqualTo(3);
+    // then
+    assertThat(queue.size()).isEqualTo(3);
 
-        // when
-        List<Integer> drained = new ArrayList<>();
-        queue.drain(drained::add);
+    // when
+    List<Integer> drained = new ArrayList<>();
+    queue.drain(drained::add);
 
-        // then
-        assertThat(drained).contains(1, 2, 3);
+    // then
+    assertThat(drained).contains(1, 2, 3);
 
-        // and
-        assertThat(queue.size()).isZero();
-    }
+    // and
+    assertThat(queue.size()).isZero();
+  }
 
-    @Test
-    public void shouldDrainEmptyQueue() {
-        // given
-        MpscQueue<Integer> queue = createMpscQueue(16);
+  @Test
+  public void shouldDrainEmptyQueue() {
+    // given
+    MpscQueue<Integer> queue = createMpscQueue(16);
 
-        // when
-        List<Integer> drained = new ArrayList<>();
-        queue.drain(drained::add);
+    // when
+    List<Integer> drained = new ArrayList<>();
+    queue.drain(drained::add);
 
-        // then
-        assertThat(drained).isEmpty();
-    }
-}
\ No newline at end of file
+    // then
+    assertThat(drained).isEmpty();
+  }
+}
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/WaitFreeDrainMpscQueueTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/WaitFreeDrainMpscQueueTest.java
index 6923f10a3f..c6f3320806 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/WaitFreeDrainMpscQueueTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/queue/WaitFreeDrainMpscQueueTest.java
@@ -2,8 +2,8 @@
 
 public class WaitFreeDrainMpscQueueTest extends MpscQueuesAbstractTest {
 
-    @Override
-    protected <T> MpscQueue<T> createMpscQueue(int size) {
-        return new WaitFreeDrainMpscQueue<>(size);
-    }
+  @Override
+  protected <T> MpscQueue<T> createMpscQueue(int size) {
+    return new WaitFreeDrainMpscQueue<>(size);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerTestRuntimeEnvironment.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerTestRuntimeEnvironment.java
index b6965869f5..2deff0501a 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerTestRuntimeEnvironment.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/ConsumerTestRuntimeEnvironment.java
@@ -1,7 +1,24 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.mockito.Mockito.mock;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Maps;
+import java.time.Clock;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.function.Supplier;
+import java.util.stream.IntStream;
 import org.apache.curator.framework.CuratorFramework;
 import pl.allegro.tech.hermes.api.Group;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -16,7 +33,6 @@
 import pl.allegro.tech.hermes.consumers.config.WorkloadProperties;
 import pl.allegro.tech.hermes.consumers.config.ZookeeperProperties;
 import pl.allegro.tech.hermes.consumers.consumer.offset.ConsumerPartitionAssignmentState;
-import pl.allegro.tech.hermes.consumers.consumer.offset.OffsetQueue;
 import pl.allegro.tech.hermes.consumers.health.ConsumerMonitor;
 import pl.allegro.tech.hermes.consumers.message.undelivered.UndeliveredMessageLogPersister;
 import pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry;
@@ -46,296 +62,299 @@
 import pl.allegro.tech.hermes.infrastructure.zookeeper.notifications.ZookeeperInternalNotificationBus;
 import pl.allegro.tech.hermes.test.helper.metrics.TestMetricsFacadeFactory;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Duration.ONE_SECOND;
-import static java.util.stream.Collectors.toList;
-import static org.mockito.Mockito.mock;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
 class ConsumerTestRuntimeEnvironment {
 
-    private static final int DEATH_OF_CONSUMER_AFTER_SECONDS = 300;
-    private final KafkaProperties kafkaProperties = new KafkaProperties();
-
-    private final ConsumerNodesRegistryPaths nodesRegistryPaths;
-
-    private int consumerIdSequence = 0;
-
-    private int subscriptionIdSequence = 0;
-
-    private final ZookeeperPaths zookeeperPaths = new ZookeeperPaths("/hermes");
-    private final Supplier<CuratorFramework> curatorSupplier;
-
-    private final GroupRepository groupRepository;
-    private final TopicRepository topicRepository;
-    private final SubscriptionRepository subscriptionRepository;
-    private final ObjectMapper objectMapper = new ObjectMapper();
-    private final ExecutorService executorService = Executors.newSingleThreadExecutor();
-    private final Supplier<MetricsFacade> metricsSupplier;
-    private final WorkloadConstraintsRepository workloadConstraintsRepository;
-    private final CuratorFramework curator;
-    private final ConsumerPartitionAssignmentState partitionAssignmentState;
-    private final ZookeeperProperties zookeeperProperties;
-
-    private final Map<String, CuratorFramework> consumerZookeeperConnections = Maps.newHashMap();
-    private final List<SubscriptionsCache> subscriptionsCaches = new ArrayList<>();
-
-    ConsumerTestRuntimeEnvironment(Supplier<CuratorFramework> curatorSupplier) {
-        this.curatorSupplier = curatorSupplier;
-        this.curator = curatorSupplier.get();
-        this.partitionAssignmentState = new ConsumerPartitionAssignmentState();
-        this.groupRepository = new ZookeeperGroupRepository(curator, objectMapper, zookeeperPaths);
-        this.topicRepository = new ZookeeperTopicRepository(curator, objectMapper, zookeeperPaths, groupRepository);
-        this.subscriptionRepository = new ZookeeperSubscriptionRepository(
-                curator, objectMapper, zookeeperPaths, topicRepository
-        );
-
-        this.workloadConstraintsRepository = new ZookeeperWorkloadConstraintsRepository(curator, objectMapper, zookeeperPaths);
-
-        this.metricsSupplier = TestMetricsFacadeFactory::create;
-        this.nodesRegistryPaths = new ConsumerNodesRegistryPaths(zookeeperPaths, kafkaProperties.getClusterName());
-        this.zookeeperProperties = new ZookeeperProperties();
+  private static final int DEATH_OF_CONSUMER_AFTER_SECONDS = 300;
+  private final KafkaProperties kafkaProperties = new KafkaProperties();
+
+  private final ConsumerNodesRegistryPaths nodesRegistryPaths;
+
+  private int consumerIdSequence = 0;
+
+  private int subscriptionIdSequence = 0;
+
+  private final ZookeeperPaths zookeeperPaths = new ZookeeperPaths("/hermes");
+  private final Supplier<CuratorFramework> curatorSupplier;
+
+  private final GroupRepository groupRepository;
+  private final TopicRepository topicRepository;
+  private final SubscriptionRepository subscriptionRepository;
+  private final ObjectMapper objectMapper = new ObjectMapper();
+  private final ExecutorService executorService = Executors.newSingleThreadExecutor();
+  private final Supplier<MetricsFacade> metricsSupplier;
+  private final WorkloadConstraintsRepository workloadConstraintsRepository;
+  private final CuratorFramework curator;
+  private final ConsumerPartitionAssignmentState partitionAssignmentState;
+  private final ZookeeperProperties zookeeperProperties;
+
+  private final Map<String, CuratorFramework> consumerZookeeperConnections = Maps.newHashMap();
+  private final List<SubscriptionsCache> subscriptionsCaches = new ArrayList<>();
+
+  ConsumerTestRuntimeEnvironment(Supplier<CuratorFramework> curatorSupplier) {
+    this.curatorSupplier = curatorSupplier;
+    this.curator = curatorSupplier.get();
+    this.partitionAssignmentState = new ConsumerPartitionAssignmentState();
+    this.groupRepository = new ZookeeperGroupRepository(curator, objectMapper, zookeeperPaths);
+    this.topicRepository =
+        new ZookeeperTopicRepository(curator, objectMapper, zookeeperPaths, groupRepository);
+    this.subscriptionRepository =
+        new ZookeeperSubscriptionRepository(curator, objectMapper, zookeeperPaths, topicRepository);
+
+    this.workloadConstraintsRepository =
+        new ZookeeperWorkloadConstraintsRepository(curator, objectMapper, zookeeperPaths);
+
+    this.metricsSupplier = TestMetricsFacadeFactory::create;
+    this.nodesRegistryPaths =
+        new ConsumerNodesRegistryPaths(zookeeperPaths, kafkaProperties.getClusterName());
+    this.zookeeperProperties = new ZookeeperProperties();
+  }
+
+  WorkloadSupervisor findLeader(List<WorkloadSupervisor> supervisors) {
+    return supervisors.stream().filter(WorkloadSupervisor::isLeader).findAny().get();
+  }
+
+  private WorkloadSupervisor createConsumer(
+      String consumerId, ConsumersSupervisor consumersSupervisor) {
+    CuratorFramework curator = curatorSupplier.get();
+    consumerZookeeperConnections.put(consumerId, curator);
+    ConsumerNodesRegistry nodesRegistry =
+        new ConsumerNodesRegistry(
+            curator,
+            executorService,
+            nodesRegistryPaths,
+            consumerId,
+            DEATH_OF_CONSUMER_AFTER_SECONDS,
+            Clock.systemDefaultZone());
+
+    try {
+      nodesRegistry.start();
+    } catch (Exception e) {
+      throw new IllegalStateException(e);
     }
 
-    WorkloadSupervisor findLeader(List<WorkloadSupervisor> supervisors) {
-        return supervisors.stream().filter(WorkloadSupervisor::isLeader).findAny().get();
+    WorkloadProperties workloadProperties = new WorkloadProperties();
+    workloadProperties.setNodeId(consumerId);
+    workloadProperties.setRebalanceInterval(Duration.ofSeconds(1));
+    workloadProperties.setConsumersPerSubscription(2);
+    workloadProperties.setMonitorScanInterval(Duration.ofSeconds(1));
+
+    ModelAwareZookeeperNotifyingCache modelAwareCache =
+        new ModelAwareZookeeperNotifyingCacheFactory(
+                curator, metricsSupplier.get(), zookeeperProperties)
+            .provide();
+
+    InternalNotificationsBus notificationsBus =
+        new ZookeeperInternalNotificationBus(objectMapper, modelAwareCache);
+
+    SubscriptionsCache subscriptionsCache =
+        new NotificationsBasedSubscriptionCache(
+            notificationsBus, groupRepository, topicRepository, subscriptionRepository);
+    subscriptionsCaches.add(subscriptionsCache);
+
+    SubscriptionConfiguration subscriptionConfiguration = new SubscriptionConfiguration();
+    SubscriptionIds subscriptionIds =
+        subscriptionConfiguration.subscriptionIds(
+            notificationsBus,
+            subscriptionsCache,
+            new ZookeeperSubscriptionIdProvider(curator, zookeeperPaths),
+            new CommonConsumerProperties());
+
+    ConsumerAssignmentCache consumerAssignmentCache =
+        new ConsumerAssignmentCache(
+            curator,
+            workloadProperties.getNodeId(),
+            kafkaProperties.getClusterName(),
+            zookeeperPaths,
+            subscriptionIds);
+    try {
+      consumerAssignmentCache.start();
+    } catch (Exception e) {
+      throw new IllegalStateException(e);
     }
 
-    private WorkloadSupervisor createConsumer(String consumerId,
-                                              ConsumersSupervisor consumersSupervisor) {
-        CuratorFramework curator = curatorSupplier.get();
-        consumerZookeeperConnections.put(consumerId, curator);
-        ConsumerNodesRegistry nodesRegistry = new ConsumerNodesRegistry(
-                curator,
-                executorService,
-                nodesRegistryPaths,
-                consumerId,
-                DEATH_OF_CONSUMER_AFTER_SECONDS,
-                Clock.systemDefaultZone());
-
-        try {
-            nodesRegistry.start();
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-
-        WorkloadProperties workloadProperties = new WorkloadProperties();
-        workloadProperties.setNodeId(consumerId);
-        workloadProperties.setRebalanceInterval(Duration.ofSeconds(1));
-        workloadProperties.setConsumersPerSubscription(2);
-        workloadProperties.setMonitorScanInterval(Duration.ofSeconds(1));
-
-        ModelAwareZookeeperNotifyingCache modelAwareCache = new ModelAwareZookeeperNotifyingCacheFactory(
-                curator, zookeeperProperties
-        ).provide();
-
-        InternalNotificationsBus notificationsBus =
-                new ZookeeperInternalNotificationBus(objectMapper, modelAwareCache);
-
-        SubscriptionsCache subscriptionsCache = new NotificationsBasedSubscriptionCache(
-                notificationsBus, groupRepository, topicRepository, subscriptionRepository
-        );
-        subscriptionsCaches.add(subscriptionsCache);
-
-        SubscriptionConfiguration subscriptionConfiguration = new SubscriptionConfiguration();
-        SubscriptionIds subscriptionIds = subscriptionConfiguration.subscriptionIds(notificationsBus, subscriptionsCache,
-                new ZookeeperSubscriptionIdProvider(curator, zookeeperPaths), new CommonConsumerProperties());
-
-        ConsumerAssignmentCache consumerAssignmentCache =
-            new ConsumerAssignmentCache(
-                curator,
-                workloadProperties.getNodeId(),
-                kafkaProperties.getClusterName(),
-                zookeeperPaths,
-                subscriptionIds
-            );
-        try {
-            consumerAssignmentCache.start();
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-
-        ClusterAssignmentCache clusterAssignmentCache =
-            new ClusterAssignmentCache(
-                curator,
-                kafkaProperties.getClusterName(),
-                zookeeperPaths,
-                subscriptionIds,
-                nodesRegistry
-            );
-
-        ConsumerAssignmentRegistry consumerAssignmentRegistry =
-            new ConsumerAssignmentRegistry(
-                curator,
-                workloadProperties.getRegistryBinaryEncoderAssignmentsBufferSizeBytes(),
-                kafkaProperties.getClusterName(),
-                zookeeperPaths,
-                subscriptionIds
-            );
-
-        return new WorkloadSupervisor(
-                consumersSupervisor,
-                notificationsBus,
-                subscriptionsCache,
-                consumerAssignmentCache,
-                consumerAssignmentRegistry,
-                clusterAssignmentCache,
-                nodesRegistry,
-                mock(ZookeeperAdminCache.class),
-                executorService,
-                workloadProperties,
-                kafkaProperties.getClusterName(),
-                metricsSupplier.get(),
-                workloadConstraintsRepository,
-                new SelectiveWorkBalancer(),
-                new NoOpBalancingListener()
-        );
+    ClusterAssignmentCache clusterAssignmentCache =
+        new ClusterAssignmentCache(
+            curator,
+            kafkaProperties.getClusterName(),
+            zookeeperPaths,
+            subscriptionIds,
+            nodesRegistry);
+
+    ConsumerAssignmentRegistry consumerAssignmentRegistry =
+        new ConsumerAssignmentRegistry(
+            curator,
+            workloadProperties.getRegistryBinaryEncoderAssignmentsBufferSizeBytes(),
+            kafkaProperties.getClusterName(),
+            zookeeperPaths,
+            subscriptionIds);
+
+    return new WorkloadSupervisor(
+        consumersSupervisor,
+        notificationsBus,
+        subscriptionsCache,
+        consumerAssignmentCache,
+        consumerAssignmentRegistry,
+        clusterAssignmentCache,
+        nodesRegistry,
+        mock(ZookeeperAdminCache.class),
+        executorService,
+        workloadProperties,
+        kafkaProperties.getClusterName(),
+        metricsSupplier.get(),
+        workloadConstraintsRepository,
+        new SelectiveWorkBalancer(),
+        new NoOpBalancingListener());
+  }
+
+  WorkloadSupervisor spawnConsumer() {
+    return spawnConsumers(1).get(0);
+  }
+
+  WorkloadSupervisor spawnConsumer(String consumerId, ConsumersSupervisor consumersSupervisor) {
+    WorkloadSupervisor workloadSupervisor = createConsumer(consumerId, consumersSupervisor);
+    return startNode(workloadSupervisor);
+  }
+
+  ConsumersSupervisor consumersSupervisor(ConsumerFactory consumerFactory) {
+    MetricsFacade metrics = metricsSupplier.get();
+    CommonConsumerProperties commonConsumerProperties = new CommonConsumerProperties();
+    CommonConsumerProperties.BackgroundSupervisor supervisorParameters =
+        new CommonConsumerProperties.BackgroundSupervisor();
+    supervisorParameters.setInterval(Duration.ofSeconds(1));
+    commonConsumerProperties.setBackgroundSupervisor(supervisorParameters);
+    return new NonblockingConsumersSupervisor(
+        commonConsumerProperties,
+        new ConsumersExecutorService(new CommonConsumerProperties().getThreadPoolSize(), metrics),
+        consumerFactory,
+        partitionAssignmentState,
+        mock(Retransmitter.class),
+        mock(UndeliveredMessageLogPersister.class),
+        subscriptionRepository,
+        metrics,
+        mock(ConsumerMonitor.class),
+        Clock.systemDefaultZone());
+  }
+
+  ConsumersRuntimeMonitor monitor(
+      String consumerId,
+      ConsumersSupervisor consumersSupervisor,
+      WorkloadSupervisor workloadSupervisor,
+      Duration monitorScanInterval) {
+    CuratorFramework curator = consumerZookeeperConnections.get(consumerId);
+    ModelAwareZookeeperNotifyingCache modelAwareCache =
+        new ModelAwareZookeeperNotifyingCacheFactory(
+                curator, metricsSupplier.get(), zookeeperProperties)
+            .provide();
+    InternalNotificationsBus notificationsBus =
+        new ZookeeperInternalNotificationBus(objectMapper, modelAwareCache);
+    SubscriptionsCache subscriptionsCache =
+        new NotificationsBasedSubscriptionCache(
+            notificationsBus, groupRepository, topicRepository, subscriptionRepository);
+    subscriptionsCaches.add(subscriptionsCache);
+    subscriptionsCache.start();
+    return new ConsumersRuntimeMonitor(
+        consumersSupervisor,
+        workloadSupervisor,
+        metricsSupplier.get(),
+        subscriptionsCache,
+        monitorScanInterval);
+  }
+
+  List<WorkloadSupervisor> spawnConsumers(int howMany) {
+    return IntStream.range(0, howMany)
+        .mapToObj(
+            i -> {
+              String consumerId = nextConsumerId();
+              ConsumersSupervisor consumersSupervisor =
+                  consumersSupervisor(mock(ConsumerFactory.class));
+              WorkloadSupervisor consumer = createConsumer(consumerId, consumersSupervisor);
+              startNode(consumer);
+              return consumer;
+            })
+        .collect(toList());
+  }
+
+  void kill(WorkloadSupervisor node) {
+    consumerZookeeperConnections.get(node.consumerId()).close();
+  }
+
+  void cleanState() {
+    consumerZookeeperConnections.values().forEach(CuratorFramework::close);
+    subscriptionsCaches.clear();
+  }
+
+  private WorkloadSupervisor startNode(WorkloadSupervisor workloadSupervisor) {
+    try {
+      workloadSupervisor.start();
+      waitForRegistration(workloadSupervisor.consumerId());
+      return workloadSupervisor;
+    } catch (Exception e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    WorkloadSupervisor spawnConsumer() {
-        return spawnConsumers(1).get(0);
-    }
+  void waitForRegistration(String consumerId) {
+    await().atMost(adjust(Duration.ofSeconds(1))).until(() -> isRegistered(consumerId));
+  }
 
-    WorkloadSupervisor spawnConsumer(String consumerId, ConsumersSupervisor consumersSupervisor) {
-        WorkloadSupervisor workloadSupervisor = createConsumer(consumerId, consumersSupervisor);
-        return startNode(workloadSupervisor);
+  private boolean isRegistered(String nodeId) {
+    try {
+      return curator.checkExists().forPath(nodesRegistryPaths.nodePath(nodeId)) != null;
+    } catch (Exception e) {
+      return false;
     }
-
-    ConsumersSupervisor consumersSupervisor(ConsumerFactory consumerFactory) {
-        MetricsFacade metrics = metricsSupplier.get();
-        CommonConsumerProperties commonConsumerProperties = new CommonConsumerProperties();
-        CommonConsumerProperties.BackgroundSupervisor supervisorParameters = new CommonConsumerProperties.BackgroundSupervisor();
-        supervisorParameters.setInterval(Duration.ofSeconds(1));
-        commonConsumerProperties.setBackgroundSupervisor(supervisorParameters);
-        return new NonblockingConsumersSupervisor(commonConsumerProperties,
-                new ConsumersExecutorService(new CommonConsumerProperties().getThreadPoolSize(), metrics),
-                consumerFactory,
-                mock(OffsetQueue.class),
-                partitionAssignmentState,
-                mock(Retransmitter.class),
-                mock(UndeliveredMessageLogPersister.class),
-                subscriptionRepository,
-                metrics,
-                mock(ConsumerMonitor.class),
-                Clock.systemDefaultZone(),
-                Duration.ofSeconds(60));
+  }
+
+  void awaitUntilAssignmentExists(SubscriptionName subscription, WorkloadSupervisor node) {
+    await()
+        .atMost(adjust(Duration.ofSeconds(2)))
+        .until(() -> node.assignedSubscriptions().contains(subscription));
+  }
+
+  List<SubscriptionName> createSubscription(int howMany) {
+    return IntStream.range(0, howMany)
+        .mapToObj(i -> createSubscription(nextSubscriptionName()))
+        .collect(toList());
+  }
+
+  SubscriptionName createSubscription() {
+    return createSubscription(1).get(0);
+  }
+
+  private SubscriptionName createSubscription(SubscriptionName subscriptionName) {
+    Subscription subscription = subscription(subscriptionName).build();
+    Group group = Group.from(subscription.getTopicName().getGroupName());
+    if (!groupRepository.groupExists(group.getGroupName())) {
+      groupRepository.createGroup(group);
     }
-
-    ConsumersRuntimeMonitor monitor(String consumerId,
-                                    ConsumersSupervisor consumersSupervisor,
-                                    WorkloadSupervisor workloadSupervisor,
-                                    Duration monitorScanInterval) {
-        CuratorFramework curator = consumerZookeeperConnections.get(consumerId);
-        ModelAwareZookeeperNotifyingCache modelAwareCache =
-                new ModelAwareZookeeperNotifyingCacheFactory(curator, zookeeperProperties).provide();
-        InternalNotificationsBus notificationsBus =
-                new ZookeeperInternalNotificationBus(objectMapper, modelAwareCache);
-        SubscriptionsCache subscriptionsCache = new NotificationsBasedSubscriptionCache(
-                notificationsBus, groupRepository, topicRepository, subscriptionRepository);
-        subscriptionsCaches.add(subscriptionsCache);
-        subscriptionsCache.start();
-        return new ConsumersRuntimeMonitor(
-                consumersSupervisor,
-                workloadSupervisor,
-                metricsSupplier.get(),
-                subscriptionsCache,
-                monitorScanInterval);
-    }
-
-    List<WorkloadSupervisor> spawnConsumers(int howMany) {
-        return IntStream.range(0, howMany)
-                .mapToObj(i -> {
-                    String consumerId = nextConsumerId();
-                    ConsumersSupervisor consumersSupervisor = consumersSupervisor(mock(ConsumerFactory.class));
-                    WorkloadSupervisor consumer = createConsumer(consumerId, consumersSupervisor);
-                    startNode(consumer);
-                    return consumer;
-                })
-                .collect(toList());
-    }
-
-    void kill(WorkloadSupervisor node) {
-        consumerZookeeperConnections.get(node.consumerId()).close();
-    }
-
-    void killAll() {
-        consumerZookeeperConnections.values().forEach(CuratorFramework::close);
-    }
-
-    private WorkloadSupervisor startNode(WorkloadSupervisor workloadSupervisor) {
-        try {
-            workloadSupervisor.start();
-            waitForRegistration(workloadSupervisor.consumerId());
-            return workloadSupervisor;
-        } catch (Exception e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    void waitForRegistration(String consumerId) {
-        await().atMost(adjust(ONE_SECOND)).until(() -> isRegistered(consumerId));
-    }
-
-    private boolean isRegistered(String nodeId) {
-        try {
-            return curator.checkExists().forPath(nodesRegistryPaths.nodePath(nodeId)) != null;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    void awaitUntilAssignmentExists(SubscriptionName subscription, WorkloadSupervisor node) {
-        await().atMost(adjust(ONE_SECOND)).until(() -> {
-            node.assignedSubscriptions().contains(subscription);
-        });
-    }
-
-    List<SubscriptionName> createSubscription(int howMany) {
-        return IntStream.range(0, howMany).mapToObj(i ->
-                createSubscription(nextSubscriptionName())).collect(toList());
-    }
-
-    SubscriptionName createSubscription() {
-        return createSubscription(1).get(0);
-    }
-
-    private SubscriptionName createSubscription(SubscriptionName subscriptionName) {
-        Subscription subscription = subscription(subscriptionName).build();
-        Group group = Group.from(subscription.getTopicName().getGroupName());
-        if (!groupRepository.groupExists(group.getGroupName())) {
-            groupRepository.createGroup(group);
-        }
-        if (!topicRepository.topicExists(subscription.getTopicName())) {
-            topicRepository.createTopic(topic(subscription.getTopicName()).build());
-        }
-        subscriptionRepository.createSubscription(subscription);
-        await().atMost(adjust(ONE_SECOND)).until(
-                () -> {
-                    subscriptionRepository.subscriptionExists(subscription.getTopicName(), subscription.getName());
-                    subscriptionsCaches.forEach(subscriptionsCache ->
-                            subscriptionsCache.listActiveSubscriptionNames().contains(subscriptionName));
-                }
-        );
-        return subscription.getQualifiedName();
-    }
-
-    private String nextConsumerId() {
-        return String.valueOf(consumerIdSequence++);
-    }
-
-    private SubscriptionName nextSubscriptionName() {
-        return SubscriptionName.fromString("com.example.topic$test" + subscriptionIdSequence++);
+    if (!topicRepository.topicExists(subscription.getTopicName())) {
+      topicRepository.createTopic(topic(subscription.getTopicName()).build());
     }
+    subscriptionRepository.createSubscription(subscription);
+    await()
+        .atMost(adjust(Duration.ofSeconds(2)))
+        .untilAsserted(
+            () -> {
+              assertThat(
+                      subscriptionRepository.subscriptionExists(
+                          subscription.getTopicName(), subscription.getName()))
+                  .isTrue();
+              subscriptionsCaches.forEach(
+                  subscriptionsCache ->
+                      assertThat(
+                              subscriptionsCache
+                                  .listActiveSubscriptionNames()
+                                  .contains(subscriptionName))
+                          .isTrue());
+            });
+    return subscription.getQualifiedName();
+  }
+
+  private String nextConsumerId() {
+    return String.valueOf(consumerIdSequence++);
+  }
+
+  private SubscriptionName nextSubscriptionName() {
+    return SubscriptionName.fromString("com.example.topic$test" + subscriptionIdSequence++);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SelectiveWorkBalancerTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SelectiveWorkBalancerTest.java
index 06119b5865..8a68c95ab4 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SelectiveWorkBalancerTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SelectiveWorkBalancerTest.java
@@ -1,322 +1,358 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.google.common.collect.ImmutableList;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.IntStream;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import pl.allegro.tech.hermes.api.Constraints;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.supervisor.workload.selective.SelectiveWorkBalancer;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.stream.IntStream;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Assertions.assertThat;
-
 @RunWith(DataProviderRunner.class)
 public class SelectiveWorkBalancerTest {
 
-    private SelectiveWorkBalancer workBalancer = new SelectiveWorkBalancer();
-
-    @Test
-    public void shouldPerformSubscriptionsCleanup() {
-        // given
-        List<SubscriptionName> subscriptions = someSubscriptions(1);
-        List<String> supervisors = someSupervisors(1);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(2)
-                .build();
-        SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
-
-        // when
-        WorkBalancingResult target = workBalancer.balance(emptyList(), supervisors, currentState, constraints);
-
-        // then
-        assertThat(target.getAssignmentsView().getSubscriptions()).isEmpty();
-        assertThat(currentState.deletions(target.getAssignmentsView()).getAllAssignments()).hasSize(subscriptions.size());
-    }
-
-    @Test
-    public void shouldPerformSupervisorsCleanup() {
-        // given
-        List<String> supervisors = someSupervisors(2);
-        List<SubscriptionName> subscriptions = someSubscriptions(1);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(2)
-                .build();
-        SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
-
-        // when
-        supervisors.remove(1);
-        WorkBalancingResult work = workBalancer.balance(subscriptions, supervisors, currentState, constraints);
-
-        // then
-        assertThat(currentState.deletions(work.getAssignmentsView()).getAllAssignments()).hasSize(1);
-        assertThatSubscriptionIsAssignedTo(work.getAssignmentsView(), subscriptions.get(0), supervisors.get(0));
-    }
-
-    @Test
-    public void shouldBalanceWorkForSingleSubscription() {
-        // given
-        List<String> supervisors = someSupervisors(1);
-        List<SubscriptionName> subscriptions = someSubscriptions(1);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(2)
-                .build();
-
-        // when
-        SubscriptionAssignmentView view = initialState(subscriptions, supervisors, constraints);
-
-        // then
-        assertThatSubscriptionIsAssignedTo(view, subscriptions.get(0), supervisors.get(0));
-    }
-
-    @Test
-    public void shouldBalanceWorkForMultipleConsumersAndSingleSubscription() {
-        // given
-        List<String> supervisors = someSupervisors(2);
-        List<SubscriptionName> subscriptions = someSubscriptions(1);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(2)
-                .build();
-
-        // when
-        SubscriptionAssignmentView view = initialState(subscriptions, supervisors, constraints);
-
-        // then
-        assertThatSubscriptionIsAssignedTo(view, subscriptions.get(0), supervisors);
-    }
-
-    @Test
-    public void shouldBalanceWorkForMultipleConsumersAndMultipleSubscriptions() {
-        // given
-        List<String> supervisors = someSupervisors(2);
-        List<SubscriptionName> subscriptions = someSubscriptions(2);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(2)
-                .build();
-
-        // when
-        SubscriptionAssignmentView view = initialState(subscriptions, supervisors, constraints);
-
-        // then
-        assertThatSubscriptionIsAssignedTo(view, subscriptions.get(0), supervisors);
-        assertThatSubscriptionIsAssignedTo(view, subscriptions.get(1), supervisors);
-    }
-
-    @Test
-    public void shouldNotOverloadConsumers() {
-        // given
-        List<String> supervisors = someSupervisors(1);
-        List<SubscriptionName> subscriptions = someSubscriptions(3);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(2)
-                .build();
-
-        // when
-        SubscriptionAssignmentView view = initialState(subscriptions, supervisors, constraints);
-
-        // then
-        assertThat(view.getAssignmentsForConsumerNode(supervisors.get(0))).hasSize(2);
-    }
-
-    @Test
-    public void shouldRebalanceAfterConsumerDisappearing() {
-        // given
-        List<String> supervisors = ImmutableList.of("c1", "c2");
-        List<SubscriptionName> subscriptions = someSubscriptions(2);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(2)
-                .build();
-        SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
-
-        // when
-        List<String> extendedSupervisorsList = ImmutableList.of("c1", "c3");
-        SubscriptionAssignmentView stateAfterRebalance = workBalancer
-                .balance(subscriptions, extendedSupervisorsList, currentState, constraints)
-                .getAssignmentsView();
-
-        // then
-        assertThat(stateAfterRebalance.getSubscriptionsForConsumerNode("c3")).containsOnly(subscriptions.get(0), subscriptions.get(1));
-    }
-
-    @Test
-    public void shouldAssignWorkToNewConsumersByWorkStealing() {
-        // given
-        List<String> supervisors = someSupervisors(2);
-        List<SubscriptionName> subscriptions = someSubscriptions(2);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(2)
-                .build();
-        SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
-
-        // when
-        supervisors.add("new-supervisor");
-        SubscriptionAssignmentView stateAfterRebalance = workBalancer
-                .balance(subscriptions, supervisors, currentState, constraints)
-                .getAssignmentsView();
-
-        // then
-        assertThat(stateAfterRebalance.getAssignmentsForConsumerNode("new-supervisor").size()).isGreaterThan(0);
-        assertThat(stateAfterRebalance.getAssignmentsForSubscription(subscriptions.get(0))).hasSize(2);
-        assertThat(stateAfterRebalance.getAssignmentsForSubscription(subscriptions.get(1))).hasSize(2);
-    }
-
-    @Test
-    public void shouldEquallyAssignWorkToConsumers() {
-        // given
-        List<String> supervisors = ImmutableList.of("c1", "c2");
-        List<SubscriptionName> subscriptions = someSubscriptions(50);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(200)
-                .build();
-        SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
-
-        // when
-        List<String> extendedSupervisorsList = ImmutableList.of("c1", "c2", "c3");
-        SubscriptionAssignmentView stateAfterRebalance = workBalancer
-                .balance(subscriptions, extendedSupervisorsList, currentState, constraints)
-                .getAssignmentsView();
-
-        // then
-        assertThat(stateAfterRebalance.getAssignmentsForConsumerNode("c3")).hasSize(50 * 2 / 3);
-    }
-
-    @Test
-    public void shouldReassignWorkToFreeConsumers() {
-        // given
-        List<String> supervisors = ImmutableList.of("c1");
-        List<SubscriptionName> subscriptions = someSubscriptions(10);
-        WorkloadConstraints constraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(1)
-                .withMaxSubscriptionsPerConsumer(100)
-                .build();
-        SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
-
-        // when
-        ImmutableList<String> extendedSupervisorsList = ImmutableList.of("c1", "c2", "c3", "c4", "c5");
-        SubscriptionAssignmentView stateAfterRebalance = workBalancer
-                .balance(subscriptions, extendedSupervisorsList, currentState, constraints)
-                .getAssignmentsView();
-
-        // then
-        assertThat(stateAfterRebalance.getAssignmentsForConsumerNode("c5")).hasSize(2);
-    }
-
-    @Test
-    public void shouldRemoveRedundantWorkAssignmentsToKeepWorkloadMinimal() {
-        // given
-        List<String> supervisors = ImmutableList.of("c1", "c2", "c3");
-        List<SubscriptionName> subscriptions = someSubscriptions(10);
-        WorkloadConstraints initialConstraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(3)
-                .withMaxSubscriptionsPerConsumer(100)
-                .build();
-        SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, initialConstraints);
-
-        // when
-        WorkloadConstraints newConstraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(3)
-                .withMaxSubscriptionsPerConsumer(100)
-                .withSubscriptionConstraints(Map.of(subscriptions.get(0), new Constraints(1)))
-                .build();
-        SubscriptionAssignmentView stateAfterRebalance = workBalancer
-                .balance(subscriptions, supervisors, currentState, newConstraints)
-                .getAssignmentsView();
-
-        // then
-        assertThat(stateAfterRebalance.getAssignmentsCountForSubscription(subscriptions.get(0))).isEqualTo(1);
-    }
-
-    @DataProvider
-    public static Object[][] subscriptionConstraints() {
-        return new Object[][] {
-                { 1 }, { 3 }
-        };
-    }
-
-    @Test
-    @UseDataProvider("subscriptionConstraints")
-    public void shouldAssignConsumersForSubscriptionsAccordingToConstraints(int requiredConsumersNumber) {
-        // given
-        SubscriptionAssignmentView initialState = new SubscriptionAssignmentView(emptyMap());
-
-        List<String> supervisors = ImmutableList.of("c1", "c2", "c3");
-        List<SubscriptionName> subscriptions = someSubscriptions(4);
-        SelectiveWorkBalancer workBalancer = new SelectiveWorkBalancer();
-        WorkloadConstraints subscriptionConstraints = WorkloadConstraints.builder()
-                .withActiveConsumers(supervisors.size())
-                .withConsumersPerSubscription(2)
-                .withMaxSubscriptionsPerConsumer(4)
-                .withSubscriptionConstraints(Map.of(subscriptions.get(0), new Constraints(requiredConsumersNumber)))
-                .build();
-
-        // when
-        SubscriptionAssignmentView state = workBalancer
-                .balance(subscriptions, supervisors, initialState, subscriptionConstraints)
-                .getAssignmentsView();
-
-        // then
-        assertThat(state.getAssignmentsForSubscription(subscriptions.get(0)).size()).isEqualTo(requiredConsumersNumber);
-        assertThat(state.getAssignmentsForSubscription(subscriptions.get(1)).size()).isEqualTo(2);
-        assertThat(state.getAssignmentsForSubscription(subscriptions.get(2)).size()).isEqualTo(2);
-        assertThat(state.getAssignmentsForSubscription(subscriptions.get(3)).size()).isEqualTo(2);
-    }
-
-    private SubscriptionAssignmentView initialState(List<SubscriptionName> subscriptions, List<String> supervisors,
-                                                    WorkloadConstraints workloadConstraints) {
-        return workBalancer.balance(subscriptions, supervisors, new SubscriptionAssignmentView(emptyMap()), workloadConstraints)
-                .getAssignmentsView();
-    }
-
-    private List<SubscriptionName> someSubscriptions(int count) {
-        return IntStream.range(0, count).mapToObj(i -> anySubscription()).collect(toList());
-    }
-
-    private List<String> someSupervisors(int count) {
-        return IntStream.range(0, count).mapToObj(i -> "c" + i).collect(toList());
-    }
-
-    private SubscriptionName anySubscription() {
-        return SubscriptionName.fromString("tech.topic$s" + UUID.randomUUID().getMostSignificantBits());
-    }
-
-    private void assertThatSubscriptionIsAssignedTo(SubscriptionAssignmentView work, SubscriptionName sub, String... nodeIds) {
-        assertThatSubscriptionIsAssignedTo(work, sub, asList(nodeIds));
-    }
-
-    private void assertThatSubscriptionIsAssignedTo(SubscriptionAssignmentView work, SubscriptionName sub, List<String> nodeIds) {
-        assertThat(work.getAssignmentsForSubscription(sub))
-                .extracting(SubscriptionAssignment::getConsumerNodeId)
-                .containsOnly(nodeIds.toArray(String[]::new));
-    }
+  private SelectiveWorkBalancer workBalancer = new SelectiveWorkBalancer();
+
+  @Test
+  public void shouldPerformSubscriptionsCleanup() {
+    // given
+    List<SubscriptionName> subscriptions = someSubscriptions(1);
+    List<String> supervisors = someSupervisors(1);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(2)
+            .build();
+    SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
+
+    // when
+    WorkBalancingResult target =
+        workBalancer.balance(emptyList(), supervisors, currentState, constraints);
+
+    // then
+    assertThat(target.getAssignmentsView().getSubscriptions()).isEmpty();
+    assertThat(currentState.deletions(target.getAssignmentsView()).getAllAssignments())
+        .hasSize(subscriptions.size());
+  }
+
+  @Test
+  public void shouldPerformSupervisorsCleanup() {
+    // given
+    List<String> supervisors = someSupervisors(2);
+    List<SubscriptionName> subscriptions = someSubscriptions(1);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(2)
+            .build();
+    SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
+
+    // when
+    supervisors.remove(1);
+    WorkBalancingResult work =
+        workBalancer.balance(subscriptions, supervisors, currentState, constraints);
+
+    // then
+    assertThat(currentState.deletions(work.getAssignmentsView()).getAllAssignments()).hasSize(1);
+    assertThatSubscriptionIsAssignedTo(
+        work.getAssignmentsView(), subscriptions.get(0), supervisors.get(0));
+  }
+
+  @Test
+  public void shouldBalanceWorkForSingleSubscription() {
+    // given
+    List<String> supervisors = someSupervisors(1);
+    List<SubscriptionName> subscriptions = someSubscriptions(1);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(2)
+            .build();
+
+    // when
+    SubscriptionAssignmentView view = initialState(subscriptions, supervisors, constraints);
+
+    // then
+    assertThatSubscriptionIsAssignedTo(view, subscriptions.get(0), supervisors.get(0));
+  }
+
+  @Test
+  public void shouldBalanceWorkForMultipleConsumersAndSingleSubscription() {
+    // given
+    List<String> supervisors = someSupervisors(2);
+    List<SubscriptionName> subscriptions = someSubscriptions(1);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(2)
+            .build();
+
+    // when
+    SubscriptionAssignmentView view = initialState(subscriptions, supervisors, constraints);
+
+    // then
+    assertThatSubscriptionIsAssignedTo(view, subscriptions.get(0), supervisors);
+  }
+
+  @Test
+  public void shouldBalanceWorkForMultipleConsumersAndMultipleSubscriptions() {
+    // given
+    List<String> supervisors = someSupervisors(2);
+    List<SubscriptionName> subscriptions = someSubscriptions(2);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(2)
+            .build();
+
+    // when
+    SubscriptionAssignmentView view = initialState(subscriptions, supervisors, constraints);
+
+    // then
+    assertThatSubscriptionIsAssignedTo(view, subscriptions.get(0), supervisors);
+    assertThatSubscriptionIsAssignedTo(view, subscriptions.get(1), supervisors);
+  }
+
+  @Test
+  public void shouldNotOverloadConsumers() {
+    // given
+    List<String> supervisors = someSupervisors(1);
+    List<SubscriptionName> subscriptions = someSubscriptions(3);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(2)
+            .build();
+
+    // when
+    SubscriptionAssignmentView view = initialState(subscriptions, supervisors, constraints);
+
+    // then
+    assertThat(view.getAssignmentsForConsumerNode(supervisors.get(0))).hasSize(2);
+  }
+
+  @Test
+  public void shouldRebalanceAfterConsumerDisappearing() {
+    // given
+    List<String> supervisors = ImmutableList.of("c1", "c2");
+    List<SubscriptionName> subscriptions = someSubscriptions(2);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(2)
+            .build();
+    SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
+
+    // when
+    List<String> extendedSupervisorsList = ImmutableList.of("c1", "c3");
+    SubscriptionAssignmentView stateAfterRebalance =
+        workBalancer
+            .balance(subscriptions, extendedSupervisorsList, currentState, constraints)
+            .getAssignmentsView();
+
+    // then
+    assertThat(stateAfterRebalance.getSubscriptionsForConsumerNode("c3"))
+        .containsOnly(subscriptions.get(0), subscriptions.get(1));
+  }
+
+  @Test
+  public void shouldAssignWorkToNewConsumersByWorkStealing() {
+    // given
+    List<String> supervisors = someSupervisors(2);
+    List<SubscriptionName> subscriptions = someSubscriptions(2);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(2)
+            .build();
+    SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
+
+    // when
+    supervisors.add("new-supervisor");
+    SubscriptionAssignmentView stateAfterRebalance =
+        workBalancer
+            .balance(subscriptions, supervisors, currentState, constraints)
+            .getAssignmentsView();
+
+    // then
+    assertThat(stateAfterRebalance.getAssignmentsForConsumerNode("new-supervisor").size())
+        .isGreaterThan(0);
+    assertThat(stateAfterRebalance.getAssignmentsForSubscription(subscriptions.get(0))).hasSize(2);
+    assertThat(stateAfterRebalance.getAssignmentsForSubscription(subscriptions.get(1))).hasSize(2);
+  }
+
+  @Test
+  public void shouldEquallyAssignWorkToConsumers() {
+    // given
+    List<String> supervisors = ImmutableList.of("c1", "c2");
+    List<SubscriptionName> subscriptions = someSubscriptions(50);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(200)
+            .build();
+    SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
+
+    // when
+    List<String> extendedSupervisorsList = ImmutableList.of("c1", "c2", "c3");
+    SubscriptionAssignmentView stateAfterRebalance =
+        workBalancer
+            .balance(subscriptions, extendedSupervisorsList, currentState, constraints)
+            .getAssignmentsView();
+
+    // then
+    assertThat(stateAfterRebalance.getAssignmentsForConsumerNode("c3")).hasSize(50 * 2 / 3);
+  }
+
+  @Test
+  public void shouldReassignWorkToFreeConsumers() {
+    // given
+    List<String> supervisors = ImmutableList.of("c1");
+    List<SubscriptionName> subscriptions = someSubscriptions(10);
+    WorkloadConstraints constraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(1)
+            .withMaxSubscriptionsPerConsumer(100)
+            .build();
+    SubscriptionAssignmentView currentState = initialState(subscriptions, supervisors, constraints);
+
+    // when
+    ImmutableList<String> extendedSupervisorsList = ImmutableList.of("c1", "c2", "c3", "c4", "c5");
+    SubscriptionAssignmentView stateAfterRebalance =
+        workBalancer
+            .balance(subscriptions, extendedSupervisorsList, currentState, constraints)
+            .getAssignmentsView();
+
+    // then
+    assertThat(stateAfterRebalance.getAssignmentsForConsumerNode("c5")).hasSize(2);
+  }
+
+  @Test
+  public void shouldRemoveRedundantWorkAssignmentsToKeepWorkloadMinimal() {
+    // given
+    List<String> supervisors = ImmutableList.of("c1", "c2", "c3");
+    List<SubscriptionName> subscriptions = someSubscriptions(10);
+    WorkloadConstraints initialConstraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(3)
+            .withMaxSubscriptionsPerConsumer(100)
+            .build();
+    SubscriptionAssignmentView currentState =
+        initialState(subscriptions, supervisors, initialConstraints);
+
+    // when
+    WorkloadConstraints newConstraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(3)
+            .withMaxSubscriptionsPerConsumer(100)
+            .withSubscriptionConstraints(Map.of(subscriptions.get(0), new Constraints(1)))
+            .build();
+    SubscriptionAssignmentView stateAfterRebalance =
+        workBalancer
+            .balance(subscriptions, supervisors, currentState, newConstraints)
+            .getAssignmentsView();
+
+    // then
+    assertThat(stateAfterRebalance.getAssignmentsCountForSubscription(subscriptions.get(0)))
+        .isEqualTo(1);
+  }
+
+  @DataProvider
+  public static Object[][] subscriptionConstraints() {
+    return new Object[][] {{1}, {3}};
+  }
+
+  @Test
+  @UseDataProvider("subscriptionConstraints")
+  public void shouldAssignConsumersForSubscriptionsAccordingToConstraints(
+      int requiredConsumersNumber) {
+    // given
+    SubscriptionAssignmentView initialState = new SubscriptionAssignmentView(emptyMap());
+
+    List<String> supervisors = ImmutableList.of("c1", "c2", "c3");
+    List<SubscriptionName> subscriptions = someSubscriptions(4);
+    SelectiveWorkBalancer workBalancer = new SelectiveWorkBalancer();
+    WorkloadConstraints subscriptionConstraints =
+        WorkloadConstraints.builder()
+            .withActiveConsumers(supervisors.size())
+            .withConsumersPerSubscription(2)
+            .withMaxSubscriptionsPerConsumer(4)
+            .withSubscriptionConstraints(
+                Map.of(subscriptions.get(0), new Constraints(requiredConsumersNumber)))
+            .build();
+
+    // when
+    SubscriptionAssignmentView state =
+        workBalancer
+            .balance(subscriptions, supervisors, initialState, subscriptionConstraints)
+            .getAssignmentsView();
+
+    // then
+    assertThat(state.getAssignmentsForSubscription(subscriptions.get(0)).size())
+        .isEqualTo(requiredConsumersNumber);
+    assertThat(state.getAssignmentsForSubscription(subscriptions.get(1)).size()).isEqualTo(2);
+    assertThat(state.getAssignmentsForSubscription(subscriptions.get(2)).size()).isEqualTo(2);
+    assertThat(state.getAssignmentsForSubscription(subscriptions.get(3)).size()).isEqualTo(2);
+  }
+
+  private SubscriptionAssignmentView initialState(
+      List<SubscriptionName> subscriptions,
+      List<String> supervisors,
+      WorkloadConstraints workloadConstraints) {
+    return workBalancer
+        .balance(
+            subscriptions,
+            supervisors,
+            new SubscriptionAssignmentView(emptyMap()),
+            workloadConstraints)
+        .getAssignmentsView();
+  }
+
+  private List<SubscriptionName> someSubscriptions(int count) {
+    return IntStream.range(0, count).mapToObj(i -> anySubscription()).collect(toList());
+  }
+
+  private List<String> someSupervisors(int count) {
+    return IntStream.range(0, count).mapToObj(i -> "c" + i).collect(toList());
+  }
+
+  private SubscriptionName anySubscription() {
+    return SubscriptionName.fromString("tech.topic$s" + UUID.randomUUID().getMostSignificantBits());
+  }
+
+  private void assertThatSubscriptionIsAssignedTo(
+      SubscriptionAssignmentView work, SubscriptionName sub, String... nodeIds) {
+    assertThatSubscriptionIsAssignedTo(work, sub, asList(nodeIds));
+  }
+
+  private void assertThatSubscriptionIsAssignedTo(
+      SubscriptionAssignmentView work, SubscriptionName sub, List<String> nodeIds) {
+    assertThat(work.getAssignmentsForSubscription(sub))
+        .extracting(SubscriptionAssignment::getConsumerNodeId)
+        .containsOnly(nodeIds.toArray(String[]::new));
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentViewBuilder.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentViewBuilder.java
index c0a6886681..0577910a94 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentViewBuilder.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentViewBuilder.java
@@ -1,29 +1,32 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.Collections;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class SubscriptionAssignmentViewBuilder {
 
-    private SubscriptionAssignmentView assignmentView;
+  private SubscriptionAssignmentView assignmentView;
 
-    public SubscriptionAssignmentViewBuilder() {
-        assignmentView = new SubscriptionAssignmentView(Collections.emptyMap());
-    }
+  public SubscriptionAssignmentViewBuilder() {
+    assignmentView = new SubscriptionAssignmentView(Collections.emptyMap());
+  }
 
-    public SubscriptionAssignmentView build() {
-        return SubscriptionAssignmentView.copyOf(assignmentView);
-    }
+  public SubscriptionAssignmentView build() {
+    return SubscriptionAssignmentView.copyOf(assignmentView);
+  }
 
-    public SubscriptionAssignmentViewBuilder withAssignment(SubscriptionName subscriptionName, String... consumerNodeIds) {
-        for (String consumerNodeId : consumerNodeIds) {
-            assignmentView = assignmentView.transform((view, transformer) -> {
+  public SubscriptionAssignmentViewBuilder withAssignment(
+      SubscriptionName subscriptionName, String... consumerNodeIds) {
+    for (String consumerNodeId : consumerNodeIds) {
+      assignmentView =
+          assignmentView.transform(
+              (view, transformer) -> {
                 transformer.addSubscription(subscriptionName);
                 transformer.addConsumerNode(consumerNodeId);
-                transformer.addAssignment(new SubscriptionAssignment(consumerNodeId, subscriptionName));
-            });
-        }
-        return this;
+                transformer.addAssignment(
+                    new SubscriptionAssignment(consumerNodeId, subscriptionName));
+              });
     }
+    return this;
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentViewTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentViewTest.java
index f9ad4e50cd..58909f41f2 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentViewTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/SubscriptionAssignmentViewTest.java
@@ -1,142 +1,146 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import org.junit.Test;
-import pl.allegro.tech.hermes.api.SubscriptionName;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public class SubscriptionAssignmentViewTest {
 
-    @Test
-    public void shouldNotDeleteFromEmptyView() {
-        // given
-        SubscriptionName s1 = anySubscriptionName();
-        SubscriptionAssignmentView current = emptySubscriptionAssignmentView();
-        SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
-
-        // when
-        SubscriptionAssignmentView deletions = current.deletions(target);
-
-        // then
-        assertThat(deletions.getSubscriptions()).isEmpty();
-    }
-
-    @Test
-    public void shouldAddToEmptyView() {
-        // given
-        SubscriptionName s1 = anySubscriptionName();
-        SubscriptionAssignmentView current = emptySubscriptionAssignmentView();
-        SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
-
-        // when
-        SubscriptionAssignmentView additions = current.additions(target);
-
-        // then
-        assertThat(additions).isEqualTo(target);
-    }
-
-    @Test
-    public void shouldNotAddToUnchangedView() {
-        // given
-        SubscriptionName s1 = anySubscriptionName();
-        SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
-        SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
-
-        // when
-        SubscriptionAssignmentView additions = current.additions(target);
-
-        // then
-        assertThat(additions.getSubscriptions()).isEmpty();
-    }
-
-    @Test
-    public void shouldNotDeleteFromUnchangedView() {
-        // given
-        SubscriptionName s1 = anySubscriptionName();
-        SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
-        SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
-
-        // when
-        SubscriptionAssignmentView deletions = current.deletions(target);
-
-        // then
-        assertThat(deletions.getSubscriptions()).isEmpty();
-    }
-
-    @Test
-    public void shouldAddAssignmentToExistingSubscription() {
-        // given
-        SubscriptionName s1 = anySubscriptionName();
-        SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
-        SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").withAssignment(s1, "c2").build();
-
-        // when
-        SubscriptionAssignmentView additions = current.additions(target);
-
-        // then
-        assertThat(additions.getAssignmentsForSubscription(s1)).containsOnly(assignment(s1, "c2"));
-    }
-
-    @Test
-    public void shouldDeleteAssignmentFromExistingSubscription() {
-        // given
-        SubscriptionName s1 = anySubscriptionName();
-        SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").withAssignment(s1, "c2").build();
-        SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
-
-        // when
-        SubscriptionAssignmentView deletions = current.deletions(target);
-
-        // then
-        assertThat(deletions.getAssignmentsForSubscription(s1)).containsOnly(assignment(s1, "c2"));
-    }
-
-    @Test
-    public void shouldAddNewSubscription() {
-        // given
-        SubscriptionName s1 = anySubscriptionName();
-        SubscriptionName s2 = anySubscriptionName();
-        SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
-        SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").withAssignment(s2, "c1").build();
-
-        // when
-        SubscriptionAssignmentView additions = current.additions(target);
-
-        // then
-        assertThat(additions.getSubscriptions()).containsOnly(s2);
-        assertThat(additions.getAssignmentsForSubscription(s2)).containsOnly(assignment(s2, "c1"));
-    }
-
-    @Test
-    public void shouldDeleteOldSubscription() {
-        // given
-        SubscriptionName s1 = anySubscriptionName();
-        SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
-        SubscriptionAssignmentView target = emptySubscriptionAssignmentView();
-
-        // when
-        SubscriptionAssignmentView deletions = current.deletions(target);
-
-        // then
-        assertThat(deletions.getSubscriptions()).isEqualTo(current.getSubscriptions());
-        assertThat(deletions.getAssignmentsForSubscription(s1)).isEqualTo(current.getAssignmentsForSubscription(s1));
-    }
-
-    private SubscriptionAssignment assignment(SubscriptionName s1, String supervisorId) {
-        return new SubscriptionAssignment(supervisorId, s1);
-    }
-
-    private SubscriptionName anySubscriptionName() {
-        return SubscriptionName.fromString("com.example.topic$" + Math.abs(UUID.randomUUID().getMostSignificantBits()));
-    }
-
-    private static SubscriptionAssignmentView emptySubscriptionAssignmentView() {
-        return assignmentView().build();
-    }
-
-    private static SubscriptionAssignmentViewBuilder assignmentView() {
-        return new SubscriptionAssignmentViewBuilder();
-    }
+  @Test
+  public void shouldNotDeleteFromEmptyView() {
+    // given
+    SubscriptionName s1 = anySubscriptionName();
+    SubscriptionAssignmentView current = emptySubscriptionAssignmentView();
+    SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
+
+    // when
+    SubscriptionAssignmentView deletions = current.deletions(target);
+
+    // then
+    assertThat(deletions.getSubscriptions()).isEmpty();
+  }
+
+  @Test
+  public void shouldAddToEmptyView() {
+    // given
+    SubscriptionName s1 = anySubscriptionName();
+    SubscriptionAssignmentView current = emptySubscriptionAssignmentView();
+    SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
+
+    // when
+    SubscriptionAssignmentView additions = current.additions(target);
+
+    // then
+    assertThat(additions).isEqualTo(target);
+  }
+
+  @Test
+  public void shouldNotAddToUnchangedView() {
+    // given
+    SubscriptionName s1 = anySubscriptionName();
+    SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
+    SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
+
+    // when
+    SubscriptionAssignmentView additions = current.additions(target);
+
+    // then
+    assertThat(additions.getSubscriptions()).isEmpty();
+  }
+
+  @Test
+  public void shouldNotDeleteFromUnchangedView() {
+    // given
+    SubscriptionName s1 = anySubscriptionName();
+    SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
+    SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
+
+    // when
+    SubscriptionAssignmentView deletions = current.deletions(target);
+
+    // then
+    assertThat(deletions.getSubscriptions()).isEmpty();
+  }
+
+  @Test
+  public void shouldAddAssignmentToExistingSubscription() {
+    // given
+    SubscriptionName s1 = anySubscriptionName();
+    SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
+    SubscriptionAssignmentView target =
+        assignmentView().withAssignment(s1, "c1").withAssignment(s1, "c2").build();
+
+    // when
+    SubscriptionAssignmentView additions = current.additions(target);
+
+    // then
+    assertThat(additions.getAssignmentsForSubscription(s1)).containsOnly(assignment(s1, "c2"));
+  }
+
+  @Test
+  public void shouldDeleteAssignmentFromExistingSubscription() {
+    // given
+    SubscriptionName s1 = anySubscriptionName();
+    SubscriptionAssignmentView current =
+        assignmentView().withAssignment(s1, "c1").withAssignment(s1, "c2").build();
+    SubscriptionAssignmentView target = assignmentView().withAssignment(s1, "c1").build();
+
+    // when
+    SubscriptionAssignmentView deletions = current.deletions(target);
+
+    // then
+    assertThat(deletions.getAssignmentsForSubscription(s1)).containsOnly(assignment(s1, "c2"));
+  }
+
+  @Test
+  public void shouldAddNewSubscription() {
+    // given
+    SubscriptionName s1 = anySubscriptionName();
+    SubscriptionName s2 = anySubscriptionName();
+    SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
+    SubscriptionAssignmentView target =
+        assignmentView().withAssignment(s1, "c1").withAssignment(s2, "c1").build();
+
+    // when
+    SubscriptionAssignmentView additions = current.additions(target);
+
+    // then
+    assertThat(additions.getSubscriptions()).containsOnly(s2);
+    assertThat(additions.getAssignmentsForSubscription(s2)).containsOnly(assignment(s2, "c1"));
+  }
+
+  @Test
+  public void shouldDeleteOldSubscription() {
+    // given
+    SubscriptionName s1 = anySubscriptionName();
+    SubscriptionAssignmentView current = assignmentView().withAssignment(s1, "c1").build();
+    SubscriptionAssignmentView target = emptySubscriptionAssignmentView();
+
+    // when
+    SubscriptionAssignmentView deletions = current.deletions(target);
+
+    // then
+    assertThat(deletions.getSubscriptions()).isEqualTo(current.getSubscriptions());
+    assertThat(deletions.getAssignmentsForSubscription(s1))
+        .isEqualTo(current.getAssignmentsForSubscription(s1));
+  }
+
+  private SubscriptionAssignment assignment(SubscriptionName s1, String supervisorId) {
+    return new SubscriptionAssignment(supervisorId, s1);
+  }
+
+  private SubscriptionName anySubscriptionName() {
+    return SubscriptionName.fromString(
+        "com.example.topic$" + Math.abs(UUID.randomUUID().getMostSignificantBits()));
+  }
+
+  private static SubscriptionAssignmentView emptySubscriptionAssignmentView() {
+    return assignmentView().build();
+  }
+
+  private static SubscriptionAssignmentViewBuilder assignmentView() {
+    return new SubscriptionAssignmentViewBuilder();
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/TestSubscriptionIds.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/TestSubscriptionIds.java
index 88e31bdf09..be1b779548 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/TestSubscriptionIds.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/TestSubscriptionIds.java
@@ -1,38 +1,36 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
-import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
+import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionIds;
 
 public class TestSubscriptionIds implements SubscriptionIds {
 
-    private final Map<SubscriptionName, SubscriptionId> nameToIdMap = new ConcurrentHashMap<>();
-    private final Map<Long, SubscriptionId> valueToIdMap = new ConcurrentHashMap<>();
+  private final Map<SubscriptionName, SubscriptionId> nameToIdMap = new ConcurrentHashMap<>();
+  private final Map<Long, SubscriptionId> valueToIdMap = new ConcurrentHashMap<>();
 
-    public TestSubscriptionIds(List<SubscriptionId> ids) {
-        ids.forEach(id -> {
-            nameToIdMap.put(id.getSubscriptionName(), id);
-            valueToIdMap.put(id.getValue(), id);
+  public TestSubscriptionIds(List<SubscriptionId> ids) {
+    ids.forEach(
+        id -> {
+          nameToIdMap.put(id.getSubscriptionName(), id);
+          valueToIdMap.put(id.getValue(), id);
         });
-    }
-
-    @Override
-    public Optional<SubscriptionId> getSubscriptionId(SubscriptionName subscriptionName) {
-        return Optional.ofNullable(nameToIdMap.get(subscriptionName));
-    }
+  }
 
-    @Override
-    public Optional<SubscriptionId> getSubscriptionId(long id) {
-        return Optional.ofNullable(valueToIdMap.get(id));
-    }
+  @Override
+  public Optional<SubscriptionId> getSubscriptionId(SubscriptionName subscriptionName) {
+    return Optional.ofNullable(nameToIdMap.get(subscriptionName));
+  }
 
-    @Override
-    public void start() {
+  @Override
+  public Optional<SubscriptionId> getSubscriptionId(long id) {
+    return Optional.ofNullable(valueToIdMap.get(id));
+  }
 
-    }
+  @Override
+  public void start() {}
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadRegistryTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadRegistryTest.java
index 6362dabe33..c30556861d 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadRegistryTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadRegistryTest.java
@@ -1,6 +1,12 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import com.google.common.collect.ImmutableList;
+import java.util.Collections;
+import java.util.Set;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -14,188 +20,202 @@
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 import pl.allegro.tech.hermes.test.helper.zookeeper.ZookeeperBaseTest;
 
-import java.util.Collections;
-import java.util.Set;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class WorkloadRegistryTest extends ZookeeperBaseTest {
 
-    private static final SubscriptionName subscription1 = SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription");
-    private static final SubscriptionName subscription2 = SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription2");
-    private static final SubscriptionName subscription3 = SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription3");
-
-    private static final String consumer1 = "consumer1";
-    private static final String consumer2 = "consumer2";
-    private static final String clusterName = new KafkaProperties().getClusterName();
-
-    private static final ZookeeperPaths zookeeperPaths = new ZookeeperPaths("/hermes");
-
-    private static final WorkloadRegistryPaths registryPaths =
-            new WorkloadRegistryPaths(zookeeperPaths, clusterName);
-
-    private static final SubscriptionIds subscriptionIds =
-            new TestSubscriptionIds(ImmutableList.of(
-                    SubscriptionId.from(subscription1, 1L),
-                    SubscriptionId.from(subscription2, 2L),
-                    SubscriptionId.from(subscription2, 3L)
-            ));
-
-    private static final ConsumerAssignmentRegistry registry =
-        new ConsumerAssignmentRegistry(
-            zookeeperClient,
-            new WorkloadProperties().getRegistryBinaryEncoderAssignmentsBufferSizeBytes(),
-            clusterName,
-            zookeeperPaths,
-            subscriptionIds
-        );
-
-    private static final KafkaProperties kafkaProperties = new KafkaProperties();
-
-    private static final String cluster = kafkaProperties.getClusterName();
-
-    private static final ConsumerAssignmentCache assignmentCacheOfConsumer1 =
-            new ConsumerAssignmentCache(zookeeperClient, consumer1, cluster, zookeeperPaths, subscriptionIds);
-
-    private static final ConsumerAssignmentCache assignmentCacheOfConsumer2 =
-            new ConsumerAssignmentCache(zookeeperClient, consumer2, cluster, zookeeperPaths, subscriptionIds);
-
-    private static final ConsumerNodesRegistry consumerNodesRegistry = mock(ConsumerNodesRegistry.class);
-
-    private static final ClusterAssignmentCache clusterAssignmentCache =
-        new ClusterAssignmentCache(zookeeperClient, cluster, zookeeperPaths, subscriptionIds, consumerNodesRegistry);
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        assignmentCacheOfConsumer1.start();
-        assignmentCacheOfConsumer2.start();
-    }
-
-    @Before
-    public void beforeEach() {
-        when(consumerNodesRegistry.listConsumerNodes()).thenReturn(ImmutableList.of(consumer1, consumer2));
-    }
-
-    @AfterClass
-    public static void cleanup() throws Exception {
-        assignmentCacheOfConsumer1.stop();
-        assignmentCacheOfConsumer2.stop();
-    }
-
-    @Test
-    public void shouldSaveAssignmentsAndNotifyConsumers() {
-        // when
-        registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
-        registry.updateAssignments(consumer2, Set.of(subscription1));
-
-        wait.untilZookeeperPathIsCreated(registryPaths.consumerWorkloadPath(consumer1));
-        wait.untilZookeeperPathIsCreated(registryPaths.consumerWorkloadPath(consumer2));
-
-        // then
-        assertThat(assignmentCacheOfConsumer1.isAssignedTo(subscription1)).isTrue();
-        assertThat(assignmentCacheOfConsumer1.isAssignedTo(subscription2)).isTrue();
-        assertThat(assignmentCacheOfConsumer1.isAssignedTo(subscription3)).isFalse();
-
-        assertThat(assignmentCacheOfConsumer2.isAssignedTo(subscription1)).isTrue();
-        assertThat(assignmentCacheOfConsumer2.isAssignedTo(subscription2)).isFalse();
-    }
-
-    @Test
-    public void shouldSaveAssignmentsAndReadThroughClusterAssignmentCache() {
-        // when
-        registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
-        registry.updateAssignments(consumer2, Set.of(subscription1));
-
-        // and
-        clusterAssignmentCache.refresh();
-
-        // then
-        assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer1, consumer2);
-        assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer1)).containsOnly(subscription1, subscription2);
-        assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer2)).containsOnly(subscription1);
-        assertThat(clusterAssignmentCache.getSubscriptionConsumers().get(subscription1)).containsOnly(consumer1, consumer2);
-        assertThat(clusterAssignmentCache.getSubscriptionConsumers().get(subscription2)).containsOnly(consumer1);
-        assertThat(clusterAssignmentCache.getSubscriptionConsumers().get(subscription3)).isNull();
-        assertThat(clusterAssignmentCache.isAssignedTo(consumer1, subscription1)).isTrue();
-        assertThat(clusterAssignmentCache.isAssignedTo(consumer1, subscription3)).isFalse();
-    }
-
-    @Test
-    public void shouldApplyChangesToAssignments() {
-        // when
-        registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
-        registry.updateAssignments(consumer2, Set.of(subscription1));
-
-        // and
-        clusterAssignmentCache.refresh();
-
-        // then
-        assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer1, consumer2);
-        assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer1)).containsOnly(subscription1, subscription2);
-        assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer2)).containsOnly(subscription1);
-        assertThat(clusterAssignmentCache.getSubscriptionConsumers().get(subscription1)).containsOnly(consumer1, consumer2);
-
-        // when
-        registry.updateAssignments(consumer1, Set.of(subscription2));
-        registry.updateAssignments(consumer2, Set.of(subscription1));
-
-        // and
-        clusterAssignmentCache.refresh();
-
-        // then
-        assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer1, consumer2);
-        assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer1)).containsOnly(subscription2);
-        assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer2)).containsOnly(subscription1);
-    }
-
-    @Test
-    public void shouldCleanStaleNodesFromRegistryOnRefresh() {
-        // when
-        registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
-        registry.updateAssignments(consumer2, Set.of(subscription1));
-
-        // and
-        clusterAssignmentCache.refresh();
-
-        // then
-        assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer1, consumer2);
-
-        // when
-        when(consumerNodesRegistry.listConsumerNodes()).thenReturn(Collections.singletonList(consumer2));
-
-        // and
-        clusterAssignmentCache.refresh();
-
-        // then
-        assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer2);
-    }
-
-    @Test
-    public void shouldCleanRegistryFromStaleAssignments() {
-        // when
-        registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
-        registry.updateAssignments(consumer2, Set.of(subscription1));
-
-        // then
-        wait.untilZookeeperPathIsCreated(registryPaths.consumerWorkloadPath(consumer1));
-        wait.untilZookeeperPathIsCreated(registryPaths.consumerWorkloadPath(consumer2));
-
-        // when
-        clusterAssignmentCache.refresh();
-
-        // then
-        assertThat(clusterAssignmentCache.createSnapshot().getAssignmentsCountForConsumerNode(consumer1)).isEqualTo(2);
-
-        // when subscription2 is removed
-        registry.updateAssignments(consumer1, Set.of(subscription1));
-        registry.updateAssignments(consumer2, Set.of(subscription1));
-
-        // and
-        clusterAssignmentCache.refresh();
-
-        // then
-        assertThat(clusterAssignmentCache.createSnapshot().getAssignmentsCountForConsumerNode(consumer1)).isEqualTo(1);
-    }
+  private static final SubscriptionName subscription1 =
+      SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription");
+  private static final SubscriptionName subscription2 =
+      SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription2");
+  private static final SubscriptionName subscription3 =
+      SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription3");
+
+  private static final String consumer1 = "consumer1";
+  private static final String consumer2 = "consumer2";
+  private static final String clusterName = new KafkaProperties().getClusterName();
+
+  private static final ZookeeperPaths zookeeperPaths = new ZookeeperPaths("/hermes");
+
+  private static final WorkloadRegistryPaths registryPaths =
+      new WorkloadRegistryPaths(zookeeperPaths, clusterName);
+
+  private static final SubscriptionIds subscriptionIds =
+      new TestSubscriptionIds(
+          ImmutableList.of(
+              SubscriptionId.from(subscription1, 1L),
+              SubscriptionId.from(subscription2, 2L),
+              SubscriptionId.from(subscription2, 3L)));
+
+  private static final ConsumerAssignmentRegistry registry =
+      new ConsumerAssignmentRegistry(
+          zookeeperClient,
+          new WorkloadProperties().getRegistryBinaryEncoderAssignmentsBufferSizeBytes(),
+          clusterName,
+          zookeeperPaths,
+          subscriptionIds);
+
+  private static final KafkaProperties kafkaProperties = new KafkaProperties();
+
+  private static final String cluster = kafkaProperties.getClusterName();
+
+  private static final ConsumerAssignmentCache assignmentCacheOfConsumer1 =
+      new ConsumerAssignmentCache(
+          zookeeperClient, consumer1, cluster, zookeeperPaths, subscriptionIds);
+
+  private static final ConsumerAssignmentCache assignmentCacheOfConsumer2 =
+      new ConsumerAssignmentCache(
+          zookeeperClient, consumer2, cluster, zookeeperPaths, subscriptionIds);
+
+  private static final ConsumerNodesRegistry consumerNodesRegistry =
+      mock(ConsumerNodesRegistry.class);
+
+  private static final ClusterAssignmentCache clusterAssignmentCache =
+      new ClusterAssignmentCache(
+          zookeeperClient, cluster, zookeeperPaths, subscriptionIds, consumerNodesRegistry);
+
+  @BeforeClass
+  public static void setUp() throws Exception {
+    assignmentCacheOfConsumer1.start();
+    assignmentCacheOfConsumer2.start();
+  }
+
+  @Before
+  public void beforeEach() {
+    when(consumerNodesRegistry.listConsumerNodes())
+        .thenReturn(ImmutableList.of(consumer1, consumer2));
+  }
+
+  @AfterClass
+  public static void cleanup() throws Exception {
+    assignmentCacheOfConsumer1.stop();
+    assignmentCacheOfConsumer2.stop();
+  }
+
+  @Test
+  public void shouldSaveAssignmentsAndNotifyConsumers() {
+    // when
+    registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
+    registry.updateAssignments(consumer2, Set.of(subscription1));
+
+    wait.untilZookeeperPathIsCreated(registryPaths.consumerWorkloadPath(consumer1));
+    wait.untilZookeeperPathIsCreated(registryPaths.consumerWorkloadPath(consumer2));
+
+    // then
+    assertThat(assignmentCacheOfConsumer1.isAssignedTo(subscription1)).isTrue();
+    assertThat(assignmentCacheOfConsumer1.isAssignedTo(subscription2)).isTrue();
+    assertThat(assignmentCacheOfConsumer1.isAssignedTo(subscription3)).isFalse();
+
+    assertThat(assignmentCacheOfConsumer2.isAssignedTo(subscription1)).isTrue();
+    assertThat(assignmentCacheOfConsumer2.isAssignedTo(subscription2)).isFalse();
+  }
+
+  @Test
+  public void shouldSaveAssignmentsAndReadThroughClusterAssignmentCache() {
+    // when
+    registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
+    registry.updateAssignments(consumer2, Set.of(subscription1));
+
+    // and
+    clusterAssignmentCache.refresh();
+
+    // then
+    assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer1, consumer2);
+    assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer1))
+        .containsOnly(subscription1, subscription2);
+    assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer2))
+        .containsOnly(subscription1);
+    assertThat(clusterAssignmentCache.getSubscriptionConsumers().get(subscription1))
+        .containsOnly(consumer1, consumer2);
+    assertThat(clusterAssignmentCache.getSubscriptionConsumers().get(subscription2))
+        .containsOnly(consumer1);
+    assertThat(clusterAssignmentCache.getSubscriptionConsumers().get(subscription3)).isNull();
+    assertThat(clusterAssignmentCache.isAssignedTo(consumer1, subscription1)).isTrue();
+    assertThat(clusterAssignmentCache.isAssignedTo(consumer1, subscription3)).isFalse();
+  }
+
+  @Test
+  public void shouldApplyChangesToAssignments() {
+    // when
+    registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
+    registry.updateAssignments(consumer2, Set.of(subscription1));
+
+    // and
+    clusterAssignmentCache.refresh();
+
+    // then
+    assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer1, consumer2);
+    assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer1))
+        .containsOnly(subscription1, subscription2);
+    assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer2))
+        .containsOnly(subscription1);
+    assertThat(clusterAssignmentCache.getSubscriptionConsumers().get(subscription1))
+        .containsOnly(consumer1, consumer2);
+
+    // when
+    registry.updateAssignments(consumer1, Set.of(subscription2));
+    registry.updateAssignments(consumer2, Set.of(subscription1));
+
+    // and
+    clusterAssignmentCache.refresh();
+
+    // then
+    assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer1, consumer2);
+    assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer1))
+        .containsOnly(subscription2);
+    assertThat(clusterAssignmentCache.getConsumerSubscriptions(consumer2))
+        .containsOnly(subscription1);
+  }
+
+  @Test
+  public void shouldCleanStaleNodesFromRegistryOnRefresh() {
+    // when
+    registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
+    registry.updateAssignments(consumer2, Set.of(subscription1));
+
+    // and
+    clusterAssignmentCache.refresh();
+
+    // then
+    assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer1, consumer2);
+
+    // when
+    when(consumerNodesRegistry.listConsumerNodes())
+        .thenReturn(Collections.singletonList(consumer2));
+
+    // and
+    clusterAssignmentCache.refresh();
+
+    // then
+    assertThat(clusterAssignmentCache.getAssignedConsumers()).containsOnly(consumer2);
+  }
+
+  @Test
+  public void shouldCleanRegistryFromStaleAssignments() {
+    // when
+    registry.updateAssignments(consumer1, Set.of(subscription1, subscription2));
+    registry.updateAssignments(consumer2, Set.of(subscription1));
+
+    // then
+    wait.untilZookeeperPathIsCreated(registryPaths.consumerWorkloadPath(consumer1));
+    wait.untilZookeeperPathIsCreated(registryPaths.consumerWorkloadPath(consumer2));
+
+    // when
+    clusterAssignmentCache.refresh();
+
+    // then
+    assertThat(
+            clusterAssignmentCache.createSnapshot().getAssignmentsCountForConsumerNode(consumer1))
+        .isEqualTo(2);
+
+    // when subscription2 is removed
+    registry.updateAssignments(consumer1, Set.of(subscription1));
+    registry.updateAssignments(consumer2, Set.of(subscription1));
+
+    // and
+    clusterAssignmentCache.refresh();
+
+    // then
+    assertThat(
+            clusterAssignmentCache.createSnapshot().getAssignmentsCountForConsumerNode(consumer1))
+        .isEqualTo(1);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadSupervisorIntegrationTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadSupervisorIntegrationTest.java
index 4c510823ef..02323f0cc4 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadSupervisorIntegrationTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/WorkloadSupervisorIntegrationTest.java
@@ -1,5 +1,16 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+
+import java.time.Duration;
+import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -11,155 +22,144 @@
 import pl.allegro.tech.hermes.consumers.supervisor.monitor.ConsumersRuntimeMonitor;
 import pl.allegro.tech.hermes.test.helper.zookeeper.ZookeeperBaseTest;
 
-import java.time.Duration;
-import java.util.List;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Duration.FIVE_SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
 public class WorkloadSupervisorIntegrationTest extends ZookeeperBaseTest {
 
-    private static final ConsumerTestRuntimeEnvironment runtime = new ConsumerTestRuntimeEnvironment(ZookeeperBaseTest::newClient);
+  private static final ConsumerTestRuntimeEnvironment runtime =
+      new ConsumerTestRuntimeEnvironment(ZookeeperBaseTest::newClient);
 
-    @Before
-    public void setup() throws Exception {
-        runtime.killAll();
-        deleteData("/hermes");
-        createPath("/hermes/groups");
-    }
+  @Before
+  public void setup() throws Exception {
+    runtime.cleanState();
+    deleteData("/hermes");
+    createPath("/hermes/groups");
+  }
 
-    @Test
-    public void shouldRegisterConsumerInActiveNodesRegistryOnStartup() throws Exception {
-        // when
-        WorkloadSupervisor controller = runtime.spawnConsumer();
+  @Test
+  public void shouldRegisterConsumerInActiveNodesRegistryOnStartup() throws Exception {
+    // when
+    WorkloadSupervisor controller = runtime.spawnConsumer();
 
-        // then
-        runtime.waitForRegistration(controller.consumerId());
+    // then
+    runtime.waitForRegistration(controller.consumerId());
 
-        shutdown(controller);
-    }
+    shutdown(controller);
+  }
 
-    @Test
-    public void shouldElectOnlyOneLeaderFromRegisteredConsumers() throws Exception {
-        // when
-        List<WorkloadSupervisor> supervisors = runtime.spawnConsumers(3);
+  @Test
+  public void shouldElectOnlyOneLeaderFromRegisteredConsumers() throws Exception {
+    // when
+    List<WorkloadSupervisor> supervisors = runtime.spawnConsumers(3);
 
-        // then
-        assertThat(supervisors.stream().filter(WorkloadSupervisor::isLeader).count()).isEqualTo(1);
+    // then
+    assertThat(supervisors.stream().filter(WorkloadSupervisor::isLeader).count()).isEqualTo(1);
 
-        shutdown(supervisors);
-    }
+    shutdown(supervisors);
+  }
 
-    @Test
-    public void shouldElectNewLeaderAfterShutdown() {
-        // given
-        List<WorkloadSupervisor> supervisors = runtime.spawnConsumers(3);
-        WorkloadSupervisor leader = runtime.findLeader(supervisors);
+  @Test
+  public void shouldElectNewLeaderAfterShutdown() {
+    // given
+    List<WorkloadSupervisor> supervisors = runtime.spawnConsumers(3);
+    WorkloadSupervisor leader = runtime.findLeader(supervisors);
 
-        // when
-        runtime.kill(leader);
+    // when
+    runtime.kill(leader);
 
-        // then
-        await().atMost(adjust(FIVE_SECONDS)).until(() -> runtime.findLeader(supervisors) != leader);
-        await().atMost(adjust(FIVE_SECONDS)).until(() -> !leader.isLeader());
-    }
+    // then
+    await()
+        .atMost(adjust(Duration.ofSeconds(5)))
+        .until(() -> runtime.findLeader(supervisors) != leader);
+    await().atMost(adjust(Duration.ofSeconds(5))).until(() -> !leader.isLeader());
+  }
 
-    @Test
-    public void shouldAssignConsumerToSubscription() throws Exception {
-        // given
-        WorkloadSupervisor node = runtime.spawnConsumer();
+  @Test
+  public void shouldAssignConsumerToSubscription() throws Exception {
+    // given
+    WorkloadSupervisor node = runtime.spawnConsumer();
 
-        // when
-        SubscriptionName subscription = runtime.createSubscription();
+    // when
+    SubscriptionName subscription = runtime.createSubscription();
 
-        // then
-        runtime.awaitUntilAssignmentExists(subscription, node);
+    // then
+    runtime.awaitUntilAssignmentExists(subscription, node);
 
-        shutdown(node);
-    }
+    shutdown(node);
+  }
 
-    @Test
-    public void shouldAssignSubscriptionToMultipleConsumers() throws Exception {
-        // given
-        List<WorkloadSupervisor> nodes = runtime.spawnConsumers(2);
+  @Test
+  public void shouldAssignSubscriptionToMultipleConsumers() throws Exception {
+    // given
+    List<WorkloadSupervisor> nodes = runtime.spawnConsumers(2);
 
-        // when
-        SubscriptionName subscription = runtime.createSubscription();
+    // when
+    SubscriptionName subscription = runtime.createSubscription();
 
-        // then
-        nodes.forEach(node -> runtime.awaitUntilAssignmentExists(subscription, node));
+    // then
+    nodes.forEach(node -> runtime.awaitUntilAssignmentExists(subscription, node));
 
-        shutdown(nodes);
-    }
+    shutdown(nodes);
+  }
 
-    @Test
-    public void shouldAssignConsumerToMultipleSubscriptions() throws Exception {
-        // given
-        WorkloadSupervisor node = runtime.spawnConsumer();
+  @Test
+  public void shouldAssignConsumerToMultipleSubscriptions() throws Exception {
+    // given
+    WorkloadSupervisor node = runtime.spawnConsumer();
 
-        // when
-        List<SubscriptionName> subscriptions = runtime.createSubscription(2);
+    // when
+    List<SubscriptionName> subscriptions = runtime.createSubscription(2);
 
-        // then
-        subscriptions.forEach(subscription -> runtime.awaitUntilAssignmentExists(subscription, node));
+    // then
+    subscriptions.forEach(subscription -> runtime.awaitUntilAssignmentExists(subscription, node));
 
-        shutdown(node);
-    }
+    shutdown(node);
+  }
 
-    @Test
-    public void shouldRecreateMissingConsumer() throws Exception {
-        // given
-        ConsumerFactory consumerFactory = mock(ConsumerFactory.class);
+  @Test
+  public void shouldRecreateMissingConsumer() throws Exception {
+    // given
+    ConsumerFactory consumerFactory = mock(ConsumerFactory.class);
 
-        when(consumerFactory.createConsumer(any(Subscription.class)))
-                .thenThrow(
-                        new InternalProcessingException("failed to create consumer"))
-                .thenReturn(
-                        mock(SerialConsumer.class));
+    when(consumerFactory.createConsumer(any(Subscription.class)))
+        .thenThrow(new InternalProcessingException("failed to create consumer"))
+        .thenReturn(mock(SerialConsumer.class));
 
-        String consumerId = "consumer";
+    String consumerId = "consumer";
 
+    ConsumersSupervisor supervisor = runtime.consumersSupervisor(consumerFactory);
+    WorkloadSupervisor node = runtime.spawnConsumer(consumerId, supervisor);
 
-        ConsumersSupervisor supervisor = runtime.consumersSupervisor(consumerFactory);
-        WorkloadSupervisor node = runtime.spawnConsumer(consumerId, supervisor);
+    runtime.awaitUntilAssignmentExists(runtime.createSubscription(), node);
 
-        runtime.awaitUntilAssignmentExists(runtime.createSubscription(), node);
+    // when
+    ConsumersRuntimeMonitor monitor =
+        runtime.monitor(consumerId, supervisor, node, Duration.ofSeconds(1));
+    monitor.start();
 
-        // when
-        ConsumersRuntimeMonitor monitor = runtime.monitor(consumerId, supervisor, node, Duration.ofSeconds(1));
-        monitor.start();
+    // then
+    await()
+        .atMost(Duration.ofSeconds(5))
+        .untilAsserted(() -> verify(consumerFactory, times(2)).createConsumer(any()));
 
-        // then
-        await().atMost(FIVE_SECONDS).until(
-                () -> verify(consumerFactory, times(2)).createConsumer(any()));
+    shutdown(supervisor);
+    shutdown(node);
+    shutdown(monitor);
+  }
 
-        shutdown(supervisor);
-        shutdown(node);
-        shutdown(monitor);
-    }
+  private void shutdown(WorkloadSupervisor workloadSupervisor) throws Exception {
+    workloadSupervisor.shutdown();
+  }
 
-    private void shutdown(WorkloadSupervisor workloadSupervisor) throws Exception {
-        workloadSupervisor.shutdown();
+  private void shutdown(List<WorkloadSupervisor> workloadSupervisors) throws Exception {
+    for (WorkloadSupervisor s : workloadSupervisors) {
+      s.shutdown();
     }
+  }
 
-    private void shutdown(List<WorkloadSupervisor> workloadSupervisors) throws Exception {
-        for (WorkloadSupervisor s : workloadSupervisors) {
-            s.shutdown();
-        }
-    }
+  private void shutdown(ConsumersRuntimeMonitor monitor) throws InterruptedException {
+    monitor.shutdown();
+  }
 
-    private void shutdown(ConsumersRuntimeMonitor monitor) throws InterruptedException {
-        monitor.shutdown();
-    }
-
-    private void shutdown(ConsumersSupervisor supervisor) throws InterruptedException {
-        supervisor.shutdown();
-    }
+  private void shutdown(ConsumersSupervisor supervisor) throws InterruptedException {
+    supervisor.shutdown();
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperConsumerNodeLoadRegistryTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperConsumerNodeLoadRegistryTest.java
index 5803f557d7..19dc4cc2bc 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperConsumerNodeLoadRegistryTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperConsumerNodeLoadRegistryTest.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.SubscriptionName.fromString;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -15,97 +21,96 @@
 import pl.allegro.tech.hermes.test.helper.time.ModifiableClock;
 import pl.allegro.tech.hermes.test.helper.zookeeper.ZookeeperBaseTest;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.SubscriptionName.fromString;
-
 public class ZookeeperConsumerNodeLoadRegistryTest extends ZookeeperBaseTest {
 
-    private final SubscriptionName firstSubscription = fromString("pl.allegro.tech.hermes$testSubscription");
-    private final SubscriptionName secondSubscription = fromString("pl.allegro.tech.hermes$testSubscription2");
-    private final SubscriptionIds subscriptionIds = new TestSubscriptionIds(List.of(
-            SubscriptionId.from(firstSubscription, 1L),
-            SubscriptionId.from(secondSubscription, 2L)
-    ));
-    private final String currentConsumerId = "consumer-id";
-    private final ManuallyTriggeredScheduledExecutorService scheduledExecutorService = new ManuallyTriggeredScheduledExecutorService();
-    private final ModifiableClock clock = new ModifiableClock();
-    private final ZookeeperConsumerNodeLoadRegistry registry = new ZookeeperConsumerNodeLoadRegistry(
-            zookeeperClient,
-            subscriptionIds,
-            new ZookeeperPaths("/hermes"),
-            currentConsumerId,
-            "kafka-cluster",
-            Duration.ofMillis(50),
-            new TestExecutorServiceFactory(scheduledExecutorService),
-            clock,
-            TestMetricsFacadeFactory.create(),
-            100_000
-    );
-
-    @Before
-    public void setUp() {
-        registry.start();
-    }
-
-    @After
-    public void cleanup() throws Exception {
-        registry.stop();
-        deleteAllNodes();
-    }
-
-    @Test
-    public void shouldPeriodicallyReportConsumerLoad() {
-        // given
-        scheduledExecutorService.triggerScheduledTasks();
-
-        // and
-        SubscriptionLoadRecorder firstSubscriptionReporter = registry.register(firstSubscription);
-        firstSubscriptionReporter.initialize();
-        firstSubscriptionReporter.recordSingleOperation();
-        firstSubscriptionReporter.recordSingleOperation();
-
-        // and
-        SubscriptionLoadRecorder secondSubscriptionReporter = registry.register(secondSubscription);
-        secondSubscriptionReporter.initialize();
-
-        // and
-        clock.advanceMinutes(1);
-
-        // when
-        scheduledExecutorService.triggerScheduledTasks();
-
-        // then
-        ConsumerNodeLoad consumerNodeLoad = registry.get(currentConsumerId);
-        Map<SubscriptionName, SubscriptionLoad> loadPerSubscription = consumerNodeLoad.getLoadPerSubscription();
-        assertThat(loadPerSubscription).hasSize(2);
-        assertThat(loadPerSubscription.get(firstSubscription).getOperationsPerSecond()).isEqualTo(2d / 60);
-        assertThat(loadPerSubscription.get(secondSubscription).getOperationsPerSecond()).isEqualTo(0d);
-    }
-
-    @Test
-    public void shouldNotReportLoadOfRemovedSubscription() {
-        // given
-        scheduledExecutorService.triggerScheduledTasks();
-
-        // and
-        SubscriptionLoadRecorder firstSubscriptionReporter = registry.register(firstSubscription);
-        firstSubscriptionReporter.initialize();
-
-        // when
-        scheduledExecutorService.triggerScheduledTasks();
-
-        // then
-        assertThat(registry.get(currentConsumerId).getLoadPerSubscription()).hasSize(1);
-
-        // when
-        firstSubscriptionReporter.shutdown();
-        scheduledExecutorService.triggerScheduledTasks();
-
-        // then
-        assertThat(registry.get(currentConsumerId).getLoadPerSubscription()).hasSize(0);
-    }
+  private final SubscriptionName firstSubscription =
+      fromString("pl.allegro.tech.hermes$testSubscription");
+  private final SubscriptionName secondSubscription =
+      fromString("pl.allegro.tech.hermes$testSubscription2");
+  private final SubscriptionIds subscriptionIds =
+      new TestSubscriptionIds(
+          List.of(
+              SubscriptionId.from(firstSubscription, 1L),
+              SubscriptionId.from(secondSubscription, 2L)));
+  private final String currentConsumerId = "consumer-id";
+  private final ManuallyTriggeredScheduledExecutorService scheduledExecutorService =
+      new ManuallyTriggeredScheduledExecutorService();
+  private final ModifiableClock clock = new ModifiableClock();
+  private final ZookeeperConsumerNodeLoadRegistry registry =
+      new ZookeeperConsumerNodeLoadRegistry(
+          zookeeperClient,
+          subscriptionIds,
+          new ZookeeperPaths("/hermes"),
+          currentConsumerId,
+          "kafka-cluster",
+          Duration.ofMillis(50),
+          new TestExecutorServiceFactory(scheduledExecutorService),
+          clock,
+          TestMetricsFacadeFactory.create(),
+          100_000);
+
+  @Before
+  public void setUp() {
+    registry.start();
+  }
+
+  @After
+  public void cleanup() throws Exception {
+    registry.stop();
+    deleteAllNodes();
+  }
+
+  @Test
+  public void shouldPeriodicallyReportConsumerLoad() {
+    // given
+    scheduledExecutorService.triggerScheduledTasks();
+
+    // and
+    SubscriptionLoadRecorder firstSubscriptionReporter = registry.register(firstSubscription);
+    firstSubscriptionReporter.initialize();
+    firstSubscriptionReporter.recordSingleOperation();
+    firstSubscriptionReporter.recordSingleOperation();
+
+    // and
+    SubscriptionLoadRecorder secondSubscriptionReporter = registry.register(secondSubscription);
+    secondSubscriptionReporter.initialize();
+
+    // and
+    clock.advanceMinutes(1);
+
+    // when
+    scheduledExecutorService.triggerScheduledTasks();
+
+    // then
+    ConsumerNodeLoad consumerNodeLoad = registry.get(currentConsumerId);
+    Map<SubscriptionName, SubscriptionLoad> loadPerSubscription =
+        consumerNodeLoad.getLoadPerSubscription();
+    assertThat(loadPerSubscription).hasSize(2);
+    assertThat(loadPerSubscription.get(firstSubscription).getOperationsPerSecond())
+        .isEqualTo(2d / 60);
+    assertThat(loadPerSubscription.get(secondSubscription).getOperationsPerSecond()).isEqualTo(0d);
+  }
+
+  @Test
+  public void shouldNotReportLoadOfRemovedSubscription() {
+    // given
+    scheduledExecutorService.triggerScheduledTasks();
+
+    // and
+    SubscriptionLoadRecorder firstSubscriptionReporter = registry.register(firstSubscription);
+    firstSubscriptionReporter.initialize();
+
+    // when
+    scheduledExecutorService.triggerScheduledTasks();
+
+    // then
+    assertThat(registry.get(currentConsumerId).getLoadPerSubscription()).hasSize(1);
+
+    // when
+    firstSubscriptionReporter.shutdown();
+    scheduledExecutorService.triggerScheduledTasks();
+
+    // then
+    assertThat(registry.get(currentConsumerId).getLoadPerSubscription()).hasSize(0);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperSubscriptionProfileRegistryTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperSubscriptionProfileRegistryTest.java
index 107d5cc0fe..ad3976e32d 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperSubscriptionProfileRegistryTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/supervisor/workload/weighted/ZookeeperSubscriptionProfileRegistryTest.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.consumers.supervisor.workload.weighted;
 
+import static java.time.temporal.ChronoUnit.MILLIS;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Instant;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.consumers.subscription.id.SubscriptionId;
@@ -8,80 +15,77 @@
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 import pl.allegro.tech.hermes.test.helper.zookeeper.ZookeeperBaseTest;
 
-import java.time.Instant;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import static java.time.temporal.ChronoUnit.MILLIS;
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class ZookeeperSubscriptionProfileRegistryTest extends ZookeeperBaseTest {
 
-    @Test
-    public void shouldPersistAndReadSubscriptionProfiles() {
-        // given
-        SubscriptionName firstSubscription = SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription");
-        SubscriptionName secondSubscription = SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription2");
-        SubscriptionIds subscriptionIds = new TestSubscriptionIds(List.of(
+  @Test
+  public void shouldPersistAndReadSubscriptionProfiles() {
+    // given
+    SubscriptionName firstSubscription =
+        SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription");
+    SubscriptionName secondSubscription =
+        SubscriptionName.fromString("pl.allegro.tech.hermes$testSubscription2");
+    SubscriptionIds subscriptionIds =
+        new TestSubscriptionIds(
+            List.of(
                 SubscriptionId.from(firstSubscription, -1422951212L),
-                SubscriptionId.from(secondSubscription, 2L)
-        ));
-        ZookeeperSubscriptionProfileRegistry registry = new ZookeeperSubscriptionProfileRegistry(
-                zookeeperClient,
-                subscriptionIds,
-                new ZookeeperPaths("/hermes"),
-                "kafka-cluster",
-                100_000
-        );
-        SubscriptionProfiles profiles = new SubscriptionProfiles(
-                Map.of(
-                        firstSubscription, new SubscriptionProfile(Instant.now(), new Weight(100d)),
-                        secondSubscription, SubscriptionProfile.UNDEFINED
-                ),
-                Instant.now()
-        );
+                SubscriptionId.from(secondSubscription, 2L)));
+    ZookeeperSubscriptionProfileRegistry registry =
+        new ZookeeperSubscriptionProfileRegistry(
+            zookeeperClient,
+            subscriptionIds,
+            new ZookeeperPaths("/hermes"),
+            "kafka-cluster",
+            100_000);
+    SubscriptionProfiles profiles =
+        new SubscriptionProfiles(
+            Map.of(
+                firstSubscription,
+                new SubscriptionProfile(Instant.now(), new Weight(100d)),
+                secondSubscription,
+                SubscriptionProfile.UNDEFINED),
+            Instant.now());
 
-        // when
-        registry.persist(profiles);
+    // when
+    registry.persist(profiles);
 
-        // then
-        SubscriptionProfiles readProfiles = registry.fetch();
-        assertThatProfilesAreEqual(readProfiles, profiles);
-    }
+    // then
+    SubscriptionProfiles readProfiles = registry.fetch();
+    assertThatProfilesAreEqual(readProfiles, profiles);
+  }
 
-    @Test
-    public void shouldPersistAndReadEmptySubscriptionProfiles() {
-        // given
-        ZookeeperSubscriptionProfileRegistry registry = new ZookeeperSubscriptionProfileRegistry(
-                zookeeperClient,
-                new TestSubscriptionIds(List.of()),
-                new ZookeeperPaths("/hermes"),
-                "kafka-cluster",
-                100_000
-        );
-        SubscriptionProfiles profiles = SubscriptionProfiles.EMPTY;
+  @Test
+  public void shouldPersistAndReadEmptySubscriptionProfiles() {
+    // given
+    ZookeeperSubscriptionProfileRegistry registry =
+        new ZookeeperSubscriptionProfileRegistry(
+            zookeeperClient,
+            new TestSubscriptionIds(List.of()),
+            new ZookeeperPaths("/hermes"),
+            "kafka-cluster",
+            100_000);
+    SubscriptionProfiles profiles = SubscriptionProfiles.EMPTY;
 
-        // when
-        registry.persist(profiles);
+    // when
+    registry.persist(profiles);
 
-        // then
-        SubscriptionProfiles readProfiles = registry.fetch();
-        assertThatProfilesAreEqual(readProfiles, profiles);
-    }
+    // then
+    SubscriptionProfiles readProfiles = registry.fetch();
+    assertThatProfilesAreEqual(readProfiles, profiles);
+  }
 
-    private static void assertThatProfilesAreEqual(SubscriptionProfiles actual, SubscriptionProfiles expected) {
-        assertThat(actual)
-                .usingRecursiveComparison()
-                .withComparatorForType(new InstantComparatorIgnoringNanos(), Instant.class)
-                .isEqualTo(expected);
-    }
+  private static void assertThatProfilesAreEqual(
+      SubscriptionProfiles actual, SubscriptionProfiles expected) {
+    assertThat(actual)
+        .usingRecursiveComparison()
+        .withComparatorForType(new InstantComparatorIgnoringNanos(), Instant.class)
+        .isEqualTo(expected);
+  }
 
-    private static class InstantComparatorIgnoringNanos implements Comparator<Instant> {
+  private static class InstantComparatorIgnoringNanos implements Comparator<Instant> {
 
-        @Override
-        public int compare(Instant o1, Instant o2) {
-            return o1.truncatedTo(MILLIS).compareTo(o2.truncatedTo(MILLIS));
-        }
+    @Override
+    public int compare(Instant o1, Instant o2) {
+      return o1.truncatedTo(MILLIS).compareTo(o2.truncatedTo(MILLIS));
     }
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/HermesConsumersAssertions.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/HermesConsumersAssertions.java
index 8cd0470248..8c54e26d64 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/HermesConsumersAssertions.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/HermesConsumersAssertions.java
@@ -6,8 +6,7 @@
 
 public class HermesConsumersAssertions extends Assertions {
 
-    public static OutputRateCalculationResultAssert assertThat(OutputRateCalculationResult actual) {
-        return OutputRateCalculationResultAssert.assertThat(actual);
-    }
-
+  public static OutputRateCalculationResultAssert assertThat(OutputRateCalculationResult actual) {
+    return OutputRateCalculationResultAssert.assertThat(actual);
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/MessageBuilder.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/MessageBuilder.java
index 1f794e19be..a9838c4b63 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/MessageBuilder.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/MessageBuilder.java
@@ -1,12 +1,6 @@
 package pl.allegro.tech.hermes.consumers.test;
 
-import org.apache.avro.Schema;
-import pl.allegro.tech.hermes.api.ContentType;
-import pl.allegro.tech.hermes.api.Header;
-import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
-import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
-import pl.allegro.tech.hermes.consumers.consumer.Message;
-import pl.allegro.tech.hermes.schema.CompiledSchema;
+import static com.google.common.collect.ImmutableMap.of;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -14,131 +8,147 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
-import static com.google.common.collect.ImmutableMap.of;
+import org.apache.avro.Schema;
+import pl.allegro.tech.hermes.api.ContentType;
+import pl.allegro.tech.hermes.api.Header;
+import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
+import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
+import pl.allegro.tech.hermes.consumers.consumer.Message;
+import pl.allegro.tech.hermes.schema.CompiledSchema;
 
 public final class MessageBuilder {
 
-    public static final String TEST_MESSAGE_CONTENT = "Some test message";
-
-    private String id;
-    private String topic;
-    private ContentType contentType;
-    private long publishingTimestamp;
-    private long readingTimestamp;
-    private PartitionOffset partitionOffset;
-    private long partitionAssignmentTerm = -1L;
-    private byte[] content;
-    private Map<String, String> externalMetadata;
-    private List<Header> additionalHeaders;
-    private Optional<CompiledSchema<Schema>> schema = Optional.empty();
-    private String subscription;
-    private boolean hasSubscriptionIdentityHeaders;
-
-    private MessageBuilder() {
-    }
-
-    public static MessageBuilder newBuilder() {
-        return new MessageBuilder();
-    }
-
-    public static Message testMessage() {
-        return MessageBuilder.withTestMessage().build();
-    }
-
-    public static MessageBuilder withTestMessage() {
-        return new MessageBuilder()
-                .withId("id")
-                .withTopic("topicId")
-                .withContent(TEST_MESSAGE_CONTENT, StandardCharsets.UTF_8)
-                .withContentType(ContentType.JSON)
-                .withPublishingTimestamp(123L)
-                .withReadingTimestamp(123L)
-                .withPartitionOffset(new PartitionOffset(KafkaTopicName.valueOf("kafka_topic"), 123, 1))
-                .withExternalMetadata(of("Trace-Id", "traceId"))
-                .withAdditionalHeaders(Collections.emptyList())
-                .withSubscription("subscriptionId")
-                .withHasSubscriptionIdentityHeaders(true);
-    }
-
-    public Message build() {
-        return new Message(id, topic, content, contentType, schema, publishingTimestamp,
-                readingTimestamp, partitionOffset, partitionAssignmentTerm, externalMetadata, additionalHeaders,
-                subscription, hasSubscriptionIdentityHeaders);
-    }
-
-    public MessageBuilder withId(String id) {
-        this.id = id;
-        return this;
-    }
-
-    public MessageBuilder withSchema(Schema schema, int id, int version) {
-        this.schema = Optional.of(CompiledSchema.of(schema, id, version));
-        return this;
-    }
-
-    public MessageBuilder withTopic(String topic) {
-        this.topic = topic;
-        return this;
-    }
-
-    public MessageBuilder withContent(String content, Charset charset) {
-        this.content = content.getBytes(charset);
-        return this;
-    }
-
-    public MessageBuilder withContent(byte[] content) {
-        this.content = content;
-        return this;
-    }
-
-    public MessageBuilder withContentType(ContentType contentType) {
-        this.contentType = contentType;
-        return this;
-    }
-
-    public MessageBuilder withPublishingTimestamp(long publishingTimestamp) {
-        this.publishingTimestamp = publishingTimestamp;
-        return this;
-    }
-
-    public MessageBuilder withReadingTimestamp(long readingTimestamp) {
-        this.readingTimestamp = readingTimestamp;
-        return this;
-    }
-
-    public MessageBuilder withPartitionOffset(PartitionOffset partitionOffset) {
-        this.partitionOffset = partitionOffset;
-        return this;
-    }
-
-    public MessageBuilder withPartitionOffset(String kafkaTopic, int partition, long offset) {
-        this.partitionOffset = new PartitionOffset(KafkaTopicName.valueOf(kafkaTopic), offset, partition);
-        return this;
-    }
-
-    public MessageBuilder withPartitionAssignmentTerm(long term) {
-        this.partitionAssignmentTerm = term;
-        return this;
-    }
-
-    public MessageBuilder withExternalMetadata(Map<String, String> externalMetadata) {
-        this.externalMetadata = externalMetadata;
-        return this;
-    }
-
-    public MessageBuilder withAdditionalHeaders(List<Header> additionalHeaders) {
-        this.additionalHeaders = additionalHeaders;
-        return this;
-    }
-
-    public MessageBuilder withSubscription(String subscription) {
-        this.subscription = subscription;
-        return this;
-    }
-
-    public MessageBuilder withHasSubscriptionIdentityHeaders(boolean hasSubscriptionIdentityHeaders) {
-        this.hasSubscriptionIdentityHeaders = hasSubscriptionIdentityHeaders;
-        return this;
-    }
+  public static final String TEST_MESSAGE_CONTENT = "Some test message";
+
+  private String id;
+  private String topic;
+  private ContentType contentType;
+  private long publishingTimestamp;
+  private long readingTimestamp;
+  private PartitionOffset partitionOffset;
+  private long partitionAssignmentTerm = -1L;
+  private byte[] content;
+  private Map<String, String> externalMetadata;
+  private List<Header> additionalHeaders;
+  private Optional<CompiledSchema<Schema>> schema = Optional.empty();
+  private String subscription;
+  private boolean hasSubscriptionIdentityHeaders;
+
+  private MessageBuilder() {}
+
+  public static MessageBuilder newBuilder() {
+    return new MessageBuilder();
+  }
+
+  public static Message testMessage() {
+    return MessageBuilder.withTestMessage().build();
+  }
+
+  public static MessageBuilder withTestMessage() {
+    return new MessageBuilder()
+        .withId("id")
+        .withTopic("topicId")
+        .withContent(TEST_MESSAGE_CONTENT, StandardCharsets.UTF_8)
+        .withContentType(ContentType.JSON)
+        .withPublishingTimestamp(123L)
+        .withReadingTimestamp(123L)
+        .withPartitionOffset(new PartitionOffset(KafkaTopicName.valueOf("kafka_topic"), 123, 1))
+        .withExternalMetadata(of("Trace-Id", "traceId"))
+        .withAdditionalHeaders(Collections.emptyList())
+        .withSubscription("subscriptionId")
+        .withHasSubscriptionIdentityHeaders(true);
+  }
+
+  public Message build() {
+    return new Message(
+        id,
+        topic,
+        content,
+        contentType,
+        schema,
+        publishingTimestamp,
+        readingTimestamp,
+        partitionOffset,
+        partitionAssignmentTerm,
+        externalMetadata,
+        additionalHeaders,
+        subscription,
+        hasSubscriptionIdentityHeaders);
+  }
+
+  public MessageBuilder withId(String id) {
+    this.id = id;
+    return this;
+  }
+
+  public MessageBuilder withSchema(Schema schema, int id, int version) {
+    this.schema = Optional.of(CompiledSchema.of(schema, id, version));
+    return this;
+  }
+
+  public MessageBuilder withTopic(String topic) {
+    this.topic = topic;
+    return this;
+  }
+
+  public MessageBuilder withContent(String content, Charset charset) {
+    this.content = content.getBytes(charset);
+    return this;
+  }
+
+  public MessageBuilder withContent(byte[] content) {
+    this.content = content;
+    return this;
+  }
+
+  public MessageBuilder withContentType(ContentType contentType) {
+    this.contentType = contentType;
+    return this;
+  }
+
+  public MessageBuilder withPublishingTimestamp(long publishingTimestamp) {
+    this.publishingTimestamp = publishingTimestamp;
+    return this;
+  }
+
+  public MessageBuilder withReadingTimestamp(long readingTimestamp) {
+    this.readingTimestamp = readingTimestamp;
+    return this;
+  }
+
+  public MessageBuilder withPartitionOffset(PartitionOffset partitionOffset) {
+    this.partitionOffset = partitionOffset;
+    return this;
+  }
+
+  public MessageBuilder withPartitionOffset(String kafkaTopic, int partition, long offset) {
+    this.partitionOffset =
+        new PartitionOffset(KafkaTopicName.valueOf(kafkaTopic), offset, partition);
+    return this;
+  }
+
+  public MessageBuilder withPartitionAssignmentTerm(long term) {
+    this.partitionAssignmentTerm = term;
+    return this;
+  }
+
+  public MessageBuilder withExternalMetadata(Map<String, String> externalMetadata) {
+    this.externalMetadata = externalMetadata;
+    return this;
+  }
+
+  public MessageBuilder withAdditionalHeaders(List<Header> additionalHeaders) {
+    this.additionalHeaders = additionalHeaders;
+    return this;
+  }
+
+  public MessageBuilder withSubscription(String subscription) {
+    this.subscription = subscription;
+    return this;
+  }
+
+  public MessageBuilder withHasSubscriptionIdentityHeaders(boolean hasSubscriptionIdentityHeaders) {
+    this.hasSubscriptionIdentityHeaders = hasSubscriptionIdentityHeaders;
+    return this;
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/TestTrackers.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/TestTrackers.java
index fb2350dd24..3febad1cf6 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/TestTrackers.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/TestTrackers.java
@@ -5,7 +5,7 @@
 
 public class TestTrackers extends Trackers {
 
-    public TestTrackers() {
-        super(ImmutableList.of());
-    }
+  public TestTrackers() {
+    super(ImmutableList.of());
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/Wait.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/Wait.java
index 67026279f8..b30ba80d89 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/Wait.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/test/Wait.java
@@ -2,18 +2,17 @@
 
 public final class Wait {
 
-    private Wait() {
-    }
+  private Wait() {}
 
-    public static void forCacheInvalidation() {
-        sleep(700);
-    }
+  public static void forCacheInvalidation() {
+    sleep(700);
+  }
 
-    private static void sleep(int millis) {
-        try {
-            Thread.sleep(millis);
-        } catch (InterruptedException exception) {
-            throw new RuntimeException("Who dares to interrupt me?", exception);
-        }
+  private static void sleep(int millis) {
+    try {
+      Thread.sleep(millis);
+    } catch (InterruptedException exception) {
+      throw new RuntimeException("Who dares to interrupt me?", exception);
     }
+  }
 }
diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/uri/UriUtilsTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/uri/UriUtilsTest.java
index e1fe81076b..8a438b904d 100644
--- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/uri/UriUtilsTest.java
+++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/uri/UriUtilsTest.java
@@ -1,9 +1,5 @@
 package pl.allegro.tech.hermes.consumers.uri;
 
-import org.junit.Test;
-
-import java.net.URI;
-
 import static java.net.URI.create;
 import static org.assertj.core.api.Assertions.assertThat;
 import static pl.allegro.tech.hermes.consumers.uri.UriUtils.appendContext;
@@ -14,72 +10,78 @@
 import static pl.allegro.tech.hermes.consumers.uri.UriUtils.extractPortFromUri;
 import static pl.allegro.tech.hermes.consumers.uri.UriUtils.extractUserNameFromUri;
 
-public class UriUtilsTest {
-
-    private static final URI FULL_URI = create("jms://user:pass@localhost:123123/12312312/312?param=test");
-    private static final URI NO_PORT_URI = create("jms://user:pass@localhost/12312312/312?param=test");
-    private static final URI NO_USER_URI = create("jms://localhost:123123/12312312/312?param=test");
-
-    @Test(expected = InvalidHostException.class)
-    public void shouldThrowExceptionForInvalidHost() {
-        extractHostFromUri(URI.create("jms://host_with_underscores/test"));
-    }
-
-    @Test
-    public void shouldExtractHostFromUri() {
-        assertThat(extractHostFromUri(FULL_URI)).isEqualTo("localhost");
-    }
-
-    @Test
-    public void shouldExtractPortFromUri() {
-        assertThat(extractPortFromUri(FULL_URI).longValue()).isEqualTo(123123L);
-        assertThat(extractPortFromUri(NO_PORT_URI)).isNull();
-    }
-
-    @Test
-    public void shouldExtractAddressFromUri() {
-        assertThat(extractAddressFromUri(FULL_URI)).isEqualTo("localhost:123123");
-        assertThat(extractAddressFromUri(NO_PORT_URI)).isEqualTo("localhost");
-    }
-
-    @Test
-    public void shouldExtractUsernameFromUri() {
-        assertThat(extractUserNameFromUri(FULL_URI)).isEqualTo("user");
-        assertThat(extractUserNameFromUri(NO_USER_URI)).isNull();
-    }
-
-    @Test
-    public void shouldExtractPasswordFromUri() {
-        assertThat(extractPasswordFromUri(FULL_URI)).isEqualTo("pass");
-        assertThat(extractPasswordFromUri(NO_USER_URI)).isNull();
-    }
-
-    @Test
-    public void shouldExtractContextFromUri() {
-        assertContext("http://localhost:8080", "");
-        assertContext("http://localhost:8080/", "/");
-        assertContext("http://localhost:8080/path/1", "/path/1");
-        assertContext("http://localhost:8080/path/1?arg1=test1&arg2=test2", "/path/1?arg1=test1&arg2=test2");
-        assertContext("http://localhost:8080/path/1?arg=test#fragment", "/path/1?arg=test#fragment");
-        assertContext("http://localhost:8080?arg=test", "?arg=test");
-        assertContext("http://localhost:8080?arg=test#fragment", "?arg=test#fragment");
-        assertContext("http://localhost:8080#fragment", "#fragment");
-    }
-
-    private void assertContext(String uri, String context) {
-        assertThat(extractContextFromUri(create(uri))).isEqualTo(context);
-    }
-
-    @Test
-    public void shouldAppendContextToURI() {
-        // given when then
-        assertThat(appendContext(URI.create("http://localhost:8080/"), "context"))
-                .isEqualTo(URI.create("http://localhost:8080/context"));
+import java.net.URI;
+import org.junit.Test;
 
-        assertThat(appendContext(URI.create("http://localhost:8080/"), "/context"))
-                .isEqualTo(URI.create("http://localhost:8080/context"));
+public class UriUtilsTest {
 
-        assertThat(appendContext(URI.create("http://localhost:8080/sth"), "context"))
-                .isEqualTo(URI.create("http://localhost:8080/sth/context"));
-    }
+  private static final URI FULL_URI =
+      create("jms://user:pass@localhost:123123/12312312/312?param=test");
+  private static final URI NO_PORT_URI =
+      create("jms://user:pass@localhost/12312312/312?param=test");
+  private static final URI NO_USER_URI = create("jms://localhost:123123/12312312/312?param=test");
+
+  @Test(expected = InvalidHostException.class)
+  public void shouldThrowExceptionForInvalidHost() {
+    extractHostFromUri(URI.create("jms://host_with_underscores/test"));
+  }
+
+  @Test
+  public void shouldExtractHostFromUri() {
+    assertThat(extractHostFromUri(FULL_URI)).isEqualTo("localhost");
+  }
+
+  @Test
+  public void shouldExtractPortFromUri() {
+    assertThat(extractPortFromUri(FULL_URI).longValue()).isEqualTo(123123L);
+    assertThat(extractPortFromUri(NO_PORT_URI)).isNull();
+  }
+
+  @Test
+  public void shouldExtractAddressFromUri() {
+    assertThat(extractAddressFromUri(FULL_URI)).isEqualTo("localhost:123123");
+    assertThat(extractAddressFromUri(NO_PORT_URI)).isEqualTo("localhost");
+  }
+
+  @Test
+  public void shouldExtractUsernameFromUri() {
+    assertThat(extractUserNameFromUri(FULL_URI)).isEqualTo("user");
+    assertThat(extractUserNameFromUri(NO_USER_URI)).isNull();
+  }
+
+  @Test
+  public void shouldExtractPasswordFromUri() {
+    assertThat(extractPasswordFromUri(FULL_URI)).isEqualTo("pass");
+    assertThat(extractPasswordFromUri(NO_USER_URI)).isNull();
+  }
+
+  @Test
+  public void shouldExtractContextFromUri() {
+    assertContext("http://localhost:8080", "");
+    assertContext("http://localhost:8080/", "/");
+    assertContext("http://localhost:8080/path/1", "/path/1");
+    assertContext(
+        "http://localhost:8080/path/1?arg1=test1&arg2=test2", "/path/1?arg1=test1&arg2=test2");
+    assertContext("http://localhost:8080/path/1?arg=test#fragment", "/path/1?arg=test#fragment");
+    assertContext("http://localhost:8080?arg=test", "?arg=test");
+    assertContext("http://localhost:8080?arg=test#fragment", "?arg=test#fragment");
+    assertContext("http://localhost:8080#fragment", "#fragment");
+  }
+
+  private void assertContext(String uri, String context) {
+    assertThat(extractContextFromUri(create(uri))).isEqualTo(context);
+  }
+
+  @Test
+  public void shouldAppendContextToURI() {
+    // given when then
+    assertThat(appendContext(URI.create("http://localhost:8080/"), "context"))
+        .isEqualTo(URI.create("http://localhost:8080/context"));
+
+    assertThat(appendContext(URI.create("http://localhost:8080/"), "/context"))
+        .isEqualTo(URI.create("http://localhost:8080/context"));
+
+    assertThat(appendContext(URI.create("http://localhost:8080/sth"), "context"))
+        .isEqualTo(URI.create("http://localhost:8080/sth/context"));
+  }
 }
diff --git a/hermes-consumers/src/test/resources/allure.properties b/hermes-consumers/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-consumers/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-frontend/build.gradle b/hermes-frontend/build.gradle
index 5423631ef9..dcb9018c40 100644
--- a/hermes-frontend/build.gradle
+++ b/hermes-frontend/build.gradle
@@ -13,24 +13,19 @@ dependencies {
 
     api group: 'org.springframework.boot', name: 'spring-boot-starter', version: versions.spring
     api group: 'io.undertow', name: 'undertow-core', version: versions.undertow
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
-    api (group: 'net.openhft', name: 'chronicle-map', version: '3.22.9') {
+    // Did not update that as we're trying to abandon buffers
+    api(group: 'net.openhft', name: 'chronicle-map', version: '3.22.9') {
         exclude group: 'net.openhft', module: 'chronicle-analytics'
     }
-    implementation group: 'commons-io', name: 'commons-io', version: '2.4'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
     implementation group: 'net.jodah', name: 'failsafe', version: versions.failsafe
 
+    testImplementation project(':hermes-test-helper')
+
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.apache.groovy', name: 'groovy-json', version: versions.groovy
-
-    testImplementation(group: 'com.jayway.awaitility', name: 'awaitility-groovy', version: '1.7.0') {
-        exclude group: 'org.codehaus.groovy', module: 'groovy-all'
-    }
-
-    testImplementation project(':hermes-test-helper')
-    testImplementation(group: 'com.jayway.awaitility', name: 'awaitility', version: '1.6.1') {
-        exclude group: 'com.jayway.jsonpath', module: 'json-path'
-    }
+    testImplementation group: 'org.awaitility', name: 'awaitility-groovy', version: '4.2.1'
+    testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.2.1'
     testImplementation group: 'org.testcontainers', name: 'spock', version: versions.testcontainers
     testImplementation group: 'org.testcontainers', name: 'kafka', version: versions.testcontainers
     testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: versions.junit_jupiter
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/HermesFrontend.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/HermesFrontend.java
index 0da5c5552d..adba6ccde3 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/HermesFrontend.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/HermesFrontend.java
@@ -7,9 +7,9 @@
 @SpringBootApplication
 public class HermesFrontend {
 
-    public static void main(String[] args) {
-        SpringApplication application = new SpringApplication(HermesFrontend.class);
-        application.setWebApplicationType(WebApplicationType.NONE);
-        application.run(args);
-    }
-}
\ No newline at end of file
+  public static void main(String[] args) {
+    SpringApplication application = new SpringApplication(HermesFrontend.class);
+    application.setWebApplicationType(WebApplicationType.NONE);
+    application.run(args);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/blacklist/BlacklistZookeeperNotifyingCache.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/blacklist/BlacklistZookeeperNotifyingCache.java
index cfb11574a2..ab9d720a4e 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/blacklist/BlacklistZookeeperNotifyingCache.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/blacklist/BlacklistZookeeperNotifyingCache.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.frontend.blacklist;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
@@ -8,56 +10,55 @@
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
-import java.util.ArrayList;
-import java.util.List;
+public class BlacklistZookeeperNotifyingCache extends PathChildrenCache
+    implements PathChildrenCacheListener {
 
-public class BlacklistZookeeperNotifyingCache extends PathChildrenCache implements PathChildrenCacheListener {
+  private static final Logger logger =
+      LoggerFactory.getLogger(BlacklistZookeeperNotifyingCache.class);
 
-    private static final Logger logger = LoggerFactory.getLogger(BlacklistZookeeperNotifyingCache.class);
+  private final List<TopicBlacklistCallback> topicCallbacks = new ArrayList<>();
 
-    private final List<TopicBlacklistCallback> topicCallbacks = new ArrayList<>();
+  public BlacklistZookeeperNotifyingCache(CuratorFramework curator, ZookeeperPaths paths) {
+    super(curator, paths.topicsBlacklistPath(), true);
+    getListenable().addListener(this);
+  }
 
-    public BlacklistZookeeperNotifyingCache(CuratorFramework curator, ZookeeperPaths paths) {
-        super(curator, paths.topicsBlacklistPath(), true);
-        getListenable().addListener(this);
+  @Override
+  public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
+    if (event == null || event.getData() == null) {
+      return;
     }
 
-    @Override
-    public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
-        if (event == null || event.getData() == null) {
-            return;
-        }
-
-        logger.info("Got {} event for path {}", event.getType(), event.getData().getPath());
-
-        String qualifiedTopicName = getTopicName(event);
-
-        switch (event.getType()) {
-            case CHILD_ADDED:
-                topicCallbacks.forEach(callback -> callback.onTopicBlacklisted(qualifiedTopicName));
-                break;
-            case CHILD_REMOVED:
-                topicCallbacks.forEach(callback -> callback.onTopicUnblacklisted(qualifiedTopicName));
-                break;
-            default:
-                break;
-        }
-    }
+    logger.info("Got {} event for path {}", event.getType(), event.getData().getPath());
 
-    public void startup() {
-        try {
-            this.start();
-        } catch (Exception e) {
-            throw new IllegalStateException("Failed to start Zookeeper Topic Blacklist cache", e);
-        }
-    }
+    String qualifiedTopicName = getTopicName(event);
 
-    private String getTopicName(PathChildrenCacheEvent event) {
-        String[] paths = event.getData().getPath().split("/");
-        return paths[paths.length - 1];
+    switch (event.getType()) {
+      case CHILD_ADDED:
+        topicCallbacks.forEach(callback -> callback.onTopicBlacklisted(qualifiedTopicName));
+        break;
+      case CHILD_REMOVED:
+        topicCallbacks.forEach(callback -> callback.onTopicUnblacklisted(qualifiedTopicName));
+        break;
+      default:
+        break;
     }
+  }
 
-    public void addCallback(TopicBlacklistCallback callback) {
-        topicCallbacks.add(callback);
+  public void startup() {
+    try {
+      this.start();
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to start Zookeeper Topic Blacklist cache", e);
     }
+  }
+
+  private String getTopicName(PathChildrenCacheEvent event) {
+    String[] paths = event.getData().getPath().split("/");
+    return paths[paths.length - 1];
+  }
+
+  public void addCallback(TopicBlacklistCallback callback) {
+    topicCallbacks.add(callback);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/blacklist/TopicBlacklistCallback.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/blacklist/TopicBlacklistCallback.java
index f63e770198..8d7b3f7c82 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/blacklist/TopicBlacklistCallback.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/blacklist/TopicBlacklistCallback.java
@@ -2,7 +2,7 @@
 
 public interface TopicBlacklistCallback {
 
-    default void onTopicBlacklisted(String qualifiedTopicName) {}
+  default void onTopicBlacklisted(String qualifiedTopicName) {}
 
-    default void onTopicUnblacklisted(String qualifiedTopicName) {}
+  default void onTopicUnblacklisted(String qualifiedTopicName) {}
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupFilesManager.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupFilesManager.java
index 2ead3bd3d1..eb2141469b 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupFilesManager.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupFilesManager.java
@@ -1,10 +1,10 @@
 package pl.allegro.tech.hermes.frontend.buffer;
 
-import com.google.common.io.PatternFilenameFilter;
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.collect.Lists.newArrayList;
+import static java.lang.String.format;
+import static java.util.stream.Collectors.toList;
 
+import com.google.common.io.PatternFilenameFilter;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -14,82 +14,85 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
-import static com.google.common.collect.Lists.newArrayList;
-import static java.lang.String.format;
-import static java.util.stream.Collectors.toList;
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BackupFilesManager {
 
-    private static final Logger logger = LoggerFactory.getLogger(BackupFilesManager.class);
+  private static final Logger logger = LoggerFactory.getLogger(BackupFilesManager.class);
 
-    private static final String FILE_NAME = "hermes-buffer-v3";
-    private static final String TIMESTAMPED_BACKUP_FILE_PATTERN = FILE_NAME + "-\\d+\\.dat";
-    private static final String OLD_V2_BACKUP_PREFIX = "hermes-buffer";
-    private static final String OLD_V2_BACKUP_SUFFIX = "-v2-old.tmp";
+  private static final String FILE_NAME = "hermes-buffer-v3";
+  private static final String TIMESTAMPED_BACKUP_FILE_PATTERN = FILE_NAME + "-\\d+\\.dat";
+  private static final String OLD_V2_BACKUP_PREFIX = "hermes-buffer";
+  private static final String OLD_V2_BACKUP_SUFFIX = "-v2-old.tmp";
 
-    private final String baseDir;
-    private final Clock clock;
-    private final File backupFile;
+  private final String baseDir;
+  private final Clock clock;
+  private final File backupFile;
 
-    public BackupFilesManager(String baseDir, Clock clock) {
-        this.baseDir = baseDir;
-        this.clock = clock;
+  public BackupFilesManager(String baseDir, Clock clock) {
+    this.baseDir = baseDir;
+    this.clock = clock;
 
-        backupFile = getBackupFile();
-    }
+    backupFile = getBackupFile();
+  }
 
-    public File getCurrentBackupFile() {
-        return backupFile;
-    }
+  public File getCurrentBackupFile() {
+    return backupFile;
+  }
 
-    public Optional<File> rolloverBackupFileIfExists() {
-        if (!backupFile.exists()) {
-            logger.info("Backup file doesn't exist.");
-            return Optional.empty();
-        }
-
-        File timestampedBackupFile = new File(format("%s/%s-%s.dat", baseDir, FILE_NAME, clock.millis()));
-
-        try {
-            FileUtils.moveFile(backupFile, timestampedBackupFile);
-        } catch (IOException e) {
-            logger.error("Error while moving backup file from path {} to path {}.",
-                    backupFile.getAbsolutePath(),
-                    timestampedBackupFile.getAbsolutePath(),
-                    e);
-            return Optional.empty();
-        }
-
-        return Optional.of(timestampedBackupFile);
+  public Optional<File> rolloverBackupFileIfExists() {
+    if (!backupFile.exists()) {
+      logger.info("Backup file doesn't exist.");
+      return Optional.empty();
     }
 
-    public List<File> getTemporaryBackupV2Files(String temporaryDir) {
-        try {
-            Path dir = Paths.get(temporaryDir);
-            return Files.list(dir)
-                    .filter(file -> file.getFileName().toString().startsWith(OLD_V2_BACKUP_PREFIX))
-                    .filter(file -> file.getFileName().toString().endsWith(OLD_V2_BACKUP_SUFFIX))
-                    .map(Path::toFile)
-                    .collect(toList());
-        } catch (IOException e) {
-            logger.error("Error while scanning temporary backup v2 files from absolute path: {}",
-                    backupFile.getAbsolutePath(),
-                    e);
-            return Collections.emptyList();
-        }
+    File timestampedBackupFile =
+        new File(format("%s/%s-%s.dat", baseDir, FILE_NAME, clock.millis()));
+
+    try {
+      FileUtils.moveFile(backupFile, timestampedBackupFile);
+    } catch (IOException e) {
+      logger.error(
+          "Error while moving backup file from path {} to path {}.",
+          backupFile.getAbsolutePath(),
+          timestampedBackupFile.getAbsolutePath(),
+          e);
+      return Optional.empty();
     }
 
-    public void delete(File file) {
-        boolean status = FileUtils.deleteQuietly(file);
-        logger.info("Deleted file from path {} with status {}", file.getAbsolutePath(), status);
+    return Optional.of(timestampedBackupFile);
+  }
+
+  public List<File> getTemporaryBackupV2Files(String temporaryDir) {
+    try {
+      Path dir = Paths.get(temporaryDir);
+      return Files.list(dir)
+          .filter(file -> file.getFileName().toString().startsWith(OLD_V2_BACKUP_PREFIX))
+          .filter(file -> file.getFileName().toString().endsWith(OLD_V2_BACKUP_SUFFIX))
+          .map(Path::toFile)
+          .collect(toList());
+    } catch (IOException e) {
+      logger.error(
+          "Error while scanning temporary backup v2 files from absolute path: {}",
+          backupFile.getAbsolutePath(),
+          e);
+      return Collections.emptyList();
     }
+  }
 
-    private File getBackupFile() {
-        return new File(format("%s/%s.dat", baseDir, FILE_NAME));
-    }
+  public void delete(File file) {
+    boolean status = FileUtils.deleteQuietly(file);
+    logger.info("Deleted file from path {} with status {}", file.getAbsolutePath(), status);
+  }
 
-    public List<File> getRolledBackupFiles() {
-        return newArrayList(new File(baseDir).listFiles(new PatternFilenameFilter(TIMESTAMPED_BACKUP_FILE_PATTERN)));
-    }
+  private File getBackupFile() {
+    return new File(format("%s/%s.dat", baseDir, FILE_NAME));
+  }
+
+  public List<File> getRolledBackupFiles() {
+    return newArrayList(
+        new File(baseDir).listFiles(new PatternFilenameFilter(TIMESTAMPED_BACKUP_FILE_PATTERN)));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessage.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessage.java
index 35ba9fa962..072d77c2d0 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessage.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessage.java
@@ -2,77 +2,94 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
 import java.util.Objects;
 
 public class BackupMessage implements Serializable {
 
-    private final String messageId;
-    private final byte[] data;
-    private final long timestamp;
-    private final String qualifiedTopicName;
-    private final String partitionKey;
-    private final Integer schemaVersion;
-    private final Integer schemaId;
+  private final String messageId;
+  private final byte[] data;
+  private final long timestamp;
+  private final String qualifiedTopicName;
+  private final String partitionKey;
+  private final Integer schemaVersion;
+  private final Integer schemaId;
+  private final Map<String, String> propagatedHTTPHeaders;
 
-    public BackupMessage(String messageId, byte[] data, long timestamp, String qualifiedTopicName, String partitionKey,
-                         Integer schemaVersion, Integer schemaId) {
-        this.messageId = messageId;
-        this.data = data;
-        this.timestamp = timestamp;
-        this.qualifiedTopicName = qualifiedTopicName;
-        this.partitionKey = partitionKey;
-        this.schemaVersion = schemaVersion;
-        this.schemaId = schemaId;
-    }
+  public BackupMessage(
+      String messageId,
+      byte[] data,
+      long timestamp,
+      String qualifiedTopicName,
+      String partitionKey,
+      Integer schemaVersion,
+      Integer schemaId,
+      Map<String, String> propagatedHTTPHeaders) {
+    this.messageId = messageId;
+    this.data = data;
+    this.timestamp = timestamp;
+    this.qualifiedTopicName = qualifiedTopicName;
+    this.partitionKey = partitionKey;
+    this.schemaVersion = schemaVersion;
+    this.schemaId = schemaId;
+    this.propagatedHTTPHeaders =
+        propagatedHTTPHeaders == null ? Collections.emptyMap() : propagatedHTTPHeaders;
+  }
 
-    public String getMessageId() {
-        return messageId;
-    }
+  public String getMessageId() {
+    return messageId;
+  }
 
-    public byte[] getData() {
-        return data;
-    }
+  public byte[] getData() {
+    return data;
+  }
 
-    public long getTimestamp() {
-        return timestamp;
-    }
+  public long getTimestamp() {
+    return timestamp;
+  }
 
-    public String getQualifiedTopicName() {
-        return qualifiedTopicName;
-    }
+  public String getQualifiedTopicName() {
+    return qualifiedTopicName;
+  }
 
-    public String getPartitionKey() {
-        return partitionKey;
-    }
+  public String getPartitionKey() {
+    return partitionKey;
+  }
 
-    public Integer getSchemaVersion() {
-        return schemaVersion;
-    }
+  public Integer getSchemaVersion() {
+    return schemaVersion;
+  }
 
-    public Integer getSchemaId() {
-        return schemaId;
-    }
+  public Integer getSchemaId() {
+    return schemaId;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof BackupMessage)) {
-            return false;
-        }
-        BackupMessage that = (BackupMessage) o;
-        return Objects.equals(timestamp, that.timestamp)
-                && Objects.equals(messageId, that.messageId)
-                && Arrays.equals(data, that.data)
-                && Objects.equals(qualifiedTopicName, that.qualifiedTopicName)
-                && Objects.equals(partitionKey, that.partitionKey)
-                && Objects.equals(schemaVersion, that.schemaVersion)
-                && Objects.equals(schemaId, that.schemaId);
-    }
+  public Map<String, String> getPropagatedHTTPHeaders() {
+    return propagatedHTTPHeaders;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(messageId, data, timestamp, qualifiedTopicName, partitionKey, schemaVersion, schemaId);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
+    if (!(o instanceof BackupMessage)) {
+      return false;
+    }
+    BackupMessage that = (BackupMessage) o;
+    return Objects.equals(timestamp, that.timestamp)
+        && Objects.equals(messageId, that.messageId)
+        && Arrays.equals(data, that.data)
+        && Objects.equals(qualifiedTopicName, that.qualifiedTopicName)
+        && Objects.equals(partitionKey, that.partitionKey)
+        && Objects.equals(schemaVersion, that.schemaVersion)
+        && Objects.equals(schemaId, that.schemaId);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        messageId, data, timestamp, qualifiedTopicName, partitionKey, schemaVersion, schemaId);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoader.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoader.java
index 10ff457ecd..34882cb3ad 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoader.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoader.java
@@ -1,6 +1,22 @@
 package pl.allegro.tech.hermes.frontend.buffer;
 
 import com.google.common.collect.Lists;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.nio.charset.Charset;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicReference;
 import org.apache.avro.Schema;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
@@ -11,11 +27,11 @@
 import pl.allegro.tech.hermes.frontend.listeners.BrokerListeners;
 import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
 import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
+import pl.allegro.tech.hermes.frontend.producer.BrokerTopicAvailabilityChecker;
 import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
 import pl.allegro.tech.hermes.frontend.publishing.avro.AvroMessage;
 import pl.allegro.tech.hermes.frontend.publishing.message.JsonMessage;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
-import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 import pl.allegro.tech.hermes.schema.SchemaExistenceEnsurer;
 import pl.allegro.tech.hermes.schema.SchemaId;
@@ -23,246 +39,296 @@
 import pl.allegro.tech.hermes.schema.SchemaVersion;
 import pl.allegro.tech.hermes.tracker.frontend.Trackers;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.nio.charset.Charset;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicReference;
-
 public class BackupMessagesLoader {
 
-    private static final Logger logger = LoggerFactory.getLogger(BackupMessagesLoader.class);
-
-    private final BrokerMessageProducer brokerMessageProducer;
-    private final BrokerListeners brokerListeners;
-    private final TopicsCache topicsCache;
-    private final SchemaRepository schemaRepository;
-    private final SchemaExistenceEnsurer schemaExistenceEnsurer;
-    private final Trackers trackers;
-    private final Duration messageMaxAgeHours;
-    private final int maxResendRetries;
-    private final Duration resendSleep;
-    private final Duration readTopicInfoSleep;
-
-    private final Set<Topic> topicsAvailabilityCache = new HashSet<>();
-    private final AtomicReference<ConcurrentLinkedQueue<Pair<Message, CachedTopic>>> toResend = new AtomicReference<>();
-
-    public BackupMessagesLoader(BrokerMessageProducer brokerMessageProducer,
-                                BrokerListeners brokerListeners,
-                                TopicsCache topicsCache,
-                                SchemaRepository schemaRepository,
-                                SchemaExistenceEnsurer schemaExistenceEnsurer,
-                                Trackers trackers,
-                                BackupMessagesLoaderParameters backupMessagesLoaderParameters) {
-        this.brokerMessageProducer = brokerMessageProducer;
-        this.brokerListeners = brokerListeners;
-        this.topicsCache = topicsCache;
-        this.schemaRepository = schemaRepository;
-        this.schemaExistenceEnsurer = schemaExistenceEnsurer;
-        this.trackers = trackers;
-        this.messageMaxAgeHours = backupMessagesLoaderParameters.getMaxAge();
-        this.resendSleep = backupMessagesLoaderParameters.getLoadingPauseBetweenResend();
-        this.readTopicInfoSleep = backupMessagesLoaderParameters.getLoadingWaitForBrokerTopicInfo();
-        this.maxResendRetries = backupMessagesLoaderParameters.getMaxResendRetries();
-    }
-
-    public void loadMessages(List<BackupMessage> messages) {
-        logger.info("Loading {} messages from backup storage.", messages.size());
-        toResend.set(new ConcurrentLinkedQueue<>());
-
-        sendMessages(messages);
-
-        if (toResend.get().size() == 0) {
-            logger.info("No messages to resend.");
-            return;
-        }
-
-        int retry = 0;
-        do {
-            if (retry > 0) {
-                List<Pair<Message, CachedTopic>> retryMessages = Lists.newArrayList(toResend.getAndSet(new ConcurrentLinkedQueue<>()));
-                resendMessages(retryMessages, retry);
-            }
-            try {
-                Thread.sleep(resendSleep.toMillis());
-            } catch (InterruptedException e) {
-                logger.warn("Sleep interrupted", e);
-            }
-            retry++;
-        } while (toResend.get().size() > 0 && retry <= maxResendRetries);
-
-        logger.info("Finished resending messages from backup storage after retry #{} with {} unsent messages.", retry - 1,
-                toResend.get().size());
-    }
-
-    public void loadFromTemporaryBackupV2File(File file) {
-        try (FileInputStream fileInputStream = new FileInputStream(file);
-             ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream)) {
-            List<BackupMessage> messages = (List<BackupMessage>) objectInputStream.readObject();
-            logger.info("Loaded {} messages from temporary v2 backup file: {}", messages.size(), file);
-            loadMessages(messages);
-
-        } catch (IOException | ClassNotFoundException e) {
-            logger.error("Error reading temporary backup v2 files from path {}.", file.getAbsolutePath(), e);
-        }
-    }
-
-    public void clearTopicsAvailabilityCache() {
-        topicsAvailabilityCache.clear();
+  private static final Logger logger = LoggerFactory.getLogger(BackupMessagesLoader.class);
+
+  private final BrokerTopicAvailabilityChecker brokerTopicAvailabilityChecker;
+  private final BrokerMessageProducer brokerMessageProducer;
+  private final BrokerListeners brokerListeners;
+  private final TopicsCache topicsCache;
+  private final SchemaRepository schemaRepository;
+  private final SchemaExistenceEnsurer schemaExistenceEnsurer;
+  private final Trackers trackers;
+  private final Duration messageMaxAgeHours;
+  private final int maxResendRetries;
+  private final Duration resendSleep;
+  private final Duration readTopicInfoSleep;
+
+  private final Set<Topic> topicsAvailabilityCache = new HashSet<>();
+  private final AtomicReference<ConcurrentLinkedQueue<Pair<Message, CachedTopic>>> toResend =
+      new AtomicReference<>();
+
+  public BackupMessagesLoader(
+      BrokerTopicAvailabilityChecker brokerTopicAvailabilityChecker,
+      BrokerMessageProducer brokerMessageProducer,
+      BrokerListeners brokerListeners,
+      TopicsCache topicsCache,
+      SchemaRepository schemaRepository,
+      SchemaExistenceEnsurer schemaExistenceEnsurer,
+      Trackers trackers,
+      BackupMessagesLoaderParameters backupMessagesLoaderParameters) {
+    this.brokerTopicAvailabilityChecker = brokerTopicAvailabilityChecker;
+    this.brokerMessageProducer = brokerMessageProducer;
+    this.brokerListeners = brokerListeners;
+    this.topicsCache = topicsCache;
+    this.schemaRepository = schemaRepository;
+    this.schemaExistenceEnsurer = schemaExistenceEnsurer;
+    this.trackers = trackers;
+    this.messageMaxAgeHours = backupMessagesLoaderParameters.getMaxAge();
+    this.resendSleep = backupMessagesLoaderParameters.getLoadingPauseBetweenResend();
+    this.readTopicInfoSleep = backupMessagesLoaderParameters.getLoadingWaitForBrokerTopicInfo();
+    this.maxResendRetries = backupMessagesLoaderParameters.getMaxResendRetries();
+  }
+
+  public void loadMessages(List<BackupMessage> messages) {
+    logger.info("Loading {} messages from backup storage.", messages.size());
+    toResend.set(new ConcurrentLinkedQueue<>());
+
+    sendMessages(messages);
+
+    if (toResend.get().size() == 0) {
+      logger.info("No messages to resend.");
+      return;
     }
 
-    private void sendMessages(List<BackupMessage> messages) {
-        logger.info("Sending {} messages from backup storage.", messages.size());
-        int sentCounter = 0;
-        int discardedCounter = 0;
-        for (BackupMessage backupMessage : messages) {
-            String topicQualifiedName = backupMessage.getQualifiedTopicName();
-            Optional<CachedTopic> optionalCachedTopic = topicsCache.getTopic(topicQualifiedName);
-            if (sendBackupMessageIfNeeded(backupMessage, topicQualifiedName, optionalCachedTopic, "sending")) {
-                sentCounter++;
-            } else {
-                discardedCounter++;
-            }
-        }
-        logger.info("Loaded and sent {} messages and discarded {} messages from the backup storage.", sentCounter, discardedCounter);
+    int retry = 0;
+    do {
+      if (retry > 0) {
+        List<Pair<Message, CachedTopic>> retryMessages =
+            Lists.newArrayList(toResend.getAndSet(new ConcurrentLinkedQueue<>()));
+        resendMessages(retryMessages, retry);
+      }
+      try {
+        Thread.sleep(resendSleep.toMillis());
+      } catch (InterruptedException e) {
+        logger.warn("Sleep interrupted", e);
+      }
+      retry++;
+    } while (toResend.get().size() > 0 && retry <= maxResendRetries);
+
+    logger.info(
+        "Finished resending messages from backup storage after retry #{} with {} unsent messages.",
+        retry - 1,
+        toResend.get().size());
+  }
+
+  public void loadFromTemporaryBackupV2File(File file) {
+    try (FileInputStream fileInputStream = new FileInputStream(file);
+        ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream)) {
+      List<BackupMessage> messages = (List<BackupMessage>) objectInputStream.readObject();
+      logger.info("Loaded {} messages from temporary v2 backup file: {}", messages.size(), file);
+      loadMessages(messages);
+
+    } catch (IOException | ClassNotFoundException e) {
+      logger.error(
+          "Error reading temporary backup v2 files from path {}.", file.getAbsolutePath(), e);
     }
-
-    private void resendMessages(List<Pair<Message, CachedTopic>> messageAndTopicList, int retry) {
-        logger.info("Resending {} messages from backup storage retry {}.", messageAndTopicList.size(), retry);
-
-        int sentCounter = 0;
-        int discardedCounter = 0;
-        for (Pair<Message, CachedTopic> messageAndTopic : messageAndTopicList) {
-            Message message = messageAndTopic.getKey();
-            Optional<CachedTopic> cachedTopic = Optional.of(messageAndTopic.getValue());
-            if (sendMessageIfNeeded(message, cachedTopic.get().getQualifiedName(), cachedTopic, "resending")) {
-                sentCounter++;
-            } else {
-                discardedCounter++;
-            }
-        }
-
-        logger.info("Resent {}/{} messages and discarded {} messages from the backup storage retry {}.", sentCounter,
-                messageAndTopicList.size(), discardedCounter, retry);
+  }
+
+  public void clearTopicsAvailabilityCache() {
+    topicsAvailabilityCache.clear();
+  }
+
+  private void sendMessages(List<BackupMessage> messages) {
+    logger.info("Sending {} messages from backup storage.", messages.size());
+    int sentCounter = 0;
+    int discardedCounter = 0;
+    for (BackupMessage backupMessage : messages) {
+      String topicQualifiedName = backupMessage.getQualifiedTopicName();
+      Optional<CachedTopic> optionalCachedTopic = topicsCache.getTopic(topicQualifiedName);
+      if (sendBackupMessageIfNeeded(
+          backupMessage, topicQualifiedName, optionalCachedTopic, "sending")) {
+        sentCounter++;
+      } else {
+        discardedCounter++;
+      }
     }
-
-    private boolean sendBackupMessageIfNeeded(BackupMessage backupMessage, String topicQualifiedName, Optional<CachedTopic> cachedTopic,
-                                              String contextName) {
-        if (cachedTopic.isPresent()) {
-            Message message;
-            if (backupMessage.getSchemaVersion() != null) {
-                message = createAvroMessageFromVersion(backupMessage, cachedTopic);
-            } else if (backupMessage.getSchemaId() != null) {
-                message = createAvroMessageFromSchemaId(backupMessage, cachedTopic);
-            } else {
-                message = createJsonMessage(backupMessage);
-            }
-            return sendMessageIfNeeded(message, topicQualifiedName, cachedTopic, contextName);
-        }
-        return false;
+    logger.info(
+        "Loaded and sent {} messages and discarded {} messages from the backup storage.",
+        sentCounter,
+        discardedCounter);
+  }
+
+  private void resendMessages(List<Pair<Message, CachedTopic>> messageAndTopicList, int retry) {
+    logger.info(
+        "Resending {} messages from backup storage retry {}.", messageAndTopicList.size(), retry);
+
+    int sentCounter = 0;
+    int discardedCounter = 0;
+    for (Pair<Message, CachedTopic> messageAndTopic : messageAndTopicList) {
+      Message message = messageAndTopic.getKey();
+      Optional<CachedTopic> cachedTopic = Optional.of(messageAndTopic.getValue());
+      if (sendMessageIfNeeded(
+          message, cachedTopic.get().getQualifiedName(), cachedTopic, "resending")) {
+        sentCounter++;
+      } else {
+        discardedCounter++;
+      }
     }
 
-    private Message createAvroMessageFromSchemaId(BackupMessage backupMessage, Optional<CachedTopic> cachedTopic) {
-        SchemaId schemaId = SchemaId.valueOf(backupMessage.getSchemaId());
-        schemaExistenceEnsurer.ensureSchemaExists(cachedTopic.get().getTopic(), schemaId);
-        CompiledSchema<Schema> schema = schemaRepository.getAvroSchema(cachedTopic.get().getTopic(), schemaId);
-        return createAvroMessage(backupMessage, schema);
+    logger.info(
+        "Resent {}/{} messages and discarded {} messages from the backup storage retry {}.",
+        sentCounter,
+        messageAndTopicList.size(),
+        discardedCounter,
+        retry);
+  }
+
+  private boolean sendBackupMessageIfNeeded(
+      BackupMessage backupMessage,
+      String topicQualifiedName,
+      Optional<CachedTopic> cachedTopic,
+      String contextName) {
+    if (cachedTopic.isPresent()) {
+      Message message;
+      if (backupMessage.getSchemaVersion() != null) {
+        message = createAvroMessageFromVersion(backupMessage, cachedTopic);
+      } else if (backupMessage.getSchemaId() != null) {
+        message = createAvroMessageFromSchemaId(backupMessage, cachedTopic);
+      } else {
+        message = createJsonMessage(backupMessage);
+      }
+      return sendMessageIfNeeded(message, topicQualifiedName, cachedTopic, contextName);
     }
-
-    private Message createAvroMessageFromVersion(BackupMessage backupMessage, Optional<CachedTopic> cachedTopic) {
-        SchemaVersion version = SchemaVersion.valueOf(backupMessage.getSchemaVersion());
-        schemaExistenceEnsurer.ensureSchemaExists(cachedTopic.get().getTopic(), version);
-        CompiledSchema<Schema> schema = schemaRepository.getAvroSchema(cachedTopic.get().getTopic(), version);
-        return createAvroMessage(backupMessage, schema);
+    return false;
+  }
+
+  private Message createAvroMessageFromSchemaId(
+      BackupMessage backupMessage, Optional<CachedTopic> cachedTopic) {
+    SchemaId schemaId = SchemaId.valueOf(backupMessage.getSchemaId());
+    schemaExistenceEnsurer.ensureSchemaExists(cachedTopic.get().getTopic(), schemaId);
+    CompiledSchema<Schema> schema =
+        schemaRepository.getAvroSchema(cachedTopic.get().getTopic(), schemaId);
+    return createAvroMessage(backupMessage, schema);
+  }
+
+  private Message createAvroMessageFromVersion(
+      BackupMessage backupMessage, Optional<CachedTopic> cachedTopic) {
+    SchemaVersion version = SchemaVersion.valueOf(backupMessage.getSchemaVersion());
+    schemaExistenceEnsurer.ensureSchemaExists(cachedTopic.get().getTopic(), version);
+    CompiledSchema<Schema> schema =
+        schemaRepository.getAvroSchema(cachedTopic.get().getTopic(), version);
+    return createAvroMessage(backupMessage, schema);
+  }
+
+  private Message createAvroMessage(BackupMessage backupMessage, CompiledSchema<Schema> schema) {
+    return new AvroMessage(
+        backupMessage.getMessageId(),
+        backupMessage.getData(),
+        backupMessage.getTimestamp(),
+        schema,
+        backupMessage.getPartitionKey(),
+        backupMessage.getPropagatedHTTPHeaders());
+  }
+
+  private Message createJsonMessage(BackupMessage backupMessage) {
+    return new JsonMessage(
+        backupMessage.getMessageId(),
+        backupMessage.getData(),
+        backupMessage.getTimestamp(),
+        backupMessage.getPartitionKey(),
+        backupMessage.getPropagatedHTTPHeaders());
+  }
+
+  private boolean sendMessageIfNeeded(
+      Message message,
+      String topicQualifiedName,
+      Optional<CachedTopic> cachedTopic,
+      String contextName) {
+    if (cachedTopic.isPresent()) {
+      if (isNotStale(message)) {
+        waitOnBrokerTopicAvailability(cachedTopic.get());
+        sendMessage(message, cachedTopic.get());
+        return true;
+      }
+      logger.warn(
+          "Not {} stale message {} {} {}",
+          contextName,
+          message.getId(),
+          topicQualifiedName,
+          new String(message.getData(), Charset.defaultCharset()));
+      return false;
     }
-
-    private Message createAvroMessage(BackupMessage backupMessage, CompiledSchema<Schema> schema) {
-        return new AvroMessage(backupMessage.getMessageId(), backupMessage.getData(), backupMessage.getTimestamp(), schema,
-                backupMessage.getPartitionKey());
+    logger.error(
+        "Topic {} not present. Not {} message {} {}",
+        topicQualifiedName,
+        contextName,
+        message.getId(),
+        new String(message.getData(), Charset.defaultCharset()));
+    return false;
+  }
+
+  private void waitOnBrokerTopicAvailability(CachedTopic cachedTopic) {
+    int tries = 0;
+    while (!isBrokerTopicAvailable(cachedTopic)) {
+      try {
+        tries++;
+        logger.info(
+            "Broker topic {} is not available, checked {} times.",
+            cachedTopic.getTopic().getQualifiedName(),
+            tries);
+        Thread.sleep(readTopicInfoSleep.toMillis());
+      } catch (InterruptedException e) {
+        logger.warn(
+            "Waiting for broker topic availability interrupted. Topic: {}",
+            cachedTopic.getTopic().getQualifiedName());
+      }
     }
+  }
 
-    private Message createJsonMessage(BackupMessage backupMessage) {
-        return new JsonMessage(backupMessage.getMessageId(), backupMessage.getData(), backupMessage.getTimestamp(),
-                backupMessage.getPartitionKey());
+  private boolean isBrokerTopicAvailable(CachedTopic cachedTopic) {
+    if (topicsAvailabilityCache.contains(cachedTopic.getTopic())) {
+      return true;
     }
 
-    private boolean sendMessageIfNeeded(Message message, String topicQualifiedName, Optional<CachedTopic> cachedTopic, String contextName) {
-        if (cachedTopic.isPresent()) {
-            if (isNotStale(message)) {
-                waitOnBrokerTopicAvailability(cachedTopic.get());
-                sendMessage(message, cachedTopic.get());
-                return true;
-            }
-            logger.warn("Not {} stale message {} {} {}", contextName, message.getId(), topicQualifiedName,
-                    new String(message.getData(), Charset.defaultCharset()));
-            return false;
-        }
-        logger.error("Topic {} not present. Not {} message {} {}", topicQualifiedName, contextName, message.getId(),
-                new String(message.getData(), Charset.defaultCharset()));
-        return false;
+    if (brokerTopicAvailabilityChecker.isTopicAvailable(cachedTopic)) {
+      topicsAvailabilityCache.add(cachedTopic.getTopic());
+      logger.info("Broker topic {} is available.", cachedTopic.getTopic().getQualifiedName());
+      return true;
     }
 
-    private void waitOnBrokerTopicAvailability(CachedTopic cachedTopic) {
-        int tries = 0;
-        while (!isBrokerTopicAvailable(cachedTopic)) {
-            try {
-                tries++;
-                logger.info("Broker topic {} is not available, checked {} times.", cachedTopic.getTopic().getQualifiedName(), tries);
-                Thread.sleep(readTopicInfoSleep.toMillis());
-            } catch (InterruptedException e) {
-                logger.warn("Waiting for broker topic availability interrupted. Topic: {}", cachedTopic.getTopic().getQualifiedName());
-            }
-        }
-    }
-
-    private boolean isBrokerTopicAvailable(CachedTopic cachedTopic) {
-        if (topicsAvailabilityCache.contains(cachedTopic.getTopic())) {
-            return true;
-        }
-
-        if (brokerMessageProducer.isTopicAvailable(cachedTopic)) {
-            topicsAvailabilityCache.add(cachedTopic.getTopic());
-            logger.info("Broker topic {} is available.", cachedTopic.getTopic().getQualifiedName());
-            return true;
-        }
-
-        return false;
-    }
-
-    private boolean isNotStale(Message message) {
-        return LocalDateTime.ofInstant(Instant.ofEpochMilli(message.getTimestamp()), ZoneId.systemDefault())
-                .isAfter(LocalDateTime.now().minusHours(messageMaxAgeHours.toHours()));
-    }
-
-    private void sendMessage(Message message, CachedTopic cachedTopic) {
-        HermesTimerContext brokerTimer = cachedTopic.startBrokerLatencyTimer();
-        brokerMessageProducer.send(message, cachedTopic, new PublishingCallback() {
-            @Override
-            public void onUnpublished(Message message, Topic topic, Exception exception) {
-                brokerTimer.close();
-                brokerListeners.onError(message, topic, exception);
-                trackers.get(topic).logError(message.getId(), topic.getName(), exception.getMessage(), "", Collections.emptyMap());
-                toResend.get().add(ImmutablePair.of(message, cachedTopic));
-            }
-
-            @Override
-            public void onPublished(Message message, Topic topic) {
-                brokerTimer.close();
-                cachedTopic.incrementPublished();
-                brokerListeners.onAcknowledge(message, topic);
-                trackers.get(topic).logPublished(message.getId(), topic.getName(), "", Collections.emptyMap());
-            }
+    return false;
+  }
+
+  private boolean isNotStale(Message message) {
+    return LocalDateTime.ofInstant(
+            Instant.ofEpochMilli(message.getTimestamp()), ZoneId.systemDefault())
+        .isAfter(LocalDateTime.now().minusHours(messageMaxAgeHours.toHours()));
+  }
+
+  private void sendMessage(Message message, CachedTopic cachedTopic) {
+    brokerMessageProducer.send(
+        message,
+        cachedTopic,
+        new PublishingCallback() {
+          @Override
+          public void onUnpublished(Message message, Topic topic, Exception exception) {
+            brokerListeners.onError(message, topic, exception);
+            trackers
+                .get(topic)
+                .logError(
+                    message.getId(),
+                    topic.getName(),
+                    exception.getMessage(),
+                    "",
+                    Collections.emptyMap());
+            toResend.get().add(ImmutablePair.of(message, cachedTopic));
+          }
+
+          @Override
+          public void onPublished(Message message, Topic topic) {
+            brokerListeners.onAcknowledge(message, topic);
+          }
+
+          @Override
+          public void onEachPublished(Message message, Topic topic, String datacenter) {
+            cachedTopic.incrementPublished(datacenter);
+            trackers
+                .get(topic)
+                .logPublished(
+                    message.getId(), topic.getName(), "", datacenter, Collections.emptyMap());
+          }
         });
-    }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoaderParameters.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoaderParameters.java
index 0229227d45..671e0e7380 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoaderParameters.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoaderParameters.java
@@ -4,11 +4,11 @@
 
 public interface BackupMessagesLoaderParameters {
 
-    Duration getMaxAge();
+  Duration getMaxAge();
 
-    int getMaxResendRetries();
+  int getMaxResendRetries();
 
-    Duration getLoadingPauseBetweenResend();
+  Duration getLoadingPauseBetweenResend();
 
-    Duration getLoadingWaitForBrokerTopicInfo();
+  Duration getLoadingWaitForBrokerTopicInfo();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BrokerListener.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BrokerListener.java
index c44917e62f..91e124e339 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BrokerListener.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/BrokerListener.java
@@ -6,26 +6,27 @@
 import pl.allegro.tech.hermes.frontend.listeners.BrokerTimeoutListener;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 
-public class BrokerListener implements BrokerAcknowledgeListener, BrokerTimeoutListener, BrokerErrorListener {
+public class BrokerListener
+    implements BrokerAcknowledgeListener, BrokerTimeoutListener, BrokerErrorListener {
 
-    private final MessageRepository messageRepository;
+  private final MessageRepository messageRepository;
 
-    public BrokerListener(MessageRepository messageRepository) {
-        this.messageRepository = messageRepository;
-    }
+  public BrokerListener(MessageRepository messageRepository) {
+    this.messageRepository = messageRepository;
+  }
 
-    @Override
-    public void onAcknowledge(Message message, Topic topic) {
-        messageRepository.delete(message.getId());
-    }
+  @Override
+  public void onAcknowledge(Message message, Topic topic) {
+    messageRepository.delete(message.getId());
+  }
 
-    @Override
-    public void onTimeout(Message message, Topic topic) {
-        messageRepository.save(message, topic);
-    }
+  @Override
+  public void onTimeout(Message message, Topic topic) {
+    messageRepository.save(message, topic);
+  }
 
-    @Override
-    public void onError(Message message, Topic topic, Exception ex) {
-        messageRepository.save(message, topic);
-    }
+  @Override
+  public void onError(Message message, Topic topic, Exception ex) {
+    messageRepository.save(message, topic);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/MessageRepository.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/MessageRepository.java
index 9bbc307cc0..0ee1973e3e 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/MessageRepository.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/MessageRepository.java
@@ -1,17 +1,16 @@
 package pl.allegro.tech.hermes.frontend.buffer;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 
-import java.util.List;
-
 public interface MessageRepository {
 
-    void save(Message message, Topic topic);
+  void save(Message message, Topic topic);
 
-    void delete(String messageId);
+  void delete(String messageId);
 
-    List<BackupMessage> findAll();
+  List<BackupMessage> findAll();
 
-    void close();
+  void close();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/PersistentBufferExtension.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/PersistentBufferExtension.java
index 80fd1cda92..0fa1dded8e 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/PersistentBufferExtension.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/PersistentBufferExtension.java
@@ -1,108 +1,114 @@
 package pl.allegro.tech.hermes.frontend.buffer;
 
+import static java.util.stream.Collectors.joining;
+
+import java.io.File;
+import java.time.Clock;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.frontend.buffer.chronicle.ChronicleMapMessageRepository;
 import pl.allegro.tech.hermes.frontend.listeners.BrokerListeners;
 
-import java.io.File;
-import java.time.Clock;
-import java.util.List;
-
-import static java.util.stream.Collectors.joining;
-
 public class PersistentBufferExtension {
 
-    private static final Logger logger = LoggerFactory.getLogger(PersistentBufferExtension.class);
+  private static final Logger logger = LoggerFactory.getLogger(PersistentBufferExtension.class);
 
-    private final PersistentBufferExtensionParameters persistentBufferExtensionParameters;
+  private final PersistentBufferExtensionParameters persistentBufferExtensionParameters;
 
-    private final Clock clock;
+  private final Clock clock;
 
-    private final BrokerListeners listeners;
+  private final BrokerListeners listeners;
 
-    private final BackupMessagesLoader backupMessagesLoader;
-    private final MetricsFacade metricsFacade;
+  private final BackupMessagesLoader backupMessagesLoader;
+  private final MetricsFacade metricsFacade;
 
-    private int entries;
-    private int avgMessageSize;
+  private int entries;
+  private int avgMessageSize;
 
-    public PersistentBufferExtension(PersistentBufferExtensionParameters persistentBufferExtensionParameters,
-                                     Clock clock,
-                                     BrokerListeners listeners,
-                                     BackupMessagesLoader backupMessagesLoader,
-                                     MetricsFacade metricsFacade) {
-        this.persistentBufferExtensionParameters = persistentBufferExtensionParameters;
-        this.clock = clock;
-        this.listeners = listeners;
-        this.backupMessagesLoader = backupMessagesLoader;
-        this.metricsFacade = metricsFacade;
-    }
-
-    public void extend() {
-        BackupFilesManager backupFilesManager = new BackupFilesManager(
-                persistentBufferExtensionParameters.getDirectory(),
-                clock);
-
-        long backupStorageSizeInBytes = persistentBufferExtensionParameters.getBufferedSizeBytes();
-        avgMessageSize = persistentBufferExtensionParameters.getAverageMessageSize();
-
-        entries = (int) (backupStorageSizeInBytes / avgMessageSize);
-
-        if (persistentBufferExtensionParameters.isV2MigrationEnabled()) {
-            loadTemporaryBackupV2Files(backupFilesManager);
-        }
-
-        backupFilesManager.rolloverBackupFileIfExists();
-        List<File> rolledBackupFiles = backupFilesManager.getRolledBackupFiles();
-        if (!rolledBackupFiles.isEmpty()) {
-            rollBackupFiles(backupFilesManager, rolledBackupFiles);
-        }
+  public PersistentBufferExtension(
+      PersistentBufferExtensionParameters persistentBufferExtensionParameters,
+      Clock clock,
+      BrokerListeners listeners,
+      BackupMessagesLoader backupMessagesLoader,
+      MetricsFacade metricsFacade) {
+    this.persistentBufferExtensionParameters = persistentBufferExtensionParameters;
+    this.clock = clock;
+    this.listeners = listeners;
+    this.backupMessagesLoader = backupMessagesLoader;
+    this.metricsFacade = metricsFacade;
+  }
 
-        if (persistentBufferExtensionParameters.isEnabled()) {
-            enableLocalStorage(backupFilesManager);
-        }
-    }
-
-    private void loadTemporaryBackupV2Files(BackupFilesManager backupFilesManager) {
-        String temporaryDir = persistentBufferExtensionParameters.getTemporaryDirectory();
-        List<File> temporaryBackupV2Files = backupFilesManager.getTemporaryBackupV2Files(temporaryDir);
-        temporaryBackupV2Files.forEach(f -> loadTemporaryBackupV2Messages(backupFilesManager, f));
-        backupMessagesLoader.clearTopicsAvailabilityCache();
-    }
-
-    private void rollBackupFiles(BackupFilesManager backupFilesManager, List<File> rolledBackupFiles) {
-        logger.info("Backup files were found. Number of files: {}. Files: {}",
-                rolledBackupFiles.size(),
-                rolledBackupFiles.stream().map(File::getName).collect(joining(", ")));
-        rolledBackupFiles.forEach(f -> loadOldMessages(backupFilesManager, f));
-            backupMessagesLoader.clearTopicsAvailabilityCache();
-    }
+  public void extend() {
+    BackupFilesManager backupFilesManager =
+        new BackupFilesManager(persistentBufferExtensionParameters.getDirectory(), clock);
 
-    private void enableLocalStorage(BackupFilesManager backupFilesManager) {
-        MessageRepository repository = persistentBufferExtensionParameters.isSizeReportingEnabled()
-                ? new ChronicleMapMessageRepository(backupFilesManager.getCurrentBackupFile(), entries, avgMessageSize, metricsFacade)
-                : new ChronicleMapMessageRepository(backupFilesManager.getCurrentBackupFile(), entries, avgMessageSize);
+    long backupStorageSizeInBytes = persistentBufferExtensionParameters.getBufferedSizeBytes();
+    avgMessageSize = persistentBufferExtensionParameters.getAverageMessageSize();
 
-        BrokerListener brokerListener = new BrokerListener(repository);
+    entries = (int) (backupStorageSizeInBytes / avgMessageSize);
 
-        listeners.addAcknowledgeListener(brokerListener);
-        listeners.addErrorListener(brokerListener);
-        listeners.addTimeoutListener(brokerListener);
+    if (persistentBufferExtensionParameters.isV2MigrationEnabled()) {
+      loadTemporaryBackupV2Files(backupFilesManager);
     }
 
-    private void loadTemporaryBackupV2Messages(BackupFilesManager backupFilesManager, File temporaryBackup) {
-        logger.info("Loading messages from temporary backup v2 file: {}", temporaryBackup.getName());
-        backupMessagesLoader.loadFromTemporaryBackupV2File(temporaryBackup);
-        backupFilesManager.delete(temporaryBackup);
+    backupFilesManager.rolloverBackupFileIfExists();
+    List<File> rolledBackupFiles = backupFilesManager.getRolledBackupFiles();
+    if (!rolledBackupFiles.isEmpty()) {
+      rollBackupFiles(backupFilesManager, rolledBackupFiles);
     }
 
-    private void loadOldMessages(BackupFilesManager backupFilesManager, File oldBackup) {
-        logger.info("Loading messages from backup file: {}", oldBackup.getName());
-        MessageRepository oldMessageRepository = new ChronicleMapMessageRepository(oldBackup, entries, avgMessageSize);
-        backupMessagesLoader.loadMessages(oldMessageRepository.findAll());
-        oldMessageRepository.close();
-        backupFilesManager.delete(oldBackup);
+    if (persistentBufferExtensionParameters.isEnabled()) {
+      enableLocalStorage(backupFilesManager);
     }
+  }
+
+  private void loadTemporaryBackupV2Files(BackupFilesManager backupFilesManager) {
+    String temporaryDir = persistentBufferExtensionParameters.getTemporaryDirectory();
+    List<File> temporaryBackupV2Files = backupFilesManager.getTemporaryBackupV2Files(temporaryDir);
+    temporaryBackupV2Files.forEach(f -> loadTemporaryBackupV2Messages(backupFilesManager, f));
+    backupMessagesLoader.clearTopicsAvailabilityCache();
+  }
+
+  private void rollBackupFiles(
+      BackupFilesManager backupFilesManager, List<File> rolledBackupFiles) {
+    logger.info(
+        "Backup files were found. Number of files: {}. Files: {}",
+        rolledBackupFiles.size(),
+        rolledBackupFiles.stream().map(File::getName).collect(joining(", ")));
+    rolledBackupFiles.forEach(f -> loadOldMessages(backupFilesManager, f));
+    backupMessagesLoader.clearTopicsAvailabilityCache();
+  }
+
+  private void enableLocalStorage(BackupFilesManager backupFilesManager) {
+    MessageRepository repository =
+        persistentBufferExtensionParameters.isSizeReportingEnabled()
+            ? new ChronicleMapMessageRepository(
+                backupFilesManager.getCurrentBackupFile(), entries, avgMessageSize, metricsFacade)
+            : new ChronicleMapMessageRepository(
+                backupFilesManager.getCurrentBackupFile(), entries, avgMessageSize);
+
+    BrokerListener brokerListener = new BrokerListener(repository);
+
+    listeners.addAcknowledgeListener(brokerListener);
+    listeners.addErrorListener(brokerListener);
+    listeners.addTimeoutListener(brokerListener);
+  }
+
+  private void loadTemporaryBackupV2Messages(
+      BackupFilesManager backupFilesManager, File temporaryBackup) {
+    logger.info("Loading messages from temporary backup v2 file: {}", temporaryBackup.getName());
+    backupMessagesLoader.loadFromTemporaryBackupV2File(temporaryBackup);
+    backupFilesManager.delete(temporaryBackup);
+  }
+
+  private void loadOldMessages(BackupFilesManager backupFilesManager, File oldBackup) {
+    logger.info("Loading messages from backup file: {}", oldBackup.getName());
+    MessageRepository oldMessageRepository =
+        new ChronicleMapMessageRepository(oldBackup, entries, avgMessageSize);
+    backupMessagesLoader.loadMessages(oldMessageRepository.findAll());
+    oldMessageRepository.close();
+    backupFilesManager.delete(oldBackup);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/PersistentBufferExtensionParameters.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/PersistentBufferExtensionParameters.java
index eff019cdb7..e7c5fae57f 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/PersistentBufferExtensionParameters.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/PersistentBufferExtensionParameters.java
@@ -2,17 +2,17 @@
 
 public interface PersistentBufferExtensionParameters {
 
-    long getBufferedSizeBytes();
+  long getBufferedSizeBytes();
 
-    boolean isV2MigrationEnabled();
+  boolean isV2MigrationEnabled();
 
-    boolean isEnabled();
+  boolean isEnabled();
 
-    String getDirectory();
+  String getDirectory();
 
-    String getTemporaryDirectory();
+  String getTemporaryDirectory();
 
-    int getAverageMessageSize();
+  int getAverageMessageSize();
 
-    boolean isSizeReportingEnabled();
+  boolean isSizeReportingEnabled();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/SimpleExecutionCallback.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/SimpleExecutionCallback.java
deleted file mode 100644
index 38905ef34a..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/SimpleExecutionCallback.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package pl.allegro.tech.hermes.frontend.buffer;
-
-import com.google.common.collect.Lists;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
-import pl.allegro.tech.hermes.frontend.publishing.message.Message;
-
-import java.util.List;
-
-public class SimpleExecutionCallback implements PublishingCallback {
-
-    private final List<PublishingCallback> callbacks;
-
-    public SimpleExecutionCallback(PublishingCallback... callbacks) {
-        this.callbacks = Lists.newArrayList(callbacks);
-    }
-
-    @Override
-    public void onUnpublished(Message message, Topic topic, Exception exception) {
-        callbacks.forEach(c -> c.onUnpublished(message, topic, exception));
-    }
-
-    @Override
-    public void onPublished(Message message, Topic topic) {
-        callbacks.forEach(c -> c.onPublished(message, topic));
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapClosedException.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapClosedException.java
index 98fad069bd..026ac42049 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapClosedException.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapClosedException.java
@@ -2,7 +2,7 @@
 
 public class ChronicleMapClosedException extends RuntimeException {
 
-    public ChronicleMapClosedException(String message) {
-        super(message);
-    }
+  public ChronicleMapClosedException(String message) {
+    super(message);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapCreationException.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapCreationException.java
index 8e32700812..80e177100d 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapCreationException.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapCreationException.java
@@ -2,7 +2,7 @@
 
 public class ChronicleMapCreationException extends RuntimeException {
 
-    public ChronicleMapCreationException(Exception e) {
-        super("Exception while creating ChronicleMap", e);
-    }
+  public ChronicleMapCreationException(Exception e) {
+    super("Exception while creating ChronicleMap", e);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapEntryValue.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapEntryValue.java
index c91c185eaf..ad1e716ce0 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapEntryValue.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapEntryValue.java
@@ -2,69 +2,90 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.Objects;
 
 public class ChronicleMapEntryValue implements Serializable {
-    static final long serialVersionUID = -2149667159974528954L;
+  static final long serialVersionUID = -2149667159974528954L;
 
-    private final byte[] data;
-    private final long timestamp;
-    private final String qualifiedTopicName;
-    private final String partitionKey;
-    private final Integer schemaVersion;
-    private final Integer schemaId;
+  private final byte[] data;
+  private final long timestamp;
+  private final String qualifiedTopicName;
+  private final String partitionKey;
+  private final Integer schemaVersion;
+  private final Integer schemaId;
+  private final Map<String, String> propagatedHttpHeaders;
 
-    public ChronicleMapEntryValue(byte[] data, long timestamp, String qualifiedTopicName, String partitionKey,
-                                  Integer schemaVersion, Integer schemaId) {
-        this.data = data;
-        this.timestamp = timestamp;
-        this.qualifiedTopicName = qualifiedTopicName;
-        this.partitionKey = partitionKey;
-        this.schemaVersion = schemaVersion;
-        this.schemaId = schemaId;
-    }
+  public ChronicleMapEntryValue(
+      byte[] data,
+      long timestamp,
+      String qualifiedTopicName,
+      String partitionKey,
+      Integer schemaVersion,
+      Integer schemaId,
+      Map<String, String> propagatedHttpHeaders) {
+    this.data = data;
+    this.timestamp = timestamp;
+    this.qualifiedTopicName = qualifiedTopicName;
+    this.partitionKey = partitionKey;
+    this.schemaVersion = schemaVersion;
+    this.schemaId = schemaId;
+    this.propagatedHttpHeaders = propagatedHttpHeaders;
+  }
 
-    public byte[] getData() {
-        return data;
-    }
+  public byte[] getData() {
+    return data;
+  }
 
-    public long getTimestamp() {
-        return timestamp;
-    }
+  public long getTimestamp() {
+    return timestamp;
+  }
 
-    public String getQualifiedTopicName() {
-        return qualifiedTopicName;
-    }
+  public String getQualifiedTopicName() {
+    return qualifiedTopicName;
+  }
 
-    public String getPartitionKey() {
-        return partitionKey;
-    }
+  public String getPartitionKey() {
+    return partitionKey;
+  }
 
-    public Integer getSchemaVersion() {
-        return schemaVersion;
-    }
+  public Integer getSchemaVersion() {
+    return schemaVersion;
+  }
 
-    public Integer getSchemaId() {
-        return schemaId;
-    }
+  public Integer getSchemaId() {
+    return schemaId;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof ChronicleMapEntryValue)) {
-            return false;
-        }
-        ChronicleMapEntryValue that = (ChronicleMapEntryValue) o;
-        return Objects.equals(timestamp, that.timestamp)
-                && Arrays.equals(data, that.data)
-                && Objects.equals(qualifiedTopicName, that.qualifiedTopicName)
-                && Objects.equals(partitionKey, that.partitionKey);
-    }
+  public Map<String, String> getPropagatedHttpHeaders() {
+    return propagatedHttpHeaders;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(data, timestamp, qualifiedTopicName, partitionKey, schemaVersion, schemaId);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
+    if (!(o instanceof ChronicleMapEntryValue)) {
+      return false;
+    }
+    ChronicleMapEntryValue that = (ChronicleMapEntryValue) o;
+    return Objects.equals(timestamp, that.timestamp)
+        && Arrays.equals(data, that.data)
+        && Objects.equals(qualifiedTopicName, that.qualifiedTopicName)
+        && Objects.equals(partitionKey, that.partitionKey)
+        && Objects.equals(propagatedHttpHeaders, that.propagatedHttpHeaders);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        data,
+        timestamp,
+        qualifiedTopicName,
+        partitionKey,
+        schemaVersion,
+        schemaId,
+        propagatedHttpHeaders);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapMessageRepository.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapMessageRepository.java
index 086b4ba50f..dab4eb2b65 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapMessageRepository.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/buffer/chronicle/ChronicleMapMessageRepository.java
@@ -1,5 +1,13 @@
 package pl.allegro.tech.hermes.frontend.buffer.chronicle;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.ChronicleMapBuilder;
 import org.slf4j.Logger;
@@ -11,104 +19,111 @@
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageIdGenerator;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.stream.Collectors;
-
 public class ChronicleMapMessageRepository implements MessageRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(ChronicleMapMessageRepository.class);
-
-    private static final boolean SAME_BUILDER_CONFIG = false;
-
-    private final ChronicleMap<String, ChronicleMapEntryValue> map;
-
-    private boolean closed = false;
-    private final ReadWriteLock closeLock = new ReentrantReadWriteLock();
-
-    static {
-        System.setProperty("chronicle.map.disable.locking", Boolean.TRUE.toString());
-    }
-
-    public ChronicleMapMessageRepository(File file, int entries, int averageMessageSize) {
-        logger.info("Creating backup storage in path: {}", file.getAbsolutePath());
-        try {
-            map = ChronicleMapBuilder.of(String.class, ChronicleMapEntryValue.class)
-                    .constantKeySizeBySample(MessageIdGenerator.generate())
-                    .averageValueSize(averageMessageSize)
-                    .entries(entries)
-                    .setPreShutdownAction(new LoggingMapSizePreShutdownHook())
-                    .sparseFile(true)
-                    .createOrRecoverPersistedTo(file, SAME_BUILDER_CONFIG);
-        } catch (IOException e) {
-            logger.error("Failed to load backup storage file from path {}", file.getAbsoluteFile(), e);
-            throw new ChronicleMapCreationException(e);
-        }
-    }
-
-    public ChronicleMapMessageRepository(File file, int entries, int averageMessageSize, MetricsFacade metricsFacade) {
-        this(file, entries, averageMessageSize);
-        metricsFacade.persistentBuffer().registerBackupStorageSizeGauge(map, Map::size);
+  private static final Logger logger = LoggerFactory.getLogger(ChronicleMapMessageRepository.class);
+
+  private static final boolean SAME_BUILDER_CONFIG = false;
+
+  private final ChronicleMap<String, ChronicleMapEntryValue> map;
+
+  private boolean closed = false;
+  private final ReadWriteLock closeLock = new ReentrantReadWriteLock();
+
+  static {
+    System.setProperty("chronicle.map.disable.locking", Boolean.TRUE.toString());
+  }
+
+  public ChronicleMapMessageRepository(File file, int entries, int averageMessageSize) {
+    logger.info("Creating backup storage in path: {}", file.getAbsolutePath());
+    try {
+      map =
+          ChronicleMapBuilder.of(String.class, ChronicleMapEntryValue.class)
+              .constantKeySizeBySample(MessageIdGenerator.generate())
+              .averageValueSize(averageMessageSize)
+              .entries(entries)
+              .setPreShutdownAction(new LoggingMapSizePreShutdownHook())
+              .sparseFile(true)
+              .createOrRecoverPersistedTo(file, SAME_BUILDER_CONFIG);
+    } catch (IOException e) {
+      logger.error("Failed to load backup storage file from path {}", file.getAbsoluteFile(), e);
+      throw new ChronicleMapCreationException(e);
     }
-
-    @Override
-    public void save(Message message, Topic topic) {
-        Lock lock = closeLock.readLock();
-        lock.lock();
-        try {
-            if (closed) {
-                throw new ChronicleMapClosedException("Backup storage is closed. Unable to add new messages.");
-            }
-            map.put(message.getId(),
-                    new ChronicleMapEntryValue(
-                            message.getData(), message.getTimestamp(), topic.getQualifiedName(),
-                            message.getPartitionKey(), message.getCompiledSchema().map(v -> v.getVersion().value()).orElse(null),
-                            message.getCompiledSchema().map(v -> v.getId().value()).orElse(null)));
-        } finally {
-            lock.unlock();
-        }
+  }
+
+  public ChronicleMapMessageRepository(
+      File file, int entries, int averageMessageSize, MetricsFacade metricsFacade) {
+    this(file, entries, averageMessageSize);
+    metricsFacade.persistentBuffer().registerBackupStorageSizeGauge(map, Map::size);
+  }
+
+  @Override
+  public void save(Message message, Topic topic) {
+    Lock lock = closeLock.readLock();
+    lock.lock();
+    try {
+      if (closed) {
+        throw new ChronicleMapClosedException(
+            "Backup storage is closed. Unable to add new messages.");
+      }
+      map.put(
+          message.getId(),
+          new ChronicleMapEntryValue(
+              message.getData(),
+              message.getTimestamp(),
+              topic.getQualifiedName(),
+              message.getPartitionKey(),
+              message.getCompiledSchema().map(v -> v.getVersion().value()).orElse(null),
+              message.getCompiledSchema().map(v -> v.getId().value()).orElse(null),
+              message.getHTTPHeaders()));
+    } finally {
+      lock.unlock();
     }
+  }
+
+  @Override
+  public void delete(String messageId) {
+    map.remove(messageId);
+  }
+
+  @Override
+  public List<BackupMessage> findAll() {
+    return map.entrySet().stream()
+        .map((e) -> toBackupMessage(e.getKey(), e.getValue()))
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public void close() {
+    map.close();
+  }
+
+  private BackupMessage toBackupMessage(String id, ChronicleMapEntryValue entryValue) {
+    return new BackupMessage(
+        id,
+        entryValue.getData(),
+        entryValue.getTimestamp(),
+        entryValue.getQualifiedTopicName(),
+        entryValue.getPartitionKey(),
+        entryValue.getSchemaVersion(),
+        entryValue.getSchemaId(),
+        entryValue.getPropagatedHttpHeaders());
+  }
+
+  private class LoggingMapSizePreShutdownHook implements Runnable {
 
     @Override
-    public void delete(String messageId) {
-        map.remove(messageId);
-    }
-
-    @Override
-    public List<BackupMessage> findAll() {
-        return map.entrySet().stream().map((e) -> toBackupMessage(e.getKey(), e.getValue())).collect(Collectors.toList());
-    }
-
-    @Override
-    public void close() {
-        map.close();
-    }
-
-    private BackupMessage toBackupMessage(String id, ChronicleMapEntryValue entryValue) {
-        return new BackupMessage(id, entryValue.getData(), entryValue.getTimestamp(),
-                entryValue.getQualifiedTopicName(), entryValue.getPartitionKey(), entryValue.getSchemaVersion(),
-                entryValue.getSchemaId());
-    }
-
-    private class LoggingMapSizePreShutdownHook implements Runnable {
-
-        @Override
-        public void run() {
-            Lock lock = closeLock.writeLock();
-            lock.lock();
-            try {
-                closed = true;
-                if (map != null) {
-                    logger.info("Closing backup storage with {} messages.", map.size());
-                }
-            } finally {
-                lock.unlock();
-            }
+    public void run() {
+      Lock lock = closeLock.writeLock();
+      lock.lock();
+      try {
+        closed = true;
+        if (map != null) {
+          logger.info("Closing backup storage with {} messages.", map.size());
         }
+      } finally {
+        lock.unlock();
+      }
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/cache/topic/NotificationBasedTopicsCache.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/cache/topic/NotificationBasedTopicsCache.java
index bf2e7a9d92..fb44476623 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/cache/topic/NotificationBasedTopicsCache.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/cache/topic/NotificationBasedTopicsCache.java
@@ -1,6 +1,10 @@
 package pl.allegro.tech.hermes.frontend.cache.topic;
 
 import com.google.common.collect.ImmutableList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Topic;
@@ -14,104 +18,118 @@
 import pl.allegro.tech.hermes.frontend.blacklist.BlacklistZookeeperNotifyingCache;
 import pl.allegro.tech.hermes.frontend.blacklist.TopicBlacklistCallback;
 import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class NotificationBasedTopicsCache implements TopicCallback, TopicsCache, TopicBlacklistCallback {
-
-    private static final Logger logger = LoggerFactory.getLogger(NotificationBasedTopicsCache.class);
-
-    private final ConcurrentMap<String, CachedTopic> topicCache = new ConcurrentHashMap<>();
-
-    private final GroupRepository groupRepository;
-    private final TopicRepository topicRepository;
-    private final MetricsFacade metricsFacade;
-    private final KafkaNamesMapper kafkaNamesMapper;
-
-    public NotificationBasedTopicsCache(InternalNotificationsBus notificationsBus,
-                                        BlacklistZookeeperNotifyingCache blacklistZookeeperNotifyingCache,
-                                        GroupRepository groupRepository,
-                                        TopicRepository topicRepository,
-                                        MetricsFacade metricsFacade,
-                                        KafkaNamesMapper kafkaNamesMapper) {
-        this.groupRepository = groupRepository;
-        this.topicRepository = topicRepository;
-        this.metricsFacade = metricsFacade;
-        this.kafkaNamesMapper = kafkaNamesMapper;
-        notificationsBus.registerTopicCallback(this);
-        blacklistZookeeperNotifyingCache.addCallback(this);
-    }
-
-    @Override
-    public void onTopicCreated(Topic topic) {
-        topicCache.put(topic.getName().qualifiedName(), cachedTopic(topic));
+import pl.allegro.tech.hermes.frontend.metric.ThroughputRegistry;
+
+public class NotificationBasedTopicsCache
+    implements TopicCallback, TopicsCache, TopicBlacklistCallback {
+
+  private static final Logger logger = LoggerFactory.getLogger(NotificationBasedTopicsCache.class);
+
+  private final ConcurrentMap<String, CachedTopic> topicCache = new ConcurrentHashMap<>();
+
+  private final GroupRepository groupRepository;
+  private final TopicRepository topicRepository;
+  private final MetricsFacade metricsFacade;
+  private final KafkaNamesMapper kafkaNamesMapper;
+  private final ThroughputRegistry throughputRegistry;
+
+  public NotificationBasedTopicsCache(
+      InternalNotificationsBus notificationsBus,
+      BlacklistZookeeperNotifyingCache blacklistZookeeperNotifyingCache,
+      GroupRepository groupRepository,
+      TopicRepository topicRepository,
+      MetricsFacade metricsFacade,
+      ThroughputRegistry throughputRegistry,
+      KafkaNamesMapper kafkaNamesMapper) {
+    this.groupRepository = groupRepository;
+    this.topicRepository = topicRepository;
+    this.metricsFacade = metricsFacade;
+    this.kafkaNamesMapper = kafkaNamesMapper;
+    this.throughputRegistry = throughputRegistry;
+    notificationsBus.registerTopicCallback(this);
+    blacklistZookeeperNotifyingCache.addCallback(this);
+  }
+
+  @Override
+  public void onTopicCreated(Topic topic) {
+    topicCache.put(topic.getName().qualifiedName(), cachedTopic(topic));
+  }
+
+  @Override
+  public void onTopicRemoved(Topic topic) {
+    if (topicCache.containsKey(topic.getName().qualifiedName())) {
+      Topic cachedTopic = topicCache.get(topic.getName().qualifiedName()).getTopic();
+      if (cachedTopic.equals(topic)) {
+        topicCache.remove(topic.getName().qualifiedName());
+      } else {
+        logger.warn(
+            "Received event about removed topic but cache contains different topic under the same name."
+                + "Cached topic {}, removed topic {}",
+            cachedTopic,
+            topic);
+      }
     }
-
-    @Override
-    public void onTopicRemoved(Topic topic) {
-        if (topicCache.containsKey(topic.getName().qualifiedName())) {
-            Topic cachedTopic = topicCache.get(topic.getName().qualifiedName()).getTopic();
-            if (cachedTopic.equals(topic)) {
-                topicCache.remove(topic.getName().qualifiedName());
-            } else {
-                logger.warn("Received event about removed topic but cache contains different topic under the same name."
-                        + "Cached topic {}, removed topic {}", cachedTopic, topic);
-            }
-        }
-    }
-
-    @Override
-    public void onTopicChanged(Topic topic) {
-        topicCache.put(topic.getName().qualifiedName(), cachedTopic(topic));
+  }
+
+  @Override
+  public void onTopicChanged(Topic topic) {
+    topicCache.put(topic.getName().qualifiedName(), cachedTopic(topic));
+  }
+
+  @Override
+  public void onTopicBlacklisted(String qualifiedTopicName) {
+    Optional<Topic> topic =
+        Optional.ofNullable(
+            Optional.ofNullable(topicCache.get(qualifiedTopicName))
+                .map(CachedTopic::getTopic)
+                .orElseGet(
+                    () ->
+                        topicRepository.getTopicDetails(
+                            TopicName.fromQualifiedName(qualifiedTopicName))));
+
+    topic.ifPresent(t -> topicCache.put(qualifiedTopicName, bannedTopic(t)));
+  }
+
+  @Override
+  public void onTopicUnblacklisted(String qualifiedTopicName) {
+    Optional<Topic> topic =
+        Optional.ofNullable(
+            Optional.ofNullable(topicCache.get(qualifiedTopicName))
+                .map(CachedTopic::getTopic)
+                .orElseGet(
+                    () ->
+                        topicRepository.getTopicDetails(
+                            TopicName.fromQualifiedName(qualifiedTopicName))));
+
+    topic.ifPresent(t -> topicCache.put(qualifiedTopicName, cachedTopic(t)));
+  }
+
+  @Override
+  public Optional<CachedTopic> getTopic(String qualifiedTopicName) {
+    return Optional.ofNullable(topicCache.get(qualifiedTopicName));
+  }
+
+  @Override
+  public List<CachedTopic> getTopics() {
+    return ImmutableList.copyOf(topicCache.values());
+  }
+
+  @Override
+  public void start() {
+    for (String groupName : groupRepository.listGroupNames()) {
+      for (Topic topic : topicRepository.listTopics(groupName)) {
+        topicCache.put(topic.getQualifiedName(), cachedTopic(topic));
+      }
     }
+  }
 
-    @Override
-    public void onTopicBlacklisted(String qualifiedTopicName) {
-        Optional<Topic> topic = Optional.ofNullable(
-                Optional.ofNullable(
-                        topicCache.get(qualifiedTopicName)).map(CachedTopic::getTopic).orElseGet(() ->
-                        topicRepository.getTopicDetails(TopicName.fromQualifiedName(qualifiedTopicName))));
+  private CachedTopic cachedTopic(Topic topic) {
+    return new CachedTopic(
+        topic, metricsFacade, throughputRegistry, kafkaNamesMapper.toKafkaTopics(topic));
+  }
 
-        topic.ifPresent(t -> topicCache.put(qualifiedTopicName, bannedTopic(t)));
-    }
-
-    @Override
-    public void onTopicUnblacklisted(String qualifiedTopicName) {
-        Optional<Topic> topic = Optional.ofNullable(
-                Optional.ofNullable(
-                        topicCache.get(qualifiedTopicName)).map(CachedTopic::getTopic).orElseGet(() ->
-                        topicRepository.getTopicDetails(TopicName.fromQualifiedName(qualifiedTopicName))));
-
-        topic.ifPresent(t -> topicCache.put(qualifiedTopicName, cachedTopic(t)));
-    }
-
-    @Override
-    public Optional<CachedTopic> getTopic(String qualifiedTopicName) {
-        return Optional.ofNullable(topicCache.get(qualifiedTopicName));
-    }
-
-    @Override
-    public List<CachedTopic> getTopics() {
-        return ImmutableList.copyOf(topicCache.values());
-    }
-
-    @Override
-    public void start() {
-        for (String groupName : groupRepository.listGroupNames()) {
-            for (Topic topic : topicRepository.listTopics(groupName)) {
-                topicCache.put(topic.getQualifiedName(), cachedTopic(topic));
-            }
-        }
-    }
-
-    private CachedTopic cachedTopic(Topic topic) {
-        return new CachedTopic(topic, metricsFacade, kafkaNamesMapper.toKafkaTopics(topic));
-    }
-
-    private CachedTopic bannedTopic(Topic topic) {
-        return new CachedTopic(topic, metricsFacade, kafkaNamesMapper.toKafkaTopics(topic), true);
-    }
+  private CachedTopic bannedTopic(Topic topic) {
+    return new CachedTopic(
+        topic, metricsFacade, throughputRegistry, kafkaNamesMapper.toKafkaTopics(topic), true);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/cache/topic/TopicsCache.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/cache/topic/TopicsCache.java
index 520e33d536..39b8b56d42 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/cache/topic/TopicsCache.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/cache/topic/TopicsCache.java
@@ -1,16 +1,14 @@
 package pl.allegro.tech.hermes.frontend.cache.topic;
 
-import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
-
 import java.util.List;
 import java.util.Optional;
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
 
 public interface TopicsCache {
 
-    Optional<CachedTopic> getTopic(String qualifiedTopicName);
-
-    List<CachedTopic> getTopics();
+  Optional<CachedTopic> getTopic(String qualifiedTopicName);
 
-    void start();
+  List<CachedTopic> getTopics();
 
+  void start();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/BrokerLatencyReporterConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/BrokerLatencyReporterConfiguration.java
new file mode 100644
index 0000000000..d92b07ae52
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/BrokerLatencyReporterConfiguration.java
@@ -0,0 +1,33 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import java.util.concurrent.ExecutorService;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory;
+import pl.allegro.tech.hermes.frontend.producer.BrokerLatencyReporter;
+
+@Configuration
+@EnableConfigurationProperties(BrokerLatencyReporterProperties.class)
+public class BrokerLatencyReporterConfiguration {
+
+  @Bean
+  BrokerLatencyReporter brokerLatencyReporter(
+      BrokerLatencyReporterProperties properties,
+      MetricsFacade metricsFacade,
+      InstrumentedExecutorServiceFactory executorServiceFactory) {
+    ExecutorService executorService =
+        executorServiceFactory.getExecutorService(
+            "broker-latency-reporter",
+            properties.getThreadPoolSize(),
+            true,
+            properties.getThreadPoolQueueCapacity());
+
+    return new BrokerLatencyReporter(
+        properties.isEnabled(),
+        metricsFacade,
+        properties.getSlowResponseLoggingThreshold(),
+        executorService);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/BrokerLatencyReporterProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/BrokerLatencyReporterProperties.java
new file mode 100644
index 0000000000..dc54308c3c
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/BrokerLatencyReporterProperties.java
@@ -0,0 +1,44 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "frontend.broker-latency-reporter")
+public class BrokerLatencyReporterProperties {
+  private boolean enabled;
+  private Duration slowResponseLoggingThreshold = Duration.ofMillis(100);
+  private int threadPoolSize = 8;
+  private int threadPoolQueueCapacity = 1_000_000;
+
+  public int getThreadPoolSize() {
+    return threadPoolSize;
+  }
+
+  public void setThreadPoolSize(int threadPoolSize) {
+    this.threadPoolSize = threadPoolSize;
+  }
+
+  public int getThreadPoolQueueCapacity() {
+    return threadPoolQueueCapacity;
+  }
+
+  public void setThreadPoolQueueCapacity(int threadPoolQueueCapacity) {
+    this.threadPoolQueueCapacity = threadPoolQueueCapacity;
+  }
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  public Duration getSlowResponseLoggingThreshold() {
+    return slowResponseLoggingThreshold;
+  }
+
+  public void setSlowResponseLoggingThreshold(Duration slowResponseLoggingThreshold) {
+    this.slowResponseLoggingThreshold = slowResponseLoggingThreshold;
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java
index 6ee77fb667..dfc71aae5b 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java
@@ -1,12 +1,14 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import com.codahale.metrics.MetricRegistry;
+import static io.micrometer.core.instrument.Clock.SYSTEM;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 import io.micrometer.prometheus.PrometheusConfig;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
-import jakarta.inject.Named;
+import java.time.Clock;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -16,7 +18,6 @@
 import pl.allegro.tech.hermes.common.clock.ClockFactory;
 import pl.allegro.tech.hermes.common.di.factories.CuratorClientFactory;
 import pl.allegro.tech.hermes.common.di.factories.HermesCuratorClientFactory;
-import pl.allegro.tech.hermes.common.di.factories.MetricRegistryFactory;
 import pl.allegro.tech.hermes.common.di.factories.MicrometerRegistryParameters;
 import pl.allegro.tech.hermes.common.di.factories.ModelAwareZookeeperNotifyingCacheFactory;
 import pl.allegro.tech.hermes.common.di.factories.ObjectMapperFactory;
@@ -33,12 +34,10 @@
 import pl.allegro.tech.hermes.common.message.wrapper.AvroMessageSchemaVersionTruncationContentWrapper;
 import pl.allegro.tech.hermes.common.message.wrapper.CompositeMessageContentWrapper;
 import pl.allegro.tech.hermes.common.message.wrapper.JsonMessageContentWrapper;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.common.metric.counter.CounterStorage;
 import pl.allegro.tech.hermes.common.metric.counter.zookeeper.ZookeeperCounterStorage;
 import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory;
-import pl.allegro.tech.hermes.common.metric.executor.ThreadPoolMetrics;
 import pl.allegro.tech.hermes.common.util.InetAddressInstanceIdResolver;
 import pl.allegro.tech.hermes.common.util.InstanceIdResolver;
 import pl.allegro.tech.hermes.domain.filtering.MessageFilter;
@@ -74,324 +73,331 @@
 import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 
-import java.time.Clock;
-import java.util.List;
-
-import static io.micrometer.core.instrument.Clock.SYSTEM;
-
 @Configuration
 @EnableConfigurationProperties({
-        MetricRegistryProperties.class,
-        MicrometerRegistryProperties.class,
-        GraphiteProperties.class,
-        PrometheusProperties.class,
-        SchemaProperties.class,
-        ZookeeperClustersProperties.class,
-        KafkaClustersProperties.class,
-        ContentRootProperties.class,
-        DatacenterNameProperties.class
+  MetricRegistryProperties.class,
+  MicrometerRegistryProperties.class,
+  PrometheusProperties.class,
+  SchemaProperties.class,
+  ZookeeperClustersProperties.class,
+  KafkaClustersProperties.class,
+  ContentRootProperties.class,
+  DatacenterNameProperties.class,
+  TopicDefaultsProperties.class
 })
 public class CommonConfiguration {
 
-    @Bean
-    public DatacenterNameProvider dcNameProvider(DatacenterNameProperties datacenterNameProperties) {
-        if (datacenterNameProperties.getSource() == DcNameSource.ENV) {
-            return new EnvironmentVariableDatacenterNameProvider(datacenterNameProperties.getEnv());
-        } else {
-            return new DefaultDatacenterNameProvider();
-        }
-    }
-
-    @Bean
-    public SubscriptionRepository subscriptionRepository(CuratorFramework zookeeper,
-                                                         ZookeeperPaths paths,
-                                                         ObjectMapper mapper,
-                                                         TopicRepository topicRepository) {
-        return new ZookeeperSubscriptionRepository(zookeeper, mapper, paths, topicRepository);
-    }
-
-    @Bean
-    public OAuthProviderRepository oAuthProviderRepository(CuratorFramework zookeeper,
-                                                           ZookeeperPaths paths,
-                                                           ObjectMapper mapper) {
-        return new ZookeeperOAuthProviderRepository(zookeeper, mapper, paths);
-    }
-
-    @Bean
-    public TopicRepository topicRepository(CuratorFramework zookeeper,
-                                           ZookeeperPaths paths,
-                                           ObjectMapper mapper,
-                                           GroupRepository groupRepository) {
-        return new ZookeeperTopicRepository(zookeeper, mapper, paths, groupRepository);
-    }
-
-    @Bean
-    public GroupRepository groupRepository(CuratorFramework zookeeper,
-                                           ZookeeperPaths paths,
-                                           ObjectMapper mapper) {
-        return new ZookeeperGroupRepository(zookeeper, mapper, paths);
-    }
-
-    @Bean(destroyMethod = "close")
-    public CuratorFramework hermesCurator(ZookeeperClustersProperties zookeeperClustersProperties,
-                                          CuratorClientFactory curatorClientFactory,
-                                          DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new HermesCuratorClientFactory(zookeeperProperties, curatorClientFactory).provide();
-    }
-
-    @Bean
-    public CuratorClientFactory curatorClientFactory(ZookeeperClustersProperties zookeeperClustersProperties,
-                                                     DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new CuratorClientFactory(zookeeperProperties);
-    }
-
-    @Bean
-    public FilterChainFactory filterChainFactory(MessageFilterSource filters) {
-        return new FilterChainFactory(filters);
-    }
-
-    @Bean
-    public InternalNotificationsBus zookeeperInternalNotificationBus(ObjectMapper objectMapper,
-                                                                     ModelAwareZookeeperNotifyingCache modelNotifyingCache) {
-        return new ZookeeperInternalNotificationBus(objectMapper, modelNotifyingCache);
-    }
-
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    public ModelAwareZookeeperNotifyingCache modelAwareZookeeperNotifyingCache(CuratorFramework curator,
-                                                                               ZookeeperClustersProperties zookeeperClustersProperties,
-                                                                               DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new ModelAwareZookeeperNotifyingCacheFactory(curator, zookeeperProperties).provide();
-    }
-
-    @Bean
-    public UndeliveredMessageLog undeliveredMessageLog(CuratorFramework zookeeper,
-                                                       ZookeeperPaths paths,
-                                                       ObjectMapper mapper,
-                                                       MetricsFacade metricsFacade) {
-        return new ZookeeperUndeliveredMessageLog(zookeeper, paths, mapper, metricsFacade);
-    }
-
-    @Bean
-    public ThreadPoolMetrics threadPoolMetrics(MetricsFacade metricsFacade) {
-        return new ThreadPoolMetrics(metricsFacade);
-    }
-
-    @Bean
-    public InstrumentedExecutorServiceFactory instrumentedExecutorServiceFactory(ThreadPoolMetrics threadPoolMetrics) {
-        return new InstrumentedExecutorServiceFactory(threadPoolMetrics);
-    }
-
-    @Bean
-    public ZookeeperAdminCache zookeeperAdminCache(ZookeeperPaths zookeeperPaths,
-                                                   CuratorFramework client,
-                                                   ObjectMapper objectMapper,
-                                                   Clock clock) {
-        return new ZookeeperAdminCache(zookeeperPaths, client, objectMapper, clock);
-    }
-
-    @Bean
-    public ObjectMapper objectMapper(SchemaProperties schemaProperties) {
-        return new ObjectMapperFactory(schemaProperties.isIdSerializationEnabled()).provide();
-    }
-
-    @Bean
-    public CompositeMessageContentWrapper messageContentWrapper(
-            JsonMessageContentWrapper jsonMessageContentWrapper,
-            AvroMessageContentWrapper avroMessageContentWrapper,
-            AvroMessageSchemaIdAwareContentWrapper schemaIdAwareContentWrapper,
-            AvroMessageHeaderSchemaVersionContentWrapper headerSchemaVersionContentWrapper,
-            AvroMessageHeaderSchemaIdContentWrapper headerSchemaIdContentWrapper,
-            AvroMessageSchemaVersionTruncationContentWrapper schemaVersionTruncationContentWrapper) {
-        return new CompositeMessageContentWrapper(
-                jsonMessageContentWrapper,
-                avroMessageContentWrapper,
-                schemaIdAwareContentWrapper,
-                headerSchemaVersionContentWrapper,
-                headerSchemaIdContentWrapper,
-                schemaVersionTruncationContentWrapper);
-    }
-
-    @Bean
-    public JsonMessageContentWrapper jsonMessageContentWrapper(ContentRootProperties contentRootProperties,
-                                                               ObjectMapper mapper) {
-        return new JsonMessageContentWrapper(contentRootProperties.getMessage(), contentRootProperties.getMetadata(), mapper);
-    }
-
-    @Bean
-    public AvroMessageContentWrapper avroMessageContentWrapper(Clock clock) {
-        return new AvroMessageContentWrapper(clock);
-    }
-
-    @Bean
-    public AvroMessageSchemaVersionTruncationContentWrapper avroMessageSchemaVersionTruncationContentWrapper(
-            SchemaRepository schemaRepository,
-            AvroMessageContentWrapper avroMessageContentWrapper,
-            MetricsFacade metricsFacade,
-            SchemaProperties schemaProperties) {
-        return new AvroMessageSchemaVersionTruncationContentWrapper(schemaRepository, avroMessageContentWrapper,
-                metricsFacade, schemaProperties.isVersionTruncationEnabled());
-    }
-
-    @Bean
-    public AvroMessageHeaderSchemaIdContentWrapper avroMessageHeaderSchemaIdContentWrapper(
-            SchemaRepository schemaRepository,
-            AvroMessageContentWrapper avroMessageContentWrapper,
-            MetricsFacade metricsFacade,
-            SchemaProperties schemaProperties) {
-        return new AvroMessageHeaderSchemaIdContentWrapper(schemaRepository, avroMessageContentWrapper,
-                metricsFacade, schemaProperties.isIdHeaderEnabled());
-    }
-
-    @Bean
-    public AvroMessageHeaderSchemaVersionContentWrapper avroMessageHeaderSchemaVersionContentWrapper(
-            SchemaRepository schemaRepository,
-            AvroMessageContentWrapper avroMessageContentWrapper,
-            MetricsFacade metricsFacade) {
-        return new AvroMessageHeaderSchemaVersionContentWrapper(schemaRepository, avroMessageContentWrapper,
-                metricsFacade);
-    }
-
-    @Bean
-    public AvroMessageSchemaIdAwareContentWrapper avroMessageSchemaIdAwareContentWrapper(
-            SchemaRepository schemaRepository,
-            AvroMessageContentWrapper avroMessageContentWrapper,
-            MetricsFacade metricsFacade) {
-        return new AvroMessageSchemaIdAwareContentWrapper(schemaRepository, avroMessageContentWrapper,
-                metricsFacade);
-    }
-
-    @Bean
-    public KafkaNamesMapper prodKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
-        return new NamespaceKafkaNamesMapper(kafkaClustersProperties.getNamespace(), kafkaClustersProperties.getNamespaceSeparator());
-    }
-
-    @Bean
-    public Clock clock() {
-        return new ClockFactory().provide();
-    }
-
-    @Bean
-    public ZookeeperPaths zookeeperPaths(ZookeeperClustersProperties zookeeperClustersProperties,
-                                         DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new ZookeeperPaths(zookeeperProperties.getRoot());
-    }
-
-    @Bean
-    public WorkloadConstraintsRepository workloadConstraintsRepository(CuratorFramework curator,
-                                                                       ObjectMapper mapper,
-                                                                       ZookeeperPaths paths) {
-        return new ZookeeperWorkloadConstraintsRepository(curator, mapper, paths);
-    }
-
-    @Bean
-    public HermesMetrics hermesMetrics(MetricRegistry metricRegistry,
-                                       PathsCompiler pathsCompiler) {
-        return new HermesMetrics(metricRegistry, pathsCompiler);
-    }
-
-    @Bean
-    public MetricsFacade micrometerHermesMetrics(MeterRegistry meterRegistry, HermesMetrics hermesMetrics) {
-        return new MetricsFacade(meterRegistry, hermesMetrics);
-    }
-
-    @Bean
-    public MetricRegistry metricRegistry(MetricRegistryProperties metricRegistryProperties,
-                                         GraphiteProperties graphiteProperties,
-                                         InstanceIdResolver instanceIdResolver,
-                                         @Named("moduleName") String moduleName) {
-        return new MetricRegistryFactory(metricRegistryProperties, graphiteProperties,
-                instanceIdResolver, moduleName).provide();
-    }
-
-    @Bean
-    PrometheusConfig prometheusConfig(PrometheusProperties properties) {
-        return new PrometheusConfigAdapter(properties);
-    }
-
-    @Bean
-    public PrometheusMeterRegistry micrometerRegistry(MicrometerRegistryParameters micrometerRegistryParameters,
-                                                      PrometheusConfig prometheusConfig,
-                                                      CounterStorage counterStorage) {
-        return new PrometheusMeterRegistryFactory(micrometerRegistryParameters,
-                prometheusConfig, counterStorage, "hermes-frontend").provide();
-    }
-
-    @Bean
-    @Primary
-    public MeterRegistry compositeMeterRegistry(List<MeterRegistry> registries) {
-        return new CompositeMeterRegistry(SYSTEM, registries);
-    }
-
-    @Bean
-    public PathsCompiler metricRegistryPathsCompiler(InstanceIdResolver instanceIdResolver) {
-        return new PathsCompiler(instanceIdResolver.resolve());
-    }
-
-    @Bean
-    public CounterStorage zookeeperCounterStorage(SharedCounter sharedCounter,
-                                                  SubscriptionRepository subscriptionRepository,
-                                                  PathsCompiler pathsCompiler,
-                                                  ZookeeperClustersProperties zookeeperClustersProperties,
-                                                  DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new ZookeeperCounterStorage(sharedCounter, subscriptionRepository, pathsCompiler, zookeeperProperties.getRoot());
-    }
-
-    @Bean
-    public SharedCounter sharedCounter(CuratorFramework zookeeper,
-                                       ZookeeperClustersProperties zookeeperClustersProperties,
-                                       MetricRegistryProperties metricRegistryProperties,
-                                       DatacenterNameProvider datacenterNameProvider) {
-        ZookeeperProperties zookeeperProperties = zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
-        return new SharedCounter(zookeeper,
-                metricRegistryProperties.getCounterExpireAfterAccess(),
-                zookeeperProperties.getBaseSleepTime(),
-                zookeeperProperties.getMaxRetries()
-        );
-    }
-
-    @Bean
-    public InstanceIdResolver instanceIdResolver() {
-        return new InetAddressInstanceIdResolver();
-    }
-
-    @Bean
-    public SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicatorFactory(
-            CuratorFramework zookeeper,
-            ZookeeperPaths paths,
-            SubscriptionRepository subscriptionRepository) {
-        return new ZookeeperSubscriptionOffsetChangeIndicator(zookeeper, paths, subscriptionRepository);
-    }
-
-    @Bean
-    public MessageFilters messageFilters(List<MessageFilter> globalFilters,
-                                         List<SubscriptionMessageFilterCompiler> subscriptionMessageFilterCompilers) {
-        return new MessageFilters(globalFilters, subscriptionMessageFilterCompilers);
-    }
-
-    @Bean
-    public SubscriptionMessageFilterCompiler jsonPathSubscriptionMessageFilterCompiler() {
-        return new JsonPathSubscriptionMessageFilterCompiler();
-    }
-
-    @Bean
-    public SubscriptionMessageFilterCompiler avroPathSubscriptionMessageFilterCompiler() {
-        return new AvroPathSubscriptionMessageFilterCompiler();
-    }
-
-    @Bean
-    public SubscriptionMessageFilterCompiler headerSubscriptionMessageFilterCompiler() {
-        return new HeaderSubscriptionMessageFilterCompiler();
-    }
-
-    @Bean
-    public MessagePreviewRepository zookeeperMessagePreviewRepository(CuratorFramework zookeeper,
-                                                                      ObjectMapper mapper,
-                                                                      ZookeeperPaths paths) {
-        return new ZookeeperMessagePreviewRepository(zookeeper, mapper, paths);
-    }
+  @Bean
+  public DatacenterNameProvider dcNameProvider(DatacenterNameProperties datacenterNameProperties) {
+    if (datacenterNameProperties.getSource() == DcNameSource.ENV) {
+      return new EnvironmentVariableDatacenterNameProvider(datacenterNameProperties.getEnv());
+    } else {
+      return new DefaultDatacenterNameProvider();
+    }
+  }
+
+  @Bean
+  public SubscriptionRepository subscriptionRepository(
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      ObjectMapper mapper,
+      TopicRepository topicRepository) {
+    return new ZookeeperSubscriptionRepository(zookeeper, mapper, paths, topicRepository);
+  }
+
+  @Bean
+  public OAuthProviderRepository oAuthProviderRepository(
+      CuratorFramework zookeeper, ZookeeperPaths paths, ObjectMapper mapper) {
+    return new ZookeeperOAuthProviderRepository(zookeeper, mapper, paths);
+  }
+
+  @Bean
+  public TopicRepository topicRepository(
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      ObjectMapper mapper,
+      GroupRepository groupRepository) {
+    return new ZookeeperTopicRepository(zookeeper, mapper, paths, groupRepository);
+  }
+
+  @Bean
+  public GroupRepository groupRepository(
+      CuratorFramework zookeeper, ZookeeperPaths paths, ObjectMapper mapper) {
+    return new ZookeeperGroupRepository(zookeeper, mapper, paths);
+  }
+
+  @Bean(destroyMethod = "close")
+  public CuratorFramework hermesCurator(
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      CuratorClientFactory curatorClientFactory,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new HermesCuratorClientFactory(zookeeperProperties, curatorClientFactory).provide();
+  }
+
+  @Bean
+  public CuratorClientFactory curatorClientFactory(
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new CuratorClientFactory(zookeeperProperties);
+  }
+
+  @Bean
+  public FilterChainFactory filterChainFactory(MessageFilterSource filters) {
+    return new FilterChainFactory(filters);
+  }
+
+  @Bean
+  public InternalNotificationsBus zookeeperInternalNotificationBus(
+      ObjectMapper objectMapper, ModelAwareZookeeperNotifyingCache modelNotifyingCache) {
+    return new ZookeeperInternalNotificationBus(objectMapper, modelNotifyingCache);
+  }
+
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public ModelAwareZookeeperNotifyingCache modelAwareZookeeperNotifyingCache(
+      CuratorFramework curator,
+      MetricsFacade metricsFacade,
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new ModelAwareZookeeperNotifyingCacheFactory(curator, metricsFacade, zookeeperProperties)
+        .provide();
+  }
+
+  @Bean
+  public UndeliveredMessageLog undeliveredMessageLog(
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      ObjectMapper mapper,
+      MetricsFacade metricsFacade) {
+    return new ZookeeperUndeliveredMessageLog(zookeeper, paths, mapper, metricsFacade);
+  }
+
+  @Bean
+  public InstrumentedExecutorServiceFactory instrumentedExecutorServiceFactory(
+      MetricsFacade metricsFacade) {
+    return new InstrumentedExecutorServiceFactory(metricsFacade);
+  }
+
+  @Bean
+  public ZookeeperAdminCache zookeeperAdminCache(
+      ZookeeperPaths zookeeperPaths,
+      CuratorFramework client,
+      ObjectMapper objectMapper,
+      Clock clock) {
+    return new ZookeeperAdminCache(zookeeperPaths, client, objectMapper, clock);
+  }
+
+  @Bean
+  public ObjectMapper objectMapper(
+      SchemaProperties schemaProperties, TopicDefaultsProperties topicDefaults) {
+    return new ObjectMapperFactory(
+            schemaProperties.isIdSerializationEnabled(),
+            topicDefaults.isFallbackToRemoteDatacenterEnabled())
+        .provide();
+  }
+
+  @Bean
+  public CompositeMessageContentWrapper messageContentWrapper(
+      JsonMessageContentWrapper jsonMessageContentWrapper,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      AvroMessageSchemaIdAwareContentWrapper schemaIdAwareContentWrapper,
+      AvroMessageHeaderSchemaVersionContentWrapper headerSchemaVersionContentWrapper,
+      AvroMessageHeaderSchemaIdContentWrapper headerSchemaIdContentWrapper,
+      AvroMessageSchemaVersionTruncationContentWrapper schemaVersionTruncationContentWrapper) {
+    return new CompositeMessageContentWrapper(
+        jsonMessageContentWrapper,
+        avroMessageContentWrapper,
+        schemaIdAwareContentWrapper,
+        headerSchemaVersionContentWrapper,
+        headerSchemaIdContentWrapper,
+        schemaVersionTruncationContentWrapper);
+  }
+
+  @Bean
+  public JsonMessageContentWrapper jsonMessageContentWrapper(
+      ContentRootProperties contentRootProperties, ObjectMapper mapper) {
+    return new JsonMessageContentWrapper(
+        contentRootProperties.getMessage(), contentRootProperties.getMetadata(), mapper);
+  }
+
+  @Bean
+  public AvroMessageContentWrapper avroMessageContentWrapper(Clock clock) {
+    return new AvroMessageContentWrapper(clock);
+  }
+
+  @Bean
+  public AvroMessageSchemaVersionTruncationContentWrapper
+      avroMessageSchemaVersionTruncationContentWrapper(
+          SchemaRepository schemaRepository,
+          AvroMessageContentWrapper avroMessageContentWrapper,
+          MetricsFacade metricsFacade,
+          SchemaProperties schemaProperties) {
+    return new AvroMessageSchemaVersionTruncationContentWrapper(
+        schemaRepository,
+        avroMessageContentWrapper,
+        metricsFacade,
+        schemaProperties.isVersionTruncationEnabled());
+  }
+
+  @Bean
+  public AvroMessageHeaderSchemaIdContentWrapper avroMessageHeaderSchemaIdContentWrapper(
+      SchemaRepository schemaRepository,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      MetricsFacade metricsFacade,
+      SchemaProperties schemaProperties) {
+    return new AvroMessageHeaderSchemaIdContentWrapper(
+        schemaRepository,
+        avroMessageContentWrapper,
+        metricsFacade,
+        schemaProperties.isIdHeaderEnabled());
+  }
+
+  @Bean
+  public AvroMessageHeaderSchemaVersionContentWrapper avroMessageHeaderSchemaVersionContentWrapper(
+      SchemaRepository schemaRepository,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      MetricsFacade metricsFacade) {
+    return new AvroMessageHeaderSchemaVersionContentWrapper(
+        schemaRepository, avroMessageContentWrapper, metricsFacade);
+  }
+
+  @Bean
+  public AvroMessageSchemaIdAwareContentWrapper avroMessageSchemaIdAwareContentWrapper(
+      SchemaRepository schemaRepository,
+      AvroMessageContentWrapper avroMessageContentWrapper,
+      MetricsFacade metricsFacade) {
+    return new AvroMessageSchemaIdAwareContentWrapper(
+        schemaRepository, avroMessageContentWrapper, metricsFacade);
+  }
+
+  @Bean
+  public KafkaNamesMapper prodKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
+    return new NamespaceKafkaNamesMapper(
+        kafkaClustersProperties.getNamespace(), kafkaClustersProperties.getNamespaceSeparator());
+  }
+
+  @Bean
+  public Clock clock() {
+    return new ClockFactory().provide();
+  }
+
+  @Bean
+  public ZookeeperPaths zookeeperPaths(
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new ZookeeperPaths(zookeeperProperties.getRoot());
+  }
+
+  @Bean
+  public WorkloadConstraintsRepository workloadConstraintsRepository(
+      CuratorFramework curator, ObjectMapper mapper, ZookeeperPaths paths) {
+    return new ZookeeperWorkloadConstraintsRepository(curator, mapper, paths);
+  }
+
+  @Bean
+  public MetricsFacade micrometerHermesMetrics(MeterRegistry meterRegistry) {
+    return new MetricsFacade(meterRegistry);
+  }
+
+  @Bean
+  PrometheusConfig prometheusConfig(PrometheusProperties properties) {
+    return new PrometheusConfigAdapter(properties);
+  }
+
+  @Bean
+  public PrometheusMeterRegistry micrometerRegistry(
+      MicrometerRegistryParameters micrometerRegistryParameters,
+      PrometheusConfig prometheusConfig,
+      CounterStorage counterStorage) {
+    return new PrometheusMeterRegistryFactory(
+            micrometerRegistryParameters, prometheusConfig, counterStorage, "hermes-frontend")
+        .provide();
+  }
+
+  @Bean
+  @Primary
+  public MeterRegistry compositeMeterRegistry(List<MeterRegistry> registries) {
+    return new CompositeMeterRegistry(SYSTEM, registries);
+  }
+
+  @Bean
+  public PathsCompiler metricRegistryPathsCompiler(InstanceIdResolver instanceIdResolver) {
+    return new PathsCompiler(instanceIdResolver.resolve());
+  }
+
+  @Bean
+  public CounterStorage zookeeperCounterStorage(
+      SharedCounter sharedCounter,
+      SubscriptionRepository subscriptionRepository,
+      PathsCompiler pathsCompiler,
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new ZookeeperCounterStorage(
+        sharedCounter, subscriptionRepository, pathsCompiler, zookeeperProperties.getRoot());
+  }
+
+  @Bean
+  public SharedCounter sharedCounter(
+      CuratorFramework zookeeper,
+      ZookeeperClustersProperties zookeeperClustersProperties,
+      MetricRegistryProperties metricRegistryProperties,
+      DatacenterNameProvider datacenterNameProvider) {
+    ZookeeperProperties zookeeperProperties =
+        zookeeperClustersProperties.toZookeeperProperties(datacenterNameProvider);
+    return new SharedCounter(
+        zookeeper,
+        metricRegistryProperties.getCounterExpireAfterAccess(),
+        zookeeperProperties.getBaseSleepTime(),
+        zookeeperProperties.getMaxRetries());
+  }
+
+  @Bean
+  public InstanceIdResolver instanceIdResolver() {
+    return new InetAddressInstanceIdResolver();
+  }
+
+  @Bean
+  public SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicatorFactory(
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      SubscriptionRepository subscriptionRepository) {
+    return new ZookeeperSubscriptionOffsetChangeIndicator(zookeeper, paths, subscriptionRepository);
+  }
+
+  @Bean
+  public MessageFilters messageFilters(
+      List<MessageFilter> globalFilters,
+      List<SubscriptionMessageFilterCompiler> subscriptionMessageFilterCompilers) {
+    return new MessageFilters(globalFilters, subscriptionMessageFilterCompilers);
+  }
+
+  @Bean
+  public SubscriptionMessageFilterCompiler jsonPathSubscriptionMessageFilterCompiler() {
+    return new JsonPathSubscriptionMessageFilterCompiler();
+  }
+
+  @Bean
+  public SubscriptionMessageFilterCompiler avroPathSubscriptionMessageFilterCompiler() {
+    return new AvroPathSubscriptionMessageFilterCompiler();
+  }
+
+  @Bean
+  public SubscriptionMessageFilterCompiler headerSubscriptionMessageFilterCompiler() {
+    return new HeaderSubscriptionMessageFilterCompiler();
+  }
+
+  @Bean
+  public MessagePreviewRepository zookeeperMessagePreviewRepository(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    return new ZookeeperMessagePreviewRepository(zookeeper, mapper, paths);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ContentRootProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ContentRootProperties.java
index 0cf7c61610..74433a00c8 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ContentRootProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ContentRootProperties.java
@@ -5,23 +5,23 @@
 @ConfigurationProperties(prefix = "frontend.content.root")
 public class ContentRootProperties {
 
-    private String message = "message";
+  private String message = "message";
 
-    private String metadata = "metadata";
+  private String metadata = "metadata";
 
-    public String getMessage() {
-        return message;
-    }
+  public String getMessage() {
+    return message;
+  }
 
-    public void setMessage(String message) {
-        this.message = message;
-    }
+  public void setMessage(String message) {
+    this.message = message;
+  }
 
-    public String getMetadata() {
-        return metadata;
-    }
+  public String getMetadata() {
+    return metadata;
+  }
 
-    public void setMetadata(String metadata) {
-        this.metadata = metadata;
-    }
+  public void setMetadata(String metadata) {
+    this.metadata = metadata;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/DatacenterNameProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/DatacenterNameProperties.java
index 64075272a1..4630277cbd 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/DatacenterNameProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/DatacenterNameProperties.java
@@ -6,23 +6,23 @@
 @ConfigurationProperties(prefix = "frontend.datacenter.name")
 public class DatacenterNameProperties {
 
-    private DcNameSource source;
+  private DcNameSource source;
 
-    private String env = "DC";
+  private String env = "DC";
 
-    public DcNameSource getSource() {
-        return source;
-    }
+  public DcNameSource getSource() {
+    return source;
+  }
 
-    public void setSource(DcNameSource source) {
-        this.source = source;
-    }
+  public void setSource(DcNameSource source) {
+    this.source = source;
+  }
 
-    public String getEnv() {
-        return env;
-    }
+  public String getEnv() {
+    return env;
+  }
 
-    public void setEnv(String env) {
-        this.env = env;
-    }
+  public void setEnv(String env) {
+    this.env = env;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastKafkaProducerProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastKafkaProducerProperties.java
new file mode 100644
index 0000000000..aa00a91037
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastKafkaProducerProperties.java
@@ -0,0 +1,72 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaProducerParameters;
+
+@ConfigurationProperties(prefix = "frontend.kafka.fail-fast-producer")
+public class FailFastKafkaProducerProperties {
+
+  private KafkaProducerParameters local = new FailFastLocalKafkaProducerProperties();
+
+  private KafkaProducerParameters remote = new FailFastRemoteKafkaProducerProperties();
+
+  private Duration speculativeSendDelay = Duration.ofMillis(250);
+
+  private FallbackSchedulerProperties fallbackScheduler = new FallbackSchedulerProperties();
+
+  public Duration getSpeculativeSendDelay() {
+    return speculativeSendDelay;
+  }
+
+  public void setSpeculativeSendDelay(Duration speculativeSendDelay) {
+    this.speculativeSendDelay = speculativeSendDelay;
+  }
+
+  public FallbackSchedulerProperties getFallbackScheduler() {
+    return fallbackScheduler;
+  }
+
+  public void setFallbackScheduler(FallbackSchedulerProperties fallbackScheduler) {
+    this.fallbackScheduler = fallbackScheduler;
+  }
+
+  public KafkaProducerParameters getLocal() {
+    return local;
+  }
+
+  public void setLocal(KafkaProducerParameters local) {
+    this.local = local;
+  }
+
+  public KafkaProducerParameters getRemote() {
+    return remote;
+  }
+
+  public void setRemote(KafkaProducerParameters remote) {
+    this.remote = remote;
+  }
+
+  public static class FallbackSchedulerProperties {
+
+    private int threadPoolSize = 16;
+
+    private boolean threadPoolMonitoringEnabled = false;
+
+    public int getThreadPoolSize() {
+      return threadPoolSize;
+    }
+
+    public void setThreadPoolSize(int threadPoolSize) {
+      this.threadPoolSize = threadPoolSize;
+    }
+
+    public boolean isThreadPoolMonitoringEnabled() {
+      return threadPoolMonitoringEnabled;
+    }
+
+    public void setThreadPoolMonitoringEnabled(boolean threadPoolMonitoringEnabled) {
+      this.threadPoolMonitoringEnabled = threadPoolMonitoringEnabled;
+    }
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastLocalKafkaProducerProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastLocalKafkaProducerProperties.java
new file mode 100644
index 0000000000..87811c5cb1
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastLocalKafkaProducerProperties.java
@@ -0,0 +1,206 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import java.time.Duration;
+import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaProducerParameters;
+
+/**
+ * Kafka producer maintains a single connection to each broker, over which produce request are sent.
+ * When producer request duration exceeds requestTimeout, producer closes the connection to the
+ * broker that the request was sent to. This causes all inflight requests that were sent to that
+ * broker to be cancelled. The number of inflight requests is configured by
+ * maxInflightRequestsPerConnection property.
+ *
+ * <p>Let's assume that we have requestTimeout set to 500ms, maxInflightRequestsPerConnection set to
+ * 5, and there are following inflight batches in the producer being sent to broker1:
+ *
+ * <p>batchId | time spent in send buffer (socket) ------------------------------------ batch1 |
+ * 10ms batch2 | 200ms batch3 | 300ms batch4 | 400ms batch5 | 501ms
+ *
+ * <p>Batch5 exceeded the requestTimeout so producer will close the connection to broker1. This
+ * causes batch5 to be marked as failed but also causes batches 1-4 to be retried. This has the
+ * following consequences: 1. Batches 1-4 will probably get duplicated - even tough they were
+ * cancelled, they were probably sent to the broker, just haven't been ACKd yet. Retry would cause
+ * them to be sent once again resulting in duplicates. 2. On retry, batches 1-4 will have a smaller
+ * time budget to complete. Part of their budget was already wasted in send buffer + retryBackoff
+ * will be applied to them. They will have little time to complete on retry which can cause them to
+ * be timed out, potentially resulting in a vicious circle. 3. Connection to the broker must be
+ * reestablished which takes time.
+ *
+ * <p>To avoid problems described above we actually set requestTimeout and deliveryTimeout to be
+ * much higher than the maximum frontend request duration
+ * (frontend.handlers.maxPublishRequestDuration). This means that when maxPublishRequestDuration is
+ * exceeded for a message we received, a client will receive 5xx even tough the corresponding
+ * message is still being processed in the producer. The message will eventually be ACKd by Kafka so
+ * upon client-side retry the message will be duplicated. This however, would likely also happen if
+ * the message was promptly timed-out by producer before maxPublishRequestDuration elapsed - the
+ * message was likely already sent to Kafka, there just haven't been a response yet.
+ *
+ * <p>So by using large requestTimeout we cause the first slow message to be duplicated (by
+ * client-side retry) but: - we protect other inflight messages from being duplicated, - we prevent
+ * connections from being frequently dropped and reestablished.
+ */
+public class FailFastLocalKafkaProducerProperties implements KafkaProducerParameters {
+  private Duration maxBlock = Duration.ofMillis(500);
+
+  private Duration metadataMaxAge = Duration.ofMinutes(5);
+
+  private String compressionCodec = "none";
+
+  private int retries = Integer.MAX_VALUE;
+
+  private Duration retryBackoff = Duration.ofMillis(50);
+
+  private Duration requestTimeout = Duration.ofSeconds(30);
+
+  private Duration deliveryTimeout = Duration.ofSeconds(30);
+
+  private int batchSize = 16 * 1024;
+
+  private int tcpSendBuffer = 128 * 1024;
+
+  private int maxRequestSize = 1024 * 1024;
+
+  private Duration linger = Duration.ofMillis(0);
+
+  private Duration metricsSampleWindow = Duration.ofSeconds(30);
+
+  private int maxInflightRequestsPerConnection = 5;
+
+  private boolean reportNodeMetricsEnabled = false;
+
+  private boolean idempotenceEnabled = false;
+
+  @Override
+  public Duration getMaxBlock() {
+    return maxBlock;
+  }
+
+  public void setMaxBlock(Duration maxBlock) {
+    this.maxBlock = maxBlock;
+  }
+
+  @Override
+  public Duration getMetadataMaxAge() {
+    return metadataMaxAge;
+  }
+
+  public void setMetadataMaxAge(Duration metadataMaxAge) {
+    this.metadataMaxAge = metadataMaxAge;
+  }
+
+  @Override
+  public String getCompressionCodec() {
+    return compressionCodec;
+  }
+
+  public void setCompressionCodec(String compressionCodec) {
+    this.compressionCodec = compressionCodec;
+  }
+
+  @Override
+  public int getRetries() {
+    return retries;
+  }
+
+  public void setRetries(int retries) {
+    this.retries = retries;
+  }
+
+  @Override
+  public Duration getRetryBackoff() {
+    return retryBackoff;
+  }
+
+  public void setRetryBackoff(Duration retryBackoff) {
+    this.retryBackoff = retryBackoff;
+  }
+
+  @Override
+  public Duration getRequestTimeout() {
+    return requestTimeout;
+  }
+
+  public void setRequestTimeout(Duration requestTimeout) {
+    this.requestTimeout = requestTimeout;
+  }
+
+  @Override
+  public int getBatchSize() {
+    return batchSize;
+  }
+
+  public void setBatchSize(int batchSize) {
+    this.batchSize = batchSize;
+  }
+
+  @Override
+  public int getTcpSendBuffer() {
+    return tcpSendBuffer;
+  }
+
+  public void setTcpSendBuffer(int tcpSendBuffer) {
+    this.tcpSendBuffer = tcpSendBuffer;
+  }
+
+  @Override
+  public int getMaxRequestSize() {
+    return maxRequestSize;
+  }
+
+  public void setMaxRequestSize(int maxRequestSize) {
+    this.maxRequestSize = maxRequestSize;
+  }
+
+  @Override
+  public Duration getLinger() {
+    return linger;
+  }
+
+  public void setLinger(Duration linger) {
+    this.linger = linger;
+  }
+
+  @Override
+  public Duration getMetricsSampleWindow() {
+    return metricsSampleWindow;
+  }
+
+  public void setMetricsSampleWindow(Duration metricsSampleWindow) {
+    this.metricsSampleWindow = metricsSampleWindow;
+  }
+
+  @Override
+  public int getMaxInflightRequestsPerConnection() {
+    return maxInflightRequestsPerConnection;
+  }
+
+  public void setMaxInflightRequestsPerConnection(int maxInflightRequestsPerConnection) {
+    this.maxInflightRequestsPerConnection = maxInflightRequestsPerConnection;
+  }
+
+  @Override
+  public boolean isReportNodeMetricsEnabled() {
+    return reportNodeMetricsEnabled;
+  }
+
+  public void setReportNodeMetricsEnabled(boolean reportNodeMetricsEnabled) {
+    this.reportNodeMetricsEnabled = reportNodeMetricsEnabled;
+  }
+
+  @Override
+  public Duration getDeliveryTimeout() {
+    return deliveryTimeout;
+  }
+
+  public void setDeliveryTimeout(Duration deliveryTimeout) {
+    this.deliveryTimeout = deliveryTimeout;
+  }
+
+  public boolean isIdempotenceEnabled() {
+    return idempotenceEnabled;
+  }
+
+  public void setIdempotenceEnabled(boolean idempotenceEnabled) {
+    this.idempotenceEnabled = idempotenceEnabled;
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastRemoteKafkaProducerProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastRemoteKafkaProducerProperties.java
new file mode 100644
index 0000000000..316c89b521
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FailFastRemoteKafkaProducerProperties.java
@@ -0,0 +1,175 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import java.time.Duration;
+import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaProducerParameters;
+
+/**
+ * See {@link pl.allegro.tech.hermes.frontend.config.FailFastLocalKafkaProducerProperties} for the
+ * explanation of default values used.
+ */
+public class FailFastRemoteKafkaProducerProperties implements KafkaProducerParameters {
+  private Duration maxBlock = Duration.ofMillis(250);
+
+  private Duration metadataMaxAge = Duration.ofMinutes(5);
+
+  private String compressionCodec = "none";
+
+  private int retries = Integer.MAX_VALUE;
+
+  private Duration retryBackoff = Duration.ofMillis(50);
+
+  private Duration requestTimeout = Duration.ofSeconds(30);
+
+  private Duration deliveryTimeout = Duration.ofSeconds(30);
+
+  private int batchSize = 16 * 1024;
+
+  private int tcpSendBuffer = 128 * 1024;
+
+  private int maxRequestSize = 1024 * 1024;
+
+  private Duration linger = Duration.ofMillis(0);
+
+  private Duration metricsSampleWindow = Duration.ofSeconds(30);
+
+  private int maxInflightRequestsPerConnection = 5;
+
+  private boolean reportNodeMetricsEnabled = false;
+
+  private boolean idempotenceEnabled = false;
+
+  @Override
+  public Duration getMaxBlock() {
+    return maxBlock;
+  }
+
+  public void setMaxBlock(Duration maxBlock) {
+    this.maxBlock = maxBlock;
+  }
+
+  @Override
+  public Duration getMetadataMaxAge() {
+    return metadataMaxAge;
+  }
+
+  public void setMetadataMaxAge(Duration metadataMaxAge) {
+    this.metadataMaxAge = metadataMaxAge;
+  }
+
+  @Override
+  public String getCompressionCodec() {
+    return compressionCodec;
+  }
+
+  public void setCompressionCodec(String compressionCodec) {
+    this.compressionCodec = compressionCodec;
+  }
+
+  @Override
+  public int getRetries() {
+    return retries;
+  }
+
+  public void setRetries(int retries) {
+    this.retries = retries;
+  }
+
+  @Override
+  public Duration getRetryBackoff() {
+    return retryBackoff;
+  }
+
+  public void setRetryBackoff(Duration retryBackoff) {
+    this.retryBackoff = retryBackoff;
+  }
+
+  @Override
+  public Duration getRequestTimeout() {
+    return requestTimeout;
+  }
+
+  public void setRequestTimeout(Duration requestTimeout) {
+    this.requestTimeout = requestTimeout;
+  }
+
+  @Override
+  public int getBatchSize() {
+    return batchSize;
+  }
+
+  public void setBatchSize(int batchSize) {
+    this.batchSize = batchSize;
+  }
+
+  @Override
+  public int getTcpSendBuffer() {
+    return tcpSendBuffer;
+  }
+
+  public void setTcpSendBuffer(int tcpSendBuffer) {
+    this.tcpSendBuffer = tcpSendBuffer;
+  }
+
+  @Override
+  public int getMaxRequestSize() {
+    return maxRequestSize;
+  }
+
+  public void setMaxRequestSize(int maxRequestSize) {
+    this.maxRequestSize = maxRequestSize;
+  }
+
+  @Override
+  public Duration getLinger() {
+    return linger;
+  }
+
+  public void setLinger(Duration linger) {
+    this.linger = linger;
+  }
+
+  @Override
+  public Duration getMetricsSampleWindow() {
+    return metricsSampleWindow;
+  }
+
+  public void setMetricsSampleWindow(Duration metricsSampleWindow) {
+    this.metricsSampleWindow = metricsSampleWindow;
+  }
+
+  @Override
+  public int getMaxInflightRequestsPerConnection() {
+    return maxInflightRequestsPerConnection;
+  }
+
+  public void setMaxInflightRequestsPerConnection(int maxInflightRequestsPerConnection) {
+    this.maxInflightRequestsPerConnection = maxInflightRequestsPerConnection;
+  }
+
+  @Override
+  public boolean isReportNodeMetricsEnabled() {
+    return reportNodeMetricsEnabled;
+  }
+
+  public void setReportNodeMetricsEnabled(boolean reportNodeMetricsEnabled) {
+    this.reportNodeMetricsEnabled = reportNodeMetricsEnabled;
+  }
+
+  @Override
+  public Duration getDeliveryTimeout() {
+    return deliveryTimeout;
+  }
+
+  public void setDeliveryTimeout(Duration deliveryTimeout) {
+    this.deliveryTimeout = deliveryTimeout;
+  }
+
+  @Override
+  public boolean isIdempotenceEnabled() {
+    return idempotenceEnabled;
+  }
+
+  public void setIdempotenceEnabled(boolean idempotenceEnabled) {
+    this.idempotenceEnabled = idempotenceEnabled;
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendConfiguration.java
index 79f55c326d..f8c78508bc 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendConfiguration.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendConfiguration.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.frontend.config;
 
+import jakarta.inject.Named;
+import java.time.Clock;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -15,8 +18,8 @@
 import pl.allegro.tech.hermes.frontend.cache.topic.NotificationBasedTopicsCache;
 import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
 import pl.allegro.tech.hermes.frontend.listeners.BrokerListeners;
+import pl.allegro.tech.hermes.frontend.metric.ThroughputRegistry;
 import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
-import pl.allegro.tech.hermes.frontend.services.HealthCheckService;
 import pl.allegro.tech.hermes.frontend.validator.MessageValidators;
 import pl.allegro.tech.hermes.frontend.validator.TopicMessageValidator;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
@@ -24,69 +27,78 @@
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 import pl.allegro.tech.hermes.tracker.frontend.Trackers;
 
-import java.time.Clock;
-import java.util.List;
-
 @Configuration
 @EnableConfigurationProperties(LocalMessageStorageProperties.class)
 public class FrontendConfiguration {
 
-    @Bean
-    public MessageValidators messageValidators(List<TopicMessageValidator> messageValidators) {
-        return new MessageValidators(messageValidators);
-    }
-
-    @Bean(initMethod = "start")
-    public TopicsCache notificationBasedTopicsCache(InternalNotificationsBus internalNotificationsBus,
-                                                    GroupRepository groupRepository,
-                                                    TopicRepository topicRepository,
-                                                    MetricsFacade metricsFacade,
-                                                    KafkaNamesMapper kafkaNamesMapper,
-                                                    BlacklistZookeeperNotifyingCache blacklistZookeeperNotifyingCache) {
+  @Bean
+  public MessageValidators messageValidators(List<TopicMessageValidator> messageValidators) {
+    return new MessageValidators(messageValidators);
+  }
 
-        return new NotificationBasedTopicsCache(internalNotificationsBus, blacklistZookeeperNotifyingCache,
-                groupRepository, topicRepository, metricsFacade, kafkaNamesMapper);
-    }
+  @Bean(initMethod = "start")
+  public TopicsCache notificationBasedTopicsCache(
+      InternalNotificationsBus internalNotificationsBus,
+      GroupRepository groupRepository,
+      TopicRepository topicRepository,
+      MetricsFacade metricsFacade,
+      ThroughputRegistry throughputRegistry,
+      KafkaNamesMapper kafkaNamesMapper,
+      BlacklistZookeeperNotifyingCache blacklistZookeeperNotifyingCache) {
 
-    @Bean
-    public BackupMessagesLoader backupMessagesLoader(BrokerMessageProducer brokerMessageProducer,
-                                                     BrokerListeners brokerListeners,
-                                                     TopicsCache topicsCache,
-                                                     SchemaRepository schemaRepository,
-                                                     Trackers trackers,
-                                                     LocalMessageStorageProperties localMessageStorageProperties) {
-        return new BackupMessagesLoader(brokerMessageProducer, brokerListeners, topicsCache, schemaRepository,
-                new SchemaExistenceEnsurer(schemaRepository), trackers, localMessageStorageProperties);
-    }
+    return new NotificationBasedTopicsCache(
+        internalNotificationsBus,
+        blacklistZookeeperNotifyingCache,
+        groupRepository,
+        topicRepository,
+        metricsFacade,
+        throughputRegistry,
+        kafkaNamesMapper);
+  }
 
-    @Bean(initMethod = "extend")
-    public PersistentBufferExtension persistentBufferExtension(LocalMessageStorageProperties localMessageStorageProperties,
-                                                               Clock clock,
-                                                               BrokerListeners listeners,
-                                                               BackupMessagesLoader backupMessagesLoader,
-                                                               MetricsFacade metricsFacade) {
-        return new PersistentBufferExtension(localMessageStorageProperties, clock, listeners, backupMessagesLoader,
-                metricsFacade);
-    }
+  @Bean
+  public BackupMessagesLoader backupMessagesLoader(
+      @Named("localDatacenterBrokerProducer") BrokerMessageProducer brokerMessageProducer,
+      BrokerListeners brokerListeners,
+      TopicsCache topicsCache,
+      SchemaRepository schemaRepository,
+      Trackers trackers,
+      LocalMessageStorageProperties localMessageStorageProperties) {
+    return new BackupMessagesLoader(
+        brokerMessageProducer,
+        brokerMessageProducer,
+        brokerListeners,
+        topicsCache,
+        schemaRepository,
+        new SchemaExistenceEnsurer(schemaRepository),
+        trackers,
+        localMessageStorageProperties);
+  }
 
-    @Bean(initMethod = "startup")
-    public BlacklistZookeeperNotifyingCache blacklistZookeeperNotifyingCache(CuratorFramework curator,
-                                                                             ZookeeperPaths zookeeperPaths) {
-        return new BlacklistZookeeperNotifyingCache(curator, zookeeperPaths);
-    }
+  @Bean(initMethod = "extend")
+  public PersistentBufferExtension persistentBufferExtension(
+      LocalMessageStorageProperties localMessageStorageProperties,
+      Clock clock,
+      BrokerListeners listeners,
+      BackupMessagesLoader backupMessagesLoader,
+      MetricsFacade metricsFacade) {
+    return new PersistentBufferExtension(
+        localMessageStorageProperties, clock, listeners, backupMessagesLoader, metricsFacade);
+  }
 
-    @Bean(initMethod = "startup")
-    public HealthCheckService healthCheckService() {
-        return new HealthCheckService();
-    }
+  @Bean(initMethod = "startup")
+  public BlacklistZookeeperNotifyingCache blacklistZookeeperNotifyingCache(
+      CuratorFramework curator, ZookeeperPaths zookeeperPaths) {
+    return new BlacklistZookeeperNotifyingCache(curator, zookeeperPaths);
+  }
 
-    @Bean
-    public BrokerListeners defaultBrokerListeners() {
-        return new BrokerListeners();
-    }
+  @Bean
+  public BrokerListeners defaultBrokerListeners() {
+    return new BrokerListeners();
+  }
 
-    @Bean
-    public String moduleName() {
-        return "producer";
-    }
+  @Bean
+  public String moduleName() {
+    return "producer";
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendProducerConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendProducerConfiguration.java
index e89c46762b..124578aac4 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendProducerConfiguration.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendProducerConfiguration.java
@@ -1,64 +1,184 @@
 package pl.allegro.tech.hermes.frontend.config;
 
+import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.kafka.clients.CommonClientConfigs.DEFAULT_SECURITY_PROTOCOL;
+import static org.apache.kafka.clients.CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG;
+import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
+import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
+import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
+
+import jakarta.inject.Named;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.ScheduledExecutorService;
+import org.apache.kafka.clients.admin.AdminClient;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory;
+import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
+import pl.allegro.tech.hermes.frontend.config.FailFastKafkaProducerProperties.FallbackSchedulerProperties;
+import pl.allegro.tech.hermes.frontend.producer.BrokerLatencyReporter;
 import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
-import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaBrokerMessageProducer;
+import pl.allegro.tech.hermes.frontend.producer.kafka.FallbackToRemoteDatacenterAwareMessageProducer;
+import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaChaosProperties;
 import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaHeaderFactory;
-import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaMessageProducerFactory;
-import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaTopicMetadataFetcher;
-import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaTopicMetadataFetcherFactory;
+import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaMessageSenders;
+import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaMessageSendersFactory;
+import pl.allegro.tech.hermes.frontend.producer.kafka.LocalDatacenterMessageProducer;
 import pl.allegro.tech.hermes.frontend.producer.kafka.MessageToKafkaProducerRecordConverter;
-import pl.allegro.tech.hermes.frontend.producer.kafka.Producers;
+import pl.allegro.tech.hermes.frontend.producer.kafka.MultiDatacenterMessageProducer;
+import pl.allegro.tech.hermes.frontend.producer.kafka.ProducerMetadataLoadingJob;
+import pl.allegro.tech.hermes.frontend.readiness.AdminReadinessService;
 import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
 
 @Configuration
 @EnableConfigurationProperties({
-        LocalMessageStorageProperties.class,
-        SchemaProperties.class,
-        KafkaHeaderNameProperties.class,
-        KafkaProducerProperties.class,
-        KafkaClustersProperties.class
+  LocalMessageStorageProperties.class,
+  SchemaProperties.class,
+  KafkaHeaderNameProperties.class,
+  KafkaProducerProperties.class,
+  FailFastKafkaProducerProperties.class,
+  KafkaChaosProperties.class,
+  KafkaClustersProperties.class,
+  HTTPHeadersProperties.class
 })
 public class FrontendProducerConfiguration {
 
-    @Bean
-    public BrokerMessageProducer kafkaBrokerMessageProducer(Producers producers,
-                                                            KafkaTopicMetadataFetcher kafkaTopicMetadataFetcher,
-                                                            MetricsFacade metricsFacade,
-                                                            MessageToKafkaProducerRecordConverter messageConverter) {
-        return new KafkaBrokerMessageProducer(producers, kafkaTopicMetadataFetcher, metricsFacade, messageConverter);
-    }
+  @Bean
+  public BrokerMessageProducer kafkaBrokerMessageProducer(
+      @Named("localDatacenterBrokerProducer") BrokerMessageProducer localDatacenterBrokerProducer,
+      @Named("multiDatacenterBrokerProducer") BrokerMessageProducer multiDatacenterBrokerProducer) {
+    return new FallbackToRemoteDatacenterAwareMessageProducer(
+        localDatacenterBrokerProducer, multiDatacenterBrokerProducer);
+  }
 
-    @Bean
-    public KafkaHeaderFactory kafkaHeaderFactory(KafkaHeaderNameProperties kafkaHeaderNameProperties) {
-        return new KafkaHeaderFactory(kafkaHeaderNameProperties);
-    }
+  @Bean
+  public BrokerMessageProducer localDatacenterBrokerProducer(
+      @Named("kafkaMessageSenders") KafkaMessageSenders kafkaMessageSenders,
+      MessageToKafkaProducerRecordConverter messageConverter) {
+    return new LocalDatacenterMessageProducer(kafkaMessageSenders, messageConverter);
+  }
 
-    @Bean(destroyMethod = "close")
-    public Producers kafkaMessageProducer(KafkaClustersProperties kafkaClustersProperties,
-                                          KafkaProducerProperties kafkaProducerProperties,
-                                          LocalMessageStorageProperties localMessageStorageProperties,
-                                          DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        return new KafkaMessageProducerFactory(kafkaProperties, kafkaProducerProperties,
-                localMessageStorageProperties.getBufferedSizeBytes()).provide();
-    }
+  @Bean
+  public BrokerMessageProducer multiDatacenterBrokerProducer(
+      @Named("failFastKafkaMessageSenders") KafkaMessageSenders kafkaMessageSenders,
+      MessageToKafkaProducerRecordConverter messageConverter,
+      FailFastKafkaProducerProperties kafkaProducerProperties,
+      AdminReadinessService adminReadinessService,
+      InstrumentedExecutorServiceFactory executorServiceFactory) {
+    FallbackSchedulerProperties fallbackSchedulerProperties =
+        kafkaProducerProperties.getFallbackScheduler();
+    ScheduledExecutorService fallbackScheduler =
+        executorServiceFactory
+            .scheduledExecutorBuilder(
+                "fallback-to-remote", fallbackSchedulerProperties.getThreadPoolSize())
+            .withMonitoringEnabled(fallbackSchedulerProperties.isThreadPoolMonitoringEnabled())
+            .withRemoveOnCancel(true)
+            .create();
+    return new MultiDatacenterMessageProducer(
+        kafkaMessageSenders,
+        adminReadinessService,
+        messageConverter,
+        kafkaProducerProperties.getSpeculativeSendDelay(),
+        fallbackScheduler);
+  }
 
-    @Bean(destroyMethod = "close")
-    public KafkaTopicMetadataFetcher kafkaTopicMetadataFetcher(KafkaProducerProperties kafkaProducerProperties,
-                                                               KafkaClustersProperties kafkaClustersProperties,
-                                                               DatacenterNameProvider datacenterNameProvider) {
-        KafkaProperties kafkaProperties = kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
-        return new KafkaTopicMetadataFetcherFactory(kafkaProperties, kafkaProducerProperties.getMetadataMaxAge(),
-                (int) kafkaProperties.getAdminRequestTimeout().toMillis()).provide();
-    }
+  @Bean
+  public KafkaHeaderFactory kafkaHeaderFactory(
+      KafkaHeaderNameProperties kafkaHeaderNameProperties,
+      HTTPHeadersProperties httpHeadersProperties) {
+    return new KafkaHeaderFactory(
+        kafkaHeaderNameProperties, httpHeadersProperties.getPropagationAsKafkaHeaders());
+  }
+
+  @Bean(destroyMethod = "close")
+  public KafkaMessageSenders kafkaMessageSenders(
+      KafkaProducerProperties kafkaProducerProperties,
+      KafkaMessageSendersFactory kafkaMessageSendersFactory) {
+    return kafkaMessageSendersFactory.provide(kafkaProducerProperties, "default");
+  }
 
-    @Bean
-    public MessageToKafkaProducerRecordConverter messageToKafkaProducerRecordConverter(KafkaHeaderFactory kafkaHeaderFactory,
-                                                                                       SchemaProperties schemaProperties) {
-        return new MessageToKafkaProducerRecordConverter(kafkaHeaderFactory, schemaProperties.isIdHeaderEnabled());
+  @Bean(destroyMethod = "close")
+  public KafkaMessageSenders failFastKafkaMessageSenders(
+      FailFastKafkaProducerProperties kafkaProducerProperties,
+      KafkaMessageSendersFactory kafkaMessageSendersFactory) {
+    return kafkaMessageSendersFactory.provide(
+        kafkaProducerProperties.getLocal(), kafkaProducerProperties.getRemote(), "failFast");
+  }
+
+  @Bean
+  public ScheduledExecutorService chaosScheduler(
+      KafkaChaosProperties chaosProperties,
+      InstrumentedExecutorServiceFactory executorServiceFactory) {
+    KafkaChaosProperties.ChaosSchedulerProperties chaosSchedulerProperties =
+        chaosProperties.getChaosScheduler();
+    return executorServiceFactory
+        .scheduledExecutorBuilder("chaos", chaosSchedulerProperties.getThreadPoolSize())
+        .withMonitoringEnabled(chaosSchedulerProperties.isThreadPoolMonitoringEnabled())
+        .create();
+  }
+
+  @Bean(destroyMethod = "close")
+  public KafkaMessageSendersFactory kafkaMessageSendersFactory(
+      KafkaClustersProperties kafkaClustersProperties,
+      KafkaProducerProperties kafkaProducerProperties,
+      TopicLoadingProperties topicLoadingProperties,
+      TopicsCache topicsCache,
+      LocalMessageStorageProperties localMessageStorageProperties,
+      DatacenterNameProvider datacenterNameProvider,
+      BrokerLatencyReporter brokerLatencyReporter,
+      MetricsFacade metricsFacade,
+      @Named("chaosScheduler") ScheduledExecutorService chaosScheduler) {
+    KafkaProperties kafkaProperties =
+        kafkaClustersProperties.toKafkaProperties(datacenterNameProvider);
+    List<KafkaParameters> remoteKafkaProperties =
+        kafkaClustersProperties.toRemoteKafkaProperties(datacenterNameProvider);
+
+    return new KafkaMessageSendersFactory(
+        kafkaProperties,
+        remoteKafkaProperties,
+        brokerLatencyReporter,
+        metricsFacade,
+        createAdminClient(kafkaProperties),
+        topicsCache,
+        topicLoadingProperties.getMetadata().getRetryCount(),
+        topicLoadingProperties.getMetadata().getRetryInterval(),
+        topicLoadingProperties.getMetadata().getThreadPoolSize(),
+        localMessageStorageProperties.getBufferedSizeBytes(),
+        kafkaProducerProperties.getMetadataMaxAge(),
+        chaosScheduler);
+  }
+
+  private static AdminClient createAdminClient(KafkaProperties kafkaProperties) {
+    Properties props = new Properties();
+    props.put(BOOTSTRAP_SERVERS_CONFIG, kafkaProperties.getBrokerList());
+    props.put(SECURITY_PROTOCOL_CONFIG, DEFAULT_SECURITY_PROTOCOL);
+    props.put(REQUEST_TIMEOUT_MS_CONFIG, (int) kafkaProperties.getAdminRequestTimeout().toMillis());
+    if (kafkaProperties.isAuthenticationEnabled()) {
+      props.put(SASL_MECHANISM, kafkaProperties.getAuthenticationMechanism());
+      props.put(SECURITY_PROTOCOL_CONFIG, kafkaProperties.getAuthenticationProtocol());
+      props.put(SASL_JAAS_CONFIG, kafkaProperties.getJaasConfig());
     }
+    return AdminClient.create(props);
+  }
+
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public ProducerMetadataLoadingJob producerMetadataLoadingJob(
+      List<KafkaMessageSenders> kafkaMessageSendersList,
+      TopicLoadingProperties topicLoadingProperties) {
+    return new ProducerMetadataLoadingJob(
+        kafkaMessageSendersList,
+        topicLoadingProperties.getMetadataRefreshJob().isEnabled(),
+        topicLoadingProperties.getMetadataRefreshJob().getInterval());
+  }
+
+  @Bean
+  public MessageToKafkaProducerRecordConverter messageToKafkaProducerRecordConverter(
+      KafkaHeaderFactory kafkaHeaderFactory, SchemaProperties schemaProperties) {
+    return new MessageToKafkaProducerRecordConverter(
+        kafkaHeaderFactory, schemaProperties.isIdHeaderEnabled());
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendPublishingConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendPublishingConfiguration.java
index ea1b65981b..1f9e8cd262 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendPublishingConfiguration.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendPublishingConfiguration.java
@@ -1,7 +1,11 @@
 package pl.allegro.tech.hermes.frontend.config;
 
+import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.undertow.server.HttpHandler;
+import jakarta.inject.Named;
+import java.time.Clock;
+import java.util.Optional;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,6 +14,7 @@
 import pl.allegro.tech.hermes.domain.topic.preview.MessagePreviewRepository;
 import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
 import pl.allegro.tech.hermes.frontend.listeners.BrokerListeners;
+import pl.allegro.tech.hermes.frontend.metric.ThroughputRegistry;
 import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.HandlersChainFactory;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter;
@@ -31,90 +36,124 @@
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 import pl.allegro.tech.hermes.tracker.frontend.Trackers;
 
-import java.time.Clock;
-import java.util.Optional;
-
 @Configuration
 @EnableConfigurationProperties({
-        ThroughputProperties.class,
-        MessagePreviewProperties.class,
-        HeaderPropagationProperties.class,
-        HandlersChainProperties.class,
-        SchemaProperties.class
+  ThroughputProperties.class,
+  MessagePreviewProperties.class,
+  HandlersChainProperties.class,
+  SchemaProperties.class
 })
 public class FrontendPublishingConfiguration {
 
-    @Bean
-    public HttpHandler httpHandler(TopicsCache topicsCache, MessageErrorProcessor messageErrorProcessor,
-                                   MessageEndProcessor messageEndProcessor, MessageFactory messageFactory,
-                                   BrokerMessageProducer brokerMessageProducer, MessagePreviewLog messagePreviewLog,
-                                   ThroughputLimiter throughputLimiter, Optional<AuthenticationConfiguration> authConfig,
-                                   MessagePreviewProperties messagePreviewProperties, HandlersChainProperties handlersChainProperties) {
-        return new HandlersChainFactory(topicsCache, messageErrorProcessor, messageEndProcessor, messageFactory,
-                brokerMessageProducer, messagePreviewLog, throughputLimiter, authConfig, messagePreviewProperties.isEnabled(),
-                handlersChainProperties).provide();
-    }
+  @Bean
+  public HttpHandler httpHandler(
+      TopicsCache topicsCache,
+      MessageErrorProcessor messageErrorProcessor,
+      MessageEndProcessor messageEndProcessor,
+      MessageFactory messageFactory,
+      @Named("kafkaBrokerMessageProducer") BrokerMessageProducer brokerMessageProducer,
+      MessagePreviewLog messagePreviewLog,
+      ThroughputLimiter throughputLimiter,
+      Optional<AuthenticationConfiguration> authConfig,
+      MessagePreviewProperties messagePreviewProperties,
+      HandlersChainProperties handlersChainProperties) {
+    return new HandlersChainFactory(
+            topicsCache,
+            messageErrorProcessor,
+            messageEndProcessor,
+            messageFactory,
+            brokerMessageProducer,
+            messagePreviewLog,
+            throughputLimiter,
+            authConfig,
+            messagePreviewProperties.isEnabled(),
+            handlersChainProperties)
+        .provide();
+  }
+
+  @Bean
+  public ThroughputRegistry throughputRegistry(MetricsFacade metricsFacade) {
+    return new ThroughputRegistry(metricsFacade, new MetricRegistry());
+  }
 
-    @Bean
-    public ThroughputLimiter throughputLimiter(ThroughputProperties throughputProperties, MetricsFacade metricsFacade) {
-        return new ThroughputLimiterFactory(throughputProperties, metricsFacade).provide();
-    }
+  @Bean
+  public ThroughputLimiter throughputLimiter(
+      ThroughputProperties throughputProperties, ThroughputRegistry throughputRegistry) {
+    return new ThroughputLimiterFactory(throughputProperties, throughputRegistry).provide();
+  }
 
-    @Bean
-    public MessageEndProcessor messageEndProcessor(Trackers trackers, BrokerListeners brokerListeners,
-                                                   TrackingHeadersExtractor trackingHeadersExtractor) {
-        return new MessageEndProcessor(trackers, brokerListeners, trackingHeadersExtractor);
-    }
+  @Bean
+  public MessageEndProcessor messageEndProcessor(
+      Trackers trackers,
+      BrokerListeners brokerListeners,
+      TrackingHeadersExtractor trackingHeadersExtractor) {
+    return new MessageEndProcessor(trackers, brokerListeners, trackingHeadersExtractor);
+  }
 
-    @Bean
-    public TrackingHeadersExtractor extraHeadersExtractor() {
-        return new DefaultTrackingHeaderExtractor();
-    }
+  @Bean
+  public TrackingHeadersExtractor extraHeadersExtractor() {
+    return new DefaultTrackingHeaderExtractor();
+  }
 
-    @Bean
-    public MessageErrorProcessor messageErrorProcessor(ObjectMapper objectMapper, Trackers trackers,
-                                                       TrackingHeadersExtractor trackingHeadersExtractor) {
-        return new MessageErrorProcessor(objectMapper, trackers, trackingHeadersExtractor);
-    }
+  @Bean
+  public MessageErrorProcessor messageErrorProcessor(
+      ObjectMapper objectMapper,
+      Trackers trackers,
+      TrackingHeadersExtractor trackingHeadersExtractor) {
+    return new MessageErrorProcessor(objectMapper, trackers, trackingHeadersExtractor);
+  }
 
-    @Bean
-    public AvroEnforcer messageContentTypeEnforcer() {
-        return new MessageContentTypeEnforcer();
-    }
+  @Bean
+  public AvroEnforcer messageContentTypeEnforcer() {
+    return new MessageContentTypeEnforcer();
+  }
 
-    @Bean
-    public MessageFactory messageFactory(MessageValidators validators,
-                                         AvroEnforcer enforcer,
-                                         SchemaRepository schemaRepository,
-                                         HeadersPropagator headersPropagator,
-                                         CompositeMessageContentWrapper compositeMessageContentWrapper,
-                                         Clock clock,
-                                         SchemaProperties schemaProperties) {
-        return new MessageFactory(validators, enforcer, schemaRepository, headersPropagator, compositeMessageContentWrapper,
-                clock, schemaProperties.isIdHeaderEnabled());
-    }
+  @Bean
+  public MessageFactory messageFactory(
+      MessageValidators validators,
+      AvroEnforcer enforcer,
+      SchemaRepository schemaRepository,
+      HeadersPropagator headersPropagator,
+      CompositeMessageContentWrapper compositeMessageContentWrapper,
+      Clock clock,
+      SchemaProperties schemaProperties) {
+    return new MessageFactory(
+        validators,
+        enforcer,
+        schemaRepository,
+        headersPropagator,
+        compositeMessageContentWrapper,
+        clock,
+        schemaProperties.isIdHeaderEnabled());
+  }
 
-    @Bean
-    public HeadersPropagator defaultHeadersPropagator(HeaderPropagationProperties headerPropagationProperties) {
-        return new DefaultHeadersPropagator(headerPropagationProperties.isEnabled(), headerPropagationProperties.getAllowFilter());
-    }
+  @Bean
+  public HeadersPropagator defaultHeadersPropagator(HTTPHeadersProperties httpHeadersProperties) {
+    return new DefaultHeadersPropagator(httpHeadersProperties);
+  }
 
-    @Bean
-    public MessagePreviewFactory messagePreviewFactory(MessagePreviewProperties messagePreviewProperties) {
-        return new MessagePreviewFactory(messagePreviewProperties.getMaxSizeKb());
-    }
+  @Bean
+  public MessagePreviewFactory messagePreviewFactory(
+      MessagePreviewProperties messagePreviewProperties) {
+    return new MessagePreviewFactory(messagePreviewProperties.getMaxSizeKb());
+  }
 
-    @Bean
-    public MessagePreviewLog messagePreviewLog(MessagePreviewFactory messagePreviewFactory,
-                                               MessagePreviewProperties messagePreviewProperties) {
-        return new MessagePreviewLog(messagePreviewFactory, messagePreviewProperties.getSize());
-    }
+  @Bean
+  public MessagePreviewLog messagePreviewLog(
+      MessagePreviewFactory messagePreviewFactory,
+      MessagePreviewProperties messagePreviewProperties) {
+    return new MessagePreviewLog(messagePreviewFactory, messagePreviewProperties.getSize());
+  }
 
-    @Bean
-    public DefaultMessagePreviewPersister messagePreviewPersister(MessagePreviewLog messagePreviewLog,
-                                                                  MessagePreviewRepository repository,
-                                                                  MessagePreviewProperties messagePreviewProperties) {
-        return new DefaultMessagePreviewPersister(messagePreviewLog, repository, messagePreviewProperties.getLogPersistPeriod(),
-                messagePreviewProperties.isEnabled());
-    }
+  @Bean
+  public DefaultMessagePreviewPersister messagePreviewPersister(
+      MessagePreviewLog messagePreviewLog,
+      MessagePreviewRepository repository,
+      MessagePreviewProperties messagePreviewProperties) {
+    return new DefaultMessagePreviewPersister(
+        messagePreviewLog,
+        repository,
+        messagePreviewProperties.getLogPersistPeriod(),
+        messagePreviewProperties.isEnabled());
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendServerConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendServerConfiguration.java
index d83f8fd0a8..8f707fbab8 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendServerConfiguration.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendServerConfiguration.java
@@ -1,117 +1,73 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.undertow.server.HttpHandler;
-import org.apache.curator.framework.CuratorFramework;
+import java.util.Optional;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.common.ssl.SslContextFactory;
 import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
-import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter;
 import pl.allegro.tech.hermes.frontend.publishing.preview.DefaultMessagePreviewPersister;
-import pl.allegro.tech.hermes.frontend.server.DefaultReadinessChecker;
+import pl.allegro.tech.hermes.frontend.readiness.HealthCheckService;
+import pl.allegro.tech.hermes.frontend.readiness.ReadinessChecker;
 import pl.allegro.tech.hermes.frontend.server.HermesServer;
 import pl.allegro.tech.hermes.frontend.server.SslContextFactoryProvider;
-import pl.allegro.tech.hermes.frontend.server.TopicMetadataLoadingJob;
-import pl.allegro.tech.hermes.frontend.server.TopicMetadataLoadingRunner;
-import pl.allegro.tech.hermes.frontend.server.TopicMetadataLoadingStartupHook;
 import pl.allegro.tech.hermes.frontend.server.TopicSchemaLoadingStartupHook;
-import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 
-import java.util.Optional;
-
 @Configuration
 @EnableConfigurationProperties({
-        TopicLoadingProperties.class,
-        ReadinessCheckProperties.class,
-        SslProperties.class,
-        HermesServerProperties.class
+  TopicLoadingProperties.class,
+  ReadinessCheckProperties.class,
+  SslProperties.class,
+  HermesServerProperties.class
 })
 public class FrontendServerConfiguration {
 
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    public HermesServer hermesServer(HermesServerProperties hermesServerProperties,
-                                     SslProperties sslProperties,
-                                     MetricsFacade metricsFacade,
-                                     HttpHandler publishingHandler,
-                                     DefaultReadinessChecker defaultReadinessChecker,
-                                     DefaultMessagePreviewPersister defaultMessagePreviewPersister,
-                                     ThroughputLimiter throughputLimiter,
-                                     TopicMetadataLoadingJob topicMetadataLoadingJob,
-                                     SslContextFactoryProvider sslContextFactoryProvider,
-                                     TopicLoadingProperties topicLoadingProperties,
-                                     PrometheusMeterRegistry prometheusMeterRegistry) {
-        return new HermesServer(
-                sslProperties,
-                hermesServerProperties,
-                metricsFacade,
-                publishingHandler,
-                defaultReadinessChecker,
-                defaultMessagePreviewPersister,
-                throughputLimiter,
-                topicMetadataLoadingJob,
-                topicLoadingProperties.getMetadataRefreshJob().isEnabled(),
-                sslContextFactoryProvider,
-                prometheusMeterRegistry);
-    }
-
-    @Bean
-    public DefaultReadinessChecker readinessChecker(ReadinessCheckProperties readinessCheckProperties,
-                                                    TopicMetadataLoadingRunner topicMetadataLoadingRunner,
-                                                    CuratorFramework zookeeper,
-                                                    ZookeeperPaths paths,
-                                                    ObjectMapper mapper) {
-        return new DefaultReadinessChecker(
-                topicMetadataLoadingRunner,
-                zookeeper,
-                paths,
-                mapper,
-                readinessCheckProperties.isEnabled(),
-                readinessCheckProperties.isKafkaCheckEnabled(),
-                readinessCheckProperties.getInterval()
-        );
-    }
-
-    @Bean
-    public SslContextFactoryProvider sslContextFactoryProvider(Optional<SslContextFactory> sslContextFactory,
-                                                               SslProperties sslProperties) {
-        return new SslContextFactoryProvider(sslContextFactory.orElse(null), sslProperties);
-    }
-
-    @Bean
-    public TopicMetadataLoadingJob topicMetadataLoadingJob(TopicMetadataLoadingRunner topicMetadataLoadingRunner,
-                                                           TopicLoadingProperties topicLoadingProperties) {
-        return new TopicMetadataLoadingJob(topicMetadataLoadingRunner, topicLoadingProperties.getMetadataRefreshJob().getInterval());
-    }
-
-    @Bean
-    public TopicMetadataLoadingRunner topicMetadataLoadingRunner(BrokerMessageProducer brokerMessageProducer,
-                                                                 TopicsCache topicsCache,
-                                                                 TopicLoadingProperties topicLoadingProperties) {
-        return new TopicMetadataLoadingRunner(brokerMessageProducer, topicsCache,
-                topicLoadingProperties.getMetadata().getRetryCount(),
-                topicLoadingProperties.getMetadata().getRetryInterval(),
-                topicLoadingProperties.getMetadata().getThreadPoolSize());
-    }
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public HermesServer hermesServer(
+      HermesServerProperties hermesServerProperties,
+      SslProperties sslProperties,
+      MetricsFacade metricsFacade,
+      HttpHandler publishingHandler,
+      HealthCheckService healthCheckService,
+      ReadinessChecker readinessChecker,
+      DefaultMessagePreviewPersister defaultMessagePreviewPersister,
+      ThroughputLimiter throughputLimiter,
+      SslContextFactoryProvider sslContextFactoryProvider,
+      PrometheusMeterRegistry prometheusMeterRegistry) {
+    return new HermesServer(
+        sslProperties,
+        hermesServerProperties,
+        metricsFacade,
+        publishingHandler,
+        healthCheckService,
+        readinessChecker,
+        defaultMessagePreviewPersister,
+        throughputLimiter,
+        sslContextFactoryProvider,
+        prometheusMeterRegistry);
+  }
 
-    @Bean(initMethod = "run")
-    public TopicMetadataLoadingStartupHook topicMetadataLoadingStartupHook(TopicMetadataLoadingRunner topicMetadataLoadingRunner,
-                                                                           TopicLoadingProperties topicLoadingProperties) {
-        return new TopicMetadataLoadingStartupHook(topicMetadataLoadingRunner, topicLoadingProperties.getMetadata().isEnabled());
-    }
+  @Bean
+  public SslContextFactoryProvider sslContextFactoryProvider(
+      Optional<SslContextFactory> sslContextFactory, SslProperties sslProperties) {
+    return new SslContextFactoryProvider(sslContextFactory.orElse(null), sslProperties);
+  }
 
-    @Bean(initMethod = "run")
-    public TopicSchemaLoadingStartupHook topicSchemaLoadingStartupHook(TopicsCache topicsCache,
-                                                                       SchemaRepository schemaRepository,
-                                                                       TopicLoadingProperties topicLoadingProperties) {
-        return new TopicSchemaLoadingStartupHook(topicsCache, schemaRepository,
-                topicLoadingProperties.getSchema().getRetryCount(),
-                topicLoadingProperties.getSchema().getThreadPoolSize(),
-                topicLoadingProperties.getSchema().isEnabled());
-    }
+  @Bean(initMethod = "run")
+  public TopicSchemaLoadingStartupHook topicSchemaLoadingStartupHook(
+      TopicsCache topicsCache,
+      SchemaRepository schemaRepository,
+      TopicLoadingProperties topicLoadingProperties) {
+    return new TopicSchemaLoadingStartupHook(
+        topicsCache,
+        schemaRepository,
+        topicLoadingProperties.getSchema().getRetryCount(),
+        topicLoadingProperties.getSchema().getThreadPoolSize(),
+        topicLoadingProperties.getSchema().isEnabled());
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendTrackerConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendTrackerConfiguration.java
index 2350ca197d..dbb733c9fc 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendTrackerConfiguration.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendTrackerConfiguration.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.frontend.config;
 
+import java.time.Clock;
+import java.util.List;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import pl.allegro.tech.hermes.tracker.frontend.LogRepository;
@@ -7,24 +9,22 @@
 import pl.allegro.tech.hermes.tracker.frontend.PublishingMessageTracker;
 import pl.allegro.tech.hermes.tracker.frontend.Trackers;
 
-import java.time.Clock;
-import java.util.List;
-
 @Configuration
 public class FrontendTrackerConfiguration {
 
-    @Bean
-    public PublishingMessageTracker publishingMessageTracker(List<LogRepository> repositories, Clock clock) {
-        return new PublishingMessageTracker(repositories, clock);
-    }
+  @Bean
+  public PublishingMessageTracker publishingMessageTracker(
+      List<LogRepository> repositories, Clock clock) {
+    return new PublishingMessageTracker(repositories, clock);
+  }
 
-    @Bean
-    public NoOperationPublishingTracker noOperationPublishingTracker() {
-        return new NoOperationPublishingTracker();
-    }
+  @Bean
+  public NoOperationPublishingTracker noOperationPublishingTracker() {
+    return new NoOperationPublishingTracker();
+  }
 
-    @Bean(destroyMethod = "close")
-    public Trackers trackers(List<LogRepository> repositories) {
-        return new Trackers(repositories);
-    }
+  @Bean(destroyMethod = "close")
+  public Trackers trackers(List<LogRepository> repositories) {
+    return new Trackers(repositories);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/GraphiteProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/GraphiteProperties.java
deleted file mode 100644
index 60e3a7fab2..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/GraphiteProperties.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package pl.allegro.tech.hermes.frontend.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.common.di.factories.GraphiteParameters;
-
-@ConfigurationProperties(prefix = "frontend.graphite")
-public class GraphiteProperties implements GraphiteParameters {
-
-    private String prefix = "stats.tech.hermes";
-
-    private String host = "localhost";
-
-    private int port = 2003;
-
-    @Override
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    @Override
-    public String getHost() {
-        return host;
-    }
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @Override
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HTTPHeadersProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HTTPHeadersProperties.java
new file mode 100644
index 0000000000..8e765b8011
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HTTPHeadersProperties.java
@@ -0,0 +1,75 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import java.util.HashSet;
+import java.util.Set;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.common.kafka.HTTPHeadersPropagationAsKafkaHeadersProperties;
+
+@ConfigurationProperties(prefix = "frontend.http.headers")
+public class HTTPHeadersProperties {
+
+  public boolean propagationEnabled = false;
+  public Set<String> allowedSet = new HashSet<>();
+  public Set<String> additionalAllowedSetToLog = new HashSet<>();
+  public PropagationAsKafkaHeadersProperties propagationAsKafkaHeaders =
+      new PropagationAsKafkaHeadersProperties();
+
+  public static class PropagationAsKafkaHeadersProperties
+      implements HTTPHeadersPropagationAsKafkaHeadersProperties {
+
+    public boolean enabled = true;
+
+    public String prefix = "h-";
+
+    @Override
+    public boolean isEnabled() {
+      return enabled;
+    }
+
+    @Override
+    public String getPrefix() {
+      return prefix;
+    }
+
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
+
+    public void setPrefix(String prefix) {
+      this.prefix = prefix;
+    }
+  }
+
+  public boolean isPropagationEnabled() {
+    return propagationEnabled;
+  }
+
+  public void setPropagationEnabled(boolean propagationEnabled) {
+    this.propagationEnabled = propagationEnabled;
+  }
+
+  public PropagationAsKafkaHeadersProperties getPropagationAsKafkaHeaders() {
+    return propagationAsKafkaHeaders;
+  }
+
+  public void setPropagationAsKafkaHeaders(
+      PropagationAsKafkaHeadersProperties propagationAsKafkaHeaders) {
+    this.propagationAsKafkaHeaders = propagationAsKafkaHeaders;
+  }
+
+  public Set<String> getAllowedSet() {
+    return allowedSet;
+  }
+
+  public void setAllowedSet(Set<String> allowedSet) {
+    this.allowedSet = allowedSet;
+  }
+
+  public Set<String> getAdditionalAllowedSetToLog() {
+    return additionalAllowedSetToLog;
+  }
+
+  public void setAdditionalAllowedSetToLog(Set<String> additionalAllowedSetToLog) {
+    this.additionalAllowedSetToLog = additionalAllowedSetToLog;
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HandlersChainProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HandlersChainProperties.java
index 1e0aa17905..13920d2b6c 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HandlersChainProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HandlersChainProperties.java
@@ -1,129 +1,139 @@
 package pl.allegro.tech.hermes.frontend.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.HandlersChainParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "frontend.handlers")
 public class HandlersChainProperties implements HandlersChainParameters {
 
-    private Duration idleTimeout = Duration.ofMillis(65);
+  private Duration idleTimeout = Duration.ofMillis(65);
 
-    private Duration longIdleTimeout = Duration.ofMillis(400);
+  private Duration longIdleTimeout = Duration.ofMillis(400);
 
-    private boolean forceTopicMaxMessageSize = false;
+  private Duration maxPublishRequestDuration = Duration.ofMillis(500);
 
-    @Override
-    public Duration getIdleTimeout() {
-        return idleTimeout;
-    }
+  private boolean forceTopicMaxMessageSize = false;
 
-    public void setIdleTimeout(Duration idleTimeout) {
-        this.idleTimeout = idleTimeout;
-    }
+  @Override
+  public Duration getIdleTimeout() {
+    return idleTimeout;
+  }
 
-    @Override
-    public Duration getLongIdleTimeout() {
-        return longIdleTimeout;
-    }
+  public void setIdleTimeout(Duration idleTimeout) {
+    this.idleTimeout = idleTimeout;
+  }
 
-    public void setLongIdleTimeout(Duration longIdleTimeout) {
-        this.longIdleTimeout = longIdleTimeout;
-    }
+  @Override
+  public Duration getLongIdleTimeout() {
+    return longIdleTimeout;
+  }
 
-    @Override
-    public boolean isForceTopicMaxMessageSize() {
-        return forceTopicMaxMessageSize;
-    }
+  public void setLongIdleTimeout(Duration longIdleTimeout) {
+    this.longIdleTimeout = longIdleTimeout;
+  }
 
-    @Override
-    public boolean isKeepAliveHeaderEnabled() {
-        return keepAliveHeader.enabled;
-    }
+  @Override
+  public boolean isForceTopicMaxMessageSize() {
+    return forceTopicMaxMessageSize;
+  }
 
-    @Override
-    public Duration getKeepAliveHeaderTimeout() {
-        return keepAliveHeader.timeout;
-    }
+  @Override
+  public boolean isKeepAliveHeaderEnabled() {
+    return keepAliveHeader.enabled;
+  }
 
-    @Override
-    public boolean isAuthenticationEnabled() {
-        return authentication.enabled;
-    }
+  @Override
+  public Duration getKeepAliveHeaderTimeout() {
+    return keepAliveHeader.timeout;
+  }
 
-    @Override
-    public String getAuthenticationMode() {
-        return authentication.mode;
-    }
+  @Override
+  public boolean isAuthenticationEnabled() {
+    return authentication.enabled;
+  }
 
-    public void setForceTopicMaxMessageSize(boolean forceTopicMaxMessageSize) {
-        this.forceTopicMaxMessageSize = forceTopicMaxMessageSize;
-    }
+  @Override
+  public String getAuthenticationMode() {
+    return authentication.mode;
+  }
 
-    private AuthenticationProperties authentication = new AuthenticationProperties();
+  public void setForceTopicMaxMessageSize(boolean forceTopicMaxMessageSize) {
+    this.forceTopicMaxMessageSize = forceTopicMaxMessageSize;
+  }
 
-    private KeepAliveHeaderProperties keepAliveHeader = new KeepAliveHeaderProperties();
+  @Override
+  public Duration getMaxPublishRequestDuration() {
+    return maxPublishRequestDuration;
+  }
 
-    public AuthenticationProperties getAuthentication() {
-        return authentication;
-    }
+  public void setMaxPublishRequestDuration(Duration maxPublishRequestDuration) {
+    this.maxPublishRequestDuration = maxPublishRequestDuration;
+  }
 
-    public void setAuthentication(AuthenticationProperties authentication) {
-        this.authentication = authentication;
-    }
+  private AuthenticationProperties authentication = new AuthenticationProperties();
 
-    public KeepAliveHeaderProperties getKeepAliveHeader() {
-        return keepAliveHeader;
-    }
+  private KeepAliveHeaderProperties keepAliveHeader = new KeepAliveHeaderProperties();
 
-    public void setKeepAliveHeader(KeepAliveHeaderProperties keepAliveHeader) {
-        this.keepAliveHeader = keepAliveHeader;
-    }
+  public AuthenticationProperties getAuthentication() {
+    return authentication;
+  }
 
-    public static class AuthenticationProperties {
+  public void setAuthentication(AuthenticationProperties authentication) {
+    this.authentication = authentication;
+  }
 
-        private boolean enabled = false;
+  public KeepAliveHeaderProperties getKeepAliveHeader() {
+    return keepAliveHeader;
+  }
 
-        private String mode = "constraint_driven";
+  public void setKeepAliveHeader(KeepAliveHeaderProperties keepAliveHeader) {
+    this.keepAliveHeader = keepAliveHeader;
+  }
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+  public static class AuthenticationProperties {
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    private boolean enabled = false;
 
-        public String getMode() {
-            return mode;
-        }
+    private String mode = "constraint_driven";
 
-        public void setMode(String mode) {
-            this.mode = mode;
-        }
+    public boolean isEnabled() {
+      return enabled;
     }
 
-    public static class KeepAliveHeaderProperties {
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
 
-        private boolean enabled = false;
+    public String getMode() {
+      return mode;
+    }
 
-        private Duration timeout = Duration.ofSeconds(1);
+    public void setMode(String mode) {
+      this.mode = mode;
+    }
+  }
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+  public static class KeepAliveHeaderProperties {
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    private boolean enabled = false;
 
-        public Duration getTimeout() {
-            return timeout;
-        }
+    private Duration timeout = Duration.ofSeconds(1);
+
+    public boolean isEnabled() {
+      return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
+
+    public Duration getTimeout() {
+      return timeout;
+    }
 
-        public void setTimeout(Duration timeout) {
-            this.timeout = timeout;
-        }
+    public void setTimeout(Duration timeout) {
+      this.timeout = timeout;
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HeaderPropagationProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HeaderPropagationProperties.java
deleted file mode 100644
index c047adce2e..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HeaderPropagationProperties.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package pl.allegro.tech.hermes.frontend.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "frontend.header.propagation")
-public class HeaderPropagationProperties {
-
-    private boolean enabled = false;
-
-    private String allowFilter = "";
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public String getAllowFilter() {
-        return allowFilter;
-    }
-
-    public void setAllowFilter(String allowFilter) {
-        this.allowFilter = allowFilter;
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HermesServerProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HermesServerProperties.java
index eda985ef3d..849f79ebaa 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HermesServerProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/HermesServerProperties.java
@@ -1,197 +1,196 @@
 package pl.allegro.tech.hermes.frontend.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.frontend.server.HermesServerParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "frontend.server")
 public class HermesServerProperties implements HermesServerParameters {
 
-    private int port = 8080;
+  private int port = 8080;
 
-    private String host = "0.0.0.0";
+  private String host = "0.0.0.0";
 
-    private Duration readTimeout = Duration.ofMillis(2000);
+  private Duration readTimeout = Duration.ofMillis(2000);
 
-    private Duration requestParseTimeout = Duration.ofMillis(5000);
+  private Duration requestParseTimeout = Duration.ofMillis(5000);
 
-    private int maxHeaders = 20;
+  private int maxHeaders = 20;
 
-    private int maxParameters = 10;
+  private int maxParameters = 10;
 
-    private int maxCookies = 10;
+  private int maxCookies = 10;
 
-    private int backlogSize = 10000;
+  private int backlogSize = 10000;
 
-    private int ioThreadsCount = Runtime.getRuntime().availableProcessors() * 2;
+  private int ioThreadsCount = Runtime.getRuntime().availableProcessors() * 2;
 
-    private int workerThreadCount = 200;
+  private int workerThreadCount = 200;
 
-    private boolean alwaysKeepAlive = false;
+  private boolean alwaysKeepAlive = false;
 
-    private boolean keepAlive = false;
+  private boolean keepAlive = false;
 
-    private boolean requestDumperEnabled = false;
+  private boolean requestDumperEnabled = false;
 
-    private int bufferSize = 16384;
+  private int bufferSize = 16384;
 
-    private boolean gracefulShutdownEnabled = true;
+  private boolean gracefulShutdownEnabled = true;
 
-    private Duration gracefulShutdownInitialWait = Duration.ofSeconds(10);
+  private Duration gracefulShutdownInitialWait = Duration.ofSeconds(10);
 
-    private boolean http2Enabled = false;
+  private boolean http2Enabled = false;
 
-    @Override
-    public int getPort() {
-        return port;
-    }
+  @Override
+  public int getPort() {
+    return port;
+  }
 
-    public void setPort(int port) {
-        this.port = port;
-    }
+  public void setPort(int port) {
+    this.port = port;
+  }
 
-    @Override
-    public String getHost() {
-        return host;
-    }
+  @Override
+  public String getHost() {
+    return host;
+  }
 
-    public void setHost(String host) {
-        this.host = host;
-    }
+  public void setHost(String host) {
+    this.host = host;
+  }
 
-    @Override
-    public Duration getReadTimeout() {
-        return readTimeout;
-    }
+  @Override
+  public Duration getReadTimeout() {
+    return readTimeout;
+  }
 
-    public void setReadTimeout(Duration readTimeout) {
-        this.readTimeout = readTimeout;
-    }
+  public void setReadTimeout(Duration readTimeout) {
+    this.readTimeout = readTimeout;
+  }
 
-    @Override
-    public Duration getRequestParseTimeout() {
-        return requestParseTimeout;
-    }
+  @Override
+  public Duration getRequestParseTimeout() {
+    return requestParseTimeout;
+  }
 
-    public void setRequestParseTimeout(Duration requestParseTimeout) {
-        this.requestParseTimeout = requestParseTimeout;
-    }
+  public void setRequestParseTimeout(Duration requestParseTimeout) {
+    this.requestParseTimeout = requestParseTimeout;
+  }
 
-    @Override
-    public int getMaxHeaders() {
-        return maxHeaders;
-    }
+  @Override
+  public int getMaxHeaders() {
+    return maxHeaders;
+  }
 
-    public void setMaxHeaders(int maxHeaders) {
-        this.maxHeaders = maxHeaders;
-    }
+  public void setMaxHeaders(int maxHeaders) {
+    this.maxHeaders = maxHeaders;
+  }
 
-    @Override
-    public int getMaxParameters() {
-        return maxParameters;
-    }
+  @Override
+  public int getMaxParameters() {
+    return maxParameters;
+  }
 
-    public void setMaxParameters(int maxParameters) {
-        this.maxParameters = maxParameters;
-    }
+  public void setMaxParameters(int maxParameters) {
+    this.maxParameters = maxParameters;
+  }
 
-    @Override
-    public int getMaxCookies() {
-        return maxCookies;
-    }
+  @Override
+  public int getMaxCookies() {
+    return maxCookies;
+  }
 
-    public void setMaxCookies(int maxCookies) {
-        this.maxCookies = maxCookies;
-    }
+  public void setMaxCookies(int maxCookies) {
+    this.maxCookies = maxCookies;
+  }
 
-    @Override
-    public int getBacklogSize() {
-        return backlogSize;
-    }
+  @Override
+  public int getBacklogSize() {
+    return backlogSize;
+  }
 
-    public void setBacklogSize(int backlogSize) {
-        this.backlogSize = backlogSize;
-    }
+  public void setBacklogSize(int backlogSize) {
+    this.backlogSize = backlogSize;
+  }
 
-    @Override
-    public int getIoThreadsCount() {
-        return ioThreadsCount;
-    }
+  @Override
+  public int getIoThreadsCount() {
+    return ioThreadsCount;
+  }
 
-    public void setIoThreadsCount(int ioThreadsCount) {
-        this.ioThreadsCount = ioThreadsCount;
-    }
+  public void setIoThreadsCount(int ioThreadsCount) {
+    this.ioThreadsCount = ioThreadsCount;
+  }
 
-    @Override
-    public int getWorkerThreadCount() {
-        return workerThreadCount;
-    }
+  @Override
+  public int getWorkerThreadCount() {
+    return workerThreadCount;
+  }
 
-    public void setWorkerThreadCount(int workerThreadCount) {
-        this.workerThreadCount = workerThreadCount;
-    }
-
-    @Override
-    public boolean isAlwaysKeepAlive() {
-        return alwaysKeepAlive;
-    }
-
-    public void setAlwaysKeepAlive(boolean alwaysKeepAlive) {
-        this.alwaysKeepAlive = alwaysKeepAlive;
-    }
-
-    @Override
-    public boolean isKeepAlive() {
-        return keepAlive;
-    }
-
-    public void setKeepAlive(boolean keepAlive) {
-        this.keepAlive = keepAlive;
-    }
-
-    @Override
-    public boolean isRequestDumperEnabled() {
-        return requestDumperEnabled;
-    }
-
-    public void setRequestDumperEnabled(boolean requestDumperEnabled) {
-        this.requestDumperEnabled = requestDumperEnabled;
-    }
-
-    @Override
-    public int getBufferSize() {
-        return bufferSize;
-    }
-
-    public void setBufferSize(int bufferSize) {
-        this.bufferSize = bufferSize;
-    }
-
-    @Override
-    public boolean isGracefulShutdownEnabled() {
-        return gracefulShutdownEnabled;
-    }
-
-    public void setGracefulShutdownEnabled(boolean gracefulShutdownEnabled) {
-        this.gracefulShutdownEnabled = gracefulShutdownEnabled;
-    }
-
-    @Override
-    public Duration getGracefulShutdownInitialWait() {
-        return gracefulShutdownInitialWait;
-    }
-
-    public void setGracefulShutdownInitialWait(Duration gracefulShutdownInitialWait) {
-        this.gracefulShutdownInitialWait = gracefulShutdownInitialWait;
-    }
-
-    @Override
-    public boolean isHttp2Enabled() {
-        return http2Enabled;
-    }
-
-    public void setHttp2Enabled(boolean http2Enabled) {
-        this.http2Enabled = http2Enabled;
-    }
+  public void setWorkerThreadCount(int workerThreadCount) {
+    this.workerThreadCount = workerThreadCount;
+  }
+
+  @Override
+  public boolean isAlwaysKeepAlive() {
+    return alwaysKeepAlive;
+  }
+
+  public void setAlwaysKeepAlive(boolean alwaysKeepAlive) {
+    this.alwaysKeepAlive = alwaysKeepAlive;
+  }
+
+  @Override
+  public boolean isKeepAlive() {
+    return keepAlive;
+  }
+
+  public void setKeepAlive(boolean keepAlive) {
+    this.keepAlive = keepAlive;
+  }
+
+  @Override
+  public boolean isRequestDumperEnabled() {
+    return requestDumperEnabled;
+  }
+
+  public void setRequestDumperEnabled(boolean requestDumperEnabled) {
+    this.requestDumperEnabled = requestDumperEnabled;
+  }
+
+  @Override
+  public int getBufferSize() {
+    return bufferSize;
+  }
+
+  public void setBufferSize(int bufferSize) {
+    this.bufferSize = bufferSize;
+  }
+
+  @Override
+  public boolean isGracefulShutdownEnabled() {
+    return gracefulShutdownEnabled;
+  }
+
+  public void setGracefulShutdownEnabled(boolean gracefulShutdownEnabled) {
+    this.gracefulShutdownEnabled = gracefulShutdownEnabled;
+  }
+
+  @Override
+  public Duration getGracefulShutdownInitialWait() {
+    return gracefulShutdownInitialWait;
+  }
+
+  public void setGracefulShutdownInitialWait(Duration gracefulShutdownInitialWait) {
+    this.gracefulShutdownInitialWait = gracefulShutdownInitialWait;
+  }
+
+  @Override
+  public boolean isHttp2Enabled() {
+    return http2Enabled;
+  }
+
+  public void setHttp2Enabled(boolean http2Enabled) {
+    this.http2Enabled = http2Enabled;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaClustersProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaClustersProperties.java
index b3e3be3e88..60170d2395 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaClustersProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaClustersProperties.java
@@ -1,51 +1,63 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
-
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
+import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
 
 @ConfigurationProperties(prefix = "frontend.kafka")
 public class KafkaClustersProperties {
 
-    private List<KafkaProperties> clusters = new ArrayList<>();
-
-    private String namespace = "";
-
-    private String namespaceSeparator = "_";
-
-    public List<KafkaProperties> getClusters() {
-        return clusters;
-    }
-
-    public void setClusters(List<KafkaProperties> clusters) {
-        this.clusters = clusters;
-    }
-
-    public String getNamespace() {
-        return namespace;
-    }
-
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    public String getNamespaceSeparator() {
-        return namespaceSeparator;
-    }
-
-    public void setNamespaceSeparator(String namespaceSeparator) {
-        this.namespaceSeparator = namespaceSeparator;
-    }
-
-    public KafkaProperties toKafkaProperties(DatacenterNameProvider datacenterNameProvider) {
-        return this.clusters
-                .stream()
-                .filter(cluster -> cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException(
-                        "No properties for datacenter: " + datacenterNameProvider.getDatacenterName() + " defined."));
-    }
+  private List<KafkaProperties> clusters = new ArrayList<>();
+
+  private String namespace = "";
+
+  private String namespaceSeparator = "_";
+
+  public List<KafkaProperties> getClusters() {
+    return clusters;
+  }
+
+  public void setClusters(List<KafkaProperties> clusters) {
+    this.clusters = clusters;
+  }
+
+  public String getNamespace() {
+    return namespace;
+  }
+
+  public void setNamespace(String namespace) {
+    this.namespace = namespace;
+  }
+
+  public String getNamespaceSeparator() {
+    return namespaceSeparator;
+  }
+
+  public void setNamespaceSeparator(String namespaceSeparator) {
+    this.namespaceSeparator = namespaceSeparator;
+  }
+
+  public KafkaProperties toKafkaProperties(DatacenterNameProvider datacenterNameProvider) {
+    return this.clusters.stream()
+        .filter(
+            cluster -> cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "No properties for datacenter: "
+                        + datacenterNameProvider.getDatacenterName()
+                        + " defined."));
+  }
+
+  public List<KafkaParameters> toRemoteKafkaProperties(
+      DatacenterNameProvider datacenterNameProvider) {
+    return this.clusters.stream()
+        .filter(
+            cluster -> !cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
+        .collect(Collectors.toList());
+  }
 }
-
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaHeaderNameProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaHeaderNameProperties.java
index e9983503dc..14633fde74 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaHeaderNameProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaHeaderNameProperties.java
@@ -6,47 +6,36 @@
 @ConfigurationProperties(prefix = "frontend.kafka.header.name")
 public class KafkaHeaderNameProperties implements KafkaHeaderNameParameters {
 
-    private String messageId = "id";
+  private String messageId = "id";
 
-    private String timestamp = "ts";
+  private String schemaVersion = "sv";
 
-    private String schemaVersion = "sv";
+  private String schemaId = "sid";
 
-    private String schemaId = "sid";
+  @Override
+  public String getMessageId() {
+    return messageId;
+  }
 
-    @Override
-    public String getMessageId() {
-        return messageId;
-    }
+  public void setMessageId(String messageId) {
+    this.messageId = messageId;
+  }
 
-    public void setMessageId(String messageId) {
-        this.messageId = messageId;
-    }
+  @Override
+  public String getSchemaVersion() {
+    return schemaVersion;
+  }
 
-    @Override
-    public String getTimestamp() {
-        return timestamp;
-    }
+  public void setSchemaVersion(String schemaVersion) {
+    this.schemaVersion = schemaVersion;
+  }
 
-    public void setTimestamp(String timestamp) {
-        this.timestamp = timestamp;
-    }
+  @Override
+  public String getSchemaId() {
+    return schemaId;
+  }
 
-    @Override
-    public String getSchemaVersion() {
-        return schemaVersion;
-    }
-
-    public void setSchemaVersion(String schemaVersion) {
-        this.schemaVersion = schemaVersion;
-    }
-
-    @Override
-    public String getSchemaId() {
-        return schemaId;
-    }
-
-    public void setSchemaId(String schemaId) {
-        this.schemaId = schemaId;
-    }
+  public void setSchemaId(String schemaId) {
+    this.schemaId = schemaId;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaProducerProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaProducerProperties.java
index 17562ec453..cb00b3afab 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaProducerProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaProducerProperties.java
@@ -1,153 +1,173 @@
 package pl.allegro.tech.hermes.frontend.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.frontend.producer.kafka.KafkaProducerParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "frontend.kafka.producer")
 public class KafkaProducerProperties implements KafkaProducerParameters {
 
-    private Duration maxBlock = Duration.ofMillis(500);
+  private Duration maxBlock = Duration.ofMillis(500);
+
+  private Duration metadataMaxAge = Duration.ofMinutes(5);
 
-    private Duration metadataMaxAge = Duration.ofMinutes(5);
+  private String compressionCodec = "none";
 
-    private String compressionCodec = "none";
+  private int retries = Integer.MAX_VALUE;
 
-    private int retries = Integer.MAX_VALUE;
+  private Duration retryBackoff = Duration.ofMillis(256);
 
-    private Duration retryBackoff = Duration.ofMillis(256);
+  private Duration requestTimeout = Duration.ofMinutes(30);
 
-    private Duration requestTimeout = Duration.ofMinutes(30);
+  private Duration deliveryTimeout = Duration.ofMinutes(30);
 
-    private int batchSize = 16 * 1024;
+  private int batchSize = 16 * 1024;
 
-    private int tcpSendBuffer = 128 * 1024;
+  private int tcpSendBuffer = 128 * 1024;
 
-    private int maxRequestSize = 1024 * 1024;
+  private int maxRequestSize = 1024 * 1024;
 
-    private Duration linger = Duration.ofMillis(0);
+  private Duration linger = Duration.ofMillis(0);
 
-    private Duration metricsSampleWindow = Duration.ofSeconds(30);
+  private Duration metricsSampleWindow = Duration.ofSeconds(30);
 
-    private int maxInflightRequestsPerConnection = 5;
+  private int maxInflightRequestsPerConnection = 5;
 
-    private boolean reportNodeMetricsEnabled = false;
+  private boolean reportNodeMetricsEnabled = false;
 
-    @Override
-    public Duration getMaxBlock() {
-        return maxBlock;
-    }
+  private boolean idempotenceEnabled = false;
 
-    public void setMaxBlock(Duration maxBlock) {
-        this.maxBlock = maxBlock;
-    }
+  @Override
+  public Duration getMaxBlock() {
+    return maxBlock;
+  }
 
-    @Override
-    public Duration getMetadataMaxAge() {
-        return metadataMaxAge;
-    }
+  public void setMaxBlock(Duration maxBlock) {
+    this.maxBlock = maxBlock;
+  }
 
-    public void setMetadataMaxAge(Duration metadataMaxAge) {
-        this.metadataMaxAge = metadataMaxAge;
-    }
+  @Override
+  public Duration getMetadataMaxAge() {
+    return metadataMaxAge;
+  }
 
-    @Override
-    public String getCompressionCodec() {
-        return compressionCodec;
-    }
+  public void setMetadataMaxAge(Duration metadataMaxAge) {
+    this.metadataMaxAge = metadataMaxAge;
+  }
 
-    public void setCompressionCodec(String compressionCodec) {
-        this.compressionCodec = compressionCodec;
-    }
+  @Override
+  public String getCompressionCodec() {
+    return compressionCodec;
+  }
 
-    @Override
-    public int getRetries() {
-        return retries;
-    }
+  public void setCompressionCodec(String compressionCodec) {
+    this.compressionCodec = compressionCodec;
+  }
 
-    public void setRetries(int retries) {
-        this.retries = retries;
-    }
+  @Override
+  public int getRetries() {
+    return retries;
+  }
 
-    @Override
-    public Duration getRetryBackoff() {
-        return retryBackoff;
-    }
+  public void setRetries(int retries) {
+    this.retries = retries;
+  }
 
-    public void setRetryBackoff(Duration retryBackoff) {
-        this.retryBackoff = retryBackoff;
-    }
+  @Override
+  public Duration getRetryBackoff() {
+    return retryBackoff;
+  }
 
-    @Override
-    public Duration getRequestTimeout() {
-        return requestTimeout;
-    }
+  public void setRetryBackoff(Duration retryBackoff) {
+    this.retryBackoff = retryBackoff;
+  }
 
-    public void setRequestTimeout(Duration requestTimeout) {
-        this.requestTimeout = requestTimeout;
-    }
+  @Override
+  public Duration getRequestTimeout() {
+    return requestTimeout;
+  }
 
-    @Override
-    public int getBatchSize() {
-        return batchSize;
-    }
+  public void setRequestTimeout(Duration requestTimeout) {
+    this.requestTimeout = requestTimeout;
+  }
 
-    public void setBatchSize(int batchSize) {
-        this.batchSize = batchSize;
-    }
+  @Override
+  public int getBatchSize() {
+    return batchSize;
+  }
 
-    @Override
-    public int getTcpSendBuffer() {
-        return tcpSendBuffer;
-    }
+  public void setBatchSize(int batchSize) {
+    this.batchSize = batchSize;
+  }
 
-    public void setTcpSendBuffer(int tcpSendBuffer) {
-        this.tcpSendBuffer = tcpSendBuffer;
-    }
+  @Override
+  public int getTcpSendBuffer() {
+    return tcpSendBuffer;
+  }
 
-    @Override
-    public int getMaxRequestSize() {
-        return maxRequestSize;
-    }
+  public void setTcpSendBuffer(int tcpSendBuffer) {
+    this.tcpSendBuffer = tcpSendBuffer;
+  }
 
-    public void setMaxRequestSize(int maxRequestSize) {
-        this.maxRequestSize = maxRequestSize;
-    }
+  @Override
+  public int getMaxRequestSize() {
+    return maxRequestSize;
+  }
 
-    @Override
-    public Duration getLinger() {
-        return linger;
-    }
+  public void setMaxRequestSize(int maxRequestSize) {
+    this.maxRequestSize = maxRequestSize;
+  }
 
-    public void setLinger(Duration linger) {
-        this.linger = linger;
-    }
+  @Override
+  public Duration getLinger() {
+    return linger;
+  }
 
-    @Override
-    public Duration getMetricsSampleWindow() {
-        return metricsSampleWindow;
-    }
-
-    public void setMetricsSampleWindow(Duration metricsSampleWindow) {
-        this.metricsSampleWindow = metricsSampleWindow;
-    }
-
-    @Override
-    public int getMaxInflightRequestsPerConnection() {
-        return maxInflightRequestsPerConnection;
-    }
-
-    public void setMaxInflightRequestsPerConnection(int maxInflightRequestsPerConnection) {
-        this.maxInflightRequestsPerConnection = maxInflightRequestsPerConnection;
-    }
-
-    @Override
-    public boolean isReportNodeMetricsEnabled() {
-        return reportNodeMetricsEnabled;
-    }
-
-    public void setReportNodeMetricsEnabled(boolean reportNodeMetricsEnabled) {
-        this.reportNodeMetricsEnabled = reportNodeMetricsEnabled;
-    }
+  public void setLinger(Duration linger) {
+    this.linger = linger;
+  }
+
+  @Override
+  public Duration getMetricsSampleWindow() {
+    return metricsSampleWindow;
+  }
+
+  public void setMetricsSampleWindow(Duration metricsSampleWindow) {
+    this.metricsSampleWindow = metricsSampleWindow;
+  }
+
+  @Override
+  public int getMaxInflightRequestsPerConnection() {
+    return maxInflightRequestsPerConnection;
+  }
+
+  public void setMaxInflightRequestsPerConnection(int maxInflightRequestsPerConnection) {
+    this.maxInflightRequestsPerConnection = maxInflightRequestsPerConnection;
+  }
+
+  @Override
+  public boolean isReportNodeMetricsEnabled() {
+    return reportNodeMetricsEnabled;
+  }
+
+  public void setReportNodeMetricsEnabled(boolean reportNodeMetricsEnabled) {
+    this.reportNodeMetricsEnabled = reportNodeMetricsEnabled;
+  }
+
+  @Override
+  public Duration getDeliveryTimeout() {
+    return deliveryTimeout;
+  }
+
+  public void setDeliveryTimeout(Duration deliveryTimeout) {
+    this.deliveryTimeout = deliveryTimeout;
+  }
+
+  public boolean isIdempotenceEnabled() {
+    return idempotenceEnabled;
+  }
+
+  public void setIdempotenceEnabled(boolean idempotenceEnabled) {
+    this.idempotenceEnabled = idempotenceEnabled;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaProperties.java
index 473ccbd097..795a22ba5f 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/KafkaProperties.java
@@ -1,74 +1,69 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import pl.allegro.tech.hermes.common.config.KafkaAuthorizationProperties;
-import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
-
 import java.time.Duration;
+import pl.allegro.tech.hermes.common.config.KafkaAuthenticationProperties;
+import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
 
 public class KafkaProperties implements KafkaParameters {
 
-    private KafkaAuthorizationProperties authorization = new KafkaAuthorizationProperties();
-
-    private String datacenter = "dc";
+  private KafkaAuthenticationProperties authentication = new KafkaAuthenticationProperties();
 
-    private String brokerList = "localhost:9092";
+  private String datacenter = "dc";
 
-    private Duration adminRequestTimeout = Duration.ofMinutes(5);
+  private String brokerList = "localhost:9092";
 
-    public KafkaAuthorizationProperties getAuthorization() {
-        return authorization;
-    }
+  private Duration adminRequestTimeout = Duration.ofMinutes(5);
 
-    public void setAuthorization(KafkaAuthorizationProperties authorization) {
-        this.authorization = authorization;
-    }
+  @Deprecated
+  public void setAuthorization(KafkaAuthenticationProperties authorization) {
+    this.authentication = authorization;
+  }
 
-    public String getDatacenter() {
-        return datacenter;
-    }
+  public void setAuthentication(KafkaAuthenticationProperties authorization) {
+    this.authentication = authorization;
+  }
 
-    public void setDatacenter(String datacenter) {
-        this.datacenter = datacenter;
-    }
+  public String getDatacenter() {
+    return datacenter;
+  }
 
-    @Override
-    public boolean isEnabled() {
-        return authorization.isEnabled();
-    }
+  public void setDatacenter(String datacenter) {
+    this.datacenter = datacenter;
+  }
 
-    @Override
-    public String getMechanism() {
-        return authorization.getMechanism();
-    }
+  @Override
+  public boolean isAuthenticationEnabled() {
+    return authentication.isEnabled();
+  }
 
-    @Override
-    public String getProtocol() {
-        return authorization.getProtocol();
-    }
+  @Override
+  public String getAuthenticationMechanism() {
+    return authentication.getMechanism();
+  }
 
-    @Override
-    public String getUsername() {
-        return authorization.getUsername();
-    }
+  @Override
+  public String getAuthenticationProtocol() {
+    return authentication.getProtocol();
+  }
 
-    @Override
-    public String getPassword() {
-        return authorization.getPassword();
-    }
+  public String getBrokerList() {
+    return brokerList;
+  }
 
-    public String getBrokerList() {
-        return brokerList;
-    }
+  public void setBrokerList(String brokerList) {
+    this.brokerList = brokerList;
+  }
 
-    public void setBrokerList(String brokerList) {
-        this.brokerList = brokerList;
-    }
+  public Duration getAdminRequestTimeout() {
+    return adminRequestTimeout;
+  }
 
-    public Duration getAdminRequestTimeout() {
-        return adminRequestTimeout;
-    }
+  public void setAdminRequestTimeout(Duration adminRequestTimeout) {
+    this.adminRequestTimeout = adminRequestTimeout;
+  }
 
-    public void setAdminRequestTimeout(Duration adminRequestTimeout) {
-        this.adminRequestTimeout = adminRequestTimeout;
-    }
+  @Override
+  public String getJaasConfig() {
+    return authentication.getJaasConfig();
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/LocalMessageStorageProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/LocalMessageStorageProperties.java
index 61c21cdd00..9186792bc9 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/LocalMessageStorageProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/LocalMessageStorageProperties.java
@@ -1,133 +1,133 @@
 package pl.allegro.tech.hermes.frontend.config;
 
 import com.google.common.io.Files;
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.frontend.buffer.BackupMessagesLoaderParameters;
 import pl.allegro.tech.hermes.frontend.buffer.PersistentBufferExtensionParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "frontend.messages.local.storage")
-public class LocalMessageStorageProperties implements BackupMessagesLoaderParameters, PersistentBufferExtensionParameters {
+public class LocalMessageStorageProperties
+    implements BackupMessagesLoaderParameters, PersistentBufferExtensionParameters {
 
-    private long bufferedSizeBytes = 256 * 1024 * 1024L;
+  private long bufferedSizeBytes = 256 * 1024 * 1024L;
 
-    private boolean v2MigrationEnabled = true;
+  private boolean v2MigrationEnabled = true;
 
-    private boolean enabled = false;
+  private boolean enabled = false;
 
-    private String directory = Files.createTempDir().getAbsolutePath();
+  private String directory = Files.createTempDir().getAbsolutePath();
 
-    private String temporaryDirectory = Files.createTempDir().getAbsolutePath();
+  private String temporaryDirectory = Files.createTempDir().getAbsolutePath();
 
-    private int averageMessageSize = 600;
+  private int averageMessageSize = 600;
 
-    private Duration maxAge = Duration.ofHours(72);
+  private Duration maxAge = Duration.ofHours(72);
 
-    private int maxResendRetries = 5;
+  private int maxResendRetries = 5;
 
-    private Duration loadingPauseBetweenResend = Duration.ofMillis(30);
+  private Duration loadingPauseBetweenResend = Duration.ofMillis(30);
 
-    private Duration loadingWaitForBrokerTopicInfo = Duration.ofSeconds(5);
+  private Duration loadingWaitForBrokerTopicInfo = Duration.ofSeconds(5);
 
-    private boolean sizeReportingEnabled = true;
+  private boolean sizeReportingEnabled = true;
 
-    @Override
-    public long getBufferedSizeBytes() {
-        return bufferedSizeBytes;
-    }
+  @Override
+  public long getBufferedSizeBytes() {
+    return bufferedSizeBytes;
+  }
 
-    public void setBufferedSizeBytes(long bufferedSizeBytes) {
-        this.bufferedSizeBytes = bufferedSizeBytes;
-    }
+  public void setBufferedSizeBytes(long bufferedSizeBytes) {
+    this.bufferedSizeBytes = bufferedSizeBytes;
+  }
 
-    @Override
-    public boolean isV2MigrationEnabled() {
-        return v2MigrationEnabled;
-    }
+  @Override
+  public boolean isV2MigrationEnabled() {
+    return v2MigrationEnabled;
+  }
 
-    public void setV2MigrationEnabled(boolean v2MigrationEnabled) {
-        this.v2MigrationEnabled = v2MigrationEnabled;
-    }
+  public void setV2MigrationEnabled(boolean v2MigrationEnabled) {
+    this.v2MigrationEnabled = v2MigrationEnabled;
+  }
 
-    @Override
-    public boolean isEnabled() {
-        return enabled;
-    }
+  @Override
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
 
-    @Override
-    public String getDirectory() {
-        return directory;
-    }
+  @Override
+  public String getDirectory() {
+    return directory;
+  }
 
-    public void setDirectory(String directory) {
-        this.directory = directory;
-    }
+  public void setDirectory(String directory) {
+    this.directory = directory;
+  }
 
-    @Override
-    public String getTemporaryDirectory() {
-        return temporaryDirectory;
-    }
+  @Override
+  public String getTemporaryDirectory() {
+    return temporaryDirectory;
+  }
 
-    public void setTemporaryDirectory(String temporaryDirectory) {
-        this.temporaryDirectory = temporaryDirectory;
-    }
+  public void setTemporaryDirectory(String temporaryDirectory) {
+    this.temporaryDirectory = temporaryDirectory;
+  }
 
-    @Override
-    public int getAverageMessageSize() {
-        return averageMessageSize;
-    }
+  @Override
+  public int getAverageMessageSize() {
+    return averageMessageSize;
+  }
 
-    public void setAverageMessageSize(int averageMessageSize) {
-        this.averageMessageSize = averageMessageSize;
-    }
+  public void setAverageMessageSize(int averageMessageSize) {
+    this.averageMessageSize = averageMessageSize;
+  }
 
-    @Override
-    public Duration getMaxAge() {
-        return maxAge;
-    }
+  @Override
+  public Duration getMaxAge() {
+    return maxAge;
+  }
 
-    public void setMaxAge(Duration maxAge) {
-        this.maxAge = maxAge;
-    }
+  public void setMaxAge(Duration maxAge) {
+    this.maxAge = maxAge;
+  }
 
-    @Override
-    public int getMaxResendRetries() {
-        return maxResendRetries;
-    }
+  @Override
+  public int getMaxResendRetries() {
+    return maxResendRetries;
+  }
 
-    public void setMaxResendRetries(int maxResendRetries) {
-        this.maxResendRetries = maxResendRetries;
-    }
+  public void setMaxResendRetries(int maxResendRetries) {
+    this.maxResendRetries = maxResendRetries;
+  }
 
-    @Override
-    public Duration getLoadingPauseBetweenResend() {
-        return loadingPauseBetweenResend;
-    }
+  @Override
+  public Duration getLoadingPauseBetweenResend() {
+    return loadingPauseBetweenResend;
+  }
 
-    public void setLoadingPauseBetweenResend(Duration loadingPauseBetweenResend) {
-        this.loadingPauseBetweenResend = loadingPauseBetweenResend;
-    }
+  public void setLoadingPauseBetweenResend(Duration loadingPauseBetweenResend) {
+    this.loadingPauseBetweenResend = loadingPauseBetweenResend;
+  }
 
-    @Override
-    public Duration getLoadingWaitForBrokerTopicInfo() {
-        return loadingWaitForBrokerTopicInfo;
-    }
+  @Override
+  public Duration getLoadingWaitForBrokerTopicInfo() {
+    return loadingWaitForBrokerTopicInfo;
+  }
 
-    public void setLoadingWaitForBrokerTopicInfo(Duration loadingWaitForBrokerTopicInfo) {
-        this.loadingWaitForBrokerTopicInfo = loadingWaitForBrokerTopicInfo;
-    }
+  public void setLoadingWaitForBrokerTopicInfo(Duration loadingWaitForBrokerTopicInfo) {
+    this.loadingWaitForBrokerTopicInfo = loadingWaitForBrokerTopicInfo;
+  }
 
-    @Override
-    public boolean isSizeReportingEnabled() {
-        return sizeReportingEnabled;
-    }
-
-    public void setSizeReportingEnabled(boolean sizeReportingEnabled) {
-        this.sizeReportingEnabled = sizeReportingEnabled;
-    }
+  @Override
+  public boolean isSizeReportingEnabled() {
+    return sizeReportingEnabled;
+  }
+
+  public void setSizeReportingEnabled(boolean sizeReportingEnabled) {
+    this.sizeReportingEnabled = sizeReportingEnabled;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MessagePreviewProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MessagePreviewProperties.java
index c7f2752207..9e6ae5155a 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MessagePreviewProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MessagePreviewProperties.java
@@ -1,49 +1,48 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "frontend.message.preview")
 public class MessagePreviewProperties {
 
-    private boolean enabled = false;
+  private boolean enabled = false;
 
-    private int maxSizeKb = 10;
+  private int maxSizeKb = 10;
 
-    private int size = 3;
+  private int size = 3;
 
-    private Duration logPersistPeriod = Duration.ofSeconds(30);
+  private Duration logPersistPeriod = Duration.ofSeconds(30);
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
 
-    public int getMaxSizeKb() {
-        return maxSizeKb;
-    }
+  public int getMaxSizeKb() {
+    return maxSizeKb;
+  }
 
-    public void setMaxSizeKb(int maxSizeKb) {
-        this.maxSizeKb = maxSizeKb;
-    }
+  public void setMaxSizeKb(int maxSizeKb) {
+    this.maxSizeKb = maxSizeKb;
+  }
 
-    public int getSize() {
-        return size;
-    }
+  public int getSize() {
+    return size;
+  }
 
-    public void setSize(int size) {
-        this.size = size;
-    }
+  public void setSize(int size) {
+    this.size = size;
+  }
 
-    public Duration getLogPersistPeriod() {
-        return logPersistPeriod;
-    }
+  public Duration getLogPersistPeriod() {
+    return logPersistPeriod;
+  }
 
-    public void setLogPersistPeriod(Duration logPersistPeriod) {
-        this.logPersistPeriod = logPersistPeriod;
-    }
+  public void setLogPersistPeriod(Duration logPersistPeriod) {
+    this.logPersistPeriod = logPersistPeriod;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MetricRegistryProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MetricRegistryProperties.java
index eceaadc4f8..0f2a91d5e4 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MetricRegistryProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MetricRegistryProperties.java
@@ -1,75 +1,18 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.common.di.factories.MetricRegistryParameters;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "frontend.metrics.metric-registry")
-public class MetricRegistryProperties implements MetricRegistryParameters {
-
-    private boolean zookeeperReporterEnabled = true;
-
-    private boolean graphiteReporterEnabled = false;
-
-    private boolean consoleReporterEnabled = false;
-
-    private Duration counterExpireAfterAccess = Duration.ofHours(72);
-
-    private String disabledAttributes = "M15_RATE, M5_RATE, MEAN, MEAN_RATE, MIN, STDDEV";
-
-    private Duration reportPeriod = Duration.ofSeconds(20);
-
-    @Override
-    public boolean isZookeeperReporterEnabled() {
-        return zookeeperReporterEnabled;
-    }
-
-    public void setZookeeperReporterEnabled(boolean zookeeperReporterEnabled) {
-        this.zookeeperReporterEnabled = zookeeperReporterEnabled;
-    }
-
-    @Override
-    public boolean isGraphiteReporterEnabled() {
-        return graphiteReporterEnabled;
-    }
-
-    public void setGraphiteReporterEnabled(boolean graphiteReporterEnabled) {
-        this.graphiteReporterEnabled = graphiteReporterEnabled;
-    }
-
-    @Override
-    public boolean isConsoleReporterEnabled() {
-        return consoleReporterEnabled;
-    }
-
-    public void setConsoleReporterEnabled(boolean consoleReporterEnabled) {
-        this.consoleReporterEnabled = consoleReporterEnabled;
-    }
-
-    public Duration getCounterExpireAfterAccess() {
-        return counterExpireAfterAccess;
-    }
-
-    public void setCounterExpireAfterAccess(Duration counterExpireAfterAccess) {
-        this.counterExpireAfterAccess = counterExpireAfterAccess;
-    }
-
-    @Override
-    public String getDisabledAttributes() {
-        return disabledAttributes;
-    }
+public class MetricRegistryProperties {
 
-    public void setDisabledAttributes(String disabledAttributes) {
-        this.disabledAttributes = disabledAttributes;
-    }
+  private Duration counterExpireAfterAccess = Duration.ofHours(72);
 
-    @Override
-    public Duration getReportPeriod() {
-        return reportPeriod;
-    }
+  public Duration getCounterExpireAfterAccess() {
+    return counterExpireAfterAccess;
+  }
 
-    public void setReportPeriod(Duration reportPeriod) {
-        this.reportPeriod = reportPeriod;
-    }
+  public void setCounterExpireAfterAccess(Duration counterExpireAfterAccess) {
+    this.counterExpireAfterAccess = counterExpireAfterAccess;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MicrometerRegistryProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MicrometerRegistryProperties.java
index 8a99c812bf..9aae6c401d 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MicrometerRegistryProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/MicrometerRegistryProperties.java
@@ -1,51 +1,49 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.common.di.factories.MicrometerRegistryParameters;
-
 import java.time.Duration;
 import java.util.List;
-
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.common.di.factories.MicrometerRegistryParameters;
 
 @ConfigurationProperties(prefix = "frontend.metrics.micrometer")
 public class MicrometerRegistryProperties implements MicrometerRegistryParameters {
 
-    private List<Double> percentiles = List.of(0.5, 0.99, 0.999);
-    private boolean zookeeperReporterEnabled = true;
-    private Duration reportPeriod = Duration.ofSeconds(20);
+  private List<Double> percentiles = List.of(0.5, 0.99, 0.999);
+  private boolean zookeeperReporterEnabled = true;
+  private Duration reportPeriod = Duration.ofSeconds(20);
 
-    @Override
-    public List<Double> getPercentiles() {
-        return percentiles;
-    }
+  @Override
+  public List<Double> getPercentiles() {
+    return percentiles;
+  }
 
-    @Override
-    public boolean zookeeperReporterEnabled() {
-        return zookeeperReporterEnabled;
-    }
+  @Override
+  public boolean zookeeperReporterEnabled() {
+    return zookeeperReporterEnabled;
+  }
 
-    @Override
-    public Duration zookeeperReportPeriod() {
-        return reportPeriod;
-    }
+  @Override
+  public Duration zookeeperReportPeriod() {
+    return reportPeriod;
+  }
 
-    public void setPercentiles(List<Double> percentiles) {
-        this.percentiles = percentiles;
-    }
+  public void setPercentiles(List<Double> percentiles) {
+    this.percentiles = percentiles;
+  }
 
-    public boolean isZookeeperReporterEnabled() {
-        return zookeeperReporterEnabled;
-    }
+  public boolean isZookeeperReporterEnabled() {
+    return zookeeperReporterEnabled;
+  }
 
-    public void setZookeeperReporterEnabled(boolean zookeeperReporterEnabled) {
-        this.zookeeperReporterEnabled = zookeeperReporterEnabled;
-    }
+  public void setZookeeperReporterEnabled(boolean zookeeperReporterEnabled) {
+    this.zookeeperReporterEnabled = zookeeperReporterEnabled;
+  }
 
-    public Duration getReportPeriod() {
-        return reportPeriod;
-    }
+  public Duration getReportPeriod() {
+    return reportPeriod;
+  }
 
-    public void setReportPeriod(Duration reportPeriod) {
-        this.reportPeriod = reportPeriod;
-    }
+  public void setReportPeriod(Duration reportPeriod) {
+    this.reportPeriod = reportPeriod;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusConfigAdapter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusConfigAdapter.java
index 71478a9da8..cc57060c15 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusConfigAdapter.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusConfigAdapter.java
@@ -1,32 +1,29 @@
 package pl.allegro.tech.hermes.frontend.config;
 
 import io.micrometer.prometheus.PrometheusConfig;
-
 import java.time.Duration;
 
 public class PrometheusConfigAdapter implements PrometheusConfig {
 
-    private final PrometheusProperties prometheusReporterProperties;
+  private final PrometheusProperties prometheusReporterProperties;
 
-    public PrometheusConfigAdapter(PrometheusProperties prometheusReporterProperties) {
-        this.prometheusReporterProperties = prometheusReporterProperties;
-    }
+  public PrometheusConfigAdapter(PrometheusProperties prometheusReporterProperties) {
+    this.prometheusReporterProperties = prometheusReporterProperties;
+  }
 
-    @Override
-    public boolean descriptions() {
-        return prometheusReporterProperties.isDescriptions();
-    }
+  @Override
+  public boolean descriptions() {
+    return prometheusReporterProperties.isDescriptions();
+  }
 
-    @Override
-    public Duration step() {
-        return prometheusReporterProperties.getStep();
-    }
+  @Override
+  public Duration step() {
+    return prometheusReporterProperties.getStep();
+  }
 
-    /**
-     * Returning null is fine since we override all the methods from PrometheusConfig.
-     */
-    @Override
-    public String get(String key) {
-        return null;  // Nothing to see here, move along.
-    }
+  /** Returning null is fine since we override all the methods from PrometheusConfig. */
+  @Override
+  public String get(String key) {
+    return null; // Nothing to see here, move along.
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusProperties.java
index f7b3edf584..b220bea282 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusProperties.java
@@ -1,28 +1,27 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "frontend.prometheus")
 public class PrometheusProperties {
 
-    private Duration step = Duration.ofMinutes(1);
-    private boolean descriptions = true;
+  private Duration step = Duration.ofMinutes(1);
+  private boolean descriptions = true;
 
-    public Duration getStep() {
-        return this.step;
-    }
+  public Duration getStep() {
+    return this.step;
+  }
 
-    public void setStep(Duration step) {
-        this.step = step;
-    }
+  public void setStep(Duration step) {
+    this.step = step;
+  }
 
-    public boolean isDescriptions() {
-        return this.descriptions;
-    }
+  public boolean isDescriptions() {
+    return this.descriptions;
+  }
 
-    public void setDescriptions(boolean descriptions) {
-        this.descriptions = descriptions;
-    }
+  public void setDescriptions(boolean descriptions) {
+    this.descriptions = descriptions;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ReadinessCheckProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ReadinessCheckProperties.java
index dce2d5be68..c0775a6356 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ReadinessCheckProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ReadinessCheckProperties.java
@@ -1,39 +1,38 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "frontend.readiness.check")
 public class ReadinessCheckProperties {
 
-    private boolean enabled = false;
+  private boolean enabled = false;
 
-    private boolean kafkaCheckEnabled = false;
+  private boolean kafkaCheckEnabled = false;
 
-    private Duration interval = Duration.ofSeconds(1);
+  private Duration interval = Duration.ofSeconds(1);
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
 
-    public Duration getInterval() {
-        return interval;
-    }
+  public Duration getInterval() {
+    return interval;
+  }
 
-    public void setIntervalSeconds(Duration intervalSeconds) {
-        this.interval = intervalSeconds;
-    }
+  public void setIntervalSeconds(Duration intervalSeconds) {
+    this.interval = intervalSeconds;
+  }
 
-    public boolean isKafkaCheckEnabled() {
-        return kafkaCheckEnabled;
-    }
+  public boolean isKafkaCheckEnabled() {
+    return kafkaCheckEnabled;
+  }
 
-    public void setKafkaCheckEnabled(boolean kafkaCheckEnabled) {
-        this.kafkaCheckEnabled = kafkaCheckEnabled;
-    }
+  public void setKafkaCheckEnabled(boolean kafkaCheckEnabled) {
+    this.kafkaCheckEnabled = kafkaCheckEnabled;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ReadinessConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ReadinessConfiguration.java
new file mode 100644
index 0000000000..c581189e3f
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ReadinessConfiguration.java
@@ -0,0 +1,48 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.inject.Named;
+import org.apache.curator.framework.CuratorFramework;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import pl.allegro.tech.hermes.frontend.producer.BrokerTopicAvailabilityChecker;
+import pl.allegro.tech.hermes.frontend.readiness.AdminReadinessService;
+import pl.allegro.tech.hermes.frontend.readiness.DefaultReadinessChecker;
+import pl.allegro.tech.hermes.frontend.readiness.HealthCheckService;
+import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
+import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
+
+@Configuration
+@EnableConfigurationProperties({ReadinessCheckProperties.class})
+public class ReadinessConfiguration {
+
+  @Bean
+  public DefaultReadinessChecker readinessChecker(
+      ReadinessCheckProperties readinessCheckProperties,
+      @Named("localDatacenterBrokerProducer")
+          BrokerTopicAvailabilityChecker brokerTopicAvailabilityChecker,
+      AdminReadinessService adminReadinessService) {
+    return new DefaultReadinessChecker(
+        brokerTopicAvailabilityChecker,
+        adminReadinessService,
+        readinessCheckProperties.isEnabled(),
+        readinessCheckProperties.isKafkaCheckEnabled(),
+        readinessCheckProperties.getInterval());
+  }
+
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  public AdminReadinessService adminReadinessService(
+      ObjectMapper mapper,
+      CuratorFramework zookeeper,
+      ZookeeperPaths paths,
+      DatacenterNameProvider datacenterNameProvider) {
+    String localDatacenterName = datacenterNameProvider.getDatacenterName();
+    return new AdminReadinessService(mapper, zookeeper, paths, localDatacenterName);
+  }
+
+  @Bean(initMethod = "startup")
+  public HealthCheckService healthCheckService() {
+    return new HealthCheckService();
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaConfiguration.java
index 59f6dd5163..d32e7211d2 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaConfiguration.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaConfiguration.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
+import java.net.URI;
 import org.apache.avro.Schema;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
@@ -23,69 +24,80 @@
 import pl.allegro.tech.hermes.schema.resolver.DefaultSchemaRepositoryInstanceResolver;
 import pl.allegro.tech.hermes.schema.resolver.SchemaRepositoryInstanceResolver;
 
-import java.net.URI;
-
 @Configuration
-@EnableConfigurationProperties({
-        SchemaProperties.class,
-        KafkaClustersProperties.class
-})
+@EnableConfigurationProperties({SchemaProperties.class, KafkaClustersProperties.class})
 public class SchemaConfiguration {
 
-    @Bean
-    public SchemaRepository schemaRepository(SchemaVersionsRepository schemaVersionsRepository,
-                                             CompiledSchemaRepository<Schema> compiledAvroSchemaRepository) {
-        return new SchemaRepositoryFactory(schemaVersionsRepository, compiledAvroSchemaRepository).provide();
-    }
+  @Bean
+  public SchemaRepository schemaRepository(
+      SchemaVersionsRepository schemaVersionsRepository,
+      CompiledSchemaRepository<Schema> compiledAvroSchemaRepository) {
+    return new SchemaRepositoryFactory(schemaVersionsRepository, compiledAvroSchemaRepository)
+        .provide();
+  }
 
-    @Bean
-    public CompiledSchemaRepository<Schema> avroCompiledSchemaRepository(RawSchemaClient rawSchemaClient,
-                                                                         SchemaProperties schemaProperties) {
-        return new AvroCompiledSchemaRepositoryFactory(
-                rawSchemaClient, schemaProperties.getCache().getCompiledMaximumSize(),
-                schemaProperties.getCache().getCompiledExpireAfterAccess(), schemaProperties.getCache().isEnabled()
-        ).provide();
-    }
+  @Bean
+  public CompiledSchemaRepository<Schema> avroCompiledSchemaRepository(
+      RawSchemaClient rawSchemaClient, SchemaProperties schemaProperties) {
+    return new AvroCompiledSchemaRepositoryFactory(
+            rawSchemaClient,
+            schemaProperties.getCache().getCompiledMaximumSize(),
+            schemaProperties.getCache().getCompiledExpireAfterAccess(),
+            schemaProperties.getCache().isEnabled())
+        .provide();
+  }
 
-    @Bean
-    public RawSchemaClient rawSchemaClient(KafkaClustersProperties kafkaClustersProperties,
-                                           MetricsFacade metricsFacade,
-                                           ObjectMapper objectMapper,
-                                           SchemaRepositoryInstanceResolver resolver,
-                                           SchemaProperties schemaProperties) {
-        return new RawSchemaClientFactory(
-                kafkaClustersProperties.getNamespace(),
-                kafkaClustersProperties.getNamespaceSeparator(),
-                metricsFacade,
-                objectMapper,
-                resolver,
-                schemaProperties.getRepository().isSubjectSuffixEnabled(),
-                schemaProperties.getRepository().isSubjectNamespaceEnabled()
-        ).provide();
-    }
+  @Bean
+  public RawSchemaClient rawSchemaClient(
+      KafkaClustersProperties kafkaClustersProperties,
+      MetricsFacade metricsFacade,
+      ObjectMapper objectMapper,
+      SchemaRepositoryInstanceResolver resolver,
+      SchemaProperties schemaProperties) {
+    return new RawSchemaClientFactory(
+            kafkaClustersProperties.getNamespace(),
+            kafkaClustersProperties.getNamespaceSeparator(),
+            metricsFacade,
+            objectMapper,
+            resolver,
+            schemaProperties.getRepository().isSubjectSuffixEnabled(),
+            schemaProperties.getRepository().isSubjectNamespaceEnabled())
+        .provide();
+  }
 
-    @Bean
-    public SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver(SchemaProperties schemaProperties, Client client) {
-        URI schemaRepositoryServerUri = URI.create(schemaProperties.getRepository().getServerUrl());
-        return new DefaultSchemaRepositoryInstanceResolver(client, schemaRepositoryServerUri);
-    }
+  @Bean
+  public SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver(
+      SchemaProperties schemaProperties, Client client) {
+    URI schemaRepositoryServerUri = URI.create(schemaProperties.getRepository().getServerUrl());
+    return new DefaultSchemaRepositoryInstanceResolver(client, schemaRepositoryServerUri);
+  }
 
-    @Bean
-    public Client schemaRepositoryClient(ObjectMapper mapper, SchemaProperties schemaProperties) {
-        ClientConfig config = new ClientConfig()
-                .property(ClientProperties.READ_TIMEOUT, (int) schemaProperties.getRepository().getHttpReadTimeout().toMillis())
-                .property(ClientProperties.CONNECT_TIMEOUT, (int) schemaProperties.getRepository().getHttpConnectTimeout().toMillis())
-                .register(new JacksonJsonProvider(mapper));
+  @Bean
+  public Client schemaRepositoryClient(ObjectMapper mapper, SchemaProperties schemaProperties) {
+    ClientConfig config =
+        new ClientConfig()
+            .property(
+                ClientProperties.READ_TIMEOUT,
+                (int) schemaProperties.getRepository().getHttpReadTimeout().toMillis())
+            .property(
+                ClientProperties.CONNECT_TIMEOUT,
+                (int) schemaProperties.getRepository().getHttpConnectTimeout().toMillis())
+            .register(new JacksonJsonProvider(mapper));
 
-        return ClientBuilder.newClient(config);
-    }
+    return ClientBuilder.newClient(config);
+  }
 
-    @Bean
-    public SchemaVersionsRepository schemaVersionsRepositoryFactory(RawSchemaClient rawSchemaClient,
-                                                                    SchemaProperties schemaProperties,
-                                                                    InternalNotificationsBus notificationsBus,
-                                                                    CompiledSchemaRepository<?> compiledSchemaRepository) {
-        return new SchemaVersionsRepositoryFactory(rawSchemaClient, schemaProperties.getCache(), notificationsBus, compiledSchemaRepository)
-                .provide();
-    }
+  @Bean
+  public SchemaVersionsRepository schemaVersionsRepositoryFactory(
+      RawSchemaClient rawSchemaClient,
+      SchemaProperties schemaProperties,
+      InternalNotificationsBus notificationsBus,
+      CompiledSchemaRepository<?> compiledSchemaRepository) {
+    return new SchemaVersionsRepositoryFactory(
+            rawSchemaClient,
+            schemaProperties.getCache(),
+            notificationsBus,
+            compiledSchemaRepository)
+        .provide();
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaProperties.java
index 3c71e2ce53..a022fdce49 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaProperties.java
@@ -7,53 +7,53 @@
 @ConfigurationProperties(prefix = "frontend.schema")
 public class SchemaProperties {
 
-    private SchemaCacheProperties cache = new SchemaCacheProperties();
+  private SchemaCacheProperties cache = new SchemaCacheProperties();
 
-    private SchemaRepositoryProperties repository = new SchemaRepositoryProperties();
+  private SchemaRepositoryProperties repository = new SchemaRepositoryProperties();
 
-    private boolean idHeaderEnabled = false;
+  private boolean idHeaderEnabled = false;
 
-    private boolean idSerializationEnabled = false;
+  private boolean idSerializationEnabled = false;
 
-    private boolean versionTruncationEnabled = false;
+  private boolean versionTruncationEnabled = false;
 
-    public SchemaCacheProperties getCache() {
-        return cache;
-    }
+  public SchemaCacheProperties getCache() {
+    return cache;
+  }
 
-    public void setCache(SchemaCacheProperties cache) {
-        this.cache = cache;
-    }
+  public void setCache(SchemaCacheProperties cache) {
+    this.cache = cache;
+  }
 
-    public SchemaRepositoryProperties getRepository() {
-        return repository;
-    }
+  public SchemaRepositoryProperties getRepository() {
+    return repository;
+  }
 
-    public void setRepository(SchemaRepositoryProperties repository) {
-        this.repository = repository;
-    }
+  public void setRepository(SchemaRepositoryProperties repository) {
+    this.repository = repository;
+  }
 
-    public boolean isIdHeaderEnabled() {
-        return idHeaderEnabled;
-    }
+  public boolean isIdHeaderEnabled() {
+    return idHeaderEnabled;
+  }
 
-    public void setIdHeaderEnabled(boolean idHeaderEnabled) {
-        this.idHeaderEnabled = idHeaderEnabled;
-    }
+  public void setIdHeaderEnabled(boolean idHeaderEnabled) {
+    this.idHeaderEnabled = idHeaderEnabled;
+  }
 
-    public boolean isIdSerializationEnabled() {
-        return idSerializationEnabled;
-    }
+  public boolean isIdSerializationEnabled() {
+    return idSerializationEnabled;
+  }
 
-    public void setIdSerializationEnabled(boolean idSerializationEnabled) {
-        this.idSerializationEnabled = idSerializationEnabled;
-    }
+  public void setIdSerializationEnabled(boolean idSerializationEnabled) {
+    this.idSerializationEnabled = idSerializationEnabled;
+  }
 
-    public boolean isVersionTruncationEnabled() {
-        return versionTruncationEnabled;
-    }
+  public boolean isVersionTruncationEnabled() {
+    return versionTruncationEnabled;
+  }
 
-    public void setVersionTruncationEnabled(boolean versionTruncationEnabled) {
-        this.versionTruncationEnabled = versionTruncationEnabled;
-    }
+  public void setVersionTruncationEnabled(boolean versionTruncationEnabled) {
+    this.versionTruncationEnabled = versionTruncationEnabled;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SslProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SslProperties.java
index 925a507eea..2f449d68de 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SslProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SslProperties.java
@@ -6,136 +6,135 @@
 @ConfigurationProperties(prefix = "frontend.ssl")
 public class SslProperties implements SslParameters {
 
-    private boolean enabled = false;
+  private boolean enabled = false;
 
-    private int port = 8443;
+  private int port = 8443;
 
-    private String clientAuthMode = "not_requested";
+  private String clientAuthMode = "not_requested";
 
-    private String protocol = "TLS";
+  private String protocol = "TLS";
 
-    private String keystoreSource = "jre";
+  private String keystoreSource = "jre";
 
-    private String keystoreLocation = "classpath:server.keystore";
+  private String keystoreLocation = "classpath:server.keystore";
 
-    private String keystorePassword = "password";
+  private String keystorePassword = "password";
 
-    private String keystoreFormat = "JKS";
+  private String keystoreFormat = "JKS";
 
-    private String truststoreSource = "jre";
+  private String truststoreSource = "jre";
 
-    private String truststoreLocation = "classpath:server.truststore";
+  private String truststoreLocation = "classpath:server.truststore";
 
-    private String truststorePassword = "password";
+  private String truststorePassword = "password";
 
-    private String truststoreFormat = "JKS";
+  private String truststoreFormat = "JKS";
 
-    @Override
-    public boolean isEnabled() {
-        return enabled;
-    }
+  @Override
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
 
-    @Override
-    public int getPort() {
-        return port;
-    }
+  @Override
+  public int getPort() {
+    return port;
+  }
 
-    public void setPort(int port) {
-        this.port = port;
-    }
+  public void setPort(int port) {
+    this.port = port;
+  }
 
-    @Override
-    public String getClientAuthMode() {
-        return clientAuthMode;
-    }
+  @Override
+  public String getClientAuthMode() {
+    return clientAuthMode;
+  }
 
-    public void setClientAuthMode(String clientAuthMode) {
-        this.clientAuthMode = clientAuthMode;
-    }
+  public void setClientAuthMode(String clientAuthMode) {
+    this.clientAuthMode = clientAuthMode;
+  }
 
-    @Override
-    public String getProtocol() {
-        return protocol;
-    }
+  @Override
+  public String getProtocol() {
+    return protocol;
+  }
 
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
+  public void setProtocol(String protocol) {
+    this.protocol = protocol;
+  }
 
-    @Override
-    public String getKeystoreSource() {
-        return keystoreSource;
-    }
+  @Override
+  public String getKeystoreSource() {
+    return keystoreSource;
+  }
 
-    public void setKeystoreSource(String keystoreSource) {
-        this.keystoreSource = keystoreSource;
-    }
+  public void setKeystoreSource(String keystoreSource) {
+    this.keystoreSource = keystoreSource;
+  }
 
-    @Override
-    public String getKeystoreLocation() {
-        return keystoreLocation;
-    }
+  @Override
+  public String getKeystoreLocation() {
+    return keystoreLocation;
+  }
 
-    public void setKeystoreLocation(String keystoreLocation) {
-        this.keystoreLocation = keystoreLocation;
-    }
+  public void setKeystoreLocation(String keystoreLocation) {
+    this.keystoreLocation = keystoreLocation;
+  }
 
-    @Override
-    public String getKeystorePassword() {
-        return keystorePassword;
-    }
+  @Override
+  public String getKeystorePassword() {
+    return keystorePassword;
+  }
 
-    public void setKeystorePassword(String keystorePassword) {
-        this.keystorePassword = keystorePassword;
-    }
+  public void setKeystorePassword(String keystorePassword) {
+    this.keystorePassword = keystorePassword;
+  }
 
-    @Override
-    public String getKeystoreFormat() {
-        return keystoreFormat;
-    }
+  @Override
+  public String getKeystoreFormat() {
+    return keystoreFormat;
+  }
 
-    public void setKeystoreFormat(String keystoreFormat) {
-        this.keystoreFormat = keystoreFormat;
-    }
+  public void setKeystoreFormat(String keystoreFormat) {
+    this.keystoreFormat = keystoreFormat;
+  }
 
-    @Override
-    public String getTruststoreSource() {
-        return truststoreSource;
-    }
+  @Override
+  public String getTruststoreSource() {
+    return truststoreSource;
+  }
 
-    public void setTruststoreSource(String truststoreSource) {
-        this.truststoreSource = truststoreSource;
-    }
+  public void setTruststoreSource(String truststoreSource) {
+    this.truststoreSource = truststoreSource;
+  }
 
-    @Override
-    public String getTruststoreLocation() {
-        return truststoreLocation;
-    }
+  @Override
+  public String getTruststoreLocation() {
+    return truststoreLocation;
+  }
 
-    public void setTruststoreLocation(String truststoreLocation) {
-        this.truststoreLocation = truststoreLocation;
-    }
+  public void setTruststoreLocation(String truststoreLocation) {
+    this.truststoreLocation = truststoreLocation;
+  }
 
-    @Override
-    public String getTruststorePassword() {
-        return truststorePassword;
-    }
-
-    public void setTruststorePassword(String truststorePassword) {
-        this.truststorePassword = truststorePassword;
-    }
-
-    @Override
-    public String getTruststoreFormat() {
-        return truststoreFormat;
-    }
-
-    public void setTruststoreFormat(String truststoreFormat) {
-        this.truststoreFormat = truststoreFormat;
-    }
+  @Override
+  public String getTruststorePassword() {
+    return truststorePassword;
+  }
+
+  public void setTruststorePassword(String truststorePassword) {
+    this.truststorePassword = truststorePassword;
+  }
+
+  @Override
+  public String getTruststoreFormat() {
+    return truststoreFormat;
+  }
+
+  public void setTruststoreFormat(String truststoreFormat) {
+    this.truststoreFormat = truststoreFormat;
+  }
 }
-
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ThroughputProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ThroughputProperties.java
index 6d7387d5e5..ce76846ba9 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ThroughputProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ThroughputProperties.java
@@ -1,87 +1,86 @@
 package pl.allegro.tech.hermes.frontend.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputParameters;
 
-import java.time.Duration;
-
 @ConfigurationProperties(prefix = "frontend.throughput")
 public class ThroughputProperties implements ThroughputParameters {
 
-    private String type = "unlimited";
+  private String type = "unlimited";
 
-    private long fixedMax = Long.MAX_VALUE;
+  private long fixedMax = Long.MAX_VALUE;
 
-    private long dynamicMax = Long.MAX_VALUE;
+  private long dynamicMax = Long.MAX_VALUE;
 
-    private long dynamicThreshold = Long.MAX_VALUE;
+  private long dynamicThreshold = Long.MAX_VALUE;
 
-    private long dynamicDesired = Long.MAX_VALUE;
+  private long dynamicDesired = Long.MAX_VALUE;
 
-    private double dynamicIdle = 0.5;
+  private double dynamicIdle = 0.5;
 
-    private Duration dynamicCheckInterval = Duration.ofSeconds(30);
+  private Duration dynamicCheckInterval = Duration.ofSeconds(30);
 
-    @Override
-    public String getType() {
-        return type;
-    }
+  @Override
+  public String getType() {
+    return type;
+  }
 
-    public void setType(String type) {
-        this.type = type;
-    }
+  public void setType(String type) {
+    this.type = type;
+  }
 
-    @Override
-    public long getFixedMax() {
-        return fixedMax;
-    }
+  @Override
+  public long getFixedMax() {
+    return fixedMax;
+  }
 
-    public void setFixedMax(long fixedMax) {
-        this.fixedMax = fixedMax;
-    }
+  public void setFixedMax(long fixedMax) {
+    this.fixedMax = fixedMax;
+  }
 
-    @Override
-    public long getDynamicMax() {
-        return dynamicMax;
-    }
+  @Override
+  public long getDynamicMax() {
+    return dynamicMax;
+  }
 
-    public void setDynamicMax(long dynamicMax) {
-        this.dynamicMax = dynamicMax;
-    }
+  public void setDynamicMax(long dynamicMax) {
+    this.dynamicMax = dynamicMax;
+  }
 
-    @Override
-    public long getDynamicThreshold() {
-        return dynamicThreshold;
-    }
+  @Override
+  public long getDynamicThreshold() {
+    return dynamicThreshold;
+  }
 
-    public void setDynamicThreshold(long dynamicThreshold) {
-        this.dynamicThreshold = dynamicThreshold;
-    }
+  public void setDynamicThreshold(long dynamicThreshold) {
+    this.dynamicThreshold = dynamicThreshold;
+  }
 
-    @Override
-    public long getDynamicDesired() {
-        return dynamicDesired;
-    }
+  @Override
+  public long getDynamicDesired() {
+    return dynamicDesired;
+  }
 
-    public void setDynamicDesired(long dynamicDesired) {
-        this.dynamicDesired = dynamicDesired;
-    }
+  public void setDynamicDesired(long dynamicDesired) {
+    this.dynamicDesired = dynamicDesired;
+  }
 
-    @Override
-    public double getDynamicIdle() {
-        return dynamicIdle;
-    }
+  @Override
+  public double getDynamicIdle() {
+    return dynamicIdle;
+  }
 
-    public void setDynamicIdle(double dynamicIdle) {
-        this.dynamicIdle = dynamicIdle;
-    }
+  public void setDynamicIdle(double dynamicIdle) {
+    this.dynamicIdle = dynamicIdle;
+  }
 
-    @Override
-    public Duration getDynamicCheckInterval() {
-        return dynamicCheckInterval;
-    }
+  @Override
+  public Duration getDynamicCheckInterval() {
+    return dynamicCheckInterval;
+  }
 
-    public void setDynamicCheckInterval(Duration dynamicCheckInterval) {
-        this.dynamicCheckInterval = dynamicCheckInterval;
-    }
+  public void setDynamicCheckInterval(Duration dynamicCheckInterval) {
+    this.dynamicCheckInterval = dynamicCheckInterval;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicDefaultsProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicDefaultsProperties.java
new file mode 100644
index 0000000000..cd7e9bd5ad
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicDefaultsProperties.java
@@ -0,0 +1,16 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "frontend.topic.defaults")
+public class TopicDefaultsProperties {
+  private boolean fallbackToRemoteDatacenterEnabled = false;
+
+  public boolean isFallbackToRemoteDatacenterEnabled() {
+    return fallbackToRemoteDatacenterEnabled;
+  }
+
+  public void setFallbackToRemoteDatacenterEnabled(boolean fallbackToRemoteDatacenterEnabled) {
+    this.fallbackToRemoteDatacenterEnabled = fallbackToRemoteDatacenterEnabled;
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicLoadingProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicLoadingProperties.java
index a469047686..c009d5ee74 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicLoadingProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicLoadingProperties.java
@@ -1,138 +1,127 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "frontend.startup.topic.loading")
 public class TopicLoadingProperties {
 
-    private MetadataLoadingProperties metadata = new MetadataLoadingProperties();
-
-    private SchemaLoadingProperties schema = new SchemaLoadingProperties();
-
-    private MetadataRefreshJobProperties metadataRefreshJob = new MetadataRefreshJobProperties();
-
-    public static class MetadataLoadingProperties {
-
-        private boolean enabled = false;
+  private MetadataLoadingProperties metadata = new MetadataLoadingProperties();
 
-        private Duration retryInterval = Duration.ofSeconds(1);
+  private SchemaLoadingProperties schema = new SchemaLoadingProperties();
 
-        private int retryCount = 5;
+  private MetadataRefreshJobProperties metadataRefreshJob = new MetadataRefreshJobProperties();
 
-        private int threadPoolSize = 16;
+  public static class MetadataLoadingProperties {
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+    private Duration retryInterval = Duration.ofSeconds(1);
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    private int retryCount = 5;
 
-        public Duration getRetryInterval() {
-            return retryInterval;
-        }
+    private int threadPoolSize = 16;
 
-        public void setRetryInterval(Duration retryInterval) {
-            this.retryInterval = retryInterval;
-        }
-
-        public int getRetryCount() {
-            return retryCount;
-        }
-
-        public void setRetryCount(int retryCount) {
-            this.retryCount = retryCount;
-        }
+    public Duration getRetryInterval() {
+      return retryInterval;
+    }
 
-        public int getThreadPoolSize() {
-            return threadPoolSize;
-        }
+    public void setRetryInterval(Duration retryInterval) {
+      this.retryInterval = retryInterval;
+    }
 
-        public void setThreadPoolSize(int threadPoolSize) {
-            this.threadPoolSize = threadPoolSize;
-        }
+    public int getRetryCount() {
+      return retryCount;
     }
 
-    public static class SchemaLoadingProperties {
+    public void setRetryCount(int retryCount) {
+      this.retryCount = retryCount;
+    }
 
-        private boolean enabled = false;
+    public int getThreadPoolSize() {
+      return threadPoolSize;
+    }
 
-        private int retryCount = 3;
+    public void setThreadPoolSize(int threadPoolSize) {
+      this.threadPoolSize = threadPoolSize;
+    }
+  }
 
-        private int threadPoolSize = 16;
+  public static class SchemaLoadingProperties {
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+    private boolean enabled = false;
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    private int retryCount = 3;
 
-        public int getRetryCount() {
-            return retryCount;
-        }
+    private int threadPoolSize = 16;
 
-        public void setRetryCount(int retryCount) {
-            this.retryCount = retryCount;
-        }
+    public boolean isEnabled() {
+      return enabled;
+    }
 
-        public int getThreadPoolSize() {
-            return threadPoolSize;
-        }
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
 
-        public void setThreadPoolSize(int threadPoolSize) {
-            this.threadPoolSize = threadPoolSize;
-        }
+    public int getRetryCount() {
+      return retryCount;
     }
 
-    public static class MetadataRefreshJobProperties {
+    public void setRetryCount(int retryCount) {
+      this.retryCount = retryCount;
+    }
 
-        private boolean enabled = true;
+    public int getThreadPoolSize() {
+      return threadPoolSize;
+    }
 
-        private Duration interval = Duration.ofSeconds(60);
+    public void setThreadPoolSize(int threadPoolSize) {
+      this.threadPoolSize = threadPoolSize;
+    }
+  }
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+  public static class MetadataRefreshJobProperties {
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    private boolean enabled = true;
 
-        public Duration getInterval() {
-            return interval;
-        }
+    private Duration interval = Duration.ofSeconds(60);
 
-        public void setInterval(Duration interval) {
-            this.interval = interval;
-        }
+    public boolean isEnabled() {
+      return enabled;
     }
 
-    public MetadataLoadingProperties getMetadata() {
-        return metadata;
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
     }
 
-    public void setMetadata(MetadataLoadingProperties metadata) {
-        this.metadata = metadata;
+    public Duration getInterval() {
+      return interval;
     }
 
-    public SchemaLoadingProperties getSchema() {
-        return schema;
+    public void setInterval(Duration interval) {
+      this.interval = interval;
     }
+  }
 
-    public void setSchema(SchemaLoadingProperties schema) {
-        this.schema = schema;
-    }
+  public MetadataLoadingProperties getMetadata() {
+    return metadata;
+  }
 
-    public MetadataRefreshJobProperties getMetadataRefreshJob() {
-        return metadataRefreshJob;
-    }
+  public void setMetadata(MetadataLoadingProperties metadata) {
+    this.metadata = metadata;
+  }
 
-    public void setMetadataRefreshJob(MetadataRefreshJobProperties metadataRefreshJob) {
-        this.metadataRefreshJob = metadataRefreshJob;
-    }
+  public SchemaLoadingProperties getSchema() {
+    return schema;
+  }
+
+  public void setSchema(SchemaLoadingProperties schema) {
+    this.schema = schema;
+  }
+
+  public MetadataRefreshJobProperties getMetadataRefreshJob() {
+    return metadataRefreshJob;
+  }
+
+  public void setMetadataRefreshJob(MetadataRefreshJobProperties metadataRefreshJob) {
+    this.metadataRefreshJob = metadataRefreshJob;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ZookeeperClustersProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ZookeeperClustersProperties.java
index 13b372c240..2469f8a491 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ZookeeperClustersProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ZookeeperClustersProperties.java
@@ -1,30 +1,33 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider;
 
 @ConfigurationProperties(prefix = "frontend.zookeeper")
 public class ZookeeperClustersProperties {
 
-    private List<ZookeeperProperties> clusters = new ArrayList<>();
+  private List<ZookeeperProperties> clusters = new ArrayList<>();
 
-    public List<ZookeeperProperties> getClusters() {
-        return clusters;
-    }
+  public List<ZookeeperProperties> getClusters() {
+    return clusters;
+  }
 
-    public void setClusters(List<ZookeeperProperties> clusters) {
-        this.clusters = clusters;
-    }
+  public void setClusters(List<ZookeeperProperties> clusters) {
+    this.clusters = clusters;
+  }
 
-    public ZookeeperProperties toZookeeperProperties(DatacenterNameProvider datacenterNameProvider) {
-        return this.clusters
-                .stream()
-                .filter(cluster -> cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException(
-                        "No properties for datacenter: " + datacenterNameProvider.getDatacenterName() + " defined."));
-    }
+  public ZookeeperProperties toZookeeperProperties(DatacenterNameProvider datacenterNameProvider) {
+    return this.clusters.stream()
+        .filter(
+            cluster -> cluster.getDatacenter().equals(datacenterNameProvider.getDatacenterName()))
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "No properties for datacenter: "
+                        + datacenterNameProvider.getDatacenterName()
+                        + " defined."));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ZookeeperProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ZookeeperProperties.java
index 0732144ee2..5ea2c5ba40 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ZookeeperProperties.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/ZookeeperProperties.java
@@ -1,180 +1,178 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import pl.allegro.tech.hermes.common.di.factories.ZookeeperParameters;
-
 import java.time.Duration;
+import pl.allegro.tech.hermes.common.di.factories.ZookeeperParameters;
 
 public class ZookeeperProperties implements ZookeeperParameters {
 
-    private String connectionString = "localhost:2181";
+  private String connectionString = "localhost:2181";
 
-    private String datacenter = "dc";
+  private String datacenter = "dc";
 
-    private Duration baseSleepTime = Duration.ofMillis(1000);
+  private Duration baseSleepTime = Duration.ofMillis(1000);
 
-    private Duration maxSleepTime = Duration.ofSeconds(30);
+  private Duration maxSleepTime = Duration.ofSeconds(30);
 
-    private int maxRetries = 29;
+  private int maxRetries = 29;
 
-    private Duration connectionTimeout = Duration.ofSeconds(10);
+  private Duration connectionTimeout = Duration.ofSeconds(10);
 
-    private Duration sessionTimeout = Duration.ofSeconds(10_000);
+  private Duration sessionTimeout = Duration.ofSeconds(10_000);
 
-    private String root = "/hermes";
+  private String root = "/hermes";
 
-    private int processingThreadPoolSize = 5;
+  private int processingThreadPoolSize = 5;
 
-    private ZookeeperAuthorizationProperties authorization = new ZookeeperAuthorizationProperties();
+  private ZookeeperAuthorizationProperties authorization = new ZookeeperAuthorizationProperties();
 
-    @Override
-    public String getConnectionString() {
-        return connectionString;
-    }
+  @Override
+  public String getConnectionString() {
+    return connectionString;
+  }
 
-    public void setConnectionString(String connectionString) {
-        this.connectionString = connectionString;
-    }
+  public void setConnectionString(String connectionString) {
+    this.connectionString = connectionString;
+  }
 
-    public String getDatacenter() {
-        return datacenter;
-    }
+  public String getDatacenter() {
+    return datacenter;
+  }
 
-    public void setDatacenter(String datacenter) {
-        this.datacenter = datacenter;
-    }
+  public void setDatacenter(String datacenter) {
+    this.datacenter = datacenter;
+  }
 
-    @Override
-    public Duration getBaseSleepTime() {
-        return baseSleepTime;
-    }
+  @Override
+  public Duration getBaseSleepTime() {
+    return baseSleepTime;
+  }
 
-    public void setBaseSleepTime(Duration baseSleepTime) {
-        this.baseSleepTime = baseSleepTime;
-    }
+  public void setBaseSleepTime(Duration baseSleepTime) {
+    this.baseSleepTime = baseSleepTime;
+  }
 
-    @Override
-    public Duration getMaxSleepTime() {
-        return maxSleepTime;
-    }
+  @Override
+  public Duration getMaxSleepTime() {
+    return maxSleepTime;
+  }
 
-    public void setMaxSleepTime(Duration maxSleepTime) {
-        this.maxSleepTime = maxSleepTime;
-    }
+  public void setMaxSleepTime(Duration maxSleepTime) {
+    this.maxSleepTime = maxSleepTime;
+  }
 
-    @Override
-    public int getMaxRetries() {
-        return maxRetries;
-    }
+  @Override
+  public int getMaxRetries() {
+    return maxRetries;
+  }
 
-    public void setMaxRetries(int maxRetries) {
-        this.maxRetries = maxRetries;
-    }
+  public void setMaxRetries(int maxRetries) {
+    this.maxRetries = maxRetries;
+  }
 
-    @Override
-    public Duration getConnectionTimeout() {
-        return connectionTimeout;
-    }
+  @Override
+  public Duration getConnectionTimeout() {
+    return connectionTimeout;
+  }
 
-    public void setConnectionTimeout(Duration connectionTimeout) {
-        this.connectionTimeout = connectionTimeout;
-    }
+  public void setConnectionTimeout(Duration connectionTimeout) {
+    this.connectionTimeout = connectionTimeout;
+  }
 
-    @Override
-    public Duration getSessionTimeout() {
-        return sessionTimeout;
-    }
+  @Override
+  public Duration getSessionTimeout() {
+    return sessionTimeout;
+  }
 
-    public void setSessionTimeout(Duration sessionTimeout) {
-        this.sessionTimeout = sessionTimeout;
-    }
+  public void setSessionTimeout(Duration sessionTimeout) {
+    this.sessionTimeout = sessionTimeout;
+  }
 
-    @Override
-    public String getRoot() {
-        return root;
-    }
+  @Override
+  public String getRoot() {
+    return root;
+  }
 
-    public void setRoot(String root) {
-        this.root = root;
-    }
+  public void setRoot(String root) {
+    this.root = root;
+  }
 
-    @Override
-    public int getProcessingThreadPoolSize() {
-        return processingThreadPoolSize;
-    }
+  @Override
+  public int getProcessingThreadPoolSize() {
+    return processingThreadPoolSize;
+  }
 
-    @Override
-    public boolean isAuthorizationEnabled() {
-        return authorization.enabled;
-    }
+  @Override
+  public boolean isAuthorizationEnabled() {
+    return authorization.enabled;
+  }
 
-    @Override
-    public String getScheme() {
-        return authorization.scheme;
-    }
+  @Override
+  public String getScheme() {
+    return authorization.scheme;
+  }
 
-    @Override
-    public String getUser() {
-        return authorization.user;
-    }
+  @Override
+  public String getUser() {
+    return authorization.user;
+  }
 
-    @Override
-    public String getPassword() {
-        return authorization.password;
-    }
+  @Override
+  public String getPassword() {
+    return authorization.password;
+  }
 
-    public void setProcessingThreadPoolSize(int processingThreadPoolSize) {
-        this.processingThreadPoolSize = processingThreadPoolSize;
-    }
+  public void setProcessingThreadPoolSize(int processingThreadPoolSize) {
+    this.processingThreadPoolSize = processingThreadPoolSize;
+  }
 
-    public ZookeeperAuthorizationProperties getAuthorization() {
-        return authorization;
-    }
+  public ZookeeperAuthorizationProperties getAuthorization() {
+    return authorization;
+  }
 
-    public void setAuthorization(ZookeeperAuthorizationProperties authorization) {
-        this.authorization = authorization;
-    }
+  public void setAuthorization(ZookeeperAuthorizationProperties authorization) {
+    this.authorization = authorization;
+  }
 
-    public static class ZookeeperAuthorizationProperties {
+  public static class ZookeeperAuthorizationProperties {
 
-        private boolean enabled = false;
+    private boolean enabled = false;
 
-        private String scheme = "digest";
+    private String scheme = "digest";
 
-        private String user = "user";
+    private String user = "user";
 
-        private String password = "password";
+    private String password = "password";
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+    public boolean isEnabled() {
+      return enabled;
+    }
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
 
-        public String getScheme() {
-            return scheme;
-        }
+    public String getScheme() {
+      return scheme;
+    }
 
-        public void setScheme(String scheme) {
-            this.scheme = scheme;
-        }
+    public void setScheme(String scheme) {
+      this.scheme = scheme;
+    }
 
-        public String getUser() {
-            return user;
-        }
+    public String getUser() {
+      return user;
+    }
 
-        public void setUser(String user) {
-            this.user = user;
-        }
+    public void setUser(String user) {
+      this.user = user;
+    }
 
-        public String getPassword() {
-            return password;
-        }
+    public String getPassword() {
+      return password;
+    }
 
-        public void setPassword(String password) {
-            this.password = password;
-        }
+    public void setPassword(String password) {
+      this.password = password;
     }
+  }
 }
-
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerAcknowledgeListener.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerAcknowledgeListener.java
index 50da07f33a..fbb09bf479 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerAcknowledgeListener.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerAcknowledgeListener.java
@@ -1,10 +1,9 @@
 package pl.allegro.tech.hermes.frontend.listeners;
 
-
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 
 public interface BrokerAcknowledgeListener {
 
-    void onAcknowledge(Message message, Topic topic);
+  void onAcknowledge(Message message, Topic topic);
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerErrorListener.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerErrorListener.java
index 0760682323..f52b60992f 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerErrorListener.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerErrorListener.java
@@ -5,5 +5,5 @@
 
 public interface BrokerErrorListener {
 
-    void onError(Message message, Topic topic, Exception ex);
+  void onError(Message message, Topic topic, Exception ex);
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerListeners.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerListeners.java
index efe2be5aff..76b3ba1191 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerListeners.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerListeners.java
@@ -1,38 +1,37 @@
 package pl.allegro.tech.hermes.frontend.listeners;
 
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.frontend.publishing.message.Message;
-
 import java.util.ArrayList;
 import java.util.List;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 
 public class BrokerListeners {
 
-    private final List<BrokerTimeoutListener> timeoutListeners = new ArrayList<>();
-    private final List<BrokerAcknowledgeListener> acknowledgeListeners = new ArrayList<>();
-    private final List<BrokerErrorListener> errorListeners = new ArrayList<>();
+  private final List<BrokerTimeoutListener> timeoutListeners = new ArrayList<>();
+  private final List<BrokerAcknowledgeListener> acknowledgeListeners = new ArrayList<>();
+  private final List<BrokerErrorListener> errorListeners = new ArrayList<>();
 
-    public void addTimeoutListener(BrokerTimeoutListener brokerTimeoutListener) {
-        timeoutListeners.add(brokerTimeoutListener);
-    }
+  public void addTimeoutListener(BrokerTimeoutListener brokerTimeoutListener) {
+    timeoutListeners.add(brokerTimeoutListener);
+  }
 
-    public void addAcknowledgeListener(BrokerAcknowledgeListener brokerAcknowledgeListener) {
-        acknowledgeListeners.add(brokerAcknowledgeListener);
-    }
+  public void addAcknowledgeListener(BrokerAcknowledgeListener brokerAcknowledgeListener) {
+    acknowledgeListeners.add(brokerAcknowledgeListener);
+  }
 
-    public void addErrorListener(BrokerErrorListener brokerErrorListener) {
-        errorListeners.add(brokerErrorListener);
-    }
+  public void addErrorListener(BrokerErrorListener brokerErrorListener) {
+    errorListeners.add(brokerErrorListener);
+  }
 
-    public void onAcknowledge(Message message, Topic topic) {
-        acknowledgeListeners.forEach(l -> l.onAcknowledge(message, topic));
-    }
+  public void onAcknowledge(Message message, Topic topic) {
+    acknowledgeListeners.forEach(l -> l.onAcknowledge(message, topic));
+  }
 
-    public void onTimeout(Message message, Topic topic) {
-        timeoutListeners.forEach(l -> l.onTimeout(message, topic));
-    }
+  public void onTimeout(Message message, Topic topic) {
+    timeoutListeners.forEach(l -> l.onTimeout(message, topic));
+  }
 
-    public void onError(Message message, Topic topic, Exception ex) {
-        errorListeners.forEach(l -> l.onError(message, topic, ex));
-    }
+  public void onError(Message message, Topic topic, Exception ex) {
+    errorListeners.forEach(l -> l.onError(message, topic, ex));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerTimeoutListener.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerTimeoutListener.java
index ffea94c748..d628db0c10 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerTimeoutListener.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/listeners/BrokerTimeoutListener.java
@@ -5,5 +5,5 @@
 
 public interface BrokerTimeoutListener {
 
-    void onTimeout(Message message, Topic topic);
+  void onTimeout(Message message, Topic topic);
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/CachedTopic.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/CachedTopic.java
index cb2a96f6ec..854832f89f 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/CachedTopic.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/CachedTopic.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.frontend.metric;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopics;
@@ -10,135 +12,150 @@
 import pl.allegro.tech.hermes.metrics.HermesRateMeter;
 import pl.allegro.tech.hermes.metrics.HermesTimer;
 import pl.allegro.tech.hermes.metrics.HermesTimerContext;
-import pl.allegro.tech.hermes.metrics.counters.MeterBackedHermesCounter;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class CachedTopic {
 
-    private final Topic topic;
-    private final KafkaTopics kafkaTopics;
-    private final MetricsFacade metricsFacade;
-    private final boolean blacklisted;
-
-    private final HermesTimer topicProducerLatencyTimer;
-    private final HermesTimer globalProducerLatencyTimer;
-
-    private final HermesTimer topicBrokerLatencyTimer;
-
-    private final HermesCounter globalRequestMeter;
-    private final HermesCounter topicRequestMeter;
+  private final Topic topic;
+  private final KafkaTopics kafkaTopics;
+  private final MetricsFacade metricsFacade;
+  private final boolean blacklisted;
 
-    private final HermesCounter globalDelayedProcessingMeter;
-    private final HermesCounter topicDelayedProcessingMeter;
+  private final HermesTimer topicProducerLatencyTimer;
+  private final HermesTimer globalProducerLatencyTimer;
 
-    private final HermesHistogram topicMessageContentSize;
-    private final HermesHistogram globalMessageContentSize;
+  private final HermesTimer topicBrokerLatencyTimer;
 
-    private final MeterBackedHermesCounter topicThroughputMeter;
-    private final MeterBackedHermesCounter globalThroughputMeter;
+  private final HermesCounter globalRequestMeter;
+  private final HermesCounter topicRequestMeter;
 
-    private final HermesCounter published;
+  private final HermesCounter globalDelayedProcessingMeter;
+  private final HermesCounter topicDelayedProcessingMeter;
 
-    private final Map<Integer, MetersPair> httpStatusCodesMeters = new ConcurrentHashMap<>();
+  private final HermesHistogram topicMessageContentSize;
+  private final HermesHistogram globalMessageContentSize;
 
-    public CachedTopic(Topic topic, MetricsFacade metricsFacade,
-                       KafkaTopics kafkaTopics) {
-        this(topic, metricsFacade, kafkaTopics, false);
-    }
-
-    public CachedTopic(Topic topic, MetricsFacade metricsFacade,
-                       KafkaTopics kafkaTopics, boolean blacklisted) {
-        this.topic = topic;
-        this.kafkaTopics = kafkaTopics;
-        this.metricsFacade = metricsFacade;
-        this.blacklisted = blacklisted;
+  private final ThroughputMeter throughputMeter;
 
-        globalRequestMeter = metricsFacade.topics().topicGlobalRequestCounter();
-        topicRequestMeter = metricsFacade.topics().topicRequestCounter(topic.getName());
+  private final HermesCounter topicDuplicatedMessageCounter;
 
-        globalDelayedProcessingMeter = metricsFacade.topics().topicGlobalDelayedProcessingCounter();
-        topicDelayedProcessingMeter = metricsFacade.topics().topicDelayedProcessingCounter(topic.getName());
+  private final Map<String, HermesCounter> published = new ConcurrentHashMap<>();
 
-        globalMessageContentSize = metricsFacade.topics().topicGlobalMessageContentSizeHistogram();
-        topicMessageContentSize = metricsFacade.topics().topicMessageContentSizeHistogram(topic.getName());
+  private final Map<Integer, MetersPair> httpStatusCodesMeters = new ConcurrentHashMap<>();
 
-        published = metricsFacade.topics().topicPublished(topic.getName());
+  public CachedTopic(
+      Topic topic,
+      MetricsFacade metricsFacade,
+      ThroughputRegistry throughputRegistry,
+      KafkaTopics kafkaTopics) {
+    this(topic, metricsFacade, throughputRegistry, kafkaTopics, false);
+  }
 
-        globalThroughputMeter = metricsFacade.topics().topicGlobalThroughputBytes();
-        topicThroughputMeter = metricsFacade.topics().topicThroughputBytes(topic.getName());
-
-        if (Topic.Ack.ALL.equals(topic.getAck())) {
-            globalProducerLatencyTimer = metricsFacade.topics().ackAllGlobalLatency();
-            topicProducerLatencyTimer = metricsFacade.topics().ackAllTopicLatency(topic.getName());
-            topicBrokerLatencyTimer = metricsFacade.topics().ackAllBrokerLatency();
-        } else {
-            globalProducerLatencyTimer = metricsFacade.topics().ackLeaderGlobalLatency();
-            topicProducerLatencyTimer = metricsFacade.topics().ackLeaderTopicLatency(topic.getName());
-            topicBrokerLatencyTimer = metricsFacade.topics().ackLeaderBrokerLatency();
-        }
-    }
+  public CachedTopic(
+      Topic topic,
+      MetricsFacade metricsFacade,
+      ThroughputRegistry throughputRegistry,
+      KafkaTopics kafkaTopics,
+      boolean blacklisted) {
+    this.topic = topic;
+    this.kafkaTopics = kafkaTopics;
+    this.metricsFacade = metricsFacade;
+    this.blacklisted = blacklisted;
 
-    public Topic getTopic() {
-        return topic;
-    }
+    globalRequestMeter = metricsFacade.topics().topicGlobalRequestCounter();
+    topicRequestMeter = metricsFacade.topics().topicRequestCounter(topic.getName());
 
-    public TopicName getTopicName() {
-        return topic.getName();
-    }
+    globalDelayedProcessingMeter = metricsFacade.topics().topicGlobalDelayedProcessingCounter();
+    topicDelayedProcessingMeter =
+        metricsFacade.topics().topicDelayedProcessingCounter(topic.getName());
 
-    public String getQualifiedName() {
-        return topic.getName().qualifiedName();
-    }
+    globalMessageContentSize = metricsFacade.topics().topicGlobalMessageContentSizeHistogram();
+    topicMessageContentSize =
+        metricsFacade.topics().topicMessageContentSizeHistogram(topic.getName());
 
-    public KafkaTopics getKafkaTopics() {
-        return kafkaTopics;
-    }
+    throughputMeter = throughputRegistry.forTopic(topic.getName());
 
-    public boolean isBlacklisted() {
-        return blacklisted;
+    if (Topic.Ack.ALL.equals(topic.getAck())) {
+      globalProducerLatencyTimer = metricsFacade.topics().ackAllGlobalLatency();
+      topicProducerLatencyTimer = metricsFacade.topics().ackAllTopicLatency(topic.getName());
+      topicBrokerLatencyTimer = metricsFacade.topics().ackAllBrokerLatency();
+    } else {
+      globalProducerLatencyTimer = metricsFacade.topics().ackLeaderGlobalLatency();
+      topicProducerLatencyTimer = metricsFacade.topics().ackLeaderTopicLatency(topic.getName());
+      topicBrokerLatencyTimer = metricsFacade.topics().ackLeaderBrokerLatency();
     }
 
-    public StartedTimersPair startProducerLatencyTimers() {
-        return new StartedTimersPair(topicProducerLatencyTimer.time(), globalProducerLatencyTimer.time());
-    }
-
-    public void markStatusCodeMeter(int status) {
-        httpStatusCodesMeters.computeIfAbsent(
-                status,
-                code -> new MetersPair(
+    topicDuplicatedMessageCounter =
+        metricsFacade.topics().topicDuplicatedMessageCounter(topic.getName());
+  }
+
+  public Topic getTopic() {
+    return topic;
+  }
+
+  public TopicName getTopicName() {
+    return topic.getName();
+  }
+
+  public String getQualifiedName() {
+    return topic.getName().qualifiedName();
+  }
+
+  public KafkaTopics getKafkaTopics() {
+    return kafkaTopics;
+  }
+
+  public boolean isBlacklisted() {
+    return blacklisted;
+  }
+
+  public StartedTimersPair startProducerLatencyTimers() {
+    return new StartedTimersPair(
+        topicProducerLatencyTimer.time(), globalProducerLatencyTimer.time());
+  }
+
+  public void markStatusCodeMeter(int status) {
+    httpStatusCodesMeters
+        .computeIfAbsent(
+            status,
+            code ->
+                new MetersPair(
                     metricsFacade.topics().topicGlobalHttpStatusCodeCounter(status),
-                    metricsFacade.topics().topicHttpStatusCodeCounter(topic.getName(), status))
-        ).mark();
-    }
-
-    public void markRequestMeter() {
-        globalRequestMeter.increment(1L);
-        topicRequestMeter.increment(1L);
-    }
-
-    public HermesTimerContext startBrokerLatencyTimer() {
-        return topicBrokerLatencyTimer.time();
-    }
-
-    public void incrementPublished() {
-        published.increment(1L);
-    }
-
-    public void reportMessageContentSize(int size) {
-        topicMessageContentSize.record(size);
-        globalMessageContentSize.record(size);
-        topicThroughputMeter.increment(size);
-        globalThroughputMeter.increment(size);
-    }
-
-    public void markDelayedProcessing() {
-        topicDelayedProcessingMeter.increment(1L);
-        globalDelayedProcessingMeter.increment(1L);
-    }
-
-    public HermesRateMeter getThroughput() {
-        return topicThroughputMeter;
-    }
+                    metricsFacade.topics().topicHttpStatusCodeCounter(topic.getName(), status)))
+        .mark();
+  }
+
+  public void markRequestMeter() {
+    globalRequestMeter.increment(1L);
+    topicRequestMeter.increment(1L);
+  }
+
+  public HermesTimerContext startBrokerLatencyTimer() {
+    return topicBrokerLatencyTimer.time();
+  }
+
+  public void incrementPublished(String datacenter) {
+    published
+        .computeIfAbsent(
+            datacenter, dc -> metricsFacade.topics().topicPublished(topic.getName(), datacenter))
+        .increment();
+  }
+
+  public void reportMessageContentSize(int size) {
+    topicMessageContentSize.record(size);
+    globalMessageContentSize.record(size);
+    throughputMeter.increment(size);
+  }
+
+  public void markDelayedProcessing() {
+    topicDelayedProcessingMeter.increment(1L);
+    globalDelayedProcessingMeter.increment(1L);
+  }
+
+  public HermesRateMeter getThroughput() {
+    return throughputMeter;
+  }
+
+  public void markMessageDuplicated() {
+    topicDuplicatedMessageCounter.increment();
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/MetersPair.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/MetersPair.java
index 324cbe47e5..fa1c776149 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/MetersPair.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/MetersPair.java
@@ -3,16 +3,16 @@
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 
 public class MetersPair {
-    private final HermesCounter meter1;
-    private final HermesCounter meter2;
+  private final HermesCounter meter1;
+  private final HermesCounter meter2;
 
-    public MetersPair(HermesCounter meter1, HermesCounter meter2) {
-        this.meter1 = meter1;
-        this.meter2 = meter2;
-    }
+  public MetersPair(HermesCounter meter1, HermesCounter meter2) {
+    this.meter1 = meter1;
+    this.meter2 = meter2;
+  }
 
-    void mark() {
-        meter1.increment(1L);
-        meter2.increment(1L);
-    }
-}
\ No newline at end of file
+  void mark() {
+    meter1.increment(1L);
+    meter2.increment(1L);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/ThroughputMeter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/ThroughputMeter.java
new file mode 100644
index 0000000000..31c1d985d5
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/ThroughputMeter.java
@@ -0,0 +1,36 @@
+package pl.allegro.tech.hermes.frontend.metric;
+
+import com.codahale.metrics.Meter;
+import pl.allegro.tech.hermes.metrics.HermesCounter;
+import pl.allegro.tech.hermes.metrics.HermesRateMeter;
+
+public class ThroughputMeter implements HermesRateMeter {
+
+  private final HermesCounter topicThroughputMetric;
+  private final HermesCounter globalThroughputMetric;
+  private final Meter topicMeter;
+  private final Meter globalMeter;
+
+  public ThroughputMeter(
+      HermesCounter topicThroughputMetric,
+      HermesCounter globalThroughputMetric,
+      Meter topicMeter,
+      Meter globalMeter) {
+    this.topicThroughputMetric = topicThroughputMetric;
+    this.globalThroughputMetric = globalThroughputMetric;
+    this.topicMeter = topicMeter;
+    this.globalMeter = globalMeter;
+  }
+
+  @Override
+  public double getOneMinuteRate() {
+    return topicMeter.getOneMinuteRate();
+  }
+
+  public void increment(long size) {
+    this.topicMeter.mark(size);
+    this.globalMeter.mark(size);
+    this.topicThroughputMetric.increment(size);
+    this.globalThroughputMetric.increment(size);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/ThroughputRegistry.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/ThroughputRegistry.java
new file mode 100644
index 0000000000..01db082470
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/metric/ThroughputRegistry.java
@@ -0,0 +1,31 @@
+package pl.allegro.tech.hermes.frontend.metric;
+
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+
+public class ThroughputRegistry {
+
+  private final MetricsFacade metricsFacade;
+  private final MetricRegistry metricRegistry;
+  private final Meter globalThroughputMeter;
+
+  public ThroughputRegistry(MetricsFacade metricsFacade, MetricRegistry metricRegistry) {
+    this.metricsFacade = metricsFacade;
+    this.metricRegistry = metricRegistry;
+    this.globalThroughputMeter = metricRegistry.meter("globalThroughputMeter");
+  }
+
+  public double getGlobalThroughputOneMinuteRate() {
+    return globalThroughputMeter.getOneMinuteRate();
+  }
+
+  public ThroughputMeter forTopic(TopicName topic) {
+    return new ThroughputMeter(
+        metricsFacade.topics().topicThroughputBytes(topic),
+        metricsFacade.topics().topicGlobalThroughputBytes(),
+        metricRegistry.meter(topic.qualifiedName() + "Throughput"),
+        globalThroughputMeter);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerLatencyReporter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerLatencyReporter.java
new file mode 100644
index 0000000000..a0ce01aa1c
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerLatencyReporter.java
@@ -0,0 +1,71 @@
+package pl.allegro.tech.hermes.frontend.producer;
+
+import java.time.Duration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.frontend.publishing.message.Message;
+import pl.allegro.tech.hermes.frontend.publishing.metadata.ProduceMetadata;
+import pl.allegro.tech.hermes.metrics.HermesTimerContext;
+
+public class BrokerLatencyReporter {
+
+  private static final Logger logger = LoggerFactory.getLogger(BrokerLatencyReporter.class);
+
+  private final boolean perBrokerLatencyEnabled;
+  private final MetricsFacade metricsFacade;
+  private final Duration slowResponseThreshold;
+  private final ExecutorService reporterExecutorService;
+
+  public BrokerLatencyReporter(
+      boolean perBrokerLatencyEnabled,
+      MetricsFacade metricsFacade,
+      Duration slowResponseThreshold,
+      ExecutorService reporterExecutorService) {
+    this.perBrokerLatencyEnabled = perBrokerLatencyEnabled;
+    this.metricsFacade = metricsFacade;
+    this.slowResponseThreshold = slowResponseThreshold;
+    this.reporterExecutorService = reporterExecutorService;
+  }
+
+  public void report(
+      HermesTimerContext timerContext,
+      Message message,
+      Topic.Ack ack,
+      Supplier<ProduceMetadata> produceMetadata) {
+    Duration duration = timerContext.closeAndGet();
+    if (perBrokerLatencyEnabled) {
+      try {
+        reporterExecutorService.submit(
+            () -> doReport(duration, message.getId(), ack, produceMetadata));
+      } catch (RejectedExecutionException ignored) {
+        // don't propagate the exception - allow metrics to be dropped if executor is overloaded
+        // executor service should already be instrumented to meter rejected executions so no action
+        // is needed
+      }
+    }
+  }
+
+  private void doReport(
+      Duration duration,
+      String messageId,
+      Topic.Ack ack,
+      Supplier<ProduceMetadata> produceMetadata) {
+    String broker = produceMetadata.get().getBroker().orElse("unknown");
+
+    if (duration.compareTo(slowResponseThreshold) > 0) {
+      logger.debug(
+          "Slow produce request, broker response time: {} ms, ackLevel: {}, messageId: {}, broker: {}",
+          duration.toMillis(),
+          ack,
+          messageId,
+          broker);
+    }
+
+    metricsFacade.broker().recordBrokerLatency(broker, ack, duration);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerMessageProducer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerMessageProducer.java
index 6ca0c78103..1e9afdaf76 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerMessageProducer.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerMessageProducer.java
@@ -4,9 +4,7 @@
 import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 
-public interface BrokerMessageProducer {
+public interface BrokerMessageProducer extends BrokerTopicAvailabilityChecker {
 
-    void send(Message message, CachedTopic topic, PublishingCallback callback);
-
-    boolean isTopicAvailable(CachedTopic topic);
+  void send(Message message, CachedTopic topic, PublishingCallback callback);
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerTopicAvailabilityChecker.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerTopicAvailabilityChecker.java
new file mode 100644
index 0000000000..635070bf84
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/BrokerTopicAvailabilityChecker.java
@@ -0,0 +1,10 @@
+package pl.allegro.tech.hermes.frontend.producer;
+
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+
+public interface BrokerTopicAvailabilityChecker {
+
+  boolean areAllTopicsAvailable();
+
+  boolean isTopicAvailable(CachedTopic cachedTopic);
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ChaosException.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ChaosException.java
new file mode 100644
index 0000000000..6d0ba17f40
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ChaosException.java
@@ -0,0 +1,15 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+public class ChaosException extends RuntimeException {
+
+  public ChaosException(String datacenter, long delayMs, String messageId) {
+    super(
+        "Scheduled failure occurred for datacenter: "
+            + datacenter
+            + ", messageId: "
+            + messageId
+            + " after "
+            + delayMs
+            + "ms");
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/FallbackToRemoteDatacenterAwareMessageProducer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/FallbackToRemoteDatacenterAwareMessageProducer.java
new file mode 100644
index 0000000000..af61cf4ee5
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/FallbackToRemoteDatacenterAwareMessageProducer.java
@@ -0,0 +1,38 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
+import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
+import pl.allegro.tech.hermes.frontend.publishing.message.Message;
+
+public class FallbackToRemoteDatacenterAwareMessageProducer implements BrokerMessageProducer {
+
+  private final BrokerMessageProducer localDatacenterMessageProducer;
+  private final BrokerMessageProducer multiDatacenterMessageProducer;
+
+  public FallbackToRemoteDatacenterAwareMessageProducer(
+      BrokerMessageProducer localDatacenterMessageProducer,
+      BrokerMessageProducer multiDatacenterMessageProducer) {
+    this.localDatacenterMessageProducer = localDatacenterMessageProducer;
+    this.multiDatacenterMessageProducer = multiDatacenterMessageProducer;
+  }
+
+  @Override
+  public void send(Message message, CachedTopic topic, PublishingCallback callback) {
+    if (topic.getTopic().isFallbackToRemoteDatacenterEnabled()) {
+      this.multiDatacenterMessageProducer.send(message, topic, callback);
+    } else {
+      this.localDatacenterMessageProducer.send(message, topic, callback);
+    }
+  }
+
+  @Override
+  public boolean areAllTopicsAvailable() {
+    return localDatacenterMessageProducer.areAllTopicsAvailable();
+  }
+
+  @Override
+  public boolean isTopicAvailable(CachedTopic topic) {
+    return localDatacenterMessageProducer.isTopicAvailable(topic);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducer.java
deleted file mode 100644
index e400101425..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducer.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package pl.allegro.tech.hermes.frontend.producer.kafka;
-
-import jakarta.inject.Singleton;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.clients.producer.RecordMetadata;
-import org.apache.kafka.common.PartitionInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
-import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
-import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
-import pl.allegro.tech.hermes.frontend.publishing.message.Message;
-
-import java.util.List;
-
-@Singleton
-public class KafkaBrokerMessageProducer implements BrokerMessageProducer {
-
-    private static final Logger logger = LoggerFactory.getLogger(KafkaBrokerMessageProducer.class);
-    private final Producers producers;
-    private final KafkaTopicMetadataFetcher kafkaTopicMetadataFetcher;
-    private final MetricsFacade metricsFacade;
-    private final MessageToKafkaProducerRecordConverter messageConverter;
-
-    public KafkaBrokerMessageProducer(Producers producers,
-                                      KafkaTopicMetadataFetcher kafkaTopicMetadataFetcher,
-                                      MetricsFacade metricsFacade,
-                                      MessageToKafkaProducerRecordConverter messageConverter) {
-        this.producers = producers;
-        this.kafkaTopicMetadataFetcher = kafkaTopicMetadataFetcher;
-        this.metricsFacade = metricsFacade;
-        this.messageConverter = messageConverter;
-        producers.registerGauges(metricsFacade);
-    }
-
-    @Override
-    public void send(Message message, CachedTopic cachedTopic, final PublishingCallback callback) {
-        ProducerRecord<byte[], byte[]> producerRecord =
-                messageConverter.convertToProducerRecord(message, cachedTopic.getKafkaTopics().getPrimary().name());
-
-        try {
-            producers.get(cachedTopic.getTopic()).send(producerRecord, new SendCallback(message, cachedTopic.getTopic(), callback));
-        } catch (Exception e) {
-            // message didn't get to internal producer buffer and it will not be send to a broker
-            callback.onUnpublished(message, cachedTopic.getTopic(), e);
-        }
-    }
-
-    @Override
-    public boolean isTopicAvailable(CachedTopic cachedTopic) {
-        String kafkaTopicName = cachedTopic.getKafkaTopics().getPrimary().name().asString();
-
-        try {
-            List<PartitionInfo> partitionInfos = producers.get(cachedTopic.getTopic()).partitionsFor(kafkaTopicName);
-            if (anyPartitionWithoutLeader(partitionInfos)) {
-                logger.warn("Topic {} has partitions without a leader.", kafkaTopicName);
-                return false;
-            }
-            if (anyUnderReplicatedPartition(partitionInfos, kafkaTopicName)) {
-                logger.warn("Topic {} has under replicated partitions.", kafkaTopicName);
-                return false;
-            }
-            if (partitionInfos.size() > 0) {
-                return true;
-            }
-        } catch (Exception e) {
-            logger.warn("Could not read information about partitions for topic {}. {}", kafkaTopicName, e.getMessage());
-            return false;
-        }
-
-        logger.warn("No information about partitions for topic {}", kafkaTopicName);
-        return false;
-    }
-
-    private boolean anyPartitionWithoutLeader(List<PartitionInfo> partitionInfos) {
-        return partitionInfos.stream().anyMatch(p -> p.leader() == null);
-    }
-
-    private boolean anyUnderReplicatedPartition(List<PartitionInfo> partitionInfos, String kafkaTopicName) throws Exception {
-        int minInSyncReplicas = kafkaTopicMetadataFetcher.fetchMinInSyncReplicas(kafkaTopicName);
-        return partitionInfos.stream().anyMatch(p -> p.inSyncReplicas().length < minInSyncReplicas);
-    }
-
-    private class SendCallback implements org.apache.kafka.clients.producer.Callback {
-
-        private final Message message;
-        private final Topic topic;
-        private final PublishingCallback callback;
-
-        public SendCallback(Message message, Topic topic, PublishingCallback callback) {
-            this.message = message;
-            this.topic = topic;
-            this.callback = callback;
-        }
-
-        @Override
-        public void onCompletion(RecordMetadata recordMetadata, Exception e) {
-            if (e == null) {
-                callback.onPublished(message, topic);
-                producers.maybeRegisterNodeMetricsGauges(metricsFacade);
-            } else {
-                callback.onUnpublished(message, topic, e);
-            }
-        }
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaChaosProperties.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaChaosProperties.java
new file mode 100644
index 0000000000..f578072e98
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaChaosProperties.java
@@ -0,0 +1,39 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "frontend.kafka.chaos")
+public class KafkaChaosProperties {
+  private ChaosSchedulerProperties chaosScheduler = new ChaosSchedulerProperties();
+
+  public ChaosSchedulerProperties getChaosScheduler() {
+    return chaosScheduler;
+  }
+
+  public void setChaosScheduler(ChaosSchedulerProperties chaosScheduler) {
+    this.chaosScheduler = chaosScheduler;
+  }
+
+  public static class ChaosSchedulerProperties {
+
+    private int threadPoolSize = 16;
+
+    private boolean threadPoolMonitoringEnabled = false;
+
+    public int getThreadPoolSize() {
+      return threadPoolSize;
+    }
+
+    public void setThreadPoolSize(int threadPoolSize) {
+      this.threadPoolSize = threadPoolSize;
+    }
+
+    public boolean isThreadPoolMonitoringEnabled() {
+      return threadPoolMonitoringEnabled;
+    }
+
+    public void setThreadPoolMonitoringEnabled(boolean threadPoolMonitoringEnabled) {
+      this.threadPoolMonitoringEnabled = threadPoolMonitoringEnabled;
+    }
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaHeaderFactory.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaHeaderFactory.java
index 8e0f67e44f..2f5396f141 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaHeaderFactory.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaHeaderFactory.java
@@ -1,32 +1,50 @@
 package pl.allegro.tech.hermes.frontend.producer.kafka;
 
 import com.google.common.primitives.Ints;
-import com.google.common.primitives.Longs;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
 import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.internals.RecordHeader;
+import pl.allegro.tech.hermes.common.kafka.HTTPHeadersPropagationAsKafkaHeadersProperties;
 import pl.allegro.tech.hermes.common.kafka.KafkaHeaderNameParameters;
 
 public class KafkaHeaderFactory {
 
-    private final KafkaHeaderNameParameters kafkaHeaderNameParameters;
-
-    public KafkaHeaderFactory(KafkaHeaderNameParameters kafkaHeaderNameParameters) {
-        this.kafkaHeaderNameParameters = kafkaHeaderNameParameters;
-    }
-
-    Header messageId(String messageId) {
-        return new RecordHeader(kafkaHeaderNameParameters.getMessageId(), messageId.getBytes());
-    }
-
-    Header timestamp(long timestamp) {
-        return new RecordHeader(kafkaHeaderNameParameters.getTimestamp(), Longs.toByteArray(timestamp));
-    }
-
-    Header schemaVersion(int schemaVersion) {
-        return new RecordHeader(kafkaHeaderNameParameters.getSchemaVersion(), Ints.toByteArray(schemaVersion));
+  private final KafkaHeaderNameParameters kafkaHeaderNameParameters;
+  private final boolean isHTTPHeadersPropagationAsKafkaHeadersEnabled;
+  private final String httpHeaderPrefix;
+
+  public KafkaHeaderFactory(
+      KafkaHeaderNameParameters kafkaHeaderNameParameters,
+      HTTPHeadersPropagationAsKafkaHeadersProperties
+          httpHeadersPropagationAsKafkaHeadersProperties) {
+    this.kafkaHeaderNameParameters = kafkaHeaderNameParameters;
+    this.isHTTPHeadersPropagationAsKafkaHeadersEnabled =
+        httpHeadersPropagationAsKafkaHeadersProperties.isEnabled();
+    this.httpHeaderPrefix = httpHeadersPropagationAsKafkaHeadersProperties.getPrefix();
+  }
+
+  Header messageId(String messageId) {
+    return new RecordHeader(kafkaHeaderNameParameters.getMessageId(), messageId.getBytes());
+  }
+
+  Header schemaVersion(int schemaVersion) {
+    return new RecordHeader(
+        kafkaHeaderNameParameters.getSchemaVersion(), Ints.toByteArray(schemaVersion));
+  }
+
+  Header schemaId(int schemaId) {
+    return new RecordHeader(kafkaHeaderNameParameters.getSchemaId(), Ints.toByteArray(schemaId));
+  }
+
+  void setHTTPHeadersIfEnabled(List<Header> headers, Map<String, String> httpHeaders) {
+    if (isHTTPHeadersPropagationAsKafkaHeadersEnabled) {
+      httpHeaders.forEach((name, value) -> headers.add(createHttpHeader(name, value)));
     }
+  }
 
-    Header schemaId(int schemaId) {
-        return new RecordHeader(kafkaHeaderNameParameters.getSchemaId(), Ints.toByteArray(schemaId));
-    }
+  private Header createHttpHeader(String name, String value) {
+    return new RecordHeader(httpHeaderPrefix + name, value.getBytes(StandardCharsets.UTF_8));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageProducerFactory.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageProducerFactory.java
deleted file mode 100644
index f8c2d94db4..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageProducerFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package pl.allegro.tech.hermes.frontend.producer.kafka;
-
-import com.google.common.collect.ImmutableMap;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.Producer;
-import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.ACKS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.BATCH_SIZE_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.BOOTSTRAP_SERVERS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.BUFFER_MEMORY_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.COMPRESSION_TYPE_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.LINGER_MS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.MAX_BLOCK_MS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.MAX_IN_FLIGHT_REQUESTS_PER_CONNECTION;
-import static org.apache.kafka.clients.producer.ProducerConfig.MAX_REQUEST_SIZE_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.METADATA_MAX_AGE_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.METRICS_SAMPLE_WINDOW_MS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.REQUEST_TIMEOUT_MS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.RETRIES_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.RETRY_BACKOFF_MS_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.SEND_BUFFER_CONFIG;
-import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
-import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
-import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
-
-public class KafkaMessageProducerFactory {
-
-    private static final String ACK_ALL = "-1";
-    private static final String ACK_LEADER = "1";
-
-    private final KafkaParameters kafkaParameters;
-    private final KafkaProducerParameters kafkaProducerParameters;
-    private final long bufferedSizeBytes;
-
-    public KafkaMessageProducerFactory(KafkaParameters kafkaParameters,
-                                       KafkaProducerParameters kafkaProducerParameters,
-                                       long bufferedSizeBytes) {
-        this.kafkaProducerParameters = kafkaProducerParameters;
-        this.bufferedSizeBytes = bufferedSizeBytes;
-        this.kafkaParameters = kafkaParameters;
-    }
-
-    public Producers provide() {
-        Map<String, Object> props = new HashMap<>();
-        props.put(BOOTSTRAP_SERVERS_CONFIG, kafkaParameters.getBrokerList());
-        props.put(MAX_BLOCK_MS_CONFIG, (int) kafkaProducerParameters.getMaxBlock().toMillis());
-        props.put(COMPRESSION_TYPE_CONFIG, kafkaProducerParameters.getCompressionCodec());
-        props.put(BUFFER_MEMORY_CONFIG, bufferedSizeBytes);
-        props.put(REQUEST_TIMEOUT_MS_CONFIG, (int) kafkaProducerParameters.getRequestTimeout().toMillis());
-        props.put(BATCH_SIZE_CONFIG, kafkaProducerParameters.getBatchSize());
-        props.put(SEND_BUFFER_CONFIG, kafkaProducerParameters.getTcpSendBuffer());
-        props.put(RETRIES_CONFIG, kafkaProducerParameters.getRetries());
-        props.put(RETRY_BACKOFF_MS_CONFIG, (int) kafkaProducerParameters.getRetryBackoff().toMillis());
-        props.put(METADATA_MAX_AGE_CONFIG, (int) kafkaProducerParameters.getMetadataMaxAge().toMillis());
-        props.put(KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArraySerializer");
-        props.put(VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArraySerializer");
-        props.put(MAX_REQUEST_SIZE_CONFIG, kafkaProducerParameters.getMaxRequestSize());
-        props.put(LINGER_MS_CONFIG, (int) kafkaProducerParameters.getLinger().toMillis());
-        props.put(METRICS_SAMPLE_WINDOW_MS_CONFIG, (int) kafkaProducerParameters.getMetricsSampleWindow().toMillis());
-        props.put(MAX_IN_FLIGHT_REQUESTS_PER_CONNECTION, kafkaProducerParameters.getMaxInflightRequestsPerConnection());
-
-        if (kafkaParameters.isEnabled()) {
-            props.put(SASL_MECHANISM, kafkaParameters.getMechanism());
-            props.put(SECURITY_PROTOCOL_CONFIG, kafkaParameters.getProtocol());
-            props.put(SASL_JAAS_CONFIG,
-                    "org.apache.kafka.common.security.plain.PlainLoginModule required\n"
-                            + "username=\"" + kafkaParameters.getUsername() + "\"\n"
-                            + "password=\"" + kafkaParameters.getPassword() + "\";"
-            );
-        }
-
-        Producer<byte[], byte[]> leaderConfirms = new KafkaProducer<>(copyWithEntryAdded(props, ACKS_CONFIG, ACK_LEADER));
-        Producer<byte[], byte[]> everyoneConfirms = new KafkaProducer<>(copyWithEntryAdded(props, ACKS_CONFIG, ACK_ALL));
-        return new Producers(leaderConfirms, everyoneConfirms, kafkaProducerParameters.isReportNodeMetricsEnabled());
-    }
-
-    private ImmutableMap<String, Object> copyWithEntryAdded(Map<String, Object> common, String key, String value) {
-        return ImmutableMap.<String, Object>builder().putAll(common).put(key, value).build();
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSender.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSender.java
new file mode 100644
index 0000000000..8b50b6b886
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSender.java
@@ -0,0 +1,282 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.function.ToDoubleFunction;
+import org.apache.kafka.clients.producer.Callback;
+import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
+import org.apache.kafka.common.Metric;
+import org.apache.kafka.common.MetricName;
+import org.apache.kafka.common.Node;
+import org.apache.kafka.common.PartitionInfo;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.errors.InterruptException;
+import org.apache.kafka.common.record.RecordBatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+import pl.allegro.tech.hermes.frontend.producer.BrokerLatencyReporter;
+import pl.allegro.tech.hermes.frontend.publishing.message.Message;
+import pl.allegro.tech.hermes.frontend.publishing.metadata.ProduceMetadata;
+import pl.allegro.tech.hermes.metrics.HermesTimerContext;
+
+public class KafkaMessageSender<K, V> {
+
+  private static final Logger logger = LoggerFactory.getLogger(KafkaMessageSender.class);
+
+  private final Producer<K, V> producer;
+  private final BrokerLatencyReporter brokerLatencyReporter;
+  private final MetricsFacade metricsFacade;
+  private final String datacenter;
+  private final ScheduledExecutorService chaosScheduler;
+
+  KafkaMessageSender(
+      Producer<K, V> kafkaProducer,
+      BrokerLatencyReporter brokerLatencyReporter,
+      MetricsFacade metricsFacade,
+      String datacenter,
+      ScheduledExecutorService chaosScheduler) {
+    this.producer = kafkaProducer;
+    this.brokerLatencyReporter = brokerLatencyReporter;
+    this.metricsFacade = metricsFacade;
+    this.datacenter = datacenter;
+    this.chaosScheduler = chaosScheduler;
+  }
+
+  public String getDatacenter() {
+    return datacenter;
+  }
+
+  public void send(
+      ProducerRecord<K, V> producerRecord,
+      CachedTopic cachedTopic,
+      Message message,
+      Callback callback,
+      MultiDatacenterMessageProducer.ChaosExperiment experiment) {
+    if (experiment.enabled()) {
+      try {
+        chaosScheduler.schedule(
+            () -> {
+              if (experiment.completeWithError()) {
+                var exception =
+                    new ChaosException(datacenter, experiment.delayInMillis(), message.getId());
+                callback.onCompletion(exceptionalRecordMetadata(cachedTopic), exception);
+              } else {
+                send(producerRecord, cachedTopic, message, callback);
+              }
+            },
+            experiment.delayInMillis(),
+            TimeUnit.MILLISECONDS);
+      } catch (RejectedExecutionException e) {
+        logger.warn("Failed while scheduling chaos experiment. Sending message to Kafka.", e);
+        send(producerRecord, cachedTopic, message, callback);
+      }
+    } else {
+      send(producerRecord, cachedTopic, message, callback);
+    }
+  }
+
+  public void send(
+      ProducerRecord<K, V> producerRecord,
+      CachedTopic cachedTopic,
+      Message message,
+      Callback callback) {
+    HermesTimerContext timer = cachedTopic.startBrokerLatencyTimer();
+    Callback meteredCallback = new MeteredCallback(timer, message, cachedTopic, callback);
+    try {
+      producer.send(producerRecord, meteredCallback);
+    } catch (Exception e) {
+      callback.onCompletion(exceptionalRecordMetadata(cachedTopic), e);
+    }
+  }
+
+  private static RecordMetadata exceptionalRecordMetadata(CachedTopic cachedTopic) {
+    var tp =
+        new TopicPartition(
+            cachedTopic.getKafkaTopics().getPrimary().name().asString(),
+            RecordMetadata.UNKNOWN_PARTITION);
+    return new RecordMetadata(tp, -1, -1, RecordBatch.NO_TIMESTAMP, -1L, -1, -1);
+  }
+
+  List<PartitionInfo> loadPartitionMetadataFor(String topic) {
+    return producer.partitionsFor(topic);
+  }
+
+  public void close() {
+    producer.close();
+  }
+
+  private Supplier<ProduceMetadata> produceMetadataSupplier(RecordMetadata recordMetadata) {
+    return () -> {
+      String kafkaTopicName = recordMetadata.topic();
+      try {
+        List<PartitionInfo> topicPartitions = producer.partitionsFor(kafkaTopicName);
+
+        Optional<PartitionInfo> partitionInfo =
+            topicPartitions.stream()
+                .filter(p -> p.partition() == recordMetadata.partition())
+                .findFirst();
+
+        return partitionInfo
+            .flatMap(partition -> Optional.ofNullable(partition.leader()))
+            .map(Node::host)
+            .map(ProduceMetadata::new)
+            .orElse(ProduceMetadata.empty());
+      } catch (InterruptException e) {
+        Thread.currentThread().interrupt();
+      } catch (Exception e) {
+        logger.warn(
+            "Could not read information about partitions for topic {}. {}",
+            kafkaTopicName,
+            e.getMessage());
+      }
+      return ProduceMetadata.empty();
+    };
+  }
+
+  private class MeteredCallback implements Callback {
+
+    private final HermesTimerContext hermesTimerContext;
+    private final Message message;
+    private final CachedTopic cachedTopic;
+    private final Callback callback;
+
+    public MeteredCallback(
+        HermesTimerContext hermesTimerContext,
+        Message message,
+        CachedTopic cachedTopic,
+        Callback callback) {
+      this.hermesTimerContext = hermesTimerContext;
+      this.message = message;
+      this.cachedTopic = cachedTopic;
+      this.callback = callback;
+    }
+
+    @Override
+    public void onCompletion(RecordMetadata metadata, Exception exception) {
+      callback.onCompletion(metadata, exception);
+      Supplier<ProduceMetadata> produceMetadataSupplier = produceMetadataSupplier(metadata);
+      brokerLatencyReporter.report(
+          hermesTimerContext, message, cachedTopic.getTopic().getAck(), produceMetadataSupplier);
+    }
+  }
+
+  public void registerGauges(Topic.Ack ack, String sender) {
+    MetricName bufferTotalBytes =
+        producerMetricMame("buffer-total-bytes", "producer-metrics", "buffer total bytes");
+    MetricName bufferAvailableBytes =
+        producerMetricMame("buffer-available-bytes", "producer-metrics", "buffer available bytes");
+    MetricName compressionRate =
+        producerMetricMame("compression-rate-avg", "producer-metrics", "average compression rate");
+    MetricName failedBatches =
+        producerMetricMame("record-error-total", "producer-metrics", "failed publishing batches");
+    MetricName metadataAge =
+        producerMetricMame("metadata-age", "producer-metrics", "age [s] of metadata");
+    MetricName queueTimeMax =
+        producerMetricMame(
+            "record-queue-time-max",
+            "producer-metrics",
+            "maximum time [ms] that batch spent in the send buffer");
+    MetricName recordSendTotal =
+        producerMetricMame(
+            "record-send-total",
+            "producer-metrics",
+            "total number of records sent - including retries");
+
+    if (ack == Topic.Ack.ALL) {
+      metricsFacade
+          .producer()
+          .registerAckAllTotalBytesGauge(
+              producer, producerMetric(bufferTotalBytes), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckAllAvailableBytesGauge(
+              producer, producerMetric(bufferAvailableBytes), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckAllCompressionRateGauge(
+              producer, producerMetric(compressionRate), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckAllFailedBatchesGauge(
+              producer, producerMetric(failedBatches), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckAllMetadataAgeGauge(
+              producer, producerMetric(metadataAge), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckAllRecordQueueTimeMaxGauge(
+              producer, producerMetric(queueTimeMax), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckAllRecordSendCounter(
+              producer, producerMetric(recordSendTotal), sender, datacenter);
+    } else if (ack == Topic.Ack.LEADER) {
+      metricsFacade
+          .producer()
+          .registerAckLeaderTotalBytesGauge(
+              producer, producerMetric(bufferTotalBytes), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckLeaderAvailableBytesGauge(
+              producer, producerMetric(bufferAvailableBytes), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckLeaderCompressionRateGauge(
+              producer, producerMetric(compressionRate), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckLeaderFailedBatchesGauge(
+              producer, producerMetric(failedBatches), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckLeaderMetadataAgeGauge(
+              producer, producerMetric(metadataAge), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckLeaderRecordQueueTimeMaxGauge(
+              producer, producerMetric(queueTimeMax), sender, datacenter);
+      metricsFacade
+          .producer()
+          .registerAckLeaderRecordSendCounter(
+              producer, producerMetric(recordSendTotal), sender, datacenter);
+    }
+  }
+
+  private double findProducerMetric(
+      Producer<K, V> producer, Predicate<Map.Entry<MetricName, ? extends Metric>> predicate) {
+    Optional<? extends Map.Entry<MetricName, ? extends Metric>> first =
+        producer.metrics().entrySet().stream().filter(predicate).findFirst();
+    Object value =
+        first.map(metricNameEntry -> metricNameEntry.getValue().metricValue()).orElse(0.0d);
+    if (value instanceof Number) {
+      return ((Number) value).doubleValue();
+    } else {
+      return 0.0;
+    }
+  }
+
+  private ToDoubleFunction<Producer<K, V>> producerMetric(MetricName producerMetricName) {
+    Predicate<Map.Entry<MetricName, ? extends Metric>> predicate =
+        entry ->
+            entry.getKey().group().equals(producerMetricName.group())
+                && entry.getKey().name().equals(producerMetricName.name());
+    return producer -> findProducerMetric(producer, predicate);
+  }
+
+  private static MetricName producerMetricMame(String name, String group, String description) {
+    return new MetricName(name, group, description, Collections.emptyMap());
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSenders.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSenders.java
new file mode 100644
index 0000000000..66cea1384a
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSenders.java
@@ -0,0 +1,178 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.kafka.common.PartitionInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+
+// exposes kafka producer metrics, see:
+// https://docs.confluent.io/platform/current/kafka/monitoring.html#producer-metrics
+public class KafkaMessageSenders {
+
+  private static final Logger logger = LoggerFactory.getLogger(KafkaMessageSenders.class);
+
+  private final KafkaMessageSender<byte[], byte[]> ackLeader;
+  private final KafkaMessageSender<byte[], byte[]> ackAll;
+
+  private final List<KafkaMessageSender<byte[], byte[]>> remoteAckLeader;
+  private final List<KafkaMessageSender<byte[], byte[]>> remoteAckAll;
+
+  private final MinInSyncReplicasLoader localMinInSyncReplicasLoader;
+  private final TopicMetadataLoadingExecutor topicMetadataLoadingExecutor;
+  private final List<TopicMetadataLoader> localDatacenterTopicMetadataLoaders;
+  private final List<TopicMetadataLoader> kafkaProducerMetadataRefreshers;
+  private final List<String> datacenters;
+
+  KafkaMessageSenders(
+      TopicMetadataLoadingExecutor topicMetadataLoadingExecutor,
+      MinInSyncReplicasLoader localMinInSyncReplicasLoader,
+      Tuple localSenders,
+      List<Tuple> remoteSenders) {
+    this.topicMetadataLoadingExecutor = topicMetadataLoadingExecutor;
+    this.localMinInSyncReplicasLoader = localMinInSyncReplicasLoader;
+    this.ackLeader = localSenders.ackLeader;
+    this.ackAll = localSenders.ackAll;
+    this.remoteAckLeader =
+        remoteSenders.stream().map(it -> it.ackLeader).collect(Collectors.toList());
+    this.remoteAckAll = remoteSenders.stream().map(it -> it.ackAll).collect(Collectors.toList());
+    this.localDatacenterTopicMetadataLoaders =
+        List.of(new LocalDatacenterTopicAvailabilityChecker());
+    this.kafkaProducerMetadataRefreshers =
+        Stream.concat(Stream.of(localSenders), remoteSenders.stream())
+            .map(KafkaProducerMetadataRefresher::new)
+            .collect(Collectors.toList());
+    this.datacenters =
+        Stream.concat(Stream.of(localSenders), remoteSenders.stream())
+            .map(tuple -> tuple.ackAll)
+            .map(KafkaMessageSender::getDatacenter)
+            .toList();
+  }
+
+  KafkaMessageSender<byte[], byte[]> get(Topic topic) {
+    return topic.isReplicationConfirmRequired() ? ackAll : ackLeader;
+  }
+
+  List<KafkaMessageSender<byte[], byte[]>> getRemote(Topic topic) {
+    return topic.isReplicationConfirmRequired() ? remoteAckAll : remoteAckLeader;
+  }
+
+  List<String> getDatacenters() {
+    return datacenters;
+  }
+
+  void refreshTopicMetadata() {
+    topicMetadataLoadingExecutor.execute(kafkaProducerMetadataRefreshers);
+  }
+
+  boolean areAllTopicsAvailable() {
+    return topicMetadataLoadingExecutor.execute(localDatacenterTopicMetadataLoaders);
+  }
+
+  boolean isTopicAvailable(CachedTopic cachedTopic) {
+    String kafkaTopicName = cachedTopic.getKafkaTopics().getPrimary().name().asString();
+
+    try {
+      List<PartitionInfo> partitionInfos =
+          get(cachedTopic.getTopic()).loadPartitionMetadataFor(kafkaTopicName);
+      if (anyPartitionWithoutLeader(partitionInfos)) {
+        logger.warn("Topic {} has partitions without a leader.", kafkaTopicName);
+        return false;
+      }
+      if (anyUnderReplicatedPartition(partitionInfos, kafkaTopicName)) {
+        logger.warn("Topic {} has under replicated partitions.", kafkaTopicName);
+        return false;
+      }
+      if (!partitionInfos.isEmpty()) {
+        return true;
+      }
+    } catch (Exception e) {
+      logger.warn(
+          "Could not read information about partitions for topic {}. {}",
+          kafkaTopicName,
+          e.getMessage());
+      return false;
+    }
+
+    logger.warn("No information about partitions for topic {}", kafkaTopicName);
+    return false;
+  }
+
+  private boolean anyPartitionWithoutLeader(List<PartitionInfo> partitionInfos) {
+    return partitionInfos.stream().anyMatch(p -> p.leader() == null);
+  }
+
+  private boolean anyUnderReplicatedPartition(
+      List<PartitionInfo> partitionInfos, String kafkaTopicName) throws Exception {
+    int minInSyncReplicas = localMinInSyncReplicasLoader.get(kafkaTopicName);
+    return partitionInfos.stream().anyMatch(p -> p.inSyncReplicas().length < minInSyncReplicas);
+  }
+
+  public void registerSenderMetrics(String name) {
+    ackLeader.registerGauges(Topic.Ack.LEADER, name);
+    ackAll.registerGauges(Topic.Ack.ALL, name);
+    remoteAckLeader.forEach(sender -> sender.registerGauges(Topic.Ack.LEADER, name));
+    remoteAckAll.forEach(sender -> sender.registerGauges(Topic.Ack.ALL, name));
+  }
+
+  static class Tuple {
+    private final KafkaMessageSender<byte[], byte[]> ackLeader;
+    private final KafkaMessageSender<byte[], byte[]> ackAll;
+
+    Tuple(KafkaMessageSender<byte[], byte[]> ackLeader, KafkaMessageSender<byte[], byte[]> ackAll) {
+      this.ackLeader = ackLeader;
+      this.ackAll = ackAll;
+    }
+  }
+
+  public void close() {
+    ackAll.close();
+    ackLeader.close();
+  }
+
+  private class KafkaProducerMetadataRefresher implements TopicMetadataLoader {
+
+    private final KafkaMessageSender<byte[], byte[]> ackLeader;
+    private final KafkaMessageSender<byte[], byte[]> ackAll;
+
+    KafkaProducerMetadataRefresher(Tuple tuple) {
+      this.ackLeader = tuple.ackLeader;
+      this.ackAll = tuple.ackAll;
+    }
+
+    @Override
+    public MetadataLoadingResult load(CachedTopic cachedTopic) {
+      String kafkaTopicName = cachedTopic.getKafkaTopics().getPrimary().name().asString();
+      var sender = getSender(cachedTopic.getTopic());
+      var partitionInfos = sender.loadPartitionMetadataFor(kafkaTopicName);
+      if (anyPartitionWithoutLeader(partitionInfos)) {
+        logger.warn("Topic {} has partitions without a leader.", kafkaTopicName);
+        return MetadataLoadingResult.failure(cachedTopic.getTopicName(), sender.getDatacenter());
+      }
+      if (partitionInfos.isEmpty()) {
+        logger.warn("No information about partitions for topic {}", kafkaTopicName);
+        return MetadataLoadingResult.failure(cachedTopic.getTopicName(), sender.getDatacenter());
+      }
+      return MetadataLoadingResult.success(cachedTopic.getTopicName(), sender.getDatacenter());
+    }
+
+    private KafkaMessageSender<byte[], byte[]> getSender(Topic topic) {
+      return topic.isReplicationConfirmRequired() ? ackAll : ackLeader;
+    }
+  }
+
+  private class LocalDatacenterTopicAvailabilityChecker implements TopicMetadataLoader {
+
+    @Override
+    public MetadataLoadingResult load(CachedTopic topic) {
+      String datacenter = get(topic.getTopic()).getDatacenter();
+      if (isTopicAvailable(topic)) {
+        return MetadataLoadingResult.success(topic.getTopicName(), datacenter);
+      }
+      return MetadataLoadingResult.failure(topic.getTopicName(), datacenter);
+    }
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSendersFactory.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSendersFactory.java
new file mode 100644
index 0000000000..391dbbc827
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaMessageSendersFactory.java
@@ -0,0 +1,160 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.ACKS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.BATCH_SIZE_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.BUFFER_MEMORY_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.COMPRESSION_TYPE_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.DELIVERY_TIMEOUT_MS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.ENABLE_IDEMPOTENCE_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.LINGER_MS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.MAX_BLOCK_MS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.MAX_IN_FLIGHT_REQUESTS_PER_CONNECTION;
+import static org.apache.kafka.clients.producer.ProducerConfig.MAX_REQUEST_SIZE_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.METADATA_MAX_AGE_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.METRICS_SAMPLE_WINDOW_MS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.REQUEST_TIMEOUT_MS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.RETRIES_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.RETRY_BACKOFF_MS_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.SEND_BUFFER_CONFIG;
+import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
+import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
+import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import org.apache.kafka.clients.admin.AdminClient;
+import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
+import pl.allegro.tech.hermes.frontend.producer.BrokerLatencyReporter;
+
+public class KafkaMessageSendersFactory {
+
+  private static final String ACK_ALL = "-1";
+  private static final String ACK_LEADER = "1";
+
+  private final TopicMetadataLoadingExecutor topicMetadataLoadingExecutor;
+  private final MinInSyncReplicasLoader localMinInSyncReplicasLoader;
+  private final KafkaParameters kafkaParameters;
+  private final List<KafkaParameters> remoteKafkaParameters;
+  private final BrokerLatencyReporter brokerLatencyReporter;
+  private final MetricsFacade metricsFacade;
+  private final long bufferedSizeBytes;
+  private final ScheduledExecutorService chaosScheduler;
+
+  public KafkaMessageSendersFactory(
+      KafkaParameters kafkaParameters,
+      List<KafkaParameters> remoteKafkaParameters,
+      BrokerLatencyReporter brokerLatencyReporter,
+      MetricsFacade metricsFacade,
+      AdminClient localAdminClient,
+      TopicsCache topicsCache,
+      int retryCount,
+      Duration retryInterval,
+      int threadPoolSize,
+      long bufferedSizeBytes,
+      Duration metadataMaxAge,
+      ScheduledExecutorService chaosScheduler) {
+    this.topicMetadataLoadingExecutor =
+        new TopicMetadataLoadingExecutor(topicsCache, retryCount, retryInterval, threadPoolSize);
+    this.localMinInSyncReplicasLoader =
+        new MinInSyncReplicasLoader(localAdminClient, metadataMaxAge);
+    this.bufferedSizeBytes = bufferedSizeBytes;
+    this.kafkaParameters = kafkaParameters;
+    this.remoteKafkaParameters = remoteKafkaParameters;
+    this.metricsFacade = metricsFacade;
+    this.brokerLatencyReporter = brokerLatencyReporter;
+    this.chaosScheduler = chaosScheduler;
+  }
+
+  public KafkaMessageSenders provide(
+      KafkaProducerParameters kafkaProducerParameters, String senderName) {
+    return provide(kafkaProducerParameters, kafkaProducerParameters, senderName);
+  }
+
+  public KafkaMessageSenders provide(
+      KafkaProducerParameters localKafkaProducerParameters,
+      KafkaProducerParameters remoteKafkaProducerParameters,
+      String senderName) {
+    KafkaMessageSenders.Tuple localProducers =
+        new KafkaMessageSenders.Tuple(
+            sender(kafkaParameters, localKafkaProducerParameters, ACK_LEADER),
+            sender(kafkaParameters, localKafkaProducerParameters, ACK_ALL));
+
+    List<KafkaMessageSenders.Tuple> remoteProducers =
+        remoteKafkaParameters.stream()
+            .map(
+                kafkaProperties ->
+                    new KafkaMessageSenders.Tuple(
+                        sender(kafkaProperties, remoteKafkaProducerParameters, ACK_LEADER),
+                        sender(kafkaProperties, remoteKafkaProducerParameters, ACK_ALL)))
+            .toList();
+    KafkaMessageSenders senders =
+        new KafkaMessageSenders(
+            topicMetadataLoadingExecutor,
+            localMinInSyncReplicasLoader,
+            localProducers,
+            remoteProducers);
+    senders.registerSenderMetrics(senderName);
+    return senders;
+  }
+
+  private KafkaMessageSender<byte[], byte[]> sender(
+      KafkaParameters kafkaParameters,
+      KafkaProducerParameters kafkaProducerParameters,
+      String acks) {
+    Map<String, Object> props = new HashMap<>();
+    props.put(BOOTSTRAP_SERVERS_CONFIG, kafkaParameters.getBrokerList());
+    props.put(MAX_BLOCK_MS_CONFIG, (int) kafkaProducerParameters.getMaxBlock().toMillis());
+    props.put(COMPRESSION_TYPE_CONFIG, kafkaProducerParameters.getCompressionCodec());
+    props.put(BUFFER_MEMORY_CONFIG, bufferedSizeBytes);
+    props.put(
+        REQUEST_TIMEOUT_MS_CONFIG, (int) kafkaProducerParameters.getRequestTimeout().toMillis());
+    props.put(
+        DELIVERY_TIMEOUT_MS_CONFIG, (int) kafkaProducerParameters.getDeliveryTimeout().toMillis());
+    props.put(BATCH_SIZE_CONFIG, kafkaProducerParameters.getBatchSize());
+    props.put(SEND_BUFFER_CONFIG, kafkaProducerParameters.getTcpSendBuffer());
+    props.put(RETRIES_CONFIG, kafkaProducerParameters.getRetries());
+    props.put(RETRY_BACKOFF_MS_CONFIG, (int) kafkaProducerParameters.getRetryBackoff().toMillis());
+    props.put(
+        METADATA_MAX_AGE_CONFIG, (int) kafkaProducerParameters.getMetadataMaxAge().toMillis());
+    props.put(
+        KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArraySerializer");
+    props.put(
+        VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArraySerializer");
+    props.put(MAX_REQUEST_SIZE_CONFIG, kafkaProducerParameters.getMaxRequestSize());
+    props.put(LINGER_MS_CONFIG, (int) kafkaProducerParameters.getLinger().toMillis());
+    props.put(
+        METRICS_SAMPLE_WINDOW_MS_CONFIG,
+        (int) kafkaProducerParameters.getMetricsSampleWindow().toMillis());
+    props.put(
+        MAX_IN_FLIGHT_REQUESTS_PER_CONNECTION,
+        kafkaProducerParameters.getMaxInflightRequestsPerConnection());
+    props.put(ENABLE_IDEMPOTENCE_CONFIG, kafkaProducerParameters.isIdempotenceEnabled());
+    props.put(ACKS_CONFIG, acks);
+
+    if (kafkaParameters.isAuthenticationEnabled()) {
+      props.put(SASL_MECHANISM, kafkaParameters.getAuthenticationMechanism());
+      props.put(SECURITY_PROTOCOL_CONFIG, kafkaParameters.getAuthenticationProtocol());
+      props.put(SASL_JAAS_CONFIG, kafkaParameters.getJaasConfig());
+    }
+
+    return new KafkaMessageSender<>(
+        new org.apache.kafka.clients.producer.KafkaProducer<>(props),
+        brokerLatencyReporter,
+        metricsFacade,
+        kafkaParameters.getDatacenter(),
+        chaosScheduler);
+  }
+
+  public void close() throws Exception {
+    topicMetadataLoadingExecutor.close();
+    localMinInSyncReplicasLoader.close();
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaProducerParameters.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaProducerParameters.java
index f7e05d4283..e8c5a5cc49 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaProducerParameters.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaProducerParameters.java
@@ -4,29 +4,33 @@
 
 public interface KafkaProducerParameters {
 
-    Duration getMaxBlock();
+  Duration getMaxBlock();
 
-    Duration getMetadataMaxAge();
+  Duration getMetadataMaxAge();
 
-    String getCompressionCodec();
+  String getCompressionCodec();
 
-    int getRetries();
+  int getRetries();
 
-    Duration getRetryBackoff();
+  Duration getRetryBackoff();
 
-    Duration getRequestTimeout();
+  Duration getRequestTimeout();
 
-    int getBatchSize();
+  int getBatchSize();
 
-    int getTcpSendBuffer();
+  int getTcpSendBuffer();
 
-    int getMaxRequestSize();
+  int getMaxRequestSize();
 
-    Duration getLinger();
+  Duration getDeliveryTimeout();
 
-    Duration getMetricsSampleWindow();
+  Duration getLinger();
 
-    int getMaxInflightRequestsPerConnection();
+  Duration getMetricsSampleWindow();
 
-    boolean isReportNodeMetricsEnabled();
+  int getMaxInflightRequestsPerConnection();
+
+  boolean isReportNodeMetricsEnabled();
+
+  boolean isIdempotenceEnabled();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaTopicMetadataFetcher.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaTopicMetadataFetcher.java
deleted file mode 100644
index d63c2a4af1..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaTopicMetadataFetcher.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package pl.allegro.tech.hermes.frontend.producer.kafka;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableList;
-import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.admin.Config;
-import org.apache.kafka.clients.admin.ConfigEntry;
-import org.apache.kafka.clients.admin.DescribeConfigsResult;
-import org.apache.kafka.common.config.ConfigResource;
-
-import java.time.Duration;
-import java.util.Map;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.kafka.common.config.ConfigResource.Type.TOPIC;
-import static org.apache.kafka.common.config.TopicConfig.MIN_IN_SYNC_REPLICAS_CONFIG;
-
-public class KafkaTopicMetadataFetcher {
-    private final LoadingCache<String, Integer> minInSyncReplicasCache;
-    private final AdminClient adminClient;
-
-    KafkaTopicMetadataFetcher(AdminClient adminClient, Duration metadataMaxAge) {
-        this.adminClient = adminClient;
-        this.minInSyncReplicasCache = CacheBuilder
-                .newBuilder()
-                .expireAfterWrite(metadataMaxAge.toMillis(), MILLISECONDS)
-                .build(new MinInSyncReplicasLoader());
-    }
-
-    int fetchMinInSyncReplicas(String kafkaTopicName) throws Exception {
-        return minInSyncReplicasCache.get(kafkaTopicName);
-    }
-
-    void close() {
-        adminClient.close();
-    }
-
-    private class MinInSyncReplicasLoader extends CacheLoader<String, Integer> {
-
-        @Override
-        public Integer load(String kafkaTopicName) throws Exception {
-            ConfigResource resource = new ConfigResource(TOPIC, kafkaTopicName);
-            DescribeConfigsResult describeTopicsResult = adminClient.describeConfigs(ImmutableList.of(resource));
-            Map<ConfigResource, Config> configMap = describeTopicsResult.all().get();
-            Config config = configMap.get(resource);
-            ConfigEntry configEntry = config.get(MIN_IN_SYNC_REPLICAS_CONFIG);
-            String value = configEntry.value();
-            return Integer.parseInt(value);
-        }
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaTopicMetadataFetcherFactory.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaTopicMetadataFetcherFactory.java
deleted file mode 100644
index d7e1fe56ee..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaTopicMetadataFetcherFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package pl.allegro.tech.hermes.frontend.producer.kafka;
-
-import org.apache.kafka.clients.admin.AdminClient;
-import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
-
-import java.time.Duration;
-import java.util.Properties;
-
-import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG;
-import static org.apache.kafka.clients.CommonClientConfigs.DEFAULT_SECURITY_PROTOCOL;
-import static org.apache.kafka.clients.CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG;
-import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
-import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
-import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
-
-public class KafkaTopicMetadataFetcherFactory {
-
-    private final KafkaParameters kafkaParameters;
-
-    private final Duration metadataMaxAge;
-
-    private final int requestTimeoutMs;
-
-    public KafkaTopicMetadataFetcherFactory(KafkaParameters kafkaParameters, Duration metadataMaxAge, int requestTimeoutMs) {
-        this.kafkaParameters = kafkaParameters;
-        this.metadataMaxAge = metadataMaxAge;
-        this.requestTimeoutMs = requestTimeoutMs;
-    }
-
-    public KafkaTopicMetadataFetcher provide() {
-        Properties props = new Properties();
-        props.put(BOOTSTRAP_SERVERS_CONFIG, kafkaParameters.getBrokerList());
-        props.put(SECURITY_PROTOCOL_CONFIG, DEFAULT_SECURITY_PROTOCOL);
-        props.put(REQUEST_TIMEOUT_MS_CONFIG, requestTimeoutMs);
-        if (kafkaParameters.isEnabled()) {
-            props.put(SASL_MECHANISM, kafkaParameters.getMechanism());
-            props.put(SECURITY_PROTOCOL_CONFIG, kafkaParameters.getProtocol());
-            props.put(SASL_JAAS_CONFIG,
-                    "org.apache.kafka.common.security.plain.PlainLoginModule required\n"
-                            + "username=\"" + kafkaParameters.getUsername() + "\"\n"
-                            + "password=\"" + kafkaParameters.getPassword() + "\";"
-            );
-        }
-        AdminClient adminClient = AdminClient.create(props);
-        return new KafkaTopicMetadataFetcher(adminClient, metadataMaxAge);
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducer.java
new file mode 100644
index 0000000000..f23df903e2
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducer.java
@@ -0,0 +1,72 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import jakarta.inject.Singleton;
+import org.apache.kafka.clients.producer.Callback;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
+import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
+import pl.allegro.tech.hermes.frontend.publishing.message.Message;
+
+@Singleton
+public class LocalDatacenterMessageProducer implements BrokerMessageProducer {
+
+  private final KafkaMessageSenders kafkaMessageSenders;
+  private final MessageToKafkaProducerRecordConverter messageConverter;
+
+  public LocalDatacenterMessageProducer(
+      KafkaMessageSenders kafkaMessageSenders,
+      MessageToKafkaProducerRecordConverter messageConverter) {
+    this.kafkaMessageSenders = kafkaMessageSenders;
+    this.messageConverter = messageConverter;
+  }
+
+  @Override
+  public void send(Message message, CachedTopic cachedTopic, final PublishingCallback callback) {
+    ProducerRecord<byte[], byte[]> producerRecord =
+        messageConverter.convertToProducerRecord(
+            message, cachedTopic.getKafkaTopics().getPrimary().name());
+
+    var producer = kafkaMessageSenders.get(cachedTopic.getTopic());
+    Callback wrappedCallback =
+        new SendCallback(message, cachedTopic, callback, producer.getDatacenter());
+    producer.send(producerRecord, cachedTopic, message, wrappedCallback);
+  }
+
+  @Override
+  public boolean areAllTopicsAvailable() {
+    return kafkaMessageSenders.areAllTopicsAvailable();
+  }
+
+  @Override
+  public boolean isTopicAvailable(CachedTopic cachedTopic) {
+    return kafkaMessageSenders.isTopicAvailable(cachedTopic);
+  }
+
+  private static class SendCallback implements org.apache.kafka.clients.producer.Callback {
+
+    private final Message message;
+    private final CachedTopic topic;
+    private final PublishingCallback callback;
+    private final String datacenter;
+
+    public SendCallback(
+        Message message, CachedTopic topic, PublishingCallback callback, String datacenter) {
+      this.message = message;
+      this.topic = topic;
+      this.callback = callback;
+      this.datacenter = datacenter;
+    }
+
+    @Override
+    public void onCompletion(RecordMetadata recordMetadata, Exception e) {
+      if (e == null) {
+        callback.onEachPublished(message, topic.getTopic(), datacenter);
+        callback.onPublished(message, topic.getTopic());
+      } else {
+        callback.onUnpublished(message, topic.getTopic(), e);
+      }
+    }
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MessageToKafkaProducerRecordConverter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MessageToKafkaProducerRecordConverter.java
index a2da87693f..b7fcc267b7 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MessageToKafkaProducerRecordConverter.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MessageToKafkaProducerRecordConverter.java
@@ -1,64 +1,56 @@
 package pl.allegro.tech.hermes.frontend.producer.kafka;
 
+import static java.util.Optional.ofNullable;
+
+import com.google.common.collect.Lists;
+import java.util.List;
 import org.apache.avro.Schema;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.header.Header;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
-import pl.allegro.tech.hermes.schema.CompiledSchema;
-import pl.allegro.tech.hermes.schema.SchemaId;
-import pl.allegro.tech.hermes.schema.SchemaVersion;
-
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.util.Optional.ofNullable;
 
 public class MessageToKafkaProducerRecordConverter {
 
-    private final KafkaHeaderFactory kafkaHeaderFactory;
-    private final boolean schemaIdHeaderEnabled;
-
-    public MessageToKafkaProducerRecordConverter(KafkaHeaderFactory kafkaHeaderFactory,
-                                                 boolean schemaIdHeaderEnabled) {
-        this.kafkaHeaderFactory = kafkaHeaderFactory;
-        this.schemaIdHeaderEnabled = schemaIdHeaderEnabled;
-    }
-
-    public ProducerRecord<byte[], byte[]> convertToProducerRecord(Message message, KafkaTopicName kafkaTopicName) {
-        Optional<SchemaVersion> schemaVersion = message.<Schema>getCompiledSchema().map(CompiledSchema::getVersion);
-        Optional<SchemaId> schemaId = createSchemaId(message);
-        Iterable<Header> headers = createRecordHeaders(message.getId(), message.getTimestamp(), schemaId, schemaVersion);
-        byte[] partitionKey = ofNullable(message.getPartitionKey()).map(String::getBytes).orElse(null);
-
-        return new ProducerRecord<>(kafkaTopicName.asString(), null, message.getTimestamp(),
-                partitionKey, message.getData(), headers);
-    }
-
-    private Optional<SchemaId> createSchemaId(Message message) {
-        if (schemaIdHeaderEnabled) {
-            return message.<Schema>getCompiledSchema().map(CompiledSchema::getId);
-        }
-
-        return Optional.empty();
-    }
-
-    private Iterable<Header> createRecordHeaders(String id,
-                                                 long timestamp,
-                                                 Optional<SchemaId> schemaId,
-                                                 Optional<SchemaVersion> schemaVersion) {
-        Stream<Optional<Header>> headers = Stream.of(
-                Optional.of(kafkaHeaderFactory.messageId(id)),
-                Optional.of(kafkaHeaderFactory.timestamp(timestamp)),
-                schemaVersion.map(sv -> kafkaHeaderFactory.schemaVersion(sv.value())),
-                schemaId.map(sid -> kafkaHeaderFactory.schemaId(sid.value()))
-        );
-
-        return headers
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.toList());
-    }
-
+  private final KafkaHeaderFactory kafkaHeaderFactory;
+  private final boolean schemaIdHeaderEnabled;
+
+  public MessageToKafkaProducerRecordConverter(
+      KafkaHeaderFactory kafkaHeaderFactory, boolean schemaIdHeaderEnabled) {
+    this.kafkaHeaderFactory = kafkaHeaderFactory;
+    this.schemaIdHeaderEnabled = schemaIdHeaderEnabled;
+  }
+
+  public ProducerRecord<byte[], byte[]> convertToProducerRecord(
+      Message message, KafkaTopicName kafkaTopicName) {
+    Iterable<Header> headers = createRecordHeaders(message);
+    byte[] partitionKey = ofNullable(message.getPartitionKey()).map(String::getBytes).orElse(null);
+
+    return new ProducerRecord<>(
+        kafkaTopicName.asString(),
+        null,
+        message.getTimestamp(),
+        partitionKey,
+        message.getData(),
+        headers);
+  }
+
+  private Iterable<Header> createRecordHeaders(Message message) {
+    List<Header> headers = Lists.newArrayList(kafkaHeaderFactory.messageId(message.getId()));
+
+    message
+        .<Schema>getCompiledSchema()
+        .ifPresent(
+            compiledSchemaVersion -> {
+              headers.add(
+                  kafkaHeaderFactory.schemaVersion(compiledSchemaVersion.getVersion().value()));
+              if (schemaIdHeaderEnabled) {
+                headers.add(kafkaHeaderFactory.schemaId(compiledSchemaVersion.getId().value()));
+              }
+            });
+
+    kafkaHeaderFactory.setHTTPHeadersIfEnabled(headers, message.getHTTPHeaders());
+
+    return headers;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MinInSyncReplicasLoader.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MinInSyncReplicasLoader.java
new file mode 100644
index 0000000000..9462b9317b
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MinInSyncReplicasLoader.java
@@ -0,0 +1,55 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.kafka.common.config.ConfigResource.Type.TOPIC;
+import static org.apache.kafka.common.config.TopicConfig.MIN_IN_SYNC_REPLICAS_CONFIG;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.ImmutableList;
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.Config;
+import org.apache.kafka.clients.admin.ConfigEntry;
+import org.apache.kafka.clients.admin.DescribeConfigsResult;
+import org.apache.kafka.common.config.ConfigResource;
+
+class MinInSyncReplicasLoader {
+
+  private final AdminClient adminClient;
+  private final LoadingCache<String, Integer> minInSyncReplicasCache;
+
+  MinInSyncReplicasLoader(AdminClient adminClient, Duration metadataMaxAge) {
+    this.adminClient = adminClient;
+    this.minInSyncReplicasCache =
+        CacheBuilder.newBuilder()
+            .expireAfterWrite(metadataMaxAge.toMillis(), MILLISECONDS)
+            .build(new MinInSyncReplicasCacheLoader());
+  }
+
+  int get(String kafkaTopicName) throws ExecutionException {
+    return minInSyncReplicasCache.get(kafkaTopicName);
+  }
+
+  void close() {
+    adminClient.close();
+  }
+
+  private class MinInSyncReplicasCacheLoader extends CacheLoader<String, Integer> {
+
+    @Override
+    public Integer load(String kafkaTopicName) throws Exception {
+      ConfigResource resource = new ConfigResource(TOPIC, kafkaTopicName);
+      DescribeConfigsResult describeTopicsResult =
+          adminClient.describeConfigs(ImmutableList.of(resource));
+      Map<ConfigResource, Config> configMap = describeTopicsResult.all().get();
+      Config config = configMap.get(resource);
+      ConfigEntry configEntry = config.get(MIN_IN_SYNC_REPLICAS_CONFIG);
+      String value = configEntry.value();
+      return Integer.parseInt(value);
+    }
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MultiDatacenterMessageProducer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MultiDatacenterMessageProducer.java
new file mode 100644
index 0000000000..8ba8b27c93
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/MultiDatacenterMessageProducer.java
@@ -0,0 +1,405 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.kafka.clients.producer.Callback;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy.ChaosPolicy;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
+import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
+import pl.allegro.tech.hermes.frontend.publishing.message.Message;
+import pl.allegro.tech.hermes.frontend.readiness.AdminReadinessService;
+
+public class MultiDatacenterMessageProducer implements BrokerMessageProducer {
+
+  private static final Logger logger =
+      LoggerFactory.getLogger(MultiDatacenterMessageProducer.class);
+
+  private final KafkaMessageSenders kafkaMessageSenders;
+  private final MessageToKafkaProducerRecordConverter messageConverter;
+  private final Duration speculativeSendDelay;
+  private final AdminReadinessService adminReadinessService;
+  private final ScheduledExecutorService fallbackScheduler;
+
+  public MultiDatacenterMessageProducer(
+      KafkaMessageSenders kafkaMessageSenders,
+      AdminReadinessService adminReadinessService,
+      MessageToKafkaProducerRecordConverter messageConverter,
+      Duration speculativeSendDelay,
+      ScheduledExecutorService fallbackScheduler) {
+    this.messageConverter = messageConverter;
+    this.kafkaMessageSenders = kafkaMessageSenders;
+    this.speculativeSendDelay = speculativeSendDelay;
+    this.adminReadinessService = adminReadinessService;
+    this.fallbackScheduler = fallbackScheduler;
+  }
+
+  @Override
+  public void send(Message message, CachedTopic cachedTopic, PublishingCallback callback) {
+    var producerRecord =
+        messageConverter.convertToProducerRecord(
+            message, cachedTopic.getKafkaTopics().getPrimary().name());
+
+    KafkaMessageSender<byte[], byte[]> localSender =
+        kafkaMessageSenders.get(cachedTopic.getTopic());
+    Optional<KafkaMessageSender<byte[], byte[]>> remoteSender = getRemoteSender(cachedTopic);
+
+    Map<String, ChaosExperiment> experiments =
+        createChaosExperimentsPerDatacenter(cachedTopic.getTopic());
+
+    if (remoteSender.isPresent()) {
+      sendWithFallback(
+          localSender,
+          remoteSender.get(),
+          producerRecord,
+          cachedTopic,
+          message,
+          experiments,
+          callback);
+    } else {
+      sendWithoutFallback(localSender, producerRecord, cachedTopic, message, callback);
+    }
+  }
+
+  private static class SendWithFallbackExecutionContext {
+
+    private final AtomicBoolean fallbackExecuted = new AtomicBoolean(false);
+    private final AtomicBoolean sent = new AtomicBoolean(false);
+    private final AtomicInteger tries;
+    private final ConcurrentHashMap<String, Exception> errors;
+
+    private SendWithFallbackExecutionContext() {
+      this.tries = new AtomicInteger(2);
+      this.errors = new ConcurrentHashMap<>(2);
+    }
+
+    public boolean tryTransitionToFallback() {
+      return fallbackExecuted.compareAndSet(false, true) && !sent.get();
+    }
+
+    boolean tryTransitionToUnpublished(String datacenter, Exception exception) {
+      errors.put(datacenter, exception);
+      return tries.decrementAndGet() == 0;
+    }
+
+    public boolean tryTransitionToFirstSent() {
+      return sent.compareAndSet(false, true);
+    }
+  }
+
+  /*
+  We first try to send message to local DC. If the local send fails we perform 'immediate' fallback to remote DC.
+
+  Additionally, we schedule a 'speculative' fallback to remote DC to execute after 'speculativeSendDelay' elapses.
+  Speculative fallback decreases publication latency but may result in messages being duplicated across DCs.
+
+  If local DC send succeeds or fails before 'speculativeSendDelay' elapses we try to cancel the 'speculative' fallback if
+  it has not been executed yet. We guarantee that only one fallback executes - either 'immediate' or 'speculative'.
+   */
+  private void sendWithFallback(
+      KafkaMessageSender<byte[], byte[]> localSender,
+      KafkaMessageSender<byte[], byte[]> remoteSender,
+      ProducerRecord<byte[], byte[]> producerRecord,
+      CachedTopic cachedTopic,
+      Message message,
+      Map<String, ChaosExperiment> experiments,
+      PublishingCallback publishingCallback) {
+
+    SendWithFallbackExecutionContext context = new SendWithFallbackExecutionContext();
+
+    FallbackRunnable fallback =
+        new FallbackRunnable(
+            remoteSender,
+            producerRecord,
+            cachedTopic,
+            message,
+            experiments.getOrDefault(remoteSender.getDatacenter(), ChaosExperiment.DISABLED),
+            publishingCallback,
+            context);
+
+    Future<?> speculativeFallback;
+    try {
+      speculativeFallback =
+          fallbackScheduler.schedule(
+              fallback, speculativeSendDelay.toMillis(), TimeUnit.MILLISECONDS);
+    } catch (RejectedExecutionException rejectedExecutionException) {
+      logger.warn(
+          "Failed to run schedule fallback for message: {}, topic: {}",
+          message,
+          cachedTopic.getQualifiedName(),
+          rejectedExecutionException);
+      speculativeFallback = CompletableFuture.completedFuture(null);
+    }
+
+    localSender.send(
+        producerRecord,
+        cachedTopic,
+        message,
+        new FallbackAwareLocalSendCallback(
+            message,
+            cachedTopic,
+            localSender.getDatacenter(),
+            context,
+            publishingCallback,
+            fallback,
+            speculativeFallback),
+        experiments.getOrDefault(localSender.getDatacenter(), ChaosExperiment.DISABLED));
+  }
+
+  private void sendWithoutFallback(
+      KafkaMessageSender<byte[], byte[]> sender,
+      ProducerRecord<byte[], byte[]> producerRecord,
+      CachedTopic cachedTopic,
+      Message message,
+      PublishingCallback callback) {
+    sender.send(
+        producerRecord,
+        cachedTopic,
+        message,
+        new LocalSendCallback(message, cachedTopic, sender.getDatacenter(), callback));
+  }
+
+  private Map<String, ChaosExperiment> createChaosExperimentsPerDatacenter(Topic topic) {
+    PublishingChaosPolicy chaos = topic.getChaos();
+    return switch (chaos.mode()) {
+      case DISABLED -> Map.of();
+      case GLOBAL -> {
+        Map<String, ChaosExperiment> experiments = new HashMap<>();
+        ChaosPolicy policy = chaos.globalPolicy();
+        boolean enabled = computeIfShouldBeEnabled(policy);
+        for (String datacenter : kafkaMessageSenders.getDatacenters()) {
+          experiments.put(datacenter, createChaosExperimentForDatacenter(policy, enabled));
+        }
+        yield experiments;
+      }
+      case DATACENTER -> {
+        Map<String, ChaosExperiment> experiments = new HashMap<>();
+        Map<String, ChaosPolicy> policies = chaos.datacenterPolicies();
+        for (String datacenter : kafkaMessageSenders.getDatacenters()) {
+          ChaosPolicy policy = policies.get(datacenter);
+          boolean enabled = computeIfShouldBeEnabled(policy);
+          experiments.put(datacenter, createChaosExperimentForDatacenter(policy, enabled));
+        }
+        yield experiments;
+      }
+    };
+  }
+
+  private boolean computeIfShouldBeEnabled(ChaosPolicy policy) {
+    if (policy == null) {
+      return false;
+    }
+    return ThreadLocalRandom.current().nextInt(100) < policy.probability();
+  }
+
+  private ChaosExperiment createChaosExperimentForDatacenter(ChaosPolicy policy, boolean enabled) {
+    if (!enabled) {
+      return ChaosExperiment.DISABLED;
+    }
+    long delayMillisFrom = policy.delayFrom();
+    long delayMillisTo = policy.delayTo();
+    long delayMillis =
+        ThreadLocalRandom.current().nextLong(delayMillisTo - delayMillisFrom) + delayMillisFrom;
+    return new ChaosExperiment(true, policy.completeWithError(), delayMillis);
+  }
+
+  public record ChaosExperiment(boolean enabled, boolean completeWithError, long delayInMillis) {
+
+    private static final ChaosExperiment DISABLED = new ChaosExperiment(false, false, 0);
+  }
+
+  private Optional<KafkaMessageSender<byte[], byte[]>> getRemoteSender(CachedTopic cachedTopic) {
+    return kafkaMessageSenders.getRemote(cachedTopic.getTopic()).stream()
+        .filter(producer -> adminReadinessService.isDatacenterReady(producer.getDatacenter()))
+        .findFirst();
+  }
+
+  private record RemoteSendCallback(
+      Message message,
+      CachedTopic cachedTopic,
+      String datacenter,
+      PublishingCallback callback,
+      SendWithFallbackExecutionContext state)
+      implements Callback {
+
+    @Override
+    public void onCompletion(RecordMetadata metadata, Exception exception) {
+      if (exception == null) {
+        callback.onEachPublished(message, cachedTopic.getTopic(), datacenter);
+        if (state.tryTransitionToFirstSent()) {
+          callback.onPublished(message, cachedTopic.getTopic());
+        } else {
+          cachedTopic.markMessageDuplicated();
+        }
+      } else {
+        if (state.tryTransitionToUnpublished(datacenter, exception)) {
+          callback.onUnpublished(
+              message, cachedTopic.getTopic(), new MultiDCPublishException(state.errors));
+        }
+      }
+    }
+  }
+
+  private class FallbackAwareLocalSendCallback implements Callback {
+
+    private final Message message;
+    private final CachedTopic cachedTopic;
+    private final String datacenter;
+    private final PublishingCallback callback;
+    private final FallbackRunnable fallback;
+    private final Future<?> speculativeFallback;
+    private final SendWithFallbackExecutionContext state;
+
+    private FallbackAwareLocalSendCallback(
+        Message message,
+        CachedTopic cachedTopic,
+        String datacenter,
+        SendWithFallbackExecutionContext state,
+        PublishingCallback callback,
+        FallbackRunnable fallback,
+        Future<?> speculativeFallback) {
+      this.message = message;
+      this.cachedTopic = cachedTopic;
+      this.datacenter = datacenter;
+      this.callback = callback;
+      this.fallback = fallback;
+      this.speculativeFallback = speculativeFallback;
+      this.state = state;
+    }
+
+    @Override
+    public void onCompletion(RecordMetadata metadata, Exception exception) {
+      if (exception == null) {
+        cancelSpeculativeFallback();
+        callback.onEachPublished(message, cachedTopic.getTopic(), datacenter);
+        if (state.tryTransitionToFirstSent()) {
+          callback.onPublished(message, cachedTopic.getTopic());
+        } else {
+          cachedTopic.markMessageDuplicated();
+        }
+      } else {
+        if (state.tryTransitionToUnpublished(datacenter, exception)) {
+          callback.onUnpublished(
+              message, cachedTopic.getTopic(), new MultiDCPublishException(state.errors));
+        } else {
+          fallback();
+        }
+      }
+    }
+
+    private void fallback() {
+      try {
+        speculativeFallback.cancel(false);
+        fallbackScheduler.execute(fallback);
+      } catch (RejectedExecutionException rejectedExecutionException) {
+        logger.warn(
+            "Failed to run immediate fallback for message: {}, topic: {}",
+            message,
+            cachedTopic.getQualifiedName(),
+            rejectedExecutionException);
+      }
+    }
+
+    private void cancelSpeculativeFallback() {
+      speculativeFallback.cancel(false);
+    }
+  }
+
+  private record LocalSendCallback(
+      Message message, CachedTopic cachedTopic, String datacenter, PublishingCallback callback)
+      implements Callback {
+
+    @Override
+    public void onCompletion(RecordMetadata metadata, Exception exception) {
+      if (exception != null) {
+        callback.onUnpublished(message, cachedTopic.getTopic(), exception);
+      } else {
+        callback.onEachPublished(message, cachedTopic.getTopic(), datacenter);
+        callback.onPublished(message, cachedTopic.getTopic());
+      }
+    }
+  }
+
+  private class FallbackRunnable implements Runnable {
+    private final KafkaMessageSender<byte[], byte[]> remoteSender;
+    private final ProducerRecord<byte[], byte[]> producerRecord;
+    private final CachedTopic cachedTopic;
+    private final Message message;
+    private final ChaosExperiment experiment;
+    private final PublishingCallback callback;
+    private final SendWithFallbackExecutionContext context;
+
+    public FallbackRunnable(
+        KafkaMessageSender<byte[], byte[]> remoteSender,
+        ProducerRecord<byte[], byte[]> producerRecord,
+        CachedTopic cachedTopic,
+        Message message,
+        ChaosExperiment experiment,
+        PublishingCallback callback,
+        SendWithFallbackExecutionContext context) {
+      this.remoteSender = remoteSender;
+      this.producerRecord = producerRecord;
+      this.cachedTopic = cachedTopic;
+      this.message = message;
+      this.experiment = experiment;
+      this.callback = callback;
+      this.context = context;
+    }
+
+    public void run() {
+      if (context.tryTransitionToFallback()) {
+        remoteSender.send(
+            producerRecord,
+            cachedTopic,
+            message,
+            new RemoteSendCallback(
+                message, cachedTopic, remoteSender.getDatacenter(), callback, context),
+            experiment);
+      }
+    }
+  }
+
+  public static class MultiDCPublishException extends RuntimeException {
+
+    public MultiDCPublishException(Map<String, Exception> exceptionsPerDC) {
+      super(errorMessage(exceptionsPerDC));
+    }
+
+    private static String errorMessage(Map<String, Exception> exceptionsPerDC) {
+      StringBuilder builder = new StringBuilder();
+      exceptionsPerDC.forEach(
+          (dc, exception) ->
+              builder.append(String.format("[%s]: %s, ", dc, getRootCauseMessage(exception))));
+      return builder.toString();
+    }
+  }
+
+  @Override
+  public boolean areAllTopicsAvailable() {
+    return kafkaMessageSenders.areAllTopicsAvailable();
+  }
+
+  @Override
+  public boolean isTopicAvailable(CachedTopic topic) {
+    return kafkaMessageSenders.isTopicAvailable(topic);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ProducerBrokerNodeReader.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ProducerBrokerNodeReader.java
index e7bbc994c5..a0d3ffa8ff 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ProducerBrokerNodeReader.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ProducerBrokerNodeReader.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.frontend.producer.kafka;
 
+import static java.util.Collections.singletonList;
+
+import java.lang.reflect.Field;
+import java.util.List;
 import org.apache.kafka.clients.Metadata;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.Producer;
@@ -7,26 +11,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.Field;
-import java.util.List;
-
-import static java.util.Collections.singletonList;
-
 public class ProducerBrokerNodeReader {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProducerBrokerNodeReader.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(ProducerBrokerNodeReader.class);
 
-    public static List<Node> read(Producer<?, ?> producer) {
-        if (producer instanceof KafkaProducer) {
-            KafkaProducer<?, ?> kafkaProducer = (KafkaProducer<?, ?>) producer;
-            try {
-                Field field = KafkaProducer.class.getDeclaredField("metadata");
-                field.setAccessible(true);
-                Metadata metadata = (Metadata) field.get(kafkaProducer);
-                return metadata.fetch().nodes();
-            } catch (Exception e) {
-                LOGGER.error("Could not read broker node list from producer.", e);
-            }
-        }
-        return singletonList(new Node(0, "none", 0));
+  public static List<Node> read(Producer<?, ?> producer) {
+    if (producer instanceof KafkaProducer) {
+      KafkaProducer<?, ?> kafkaProducer = (KafkaProducer<?, ?>) producer;
+      try {
+        Field field = KafkaProducer.class.getDeclaredField("metadata");
+        field.setAccessible(true);
+        Metadata metadata = (Metadata) field.get(kafkaProducer);
+        return metadata.fetch().nodes();
+      } catch (Exception e) {
+        LOGGER.error("Could not read broker node list from producer.", e);
+      }
     }
+    return singletonList(new Node(0, "none", 0));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ProducerMetadataLoadingJob.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ProducerMetadataLoadingJob.java
new file mode 100644
index 0000000000..3e9d45722c
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/ProducerMetadataLoadingJob.java
@@ -0,0 +1,67 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * The purpose of this job is to periodically refresh the cache in {@link
+ * org.apache.kafka.clients.producer.KafkaProducer} that stores topic metadata. This is especially
+ * important to avoid a cold start, i.e. when a new hermes-frontend instance is launched with the
+ * cache being empty. Since the producer relies on topic metadata to send produce requests to Kafka,
+ * if the cache is empty, the producer must load the metadata before sending the produce request.
+ * Fetching the metadata might be costly, therefore we want to avoid passing on this cost to the
+ * Hermes client.
+ */
+public class ProducerMetadataLoadingJob implements Runnable {
+
+  private final List<KafkaMessageSenders> kafkaMessageSendersList;
+  private final ScheduledExecutorService executorService;
+  private final boolean enabled;
+  private final Duration interval;
+
+  private ScheduledFuture<?> job;
+
+  public ProducerMetadataLoadingJob(
+      List<KafkaMessageSenders> kafkaMessageSendersList, boolean enabled, Duration interval) {
+    this.kafkaMessageSendersList = kafkaMessageSendersList;
+    this.enabled = enabled;
+    this.interval = interval;
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat("TopicMetadataLoadingJob-%d").build();
+    this.executorService = Executors.newSingleThreadScheduledExecutor(threadFactory);
+  }
+
+  @Override
+  public void run() {
+    refreshTopicMetadata();
+  }
+
+  public void start() {
+    if (enabled) {
+      refreshTopicMetadata();
+      job =
+          executorService.scheduleAtFixedRate(
+              this, interval.toSeconds(), interval.toSeconds(), TimeUnit.SECONDS);
+    }
+  }
+
+  public void stop() throws InterruptedException {
+    if (enabled) {
+      job.cancel(false);
+      executorService.shutdown();
+      executorService.awaitTermination(1, TimeUnit.MINUTES);
+    }
+  }
+
+  private void refreshTopicMetadata() {
+    for (KafkaMessageSenders kafkaMessageSenders : kafkaMessageSendersList) {
+      kafkaMessageSenders.refreshTopicMetadata();
+    }
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/Producers.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/Producers.java
deleted file mode 100644
index 61c109eafc..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/Producers.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package pl.allegro.tech.hermes.frontend.producer.kafka;
-
-import org.apache.kafka.clients.producer.Producer;
-import org.apache.kafka.common.Metric;
-import org.apache.kafka.common.MetricName;
-import org.apache.kafka.common.Node;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Predicate;
-import java.util.function.ToDoubleFunction;
-
-// exposes kafka producer metrics, see: https://docs.confluent.io/platform/current/kafka/monitoring.html#producer-metrics
-public class Producers {
-    private final Producer<byte[], byte[]> ackLeader;
-    private final Producer<byte[], byte[]> ackAll;
-
-    private final boolean reportNodeMetrics;
-    private final AtomicBoolean nodeMetricsRegistered = new AtomicBoolean(false);
-
-    public Producers(Producer<byte[], byte[]> ackLeader,
-                     Producer<byte[], byte[]> ackAll,
-                     boolean reportNodeMetrics) {
-        this.ackLeader = ackLeader;
-        this.ackAll = ackAll;
-        this.reportNodeMetrics = reportNodeMetrics;
-    }
-
-    public Producer<byte[], byte[]> get(Topic topic) {
-        return topic.isReplicationConfirmRequired() ? ackAll : ackLeader;
-    }
-
-    public void registerGauges(MetricsFacade metricsFacade) {
-        MetricName bufferTotalBytes = producerMetric("buffer-total-bytes", "producer-metrics", "buffer total bytes");
-        metricsFacade.producer().registerAckAllTotalBytesGauge(ackAll, producerGauge(bufferTotalBytes));
-        metricsFacade.producer().registerAckLeaderTotalBytesGauge(ackLeader, producerGauge(bufferTotalBytes));
-
-        MetricName bufferAvailableBytes = producerMetric("buffer-available-bytes", "producer-metrics", "buffer available bytes");
-        metricsFacade.producer().registerAckAllAvailableBytesGauge(ackAll, producerGauge(bufferAvailableBytes));
-        metricsFacade.producer().registerAckLeaderAvailableBytesGauge(ackLeader, producerGauge(bufferAvailableBytes));
-
-        MetricName compressionRate = producerMetric("compression-rate-avg", "producer-metrics", "average compression rate");
-        metricsFacade.producer().registerAckAllCompressionRateGauge(ackAll, producerGauge(compressionRate));
-        metricsFacade.producer().registerAckLeaderCompressionRateGauge(ackLeader, producerGauge(compressionRate));
-
-        MetricName failedBatches = producerMetric("record-error-total", "producer-metrics", "failed publishing batches");
-        metricsFacade.producer().registerAckAllFailedBatchesGauge(ackAll, producerGauge(failedBatches));
-        metricsFacade.producer().registerAckLeaderFailedBatchesGauge(ackLeader, producerGauge(failedBatches));
-
-        MetricName metadataAge = producerMetric("metadata-age", "producer-metrics", "age [s] of metadata");
-        metricsFacade.producer().registerAckAllMetadataAgeGauge(ackAll, producerGauge(metadataAge));
-        metricsFacade.producer().registerAckLeaderMetadataAgeGauge(ackLeader, producerGauge(metadataAge));
-
-        MetricName queueTimeMax = producerMetric("record-queue-time-max", "producer-metrics",
-                "maximum time [ms] that batch spent in the send buffer");
-        metricsFacade.producer().registerAckAllRecordQueueTimeMaxGauge(ackAll, producerGauge(queueTimeMax));
-        metricsFacade.producer().registerAckLeaderRecordQueueTimeMaxGauge(ackLeader, producerGauge(queueTimeMax));
-    }
-
-    public void maybeRegisterNodeMetricsGauges(MetricsFacade metricsFacade) {
-        if (reportNodeMetrics && nodeMetricsRegistered.compareAndSet(false, true)) {
-            registerLatencyPerBrokerGauge(metricsFacade);
-        }
-    }
-
-    private void registerLatencyPerBrokerGauge(MetricsFacade metricsFacade) {
-        List<Node> brokers = ProducerBrokerNodeReader.read(ackLeader);
-        for (Node broker : brokers) {
-            metricsFacade.producer().registerAckAllMaxLatencyBrokerGauge(ackAll,
-                    producerLatencyGauge("request-latency-max", broker), broker.host());
-            metricsFacade.producer().registerAckLeaderMaxLatencyPerBrokerGauge(ackLeader,
-                    producerLatencyGauge("request-latency-max", broker), broker.host());
-            metricsFacade.producer().registerAckAllAvgLatencyPerBrokerGauge(ackAll,
-                    producerLatencyGauge("request-latency-avg", broker), broker.host());
-            metricsFacade.producer().registerAckLeaderAvgLatencyPerBrokerGauge(ackLeader,
-                    producerLatencyGauge("request-latency-avg", broker), broker.host());
-        }
-    }
-
-    private double findProducerMetric(Producer<byte[], byte[]> producer,
-                                      Predicate<Map.Entry<MetricName, ? extends Metric>> predicate) {
-        Optional<? extends Map.Entry<MetricName, ? extends Metric>> first =
-                producer.metrics().entrySet().stream().filter(predicate).findFirst();
-        double value = first.map(metricNameEntry -> metricNameEntry.getValue().value()).orElse(0.0);
-        return value < 0 ? 0.0 : value;
-    }
-
-    private ToDoubleFunction<Producer<byte[], byte[]>> producerLatencyGauge(String producerMetricName, Node node) {
-        Predicate<Map.Entry<MetricName, ? extends Metric>> predicate = entry -> entry.getKey().group().equals("producer-node-metrics")
-                && entry.getKey().name().equals(producerMetricName)
-                && entry.getKey().tags().containsValue("node-" + node.id());
-        return producer -> findProducerMetric(producer, predicate);
-    }
-
-    private ToDoubleFunction<Producer<byte[], byte[]>> producerGauge(MetricName producerMetricName) {
-        Predicate<Map.Entry<MetricName, ? extends Metric>> predicate = entry -> entry.getKey().group().equals(producerMetricName.group())
-                && entry.getKey().name().equals(producerMetricName.name());
-        return producer -> findProducerMetric(producer, predicate);
-    }
-
-    private static MetricName producerMetric(String name, String group, String description) {
-        return new MetricName(name, group, description, Collections.emptyMap());
-    }
-
-    public void close() {
-        ackAll.close();
-        ackLeader.close();
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoader.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoader.java
new file mode 100644
index 0000000000..506e65f0da
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoader.java
@@ -0,0 +1,29 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+
+interface TopicMetadataLoader {
+
+  MetadataLoadingResult load(CachedTopic cachedTopic);
+
+  record MetadataLoadingResult(Type type, TopicName topicName, String datacenter) {
+
+    static MetadataLoadingResult success(TopicName topicName, String datacenter) {
+      return new MetadataLoadingResult(Type.SUCCESS, topicName, datacenter);
+    }
+
+    static MetadataLoadingResult failure(TopicName topicName, String datacenter) {
+      return new MetadataLoadingResult(Type.FAILURE, topicName, datacenter);
+    }
+
+    boolean isFailure() {
+      return Type.FAILURE == type;
+    }
+  }
+
+  enum Type {
+    SUCCESS,
+    FAILURE
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoadingExecutor.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoadingExecutor.java
new file mode 100644
index 0000000000..a52e8564eb
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoadingExecutor.java
@@ -0,0 +1,124 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import static java.util.concurrent.CompletableFuture.completedFuture;
+import static pl.allegro.tech.hermes.frontend.producer.kafka.TopicMetadataLoader.MetadataLoadingResult;
+import static pl.allegro.tech.hermes.frontend.producer.kafka.TopicMetadataLoader.Type;
+import static pl.allegro.tech.hermes.frontend.utils.CompletableFuturesHelper.allComplete;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import net.jodah.failsafe.Failsafe;
+import net.jodah.failsafe.RetryPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+
+class TopicMetadataLoadingExecutor {
+
+  private static final Logger logger = LoggerFactory.getLogger(TopicMetadataLoadingExecutor.class);
+
+  private final ScheduledExecutorService scheduler;
+  private final RetryPolicy<MetadataLoadingResult> retryPolicy;
+  private final TopicsCache topicsCache;
+
+  TopicMetadataLoadingExecutor(
+      TopicsCache topicsCache, int retryCount, Duration retryInterval, int threadPoolSize) {
+    this.topicsCache = topicsCache;
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat("topic-metadata-loader-%d").build();
+    this.scheduler = Executors.newScheduledThreadPool(threadPoolSize, threadFactory);
+    this.retryPolicy =
+        new RetryPolicy<MetadataLoadingResult>()
+            .withMaxRetries(retryCount)
+            .withDelay(retryInterval)
+            .handleIf((resp, cause) -> resp.isFailure());
+  }
+
+  boolean execute(List<TopicMetadataLoader> loaders) {
+    try {
+      long start = System.currentTimeMillis();
+      logger.info("Loading topic metadata");
+      List<CachedTopic> topics = topicsCache.getTopics();
+      List<MetadataLoadingResult> allResults = loadMetadataForTopics(topics, loaders);
+      logger.info("Finished loading topic metadata in {}ms", System.currentTimeMillis() - start);
+      logResultInfo(allResults);
+      return allResults.stream().noneMatch(MetadataLoadingResult::isFailure);
+    } catch (Exception e) {
+      logger.error("An error occurred while refreshing topic metadata", e);
+      return false;
+    }
+  }
+
+  private List<MetadataLoadingResult> loadMetadataForTopics(
+      List<CachedTopic> topics, List<TopicMetadataLoader> loaders) {
+    List<CompletableFuture<MetadataLoadingResult>> completableFutures = new ArrayList<>();
+    for (CachedTopic topic : topics) {
+      for (TopicMetadataLoader loader : loaders) {
+        completableFutures.add(loadTopicMetadata(topic, loader));
+      }
+    }
+    return allComplete(completableFutures).join();
+  }
+
+  private CompletableFuture<MetadataLoadingResult> loadTopicMetadata(
+      CachedTopic topic, TopicMetadataLoader loader) {
+    return Failsafe.with(retryPolicy)
+        .with(scheduler)
+        .getStageAsync((context) -> completedFuture(loader.load(topic)));
+  }
+
+  private void logResultInfo(List<MetadataLoadingResult> allResults) {
+    Map<String, List<MetadataLoadingResult>> resultsPerDatacenter =
+        allResults.stream()
+            .collect(Collectors.groupingBy(MetadataLoadingResult::datacenter, Collectors.toList()));
+
+    for (Map.Entry<String, List<MetadataLoadingResult>> datacenterResults :
+        resultsPerDatacenter.entrySet()) {
+      Map<Type, List<MetadataLoadingResult>> groupedResults =
+          getGroupedResults(datacenterResults.getValue());
+      Optional<List<MetadataLoadingResult>> successes =
+          Optional.ofNullable(groupedResults.get(Type.SUCCESS));
+      Optional<List<MetadataLoadingResult>> failures =
+          Optional.ofNullable(groupedResults.get(Type.FAILURE));
+
+      logger.info(
+          "Results of loading topic metadata from datacenter {}: successfully loaded {} topics, failed for {} topics{}",
+          datacenterResults.getKey(),
+          successes.map(List::size).orElse(0),
+          failures.map(List::size).orElse(0),
+          failures
+              .map(results -> String.format("Failed topics: [%s].", topicsOfResults(results)))
+              .orElse(""));
+    }
+  }
+
+  private Map<Type, List<MetadataLoadingResult>> getGroupedResults(
+      List<MetadataLoadingResult> allResults) {
+    return allResults.stream()
+        .collect(Collectors.groupingBy(MetadataLoadingResult::type, Collectors.toList()));
+  }
+
+  private String topicsOfResults(List<MetadataLoadingResult> results) {
+    return results.stream()
+        .map(MetadataLoadingResult::topicName)
+        .map(TopicName::qualifiedName)
+        .collect(Collectors.joining(", "));
+  }
+
+  void close() throws Exception {
+    scheduler.shutdown();
+    scheduler.awaitTermination(1, TimeUnit.SECONDS);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/PublishingCallback.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/PublishingCallback.java
index 0742bea8f5..6af0ccff48 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/PublishingCallback.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/PublishingCallback.java
@@ -5,8 +5,19 @@
 
 public interface PublishingCallback {
 
-    void onUnpublished(Message message, Topic topic, Exception exception);
+  /** Invoked when publishing to the broker fails and the message won't be delivered. */
+  void onUnpublished(Message message, Topic topic, Exception exception);
 
-    void onPublished(Message message, Topic topic);
+  /** Invoked the first time the message is successfully published to the broker. */
+  void onPublished(Message message, Topic topic);
 
+  /**
+   * Invoked every time the message is successfully published to the broker. Could be invoked one or
+   * many times depending on the underlying implementation.
+   *
+   * @param message the delivered message
+   * @param topic the topic that the message was delivered to
+   * @param datacenter the datacenter that the messages was delivered to
+   */
+  void onEachPublished(Message message, Topic topic, String datacenter);
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/avro/AvroMessage.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/avro/AvroMessage.java
index a921259fb3..7bf5f9e4e9 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/avro/AvroMessage.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/avro/AvroMessage.java
@@ -1,64 +1,73 @@
 package pl.allegro.tech.hermes.frontend.publishing.avro;
 
+import java.util.Map;
+import java.util.Optional;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.util.Optional;
-
 public class AvroMessage implements Message {
 
-    private final String id;
-    private final byte[] data;
-    private final long timestamp;
-    private final CompiledSchema<Schema> schema;
-    private final String partitionKey;
+  private final String id;
+  private final byte[] data;
+  private final long timestamp;
+  private final CompiledSchema<Schema> schema;
+  private final String partitionKey;
+  private final Map<String, String> propagatedHTTPHeaders;
+
+  public AvroMessage(
+      String id,
+      byte[] data,
+      long timestamp,
+      CompiledSchema<Schema> schema,
+      String partitionKey,
+      Map<String, String> propagatedHTTPHeaders) {
+    this.id = id;
+    this.data = data;
+    this.timestamp = timestamp;
+    this.schema = schema;
+    this.partitionKey = partitionKey;
+    this.propagatedHTTPHeaders = propagatedHTTPHeaders;
+  }
 
-    public AvroMessage(String id,
-                       byte[] data,
-                       long timestamp,
-                       CompiledSchema<Schema> schema,
-                       String partitionKey) {
-        this.id = id;
-        this.data = data;
-        this.timestamp = timestamp;
-        this.schema = schema;
-        this.partitionKey = partitionKey;
-    }
+  @Override
+  public String getId() {
+    return id;
+  }
 
-    @Override
-    public String getId() {
-        return id;
-    }
+  @Override
+  public byte[] getData() {
+    return data;
+  }
 
-    @Override
-    public byte[] getData() {
-        return data;
-    }
+  @Override
+  public long getTimestamp() {
+    return timestamp;
+  }
 
-    @Override
-    public long getTimestamp() {
-        return timestamp;
-    }
+  @Override
+  public ContentType getContentType() {
+    return ContentType.AVRO;
+  }
 
-    @Override
-    public ContentType getContentType() {
-        return ContentType.AVRO;
-    }
+  @Override
+  public String getPartitionKey() {
+    return partitionKey;
+  }
 
-    @Override
-    public String getPartitionKey() {
-        return partitionKey;
-    }
+  @SuppressWarnings("unchecked")
+  @Override
+  public <T> Optional<CompiledSchema<T>> getCompiledSchema() {
+    return Optional.of((CompiledSchema<T>) schema);
+  }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> Optional<CompiledSchema<T>> getCompiledSchema() {
-        return Optional.of((CompiledSchema<T>) schema);
-    }
+  @Override
+  public Map<String, String> getHTTPHeaders() {
+    return propagatedHTTPHeaders;
+  }
 
-    public AvroMessage withDataReplaced(byte[] newData) {
-        return new AvroMessage(id, newData, timestamp, schema, partitionKey);
-    }
+  public AvroMessage withDataReplaced(byte[] newData) {
+    return new AvroMessage(id, newData, timestamp, schema, partitionKey, propagatedHTTPHeaders);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/AttachmentContent.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/AttachmentContent.java
index d3af2f8fa7..84ce8240ba 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/AttachmentContent.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/AttachmentContent.java
@@ -8,71 +8,72 @@
 
 public class AttachmentContent {
 
-    public static final AttachmentKey<AttachmentContent> KEY = AttachmentKey.create(AttachmentContent.class);
-
-    private final CachedTopic cachedTopic;
-    private final MessageState messageState;
-    private final String messageId;
-    private byte[] messageContent;
-    private volatile TimeoutHolder timeoutHolder;
-    private volatile Message message;
-    private volatile boolean responseReady;
-
-    public Message getMessage() {
-        return message;
-    }
-
-    AttachmentContent(CachedTopic cachedTopic, MessageState messageState, String messageId) {
-        this.cachedTopic = cachedTopic;
-        this.messageState = messageState;
-        this.messageId = messageId;
-    }
-
-    public MessageState getMessageState() {
-        return messageState;
-    }
-
-    public TimeoutHolder getTimeoutHolder() {
-        return timeoutHolder;
-    }
-
-    public void removeTimeout() {
-        timeoutHolder.remove();
-    }
-
-    public void setTimeoutHolder(TimeoutHolder timeoutHolder) {
-        this.timeoutHolder = timeoutHolder;
-    }
-
-    public Topic getTopic() {
-        return cachedTopic.getTopic();
-    }
-
-    public CachedTopic getCachedTopic() {
-        return cachedTopic;
-    }
-
-    public void setMessageContent(byte[] messageContent) {
-        this.messageContent = messageContent;
-    }
-
-    public String getMessageId() {
-        return messageId;
-    }
-
-    public byte[] getMessageContent() {
-        return messageContent;
-    }
-
-    public void setMessage(Message message) {
-        this.message = message;
-    }
-
-    public boolean isResponseReady() {
-        return responseReady;
-    }
-
-    public void markResponseAsReady() {
-        responseReady = true;
-    }
+  public static final AttachmentKey<AttachmentContent> KEY =
+      AttachmentKey.create(AttachmentContent.class);
+
+  private final CachedTopic cachedTopic;
+  private final MessageState messageState;
+  private final String messageId;
+  private byte[] messageContent;
+  private volatile TimeoutHolder timeoutHolder;
+  private volatile Message message;
+  private volatile boolean responseReady;
+
+  public Message getMessage() {
+    return message;
+  }
+
+  AttachmentContent(CachedTopic cachedTopic, MessageState messageState, String messageId) {
+    this.cachedTopic = cachedTopic;
+    this.messageState = messageState;
+    this.messageId = messageId;
+  }
+
+  public MessageState getMessageState() {
+    return messageState;
+  }
+
+  public TimeoutHolder getTimeoutHolder() {
+    return timeoutHolder;
+  }
+
+  public void removeTimeout() {
+    timeoutHolder.remove();
+  }
+
+  public void setTimeoutHolder(TimeoutHolder timeoutHolder) {
+    this.timeoutHolder = timeoutHolder;
+  }
+
+  public Topic getTopic() {
+    return cachedTopic.getTopic();
+  }
+
+  public CachedTopic getCachedTopic() {
+    return cachedTopic;
+  }
+
+  public void setMessageContent(byte[] messageContent) {
+    this.messageContent = messageContent;
+  }
+
+  public String getMessageId() {
+    return messageId;
+  }
+
+  public byte[] getMessageContent() {
+    return messageContent;
+  }
+
+  public void setMessage(Message message) {
+    this.message = message;
+  }
+
+  public boolean isResponseReady() {
+    return responseReady;
+  }
+
+  public void markResponseAsReady() {
+    responseReady = true;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ContentLengthChecker.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ContentLengthChecker.java
index 4881fa0abe..805349fc39 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ContentLengthChecker.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ContentLengthChecker.java
@@ -1,58 +1,65 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
+import static java.lang.String.format;
+
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.HeaderMap;
 import io.undertow.util.HeaderValues;
 import io.undertow.util.Headers;
+import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-
-import static java.lang.String.format;
-
 final class ContentLengthChecker {
-    private static final Logger logger = LoggerFactory.getLogger(ContentLengthChecker.class);
+  private static final Logger logger = LoggerFactory.getLogger(ContentLengthChecker.class);
 
-    private final boolean forceMaxMessageSizePerTopic;
+  private final boolean forceMaxMessageSizePerTopic;
 
-    ContentLengthChecker(boolean forceMaxMessageSizePerTopic) {
-        this.forceMaxMessageSizePerTopic = forceMaxMessageSizePerTopic;
-    }
+  ContentLengthChecker(boolean forceMaxMessageSizePerTopic) {
+    this.forceMaxMessageSizePerTopic = forceMaxMessageSizePerTopic;
+  }
 
-    void check(HttpServerExchange exchange, int contentLength, AttachmentContent attachment)
-            throws InvalidContentLengthException, ContentTooLargeException {
-
-        int max = attachment.getCachedTopic().getTopic().getMaxMessageSize();
-        long expected = exchange.getRequestContentLength();
-        if (expected != contentLength && !isChunked(exchange.getRequestHeaders(), expected)) {
-            throw new InvalidContentLengthException(expected, contentLength);
-        } else if (contentLength > max) {
-            if (forceMaxMessageSizePerTopic) {
-                throw new ContentTooLargeException(contentLength, max);
-            } else {
-                logger.warn("Content-Length is larger than max on this topic [length:{}, max:{}, topic: {}]",
-                                           contentLength, max, attachment.getCachedTopic().getQualifiedName());
-            }
-        }
-    }
+  void check(HttpServerExchange exchange, int contentLength, AttachmentContent attachment)
+      throws InvalidContentLengthException, ContentTooLargeException {
 
-    private static boolean isChunked(HeaderMap headerMap, long requestContentLength) {
-        HeaderValues headerValue = headerMap.get(Headers.TRANSFER_ENCODING);
-        return headerValue != null && ("chunked".equals(headerValue.getFirst()) && requestContentLength < 0);
+    int max = attachment.getCachedTopic().getTopic().getMaxMessageSize();
+    long expected = exchange.getRequestContentLength();
+    if (expected != contentLength && !isChunked(exchange.getRequestHeaders(), expected)) {
+      throw new InvalidContentLengthException(expected, contentLength);
+    } else if (contentLength > max) {
+      if (forceMaxMessageSizePerTopic) {
+        throw new ContentTooLargeException(contentLength, max);
+      } else {
+        logger.warn(
+            "Content-Length is larger than max on this topic [length:{}, max:{}, topic: {}]",
+            contentLength,
+            max,
+            attachment.getCachedTopic().getQualifiedName());
+      }
     }
+  }
+
+  private static boolean isChunked(HeaderMap headerMap, long requestContentLength) {
+    HeaderValues headerValue = headerMap.get(Headers.TRANSFER_ENCODING);
+    return headerValue != null
+        && ("chunked".equals(headerValue.getFirst()) && requestContentLength < 0);
+  }
 
-    public static final class InvalidContentLengthException extends IOException {
-        InvalidContentLengthException(long expected, int contentLength) {
-            super(format("Content-Length does not match the header [header:%s, actual:%s].",
-                    expected, contentLength));
-        }
+  public static final class InvalidContentLengthException extends IOException {
+    InvalidContentLengthException(long expected, int contentLength) {
+      super(
+          format(
+              "Content-Length does not match the header [header:%s, actual:%s].",
+              expected, contentLength));
     }
+  }
 
-    public static final class ContentTooLargeException extends IOException {
-        ContentTooLargeException(long contentLength, int max) {
-            super(format("Content-Length is larger than max on this topic [length:%s, max:%s].",
-                    contentLength, max));
-        }
+  public static final class ContentTooLargeException extends IOException {
+    ContentTooLargeException(long contentLength, int max) {
+      super(
+          format(
+              "Content-Length is larger than max on this topic [length:%s, max:%s].",
+              contentLength, max));
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/DynamicThroughputLimiter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/DynamicThroughputLimiter.java
index 4473165696..ab3a266e58 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/DynamicThroughputLimiter.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/DynamicThroughputLimiter.java
@@ -1,99 +1,101 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.metrics.HermesRateMeter;
+import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.globalQuotaViolation;
+import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaConfirmed;
+import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaViolation;
 
 import java.time.Duration;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-
-import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.globalQuotaViolation;
-import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaConfirmed;
-import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaViolation;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.metrics.HermesRateMeter;
 
 public class DynamicThroughputLimiter implements ThroughputLimiter, Runnable {
-    private final long max;
-    private final long threshold;
-    private final long desired;
-    private final double idleThreshold;
-    private final HermesRateMeter globalThroughputMeter;
+  private final long max;
+  private final long threshold;
+  private final long desired;
+  private final double idleThreshold;
+  private final HermesRateMeter globalThroughputMeter;
 
-    private final ScheduledExecutorService executor;
-    private final Duration checkInterval;
+  private final ScheduledExecutorService executor;
+  private final Duration checkInterval;
 
-    private final ConcurrentHashMap<TopicName, Throughput> users = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<TopicName, Throughput> users = new ConcurrentHashMap<>();
 
-    public DynamicThroughputLimiter(long max,
-                                    long threshold,
-                                    long desired,
-                                    double idleThreshold,
-                                    Duration checkInterval,
-                                    HermesRateMeter globalThroughput,
-                                    ScheduledExecutorService executor) {
-        this.max = max;
-        this.threshold = threshold;
-        this.desired = desired;
-        this.idleThreshold = idleThreshold;
-        this.globalThroughputMeter = globalThroughput;
-        this.checkInterval = checkInterval;
-        this.executor = executor;
-    }
+  public DynamicThroughputLimiter(
+      long max,
+      long threshold,
+      long desired,
+      double idleThreshold,
+      Duration checkInterval,
+      HermesRateMeter globalThroughput,
+      ScheduledExecutorService executor) {
+    this.max = max;
+    this.threshold = threshold;
+    this.desired = desired;
+    this.idleThreshold = idleThreshold;
+    this.globalThroughputMeter = globalThroughput;
+    this.checkInterval = checkInterval;
+    this.executor = executor;
+  }
 
-    @Override
-    public QuotaInsight checkQuota(TopicName topic, HermesRateMeter rate) {
-        Throughput throughput = users.computeIfAbsent(topic, name -> new Throughput(rate, max));
-        long value = throughput.getRoundedOneMinuteRate();
-        if (value > throughput.max) {
-            return quotaViolation(value, throughput.max);
-        } else if (globalThroughputMeter.getOneMinuteRate() > max) {
-            return globalQuotaViolation();
-        } else {
-            return quotaConfirmed();
-        }
+  @Override
+  public QuotaInsight checkQuota(TopicName topic, HermesRateMeter rate) {
+    Throughput throughput = users.computeIfAbsent(topic, name -> new Throughput(rate, max));
+    long value = throughput.getRoundedOneMinuteRate();
+    if (value > throughput.max) {
+      return quotaViolation(value, throughput.max);
+    } else if (globalThroughputMeter.getOneMinuteRate() > max) {
+      return globalQuotaViolation();
+    } else {
+      return quotaConfirmed();
     }
+  }
 
-    @Override
-    public void start() {
-        executor.scheduleAtFixedRate(this, checkInterval.toSeconds(), checkInterval.toSeconds(), TimeUnit.SECONDS);
-    }
+  @Override
+  public void start() {
+    executor.scheduleAtFixedRate(
+        this, checkInterval.toSeconds(), checkInterval.toSeconds(), TimeUnit.SECONDS);
+  }
 
-    @Override
-    public void run() {
-        if (globalThroughputMeter.getOneMinuteRate() > threshold) {
-            calibrateLimits();
-        }
+  @Override
+  public void run() {
+    if (globalThroughputMeter.getOneMinuteRate() > threshold) {
+      calibrateLimits();
     }
+  }
 
-    private void calibrateLimits() {
-        users.entrySet().removeIf(entry -> entry.getValue().getOneMinuteRate() <= idleThreshold);
-        int userCount = users.size();
-        if (userCount > 0) {
-            long total = users.reduceValuesToLong(Long.MAX_VALUE, Throughput::getRoundedOneMinuteRate, 0, (Long::sum));
-            long mean = total / userCount;
-            long desiredMean = desired / userCount;
-            users.entrySet()
-                    .stream()
-                    .filter(entry -> entry.getValue().getRoundedOneMinuteRate() >= mean)
-                    .forEach(entry -> entry.getValue().max = desiredMean);
-        }
+  private void calibrateLimits() {
+    users.entrySet().removeIf(entry -> entry.getValue().getOneMinuteRate() <= idleThreshold);
+    int userCount = users.size();
+    if (userCount > 0) {
+      long total =
+          users.reduceValuesToLong(
+              Long.MAX_VALUE, Throughput::getRoundedOneMinuteRate, 0, (Long::sum));
+      long mean = total / userCount;
+      long desiredMean = desired / userCount;
+      users.entrySet().stream()
+          .filter(entry -> entry.getValue().getRoundedOneMinuteRate() >= mean)
+          .forEach(entry -> entry.getValue().max = desiredMean);
     }
+  }
 
-    private static class Throughput {
-        HermesRateMeter current;
-        volatile long max;
+  private static class Throughput {
+    HermesRateMeter current;
+    volatile long max;
 
-        Throughput(HermesRateMeter current, long max) {
-            this.current = current;
-            this.max = max;
-        }
+    Throughput(HermesRateMeter current, long max) {
+      this.current = current;
+      this.max = max;
+    }
 
-        long getRoundedOneMinuteRate() {
-            return (long) Math.floor(current.getOneMinuteRate());
-        }
+    long getRoundedOneMinuteRate() {
+      return (long) Math.floor(current.getOneMinuteRate());
+    }
 
-        double getOneMinuteRate() {
-            return current.getOneMinuteRate();
-        }
+    double getOneMinuteRate() {
+      return current.getOneMinuteRate();
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ExchangeMetrics.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ExchangeMetrics.java
index 11bd41b2e3..f3e7578fb4 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ExchangeMetrics.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ExchangeMetrics.java
@@ -9,26 +9,27 @@
 
 class ExchangeMetrics implements ExchangeCompletionListener {
 
-    private static final Logger logger = LoggerFactory.getLogger(ExchangeMetrics.class);
+  private static final Logger logger = LoggerFactory.getLogger(ExchangeMetrics.class);
 
-    private final StartedTimersPair producerLatencyTimers;
-    private final CachedTopic cachedTopic;
+  private final StartedTimersPair producerLatencyTimers;
+  private final CachedTopic cachedTopic;
 
-    ExchangeMetrics(CachedTopic cachedTopic) {
-        this.cachedTopic = cachedTopic;
-        producerLatencyTimers = cachedTopic.startProducerLatencyTimers();
-    }
+  ExchangeMetrics(CachedTopic cachedTopic) {
+    this.cachedTopic = cachedTopic;
+    producerLatencyTimers = cachedTopic.startProducerLatencyTimers();
+  }
 
-    @Override
-    public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener) {
-        try {
-            cachedTopic.markRequestMeter();
-            cachedTopic.markStatusCodeMeter(exchange.getStatusCode());
-            producerLatencyTimers.close();
-        } catch (RuntimeException e) {
-            logger.error("Exception while invoking metrics for topic {}", cachedTopic.getQualifiedName(), e);
-        } finally {
-            nextListener.proceed();
-        }
+  @Override
+  public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener) {
+    try {
+      cachedTopic.markRequestMeter();
+      cachedTopic.markStatusCodeMeter(exchange.getStatusCode());
+      producerLatencyTimers.close();
+    } catch (RuntimeException e) {
+      logger.error(
+          "Exception while invoking metrics for topic {}", cachedTopic.getQualifiedName(), e);
+    } finally {
+      nextListener.proceed();
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/FixedThroughputLimiter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/FixedThroughputLimiter.java
index 7d210959d4..0acedfea5b 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/FixedThroughputLimiter.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/FixedThroughputLimiter.java
@@ -1,22 +1,21 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.metrics.HermesRateMeter;
-
 import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaConfirmed;
 import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaViolation;
 
-public class FixedThroughputLimiter implements ThroughputLimiter {
-    private final long limit;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.metrics.HermesRateMeter;
 
-    public FixedThroughputLimiter(long limit) {
-        this.limit = limit;
-    }
+public class FixedThroughputLimiter implements ThroughputLimiter {
+  private final long limit;
 
-    @Override
-    public QuotaInsight checkQuota(TopicName topic, HermesRateMeter throughput) {
-        long rate = (long) Math.floor(throughput.getOneMinuteRate());
-        return rate > limit ? quotaViolation(rate, limit) : quotaConfirmed();
-    }
+  public FixedThroughputLimiter(long limit) {
+    this.limit = limit;
+  }
 
+  @Override
+  public QuotaInsight checkQuota(TopicName topic, HermesRateMeter throughput) {
+    long rate = (long) Math.floor(throughput.getOneMinuteRate());
+    return rate > limit ? quotaViolation(rate, limit) : quotaConfirmed();
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/HandlersChainFactory.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/HandlersChainFactory.java
index 3818ce95b4..d78e37304f 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/HandlersChainFactory.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/HandlersChainFactory.java
@@ -5,6 +5,7 @@
 import io.undertow.security.handlers.AuthenticationMechanismsHandler;
 import io.undertow.security.handlers.SecurityInitialHandler;
 import io.undertow.server.HttpHandler;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
@@ -16,87 +17,105 @@
 import pl.allegro.tech.hermes.frontend.server.auth.AuthenticationConfiguration;
 import pl.allegro.tech.hermes.frontend.server.auth.AuthenticationPredicateAwareConstraintHandler;
 
-import java.util.Optional;
-
 public class HandlersChainFactory {
 
-    private static final Logger logger = LoggerFactory.getLogger(HandlersChainFactory.class);
+  private static final Logger logger = LoggerFactory.getLogger(HandlersChainFactory.class);
 
-    private final TopicsCache topicsCache;
-    private final MessageErrorProcessor messageErrorProcessor;
-    private final MessageEndProcessor messageEndProcessor;
-    private final MessageFactory messageFactory;
-    private final BrokerMessageProducer brokerMessageProducer;
-    private final MessagePreviewLog previewLog;
-    private final boolean previewEnabled;
-    private final ThroughputLimiter throughputLimiter;
-    private final Optional<AuthenticationConfiguration> authenticationConfiguration;
-    private final HandlersChainParameters handlersChainParameters;
+  private final TopicsCache topicsCache;
+  private final MessageErrorProcessor messageErrorProcessor;
+  private final MessageEndProcessor messageEndProcessor;
+  private final MessageFactory messageFactory;
+  private final BrokerMessageProducer brokerMessageProducer;
+  private final MessagePreviewLog previewLog;
+  private final boolean previewEnabled;
+  private final ThroughputLimiter throughputLimiter;
+  private final Optional<AuthenticationConfiguration> authenticationConfiguration;
+  private final HandlersChainParameters handlersChainParameters;
 
-    public HandlersChainFactory(TopicsCache topicsCache, MessageErrorProcessor messageErrorProcessor,
-                                MessageEndProcessor messageEndProcessor, MessageFactory messageFactory,
-                                BrokerMessageProducer brokerMessageProducer, MessagePreviewLog messagePreviewLog,
-                                ThroughputLimiter throughputLimiter, Optional<AuthenticationConfiguration> authenticationConfiguration,
-                                boolean messagePreviewEnabled, HandlersChainParameters handlersChainParameters) {
-        this.topicsCache = topicsCache;
-        this.messageErrorProcessor = messageErrorProcessor;
-        this.messageEndProcessor = messageEndProcessor;
-        this.messageFactory = messageFactory;
-        this.brokerMessageProducer = brokerMessageProducer;
-        this.previewLog = messagePreviewLog;
-        this.previewEnabled = messagePreviewEnabled;
-        this.throughputLimiter = throughputLimiter;
-        this.authenticationConfiguration = authenticationConfiguration;
-        this.handlersChainParameters = handlersChainParameters;
-    }
+  public HandlersChainFactory(
+      TopicsCache topicsCache,
+      MessageErrorProcessor messageErrorProcessor,
+      MessageEndProcessor messageEndProcessor,
+      MessageFactory messageFactory,
+      BrokerMessageProducer brokerMessageProducer,
+      MessagePreviewLog messagePreviewLog,
+      ThroughputLimiter throughputLimiter,
+      Optional<AuthenticationConfiguration> authenticationConfiguration,
+      boolean messagePreviewEnabled,
+      HandlersChainParameters handlersChainParameters) {
+    this.topicsCache = topicsCache;
+    this.messageErrorProcessor = messageErrorProcessor;
+    this.messageEndProcessor = messageEndProcessor;
+    this.messageFactory = messageFactory;
+    this.brokerMessageProducer = brokerMessageProducer;
+    this.previewLog = messagePreviewLog;
+    this.previewEnabled = messagePreviewEnabled;
+    this.throughputLimiter = throughputLimiter;
+    this.authenticationConfiguration = authenticationConfiguration;
+    this.handlersChainParameters = handlersChainParameters;
+  }
 
-    public HttpHandler provide() {
-        HttpHandler publishing = new PublishingHandler(brokerMessageProducer, messageErrorProcessor, messageEndProcessor);
-        HttpHandler messageCreateHandler = new MessageCreateHandler(publishing, messageFactory, messageErrorProcessor);
-        HttpHandler timeoutHandler = new TimeoutHandler(messageEndProcessor, messageErrorProcessor);
-        HttpHandler handlerAfterRead = previewEnabled ? new PreviewHandler(messageCreateHandler, previewLog) : messageCreateHandler;
-        HttpHandler readHandler = new MessageReadHandler(
-                handlerAfterRead,
-                timeoutHandler,
-                messageErrorProcessor,
-                throughputLimiter,
-                handlersChainParameters.isForceTopicMaxMessageSize(),
-                handlersChainParameters.getIdleTimeout(),
-                handlersChainParameters.getLongIdleTimeout());
-        TopicHandler topicHandler = new TopicHandler(readHandler, topicsCache, messageErrorProcessor);
-        boolean keepAliveHeaderEnabled = handlersChainParameters.isKeepAliveHeaderEnabled();
-        HttpHandler rootPublishingHandler = keepAliveHeaderEnabled ? withKeepAliveHeaderHandler(topicHandler) : topicHandler;
+  public HttpHandler provide() {
+    HttpHandler publishing =
+        new PublishingHandler(brokerMessageProducer, messageErrorProcessor, messageEndProcessor);
+    HttpHandler messageCreateHandler =
+        new MessageCreateHandler(publishing, messageFactory, messageErrorProcessor);
+    HttpHandler timeoutHandler = new TimeoutHandler(messageEndProcessor, messageErrorProcessor);
+    HttpHandler handlerAfterRead =
+        previewEnabled
+            ? new PreviewHandler(messageCreateHandler, previewLog)
+            : messageCreateHandler;
+    HttpHandler readHandler =
+        new MessageReadHandler(
+            handlerAfterRead,
+            timeoutHandler,
+            messageErrorProcessor,
+            throughputLimiter,
+            handlersChainParameters.isForceTopicMaxMessageSize(),
+            handlersChainParameters.getIdleTimeout(),
+            handlersChainParameters.getLongIdleTimeout(),
+            handlersChainParameters.getMaxPublishRequestDuration());
+    TopicHandler topicHandler = new TopicHandler(readHandler, topicsCache, messageErrorProcessor);
+    boolean keepAliveHeaderEnabled = handlersChainParameters.isKeepAliveHeaderEnabled();
+    HttpHandler rootPublishingHandler =
+        keepAliveHeaderEnabled ? withKeepAliveHeaderHandler(topicHandler) : topicHandler;
 
-        boolean authenticationEnabled = handlersChainParameters.isAuthenticationEnabled();
-        return authenticationEnabled ? withAuthenticationHandlersChain(rootPublishingHandler) : rootPublishingHandler;
-    }
+    boolean authenticationEnabled = handlersChainParameters.isAuthenticationEnabled();
+    return authenticationEnabled
+        ? withAuthenticationHandlersChain(rootPublishingHandler)
+        : rootPublishingHandler;
+  }
 
-    private HttpHandler withKeepAliveHeaderHandler(HttpHandler next) {
-        return new KeepAliveHeaderHandler(next, (int) handlersChainParameters.getKeepAliveHeaderTimeout().toSeconds());
-    }
+  private HttpHandler withKeepAliveHeaderHandler(HttpHandler next) {
+    return new KeepAliveHeaderHandler(
+        next, (int) handlersChainParameters.getKeepAliveHeaderTimeout().toSeconds());
+  }
 
-    private HttpHandler withAuthenticationHandlersChain(HttpHandler next) {
-        AuthenticationConfiguration authConfig = authenticationConfiguration
-                .orElseThrow(() -> new IllegalStateException("AuthenticationConfiguration was not provided"));
-        try {
-            return createAuthenticationHandlersChain(next, authConfig);
-        } catch (Exception e) {
-            logger.error("Could not create authentication handlers chain", e);
-            throw e;
-        }
+  private HttpHandler withAuthenticationHandlersChain(HttpHandler next) {
+    AuthenticationConfiguration authConfig =
+        authenticationConfiguration.orElseThrow(
+            () -> new IllegalStateException("AuthenticationConfiguration was not provided"));
+    try {
+      return createAuthenticationHandlersChain(next, authConfig);
+    } catch (Exception e) {
+      logger.error("Could not create authentication handlers chain", e);
+      throw e;
     }
+  }
 
-    private HttpHandler createAuthenticationHandlersChain(HttpHandler next, AuthenticationConfiguration authConfig) {
-        HttpHandler authenticationCallHandler = new AuthenticationCallHandler(next);
-        HttpHandler constraintHandler = new AuthenticationPredicateAwareConstraintHandler(
-                authenticationCallHandler, authConfig.getIsAuthenticationRequiredPredicate());
+  private HttpHandler createAuthenticationHandlersChain(
+      HttpHandler next, AuthenticationConfiguration authConfig) {
+    HttpHandler authenticationCallHandler = new AuthenticationCallHandler(next);
+    HttpHandler constraintHandler =
+        new AuthenticationPredicateAwareConstraintHandler(
+            authenticationCallHandler, authConfig.getIsAuthenticationRequiredPredicate());
 
-        HttpHandler mechanismsHandler = new AuthenticationMechanismsHandler(constraintHandler,
-                authConfig.getAuthMechanisms());
-        AuthenticationMode authenticationMode = AuthenticationMode.valueOf(
-                handlersChainParameters.getAuthenticationMode().toUpperCase()
-        );
+    HttpHandler mechanismsHandler =
+        new AuthenticationMechanismsHandler(constraintHandler, authConfig.getAuthMechanisms());
+    AuthenticationMode authenticationMode =
+        AuthenticationMode.valueOf(handlersChainParameters.getAuthenticationMode().toUpperCase());
 
-        return new SecurityInitialHandler(authenticationMode, authConfig.getIdentityManager(), mechanismsHandler);
-    }
+    return new SecurityInitialHandler(
+        authenticationMode, authConfig.getIdentityManager(), mechanismsHandler);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/HandlersChainParameters.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/HandlersChainParameters.java
index 6f1204b7e1..83648dddef 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/HandlersChainParameters.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/HandlersChainParameters.java
@@ -4,17 +4,34 @@
 
 public interface HandlersChainParameters {
 
-    Duration getIdleTimeout();
+  /**
+   * Defines the time allowed for processing a publish request to a topic with ack=leader. After
+   * this time elapses a TimeoutHandler will be run which, with PersistentBufferExtension enabled,
+   * would result in message being sent to local buffer.
+   */
+  Duration getIdleTimeout();
 
-    Duration getLongIdleTimeout();
+  /**
+   * Defines the time allowed for processing a publish request to a topic with ack=all. After this
+   * time elapses a TimeoutHandler will be run which, with PersistentBufferExtension enabled, would
+   * result in message being sent to local buffer.
+   */
+  Duration getLongIdleTimeout();
 
-    boolean isForceTopicMaxMessageSize();
+  /**
+   * Defines the time allowed for processing a publish request to a topic with
+   * fallbackToRemoteDatacenterEnabled=true. After this time elapses a TimeoutHandler will be run
+   * which would result in error being returned to a client.
+   */
+  Duration getMaxPublishRequestDuration();
 
-    boolean isKeepAliveHeaderEnabled();
+  boolean isForceTopicMaxMessageSize();
 
-    Duration getKeepAliveHeaderTimeout();
+  boolean isKeepAliveHeaderEnabled();
 
-    boolean isAuthenticationEnabled();
+  Duration getKeepAliveHeaderTimeout();
 
-    String getAuthenticationMode();
+  boolean isAuthenticationEnabled();
+
+  String getAuthenticationMode();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/KeepAliveHeaderHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/KeepAliveHeaderHandler.java
index 9d19ed0c3e..7237b38e13 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/KeepAliveHeaderHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/KeepAliveHeaderHandler.java
@@ -5,7 +5,7 @@
 
 class KeepAliveHeaderHandler extends SetHeaderHandler {
 
-    KeepAliveHeaderHandler(HttpHandler next, int keepAliveTimeoutSec) {
-        super(next, "Keep-Alive", "timeout=" + keepAliveTimeoutSec);
-    }
+  KeepAliveHeaderHandler(HttpHandler next, int keepAliveTimeoutSec) {
+    super(next, "Keep-Alive", "timeout=" + keepAliveTimeoutSec);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/MessageCreateHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/MessageCreateHandler.java
index 244b367054..4718f38c15 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/MessageCreateHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/MessageCreateHandler.java
@@ -1,5 +1,13 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
+import static java.lang.String.format;
+import static pl.allegro.tech.hermes.api.ErrorCode.AVRO_SCHEMA_INVALID_METADATA;
+import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
+import static pl.allegro.tech.hermes.api.ErrorCode.SCHEMA_VERSION_DOES_NOT_EXIST;
+import static pl.allegro.tech.hermes.api.ErrorCode.VALIDATION_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorDescription.error;
+
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import pl.allegro.tech.hermes.common.message.wrapper.AvroInvalidMetadataException;
@@ -12,77 +20,75 @@
 import pl.allegro.tech.hermes.schema.SchemaVersionDoesNotExistException;
 import tech.allegro.schema.json2avro.converter.AvroConversionException;
 
-import static java.lang.String.format;
-import static pl.allegro.tech.hermes.api.ErrorCode.AVRO_SCHEMA_INVALID_METADATA;
-import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
-import static pl.allegro.tech.hermes.api.ErrorCode.SCHEMA_VERSION_DOES_NOT_EXIST;
-import static pl.allegro.tech.hermes.api.ErrorCode.VALIDATION_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorDescription.error;
-
 class MessageCreateHandler implements HttpHandler {
 
-    private final HttpHandler next;
-    private final MessageFactory messageFactory;
-    private final MessageErrorProcessor messageErrorProcessor;
+  private final HttpHandler next;
+  private final MessageFactory messageFactory;
+  private final MessageErrorProcessor messageErrorProcessor;
 
-    MessageCreateHandler(HttpHandler next, MessageFactory messageFactory, MessageErrorProcessor messageErrorProcessor) {
-        this.next = next;
-        this.messageFactory = messageFactory;
-        this.messageErrorProcessor = messageErrorProcessor;
-    }
+  MessageCreateHandler(
+      HttpHandler next,
+      MessageFactory messageFactory,
+      MessageErrorProcessor messageErrorProcessor) {
+    this.next = next;
+    this.messageFactory = messageFactory;
+    this.messageErrorProcessor = messageErrorProcessor;
+  }
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) throws Exception {
-        AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
+  @Override
+  public void handleRequest(HttpServerExchange exchange) throws Exception {
+    AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
 
-        try {
-            attachment.setMessage(messageFactory.create(exchange.getRequestHeaders(), attachment));
-            next.handleRequest(exchange);
-        } catch (InvalidMessageException | AvroConversionException | UnsupportedContentTypeException exception) {
-            attachment.removeTimeout();
-            messageErrorProcessor.sendAndLog(
-                    exchange,
-                    attachment.getTopic(),
-                    attachment.getMessageId(),
-                    error("Invalid message: " + exception.getMessage(), VALIDATION_ERROR),
-                    exception);
-        } catch (CouldNotLoadSchemaException | SchemaNotFoundException exception) {
-            attachment.removeTimeout();
-            messageErrorProcessor.sendAndLog(
-                    exchange,
-                    attachment.getTopic(),
-                    attachment.getMessageId(),
-                    error("Missing schema", SCHEMA_COULD_NOT_BE_LOADED),
-                    exception);
-        } catch (SchemaVersionDoesNotExistException exception) {
-            attachment.removeTimeout();
-            messageErrorProcessor.sendAndLog(
-                    exchange,
-                    attachment.getTopic(),
-                    attachment.getMessageId(),
-                    error(
-                            format("Given schema version '%s' does not exist", exception.getSchemaVersion().value()),
-                            SCHEMA_VERSION_DOES_NOT_EXIST),
-                    exception);
-        } catch (AvroInvalidMetadataException exception) {
-            attachment.removeTimeout();
-            messageErrorProcessor.sendAndLog(
-                    exchange,
-                    attachment.getTopic(),
-                    attachment.getMessageId(),
-                    error("Schema does not contain mandatory __metadata field for Hermes internal metadata. Please fix topic schema.",
-                            AVRO_SCHEMA_INVALID_METADATA),
-                    exception);
-        } catch (Exception exception) {
-            attachment.removeTimeout();
-            messageErrorProcessor.sendAndLog(
-                    exchange,
-                    attachment.getTopic(),
-                    attachment.getMessageId(),
-                    error("Exception caught while creating message", INTERNAL_ERROR),
-                    exception);
-        }
+    try {
+      attachment.setMessage(messageFactory.create(exchange.getRequestHeaders(), attachment));
+      next.handleRequest(exchange);
+    } catch (InvalidMessageException
+        | AvroConversionException
+        | UnsupportedContentTypeException exception) {
+      attachment.removeTimeout();
+      messageErrorProcessor.sendAndLog(
+          exchange,
+          attachment.getTopic(),
+          attachment.getMessageId(),
+          error("Invalid message: " + exception.getMessage(), VALIDATION_ERROR),
+          exception);
+    } catch (CouldNotLoadSchemaException | SchemaNotFoundException exception) {
+      attachment.removeTimeout();
+      messageErrorProcessor.sendAndLog(
+          exchange,
+          attachment.getTopic(),
+          attachment.getMessageId(),
+          error("Missing schema", SCHEMA_COULD_NOT_BE_LOADED),
+          exception);
+    } catch (SchemaVersionDoesNotExistException exception) {
+      attachment.removeTimeout();
+      messageErrorProcessor.sendAndLog(
+          exchange,
+          attachment.getTopic(),
+          attachment.getMessageId(),
+          error(
+              format(
+                  "Given schema version '%s' does not exist", exception.getSchemaVersion().value()),
+              SCHEMA_VERSION_DOES_NOT_EXIST),
+          exception);
+    } catch (AvroInvalidMetadataException exception) {
+      attachment.removeTimeout();
+      messageErrorProcessor.sendAndLog(
+          exchange,
+          attachment.getTopic(),
+          attachment.getMessageId(),
+          error(
+              "Schema does not contain mandatory __metadata field for Hermes internal metadata. Please fix topic schema.",
+              AVRO_SCHEMA_INVALID_METADATA),
+          exception);
+    } catch (Exception exception) {
+      attachment.removeTimeout();
+      messageErrorProcessor.sendAndLog(
+          exchange,
+          attachment.getTopic(),
+          attachment.getMessageId(),
+          error("Exception caught while creating message", INTERNAL_ERROR),
+          exception);
     }
-
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/MessageReadHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/MessageReadHandler.java
index 384800de70..9a53dca60f 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/MessageReadHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/MessageReadHandler.java
@@ -1,221 +1,265 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
+import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorCode.THROUGHPUT_QUOTA_VIOLATION;
+import static pl.allegro.tech.hermes.api.ErrorCode.VALIDATION_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorDescription.error;
+
 import io.undertow.io.Receiver;
 import io.undertow.server.DefaultResponseListener;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
+import java.io.ByteArrayOutputStream;
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.end.MessageErrorProcessor;
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageState;
 
-import java.io.ByteArrayOutputStream;
-import java.time.Duration;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
-import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorCode.THROUGHPUT_QUOTA_VIOLATION;
-import static pl.allegro.tech.hermes.api.ErrorCode.VALIDATION_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorDescription.error;
-
 class MessageReadHandler implements HttpHandler {
-    private static final Logger logger = LoggerFactory.getLogger(MessageReadHandler.class);
-
-    private final HttpHandler next;
-    private final HttpHandler timeoutHandler;
-    private final MessageErrorProcessor messageErrorProcessor;
-    private final ContentLengthChecker contentLengthChecker;
-    private final Duration defaultAsyncTimeout;
-    private final Duration longAsyncTimeout;
-    private final ThroughputLimiter throughputLimiter;
-
-    MessageReadHandler(HttpHandler next, HttpHandler timeoutHandler,
-                       MessageErrorProcessor messageErrorProcessor, ThroughputLimiter throughputLimiter,
-                       boolean forceMaxMessageSizePerTopic, Duration idleTime, Duration longIdleTime) {
-        this.next = next;
-        this.timeoutHandler = timeoutHandler;
-        this.messageErrorProcessor = messageErrorProcessor;
-        this.contentLengthChecker = new ContentLengthChecker(forceMaxMessageSizePerTopic);
-        this.defaultAsyncTimeout = idleTime;
-        this.longAsyncTimeout = longIdleTime;
-        this.throughputLimiter = throughputLimiter;
-    }
+  private static final Logger logger = LoggerFactory.getLogger(MessageReadHandler.class);
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) {
-        AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
-
-        Duration timeout = attachment.getTopic().isReplicationConfirmRequired() ? longAsyncTimeout : defaultAsyncTimeout;
-
-        attachment.setTimeoutHolder(new TimeoutHolder(
-                (int) timeout.toMillis(),
-                exchange.getIoThread().executeAfter(
-                        () -> runTimeoutHandler(exchange, attachment),
-                        timeout.toMillis(),
-                        MILLISECONDS)));
-
-        ThroughputLimiter.QuotaInsight quotaInsight = throughputLimiter.checkQuota(
-                attachment.getCachedTopic().getTopicName(),
-                attachment.getCachedTopic().getThroughput());
-        if (quotaInsight.hasQuota()) {
-            readMessage(exchange, attachment);
-        } else {
-            respondWithQuotaViolation(exchange, attachment, quotaInsight.getReason());
-        }
-    }
+  private final HttpHandler next;
+  private final HttpHandler timeoutHandler;
+  private final MessageErrorProcessor messageErrorProcessor;
+  private final ContentLengthChecker contentLengthChecker;
+  private final Duration defaultAsyncTimeout;
+  private final Duration longAsyncTimeout;
+  private final Duration maxPublishRequestDuration;
+  private final ThroughputLimiter throughputLimiter;
 
-    private void runTimeoutHandler(HttpServerExchange exchange, AttachmentContent attachment) {
-        try {
-            timeoutHandler.handleRequest(exchange);
-        } catch (Exception e) {
-            messageErrorProcessor.sendAndLog(exchange, attachment.getTopic(), attachment.getMessageId(),
-                    error("Error while handling timeout task", INTERNAL_ERROR), e);
-        }
-    }
+  MessageReadHandler(
+      HttpHandler next,
+      HttpHandler timeoutHandler,
+      MessageErrorProcessor messageErrorProcessor,
+      ThroughputLimiter throughputLimiter,
+      boolean forceMaxMessageSizePerTopic,
+      Duration idleTime,
+      Duration longIdleTime,
+      Duration maxPublishRequestDuration) {
+    this.next = next;
+    this.timeoutHandler = timeoutHandler;
+    this.messageErrorProcessor = messageErrorProcessor;
+    this.contentLengthChecker = new ContentLengthChecker(forceMaxMessageSizePerTopic);
+    this.defaultAsyncTimeout = idleTime;
+    this.longAsyncTimeout = longIdleTime;
+    this.throughputLimiter = throughputLimiter;
+    this.maxPublishRequestDuration = maxPublishRequestDuration;
+  }
 
-    private void readMessage(HttpServerExchange exchange, AttachmentContent attachment) {
-        ByteArrayOutputStream messageContent = new ByteArrayOutputStream();
-        MessageState state = attachment.getMessageState();
+  @Override
+  public void handleRequest(HttpServerExchange exchange) {
+    AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
 
-        Receiver receiver = exchange.getRequestReceiver();
+    Duration timeout = calculateTimeout(attachment.getTopic());
 
-        attachment.getTimeoutHolder().onTimeout((Void unused) -> receiver.pause());
+    attachment.setTimeoutHolder(
+        new TimeoutHolder(
+            (int) timeout.toMillis(),
+            exchange
+                .getIoThread()
+                .executeAfter(
+                    () -> runTimeoutHandler(exchange, attachment),
+                    timeout.toMillis(),
+                    MILLISECONDS)));
 
-        if (state.setReading()) {
-            receiver.receivePartialBytes(
-                    partialMessageRead(state, messageContent, attachment),
-                    readingError(state, attachment));
-        } else {
-            messageErrorProcessor.sendAndLog(
-                    exchange,
-                    attachment.getTopic(),
-                    attachment.getMessageId(),
-                    error("Probably context switching problem as timeout elapsed before message reading was started", INTERNAL_ERROR));
-        }
+    ThroughputLimiter.QuotaInsight quotaInsight =
+        throughputLimiter.checkQuota(
+            attachment.getCachedTopic().getTopicName(),
+            attachment.getCachedTopic().getThroughput());
+    if (quotaInsight.hasQuota()) {
+      readMessage(exchange, attachment);
+    } else {
+      respondWithQuotaViolation(exchange, attachment, quotaInsight.getReason());
     }
+  }
 
-    private Receiver.PartialBytesCallback partialMessageRead(MessageState state,
-                                                             ByteArrayOutputStream messageContent,
-                                                             AttachmentContent attachment) {
-        return (exchange, message, last) -> {
-            if (state.isReadingTimeout()) {
-                endWithoutDefaultResponse(exchange);
-                return;
-            }
-            messageContent.write(message, 0, message.length);
-
-            if (last) {
-                if (state.setFullyRead()) {
-                    messageRead(exchange, messageContent.toByteArray(), attachment);
-                } else {
-                    endWithoutDefaultResponse(exchange);
-                }
-            }
-        };
+  private Duration calculateTimeout(Topic topic) {
+    if (topic.isFallbackToRemoteDatacenterEnabled()) {
+      return maxPublishRequestDuration;
     }
+    return topic.isReplicationConfirmRequired() ? longAsyncTimeout : defaultAsyncTimeout;
+  }
 
-    private Receiver.ErrorCallback readingError(MessageState state, AttachmentContent attachment) {
-        return (exchange, exception) -> {
-            if (state.setReadingError()) {
-                attachment.removeTimeout();
-                messageErrorProcessor.sendAndLog(exchange, attachment.getTopic(), attachment.getMessageId(),
-                        error("Error while reading message. " + getRootCauseMessage(exception), INTERNAL_ERROR), exception);
-            } else {
-                messageErrorProcessor.log(
-                        exchange,
-                        "Error while reading message after timeout execution. " + getRootCauseMessage(exception),
-                        exception);
-            }
-        };
+  private void runTimeoutHandler(HttpServerExchange exchange, AttachmentContent attachment) {
+    try {
+      timeoutHandler.handleRequest(exchange);
+    } catch (Exception e) {
+      messageErrorProcessor.sendAndLog(
+          exchange,
+          attachment.getTopic(),
+          attachment.getMessageId(),
+          error("Error while handling timeout task", INTERNAL_ERROR),
+          e);
     }
+  }
 
-    private void messageRead(HttpServerExchange exchange, byte[] messageContent, AttachmentContent attachment) {
-        try {
-            contentLengthChecker.check(exchange, messageContent.length, attachment);
-            attachment.getCachedTopic().reportMessageContentSize(messageContent.length);
-            ThroughputLimiter.QuotaInsight quotaCheck = throughputLimiter.checkQuota(
-                    attachment.getCachedTopic().getTopicName(),
-                    attachment.getCachedTopic().getThroughput());
-            if (quotaCheck.hasQuota()) {
-                finalizeMessageRead(exchange, messageContent, attachment);
-            } else {
-                respondWithQuotaViolation(exchange, attachment, quotaCheck.getReason());
-            }
-        } catch (ContentLengthChecker.InvalidContentLengthException | ContentLengthChecker.ContentTooLargeException e) {
-            attachment.removeTimeout();
-            messageErrorProcessor.sendAndLog(exchange, attachment.getTopic(),
-                    attachment.getMessageId(), error(e.getMessage(), VALIDATION_ERROR));
-        } catch (Exception e) {
-            attachment.removeTimeout();
-            messageErrorProcessor.sendAndLog(exchange, attachment.getTopic(), attachment.getMessageId(), e);
-        }
+  private void readMessage(HttpServerExchange exchange, AttachmentContent attachment) {
+    ByteArrayOutputStream messageContent = new ByteArrayOutputStream();
+    MessageState state = attachment.getMessageState();
+
+    Receiver receiver = exchange.getRequestReceiver();
+
+    attachment.getTimeoutHolder().onTimeout((Void unused) -> receiver.pause());
+
+    if (state.setReading()) {
+      receiver.receivePartialBytes(
+          partialMessageRead(state, messageContent, attachment), readingError(state, attachment));
+    } else {
+      messageErrorProcessor.sendAndLog(
+          exchange,
+          attachment.getTopic(),
+          attachment.getMessageId(),
+          error(
+              "Probably context switching problem as timeout elapsed before message reading was started",
+              INTERNAL_ERROR));
     }
+  }
 
-    private void finalizeMessageRead(HttpServerExchange exchange,
-                                     byte[] messageContent,
-                                     AttachmentContent attachment) throws Exception {
-        attachment.setMessageContent(messageContent);
+  private Receiver.PartialBytesCallback partialMessageRead(
+      MessageState state, ByteArrayOutputStream messageContent, AttachmentContent attachment) {
+    return (exchange, message, last) -> {
+      if (state.isReadingTimeout()) {
         endWithoutDefaultResponse(exchange);
-        if (exchange.isInIoThread()) {
-            dispatchToWorker(exchange, attachment);
+        return;
+      }
+      messageContent.write(message, 0, message.length);
+
+      if (last) {
+        if (state.setFullyRead()) {
+          messageRead(exchange, messageContent.toByteArray(), attachment);
         } else {
-            next.handleRequest(exchange);
+          endWithoutDefaultResponse(exchange);
         }
-    }
+      }
+    };
+  }
 
-    private void respondWithQuotaViolation(HttpServerExchange exchange,
-                                           AttachmentContent attachment,
-                                           String reason) {
+  private Receiver.ErrorCallback readingError(MessageState state, AttachmentContent attachment) {
+    return (exchange, exception) -> {
+      if (state.setReadingError()) {
         attachment.removeTimeout();
         messageErrorProcessor.sendAndLog(
-                exchange,
-                attachment.getTopic(),
-                attachment.getMessageId(),
-                error(reason, THROUGHPUT_QUOTA_VIOLATION));
+            exchange,
+            attachment.getTopic(),
+            attachment.getMessageId(),
+            error("Error while reading message. " + getRootCauseMessage(exception), INTERNAL_ERROR),
+            exception);
+      } else {
+        messageErrorProcessor.log(
+            exchange,
+            "Error while reading message after timeout execution. "
+                + getRootCauseMessage(exception),
+            exception);
+      }
+    };
+  }
+
+  private void messageRead(
+      HttpServerExchange exchange, byte[] messageContent, AttachmentContent attachment) {
+    try {
+      contentLengthChecker.check(exchange, messageContent.length, attachment);
+      attachment.getCachedTopic().reportMessageContentSize(messageContent.length);
+      ThroughputLimiter.QuotaInsight quotaCheck =
+          throughputLimiter.checkQuota(
+              attachment.getCachedTopic().getTopicName(),
+              attachment.getCachedTopic().getThroughput());
+      if (quotaCheck.hasQuota()) {
+        finalizeMessageRead(exchange, messageContent, attachment);
+      } else {
+        respondWithQuotaViolation(exchange, attachment, quotaCheck.getReason());
+      }
+    } catch (ContentLengthChecker.InvalidContentLengthException
+        | ContentLengthChecker.ContentTooLargeException e) {
+      attachment.removeTimeout();
+      messageErrorProcessor.sendAndLog(
+          exchange,
+          attachment.getTopic(),
+          attachment.getMessageId(),
+          error(e.getMessage(), VALIDATION_ERROR));
+    } catch (Exception e) {
+      attachment.removeTimeout();
+      messageErrorProcessor.sendAndLog(
+          exchange, attachment.getTopic(), attachment.getMessageId(), e);
+    }
+  }
+
+  private void finalizeMessageRead(
+      HttpServerExchange exchange, byte[] messageContent, AttachmentContent attachment)
+      throws Exception {
+    attachment.setMessageContent(messageContent);
+    endWithoutDefaultResponse(exchange);
+    if (exchange.isInIoThread()) {
+      dispatchToWorker(exchange, attachment);
+    } else {
+      next.handleRequest(exchange);
     }
+  }
 
-    private void dispatchToWorker(HttpServerExchange exchange, AttachmentContent attachment) {
-        // exchange.dispatch(next) is not called here because async io read flag can be still set to true which combined with
-        // dispatch() leads to an exception
-        exchange.getConnection().getWorker().execute(() -> {
-            try {
+  private void respondWithQuotaViolation(
+      HttpServerExchange exchange, AttachmentContent attachment, String reason) {
+    attachment.removeTimeout();
+    messageErrorProcessor.sendAndLog(
+        exchange,
+        attachment.getTopic(),
+        attachment.getMessageId(),
+        error(reason, THROUGHPUT_QUOTA_VIOLATION));
+  }
+
+  private void dispatchToWorker(HttpServerExchange exchange, AttachmentContent attachment) {
+    // exchange.dispatch(next) is not called here because async io read flag can be still set to
+    // true which combined with
+    // dispatch() leads to an exception
+    exchange
+        .getConnection()
+        .getWorker()
+        .execute(
+            () -> {
+              try {
                 next.handleRequest(exchange);
-            } catch (Exception e) {
+              } catch (Exception e) {
                 attachment.removeTimeout();
-                messageErrorProcessor.sendAndLog(exchange, attachment.getTopic(), attachment.getMessageId(),
-                        error("Error while executing next handler after read handler", INTERNAL_ERROR), e);
-            }
-        });
-    }
+                messageErrorProcessor.sendAndLog(
+                    exchange,
+                    attachment.getTopic(),
+                    attachment.getMessageId(),
+                    error("Error while executing next handler after read handler", INTERNAL_ERROR),
+                    e);
+              }
+            });
+  }
 
-    private void endWithoutDefaultResponse(HttpServerExchange exchange) {
-        // when a handler doesn't return a response (for example when is interrupted by timeout)
-        // then without this listener default response can be returned with 200 status code when the handler finishes
-        // execution before the other one
-        exchange.addDefaultResponseListener(new DefaultResponseSimulator());
-    }
+  private void endWithoutDefaultResponse(HttpServerExchange exchange) {
+    // when a handler doesn't return a response (for example when is interrupted by timeout)
+    // then without this listener default response can be returned with 200 status code when the
+    // handler finishes
+    // execution before the other one
+    exchange.addDefaultResponseListener(new DefaultResponseSimulator());
+  }
 
-    static final class DefaultResponseSimulator implements DefaultResponseListener {
-
-        private static final boolean RESPONSE_SIMULATED = true;
-        private final AtomicBoolean responseNotSimulatedOnlyOnce = new AtomicBoolean();
-
-        @Override
-        public boolean handleDefaultResponse(HttpServerExchange exchange) {
-            if (exchange.getAttachment(AttachmentContent.KEY).isResponseReady()) {
-                if (exchange.getStatusCode() == 200) {
-                    try {
-                        exchange.setStatusCode(500);
-                    } catch (RuntimeException e) {
-                        logger.error("Exception has been thrown during an exchange status modification", e);
-                    }
-                }
-                return !responseNotSimulatedOnlyOnce.compareAndSet(false, true);
-            } else {
-                return RESPONSE_SIMULATED;
-            }
+  static final class DefaultResponseSimulator implements DefaultResponseListener {
+
+    private static final boolean RESPONSE_SIMULATED = true;
+    private final AtomicBoolean responseNotSimulatedOnlyOnce = new AtomicBoolean();
+
+    @Override
+    public boolean handleDefaultResponse(HttpServerExchange exchange) {
+      if (exchange.getAttachment(AttachmentContent.KEY).isResponseReady()) {
+        if (exchange.getStatusCode() == 200) {
+          try {
+            exchange.setStatusCode(500);
+          } catch (RuntimeException e) {
+            logger.error("Exception has been thrown during an exchange status modification", e);
+          }
         }
+        return !responseNotSimulatedOnlyOnce.compareAndSet(false, true);
+      } else {
+        return RESPONSE_SIMULATED;
+      }
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/PreviewHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/PreviewHandler.java
index f316c541b9..44bd2e632f 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/PreviewHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/PreviewHandler.java
@@ -6,22 +6,22 @@
 
 public class PreviewHandler implements HttpHandler {
 
-    private final HttpHandler next;
-    private final MessagePreviewLog messagePreviewLog;
+  private final HttpHandler next;
+  private final MessagePreviewLog messagePreviewLog;
 
-    public PreviewHandler(HttpHandler next, MessagePreviewLog messagePreviewLog) {
-        this.next = next;
-        this.messagePreviewLog = messagePreviewLog;
-    }
+  public PreviewHandler(HttpHandler next, MessagePreviewLog messagePreviewLog) {
+    this.next = next;
+    this.messagePreviewLog = messagePreviewLog;
+  }
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) throws Exception {
-        AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
+  @Override
+  public void handleRequest(HttpServerExchange exchange) throws Exception {
+    AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
 
-        try {
-            next.handleRequest(exchange);
-        } finally {
-            messagePreviewLog.add(attachment.getTopic(), attachment.getMessage());
-        }
+    try {
+      next.handleRequest(exchange);
+    } finally {
+      messagePreviewLog.add(attachment.getTopic(), attachment.getMessage());
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/PublishingHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/PublishingHandler.java
index 40b5ee8dc3..3782340af7 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/PublishingHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/PublishingHandler.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
+import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
+import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorDescription.error;
+
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import pl.allegro.tech.hermes.api.Topic;
@@ -9,81 +13,107 @@
 import pl.allegro.tech.hermes.frontend.publishing.handlers.end.MessageErrorProcessor;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageState;
-import pl.allegro.tech.hermes.metrics.HermesTimerContext;
-
-import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
-import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorDescription.error;
 
 class PublishingHandler implements HttpHandler {
 
-    private final BrokerMessageProducer brokerMessageProducer;
-    private final MessageErrorProcessor messageErrorProcessor;
-    private final MessageEndProcessor messageEndProcessor;
+  private final BrokerMessageProducer brokerMessageProducer;
+  private final MessageErrorProcessor messageErrorProcessor;
+  private final MessageEndProcessor messageEndProcessor;
 
-    PublishingHandler(BrokerMessageProducer brokerMessageProducer, MessageErrorProcessor messageErrorProcessor,
-                      MessageEndProcessor messageEndProcessor) {
-        this.brokerMessageProducer = brokerMessageProducer;
-        this.messageErrorProcessor = messageErrorProcessor;
-        this.messageEndProcessor = messageEndProcessor;
-    }
+  PublishingHandler(
+      BrokerMessageProducer brokerMessageProducer,
+      MessageErrorProcessor messageErrorProcessor,
+      MessageEndProcessor messageEndProcessor) {
+    this.brokerMessageProducer = brokerMessageProducer;
+    this.messageErrorProcessor = messageErrorProcessor;
+    this.messageEndProcessor = messageEndProcessor;
+  }
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) {
-        // change state of exchange to dispatched,
-        // thanks to this call, default response with 200 status code is not returned after handlerRequest() finishes its execution
-        exchange.dispatch(() -> {
-            try {
-                handle(exchange);
-            } catch (RuntimeException e) {
-                messageErrorProcessor.sendAndLog(exchange, "Exception while publishing message to a broker.", e);
-            }
+  @Override
+  public void handleRequest(HttpServerExchange exchange) {
+    // change state of exchange to dispatched,
+    // thanks to this call, default response with 200 status code is not returned after
+    // handlerRequest() finishes its execution
+    exchange.dispatch(
+        () -> {
+          try {
+            handle(exchange);
+          } catch (RuntimeException e) {
+            AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
+            MessageState messageState = attachment.getMessageState();
+            messageState.setErrorInSendingToKafka();
+            messageErrorProcessor.sendAndLog(
+                exchange, "Exception while publishing message to a broker.", e);
+          }
         });
-    }
+  }
 
-    private void handle(HttpServerExchange exchange) {
-        AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
-        MessageState messageState = attachment.getMessageState();
+  private void handle(HttpServerExchange exchange) {
+    AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
+    MessageState messageState = attachment.getMessageState();
 
-        messageState.setSendingToKafkaProducerQueue();
-        HermesTimerContext brokerLatencyTimers = attachment.getCachedTopic().startBrokerLatencyTimer();
-        brokerMessageProducer.send(attachment.getMessage(), attachment.getCachedTopic(), new PublishingCallback() {
+    messageState.setSendingToKafkaProducerQueue();
+    brokerMessageProducer.send(
+        attachment.getMessage(),
+        attachment.getCachedTopic(),
+        new PublishingCallback() {
 
-            // called from kafka producer thread
-            @Override
-            public void onPublished(Message message, Topic topic) {
-                exchange.getConnection().getWorker().execute(() -> {
-                    brokerLatencyTimers.close();
-                    if (messageState.setSentToKafka()) {
+          @Override
+          public void onPublished(Message message, Topic topic) {
+            exchange
+                .getConnection()
+                .getWorker()
+                .execute(
+                    () -> {
+                      if (messageState.setSentToKafka()) {
                         attachment.removeTimeout();
                         messageEndProcessor.sent(exchange, attachment);
-                    } else if (messageState.setDelayedSentToKafka()) {
-                        messageEndProcessor.delayedSent(exchange, attachment.getCachedTopic(), message);
-                    }
-                });
-            }
+                      } else if (messageState.setDelayedSentToKafka()) {
+                        messageEndProcessor.delayedSent(attachment.getCachedTopic(), message);
+                      }
+                    });
+          }
+
+          @Override
+          public void onEachPublished(Message message, Topic topic, String datacenter) {
+            exchange
+                .getConnection()
+                .getWorker()
+                .execute(
+                    () -> {
+                      attachment.getCachedTopic().incrementPublished(datacenter);
+                      messageEndProcessor.eachSent(exchange, attachment, datacenter);
+                    });
+          }
 
-            // in most cases this method should be called from worker thread,
-            // therefore there is no need to switch it to another worker thread
-            @Override
-            public void onUnpublished(Message message, Topic topic, Exception exception) {
-                messageState.setErrorInSendingToKafka();
-                brokerLatencyTimers.close();
-                attachment.removeTimeout();
-                handleNotPublishedMessage(exchange, topic, attachment.getMessageId(), exception);
-            }
+          @Override
+          public void onUnpublished(Message message, Topic topic, Exception exception) {
+            exchange
+                .getConnection()
+                .getWorker()
+                .execute(
+                    () -> {
+                      messageState.setErrorInSendingToKafka();
+                      attachment.removeTimeout();
+                      handleNotPublishedMessage(
+                          exchange, topic, attachment.getMessageId(), exception);
+                    });
+          }
         });
 
-        if (messageState.setSendingToKafka() && messageState.setDelayedProcessing()) {
-            messageEndProcessor.bufferedButDelayedProcessing(exchange, attachment);
-        }
+    if (messageState.setSendingToKafka()
+        && !attachment.getCachedTopic().getTopic().isFallbackToRemoteDatacenterEnabled()
+        && messageState.setDelayedProcessing()) {
+      messageEndProcessor.bufferedButDelayedProcessing(exchange, attachment);
     }
+  }
 
-    private void handleNotPublishedMessage(HttpServerExchange exchange, Topic topic, String messageId, Exception exception) {
-        messageErrorProcessor.sendAndLog(
-                exchange,
-                topic,
-                messageId,
-                error("Message not published. " + getRootCauseMessage(exception), INTERNAL_ERROR));
-    }
+  private void handleNotPublishedMessage(
+      HttpServerExchange exchange, Topic topic, String messageId, Exception exception) {
+    messageErrorProcessor.sendAndLog(
+        exchange,
+        topic,
+        messageId,
+        error("Message not published. " + getRootCauseMessage(exception), INTERNAL_ERROR));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputLimiter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputLimiter.java
index 2118c1ac72..2bcd232c80 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputLimiter.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputLimiter.java
@@ -1,56 +1,53 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
+import static java.lang.String.format;
+
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.metrics.HermesRateMeter;
 
-import static java.lang.String.format;
-
 public interface ThroughputLimiter {
-    QuotaInsight checkQuota(TopicName topic, HermesRateMeter throughput);
-
-    default void start() {
-    }
+  QuotaInsight checkQuota(TopicName topic, HermesRateMeter throughput);
 
-    default void stop() {
-    }
+  default void start() {}
 
-    class QuotaInsight {
-        private static final QuotaInsight QUOTA_CONFIRMED = new QuotaInsight();
-        private static final QuotaInsight GLOBAL_VIOLATION = new QuotaInsight(false,
-                "Global throughput exceeded. Sorry for the inconvenience.");
-        private static final String DEFAULT_REASON = "unknown";
+  default void stop() {}
 
-        private boolean hasQuota = true;
-        private String reason;
+  class QuotaInsight {
+    private static final QuotaInsight QUOTA_CONFIRMED = new QuotaInsight();
+    private static final QuotaInsight GLOBAL_VIOLATION =
+        new QuotaInsight(false, "Global throughput exceeded. Sorry for the inconvenience.");
+    private static final String DEFAULT_REASON = "unknown";
 
-        private QuotaInsight() {
-        }
+    private boolean hasQuota = true;
+    private String reason;
 
-        private QuotaInsight(boolean pass, String reason) {
-            this.hasQuota = pass;
-            this.reason = reason;
-        }
+    private QuotaInsight() {}
 
-        public boolean hasQuota() {
-            return hasQuota;
-        }
+    private QuotaInsight(boolean pass, String reason) {
+      this.hasQuota = pass;
+      this.reason = reason;
+    }
 
-        public String getReason() {
-            return reason != null ? reason : DEFAULT_REASON;
-        }
+    public boolean hasQuota() {
+      return hasQuota;
+    }
 
-        public static QuotaInsight quotaConfirmed() {
-            return QUOTA_CONFIRMED;
-        }
+    public String getReason() {
+      return reason != null ? reason : DEFAULT_REASON;
+    }
 
-        public static QuotaInsight quotaViolation(long current, long limit) {
-            return new QuotaInsight(false,
-                    format("Current throughput exceeded limit [current:%s, limit:%s].", current, limit));
-        }
+    public static QuotaInsight quotaConfirmed() {
+      return QUOTA_CONFIRMED;
+    }
 
-        public static QuotaInsight globalQuotaViolation() {
-            return GLOBAL_VIOLATION;
-        }
+    public static QuotaInsight quotaViolation(long current, long limit) {
+      return new QuotaInsight(
+          false,
+          format("Current throughput exceeded limit [current:%s, limit:%s].", current, limit));
+    }
 
+    public static QuotaInsight globalQuotaViolation() {
+      return GLOBAL_VIOLATION;
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputLimiterFactory.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputLimiterFactory.java
index aae4d09ff2..c4252dd92c 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputLimiterFactory.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputLimiterFactory.java
@@ -1,54 +1,61 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import static java.util.concurrent.Executors.newScheduledThreadPool;
+import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaConfirmed;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
-
-import static java.util.concurrent.Executors.newScheduledThreadPool;
-import static pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter.QuotaInsight.quotaConfirmed;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.frontend.metric.ThroughputRegistry;
 
 public class ThroughputLimiterFactory {
 
-    private final ThroughputParameters throughputParameters;
-
-    private final MetricsFacade metricsFacade;
-
-    private enum ThroughputLimiterType { UNLIMITED, FIXED, DYNAMIC }
-
-    public ThroughputLimiterFactory(ThroughputParameters throughputParameters, MetricsFacade metricsFacade) {
-        this.throughputParameters = throughputParameters;
-        this.metricsFacade = metricsFacade;
-    }
-
-    public ThroughputLimiter provide() {
-        switch (ThroughputLimiterType.valueOf(throughputParameters.getType().toUpperCase())) {
-            case UNLIMITED:
-                return (a, b) -> quotaConfirmed();
-            case FIXED:
-                return new FixedThroughputLimiter(throughputParameters.getFixedMax());
-            case DYNAMIC:
-                return new DynamicThroughputLimiter(
-                        throughputParameters.getDynamicMax(),
-                        throughputParameters.getDynamicThreshold(),
-                        throughputParameters.getDynamicDesired(),
-                        throughputParameters.getDynamicIdle(),
-                        throughputParameters.getDynamicCheckInterval(),
-                        metricsFacade.topics().topicGlobalThroughputBytes(),
-                        getExecutor());
-            default:
-                throw new IllegalArgumentException("Unknown throughput limiter type.");
-        }
-    }
-
-    private ScheduledExecutorService getExecutor() {
-        Logger logger = LoggerFactory.getLogger(ThroughputLimiterFactory.class);
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("ThroughputLimiterExecutor-%d")
-                .setUncaughtExceptionHandler((t, e) -> logger.error("ThroughputLimiterExecutor failed {}", t.getName(), e)).build();
-        return newScheduledThreadPool(1, threadFactory);
+  private final ThroughputParameters throughputParameters;
+
+  private final ThroughputRegistry throughputRegistry;
+
+  private enum ThroughputLimiterType {
+    UNLIMITED,
+    FIXED,
+    DYNAMIC
+  }
+
+  public ThroughputLimiterFactory(
+      ThroughputParameters throughputParameters, ThroughputRegistry throughputRegistry) {
+    this.throughputParameters = throughputParameters;
+    this.throughputRegistry = throughputRegistry;
+  }
+
+  public ThroughputLimiter provide() {
+    switch (ThroughputLimiterType.valueOf(throughputParameters.getType().toUpperCase())) {
+      case UNLIMITED:
+        return (a, b) -> quotaConfirmed();
+      case FIXED:
+        return new FixedThroughputLimiter(throughputParameters.getFixedMax());
+      case DYNAMIC:
+        return new DynamicThroughputLimiter(
+            throughputParameters.getDynamicMax(),
+            throughputParameters.getDynamicThreshold(),
+            throughputParameters.getDynamicDesired(),
+            throughputParameters.getDynamicIdle(),
+            throughputParameters.getDynamicCheckInterval(),
+            throughputRegistry::getGlobalThroughputOneMinuteRate,
+            getExecutor());
+      default:
+        throw new IllegalArgumentException("Unknown throughput limiter type.");
     }
+  }
+
+  private ScheduledExecutorService getExecutor() {
+    Logger logger = LoggerFactory.getLogger(ThroughputLimiterFactory.class);
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder()
+            .setNameFormat("ThroughputLimiterExecutor-%d")
+            .setUncaughtExceptionHandler(
+                (t, e) -> logger.error("ThroughputLimiterExecutor failed {}", t.getName(), e))
+            .build();
+    return newScheduledThreadPool(1, threadFactory);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputParameters.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputParameters.java
index 2f7ed70eec..d56cba1e2b 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputParameters.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/ThroughputParameters.java
@@ -4,17 +4,17 @@
 
 public interface ThroughputParameters {
 
-    String getType();
+  String getType();
 
-    long getFixedMax();
+  long getFixedMax();
 
-    long getDynamicMax();
+  long getDynamicMax();
 
-    long getDynamicThreshold();
+  long getDynamicThreshold();
 
-    long getDynamicDesired();
+  long getDynamicDesired();
 
-    double getDynamicIdle();
+  double getDynamicIdle();
 
-    Duration getDynamicCheckInterval();
+  Duration getDynamicCheckInterval();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TimeoutHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TimeoutHandler.java
index 206c79cb37..917974591a 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TimeoutHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TimeoutHandler.java
@@ -1,69 +1,123 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
+import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorCode.SENDING_TO_KAFKA_TIMEOUT;
+import static pl.allegro.tech.hermes.api.ErrorCode.TIMEOUT;
+import static pl.allegro.tech.hermes.api.ErrorDescription.error;
+
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.end.MessageEndProcessor;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.end.MessageErrorProcessor;
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageState;
 
-import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorCode.TIMEOUT;
-import static pl.allegro.tech.hermes.api.ErrorDescription.error;
-
 class TimeoutHandler implements HttpHandler {
 
-    private final MessageErrorProcessor messageErrorProcessor;
-    private final MessageEndProcessor messageEndProcessor;
+  private final MessageErrorProcessor messageErrorProcessor;
+  private final MessageEndProcessor messageEndProcessor;
+  private static final Logger logger = LoggerFactory.getLogger(TimeoutHandler.class);
 
-    TimeoutHandler(MessageEndProcessor messageEndProcessor, MessageErrorProcessor messageErrorProcessor) {
-        this.messageErrorProcessor = messageErrorProcessor;
-        this.messageEndProcessor = messageEndProcessor;
-    }
+  TimeoutHandler(
+      MessageEndProcessor messageEndProcessor, MessageErrorProcessor messageErrorProcessor) {
+    this.messageErrorProcessor = messageErrorProcessor;
+    this.messageEndProcessor = messageEndProcessor;
+  }
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) throws Exception {
-        AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
-        MessageState state = attachment.getMessageState();
+  @Override
+  public void handleRequest(HttpServerExchange exchange) throws Exception {
+    AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
+    MessageState state = attachment.getMessageState();
+    boolean buffersDisabled =
+        attachment.getCachedTopic().getTopic().isFallbackToRemoteDatacenterEnabled();
 
-        state.setTimeoutHasPassed();
-        if (state.setReadingTimeout()) {
-            readingTimeout(exchange, attachment);
-        } else if (state.setDelayedSending()) {
-            delayedSending(exchange, attachment);
-        } else {
-            state.setPrematureTimeout();
-        }
+    state.setTimeoutHasPassed();
+    if (state.setReadingTimeout()) {
+      readingTimeout(exchange, attachment);
+    } else if (buffersDisabled && state.setTimeoutSendingToKafka()) {
+      sendingToKafkaTimeout(exchange, attachment);
+    } else if (state.setDelayedSending()) {
+      delayedSending(exchange, attachment);
+    } else {
+      state.setPrematureTimeout();
     }
+  }
 
-    private void delayedSending(HttpServerExchange exchange, AttachmentContent attachment) {
-        exchange.getConnection().getWorker().execute(() -> {
-                try {
-                    messageEndProcessor.bufferedButDelayed(exchange, attachment);
-                } catch (RuntimeException exception) {
-                    messageErrorProcessor.sendAndLog(exchange, "Exception while handling delayed message sending.", exception);
-                }
+  private void delayedSending(HttpServerExchange exchange, AttachmentContent attachment) {
+    exchange
+        .getConnection()
+        .getWorker()
+        .execute(
+            () -> {
+              try {
+                messageEndProcessor.bufferedButDelayed(exchange, attachment);
+              } catch (RuntimeException exception) {
+                messageErrorProcessor.sendAndLog(
+                    exchange, "Exception while handling delayed message sending.", exception);
+              }
             });
-    }
+  }
 
-    private void readingTimeout(HttpServerExchange exchange, AttachmentContent attachment) {
-        exchange.getConnection().getWorker().execute(() -> {
-            TimeoutHolder timeoutHolder = attachment.getTimeoutHolder();
+  private void readingTimeout(HttpServerExchange exchange, AttachmentContent attachment) {
+    exchange
+        .getConnection()
+        .getWorker()
+        .execute(
+            () -> {
+              TimeoutHolder timeoutHolder = attachment.getTimeoutHolder();
 
-            if (timeoutHolder != null) {
+              if (timeoutHolder != null) {
                 timeoutHolder.timeout();
                 messageErrorProcessor.sendAndLog(
-                        exchange,
-                        attachment.getTopic(),
-                        attachment.getMessageId(),
-                        error("Timeout while reading message after " + timeoutHolder.getTimeout() + " milliseconds", TIMEOUT));
-            } else {
+                    exchange,
+                    attachment.getTopic(),
+                    attachment.getMessageId(),
+                    error(
+                        "Timeout while reading message after "
+                            + timeoutHolder.getTimeout()
+                            + " milliseconds",
+                        TIMEOUT));
+              } else {
                 messageErrorProcessor.sendAndLog(
-                        exchange,
-                        attachment.getTopic(),
-                        attachment.getMessageId(),
-                        error("Probably context switching problem as timeout task was started before it was attached to an exchange",
-                                INTERNAL_ERROR));
-            }
-        });
-    }
+                    exchange,
+                    attachment.getTopic(),
+                    attachment.getMessageId(),
+                    error(
+                        "Probably context switching problem as timeout task was started before it was attached to an exchange",
+                        INTERNAL_ERROR));
+              }
+            });
+  }
+
+  private void sendingToKafkaTimeout(HttpServerExchange exchange, AttachmentContent attachment) {
+    exchange
+        .getConnection()
+        .getWorker()
+        .execute(
+            () -> {
+              TimeoutHolder timeoutHolder = attachment.getTimeoutHolder();
+
+              if (timeoutHolder != null) {
+                timeoutHolder.timeout();
+                messageErrorProcessor.sendAndLog(
+                    exchange,
+                    attachment.getTopic(),
+                    attachment.getMessageId(),
+                    error(
+                        "Timeout while sending to kafka message after "
+                            + timeoutHolder.getTimeout()
+                            + " milliseconds",
+                        SENDING_TO_KAFKA_TIMEOUT));
+              } else {
+                messageErrorProcessor.sendAndLog(
+                    exchange,
+                    attachment.getTopic(),
+                    attachment.getMessageId(),
+                    error(
+                        "Probably context switching problem as timeout task was started before it was attached to an exchange",
+                        INTERNAL_ERROR));
+              }
+            });
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TimeoutHolder.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TimeoutHolder.java
index 97bb617ab2..7161194316 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TimeoutHolder.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TimeoutHolder.java
@@ -1,34 +1,33 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
-import org.xnio.XnioExecutor;
-
 import java.util.Optional;
 import java.util.function.Consumer;
+import org.xnio.XnioExecutor;
 
 class TimeoutHolder {
 
-    private final XnioExecutor.Key timeoutKey;
-    private final int timeout;
-    private volatile Optional<Consumer<Void>> timeoutConsumer = Optional.empty();
+  private final XnioExecutor.Key timeoutKey;
+  private final int timeout;
+  private volatile Optional<Consumer<Void>> timeoutConsumer = Optional.empty();
 
-    TimeoutHolder(int timeout, XnioExecutor.Key timeoutKey) {
-        this.timeoutKey = timeoutKey;
-        this.timeout = timeout;
-    }
+  TimeoutHolder(int timeout, XnioExecutor.Key timeoutKey) {
+    this.timeoutKey = timeoutKey;
+    this.timeout = timeout;
+  }
 
-    public boolean remove() {
-        return timeoutKey.remove();
-    }
+  public boolean remove() {
+    return timeoutKey.remove();
+  }
 
-    public void onTimeout(Consumer<Void> timeoutConsumer) {
-        this.timeoutConsumer = Optional.of(timeoutConsumer);
-    }
+  public void onTimeout(Consumer<Void> timeoutConsumer) {
+    this.timeoutConsumer = Optional.of(timeoutConsumer);
+  }
 
-    public void timeout() {
-        timeoutConsumer.ifPresent(c -> c.accept(null));
-    }
+  public void timeout() {
+    timeoutConsumer.ifPresent(c -> c.accept(null));
+  }
 
-    public int getTimeout() {
-        return timeout;
-    }
+  public int getTimeout() {
+    return timeout;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TopicHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TopicHandler.java
index 2158892266..baf8faff84 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TopicHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/TopicHandler.java
@@ -1,9 +1,17 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers;
 
+import static io.undertow.util.StatusCodes.INTERNAL_SERVER_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorCode.AUTH_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorCode.TOPIC_BLACKLISTED;
+import static pl.allegro.tech.hermes.api.ErrorCode.TOPIC_NOT_EXISTS;
+import static pl.allegro.tech.hermes.api.ErrorDescription.error;
+
 import io.undertow.security.api.SecurityContext;
 import io.undertow.security.idm.Account;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
+import java.util.Optional;
+import java.util.function.Consumer;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
 import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
@@ -12,116 +20,119 @@
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageState;
 import pl.allegro.tech.hermes.frontend.server.auth.Roles;
 
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import static io.undertow.util.StatusCodes.INTERNAL_SERVER_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorCode.AUTH_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorCode.TOPIC_BLACKLISTED;
-import static pl.allegro.tech.hermes.api.ErrorCode.TOPIC_NOT_EXISTS;
-import static pl.allegro.tech.hermes.api.ErrorDescription.error;
-
 class TopicHandler implements HttpHandler {
 
-    private static final String UNKNOWN_TOPIC_NAME = "unknown";
-
-    private final HttpHandler next;
-    private final TopicsCache topicsCache;
-    private final MessageErrorProcessor messageErrorProcessor;
-
-    TopicHandler(HttpHandler next, TopicsCache topicsCache, MessageErrorProcessor messageErrorProcessor) {
-        this.next = next;
-        this.topicsCache = topicsCache;
-        this.messageErrorProcessor = messageErrorProcessor;
+  private static final String UNKNOWN_TOPIC_NAME = "unknown";
+
+  private final HttpHandler next;
+  private final TopicsCache topicsCache;
+  private final MessageErrorProcessor messageErrorProcessor;
+
+  TopicHandler(
+      HttpHandler next, TopicsCache topicsCache, MessageErrorProcessor messageErrorProcessor) {
+    this.next = next;
+    this.topicsCache = topicsCache;
+    this.messageErrorProcessor = messageErrorProcessor;
+  }
+
+  @Override
+  public void handleRequest(HttpServerExchange exchange) throws Exception {
+    if (exchange.isInIoThread()) {
+      // switch to worker thread
+      exchange.dispatch(this);
+      return;
     }
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) throws Exception {
-        if (exchange.isInIoThread()) {
-            // switch to worker thread
-            exchange.dispatch(this);
-            return;
-        }
-
-        String messageId = MessageIdGenerator.generate();
-
-        onRequestValid(exchange, messageId, cachedTopic -> {
-            exchange.addExchangeCompleteListener(new ExchangeMetrics(cachedTopic));
-            exchange.putAttachment(AttachmentContent.KEY, new AttachmentContent(cachedTopic, new MessageState(), messageId));
-            setDefaultResponseCode(exchange);
-            try {
-                next.handleRequest(exchange);
-            } catch (Exception e) {
-                messageErrorProcessor.sendAndLog(exchange, cachedTopic.getTopic(), messageId, e);
-            }
+    String messageId = MessageIdGenerator.generate();
+
+    onRequestValid(
+        exchange,
+        messageId,
+        cachedTopic -> {
+          exchange.addExchangeCompleteListener(new ExchangeMetrics(cachedTopic));
+          exchange.putAttachment(
+              AttachmentContent.KEY,
+              new AttachmentContent(cachedTopic, new MessageState(), messageId));
+          setDefaultResponseCode(exchange);
+          try {
+            next.handleRequest(exchange);
+          } catch (Exception e) {
+            messageErrorProcessor.sendAndLog(exchange, cachedTopic.getTopic(), messageId, e);
+          }
         });
-    }
-
-    private void onRequestValid(HttpServerExchange exchange, String messageId, Consumer<CachedTopic> consumer) {
-        String topicName = exchange.getQueryParameters().get("qualifiedTopicName").getFirst();
-        Optional<CachedTopic> maybeTopic = topicsCache.getTopic(topicName);
-
-        if (!maybeTopic.isPresent()) {
-            unknownTopic(exchange, topicName, messageId);
-            return;
-        }
-
-        CachedTopic cachedTopic = maybeTopic.get();
-        if (cachedTopic.isBlacklisted()) {
-            blacklistedTopic(exchange, topicName, messageId);
-            return;
-        }
-
-        Topic topic = cachedTopic.getTopic();
-        if (topic.isAuthEnabled() && !hasPermission(exchange, topic)) {
-            requestForbidden(exchange, messageId, topicName);
-            return;
-        }
+  }
 
-        consumer.accept(cachedTopic);
-    }
-
-    private boolean hasPermission(HttpServerExchange exchange, Topic topic) {
-        Optional<Account> account = extractAccount(exchange);
-        return account.map(value -> hasPermission(topic, value)).orElseGet(topic::isUnauthenticatedAccessEnabled);
-    }
-
-    private boolean hasPermission(Topic topic, Account publisher) {
-        return publisher.getRoles().contains(Roles.PUBLISHER) && topic.hasPermission(publisher.getPrincipal().getName());
-    }
-
-    private Optional<Account> extractAccount(HttpServerExchange exchange) {
-        SecurityContext securityCtx = exchange.getSecurityContext();
-        return Optional.ofNullable(securityCtx != null ? securityCtx.getAuthenticatedAccount() : null);
-    }
+  private void onRequestValid(
+      HttpServerExchange exchange, String messageId, Consumer<CachedTopic> consumer) {
+    String topicName = exchange.getQueryParameters().get("qualifiedTopicName").getFirst();
+    Optional<CachedTopic> maybeTopic = topicsCache.getTopic(topicName);
 
-    private void unknownTopic(HttpServerExchange exchange, String qualifiedTopicName, String messageId) {
-        messageErrorProcessor.sendQuietly(
-                exchange,
-                error("Topic not found: " + qualifiedTopicName, TOPIC_NOT_EXISTS),
-                messageId,
-                UNKNOWN_TOPIC_NAME);
+    if (!maybeTopic.isPresent()) {
+      unknownTopic(exchange, topicName, messageId);
+      return;
     }
 
-    private void requestForbidden(HttpServerExchange exchange, String messageId, String qualifiedTopicName) {
-        messageErrorProcessor.sendQuietly(
-                exchange,
-                error("Permission denied.", AUTH_ERROR),
-                messageId,
-                qualifiedTopicName);
+    CachedTopic cachedTopic = maybeTopic.get();
+    if (cachedTopic.isBlacklisted()) {
+      blacklistedTopic(exchange, topicName, messageId);
+      return;
     }
 
-    private void blacklistedTopic(HttpServerExchange exchange, String qualifiedTopicName, String messageId) {
-        messageErrorProcessor.sendQuietly(exchange,
-                error("Topic blacklisted: " + qualifiedTopicName, TOPIC_BLACKLISTED),
-                messageId,
-                qualifiedTopicName);
+    Topic topic = cachedTopic.getTopic();
+    if (topic.isAuthEnabled() && !hasPermission(exchange, topic)) {
+      requestForbidden(exchange, messageId, topicName);
+      return;
     }
 
-    // Default Undertow's response code (200) was changed in order to avoid situations in which something wrong happens and Hermes-Frontend
-    // does not publish message but return code 200
-    // Since the default code is 500, clients have information that they should retry publishing
-    private void setDefaultResponseCode(HttpServerExchange exchange) {
-        exchange.setStatusCode(INTERNAL_SERVER_ERROR);
-    }
+    consumer.accept(cachedTopic);
+  }
+
+  private boolean hasPermission(HttpServerExchange exchange, Topic topic) {
+    Optional<Account> account = extractAccount(exchange);
+    return account
+        .map(value -> hasPermission(topic, value))
+        .orElseGet(topic::isUnauthenticatedAccessEnabled);
+  }
+
+  private boolean hasPermission(Topic topic, Account publisher) {
+    return publisher.getRoles().contains(Roles.PUBLISHER)
+        && topic.hasPermission(publisher.getPrincipal().getName());
+  }
+
+  private Optional<Account> extractAccount(HttpServerExchange exchange) {
+    SecurityContext securityCtx = exchange.getSecurityContext();
+    return Optional.ofNullable(securityCtx != null ? securityCtx.getAuthenticatedAccount() : null);
+  }
+
+  private void unknownTopic(
+      HttpServerExchange exchange, String qualifiedTopicName, String messageId) {
+    messageErrorProcessor.sendQuietly(
+        exchange,
+        error("Topic not found: " + qualifiedTopicName, TOPIC_NOT_EXISTS),
+        messageId,
+        UNKNOWN_TOPIC_NAME);
+  }
+
+  private void requestForbidden(
+      HttpServerExchange exchange, String messageId, String qualifiedTopicName) {
+    messageErrorProcessor.sendQuietly(
+        exchange, error("Permission denied.", AUTH_ERROR), messageId, qualifiedTopicName);
+  }
+
+  private void blacklistedTopic(
+      HttpServerExchange exchange, String qualifiedTopicName, String messageId) {
+    messageErrorProcessor.sendQuietly(
+        exchange,
+        error("Topic blacklisted: " + qualifiedTopicName, TOPIC_BLACKLISTED),
+        messageId,
+        qualifiedTopicName);
+  }
+
+  // Default Undertow's response code (200) was changed in order to avoid situations in which
+  // something wrong happens and Hermes-Frontend
+  // does not publish message but return code 200
+  // Since the default code is 500, clients have information that they should retry publishing
+  private void setDefaultResponseCode(HttpServerExchange exchange) {
+    exchange.setStatusCode(INTERNAL_SERVER_ERROR);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/DefaultTrackingHeaderExtractor.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/DefaultTrackingHeaderExtractor.java
index 61ed5a6f7b..ab0a679e92 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/DefaultTrackingHeaderExtractor.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/DefaultTrackingHeaderExtractor.java
@@ -1,15 +1,13 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers.end;
 
 import io.undertow.util.HeaderMap;
-
 import java.util.Collections;
 import java.util.Map;
 
 public class DefaultTrackingHeaderExtractor implements TrackingHeadersExtractor {
 
-    @Override
-    public Map<String, String> extractHeadersToLog(HeaderMap headers) {
-        return Collections.emptyMap();
-    }
-
+  @Override
+  public Map<String, String> extractHeadersToLog(HeaderMap headers) {
+    return Collections.emptyMap();
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageEndProcessor.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageEndProcessor.java
index 990d151874..e33028aba2 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageEndProcessor.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageEndProcessor.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers.end;
 
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
+import static pl.allegro.tech.hermes.frontend.publishing.handlers.end.RemoteHostReader.readHostAndPort;
+
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.HttpString;
 import io.undertow.util.StatusCodes;
@@ -12,84 +15,98 @@
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 import pl.allegro.tech.hermes.tracker.frontend.Trackers;
 
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
-import static pl.allegro.tech.hermes.frontend.publishing.handlers.end.RemoteHostReader.readHostAndPort;
-
 public class MessageEndProcessor {
 
-    private static final Logger logger = LoggerFactory.getLogger(MessageEndProcessor.class);
-    private static final HttpString messageIdHeader = new HttpString(MESSAGE_ID.getName());
+  private static final Logger logger = LoggerFactory.getLogger(MessageEndProcessor.class);
+  private static final HttpString messageIdHeader = new HttpString(MESSAGE_ID.getName());
 
-    private final Trackers trackers;
-    private final BrokerListeners brokerListeners;
-    private final TrackingHeadersExtractor trackingHeadersExtractor;
+  private final Trackers trackers;
+  private final BrokerListeners brokerListeners;
+  private final TrackingHeadersExtractor trackingHeadersExtractor;
 
-    public MessageEndProcessor(Trackers trackers, BrokerListeners brokerListeners, TrackingHeadersExtractor trackingHeadersExtractor) {
-        this.trackers = trackers;
-        this.brokerListeners = brokerListeners;
-        this.trackingHeadersExtractor = trackingHeadersExtractor;
-    }
+  public MessageEndProcessor(
+      Trackers trackers,
+      BrokerListeners brokerListeners,
+      TrackingHeadersExtractor trackingHeadersExtractor) {
+    this.trackers = trackers;
+    this.brokerListeners = brokerListeners;
+    this.trackingHeadersExtractor = trackingHeadersExtractor;
+  }
 
-    public void sent(HttpServerExchange exchange, AttachmentContent attachment) {
-        trackers.get(attachment.getTopic()).logPublished(attachment.getMessageId(),
-                attachment.getTopic().getName(), readHostAndPort(exchange),
-                trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
-        sendResponse(exchange, attachment, StatusCodes.CREATED);
-        attachment.getCachedTopic().incrementPublished();
-    }
+  public void eachSent(
+      HttpServerExchange exchange, AttachmentContent attachment, String datacenter) {
+    trackers
+        .get(attachment.getTopic())
+        .logPublished(
+            attachment.getMessageId(),
+            attachment.getTopic().getName(),
+            readHostAndPort(exchange),
+            datacenter,
+            trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
+  }
 
-    public void delayedSent(HttpServerExchange exchange, CachedTopic cachedTopic, Message message) {
-        trackers.get(cachedTopic.getTopic()).logPublished(message.getId(), cachedTopic.getTopic().getName(),
-                readHostAndPort(exchange), trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
-        brokerListeners.onAcknowledge(message, cachedTopic.getTopic());
-        cachedTopic.incrementPublished();
-    }
+  public void sent(HttpServerExchange exchange, AttachmentContent attachment) {
+    sendResponse(exchange, attachment, StatusCodes.CREATED);
+  }
 
-    public void bufferedButDelayedProcessing(HttpServerExchange exchange, AttachmentContent attachment) {
-        bufferedButDelayed(exchange, attachment);
-        attachment.getCachedTopic().markDelayedProcessing();
-    }
+  public void delayedSent(CachedTopic cachedTopic, Message message) {
+    brokerListeners.onAcknowledge(message, cachedTopic.getTopic());
+  }
 
-    public void bufferedButDelayed(HttpServerExchange exchange, AttachmentContent attachment) {
-        Topic topic = attachment.getTopic();
-        brokerListeners.onTimeout(attachment.getMessage(), topic);
-        trackers.get(topic).logInflight(attachment.getMessageId(), topic.getName(),
-                readHostAndPort(exchange), trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
-        handleRaceConditionBetweenAckAndTimeout(attachment, topic);
-        sendResponse(exchange, attachment, StatusCodes.ACCEPTED);
-    }
+  public void bufferedButDelayedProcessing(
+      HttpServerExchange exchange, AttachmentContent attachment) {
+    bufferedButDelayed(exchange, attachment);
+    attachment.getCachedTopic().markDelayedProcessing();
+  }
+
+  public void bufferedButDelayed(HttpServerExchange exchange, AttachmentContent attachment) {
+    Topic topic = attachment.getTopic();
+    brokerListeners.onTimeout(attachment.getMessage(), topic);
+    trackers
+        .get(topic)
+        .logInflight(
+            attachment.getMessageId(),
+            topic.getName(),
+            readHostAndPort(exchange),
+            trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
+    handleRaceConditionBetweenAckAndTimeout(attachment, topic);
+    sendResponse(exchange, attachment, StatusCodes.ACCEPTED);
+  }
 
-    private void handleRaceConditionBetweenAckAndTimeout(AttachmentContent attachment, Topic topic) {
-        if (attachment.getMessageState().isDelayedSentToKafka()) {
-            brokerListeners.onAcknowledge(attachment.getMessage(), topic);
-        }
+  private void handleRaceConditionBetweenAckAndTimeout(AttachmentContent attachment, Topic topic) {
+    if (attachment.getMessageState().isDelayedSentToKafka()) {
+      brokerListeners.onAcknowledge(attachment.getMessage(), topic);
     }
+  }
 
-    private void sendResponse(HttpServerExchange exchange, AttachmentContent attachment, int statusCode) {
-        if (!exchange.isResponseStarted()) {
-            exchange.setStatusCode(statusCode);
-            exchange.getResponseHeaders().add(messageIdHeader, attachment.getMessageId());
-        } else {
-            logger.warn("The response has already been started. Status code set on exchange: {}; Expected status code: {};"
-                            + "Topic: {}; Message id: {}; Remote host {}",
-                    exchange.getStatusCode(),
-                    statusCode,
-                    attachment.getCachedTopic().getQualifiedName(),
-                    attachment.getMessageId(),
-                    readHostAndPort(exchange));
-        }
-        attachment.markResponseAsReady();
-        try {
-            exchange.endExchange();
-        } catch (RuntimeException exception) {
-            logger.error("Exception while ending exchange. Status code set on exchange: {}; Expected status code: {};"
-                            + "Topic: {}; Message id: {}; Remote host {}",
-                    exchange.getStatusCode(),
-                    statusCode,
-                    attachment.getCachedTopic().getQualifiedName(),
-                    attachment.getMessageId(),
-                    readHostAndPort(exchange),
-                    exception);
-        }
+  private void sendResponse(
+      HttpServerExchange exchange, AttachmentContent attachment, int statusCode) {
+    if (!exchange.isResponseStarted()) {
+      exchange.setStatusCode(statusCode);
+      exchange.getResponseHeaders().add(messageIdHeader, attachment.getMessageId());
+    } else {
+      logger.warn(
+          "The response has already been started. Status code set on exchange: {}; Expected status code: {};"
+              + "Topic: {}; Message id: {}; Remote host {}",
+          exchange.getStatusCode(),
+          statusCode,
+          attachment.getCachedTopic().getQualifiedName(),
+          attachment.getMessageId(),
+          readHostAndPort(exchange));
+    }
+    attachment.markResponseAsReady();
+    try {
+      exchange.endExchange();
+    } catch (RuntimeException exception) {
+      logger.error(
+          "Exception while ending exchange. Status code set on exchange: {}; Expected status code: {};"
+              + "Topic: {}; Message id: {}; Remote host {}",
+          exchange.getStatusCode(),
+          statusCode,
+          attachment.getCachedTopic().getQualifiedName(),
+          attachment.getMessageId(),
+          readHostAndPort(exchange),
+          exception);
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageErrorProcessor.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageErrorProcessor.java
index 5858aefea9..bfaf5748bb 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageErrorProcessor.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageErrorProcessor.java
@@ -1,10 +1,18 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers.end;
 
+import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
+import static pl.allegro.tech.hermes.api.ErrorDescription.error;
+import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
+import static pl.allegro.tech.hermes.frontend.publishing.handlers.end.RemoteHostReader.readHostAndPort;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.Headers;
 import io.undertow.util.HttpString;
 import jakarta.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.ErrorDescription;
@@ -12,118 +20,168 @@
 import pl.allegro.tech.hermes.frontend.publishing.handlers.AttachmentContent;
 import pl.allegro.tech.hermes.tracker.frontend.Trackers;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-
-import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR;
-import static pl.allegro.tech.hermes.api.ErrorDescription.error;
-import static pl.allegro.tech.hermes.common.http.MessageMetadataHeaders.MESSAGE_ID;
-import static pl.allegro.tech.hermes.frontend.publishing.handlers.end.RemoteHostReader.readHostAndPort;
-
 public class MessageErrorProcessor {
-    private static final Logger logger = LoggerFactory.getLogger(MessageErrorProcessor.class);
-    private final ObjectMapper objectMapper;
-    private final Trackers trackers;
-    private final HttpString messageIdHeader = new HttpString(MESSAGE_ID.getName());
-    private final TrackingHeadersExtractor trackingHeadersExtractor;
+  private static final Logger logger = LoggerFactory.getLogger(MessageErrorProcessor.class);
+  private final ObjectMapper objectMapper;
+  private final Trackers trackers;
+  private final HttpString messageIdHeader = new HttpString(MESSAGE_ID.getName());
+  private final TrackingHeadersExtractor trackingHeadersExtractor;
 
-    public MessageErrorProcessor(ObjectMapper objectMapper, Trackers trackers,
-                                 TrackingHeadersExtractor trackingHeadersExtractor) {
-        this.objectMapper = objectMapper;
-        this.trackers = trackers;
-        this.trackingHeadersExtractor = trackingHeadersExtractor;
-    }
+  public MessageErrorProcessor(
+      ObjectMapper objectMapper,
+      Trackers trackers,
+      TrackingHeadersExtractor trackingHeadersExtractor) {
+    this.objectMapper = objectMapper;
+    this.trackers = trackers;
+    this.trackingHeadersExtractor = trackingHeadersExtractor;
+  }
 
-    public void sendAndLog(HttpServerExchange exchange, Topic topic, String messageId, ErrorDescription error) {
-        sendQuietly(exchange, error, messageId, topic.getQualifiedName());
-        log(error.getMessage(), topic, messageId, readHostAndPort(exchange),
-                trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
-    }
+  public void sendAndLog(
+      HttpServerExchange exchange, Topic topic, String messageId, ErrorDescription error) {
+    sendQuietly(exchange, error, messageId, topic.getQualifiedName());
+    log(
+        error.getMessage(),
+        topic,
+        messageId,
+        readHostAndPort(exchange),
+        trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
+  }
 
-    public void sendAndLog(HttpServerExchange exchange, Topic topic, String messageId, ErrorDescription error, Exception exception) {
-        sendQuietly(exchange, error, messageId, topic.getQualifiedName());
-        log(error.getMessage(), topic, messageId, readHostAndPort(exchange), exception,
-                trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
-    }
+  public void sendAndLog(
+      HttpServerExchange exchange,
+      Topic topic,
+      String messageId,
+      ErrorDescription error,
+      Exception exception) {
+    sendQuietly(exchange, error, messageId, topic.getQualifiedName());
+    log(
+        error.getMessage(),
+        topic,
+        messageId,
+        readHostAndPort(exchange),
+        exception,
+        trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
+  }
 
-    public void sendAndLog(HttpServerExchange exchange, Topic topic, String messageId, Exception e) {
-        ErrorDescription error = error("Error while handling request.", INTERNAL_ERROR);
-        sendQuietly(exchange, error, messageId, topic.getQualifiedName());
-        log(error.getMessage(), topic, messageId, readHostAndPort(exchange), e,
-                trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
-    }
+  public void sendAndLog(HttpServerExchange exchange, Topic topic, String messageId, Exception e) {
+    ErrorDescription error = error("Error while handling request.", INTERNAL_ERROR);
+    sendQuietly(exchange, error, messageId, topic.getQualifiedName());
+    log(
+        error.getMessage(),
+        topic,
+        messageId,
+        readHostAndPort(exchange),
+        e,
+        trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
+  }
 
-    public void sendAndLog(HttpServerExchange exchange, String errorMessage, Exception e) {
-        AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
-        sendAndLog(exchange, attachment.getTopic(), attachment.getMessageId(), error(errorMessage, INTERNAL_ERROR), e);
-    }
+  public void sendAndLog(HttpServerExchange exchange, String errorMessage, Exception e) {
+    AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
+    sendAndLog(
+        exchange,
+        attachment.getTopic(),
+        attachment.getMessageId(),
+        error(errorMessage, INTERNAL_ERROR),
+        e);
+  }
 
-    public void sendQuietly(HttpServerExchange exchange, ErrorDescription error, String messageId, String topicName) {
-        try {
-            if (exchange.getConnection().isOpen()) {
-                if (!exchange.isResponseStarted()) {
-                    send(exchange, error, messageId);
-                } else {
-                    logger.warn("Not sending error message to a client as response has already been started. "
-                                    + "Error message: {} Topic: {} MessageId: {} Host: {}",
-                            error.getMessage(), topicName, messageId, readHostAndPort(exchange));
-                }
-            } else {
-                logger.warn("Connection to a client closed. Can't send error response. "
-                                + "Error message: {} Topic: {} MessageId: {} Host: {}",
-                        error.getMessage(), topicName, messageId, readHostAndPort(exchange));
-                exchange.endExchange();
-            }
-        } catch (Exception e) {
-            logger.warn("Exception in sending error response to a client. {} Topic: {} MessageId: {} Host: {}",
-                    error.getMessage(), topicName, messageId, readHostAndPort(exchange), e);
+  public void sendQuietly(
+      HttpServerExchange exchange, ErrorDescription error, String messageId, String topicName) {
+    try {
+      if (exchange.getConnection().isOpen()) {
+        if (!exchange.isResponseStarted()) {
+          send(exchange, error, messageId);
+        } else {
+          logger.warn(
+              "Not sending error message to a client as response has already been started. "
+                  + "Error message: {} Topic: {} MessageId: {} Host: {}",
+              error.getMessage(),
+              topicName,
+              messageId,
+              readHostAndPort(exchange));
         }
+      } else {
+        logger.warn(
+            "Connection to a client closed. Can't send error response. "
+                + "Error message: {} Topic: {} MessageId: {} Host: {}",
+            error.getMessage(),
+            topicName,
+            messageId,
+            readHostAndPort(exchange));
+        exchange.endExchange();
+      }
+    } catch (Exception e) {
+      logger.warn(
+          "Exception in sending error response to a client. {} Topic: {} MessageId: {} Host: {}",
+          error.getMessage(),
+          topicName,
+          messageId,
+          readHostAndPort(exchange),
+          e);
     }
+  }
 
-    public void log(HttpServerExchange exchange, String errorMessage, Exception exception) {
-        AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
-        log(errorMessage, attachment.getTopic(), attachment.getMessageId(), readHostAndPort(exchange), exception,
-                trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
-    }
+  public void log(HttpServerExchange exchange, String errorMessage, Exception exception) {
+    AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
+    log(
+        errorMessage,
+        attachment.getTopic(),
+        attachment.getMessageId(),
+        readHostAndPort(exchange),
+        exception,
+        trackingHeadersExtractor.extractHeadersToLog(exchange.getRequestHeaders()));
+  }
 
-    private void log(String errorMessage,
-                     Topic topic,
-                     String messageId,
-                     String hostAndPort,
-                     Map<String, String> extraRequestHeaders) {
-        logger.error(errorMessage
-                + "; publishing on topic: "
-                + topic.getQualifiedName()
-                + "; message id: "
-                + messageId
-                + "; remote host: "
-                + hostAndPort);
-        trackers.get(topic).logError(messageId, topic.getName(), errorMessage, hostAndPort, extraRequestHeaders);
-    }
+  private void log(
+      String errorMessage,
+      Topic topic,
+      String messageId,
+      String hostAndPort,
+      Map<String, String> extraRequestHeaders) {
+    logger.error(
+        errorMessage
+            + "; publishing on topic: "
+            + topic.getQualifiedName()
+            + "; message id: "
+            + messageId
+            + "; remote host: "
+            + hostAndPort);
+    trackers
+        .get(topic)
+        .logError(messageId, topic.getName(), errorMessage, hostAndPort, extraRequestHeaders);
+  }
 
-    private void log(String errorMessage,
-                     Topic topic,
-                     String messageId,
-                     String hostAndPort,
-                     Exception exception,
-                     Map<String, String> extraRequestHeaders) {
-        logger.error(errorMessage
-                        + "; publishing on topic: "
-                        + topic.getQualifiedName()
-                        + "; message id: "
-                        + messageId
-                        + "; remote host: "
-                        + hostAndPort,
-                exception);
-        trackers.get(topic).logError(messageId, topic.getName(), errorMessage, hostAndPort, extraRequestHeaders);
-    }
+  private void log(
+      String errorMessage,
+      Topic topic,
+      String messageId,
+      String hostAndPort,
+      Exception exception,
+      Map<String, String> extraRequestHeaders) {
+    logger.error(
+        errorMessage
+            + "; publishing on topic: "
+            + topic.getQualifiedName()
+            + "; message id: "
+            + messageId
+            + "; remote host: "
+            + hostAndPort,
+        exception);
+    trackers
+        .get(topic)
+        .logError(messageId, topic.getName(), errorMessage, hostAndPort, extraRequestHeaders);
+  }
 
-    private void send(HttpServerExchange exchange, ErrorDescription error, String messageId) throws IOException {
-        exchange.setStatusCode(error.getCode().getHttpCode());
-        exchange.getResponseHeaders().add(Headers.CONTENT_TYPE, MediaType.APPLICATION_JSON);
-        exchange.getResponseHeaders().add(messageIdHeader, messageId);
-        exchange.getResponseSender().send(objectMapper.writeValueAsString(error), StandardCharsets.UTF_8,
-                ResponseReadyIoCallback.INSTANCE);
-    }
+  private void send(HttpServerExchange exchange, ErrorDescription error, String messageId)
+      throws IOException {
+    exchange.setStatusCode(error.getCode().getHttpCode());
+    exchange.getResponseHeaders().add(Headers.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+    exchange.getResponseHeaders().add(messageIdHeader, messageId);
+    exchange
+        .getResponseSender()
+        .send(
+            objectMapper.writeValueAsString(error),
+            StandardCharsets.UTF_8,
+            ResponseReadyIoCallback.INSTANCE);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/RemoteHostReader.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/RemoteHostReader.java
index d43acf7fe9..ccff52c0e2 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/RemoteHostReader.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/RemoteHostReader.java
@@ -1,17 +1,16 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers.end;
 
 import io.undertow.server.HttpServerExchange;
-
 import java.net.InetSocketAddress;
 
 class RemoteHostReader {
 
-    static String readHostAndPort(HttpServerExchange exchange) {
-        InetSocketAddress sourceAddress = exchange.getSourceAddress();
-        if (sourceAddress == null) {
-            return "";
-        }
-
-        return sourceAddress.getHostString() + ":" + sourceAddress.getPort();
+  static String readHostAndPort(HttpServerExchange exchange) {
+    InetSocketAddress sourceAddress = exchange.getSourceAddress();
+    if (sourceAddress == null) {
+      return "";
     }
+
+    return sourceAddress.getHostString() + ":" + sourceAddress.getPort();
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/ResponseReadyIoCallback.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/ResponseReadyIoCallback.java
index 52a692b9f9..b35ddadbb0 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/ResponseReadyIoCallback.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/ResponseReadyIoCallback.java
@@ -4,51 +4,53 @@
 import io.undertow.io.IoCallback;
 import io.undertow.io.Sender;
 import io.undertow.server.HttpServerExchange;
+import java.io.IOException;
 import org.xnio.IoUtils;
 import pl.allegro.tech.hermes.frontend.publishing.handlers.AttachmentContent;
 
-import java.io.IOException;
-
 /*
-    Marks the response as ready and ends the exchange
- */
+   Marks the response as ready and ends the exchange
+*/
 class ResponseReadyIoCallback implements IoCallback {
 
-    static final IoCallback INSTANCE = new ResponseReadyIoCallback();
+  static final IoCallback INSTANCE = new ResponseReadyIoCallback();
 
-    private static final IoCallback CALLBACK = new IoCallback() {
+  private static final IoCallback CALLBACK =
+      new IoCallback() {
         @Override
         public void onComplete(final HttpServerExchange exchange, final Sender sender) {
-            exchange.endExchange();
+          exchange.endExchange();
         }
 
         @Override
-        public void onException(final HttpServerExchange exchange, final Sender sender, final IOException exception) {
-            UndertowLogger.REQUEST_IO_LOGGER.ioException(exception);
-            exchange.endExchange();
-        }
-    };
-
-    @Override
-    public void onComplete(final HttpServerExchange exchange, final Sender sender) {
-        markResponseAsReady(exchange);
-        sender.close(CALLBACK);
-    }
-
-    @Override
-    public void onException(final HttpServerExchange exchange, final Sender sender, final IOException exception) {
-        try {
-            markResponseAsReady(exchange);
-            exchange.endExchange();
-        } finally {
-            IoUtils.safeClose(exchange.getConnection());
+        public void onException(
+            final HttpServerExchange exchange, final Sender sender, final IOException exception) {
+          UndertowLogger.REQUEST_IO_LOGGER.ioException(exception);
+          exchange.endExchange();
         }
+      };
+
+  @Override
+  public void onComplete(final HttpServerExchange exchange, final Sender sender) {
+    markResponseAsReady(exchange);
+    sender.close(CALLBACK);
+  }
+
+  @Override
+  public void onException(
+      final HttpServerExchange exchange, final Sender sender, final IOException exception) {
+    try {
+      markResponseAsReady(exchange);
+      exchange.endExchange();
+    } finally {
+      IoUtils.safeClose(exchange.getConnection());
     }
+  }
 
-    private void markResponseAsReady(HttpServerExchange exchange) {
-        AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
-        if (attachment != null) {
-            attachment.markResponseAsReady();
-        }
+  private void markResponseAsReady(HttpServerExchange exchange) {
+    AttachmentContent attachment = exchange.getAttachment(AttachmentContent.KEY);
+    if (attachment != null) {
+      attachment.markResponseAsReady();
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/TrackingHeadersExtractor.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/TrackingHeadersExtractor.java
index e39c65d4c8..0d81431738 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/TrackingHeadersExtractor.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/TrackingHeadersExtractor.java
@@ -1,9 +1,8 @@
 package pl.allegro.tech.hermes.frontend.publishing.handlers.end;
 
 import io.undertow.util.HeaderMap;
-
 import java.util.Map;
 
 public interface TrackingHeadersExtractor {
-    Map<String, String> extractHeadersToLog(HeaderMap headers);
+  Map<String, String> extractHeadersToLog(HeaderMap headers);
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/AvroEncodedJsonAvroConverter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/AvroEncodedJsonAvroConverter.java
index a2a041feca..76f4158317 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/AvroEncodedJsonAvroConverter.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/AvroEncodedJsonAvroConverter.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.frontend.publishing.message;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
@@ -11,36 +15,31 @@
 import org.apache.avro.io.EncoderFactory;
 import tech.allegro.schema.json2avro.converter.AvroConversionException;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
 class AvroEncodedJsonAvroConverter {
 
-    byte[] convertToAvro(byte[] bytes, Schema schema) {
-        try {
-            return convertToAvro(readJson(bytes, schema), schema);
-        } catch (IOException e) {
-            throw new AvroConversionException("Failed to convert to AVRO.", e);
-        } catch (AvroRuntimeException e) {
-                throw new AvroConversionException(
-                        String.format("Failed to convert to AVRO: %s.", e.getMessage()), e);
-        }
+  byte[] convertToAvro(byte[] bytes, Schema schema) {
+    try {
+      return convertToAvro(readJson(bytes, schema), schema);
+    } catch (IOException e) {
+      throw new AvroConversionException("Failed to convert to AVRO.", e);
+    } catch (AvroRuntimeException e) {
+      throw new AvroConversionException(
+          String.format("Failed to convert to AVRO: %s.", e.getMessage()), e);
     }
+  }
 
-    private byte[] convertToAvro(GenericData.Record jsonData, Schema schema) throws IOException {
-        GenericDatumWriter<GenericData.Record> writer = new GenericDatumWriter<>(schema);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        Encoder encoder = EncoderFactory.get().binaryEncoder(outputStream, null);
-        writer.write(jsonData, encoder);
-        encoder.flush();
-        return outputStream.toByteArray();
-    }
+  private byte[] convertToAvro(GenericData.Record jsonData, Schema schema) throws IOException {
+    GenericDatumWriter<GenericData.Record> writer = new GenericDatumWriter<>(schema);
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    Encoder encoder = EncoderFactory.get().binaryEncoder(outputStream, null);
+    writer.write(jsonData, encoder);
+    encoder.flush();
+    return outputStream.toByteArray();
+  }
 
-    private GenericData.Record readJson(byte[] bytes, Schema schema) throws IOException {
-        InputStream input = new ByteArrayInputStream(bytes);
-        Decoder decoder = DecoderFactory.get().jsonDecoder(schema, input);
-        return new GenericDatumReader<GenericData.Record>(schema).read(null, decoder);
-    }
+  private GenericData.Record readJson(byte[] bytes, Schema schema) throws IOException {
+    InputStream input = new ByteArrayInputStream(bytes);
+    Decoder decoder = DecoderFactory.get().jsonDecoder(schema, input);
+    return new GenericDatumReader<GenericData.Record>(schema).read(null, decoder);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/AvroEnforcer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/AvroEnforcer.java
index e22dfd1f40..200ebb646d 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/AvroEnforcer.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/AvroEnforcer.java
@@ -5,5 +5,5 @@
 
 public interface AvroEnforcer {
 
-    byte[] enforceAvro(String payloadContentType, byte[] data, Schema schema, Topic topic);
+  byte[] enforceAvro(String payloadContentType, byte[] data, Schema schema, Topic topic);
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/JsonMessage.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/JsonMessage.java
index 4409af800c..1f44f67e68 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/JsonMessage.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/JsonMessage.java
@@ -1,48 +1,60 @@
 package pl.allegro.tech.hermes.frontend.publishing.message;
 
+import java.util.Map;
 import pl.allegro.tech.hermes.api.ContentType;
 
 public class JsonMessage implements Message {
 
-    private final String id;
-    private final byte[] data;
-    private final long timestamp;
-    private final String partitionKey;
-
-    public JsonMessage(String id, byte[] data, long timestamp, String partitionKey) {
-        this.id = id;
-        this.data = data;
-        this.timestamp = timestamp;
-        this.partitionKey = partitionKey;
-    }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public byte[] getData() {
-        return data;
-    }
-
-    @Override
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    @Override
-    public ContentType getContentType() {
-        return ContentType.JSON;
-    }
-
-    @Override
-    public String getPartitionKey() {
-        return partitionKey;
-    }
-
-    public JsonMessage withDataReplaced(byte[] newData) {
-        return new JsonMessage(id, newData, timestamp, partitionKey);
-    }
-
+  private final String id;
+  private final byte[] data;
+  private final long timestamp;
+  private final String partitionKey;
+  private final Map<String, String> propagatedHTTPHeaders;
+
+  public JsonMessage(
+      String id,
+      byte[] data,
+      long timestamp,
+      String partitionKey,
+      Map<String, String> propagatedHTTPHeaders) {
+    this.id = id;
+    this.data = data;
+    this.timestamp = timestamp;
+    this.partitionKey = partitionKey;
+    this.propagatedHTTPHeaders = propagatedHTTPHeaders;
+  }
+
+  @Override
+  public String getId() {
+    return id;
+  }
+
+  @Override
+  public byte[] getData() {
+    return data;
+  }
+
+  @Override
+  public long getTimestamp() {
+    return timestamp;
+  }
+
+  @Override
+  public ContentType getContentType() {
+    return ContentType.JSON;
+  }
+
+  @Override
+  public String getPartitionKey() {
+    return partitionKey;
+  }
+
+  @Override
+  public Map<String, String> getHTTPHeaders() {
+    return propagatedHTTPHeaders;
+  }
+
+  public JsonMessage withDataReplaced(byte[] newData) {
+    return new JsonMessage(id, newData, timestamp, partitionKey, propagatedHTTPHeaders);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/Message.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/Message.java
index 5a13ff72d1..0ed5589e99 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/Message.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/Message.java
@@ -1,26 +1,28 @@
 package pl.allegro.tech.hermes.frontend.publishing.message;
 
+import java.util.Map;
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.util.Optional;
-
 public interface Message {
-    String getId();
+  String getId();
+
+  byte[] getData();
 
-    byte[] getData();
+  long getTimestamp();
 
-    long getTimestamp();
+  ContentType getContentType();
 
-    ContentType getContentType();
+  String getPartitionKey();
 
-    String getPartitionKey();
+  default <T> Optional<CompiledSchema<T>> getCompiledSchema() {
+    return Optional.empty();
+  }
 
-    default <T> Optional<CompiledSchema<T>> getCompiledSchema() {
-        return Optional.empty();
-    }
+  default <T> T getSchema() {
+    return this.<T>getCompiledSchema().get().getSchema();
+  }
 
-    default <T> T getSchema() {
-        return this.<T>getCompiledSchema().get().getSchema();
-    }
+  Map<String, String> getHTTPHeaders();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcer.java
index ad1d7c7913..29382c3192 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcer.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcer.java
@@ -1,50 +1,53 @@
 package pl.allegro.tech.hermes.frontend.publishing.message;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
+import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_JSON;
+
 import org.apache.avro.Schema;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.message.wrapper.UnsupportedContentTypeException;
 import tech.allegro.schema.json2avro.converter.JsonAvroConverter;
 
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
-import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_JSON;
-
 public class MessageContentTypeEnforcer implements AvroEnforcer {
 
-    private static final String APPLICATION_JSON_WITH_DELIM = APPLICATION_JSON + ";";
-    private static final String AVRO_JSON_WITH_DELIM = AVRO_JSON + ";";
-    private static final String AVRO_BINARY_WITH_DELIM = AVRO_BINARY + ";";
-    private final JsonAvroConverter defaultJsonAvroConverter = new JsonAvroConverter();
-    private final AvroEncodedJsonAvroConverter avroEncodedJsonAvroConverter = new AvroEncodedJsonAvroConverter();
-
-    @Override
-    public byte[] enforceAvro(String payloadContentType, byte[] data, Schema schema, Topic topic) {
-        String contentTypeLowerCase = StringUtils.lowerCase(payloadContentType);
-        if (isJson(contentTypeLowerCase)) {
-            return defaultJsonAvroConverter.convertToAvro(data, schema);
-        } else if (isAvroJson(contentTypeLowerCase)) {
-            return avroEncodedJsonAvroConverter.convertToAvro(data, schema);
-        } else if (isAvroBinary(contentTypeLowerCase)) {
-            return data;
-        } else {
-            throw new UnsupportedContentTypeException(payloadContentType, topic);
-        }
+  private static final String APPLICATION_JSON_WITH_DELIM = APPLICATION_JSON + ";";
+  private static final String AVRO_JSON_WITH_DELIM = AVRO_JSON + ";";
+  private static final String AVRO_BINARY_WITH_DELIM = AVRO_BINARY + ";";
+  private final JsonAvroConverter defaultJsonAvroConverter = new JsonAvroConverter();
+  private final AvroEncodedJsonAvroConverter avroEncodedJsonAvroConverter =
+      new AvroEncodedJsonAvroConverter();
+
+  @Override
+  public byte[] enforceAvro(String payloadContentType, byte[] data, Schema schema, Topic topic) {
+    String contentTypeLowerCase = StringUtils.lowerCase(payloadContentType);
+    if (isJson(contentTypeLowerCase)) {
+      return defaultJsonAvroConverter.convertToAvro(data, schema);
+    } else if (isAvroJson(contentTypeLowerCase)) {
+      return avroEncodedJsonAvroConverter.convertToAvro(data, schema);
+    } else if (isAvroBinary(contentTypeLowerCase)) {
+      return data;
+    } else {
+      throw new UnsupportedContentTypeException(payloadContentType, topic);
     }
+  }
 
-    private boolean isJson(String contentType) {
-        return isOfType(contentType, APPLICATION_JSON, APPLICATION_JSON_WITH_DELIM);
-    }
+  private boolean isJson(String contentType) {
+    return isOfType(contentType, APPLICATION_JSON, APPLICATION_JSON_WITH_DELIM);
+  }
 
-    private boolean isAvroJson(String contentType) {
-        return isOfType(contentType, AVRO_JSON, AVRO_JSON_WITH_DELIM);
-    }
+  private boolean isAvroJson(String contentType) {
+    return isOfType(contentType, AVRO_JSON, AVRO_JSON_WITH_DELIM);
+  }
 
-    private boolean isAvroBinary(String contentType) {
-        return isOfType(contentType, AVRO_BINARY, AVRO_BINARY_WITH_DELIM);
-    }
+  private boolean isAvroBinary(String contentType) {
+    return isOfType(contentType, AVRO_BINARY, AVRO_BINARY_WITH_DELIM);
+  }
 
-    private boolean isOfType(String contentType, String expectedContentType, String expectedWithDelim) {
-        return contentType != null && (contentType.equals(expectedContentType) || contentType.startsWith(expectedWithDelim));
-    }
+  private boolean isOfType(
+      String contentType, String expectedContentType, String expectedWithDelim) {
+    return contentType != null
+        && (contentType.equals(expectedContentType) || contentType.startsWith(expectedWithDelim));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageFactory.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageFactory.java
index e0dfd62a68..ea032a6b6a 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageFactory.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageFactory.java
@@ -1,8 +1,12 @@
 package pl.allegro.tech.hermes.frontend.publishing.message;
 
+import static java.util.Optional.of;
+
 import io.undertow.util.HeaderMap;
-import io.undertow.util.HeaderValues;
 import io.undertow.util.Headers;
+import java.time.Clock;
+import java.util.Map;
+import java.util.Optional;
 import org.apache.avro.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,151 +26,164 @@
 import pl.allegro.tech.hermes.schema.SchemaVersion;
 import tech.allegro.schema.json2avro.converter.AvroConversionException;
 
-import java.time.Clock;
-import java.util.Map;
-import java.util.Optional;
-
-import static java.util.Optional.of;
-import static java.util.Spliterators.spliteratorUnknownSize;
-import static java.util.stream.Collectors.toMap;
-import static java.util.stream.StreamSupport.stream;
-
 public class MessageFactory {
 
-    private static final Logger logger = LoggerFactory.getLogger(MessageFactory.class);
-
-    private final MessageValidators validators;
-    private final AvroEnforcer enforcer;
-    private final SchemaRepository schemaRepository;
-    private final HeadersPropagator headersPropagator;
-    private final MessageContentWrapper messageContentWrapper;
-    private final Clock clock;
-    private final boolean schemaIdHeaderEnabled;
-
-    public MessageFactory(MessageValidators validators,
-                          AvroEnforcer enforcer,
-                          SchemaRepository schemaRepository,
-                          HeadersPropagator headersPropagator,
-                          MessageContentWrapper messageContentWrapper,
-                          Clock clock,
-                          boolean schemaIdHeaderEnabled) {
-        this.validators = validators;
-        this.enforcer = enforcer;
-        this.messageContentWrapper = messageContentWrapper;
-        this.schemaRepository = schemaRepository;
-        this.headersPropagator = headersPropagator;
-        this.clock = clock;
-        this.schemaIdHeaderEnabled = schemaIdHeaderEnabled;
-    }
-
-    public Message create(HeaderMap headerMap, AttachmentContent attachment) {
-        return create(
-                headerMap,
-                attachment.getTopic(),
-                attachment.getMessageId(),
-                attachment.getMessageContent());
-    }
-
-    private Message create(HeaderMap headerMap, Topic topic, String messageId, byte[] messageContent) {
-        long timestamp = clock.millis();
-        switch (topic.getContentType()) {
-            case JSON: {
-                if (topic.isJsonToAvroDryRunEnabled()) {
-                    try {
-                        createAvroMessage(headerMap, topic, messageId, messageContent, timestamp);
-                    } catch (AvroConversionException exception) {
-                        logger.warn("Unsuccessful message conversion from JSON to AVRO on topic {} in dry run mode",
-                                topic.getQualifiedName(), exception);
-                    } catch (WrappingException | AvroInvalidMetadataException exception) {
-                        logger.warn("Unsuccessful wrapping of AVRO message on topic {} in dry run mode",
-                                topic.getQualifiedName(), exception);
-                    }
-                }
-                return createJsonMessage(headerMap, messageId, messageContent, timestamp);
+  private static final Logger logger = LoggerFactory.getLogger(MessageFactory.class);
+
+  private final MessageValidators validators;
+  private final AvroEnforcer enforcer;
+  private final SchemaRepository schemaRepository;
+  private final HeadersPropagator headersPropagator;
+  private final MessageContentWrapper messageContentWrapper;
+  private final Clock clock;
+  private final boolean schemaIdHeaderEnabled;
+
+  public MessageFactory(
+      MessageValidators validators,
+      AvroEnforcer enforcer,
+      SchemaRepository schemaRepository,
+      HeadersPropagator headersPropagator,
+      MessageContentWrapper messageContentWrapper,
+      Clock clock,
+      boolean schemaIdHeaderEnabled) {
+    this.validators = validators;
+    this.enforcer = enforcer;
+    this.messageContentWrapper = messageContentWrapper;
+    this.schemaRepository = schemaRepository;
+    this.headersPropagator = headersPropagator;
+    this.clock = clock;
+    this.schemaIdHeaderEnabled = schemaIdHeaderEnabled;
+  }
+
+  public Message create(HeaderMap headerMap, AttachmentContent attachment) {
+    return create(
+        headerMap,
+        attachment.getTopic(),
+        attachment.getMessageId(),
+        attachment.getMessageContent());
+  }
+
+  private Message create(
+      HeaderMap headerMap, Topic topic, String messageId, byte[] messageContent) {
+    long timestamp = clock.millis();
+    switch (topic.getContentType()) {
+      case JSON:
+        {
+          if (topic.isJsonToAvroDryRunEnabled()) {
+            try {
+              createAvroMessage(headerMap, topic, messageId, messageContent, timestamp);
+            } catch (AvroConversionException exception) {
+              logger.warn(
+                  "Unsuccessful message conversion from JSON to AVRO on topic {} in dry run mode",
+                  topic.getQualifiedName(),
+                  exception);
+            } catch (WrappingException | AvroInvalidMetadataException exception) {
+              logger.warn(
+                  "Unsuccessful wrapping of AVRO message on topic {} in dry run mode",
+                  topic.getQualifiedName(),
+                  exception);
             }
-            case AVRO:
-                return createAvroMessage(headerMap, topic, messageId, messageContent, timestamp);
-            default:
-                throw new UnsupportedContentTypeException(topic);
+          }
+          return createJsonMessage(headerMap, messageId, messageContent, timestamp);
         }
+      case AVRO:
+        return createAvroMessage(headerMap, topic, messageId, messageContent, timestamp);
+      default:
+        throw new UnsupportedContentTypeException(topic);
     }
-
-    private JsonMessage createJsonMessage(HeaderMap headerMap, String messageId, byte[] messageContent, long timestamp) {
-        Map<String, String> extraRequestHeaders = headersPropagator.extract(toHeadersMap(headerMap));
-        JsonMessage message = new JsonMessage(messageId, messageContent, timestamp, extractPartitionKey(headerMap));
-        byte[] wrapped = messageContentWrapper
-                .wrapJson(message.getData(), message.getId(), message.getTimestamp(), extraRequestHeaders);
-        return message.withDataReplaced(wrapped);
-    }
-
-    private CompiledSchema<Schema> getCompiledSchemaBySchemaVersion(HeaderMap headerMap, Topic topic) {
-        return extractSchemaVersion(headerMap)
-                .map(version -> schemaRepository.getAvroSchema(topic, version))
-                .orElseGet(() -> schemaRepository.getLatestAvroSchema(topic));
+  }
+
+  private JsonMessage createJsonMessage(
+      HeaderMap headerMap, String messageId, byte[] messageContent, long timestamp) {
+    Map<String, String> extraRequestHeaders = headersPropagator.extract(headerMap);
+    JsonMessage message =
+        new JsonMessage(
+            messageId,
+            messageContent,
+            timestamp,
+            extractPartitionKey(headerMap),
+            extraRequestHeaders);
+    byte[] wrapped =
+        messageContentWrapper.wrapJson(
+            message.getData(), message.getId(), message.getTimestamp(), extraRequestHeaders);
+    return message.withDataReplaced(wrapped);
+  }
+
+  private CompiledSchema<Schema> getCompiledSchemaBySchemaVersion(
+      HeaderMap headerMap, Topic topic) {
+    return extractSchemaVersion(headerMap)
+        .map(version -> schemaRepository.getAvroSchema(topic, version))
+        .orElseGet(() -> schemaRepository.getLatestAvroSchema(topic));
+  }
+
+  private CompiledSchema<Schema> getCompiledSchema(HeaderMap headerMap, Topic topic) {
+    return extractSchemaId(headerMap)
+        .map(id -> schemaRepository.getAvroSchema(topic, id))
+        .orElseGet(() -> getCompiledSchemaBySchemaVersion(headerMap, topic));
+  }
+
+  private AvroMessage createAvroMessage(
+      HeaderMap headerMap, Topic topic, String messageId, byte[] messageContent, long timestamp) {
+    CompiledSchema<Schema> schema = getCompiledSchema(headerMap, topic);
+    Map<String, String> extraRequestHeaders = headersPropagator.extract(headerMap);
+
+    AvroMessage message =
+        new AvroMessage(
+            messageId,
+            enforcer.enforceAvro(
+                headerMap.getFirst(Headers.CONTENT_TYPE_STRING),
+                messageContent,
+                schema.getSchema(),
+                topic),
+            timestamp,
+            schema,
+            extractPartitionKey(headerMap),
+            extraRequestHeaders);
+
+    validators.check(topic, message);
+    byte[] wrapped =
+        messageContentWrapper.wrapAvro(
+            message.getData(),
+            message.getId(),
+            message.getTimestamp(),
+            topic,
+            schema,
+            extraRequestHeaders);
+    return message.withDataReplaced(wrapped);
+  }
+
+  private Optional<SchemaVersion> extractSchemaVersion(HeaderMap headerMap) {
+    String schemaVersion = headerMap.getFirst(MessageMetadataHeaders.SCHEMA_VERSION.getName());
+
+    if (schemaVersion == null) {
+      return Optional.empty();
     }
-
-    private CompiledSchema<Schema> getCompiledSchema(HeaderMap headerMap, Topic topic) {
-        return extractSchemaId(headerMap)
-                .map(id -> schemaRepository.getAvroSchema(topic, id))
-                .orElseGet(() -> getCompiledSchemaBySchemaVersion(headerMap, topic));
+    try {
+      return of(SchemaVersion.valueOf(Integer.parseInt(schemaVersion)));
+    } catch (NumberFormatException e) {
+      return Optional.empty();
     }
+  }
 
-    private AvroMessage createAvroMessage(HeaderMap headerMap, Topic topic, String messageId, byte[] messageContent, long timestamp) {
-        CompiledSchema<Schema> schema = getCompiledSchema(headerMap, topic);
-        Map<String, String> extraRequestHeaders = headersPropagator.extract(toHeadersMap(headerMap));
-
-        AvroMessage message = new AvroMessage(
-                messageId,
-                enforcer.enforceAvro(headerMap.getFirst(Headers.CONTENT_TYPE_STRING), messageContent, schema.getSchema(), topic),
-                timestamp,
-                schema,
-                extractPartitionKey(headerMap));
-
-        validators.check(topic, message);
-        byte[] wrapped = messageContentWrapper.wrapAvro(message.getData(), message.getId(), message.getTimestamp(),
-                topic, schema, extraRequestHeaders);
-        return message.withDataReplaced(wrapped);
+  private Optional<SchemaId> extractSchemaId(HeaderMap headerMap) {
+    if (!schemaIdHeaderEnabled) {
+      return Optional.empty();
     }
 
-    private Optional<SchemaVersion> extractSchemaVersion(HeaderMap headerMap) {
-        String schemaVersion = headerMap.getFirst(MessageMetadataHeaders.SCHEMA_VERSION.getName());
+    String schemaId = headerMap.getFirst(MessageMetadataHeaders.SCHEMA_ID.getName());
 
-        if (schemaVersion == null) {
-            return Optional.empty();
-        }
-        try {
-            return of(SchemaVersion.valueOf(Integer.parseInt(schemaVersion)));
-        } catch (NumberFormatException e) {
-            return Optional.empty();
-        }
+    if (schemaId == null) {
+      return Optional.empty();
     }
 
-    private Optional<SchemaId> extractSchemaId(HeaderMap headerMap) {
-        if (!schemaIdHeaderEnabled) {
-            return Optional.empty();
-        }
-
-        String schemaId = headerMap.getFirst(MessageMetadataHeaders.SCHEMA_ID.getName());
-
-        if (schemaId == null) {
-            return Optional.empty();
-        }
-
-        try {
-            return of(SchemaId.valueOf(Integer.parseInt(schemaId)));
-        } catch (NumberFormatException e) {
-            return Optional.empty();
-        }
+    try {
+      return of(SchemaId.valueOf(Integer.parseInt(schemaId)));
+    } catch (NumberFormatException e) {
+      return Optional.empty();
     }
+  }
 
-    private String extractPartitionKey(HeaderMap headerMap) {
-        return headerMap.getFirst(MessageMetadataHeaders.PARTITION_KEY.getName());
-    }
-
-    private static Map<String, String> toHeadersMap(HeaderMap headerMap) {
-        return stream(spliteratorUnknownSize(headerMap.iterator(), 0), false)
-                .collect(toMap(
-                        h -> h.getHeaderName().toString(),
-                        HeaderValues::getFirst));
-    }
+  private String extractPartitionKey(HeaderMap headerMap) {
+    return headerMap.getFirst(MessageMetadataHeaders.PARTITION_KEY.getName());
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageIdGenerator.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageIdGenerator.java
index 4baf14fbe4..08d419e1ee 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageIdGenerator.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageIdGenerator.java
@@ -4,7 +4,7 @@
 
 public class MessageIdGenerator {
 
-    public static String generate() {
-        return UUID.randomUUID().toString();
-    }
+  public static String generate() {
+    return UUID.randomUUID().toString();
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageState.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageState.java
index a18baa68d2..07b9944a39 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageState.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageState.java
@@ -1,7 +1,5 @@
 package pl.allegro.tech.hermes.frontend.publishing.message;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 import static pl.allegro.tech.hermes.frontend.publishing.message.MessageState.State.DELAYED_PROCESSING;
 import static pl.allegro.tech.hermes.frontend.publishing.message.MessageState.State.DELAYED_SENDING;
 import static pl.allegro.tech.hermes.frontend.publishing.message.MessageState.State.DELAYED_SENT_TO_KAFKA;
@@ -15,86 +13,96 @@
 import static pl.allegro.tech.hermes.frontend.publishing.message.MessageState.State.SENDING_TO_KAFKA;
 import static pl.allegro.tech.hermes.frontend.publishing.message.MessageState.State.SENDING_TO_KAFKA_PRODUCER_QUEUE;
 import static pl.allegro.tech.hermes.frontend.publishing.message.MessageState.State.SENT_TO_KAFKA;
+import static pl.allegro.tech.hermes.frontend.publishing.message.MessageState.State.TIMEOUT_SENDING_TO_KAFKA;
+
+import java.util.concurrent.atomic.AtomicReference;
 
 public class MessageState {
 
-    enum State {
-        INIT,
-        PREMATURE_TIMEOUT,
-        READING,
-        READING_TIMEOUT,
-        READING_ERROR,
-        FULLY_READ,
-        SENDING_TO_KAFKA_PRODUCER_QUEUE,
-        ERROR_IN_SENDING_TO_KAFKA,
-        SENDING_TO_KAFKA,
-        SENT_TO_KAFKA,
-        DELAYED_SENDING,
-        DELAYED_PROCESSING,
-        DELAYED_SENT_TO_KAFKA
-    }
-
-    private volatile boolean timeoutHasPassed = false;
-    private final AtomicReference<State> state = new AtomicReference<>(State.INIT);
-
-    public boolean setReading() {
-        return state.compareAndSet(INIT, READING);
-    }
-
-    public void setPrematureTimeout() {
-        state.compareAndSet(INIT, PREMATURE_TIMEOUT);
-    }
-
-    public boolean setFullyRead() {
-        return state.compareAndSet(READING, FULLY_READ);
-    }
-
-    public boolean isReadingTimeout() {
-        return state.get() == READING_TIMEOUT;
-    }
-
-    public void setSendingToKafkaProducerQueue() {
-        state.set(SENDING_TO_KAFKA_PRODUCER_QUEUE);
-    }
-
-    public boolean setSentToKafka() {
-        return state.compareAndSet(SENDING_TO_KAFKA, SENT_TO_KAFKA) || state.compareAndSet(SENDING_TO_KAFKA_PRODUCER_QUEUE, SENT_TO_KAFKA);
-    }
-
-    public boolean isDelayedSentToKafka() {
-        return state.get() == DELAYED_SENT_TO_KAFKA;
-    }
-
-    public boolean setDelayedSending() {
-        return state.compareAndSet(SENDING_TO_KAFKA, DELAYED_SENDING);
-    }
-
-    public boolean setReadingTimeout() {
-        return state.compareAndSet(READING, READING_TIMEOUT);
-    }
-
-    public boolean setReadingError() {
-        return state.compareAndSet(READING, READING_ERROR);
-    }
-
-    public void setErrorInSendingToKafka() {
-        state.set(ERROR_IN_SENDING_TO_KAFKA);
-    }
-
-    public boolean setSendingToKafka() {
-        return state.compareAndSet(SENDING_TO_KAFKA_PRODUCER_QUEUE, SENDING_TO_KAFKA);
-    }
-
-    public boolean setDelayedProcessing() {
-        return timeoutHasPassed && state.compareAndSet(SENDING_TO_KAFKA, DELAYED_PROCESSING);
-    }
-
-    public boolean setDelayedSentToKafka() {
-        return state.compareAndSet(DELAYED_SENDING, DELAYED_SENT_TO_KAFKA)
-                || state.compareAndSet(DELAYED_PROCESSING, DELAYED_SENT_TO_KAFKA);
-    }
-
-    public void setTimeoutHasPassed() {
-        timeoutHasPassed = true;
-    }
+  enum State {
+    INIT,
+    PREMATURE_TIMEOUT,
+    READING,
+    READING_TIMEOUT,
+    READING_ERROR,
+    FULLY_READ,
+    SENDING_TO_KAFKA_PRODUCER_QUEUE,
+    ERROR_IN_SENDING_TO_KAFKA,
+    SENDING_TO_KAFKA,
+    SENT_TO_KAFKA,
+    DELAYED_SENDING,
+    DELAYED_PROCESSING,
+    DELAYED_SENT_TO_KAFKA,
+    TIMEOUT_SENDING_TO_KAFKA,
+  }
+
+  private volatile boolean timeoutHasPassed = false;
+  private final AtomicReference<State> state = new AtomicReference<>(State.INIT);
+
+  public boolean setReading() {
+    return state.compareAndSet(INIT, READING);
+  }
+
+  public void setPrematureTimeout() {
+    state.compareAndSet(INIT, PREMATURE_TIMEOUT);
+  }
+
+  public boolean setFullyRead() {
+    return state.compareAndSet(READING, FULLY_READ);
+  }
+
+  public boolean isReadingTimeout() {
+    return state.get() == READING_TIMEOUT;
+  }
+
+  public void setSendingToKafkaProducerQueue() {
+    state.set(SENDING_TO_KAFKA_PRODUCER_QUEUE);
+  }
+
+  public boolean setSentToKafka() {
+    return state.compareAndSet(SENDING_TO_KAFKA, SENT_TO_KAFKA)
+        || state.compareAndSet(SENDING_TO_KAFKA_PRODUCER_QUEUE, SENT_TO_KAFKA);
+  }
+
+  public boolean isDelayedSentToKafka() {
+    return state.get() == DELAYED_SENT_TO_KAFKA;
+  }
+
+  public boolean setDelayedSending() {
+    return state.compareAndSet(SENDING_TO_KAFKA, DELAYED_SENDING);
+  }
+
+  public boolean setTimeoutSendingToKafka() {
+    return state.compareAndSet(SENDING_TO_KAFKA_PRODUCER_QUEUE, TIMEOUT_SENDING_TO_KAFKA)
+        || state.compareAndSet(SENDING_TO_KAFKA, TIMEOUT_SENDING_TO_KAFKA);
+  }
+
+  public boolean setReadingTimeout() {
+    return state.compareAndSet(READING, READING_TIMEOUT);
+  }
+
+  public boolean setReadingError() {
+    return state.compareAndSet(READING, READING_ERROR);
+  }
+
+  public void setErrorInSendingToKafka() {
+    state.set(ERROR_IN_SENDING_TO_KAFKA);
+  }
+
+  public boolean setSendingToKafka() {
+    return state.compareAndSet(SENDING_TO_KAFKA_PRODUCER_QUEUE, SENDING_TO_KAFKA);
+  }
+
+  public boolean setDelayedProcessing() {
+    return timeoutHasPassed && state.compareAndSet(SENDING_TO_KAFKA, DELAYED_PROCESSING);
+  }
+
+  public boolean setDelayedSentToKafka() {
+    return state.compareAndSet(DELAYED_SENDING, DELAYED_SENT_TO_KAFKA)
+        || state.compareAndSet(DELAYED_PROCESSING, DELAYED_SENT_TO_KAFKA);
+  }
+
+  public void setTimeoutHasPassed() {
+    timeoutHasPassed = true;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageToJsonConverter.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageToJsonConverter.java
index 0b4f5332db..7422f60633 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageToJsonConverter.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageToJsonConverter.java
@@ -1,28 +1,33 @@
 package pl.allegro.tech.hermes.frontend.publishing.message;
 
+import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
+
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.common.message.wrapper.SchemaAwareSerDe;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 import tech.allegro.schema.json2avro.converter.JsonAvroConverter;
 
-import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
-
 public class MessageToJsonConverter {
-    private final JsonAvroConverter converter = new JsonAvroConverter();
-
-    public byte[] convert(Message message, boolean schemaIdAwareSerializationEnabled) {
-        try {
-            return message.<Schema>getCompiledSchema()
-                    .map(schema -> convertToJson(message.getData(), schema, schemaIdAwareSerializationEnabled))
-                    .orElseGet(message::getData);
-        } catch (Exception ignored) {
-            return message.getData();
-        }
-    }
+  private final JsonAvroConverter converter = new JsonAvroConverter();
 
-    private byte[] convertToJson(byte[] avro, CompiledSchema<Schema> schema, boolean schemaIdAwareSerializationEnabled) {
-        byte[] schemaAwareAvro = schemaIdAwareSerializationEnabled ? SchemaAwareSerDe.trimMagicByteAndSchemaVersion(avro) : avro;
-        return converter.convertToJson(bytesToRecord(schemaAwareAvro, schema.getSchema()));
+  public byte[] convert(Message message, boolean schemaIdAwareSerializationEnabled) {
+    try {
+      return message
+          .<Schema>getCompiledSchema()
+          .map(
+              schema -> convertToJson(message.getData(), schema, schemaIdAwareSerializationEnabled))
+          .orElseGet(message::getData);
+    } catch (Exception ignored) {
+      return message.getData();
     }
+  }
 
+  private byte[] convertToJson(
+      byte[] avro, CompiledSchema<Schema> schema, boolean schemaIdAwareSerializationEnabled) {
+    byte[] schemaAwareAvro =
+        schemaIdAwareSerializationEnabled
+            ? SchemaAwareSerDe.trimMagicByteAndSchemaVersion(avro)
+            : avro;
+    return converter.convertToJson(bytesToRecord(schemaAwareAvro, schema.getSchema()));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/DefaultHeadersPropagator.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/DefaultHeadersPropagator.java
index 880b0b4019..7aa6f0238d 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/DefaultHeadersPropagator.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/DefaultHeadersPropagator.java
@@ -1,44 +1,65 @@
 package pl.allegro.tech.hermes.frontend.publishing.metadata;
 
-import com.google.common.collect.ImmutableMap;
+import static java.util.Spliterators.spliteratorUnknownSize;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.StreamSupport.stream;
 
-import java.util.Arrays;
+import com.google.common.collect.ImmutableMap;
+import io.undertow.util.HeaderMap;
+import io.undertow.util.HeaderValues;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
-
-import static java.util.Collections.emptySet;
-import static java.util.stream.Collectors.toSet;
-
-public class DefaultHeadersPropagator implements HeadersPropagator {
-
-    private final boolean propagate;
-    private final Set<String> supportedHeaders;
-
-    public DefaultHeadersPropagator(boolean enabled, String allowFilter) {
-        if (enabled) {
-            propagate = true;
-            supportedHeaders = Arrays.stream(allowFilter.split(","))
-                    .map(String::trim)
-                    .filter(v -> v.length() > 0)
-                    .collect(toSet());
-        } else {
-            propagate = false;
-            supportedHeaders = emptySet();
-        }
-    }
+import pl.allegro.tech.hermes.frontend.config.HTTPHeadersProperties;
+import pl.allegro.tech.hermes.frontend.publishing.handlers.end.TrackingHeadersExtractor;
+
+public class DefaultHeadersPropagator implements HeadersPropagator, TrackingHeadersExtractor {
+
+  private final boolean propagate;
+  private final Set<String> supportedHeaders;
+  private final Set<String> trackingHeaders;
 
-    @Override
-    public Map<String, String> extract(Map<String, String> headers) {
-        if (propagate) {
-            if (supportedHeaders.isEmpty()) {
-                return ImmutableMap.copyOf(headers);
-            }
-            return headers.entrySet().stream()
-                    .filter(e -> this.supportedHeaders.contains(e.getKey()))
-                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-        } else {
-            return ImmutableMap.of();
-        }
+  public DefaultHeadersPropagator(HTTPHeadersProperties httpHeadersProperties) {
+    propagate = httpHeadersProperties.isPropagationEnabled();
+    supportedHeaders = httpHeadersProperties.getAllowedSet();
+    trackingHeaders =
+        new HashSet<>() {
+          {
+            addAll(httpHeadersProperties.getAllowedSet());
+            addAll(httpHeadersProperties.getAdditionalAllowedSetToLog());
+          }
+        };
+  }
+
+  @Override
+  public Map<String, String> extract(HeaderMap headerMap) {
+    if (propagate) {
+      Map<String, String> headers = toHeadersMap(headerMap);
+      if (supportedHeaders.isEmpty()) {
+        return ImmutableMap.copyOf(headers);
+      }
+
+      return extractHeaders(headers, supportedHeaders);
+    } else {
+      return ImmutableMap.of();
     }
+  }
+
+  @Override
+  public Map<String, String> extractHeadersToLog(HeaderMap headers) {
+    return extractHeaders(toHeadersMap(headers), trackingHeaders);
+  }
+
+  private static Map<String, String> toHeadersMap(HeaderMap headerMap) {
+    return stream(spliteratorUnknownSize(headerMap.iterator(), 0), false)
+        .collect(toMap(h -> h.getHeaderName().toString(), HeaderValues::getFirst));
+  }
+
+  private static Map<String, String> extractHeaders(
+      Map<String, String> headers, Set<String> headersToExtract) {
+    return headers.entrySet().stream()
+        .filter(headerEntry -> headersToExtract.contains(headerEntry.getKey().toLowerCase()))
+        .filter(headerEntry -> !headerEntry.getValue().isEmpty())
+        .collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/HeadersPropagator.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/HeadersPropagator.java
index cd4406f3a6..4b9da6e54f 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/HeadersPropagator.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/HeadersPropagator.java
@@ -1,9 +1,9 @@
 package pl.allegro.tech.hermes.frontend.publishing.metadata;
 
-
+import io.undertow.util.HeaderMap;
 import java.util.Map;
 
 public interface HeadersPropagator {
 
-    Map<String, String> extract(Map<String, String> headers);
+  Map<String, String> extract(HeaderMap headers);
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/ProduceMetadata.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/ProduceMetadata.java
new file mode 100644
index 0000000000..e02ce7a641
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/metadata/ProduceMetadata.java
@@ -0,0 +1,20 @@
+package pl.allegro.tech.hermes.frontend.publishing.metadata;
+
+import jakarta.annotation.Nullable;
+import java.util.Optional;
+
+public class ProduceMetadata {
+  @Nullable private final String broker;
+
+  public ProduceMetadata(@Nullable String broker) {
+    this.broker = broker;
+  }
+
+  public Optional<String> getBroker() {
+    return Optional.ofNullable(broker);
+  }
+
+  public static ProduceMetadata empty() {
+    return new ProduceMetadata(null);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/DefaultMessagePreviewPersister.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/DefaultMessagePreviewPersister.java
index 8cc18c14db..4f884ed0d7 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/DefaultMessagePreviewPersister.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/DefaultMessagePreviewPersister.java
@@ -1,50 +1,57 @@
 package pl.allegro.tech.hermes.frontend.publishing.preview;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import pl.allegro.tech.hermes.domain.topic.preview.MessagePreviewRepository;
-
 import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import pl.allegro.tech.hermes.domain.topic.preview.MessagePreviewRepository;
 
 public class DefaultMessagePreviewPersister implements MessagePreviewPersister {
 
-    private final Duration period;
-
-    private final MessagePreviewLog messagePreviewLog;
-
-    private final MessagePreviewRepository repository;
-
-    private final Optional<ScheduledExecutorService> scheduledExecutorService;
-
-    public DefaultMessagePreviewPersister(MessagePreviewLog messagePreviewLog,
-                                          MessagePreviewRepository repository,
-                                          Duration logPersistPeriod,
-                                          boolean previewEnabled) {
-        this.messagePreviewLog = messagePreviewLog;
-        this.repository = repository;
-        this.period = logPersistPeriod;
-
-        this.scheduledExecutorService = previewEnabled ? Optional.of(Executors.newSingleThreadScheduledExecutor(
-                new ThreadFactoryBuilder().setNameFormat("message-preview-persister-%d").build())) : Optional.empty();
-    }
-
-    @Override
-    public void start() {
-        scheduledExecutorService.ifPresent(
-                s -> s.scheduleAtFixedRate(this::persist, period.toSeconds(), period.toSeconds(), TimeUnit.SECONDS));
-    }
-
-    private void persist() {
-        repository.persist(messagePreviewLog.snapshotAndClean());
-    }
-
-    @Override
-    public void shutdown() {
-        scheduledExecutorService.ifPresent(ExecutorService::shutdown);
-    }
-
+  private final Duration period;
+
+  private final MessagePreviewLog messagePreviewLog;
+
+  private final MessagePreviewRepository repository;
+
+  private final Optional<ScheduledExecutorService> scheduledExecutorService;
+
+  public DefaultMessagePreviewPersister(
+      MessagePreviewLog messagePreviewLog,
+      MessagePreviewRepository repository,
+      Duration logPersistPeriod,
+      boolean previewEnabled) {
+    this.messagePreviewLog = messagePreviewLog;
+    this.repository = repository;
+    this.period = logPersistPeriod;
+
+    this.scheduledExecutorService =
+        previewEnabled
+            ? Optional.of(
+                Executors.newSingleThreadScheduledExecutor(
+                    new ThreadFactoryBuilder()
+                        .setNameFormat("message-preview-persister-%d")
+                        .build()))
+            : Optional.empty();
+  }
+
+  @Override
+  public void start() {
+    scheduledExecutorService.ifPresent(
+        s ->
+            s.scheduleAtFixedRate(
+                this::persist, period.toSeconds(), period.toSeconds(), TimeUnit.SECONDS));
+  }
+
+  private void persist() {
+    repository.persist(messagePreviewLog.snapshotAndClean());
+  }
+
+  @Override
+  public void shutdown() {
+    scheduledExecutorService.ifPresent(ExecutorService::shutdown);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewFactory.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewFactory.java
index 1087d45e28..3c9bc0b098 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewFactory.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewFactory.java
@@ -1,28 +1,28 @@
 package pl.allegro.tech.hermes.frontend.publishing.preview;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import pl.allegro.tech.hermes.domain.topic.preview.MessagePreview;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageToJsonConverter;
 
 public class MessagePreviewFactory {
 
-    private final int maxMessagePreviewLength;
-    private final MessageToJsonConverter converter;
+  private final int maxMessagePreviewLength;
+  private final MessageToJsonConverter converter;
 
-    public MessagePreviewFactory(int maxMessagePreviewSizeKb) {
-        this.maxMessagePreviewLength = maxMessagePreviewSizeKb * 1024;
-        converter = new MessageToJsonConverter();
-    }
+  public MessagePreviewFactory(int maxMessagePreviewSizeKb) {
+    this.maxMessagePreviewLength = maxMessagePreviewSizeKb * 1024;
+    converter = new MessageToJsonConverter();
+  }
 
-    public MessagePreview create(Message message, boolean schemaIdAwareSerializationEnabled) {
-        byte[] content = converter.convert(message, schemaIdAwareSerializationEnabled);
-        final boolean truncated = (content.length > maxMessagePreviewLength);
+  public MessagePreview create(Message message, boolean schemaIdAwareSerializationEnabled) {
+    byte[] content = converter.convert(message, schemaIdAwareSerializationEnabled);
+    final boolean truncated = (content.length > maxMessagePreviewLength);
 
-        if (truncated) {
-            return new MessagePreview(ArrayUtils.subarray(content, 0, maxMessagePreviewLength), true);
-        } else {
-            return new MessagePreview(content);
-        }
+    if (truncated) {
+      return new MessagePreview(ArrayUtils.subarray(content, 0, maxMessagePreviewLength), true);
+    } else {
+      return new MessagePreview(content);
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewLog.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewLog.java
index 5123c5552b..4b3d45ffe6 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewLog.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewLog.java
@@ -1,62 +1,62 @@
 package pl.allegro.tech.hermes.frontend.publishing.preview;
 
 import com.google.common.util.concurrent.AtomicLongMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.domain.topic.preview.MessagePreview;
 import pl.allegro.tech.hermes.domain.topic.preview.TopicsMessagesPreview;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentLinkedDeque;
-
 public class MessagePreviewLog {
 
-    private final MessagePreviewFactory messagePreviewFactory;
+  private final MessagePreviewFactory messagePreviewFactory;
 
-    private final int previewSizePerTopic;
+  private final int previewSizePerTopic;
 
-    private final AtomicLongMap<TopicName> limiter = AtomicLongMap.create();
+  private final AtomicLongMap<TopicName> limiter = AtomicLongMap.create();
 
-    private final ConcurrentLinkedDeque<MessagePreviewSnapshot> messages = new ConcurrentLinkedDeque<>();
+  private final ConcurrentLinkedDeque<MessagePreviewSnapshot> messages =
+      new ConcurrentLinkedDeque<>();
 
-    public MessagePreviewLog(MessagePreviewFactory messagePreviewFactory, int previewSizePerTopic) {
-        this.messagePreviewFactory = messagePreviewFactory;
-        this.previewSizePerTopic = previewSizePerTopic;
-    }
+  public MessagePreviewLog(MessagePreviewFactory messagePreviewFactory, int previewSizePerTopic) {
+    this.messagePreviewFactory = messagePreviewFactory;
+    this.previewSizePerTopic = previewSizePerTopic;
+  }
 
-    public void add(Topic topic, Message message) {
-        long counter = limiter.getAndIncrement(topic.getName());
-        if (counter < previewSizePerTopic) {
-            messages.add(
-                    new MessagePreviewSnapshot(
-                            topic.getName(),
-                            messagePreviewFactory.create(message, topic.isSchemaIdAwareSerializationEnabled())));
-        }
+  public void add(Topic topic, Message message) {
+    long counter = limiter.getAndIncrement(topic.getName());
+    if (counter < previewSizePerTopic) {
+      messages.add(
+          new MessagePreviewSnapshot(
+              topic.getName(),
+              messagePreviewFactory.create(message, topic.isSchemaIdAwareSerializationEnabled())));
     }
+  }
 
-    public TopicsMessagesPreview snapshotAndClean() {
-        List<MessagePreviewSnapshot> snapshot = new ArrayList<>(messages);
-        messages.clear();
-        limiter.clear();
+  public TopicsMessagesPreview snapshotAndClean() {
+    List<MessagePreviewSnapshot> snapshot = new ArrayList<>(messages);
+    messages.clear();
+    limiter.clear();
 
-        TopicsMessagesPreview preview = new TopicsMessagesPreview();
-        for (MessagePreviewSnapshot message : snapshot) {
-            preview.add(message.topicName, message.content);
-        }
-        return preview;
+    TopicsMessagesPreview preview = new TopicsMessagesPreview();
+    for (MessagePreviewSnapshot message : snapshot) {
+      preview.add(message.topicName, message.content);
     }
+    return preview;
+  }
 
-    private static class MessagePreviewSnapshot {
+  private static class MessagePreviewSnapshot {
 
-        final TopicName topicName;
+    final TopicName topicName;
 
-        final MessagePreview content;
+    final MessagePreview content;
 
-        MessagePreviewSnapshot(TopicName topicName, MessagePreview content) {
-            this.topicName = topicName;
-            this.content = content;
-        }
+    MessagePreviewSnapshot(TopicName topicName, MessagePreview content) {
+      this.topicName = topicName;
+      this.content = content;
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewPersister.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewPersister.java
index ad2cb0d004..2740d294e7 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewPersister.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewPersister.java
@@ -1,9 +1,8 @@
 package pl.allegro.tech.hermes.frontend.publishing.preview;
 
-
 public interface MessagePreviewPersister {
 
-    void start();
+  void start();
 
-    void shutdown();
+  void shutdown();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/AdminReadinessService.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/AdminReadinessService.java
new file mode 100644
index 0000000000..d7876e718e
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/AdminReadinessService.java
@@ -0,0 +1,91 @@
+package pl.allegro.tech.hermes.frontend.readiness;
+
+import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.READY;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.recipes.cache.ChildData;
+import org.apache.curator.framework.recipes.cache.NodeCache;
+import org.apache.curator.framework.recipes.cache.NodeCacheListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.DatacenterReadiness;
+import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
+import pl.allegro.tech.hermes.domain.readiness.DatacenterReadinessList;
+import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
+
+public class AdminReadinessService implements NodeCacheListener {
+
+  private static final Logger logger = LoggerFactory.getLogger(AdminReadinessService.class);
+
+  private final NodeCache cache;
+  private final ObjectMapper mapper;
+  private final String localDatacenterName;
+
+  private volatile Map<String, Boolean> readinessPerDatacenter;
+
+  public AdminReadinessService(
+      ObjectMapper mapper,
+      CuratorFramework curator,
+      ZookeeperPaths paths,
+      String localDatacenterName) {
+    this.mapper = mapper;
+    this.localDatacenterName = localDatacenterName;
+    this.cache = new NodeCache(curator, paths.datacenterReadinessPath());
+    cache.getListenable().addListener(this);
+    try {
+      cache.start(true);
+    } catch (Exception e) {
+      throw new InternalProcessingException("Readiness cache cannot start.", e);
+    }
+  }
+
+  public void start() {
+    refreshAdminReady();
+    logger.info("Initial readiness per datacenter: {}", readinessPerDatacenter);
+  }
+
+  public void stop() {
+    try {
+      cache.close();
+    } catch (Exception e) {
+      logger.warn("Failed to stop readiness cache", e);
+    }
+  }
+
+  @Override
+  public void nodeChanged() {
+    refreshAdminReady();
+    logger.info("Readiness per datacenter changed to: {}", readinessPerDatacenter);
+  }
+
+  private void refreshAdminReady() {
+    try {
+      ChildData nodeData = cache.getCurrentData();
+      if (nodeData != null) {
+        byte[] data = nodeData.getData();
+        DatacenterReadinessList readiness = mapper.readValue(data, DatacenterReadinessList.class);
+        readinessPerDatacenter =
+            readiness.datacenters().stream()
+                .collect(
+                    Collectors.toMap(
+                        DatacenterReadiness::getDatacenter, e -> e.getStatus() == READY));
+      } else {
+        readinessPerDatacenter = Collections.emptyMap();
+      }
+    } catch (Exception e) {
+      logger.error("Failed reloading readiness cache.", e);
+    }
+  }
+
+  public boolean isLocalDatacenterReady() {
+    return isDatacenterReady(localDatacenterName);
+  }
+
+  public boolean isDatacenterReady(String datacenter) {
+    return readinessPerDatacenter != null && readinessPerDatacenter.getOrDefault(datacenter, true);
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/DefaultReadinessChecker.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/DefaultReadinessChecker.java
new file mode 100644
index 0000000000..53ad0b3704
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/DefaultReadinessChecker.java
@@ -0,0 +1,90 @@
+package pl.allegro.tech.hermes.frontend.readiness;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.time.Duration;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.frontend.producer.BrokerTopicAvailabilityChecker;
+
+public class DefaultReadinessChecker implements ReadinessChecker {
+
+  private final boolean enabled;
+  private final boolean topicsCheckEnabled;
+  private final Duration interval;
+  private final BrokerTopicAvailabilityChecker brokerTopicAvailabilityChecker;
+  private final ScheduledExecutorService scheduler;
+  private final AdminReadinessService adminReadinessService;
+
+  private volatile boolean ready = false;
+
+  private static final Logger logger = LoggerFactory.getLogger(DefaultReadinessChecker.class);
+
+  public DefaultReadinessChecker(
+      BrokerTopicAvailabilityChecker brokerTopicAvailabilityChecker,
+      AdminReadinessService adminReadinessService,
+      boolean enabled,
+      boolean topicsCheckEnabled,
+      Duration interval) {
+    this.enabled = enabled;
+    this.topicsCheckEnabled = topicsCheckEnabled;
+    this.interval = interval;
+    this.brokerTopicAvailabilityChecker = brokerTopicAvailabilityChecker;
+    this.adminReadinessService = adminReadinessService;
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat("ReadinessChecker-%d").build();
+    this.scheduler = Executors.newSingleThreadScheduledExecutor(threadFactory);
+
+    logger.info(
+        "Default readiness checker enabled: {}, readiness check based on topic metadata enabled: {}",
+        enabled,
+        topicsCheckEnabled);
+  }
+
+  @Override
+  public boolean isReady() {
+    if (!enabled) {
+      return true;
+    }
+    return ready;
+  }
+
+  @Override
+  public void start() {
+    if (enabled) {
+      ReadinessCheckerJob job = new ReadinessCheckerJob();
+      job.run();
+      scheduler.scheduleAtFixedRate(
+          job, interval.toSeconds(), interval.toSeconds(), TimeUnit.SECONDS);
+    }
+  }
+
+  @Override
+  public void stop() throws InterruptedException {
+    scheduler.shutdown();
+    scheduler.awaitTermination(1, TimeUnit.MINUTES);
+  }
+
+  private class ReadinessCheckerJob implements Runnable {
+    private volatile boolean allTopicsAvailable = false;
+
+    @Override
+    public void run() {
+      if (!adminReadinessService.isLocalDatacenterReady()) {
+        ready = false;
+      } else if (allTopicsAvailable) {
+        ready = true;
+      } else if (topicsCheckEnabled) {
+        allTopicsAvailable = brokerTopicAvailabilityChecker.areAllTopicsAvailable();
+        logger.info("All topics available: {}, setting ready to: {}", allTopicsAvailable, ready);
+        ready = allTopicsAvailable;
+      } else {
+        allTopicsAvailable = true;
+        ready = true;
+      }
+    }
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/HealthCheckService.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/HealthCheckService.java
new file mode 100644
index 0000000000..5f569a88a3
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/HealthCheckService.java
@@ -0,0 +1,18 @@
+package pl.allegro.tech.hermes.frontend.readiness;
+
+public class HealthCheckService {
+
+  private volatile boolean shutdown = true;
+
+  public boolean isShutdown() {
+    return shutdown;
+  }
+
+  public void shutdown() {
+    this.shutdown = true;
+  }
+
+  public void startup() {
+    this.shutdown = false;
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/ReadinessChecker.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/ReadinessChecker.java
new file mode 100644
index 0000000000..0a3b7221f4
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/readiness/ReadinessChecker.java
@@ -0,0 +1,10 @@
+package pl.allegro.tech.hermes.frontend.readiness;
+
+public interface ReadinessChecker {
+
+  boolean isReady();
+
+  void start();
+
+  void stop() throws InterruptedException;
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/CompletableFuturesHelper.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/CompletableFuturesHelper.java
deleted file mode 100644
index 006ac6fef1..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/CompletableFuturesHelper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
-import static java.util.stream.Collectors.toList;
-
-class CompletableFuturesHelper {
-
-    static <T> CompletableFuture<List<T>> allComplete(List<CompletableFuture<T>> futures) {
-        return CompletableFuture.allOf(futures.toArray(new CompletableFuture<?>[0]))
-                .thenApply(v -> futures.stream().map(CompletableFuture::join).collect(toList()));
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/DefaultReadinessChecker.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/DefaultReadinessChecker.java
deleted file mode 100644
index 5cfb7806f9..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/DefaultReadinessChecker.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.recipes.cache.ChildData;
-import org.apache.curator.framework.recipes.cache.NodeCache;
-import org.apache.curator.framework.recipes.cache.NodeCacheListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.api.Readiness;
-import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
-import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
-
-import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-public class DefaultReadinessChecker implements ReadinessChecker, NodeCacheListener {
-    private static final Logger logger = LoggerFactory.getLogger(DefaultReadinessChecker.class);
-
-    private final boolean enabled;
-    private final boolean kafkaCheckEnabled;
-    private final Duration interval;
-    private final TopicMetadataLoadingRunner topicMetadataLoadingRunner;
-    private final ScheduledExecutorService scheduler;
-    private final ObjectMapper mapper;
-    private final NodeCache cache;
-
-    private volatile boolean adminReady = false;
-    private volatile boolean ready = false;
-
-    public DefaultReadinessChecker(TopicMetadataLoadingRunner topicMetadataLoadingRunner,
-                                   CuratorFramework curator,
-                                   ZookeeperPaths paths,
-                                   ObjectMapper mapper,
-                                   boolean enabled,
-                                   boolean kafkaCheckEnabled,
-                                   Duration interval) {
-        this.enabled = enabled;
-        this.kafkaCheckEnabled = kafkaCheckEnabled;
-        this.interval = interval;
-        this.topicMetadataLoadingRunner = topicMetadataLoadingRunner;
-        this.mapper = mapper;
-        this.cache = new NodeCache(curator, paths.frontendReadinessPath());
-        cache.getListenable().addListener(this);
-        try {
-            cache.start(true);
-        } catch (Exception e) {
-            throw new InternalProcessingException("Readiness cache cannot start.", e);
-        }
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("ReadinessChecker-%d").build();
-        this.scheduler = Executors.newSingleThreadScheduledExecutor(threadFactory);
-    }
-
-    @Override
-    public boolean isReady() {
-        if (!enabled) {
-            return true;
-        }
-        return ready;
-    }
-
-    @Override
-    public void start() {
-        if (enabled) {
-            refreshAdminReady();
-            ReadinessCheckerJob job = new ReadinessCheckerJob();
-            job.run();
-            scheduler.scheduleAtFixedRate(job, interval.toSeconds(), interval.toSeconds(), TimeUnit.SECONDS);
-        }
-    }
-
-    @Override
-    public void stop() throws InterruptedException {
-        scheduler.shutdown();
-        scheduler.awaitTermination(1, TimeUnit.MINUTES);
-        try {
-            cache.close();
-        } catch (Exception e) {
-            logger.warn("Failed to stop readiness cache", e);
-        }
-    }
-
-    @Override
-    public void nodeChanged() {
-        refreshAdminReady();
-    }
-
-    private void refreshAdminReady() {
-        try {
-            ChildData nodeData = cache.getCurrentData();
-            if (nodeData != null) {
-                byte[] data = nodeData.getData();
-                Readiness value = mapper.readValue(data, Readiness.class);
-                adminReady = value.isReady();
-            } else {
-                adminReady = true;
-            }
-        } catch (Exception e) {
-            logger.error("Failed reloading readiness cache. Current value: ready=" + ready, e);
-        }
-    }
-
-    private class ReadinessCheckerJob implements Runnable {
-        private volatile boolean kafkaReady = false;
-
-        @Override
-        public void run() {
-            if (!adminReady) {
-                ready = false;
-            } else if (kafkaReady) {
-                ready = true;
-            } else {
-                kafkaReady = checkKafkaReadiness();
-                ready = kafkaReady;
-            }
-        }
-
-        private boolean checkKafkaReadiness() {
-            if (kafkaCheckEnabled) {
-                try {
-                    List<MetadataLoadingResult> results = topicMetadataLoadingRunner.refreshMetadata();
-                    return results.stream().noneMatch(MetadataLoadingResult::isFailure);
-                } catch (Exception ex) {
-                    logger.warn("Unexpected error occurred during checking Kafka readiness", ex);
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HealthCheckHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HealthCheckHandler.java
index d2e3cd5127..b665673d54 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HealthCheckHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HealthCheckHandler.java
@@ -1,40 +1,39 @@
 package pl.allegro.tech.hermes.frontend.server;
 
-import io.undertow.server.HttpHandler;
-import io.undertow.server.HttpServerExchange;
-import pl.allegro.tech.hermes.frontend.services.HealthCheckService;
-
 import static io.undertow.util.StatusCodes.OK;
 import static io.undertow.util.StatusCodes.SERVICE_UNAVAILABLE;
 
-public class HealthCheckHandler implements HttpHandler {
+import io.undertow.server.HttpHandler;
+import io.undertow.server.HttpServerExchange;
+import pl.allegro.tech.hermes.frontend.readiness.HealthCheckService;
 
-    private final HealthCheckService healthCheckService;
+public class HealthCheckHandler implements HttpHandler {
 
-    public HealthCheckHandler(HealthCheckService healthCheckService) {
-        this.healthCheckService = healthCheckService;
-    }
+  private final HealthCheckService healthCheckService;
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) {
-        if (healthCheckService.isShutdown()) {
-            unavailable(exchange);
-        } else {
-            success(exchange);
-        }
-    }
+  public HealthCheckHandler(HealthCheckService healthCheckService) {
+    this.healthCheckService = healthCheckService;
+  }
 
-    private void success(HttpServerExchange exchange) {
-        response(exchange, OK, "UP");
+  @Override
+  public void handleRequest(HttpServerExchange exchange) {
+    if (healthCheckService.isShutdown()) {
+      unavailable(exchange);
+    } else {
+      success(exchange);
     }
+  }
 
-    private void unavailable(HttpServerExchange exchange) {
-        response(exchange, SERVICE_UNAVAILABLE, "SHUTDOWN");
-    }
+  private void success(HttpServerExchange exchange) {
+    response(exchange, OK, "UP");
+  }
 
-    private void response(HttpServerExchange exchange, int status, String data) {
-        exchange.setStatusCode(status);
-        exchange.getResponseSender().send(data);
-    }
+  private void unavailable(HttpServerExchange exchange) {
+    response(exchange, SERVICE_UNAVAILABLE, "SHUTDOWN");
+  }
 
+  private void response(HttpServerExchange exchange, int status, String data) {
+    exchange.setStatusCode(status);
+    exchange.getResponseSender().send(data);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServer.java
index b2472f4b74..796c613eb4 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServer.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServer.java
@@ -1,18 +1,5 @@
 package pl.allegro.tech.hermes.frontend.server;
 
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import io.undertow.Undertow;
-import io.undertow.server.HttpHandler;
-import io.undertow.server.RoutingHandler;
-import io.undertow.server.handlers.RequestDumpingHandler;
-import org.xnio.SslClientAuthMode;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter;
-import pl.allegro.tech.hermes.frontend.publishing.preview.MessagePreviewPersister;
-import pl.allegro.tech.hermes.frontend.services.HealthCheckService;
-
-import java.net.InetSocketAddress;
-
 import static io.undertow.UndertowOptions.ALWAYS_SET_KEEP_ALIVE;
 import static io.undertow.UndertowOptions.ENABLE_HTTP2;
 import static io.undertow.UndertowOptions.MAX_COOKIES;
@@ -24,151 +11,164 @@
 import static org.xnio.Options.READ_TIMEOUT;
 import static org.xnio.Options.SSL_CLIENT_AUTH_MODE;
 
-public class HermesServer {
-
-    private final MetricsFacade metricsFacade;
-    private final HermesServerParameters hermesServerParameters;
-    private final SslParameters sslParameters;
-    private final HttpHandler publishingHandler;
-    private final HealthCheckService healthCheckService;
-    private final ReadinessChecker readinessChecker;
-    private final MessagePreviewPersister messagePreviewPersister;
-    private final ThroughputLimiter throughputLimiter;
-    private final TopicMetadataLoadingJob topicMetadataLoadingJob;
-    private final boolean topicMetadataLoadingJobEnabled;
-    private final SslContextFactoryProvider sslContextFactoryProvider;
-    private final PrometheusMeterRegistry prometheusMeterRegistry;
-    private Undertow undertow;
-    private HermesShutdownHandler gracefulShutdown;
-
-    public HermesServer(
-            SslParameters sslParameters,
-            HermesServerParameters hermesServerParameters,
-            MetricsFacade metricsFacade,
-            HttpHandler publishingHandler,
-            ReadinessChecker readinessChecker,
-            MessagePreviewPersister messagePreviewPersister,
-            ThroughputLimiter throughputLimiter,
-            TopicMetadataLoadingJob topicMetadataLoadingJob,
-            boolean topicMetadataLoadingJobEnabled,
-            SslContextFactoryProvider sslContextFactoryProvider,
-            PrometheusMeterRegistry prometheusMeterRegistry) {
-
-        this.sslParameters = sslParameters;
-        this.hermesServerParameters = hermesServerParameters;
-        this.metricsFacade = metricsFacade;
-        this.publishingHandler = publishingHandler;
-        this.prometheusMeterRegistry = prometheusMeterRegistry;
-        this.healthCheckService = new HealthCheckService();
-        this.readinessChecker = readinessChecker;
-        this.messagePreviewPersister = messagePreviewPersister;
-        this.topicMetadataLoadingJob = topicMetadataLoadingJob;
-        this.topicMetadataLoadingJobEnabled = topicMetadataLoadingJobEnabled;
-        this.sslContextFactoryProvider = sslContextFactoryProvider;
-        this.throughputLimiter = throughputLimiter;
-    }
-
-    public void start() {
-        configureServer().start();
-        messagePreviewPersister.start();
-        throughputLimiter.start();
-
-        if (topicMetadataLoadingJobEnabled) {
-            topicMetadataLoadingJob.start();
-        }
-        healthCheckService.startup();
-        readinessChecker.start();
-    }
-
-    public void stop() throws InterruptedException {
-        if (hermesServerParameters.isGracefulShutdownEnabled()) {
-            prepareForGracefulShutdown();
-        }
-        shutdown();
-    }
-
-    public void prepareForGracefulShutdown() throws InterruptedException {
-        healthCheckService.shutdown();
-
-        Thread.sleep(hermesServerParameters.getGracefulShutdownInitialWait().toMillis());
-
-        gracefulShutdown.handleShutdown();
-    }
-
-    public void shutdown() throws InterruptedException {
-        undertow.stop();
-        messagePreviewPersister.shutdown();
-        throughputLimiter.stop();
-
-        if (topicMetadataLoadingJobEnabled) {
-            topicMetadataLoadingJob.stop();
-        }
-        readinessChecker.stop();
-    }
-
-    private Undertow configureServer() {
-        gracefulShutdown = new HermesShutdownHandler(handlers(), metricsFacade);
-        Undertow.Builder builder = Undertow.builder()
-                .addHttpListener(hermesServerParameters.getPort(), hermesServerParameters.getHost())
-                .setServerOption(REQUEST_PARSE_TIMEOUT, (int) hermesServerParameters.getRequestParseTimeout().toMillis())
-                .setServerOption(MAX_HEADERS, hermesServerParameters.getMaxHeaders())
-                .setServerOption(MAX_PARAMETERS, hermesServerParameters.getMaxParameters())
-                .setServerOption(MAX_COOKIES, hermesServerParameters.getMaxCookies())
-                .setServerOption(ALWAYS_SET_KEEP_ALIVE, hermesServerParameters.isAlwaysKeepAlive())
-                .setServerOption(KEEP_ALIVE, hermesServerParameters.isKeepAlive())
-                .setSocketOption(BACKLOG, hermesServerParameters.getBacklogSize())
-                .setSocketOption(READ_TIMEOUT, (int) hermesServerParameters.getReadTimeout().toMillis())
-                .setIoThreads(hermesServerParameters.getIoThreadsCount())
-                .setWorkerThreads(hermesServerParameters.getWorkerThreadCount())
-                .setBufferSize(hermesServerParameters.getBufferSize())
-                .setHandler(gracefulShutdown);
-
-        if (sslParameters.isEnabled()) {
-            builder.addHttpsListener(sslParameters.getPort(), hermesServerParameters.getHost(),
-                            sslContextFactoryProvider.getSslContextFactory().create().getSslContext())
-                    .setSocketOption(SSL_CLIENT_AUTH_MODE,
-                            SslClientAuthMode.valueOf(sslParameters.getClientAuthMode().toUpperCase()))
-                    .setServerOption(ENABLE_HTTP2, hermesServerParameters.isHttp2Enabled());
-        }
-        this.undertow = builder.build();
-        return undertow;
-    }
-
-    private HttpHandler handlers() {
-        HttpHandler healthCheckHandler = new HealthCheckHandler(healthCheckService);
-        HttpHandler readinessHandler = new ReadinessCheckHandler(readinessChecker, healthCheckService);
-        HttpHandler prometheusHandler = new PrometheusMetricsHandler(prometheusMeterRegistry);
+import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.undertow.Undertow;
+import io.undertow.server.HttpHandler;
+import io.undertow.server.RoutingHandler;
+import io.undertow.server.handlers.RequestDumpingHandler;
+import java.net.InetSocketAddress;
+import org.xnio.SslClientAuthMode;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.frontend.publishing.handlers.ThroughputLimiter;
+import pl.allegro.tech.hermes.frontend.publishing.preview.MessagePreviewPersister;
+import pl.allegro.tech.hermes.frontend.readiness.HealthCheckService;
+import pl.allegro.tech.hermes.frontend.readiness.ReadinessChecker;
 
-        RoutingHandler routingHandler = new RoutingHandler()
-                .post("/topics/{qualifiedTopicName}", publishingHandler)
-                .get("/status/ping", healthCheckHandler)
-                .get("/status/health", healthCheckHandler)
-                .get("/status/ready", readinessHandler)
-                .get("/status/prometheus", prometheusHandler)
-                .get("/", healthCheckHandler);
+public class HermesServer {
 
-        return isFrontendRequestDumperEnabled() ? new RequestDumpingHandler(routingHandler) : routingHandler;
+  private final MetricsFacade metricsFacade;
+  private final HermesServerParameters hermesServerParameters;
+  private final SslParameters sslParameters;
+  private final HttpHandler publishingHandler;
+  private final HealthCheckService healthCheckService;
+  private final ReadinessChecker readinessChecker;
+  private final MessagePreviewPersister messagePreviewPersister;
+  private final ThroughputLimiter throughputLimiter;
+  private final SslContextFactoryProvider sslContextFactoryProvider;
+  private final PrometheusMeterRegistry prometheusMeterRegistry;
+  private Undertow undertow;
+  private HermesShutdownHandler gracefulShutdown;
+
+  public HermesServer(
+      SslParameters sslParameters,
+      HermesServerParameters hermesServerParameters,
+      MetricsFacade metricsFacade,
+      HttpHandler publishingHandler,
+      HealthCheckService healthCheckService,
+      ReadinessChecker readinessChecker,
+      MessagePreviewPersister messagePreviewPersister,
+      ThroughputLimiter throughputLimiter,
+      SslContextFactoryProvider sslContextFactoryProvider,
+      PrometheusMeterRegistry prometheusMeterRegistry) {
+
+    this.sslParameters = sslParameters;
+    this.hermesServerParameters = hermesServerParameters;
+    this.metricsFacade = metricsFacade;
+    this.publishingHandler = publishingHandler;
+    this.prometheusMeterRegistry = prometheusMeterRegistry;
+    this.healthCheckService = healthCheckService;
+    this.readinessChecker = readinessChecker;
+    this.messagePreviewPersister = messagePreviewPersister;
+    this.sslContextFactoryProvider = sslContextFactoryProvider;
+    this.throughputLimiter = throughputLimiter;
+  }
+
+  public void start() {
+    configureServer().start();
+    messagePreviewPersister.start();
+    throughputLimiter.start();
+    healthCheckService.startup();
+    readinessChecker.start();
+  }
+
+  public void stop() throws InterruptedException {
+    if (hermesServerParameters.isGracefulShutdownEnabled()) {
+      prepareForGracefulShutdown();
     }
-
-    private boolean isFrontendRequestDumperEnabled() {
-        return hermesServerParameters.isRequestDumperEnabled();
+    shutdown();
+  }
+
+  public void prepareForGracefulShutdown() throws InterruptedException {
+    healthCheckService.shutdown();
+
+    Thread.sleep(hermesServerParameters.getGracefulShutdownInitialWait().toMillis());
+
+    gracefulShutdown.handleShutdown();
+  }
+
+  public void shutdown() throws InterruptedException {
+    undertow.stop();
+    messagePreviewPersister.shutdown();
+    throughputLimiter.stop();
+    readinessChecker.stop();
+  }
+
+  private Undertow configureServer() {
+    gracefulShutdown = new HermesShutdownHandler(handlers(), metricsFacade);
+    Undertow.Builder builder =
+        Undertow.builder()
+            .addHttpListener(hermesServerParameters.getPort(), hermesServerParameters.getHost())
+            .setServerOption(
+                REQUEST_PARSE_TIMEOUT,
+                (int) hermesServerParameters.getRequestParseTimeout().toMillis())
+            .setServerOption(MAX_HEADERS, hermesServerParameters.getMaxHeaders())
+            .setServerOption(MAX_PARAMETERS, hermesServerParameters.getMaxParameters())
+            .setServerOption(MAX_COOKIES, hermesServerParameters.getMaxCookies())
+            .setServerOption(ALWAYS_SET_KEEP_ALIVE, hermesServerParameters.isAlwaysKeepAlive())
+            .setServerOption(KEEP_ALIVE, hermesServerParameters.isKeepAlive())
+            .setSocketOption(BACKLOG, hermesServerParameters.getBacklogSize())
+            .setSocketOption(READ_TIMEOUT, (int) hermesServerParameters.getReadTimeout().toMillis())
+            .setIoThreads(hermesServerParameters.getIoThreadsCount())
+            .setWorkerThreads(hermesServerParameters.getWorkerThreadCount())
+            .setBufferSize(hermesServerParameters.getBufferSize())
+            .setHandler(gracefulShutdown);
+
+    if (sslParameters.isEnabled()) {
+      builder
+          .addHttpsListener(
+              sslParameters.getPort(),
+              hermesServerParameters.getHost(),
+              sslContextFactoryProvider.getSslContextFactory().create().getSslContext())
+          .setSocketOption(
+              SSL_CLIENT_AUTH_MODE,
+              SslClientAuthMode.valueOf(sslParameters.getClientAuthMode().toUpperCase()))
+          .setServerOption(ENABLE_HTTP2, hermesServerParameters.isHttp2Enabled());
     }
-
-    public int getPort() {
-        InetSocketAddress socketAddress = (InetSocketAddress) undertow.getListenerInfo().stream()
+    this.undertow = builder.build();
+    return undertow;
+  }
+
+  private HttpHandler handlers() {
+    HttpHandler healthCheckHandler = new HealthCheckHandler(healthCheckService);
+    HttpHandler readinessHandler = new ReadinessCheckHandler(readinessChecker, healthCheckService);
+    HttpHandler prometheusHandler = new PrometheusMetricsHandler(prometheusMeterRegistry);
+
+    RoutingHandler routingHandler =
+        new RoutingHandler()
+            .post("/topics/{qualifiedTopicName}", publishingHandler)
+            .get("/status/ping", healthCheckHandler)
+            .get("/status/health", healthCheckHandler)
+            .get("/status/ready", readinessHandler)
+            .get("/status/prometheus", prometheusHandler)
+            .get("/", healthCheckHandler);
+
+    return isFrontendRequestDumperEnabled()
+        ? new RequestDumpingHandler(routingHandler)
+        : routingHandler;
+  }
+
+  private boolean isFrontendRequestDumperEnabled() {
+    return hermesServerParameters.isRequestDumperEnabled();
+  }
+
+  public int getPort() {
+    InetSocketAddress socketAddress =
+        (InetSocketAddress)
+            undertow.getListenerInfo().stream()
                 .findFirst()
                 .orElseThrow(() -> new IllegalStateException("No port available yet."))
                 .getAddress();
-        return socketAddress.getPort();
-    }
+    return socketAddress.getPort();
+  }
 
-    public int getSSLPort() {
-        InetSocketAddress socketAddress = (InetSocketAddress) undertow.getListenerInfo().stream()
+  public int getSSLPort() {
+    InetSocketAddress socketAddress =
+        (InetSocketAddress)
+            undertow.getListenerInfo().stream()
                 .filter(listener -> listener.getSslContext() != null)
                 .findFirst()
                 .orElseThrow(() -> new IllegalStateException("No SSL port available yet."))
                 .getAddress();
-        return socketAddress.getPort();
-    }
-
+    return socketAddress.getPort();
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServerParameters.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServerParameters.java
index 5c2f7bf549..6a400e3edb 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServerParameters.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServerParameters.java
@@ -4,37 +4,37 @@
 
 public interface HermesServerParameters {
 
-    int getPort();
+  int getPort();
 
-    String getHost();
+  String getHost();
 
-    Duration getReadTimeout();
+  Duration getReadTimeout();
 
-    Duration getRequestParseTimeout();
+  Duration getRequestParseTimeout();
 
-    int getMaxHeaders();
+  int getMaxHeaders();
 
-    int getMaxParameters();
+  int getMaxParameters();
 
-    int getMaxCookies();
+  int getMaxCookies();
 
-    int getBacklogSize();
+  int getBacklogSize();
 
-    int getIoThreadsCount();
+  int getIoThreadsCount();
 
-    int getWorkerThreadCount();
+  int getWorkerThreadCount();
 
-    boolean isAlwaysKeepAlive();
+  boolean isAlwaysKeepAlive();
 
-    boolean isKeepAlive();
+  boolean isKeepAlive();
 
-    boolean isRequestDumperEnabled();
+  boolean isRequestDumperEnabled();
 
-    int getBufferSize();
+  int getBufferSize();
 
-    boolean isGracefulShutdownEnabled();
+  boolean isGracefulShutdownEnabled();
 
-    Duration getGracefulShutdownInitialWait();
+  Duration getGracefulShutdownInitialWait();
 
-    boolean isHttp2Enabled();
+  boolean isHttp2Enabled();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesShutdownHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesShutdownHandler.java
index 05925cecdd..7a48a08314 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesShutdownHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesShutdownHandler.java
@@ -4,82 +4,84 @@
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.StatusCodes;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 public class HermesShutdownHandler implements HttpHandler {
 
-    private static final Logger logger = LoggerFactory.getLogger(HermesShutdownHandler.class);
+  private static final Logger logger = LoggerFactory.getLogger(HermesShutdownHandler.class);
 
-    private static final int MILLIS = 1000;
-    private static final int MAX_INFLIGHT_RETRIES = 20;
-    private static final int TOLERANCE_BYTES = 5;
+  private static final int MILLIS = 1000;
+  private static final int MAX_INFLIGHT_RETRIES = 20;
+  private static final int TOLERANCE_BYTES = 5;
 
-    private final HttpHandler next;
-    private final MetricsFacade metrics;
-    private final ExchangeCompletionListener completionListener = new GracefulExchangeCompletionListener();
-    private final AtomicInteger inflightRequests = new AtomicInteger();
-    private volatile boolean shutdown = false;
+  private final HttpHandler next;
+  private final MetricsFacade metrics;
+  private final ExchangeCompletionListener completionListener =
+      new GracefulExchangeCompletionListener();
+  private final AtomicInteger inflightRequests = new AtomicInteger();
+  private volatile boolean shutdown = false;
 
+  public HermesShutdownHandler(HttpHandler next, MetricsFacade metrics) {
+    this.next = next;
+    this.metrics = metrics;
+    metrics.producer().registerProducerInflightRequestGauge(inflightRequests, AtomicInteger::get);
+  }
 
-    public HermesShutdownHandler(HttpHandler next, MetricsFacade metrics) {
-        this.next = next;
-        this.metrics = metrics;
-        metrics.producer().registerProducerInflightRequestGauge(inflightRequests, AtomicInteger::get);
+  @Override
+  public void handleRequest(HttpServerExchange exchange) throws Exception {
+    if (shutdown) {
+      exchange.setStatusCode(StatusCodes.SERVICE_UNAVAILABLE);
+      exchange.endExchange();
+      return;
     }
+    exchange.addExchangeCompleteListener(completionListener);
+    inflightRequests.incrementAndGet();
+    next.handleRequest(exchange);
+  }
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) throws Exception {
-        if (shutdown) {
-            exchange.setStatusCode(StatusCodes.SERVICE_UNAVAILABLE);
-            exchange.endExchange();
-            return;
-        }
-        exchange.addExchangeCompleteListener(completionListener);
-        inflightRequests.incrementAndGet();
-        next.handleRequest(exchange);
-    }
+  public void handleShutdown() throws InterruptedException {
+    shutdown = true;
+    logger.info("Waiting for inflight requests to complete");
+    awaitRequestsComplete();
+    logger.info("Awaiting buffer flush");
+    awaitBufferFlush();
+    logger.info("Shutdown complete");
+  }
 
-    public void handleShutdown() throws InterruptedException {
-        shutdown = true;
-        logger.info("Waiting for inflight requests to complete");
-        awaitRequestsComplete();
-        logger.info("Awaiting buffer flush");
-        awaitBufferFlush();
-        logger.info("Shutdown complete");
+  private void awaitRequestsComplete() throws InterruptedException {
+    int retries = MAX_INFLIGHT_RETRIES;
+    while (inflightRequests.get() > 0 && retries > 0) {
+      logger.info(
+          "Inflight requests: {}, timing out in {} ms", inflightRequests.get(), retries * MILLIS);
+      retries--;
+      Thread.sleep(MILLIS);
     }
+  }
 
-    private void awaitRequestsComplete() throws InterruptedException {
-        int retries = MAX_INFLIGHT_RETRIES;
-        while (inflightRequests.get() > 0 && retries > 0) {
-            logger.info("Inflight requests: {}, timing out in {} ms", inflightRequests.get(), retries * MILLIS);
-            retries--;
-            Thread.sleep(MILLIS);
-        }
+  private void awaitBufferFlush() throws InterruptedException {
+    while (!isBufferEmpty()) {
+      Thread.sleep(MILLIS);
     }
+  }
 
-    private void awaitBufferFlush() throws InterruptedException {
-        while (!isBufferEmpty()) {
-            Thread.sleep(MILLIS);
-        }
-    }
-
-    private boolean isBufferEmpty() {
-        long bufferUsedBytes = (long) (metrics.producer().getBufferTotalBytes()
+  private boolean isBufferEmpty() {
+    long bufferUsedBytes =
+        (long)
+            (metrics.producer().getBufferTotalBytes()
                 - metrics.producer().getBufferAvailableBytes());
-        logger.info("Buffer flush: {} bytes still in use", bufferUsedBytes);
-        return  bufferUsedBytes < TOLERANCE_BYTES;
-    }
+    logger.info("Buffer flush: {} bytes still in use", bufferUsedBytes);
+    return bufferUsedBytes < TOLERANCE_BYTES;
+  }
 
-    private final class GracefulExchangeCompletionListener implements ExchangeCompletionListener {
+  private final class GracefulExchangeCompletionListener implements ExchangeCompletionListener {
 
-        @Override
-        public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener) {
-            inflightRequests.decrementAndGet();
-            nextListener.proceed();
-        }
+    @Override
+    public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener) {
+      inflightRequests.decrementAndGet();
+      nextListener.proceed();
     }
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/MetadataLoadingResult.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/MetadataLoadingResult.java
deleted file mode 100644
index 5cd35dceb7..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/MetadataLoadingResult.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server;
-
-import pl.allegro.tech.hermes.api.TopicName;
-
-final class MetadataLoadingResult {
-
-    enum Type { SUCCESS, FAILURE }
-
-    private final Type type;
-
-    private final TopicName topicName;
-
-    MetadataLoadingResult(Type type, TopicName topicName) {
-        this.type = type;
-        this.topicName = topicName;
-    }
-
-    static MetadataLoadingResult success(TopicName topicName) {
-        return new MetadataLoadingResult(Type.SUCCESS, topicName);
-    }
-
-    static MetadataLoadingResult failure(TopicName topicName) {
-        return new MetadataLoadingResult(Type.FAILURE, topicName);
-    }
-
-    Type getType() {
-        return type;
-    }
-
-    TopicName getTopicName() {
-        return topicName;
-    }
-
-    boolean isFailure() {
-        return Type.FAILURE == type;
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/PrometheusMetricsHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/PrometheusMetricsHandler.java
index dcfd45af38..c941a6d587 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/PrometheusMetricsHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/PrometheusMetricsHandler.java
@@ -1,27 +1,26 @@
 package pl.allegro.tech.hermes.frontend.server;
 
+import static io.undertow.util.StatusCodes.OK;
+
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 
-import static io.undertow.util.StatusCodes.OK;
-
 public class PrometheusMetricsHandler implements HttpHandler {
 
-    private final PrometheusMeterRegistry meterRegistry;
-
-    public PrometheusMetricsHandler(PrometheusMeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-    }
+  private final PrometheusMeterRegistry meterRegistry;
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) {
-        response(exchange, OK, meterRegistry.scrape());
-    }
+  public PrometheusMetricsHandler(PrometheusMeterRegistry meterRegistry) {
+    this.meterRegistry = meterRegistry;
+  }
 
-    private void response(HttpServerExchange exchange, int status, String data) {
-        exchange.setStatusCode(status);
-        exchange.getResponseSender().send(data);
-    }
+  @Override
+  public void handleRequest(HttpServerExchange exchange) {
+    response(exchange, OK, meterRegistry.scrape());
+  }
 
+  private void response(HttpServerExchange exchange, int status, String data) {
+    exchange.setStatusCode(status);
+    exchange.getResponseSender().send(data);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/ReadinessCheckHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/ReadinessCheckHandler.java
index 8bad1a15a1..d745595a2b 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/ReadinessCheckHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/ReadinessCheckHandler.java
@@ -1,42 +1,43 @@
 package pl.allegro.tech.hermes.frontend.server;
 
-import io.undertow.server.HttpHandler;
-import io.undertow.server.HttpServerExchange;
-import pl.allegro.tech.hermes.frontend.services.HealthCheckService;
-
 import static io.undertow.util.StatusCodes.OK;
 import static io.undertow.util.StatusCodes.SERVICE_UNAVAILABLE;
 
-public class ReadinessCheckHandler implements HttpHandler {
-
-    private final ReadinessChecker readinessChecker;
-    private final HealthCheckService healthCheckService;
-
-    public ReadinessCheckHandler(ReadinessChecker readinessChecker, HealthCheckService healthCheckService) {
-        this.readinessChecker = readinessChecker;
-        this.healthCheckService = healthCheckService;
-    }
+import io.undertow.server.HttpHandler;
+import io.undertow.server.HttpServerExchange;
+import pl.allegro.tech.hermes.frontend.readiness.HealthCheckService;
+import pl.allegro.tech.hermes.frontend.readiness.ReadinessChecker;
 
-    @Override
-    public void handleRequest(HttpServerExchange exchange) {
-        if (!healthCheckService.isShutdown() && readinessChecker.isReady()) {
-            success(exchange);
-        } else {
-            unavailable(exchange);
-        }
-    }
+public class ReadinessCheckHandler implements HttpHandler {
 
-    private void success(HttpServerExchange exchange) {
-        response(exchange, OK, "READY");
+  private final ReadinessChecker readinessChecker;
+  private final HealthCheckService healthCheckService;
+
+  public ReadinessCheckHandler(
+      ReadinessChecker readinessChecker, HealthCheckService healthCheckService) {
+    this.readinessChecker = readinessChecker;
+    this.healthCheckService = healthCheckService;
+  }
+
+  @Override
+  public void handleRequest(HttpServerExchange exchange) {
+    if (!healthCheckService.isShutdown() && readinessChecker.isReady()) {
+      success(exchange);
+    } else {
+      unavailable(exchange);
     }
+  }
 
-    private void unavailable(HttpServerExchange exchange) {
-        response(exchange, SERVICE_UNAVAILABLE, "NOT_READY");
-    }
+  private void success(HttpServerExchange exchange) {
+    response(exchange, OK, "READY");
+  }
 
-    private void response(HttpServerExchange exchange, int status, String data) {
-        exchange.setStatusCode(status);
-        exchange.getResponseSender().send(data);
-    }
+  private void unavailable(HttpServerExchange exchange) {
+    response(exchange, SERVICE_UNAVAILABLE, "NOT_READY");
+  }
 
+  private void response(HttpServerExchange exchange, int status, String data) {
+    exchange.setStatusCode(status);
+    exchange.getResponseSender().send(data);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/ReadinessChecker.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/ReadinessChecker.java
deleted file mode 100644
index 15ca439572..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/ReadinessChecker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server;
-
-public interface ReadinessChecker {
-
-    boolean isReady();
-
-    void start();
-
-    void stop() throws InterruptedException;
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SchemaLoadingResult.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SchemaLoadingResult.java
index 052f5aa71d..2b4081a139 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SchemaLoadingResult.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SchemaLoadingResult.java
@@ -4,40 +4,42 @@
 
 final class SchemaLoadingResult {
 
-    enum Type {
-        SUCCESS, FAILURE, MISSING
-    }
+  enum Type {
+    SUCCESS,
+    FAILURE,
+    MISSING
+  }
 
-    private final Type type;
+  private final Type type;
 
-    private final Topic topic;
+  private final Topic topic;
 
-    private SchemaLoadingResult(Type type, Topic topic) {
-        this.type = type;
-        this.topic = topic;
-    }
+  private SchemaLoadingResult(Type type, Topic topic) {
+    this.type = type;
+    this.topic = topic;
+  }
 
-    static SchemaLoadingResult success(Topic topic) {
-        return new SchemaLoadingResult(Type.SUCCESS, topic);
-    }
+  static SchemaLoadingResult success(Topic topic) {
+    return new SchemaLoadingResult(Type.SUCCESS, topic);
+  }
 
-    static SchemaLoadingResult failure(Topic topic) {
-        return new SchemaLoadingResult(Type.FAILURE, topic);
-    }
+  static SchemaLoadingResult failure(Topic topic) {
+    return new SchemaLoadingResult(Type.FAILURE, topic);
+  }
 
-    static SchemaLoadingResult missing(Topic topic) {
-        return new SchemaLoadingResult(Type.MISSING, topic);
-    }
+  static SchemaLoadingResult missing(Topic topic) {
+    return new SchemaLoadingResult(Type.MISSING, topic);
+  }
 
-    Type getType() {
-        return type;
-    }
+  Type getType() {
+    return type;
+  }
 
-    Topic getTopic() {
-        return topic;
-    }
+  Topic getTopic() {
+    return topic;
+  }
 
-    boolean isFailure() {
-        return Type.FAILURE == type;
-    }
+  boolean isFailure() {
+    return Type.FAILURE == type;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SslContextFactoryProvider.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SslContextFactoryProvider.java
index 256065084e..9e9d9aded6 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SslContextFactoryProvider.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SslContextFactoryProvider.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.frontend.server;
 
+import static pl.allegro.tech.hermes.common.ssl.KeystoreSource.JRE;
+import static pl.allegro.tech.hermes.common.ssl.KeystoreSource.PROVIDED;
+
+import java.util.Optional;
 import pl.allegro.tech.hermes.common.ssl.DefaultSslContextFactory;
 import pl.allegro.tech.hermes.common.ssl.KeyManagersProvider;
 import pl.allegro.tech.hermes.common.ssl.KeystoreConfigurationException;
@@ -12,61 +16,57 @@
 import pl.allegro.tech.hermes.common.ssl.provided.ProvidedKeyManagersProvider;
 import pl.allegro.tech.hermes.common.ssl.provided.ProvidedTrustManagersProvider;
 
-import java.util.Optional;
+public class SslContextFactoryProvider {
 
-import static pl.allegro.tech.hermes.common.ssl.KeystoreSource.JRE;
-import static pl.allegro.tech.hermes.common.ssl.KeystoreSource.PROVIDED;
+  private final SslContextFactory sslContextFactory;
+  private final SslParameters sslParameters;
 
-public class SslContextFactoryProvider {
+  public SslContextFactoryProvider(
+      SslContextFactory sslContextFactory, SslParameters sslParameters) {
+    this.sslContextFactory = sslContextFactory;
+    this.sslParameters = sslParameters;
+  }
 
-    private final SslContextFactory sslContextFactory;
-    private final SslParameters sslParameters;
+  public SslContextFactory getSslContextFactory() {
+    return Optional.ofNullable(sslContextFactory).orElse(getDefault());
+  }
 
-    public SslContextFactoryProvider(SslContextFactory sslContextFactory, SslParameters sslParameters) {
-        this.sslContextFactory = sslContextFactory;
-        this.sslParameters = sslParameters;
-    }
+  private SslContextFactory getDefault() {
+    String protocol = sslParameters.getProtocol();
+    KeyManagersProvider keyManagersProvider = createKeyManagersProvider();
+    TrustManagersProvider trustManagersProvider = createTrustManagersProvider();
+    return new DefaultSslContextFactory(protocol, keyManagersProvider, trustManagersProvider);
+  }
 
-    public SslContextFactory getSslContextFactory() {
-        return Optional.ofNullable(sslContextFactory).orElse(getDefault());
+  private KeyManagersProvider createKeyManagersProvider() {
+    String keystoreSource = sslParameters.getKeystoreSource();
+    if (PROVIDED.getValue().equals(keystoreSource)) {
+      KeystoreProperties properties =
+          new KeystoreProperties(
+              sslParameters.getKeystoreLocation(),
+              sslParameters.getKeystoreFormat(),
+              sslParameters.getKeystorePassword());
+      return new ProvidedKeyManagersProvider(properties);
     }
-
-    private SslContextFactory getDefault() {
-        String protocol = sslParameters.getProtocol();
-        KeyManagersProvider keyManagersProvider = createKeyManagersProvider();
-        TrustManagersProvider trustManagersProvider = createTrustManagersProvider();
-        return new DefaultSslContextFactory(protocol, keyManagersProvider, trustManagersProvider);
+    if (JRE.getValue().equals(keystoreSource)) {
+      return new JvmKeyManagersProvider();
     }
+    throw new KeystoreConfigurationException(keystoreSource);
+  }
 
-    private KeyManagersProvider createKeyManagersProvider() {
-        String keystoreSource = sslParameters.getKeystoreSource();
-        if (PROVIDED.getValue().equals(keystoreSource)) {
-            KeystoreProperties properties = new KeystoreProperties(
-                    sslParameters.getKeystoreLocation(),
-                    sslParameters.getKeystoreFormat(),
-                    sslParameters.getKeystorePassword()
-            );
-            return new ProvidedKeyManagersProvider(properties);
-        }
-        if (JRE.getValue().equals(keystoreSource)) {
-            return new JvmKeyManagersProvider();
-        }
-        throw new KeystoreConfigurationException(keystoreSource);
+  public TrustManagersProvider createTrustManagersProvider() {
+    String truststoreSource = sslParameters.getTruststoreSource();
+    if (PROVIDED.getValue().equals(truststoreSource)) {
+      KeystoreProperties properties =
+          new KeystoreProperties(
+              sslParameters.getTruststoreLocation(),
+              sslParameters.getTruststoreFormat(),
+              sslParameters.getTruststorePassword());
+      return new ProvidedTrustManagersProvider(properties);
     }
-
-    public TrustManagersProvider createTrustManagersProvider() {
-        String truststoreSource = sslParameters.getTruststoreSource();
-        if (PROVIDED.getValue().equals(truststoreSource)) {
-            KeystoreProperties properties = new KeystoreProperties(
-                    sslParameters.getTruststoreLocation(),
-                    sslParameters.getTruststoreFormat(),
-                    sslParameters.getTruststorePassword()
-            );
-            return new ProvidedTrustManagersProvider(properties);
-        }
-        if (JRE.getValue().equals(truststoreSource)) {
-            return new JvmTrustManagerProvider();
-        }
-        throw new TruststoreConfigurationException(truststoreSource);
+    if (JRE.getValue().equals(truststoreSource)) {
+      return new JvmTrustManagerProvider();
     }
+    throw new TruststoreConfigurationException(truststoreSource);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SslParameters.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SslParameters.java
index cf2ff2ff43..971f1b9d68 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SslParameters.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/SslParameters.java
@@ -2,27 +2,27 @@
 
 public interface SslParameters {
 
-    boolean isEnabled();
+  boolean isEnabled();
 
-    int getPort();
+  int getPort();
 
-    String getClientAuthMode();
+  String getClientAuthMode();
 
-    String getProtocol();
+  String getProtocol();
 
-    String getKeystoreSource();
+  String getKeystoreSource();
 
-    String getKeystoreLocation();
+  String getKeystoreLocation();
 
-    String getKeystorePassword();
+  String getKeystorePassword();
 
-    String getKeystoreFormat();
+  String getKeystoreFormat();
 
-    String getTruststoreSource();
+  String getTruststoreSource();
 
-    String getTruststoreLocation();
+  String getTruststoreLocation();
 
-    String getTruststorePassword();
+  String getTruststorePassword();
 
-    String getTruststoreFormat();
+  String getTruststoreFormat();
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoader.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoader.java
deleted file mode 100644
index db538116e1..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoader.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server;
-
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import net.jodah.failsafe.ExecutionContext;
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
-import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
-
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.concurrent.CompletableFuture.completedFuture;
-
-class TopicMetadataLoader implements AutoCloseable {
-
-    private static final Logger logger = LoggerFactory.getLogger(TopicMetadataLoader.class);
-
-    private final BrokerMessageProducer brokerMessageProducer;
-
-    private final ScheduledExecutorService scheduler;
-
-    private final RetryPolicy<MetadataLoadingResult> retryPolicy;
-
-    TopicMetadataLoader(BrokerMessageProducer brokerMessageProducer,
-                               int retryCount,
-                               Duration retryInterval,
-                               int threadPoolSize) {
-
-        this.brokerMessageProducer = brokerMessageProducer;
-        ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("topic-metadata-loader-%d").build();
-        this.scheduler = Executors.newScheduledThreadPool(threadPoolSize, threadFactory);
-        this.retryPolicy = new RetryPolicy<MetadataLoadingResult>()
-                .withMaxRetries(retryCount)
-                .withDelay(retryInterval)
-                .handleIf((resp, cause) -> resp.isFailure());
-    }
-
-    CompletableFuture<MetadataLoadingResult> loadTopicMetadata(CachedTopic topic) {
-        return Failsafe.with(retryPolicy).with(scheduler)
-                .getStageAsync((context) -> completedFuture(fetchTopicMetadata(topic, context)));
-    }
-
-    private MetadataLoadingResult fetchTopicMetadata(CachedTopic topic, ExecutionContext context) {
-        int attempt = context.getAttemptCount();
-        if (brokerMessageProducer.isTopicAvailable(topic)) {
-            return MetadataLoadingResult.success(topic.getTopicName());
-        }
-        logger.warn("Failed to load metadata for topic {}, attempt #{}", topic.getQualifiedName(), attempt);
-        return MetadataLoadingResult.failure(topic.getTopicName());
-    }
-
-    @Override
-    public void close() throws Exception {
-        scheduler.shutdown();
-        scheduler.awaitTermination(1, TimeUnit.SECONDS);
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingJob.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingJob.java
deleted file mode 100644
index bfbe1f9ea3..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingJob.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server;
-
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.Duration;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-public class TopicMetadataLoadingJob implements Runnable {
-
-    private static final Logger logger = LoggerFactory.getLogger(TopicMetadataLoadingJob.class);
-
-    private final TopicMetadataLoadingRunner topicMetadataLoadingRunner;
-    private final ScheduledExecutorService executorService;
-    private final Duration interval;
-
-    private ScheduledFuture<?> job;
-
-    public TopicMetadataLoadingJob(TopicMetadataLoadingRunner topicMetadataLoadingRunner, Duration interval) {
-        this.topicMetadataLoadingRunner = topicMetadataLoadingRunner;
-        this.interval = interval;
-
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat("TopicMetadataLoadingJob-%d").build();
-        this.executorService = Executors.newSingleThreadScheduledExecutor(threadFactory);
-    }
-
-    @Override
-    public void run() {
-        try {
-            topicMetadataLoadingRunner.refreshMetadata();
-        } catch (Exception e) {
-            logger.error("An error occurred while refreshing topic metadata", e);
-        }
-    }
-
-    public void start() {
-        job = executorService.scheduleAtFixedRate(this, interval.toSeconds(), interval.toSeconds(), TimeUnit.SECONDS);
-    }
-
-    public void stop() throws InterruptedException {
-        job.cancel(false);
-        executorService.shutdown();
-        executorService.awaitTermination(1, TimeUnit.MINUTES);
-    }
-
-}
\ No newline at end of file
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingRunner.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingRunner.java
deleted file mode 100644
index dfb59b856d..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingRunner.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
-import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
-import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer;
-
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static java.util.stream.Collectors.toList;
-import static pl.allegro.tech.hermes.frontend.server.CompletableFuturesHelper.allComplete;
-import static pl.allegro.tech.hermes.frontend.server.MetadataLoadingResult.Type.FAILURE;
-import static pl.allegro.tech.hermes.frontend.server.MetadataLoadingResult.Type.SUCCESS;
-
-public class TopicMetadataLoadingRunner {
-
-    private static final Logger logger = LoggerFactory.getLogger(TopicMetadataLoadingRunner.class);
-
-    private final BrokerMessageProducer brokerMessageProducer;
-
-    private final TopicsCache topicsCache;
-
-    private final int retryCount;
-
-    private final Duration retryInterval;
-
-    private final int threadPoolSize;
-
-    public TopicMetadataLoadingRunner(BrokerMessageProducer brokerMessageProducer,
-                               TopicsCache topicsCache,
-                               int retryCount,
-                               Duration retryInterval,
-                               int threadPoolSize) {
-        this.brokerMessageProducer = brokerMessageProducer;
-        this.topicsCache = topicsCache;
-        this.retryCount = retryCount;
-        this.retryInterval = retryInterval;
-        this.threadPoolSize = threadPoolSize;
-    }
-
-    public List<MetadataLoadingResult> refreshMetadata() throws Exception {
-        long start = System.currentTimeMillis();
-        logger.info("Loading topics metadata");
-        List<CachedTopic> topics = topicsCache.getTopics();
-        List<MetadataLoadingResult> allResults = loadMetadataForTopics(topics);
-        logResultInfo(allResults, System.currentTimeMillis() - start);
-        return allResults;
-    }
-
-    private List<MetadataLoadingResult> loadMetadataForTopics(List<CachedTopic> topics) throws Exception {
-        try (TopicMetadataLoader loader = new TopicMetadataLoader(brokerMessageProducer, retryCount, retryInterval, threadPoolSize)) {
-            return allComplete(topics.stream().map(loader::loadTopicMetadata).collect(toList())).join();
-        }
-    }
-
-    private void logResultInfo(List<MetadataLoadingResult> allResults, long elapsed) {
-        Map<MetadataLoadingResult.Type, List<MetadataLoadingResult>> groupedResults = getGroupedResults(allResults);
-        Optional<List<MetadataLoadingResult>> successes = Optional.ofNullable(groupedResults.get(SUCCESS));
-        Optional<List<MetadataLoadingResult>> failures = Optional.ofNullable(groupedResults.get(FAILURE));
-
-        logger.info("Finished loading metadata for {} topics in {}ms [successful: {}, failed: {}]. {}",
-                allResults.size(), elapsed, successes.map(List::size).orElse(0), failures.map(List::size).orElse(0),
-                failures.map(results -> String.format("Failed for: [%s].", topicsOfResults(results))).orElse(""));
-    }
-
-    private Map<MetadataLoadingResult.Type, List<MetadataLoadingResult>> getGroupedResults(List<MetadataLoadingResult> allResults) {
-        return allResults.stream().collect(Collectors.groupingBy(MetadataLoadingResult::getType, Collectors.toList()));
-    }
-
-    private String topicsOfResults(List<MetadataLoadingResult> results) {
-        return results.stream().map(MetadataLoadingResult::getTopicName).map(TopicName::qualifiedName)
-                .collect(Collectors.joining(", "));
-    }
-
-}
\ No newline at end of file
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingStartupHook.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingStartupHook.java
deleted file mode 100644
index cf6dcd94af..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingStartupHook.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TopicMetadataLoadingStartupHook {
-    private static final Logger logger = LoggerFactory.getLogger(TopicMetadataLoadingStartupHook.class);
-
-    private final TopicMetadataLoadingRunner topicMetadataLoadingRunner;
-
-    private final boolean isTopicMetadataLoadingStartupHookEnabled;
-
-    public TopicMetadataLoadingStartupHook(TopicMetadataLoadingRunner topicMetadataLoadingRunner,
-                                           boolean isTopicMetadataLoadingStartupHookEnabled) {
-        this.topicMetadataLoadingRunner = topicMetadataLoadingRunner;
-        this.isTopicMetadataLoadingStartupHookEnabled = isTopicMetadataLoadingStartupHookEnabled;
-    }
-
-    public void run() {
-        if (isTopicMetadataLoadingStartupHookEnabled) {
-            try {
-                topicMetadataLoadingRunner.refreshMetadata();
-            } catch (Exception e) {
-                logger.error("An error occurred while refreshing topic metadata", e);
-            }
-        } else {
-            logger.info("Topic metadata loading startup hook is disabled");
-        }
-    }
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicSchemaLoader.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicSchemaLoader.java
index 375cea9cc5..2b091c9600 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicSchemaLoader.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicSchemaLoader.java
@@ -1,6 +1,13 @@
 package pl.allegro.tech.hermes.frontend.server;
 
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import net.jodah.failsafe.ExecutionContext;
 import net.jodah.failsafe.Failsafe;
 import net.jodah.failsafe.RetryPolicy;
@@ -11,57 +18,60 @@
 import pl.allegro.tech.hermes.schema.SchemaNotFoundException;
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.concurrent.CompletableFuture.completedFuture;
-
 class TopicSchemaLoader implements AutoCloseable {
 
-    private static final Logger logger = LoggerFactory.getLogger(TopicSchemaLoader.class);
+  private static final Logger logger = LoggerFactory.getLogger(TopicSchemaLoader.class);
 
-    private final SchemaRepository schemaRepository;
+  private final SchemaRepository schemaRepository;
 
-    private final ScheduledExecutorService scheduler;
+  private final ScheduledExecutorService scheduler;
 
-    private final RetryPolicy<SchemaLoadingResult> retryPolicy;
+  private final RetryPolicy<SchemaLoadingResult> retryPolicy;
 
-    TopicSchemaLoader(SchemaRepository schemaRepository, int retryCount, int threadPoolSize) {
-        this.schemaRepository = schemaRepository;
+  TopicSchemaLoader(SchemaRepository schemaRepository, int retryCount, int threadPoolSize) {
+    this.schemaRepository = schemaRepository;
 
-        ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("topic-schema-loader-%d").build();
-        this.scheduler = Executors.newScheduledThreadPool(threadPoolSize, threadFactory);
-        this.retryPolicy = new RetryPolicy<SchemaLoadingResult>()
-                .withMaxRetries(retryCount)
-                .handleIf((resp, cause) -> resp.isFailure());
-    }
+    ThreadFactory threadFactory =
+        new ThreadFactoryBuilder().setNameFormat("topic-schema-loader-%d").build();
+    this.scheduler = Executors.newScheduledThreadPool(threadPoolSize, threadFactory);
+    this.retryPolicy =
+        new RetryPolicy<SchemaLoadingResult>()
+            .withMaxRetries(retryCount)
+            .handleIf((resp, cause) -> resp.isFailure());
+  }
 
-    CompletableFuture<SchemaLoadingResult> loadTopicSchema(Topic topic) {
-        return Failsafe.with(retryPolicy).with(scheduler)
-                .getStageAsync((context) -> completedFuture(loadLatestSchema(topic, context)));
-    }
+  CompletableFuture<SchemaLoadingResult> loadTopicSchema(Topic topic) {
+    return Failsafe.with(retryPolicy)
+        .with(scheduler)
+        .getStageAsync((context) -> completedFuture(loadLatestSchema(topic, context)));
+  }
 
-    private SchemaLoadingResult loadLatestSchema(Topic topic, ExecutionContext context) {
-        int attempt = context.getAttemptCount();
-        try {
-            schemaRepository.getLatestAvroSchema(topic);
-            logger.info("Successfully loaded schema for topic {}, attempt #{}", topic.getQualifiedName(), attempt);
-            return SchemaLoadingResult.success(topic);
-        } catch (SchemaNotFoundException e) {
-            logger.warn("Failed to load schema for topic {}, attempt #{}. {}", topic.getQualifiedName(), attempt, e.getMessage());
-            return SchemaLoadingResult.missing(topic);
-        } catch (CouldNotLoadSchemaException e) {
-            logger.error("Failed to load schema for topic {}, attempt #{}", topic.getQualifiedName(), attempt, e);
-        }
-        return SchemaLoadingResult.failure(topic);
+  private SchemaLoadingResult loadLatestSchema(Topic topic, ExecutionContext context) {
+    int attempt = context.getAttemptCount();
+    try {
+      schemaRepository.getLatestAvroSchema(topic);
+      logger.info(
+          "Successfully loaded schema for topic {}, attempt #{}",
+          topic.getQualifiedName(),
+          attempt);
+      return SchemaLoadingResult.success(topic);
+    } catch (SchemaNotFoundException e) {
+      logger.warn(
+          "Failed to load schema for topic {}, attempt #{}. {}",
+          topic.getQualifiedName(),
+          attempt,
+          e.getMessage());
+      return SchemaLoadingResult.missing(topic);
+    } catch (CouldNotLoadSchemaException e) {
+      logger.error(
+          "Failed to load schema for topic {}, attempt #{}", topic.getQualifiedName(), attempt, e);
     }
+    return SchemaLoadingResult.failure(topic);
+  }
 
-    @Override
-    public void close() throws Exception {
-        scheduler.shutdown();
-        scheduler.awaitTermination(1, TimeUnit.SECONDS);
-    }
+  @Override
+  public void close() throws Exception {
+    scheduler.shutdown();
+    scheduler.awaitTermination(1, TimeUnit.SECONDS);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicSchemaLoadingStartupHook.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicSchemaLoadingStartupHook.java
index 407d631d3d..f668c780a1 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicSchemaLoadingStartupHook.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/TopicSchemaLoadingStartupHook.java
@@ -1,5 +1,17 @@
 package pl.allegro.tech.hermes.frontend.server;
 
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toList;
+import static pl.allegro.tech.hermes.frontend.server.SchemaLoadingResult.Type.FAILURE;
+import static pl.allegro.tech.hermes.frontend.server.SchemaLoadingResult.Type.MISSING;
+import static pl.allegro.tech.hermes.frontend.server.SchemaLoadingResult.Type.SUCCESS;
+import static pl.allegro.tech.hermes.frontend.utils.CompletableFuturesHelper.allComplete;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.ContentType;
@@ -9,94 +21,94 @@
 import pl.allegro.tech.hermes.frontend.server.SchemaLoadingResult.Type;
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
-import static pl.allegro.tech.hermes.frontend.server.CompletableFuturesHelper.allComplete;
-import static pl.allegro.tech.hermes.frontend.server.SchemaLoadingResult.Type.FAILURE;
-import static pl.allegro.tech.hermes.frontend.server.SchemaLoadingResult.Type.MISSING;
-import static pl.allegro.tech.hermes.frontend.server.SchemaLoadingResult.Type.SUCCESS;
-
 public class TopicSchemaLoadingStartupHook {
 
-    private static final Logger logger = LoggerFactory.getLogger(TopicSchemaLoadingStartupHook.class);
-
-    private final TopicsCache topicsCache;
-
-    private final SchemaRepository schemaRepository;
+  private static final Logger logger = LoggerFactory.getLogger(TopicSchemaLoadingStartupHook.class);
 
-    private final int retryCount;
+  private final TopicsCache topicsCache;
 
-    private final int threadPoolSize;
+  private final SchemaRepository schemaRepository;
 
-    private final boolean isTopicSchemaLoadingStartupHookEnabled;
+  private final int retryCount;
 
-    public TopicSchemaLoadingStartupHook(TopicsCache topicsCache,
-                                  SchemaRepository schemaRepository,
-                                  int retryCount,
-                                  int threadPoolSize,
-                                  boolean isTopicSchemaLoadingStartupHookEnabled) {
-        this.topicsCache = topicsCache;
-        this.schemaRepository = schemaRepository;
-        this.retryCount = retryCount;
-        this.threadPoolSize = threadPoolSize;
-        this.isTopicSchemaLoadingStartupHookEnabled = isTopicSchemaLoadingStartupHookEnabled;
-    }
-
-    public void run() {
-        if (isTopicSchemaLoadingStartupHookEnabled) {
-            long start = System.currentTimeMillis();
-            logger.info("Loading topic schemas");
-            List<Topic> topics = getAvroTopics();
-            List<SchemaLoadingResult> allResults = loadSchemasForTopics(topics);
-            logResultInfo(allResults, System.currentTimeMillis() - start);
-        } else {
-            logger.info("Loading topic schemas is disabled");
-        }
-    }
-
-    private List<Topic> getAvroTopics() {
-        return topicsCache.getTopics().stream()
-                .map(CachedTopic::getTopic)
-                .filter(topic -> ContentType.AVRO == topic.getContentType())
-                .collect(toList());
-    }
+  private final int threadPoolSize;
 
-    private List<SchemaLoadingResult> loadSchemasForTopics(List<Topic> topics) {
-        try (TopicSchemaLoader loader = new TopicSchemaLoader(schemaRepository, retryCount, threadPoolSize)) {
-            return allComplete(topics.stream().map(loader::loadTopicSchema).collect(toList())).join();
-        } catch (Exception e) {
-            logger.error("An error occurred while loading schema topics", e);
-            return Collections.emptyList();
-        }
-    }
+  private final boolean isTopicSchemaLoadingStartupHookEnabled;
 
-    private void logResultInfo(List<SchemaLoadingResult> allResults, long elapsed) {
-        Map<Type, List<SchemaLoadingResult>> groupedResults = getGroupedResults(allResults);
-        Optional<List<SchemaLoadingResult>> successes = Optional.ofNullable(groupedResults.get(SUCCESS));
-        Optional<List<SchemaLoadingResult>> missing = Optional.ofNullable(groupedResults.get(MISSING));
-        Optional<List<SchemaLoadingResult>> failures = Optional.ofNullable(groupedResults.get(FAILURE));
-
-        logger.info("Finished loading schemas for {} topics in {}ms [successful: {}, missing: {}, failed: {}]. {}{}",
-                allResults.size(), elapsed, successes.map(List::size).orElse(0),
-                missing.map(List::size).orElse(0), failures.map(List::size).orElse(0),
-                missing.map(results -> String.format("Missing schema for: [%s]", topicsOfResults(results))).orElse(""),
-                failures.map(results -> String.format("Failed for: [%s]. ", topicsOfResults(results))).orElse(""));
-    }
+  public TopicSchemaLoadingStartupHook(
+      TopicsCache topicsCache,
+      SchemaRepository schemaRepository,
+      int retryCount,
+      int threadPoolSize,
+      boolean isTopicSchemaLoadingStartupHookEnabled) {
+    this.topicsCache = topicsCache;
+    this.schemaRepository = schemaRepository;
+    this.retryCount = retryCount;
+    this.threadPoolSize = threadPoolSize;
+    this.isTopicSchemaLoadingStartupHookEnabled = isTopicSchemaLoadingStartupHookEnabled;
+  }
 
-    private String topicsOfResults(List<SchemaLoadingResult> results) {
-        return results.stream()
-                .map(SchemaLoadingResult::getTopic)
-                .map(Topic::getQualifiedName)
-                .collect(joining(", "));
+  public void run() {
+    if (isTopicSchemaLoadingStartupHookEnabled) {
+      long start = System.currentTimeMillis();
+      logger.info("Loading topic schemas");
+      List<Topic> topics = getAvroTopics();
+      List<SchemaLoadingResult> allResults = loadSchemasForTopics(topics);
+      logResultInfo(allResults, System.currentTimeMillis() - start);
+    } else {
+      logger.info("Loading topic schemas is disabled");
     }
-
-    private Map<Type, List<SchemaLoadingResult>> getGroupedResults(List<SchemaLoadingResult> allResults) {
-        return allResults.stream().collect(Collectors.groupingBy(SchemaLoadingResult::getType, Collectors.toList()));
+  }
+
+  private List<Topic> getAvroTopics() {
+    return topicsCache.getTopics().stream()
+        .map(CachedTopic::getTopic)
+        .filter(topic -> ContentType.AVRO == topic.getContentType())
+        .collect(toList());
+  }
+
+  private List<SchemaLoadingResult> loadSchemasForTopics(List<Topic> topics) {
+    try (TopicSchemaLoader loader =
+        new TopicSchemaLoader(schemaRepository, retryCount, threadPoolSize)) {
+      return allComplete(topics.stream().map(loader::loadTopicSchema).collect(toList())).join();
+    } catch (Exception e) {
+      logger.error("An error occurred while loading schema topics", e);
+      return Collections.emptyList();
     }
+  }
+
+  private void logResultInfo(List<SchemaLoadingResult> allResults, long elapsed) {
+    Map<Type, List<SchemaLoadingResult>> groupedResults = getGroupedResults(allResults);
+    Optional<List<SchemaLoadingResult>> successes =
+        Optional.ofNullable(groupedResults.get(SUCCESS));
+    Optional<List<SchemaLoadingResult>> missing = Optional.ofNullable(groupedResults.get(MISSING));
+    Optional<List<SchemaLoadingResult>> failures = Optional.ofNullable(groupedResults.get(FAILURE));
+
+    logger.info(
+        "Finished loading schemas for {} topics in {}ms [successful: {}, missing: {}, failed: {}]. {}{}",
+        allResults.size(),
+        elapsed,
+        successes.map(List::size).orElse(0),
+        missing.map(List::size).orElse(0),
+        failures.map(List::size).orElse(0),
+        missing
+            .map(results -> String.format("Missing schema for: [%s]", topicsOfResults(results)))
+            .orElse(""),
+        failures
+            .map(results -> String.format("Failed for: [%s]. ", topicsOfResults(results)))
+            .orElse(""));
+  }
+
+  private String topicsOfResults(List<SchemaLoadingResult> results) {
+    return results.stream()
+        .map(SchemaLoadingResult::getTopic)
+        .map(Topic::getQualifiedName)
+        .collect(joining(", "));
+  }
+
+  private Map<Type, List<SchemaLoadingResult>> getGroupedResults(
+      List<SchemaLoadingResult> allResults) {
+    return allResults.stream()
+        .collect(Collectors.groupingBy(SchemaLoadingResult::getType, Collectors.toList()));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/AuthenticationConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/AuthenticationConfiguration.java
index a5b9cc63c5..8ae24c101c 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/AuthenticationConfiguration.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/AuthenticationConfiguration.java
@@ -4,37 +4,39 @@
 import io.undertow.security.api.AuthenticationMechanism;
 import io.undertow.security.idm.IdentityManager;
 import io.undertow.server.HttpServerExchange;
-
 import java.util.List;
 import java.util.function.Predicate;
 
 public class AuthenticationConfiguration {
 
-    private final Predicate<HttpServerExchange> isAuthenticationRequiredPredicate;
-    private final List<AuthenticationMechanism> authMechanisms;
-    private final IdentityManager identityManager;
-
-    public AuthenticationConfiguration(Predicate<HttpServerExchange> isAuthenticationRequiredPredicate,
-                                List<AuthenticationMechanism> authMechanisms,
-                                IdentityManager identityManager) {
-        Preconditions.checkNotNull(isAuthenticationRequiredPredicate, "IsAuthenticationRequired predicate has to be provided");
-        Preconditions.checkArgument(!authMechanisms.isEmpty(), "At least one AuthenticationMechanism has to be provided.");
-        Preconditions.checkNotNull(identityManager, "IdentityManager has to be provided");
-
-        this.isAuthenticationRequiredPredicate = isAuthenticationRequiredPredicate;
-        this.authMechanisms = authMechanisms;
-        this.identityManager = identityManager;
-    }
-
-    public Predicate<HttpServerExchange> getIsAuthenticationRequiredPredicate() {
-        return isAuthenticationRequiredPredicate;
-    }
-
-    public List<AuthenticationMechanism> getAuthMechanisms() {
-        return authMechanisms;
-    }
-
-    public IdentityManager getIdentityManager() {
-        return identityManager;
-    }
+  private final Predicate<HttpServerExchange> isAuthenticationRequiredPredicate;
+  private final List<AuthenticationMechanism> authMechanisms;
+  private final IdentityManager identityManager;
+
+  public AuthenticationConfiguration(
+      Predicate<HttpServerExchange> isAuthenticationRequiredPredicate,
+      List<AuthenticationMechanism> authMechanisms,
+      IdentityManager identityManager) {
+    Preconditions.checkNotNull(
+        isAuthenticationRequiredPredicate, "IsAuthenticationRequired predicate has to be provided");
+    Preconditions.checkArgument(
+        !authMechanisms.isEmpty(), "At least one AuthenticationMechanism has to be provided.");
+    Preconditions.checkNotNull(identityManager, "IdentityManager has to be provided");
+
+    this.isAuthenticationRequiredPredicate = isAuthenticationRequiredPredicate;
+    this.authMechanisms = authMechanisms;
+    this.identityManager = identityManager;
+  }
+
+  public Predicate<HttpServerExchange> getIsAuthenticationRequiredPredicate() {
+    return isAuthenticationRequiredPredicate;
+  }
+
+  public List<AuthenticationMechanism> getAuthMechanisms() {
+    return authMechanisms;
+  }
+
+  public IdentityManager getIdentityManager() {
+    return identityManager;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/AuthenticationPredicateAwareConstraintHandler.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/AuthenticationPredicateAwareConstraintHandler.java
index f6c60d0899..9598772c9e 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/AuthenticationPredicateAwareConstraintHandler.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/AuthenticationPredicateAwareConstraintHandler.java
@@ -3,20 +3,20 @@
 import io.undertow.security.handlers.AuthenticationConstraintHandler;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
-
 import java.util.function.Predicate;
 
 public class AuthenticationPredicateAwareConstraintHandler extends AuthenticationConstraintHandler {
 
-    private final Predicate<HttpServerExchange> predicate;
+  private final Predicate<HttpServerExchange> predicate;
 
-    public AuthenticationPredicateAwareConstraintHandler(HttpHandler next, Predicate<HttpServerExchange> predicate) {
-        super(next);
-        this.predicate = predicate;
-    }
+  public AuthenticationPredicateAwareConstraintHandler(
+      HttpHandler next, Predicate<HttpServerExchange> predicate) {
+    super(next);
+    this.predicate = predicate;
+  }
 
-    @Override
-    protected boolean isAuthenticationRequired(HttpServerExchange exchange) {
-        return predicate.test(exchange);
-    }
+  @Override
+  protected boolean isAuthenticationRequired(HttpServerExchange exchange) {
+    return predicate.test(exchange);
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/Roles.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/Roles.java
index a996ddaf4a..0fc702aeec 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/Roles.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/auth/Roles.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.frontend.server.auth;
 
 public interface Roles {
-    String PUBLISHER = "PUBLISHER";
+  String PUBLISHER = "PUBLISHER";
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/services/HealthCheckService.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/services/HealthCheckService.java
deleted file mode 100644
index 6f9c727bd3..0000000000
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/services/HealthCheckService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package pl.allegro.tech.hermes.frontend.services;
-
-import jakarta.inject.Singleton;
-
-@Singleton
-public class HealthCheckService {
-
-    private volatile boolean shutdown = true;
-
-    public boolean isShutdown() {
-        return shutdown;
-    }
-
-    public void shutdown() {
-        this.shutdown = true;
-    }
-
-    public void startup() {
-        this.shutdown = false;
-    }
-
-}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/utils/CompletableFuturesHelper.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/utils/CompletableFuturesHelper.java
new file mode 100644
index 0000000000..a5952dd397
--- /dev/null
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/utils/CompletableFuturesHelper.java
@@ -0,0 +1,14 @@
+package pl.allegro.tech.hermes.frontend.utils;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public class CompletableFuturesHelper {
+
+  public static <T> CompletableFuture<List<T>> allComplete(List<CompletableFuture<T>> futures) {
+    return CompletableFuture.allOf(futures.toArray(new CompletableFuture<?>[0]))
+        .thenApply(v -> futures.stream().map(CompletableFuture::join).collect(toList()));
+  }
+}
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/InvalidMessageException.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/InvalidMessageException.java
index 49d2c74616..1d545b31ec 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/InvalidMessageException.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/InvalidMessageException.java
@@ -1,19 +1,18 @@
 package pl.allegro.tech.hermes.frontend.validator;
 
 import com.google.common.base.Joiner;
+import java.util.List;
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.common.exception.HermesException;
 
-import java.util.List;
-
 public class InvalidMessageException extends HermesException {
 
-    public InvalidMessageException(String msg, List<String> reasons) {
-        super(String.format("%s Errors: %s", msg, Joiner.on(";").join(reasons)));
-    }
+  public InvalidMessageException(String msg, List<String> reasons) {
+    super(String.format("%s Errors: %s", msg, Joiner.on(";").join(reasons)));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.FORMAT_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.FORMAT_ERROR;
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/MessageValidators.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/MessageValidators.java
index 3ae4de3a3b..67301dd412 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/MessageValidators.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/MessageValidators.java
@@ -1,20 +1,18 @@
 package pl.allegro.tech.hermes.frontend.validator;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 
-import java.util.List;
-
 public class MessageValidators {
 
-    private final List<TopicMessageValidator> messageValidators;
-
-    public MessageValidators(List<TopicMessageValidator> messageValidators) {
-        this.messageValidators = messageValidators;
-    }
+  private final List<TopicMessageValidator> messageValidators;
 
-    public void check(Topic topic, Message message) {
-        messageValidators.forEach(v -> v.check(message, topic));
-    }
+  public MessageValidators(List<TopicMessageValidator> messageValidators) {
+    this.messageValidators = messageValidators;
+  }
 
+  public void check(Topic topic, Message message) {
+    messageValidators.forEach(v -> v.check(message, topic));
+  }
 }
diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/TopicMessageValidator.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/TopicMessageValidator.java
index f5f37610c3..5cc002fb73 100644
--- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/TopicMessageValidator.java
+++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/validator/TopicMessageValidator.java
@@ -4,5 +4,5 @@
 import pl.allegro.tech.hermes.frontend.publishing.message.Message;
 
 public interface TopicMessageValidator {
-    void check(Message message, Topic topic);
+  void check(Message message, Topic topic);
 }
diff --git a/hermes-frontend/src/main/resources/application-integration.yaml b/hermes-frontend/src/main/resources/application-integration.yaml
index 4af762bba7..1ab55e4739 100644
--- a/hermes-frontend/src/main/resources/application-integration.yaml
+++ b/hermes-frontend/src/main/resources/application-integration.yaml
@@ -17,12 +17,6 @@ frontend:
     http2Enabled: true
   handlers:
     idleTimeout: 2000ms
-  metrics:
-    metric-registry:
-      graphiteReporterEnabled: true
-      reportPeriod: 1s
-  graphite:
-    port: 18023
   zookeeper:
     clusters:
       -
diff --git a/hermes-frontend/src/main/resources/application-local.yaml b/hermes-frontend/src/main/resources/application-local.yaml
index c98dc5d41d..1c78837c87 100644
--- a/hermes-frontend/src/main/resources/application-local.yaml
+++ b/hermes-frontend/src/main/resources/application-local.yaml
@@ -8,11 +8,6 @@ frontend:
     clusters:
       - datacenter: "dc"
         brokerList: "localhost:9092"
-  graphite:
-    host: "localhost"
-  metrics:
-    metric-registry:
-      graphiteReporterEnabled: true
   schema:
     cache:
       refreshAfterWrite: 1m
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducerIntegrationTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducerIntegrationTest.groovy
similarity index 70%
rename from hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducerIntegrationTest.groovy
rename to hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducerIntegrationTest.groovy
index 345beed23a..46b1913121 100644
--- a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducerIntegrationTest.groovy
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducerIntegrationTest.groovy
@@ -1,7 +1,6 @@
 package pl.allegro.tech.hermes.frontend.producer.kafka
 
 import com.codahale.metrics.MetricRegistry
-import com.jayway.awaitility.Awaitility
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import org.apache.commons.lang3.tuple.ImmutablePair
 import org.apache.kafka.clients.admin.AdminClient
@@ -10,49 +9,50 @@ import org.apache.kafka.clients.consumer.KafkaConsumer
 import org.apache.kafka.clients.consumer.OffsetAndMetadata
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.apache.kafka.common.TopicPartition
+import org.awaitility.Awaitility
 import org.testcontainers.containers.KafkaContainer
 import org.testcontainers.containers.wait.strategy.Wait
 import org.testcontainers.spock.Testcontainers
-import pl.allegro.tech.hermes.api.ContentType
-import pl.allegro.tech.hermes.api.DeliveryType
-import pl.allegro.tech.hermes.api.Subscription
-import pl.allegro.tech.hermes.api.SubscriptionMode
-import pl.allegro.tech.hermes.api.Topic
+import pl.allegro.tech.hermes.api.*
 import pl.allegro.tech.hermes.common.kafka.ConsumerGroupId
 import pl.allegro.tech.hermes.common.kafka.JsonToAvroMigrationKafkaNamesMapper
 import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper
-import pl.allegro.tech.hermes.common.metric.HermesMetrics
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
-import pl.allegro.tech.hermes.frontend.config.SchemaProperties
+import pl.allegro.tech.hermes.frontend.config.HTTPHeadersProperties
 import pl.allegro.tech.hermes.frontend.config.KafkaHeaderNameProperties
-import pl.allegro.tech.hermes.frontend.config.KafkaProducerProperties
+import pl.allegro.tech.hermes.frontend.config.SchemaProperties
 import pl.allegro.tech.hermes.frontend.metric.CachedTopic
+import pl.allegro.tech.hermes.frontend.producer.BrokerLatencyReporter
 import pl.allegro.tech.hermes.frontend.publishing.avro.AvroMessage
 import pl.allegro.tech.hermes.frontend.server.CachedTopicsTestHelper
-import pl.allegro.tech.hermes.metrics.PathsCompiler
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser
 import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder
+import pl.allegro.tech.hermes.test.helper.containers.ImageTags
 import spock.lang.Shared
 import spock.lang.Specification
 
 import java.time.Duration
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
 import java.util.stream.Collectors
 
+import static java.util.Collections.emptyList
+import static java.util.Collections.emptyMap
 import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG
-import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_ID_CONFIG
-import static org.apache.kafka.clients.consumer.ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG
-import static org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG
+import static org.apache.kafka.clients.consumer.ConsumerConfig.*
 import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG
 import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG
 
 @Testcontainers
-class KafkaBrokerMessageProducerIntegrationTest extends Specification {
+class LocalDatacenterMessageProducerIntegrationTest extends Specification {
 
     static Integer NUMBER_OF_PARTITION = 3
 
     @Shared
-    KafkaContainer kafkaContainer = new KafkaContainer()
+    BrokerLatencyReporter brokerLatencyReporter = new BrokerLatencyReporter(false, null, null, null)
+
+    @Shared
+    KafkaContainer kafkaContainer = new KafkaContainer(ImageTags.confluentImagesTag())
 
     @Shared
     KafkaProducer<byte[], byte[]> leaderConfirms
@@ -61,13 +61,13 @@ class KafkaBrokerMessageProducerIntegrationTest extends Specification {
     KafkaProducer<byte[], byte[]> everyoneConfirms
 
     @Shared
-    KafkaBrokerMessageProducer brokerMessageProducer
+    LocalDatacenterMessageProducer brokerMessageProducer
 
     @Shared
     KafkaNamesMapper kafkaNamesMapper = new JsonToAvroMigrationKafkaNamesMapper("", "_")
 
     @Shared
-    Producers producers
+    KafkaMessageSenders producers
 
     @Shared
     String containerId
@@ -82,7 +82,13 @@ class KafkaBrokerMessageProducerIntegrationTest extends Specification {
     KafkaHeaderNameProperties kafkaHeaderNameProperties = new KafkaHeaderNameProperties()
 
     @Shared
-    KafkaProducerProperties kafkaProducerProperties = new KafkaProducerProperties()
+    String datacenter = "dc"
+
+    @Shared
+    ScheduledExecutorService chaosScheduler = Executors.newSingleThreadScheduledExecutor();
+
+    @Shared
+    MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry())
 
     def setupSpec() {
         kafkaContainer.start()
@@ -99,11 +105,22 @@ class KafkaBrokerMessageProducerIntegrationTest extends Specification {
     }
 
     def setup() {
-        producers = new Producers(leaderConfirms, everyoneConfirms, kafkaProducerProperties.isReportNodeMetricsEnabled())
-        brokerMessageProducer = new KafkaBrokerMessageProducer(producers,
-                new KafkaTopicMetadataFetcher(adminClient, kafkaProducerProperties.getMetadataMaxAge()),
-                new MetricsFacade(new SimpleMeterRegistry(), new HermesMetrics(new MetricRegistry(), new PathsCompiler("localhost"))),
-                new MessageToKafkaProducerRecordConverter(new KafkaHeaderFactory(kafkaHeaderNameProperties),
+        TopicMetadataLoadingExecutor topicMetadataLoadingExecutor = Mock()
+        MinInSyncReplicasLoader minInSyncReplicasLoader = Mock()
+        producers = new KafkaMessageSenders(
+                topicMetadataLoadingExecutor,
+                minInSyncReplicasLoader,
+                new KafkaMessageSenders.Tuple(
+                        new KafkaMessageSender<byte[], byte[]>(leaderConfirms, brokerLatencyReporter, metricsFacade, datacenter, chaosScheduler),
+                        new KafkaMessageSender<byte[], byte[]>(everyoneConfirms, brokerLatencyReporter, metricsFacade, datacenter, chaosScheduler)
+                ),
+                emptyList()
+        )
+        brokerMessageProducer = new LocalDatacenterMessageProducer(
+                producers,
+                new MessageToKafkaProducerRecordConverter(new KafkaHeaderFactory(
+                            kafkaHeaderNameProperties,
+                            new HTTPHeadersProperties.PropagationAsKafkaHeadersProperties()),
                         schemaProperties.isIdHeaderEnabled()
                 )
         )
@@ -138,42 +155,15 @@ class KafkaBrokerMessageProducerIntegrationTest extends Specification {
         partitionsWithMessagesData.get(0).offset() == 10
     }
 
-    def "should publish messages with random distribiution when pratition-key is not present"() {
-        Topic topic = createAvroTopic("pl.allegro.test.randomFoo")
-        Subscription subscription = createTestSubscription(topic, "test-subscription")
-        String kafkaTopicName = topic.getName().toString()
-        ConsumerGroupId consumerGroupId = kafkaNamesMapper.toConsumerGroupId(subscription.qualifiedName)
-        createTopicInKafka(kafkaTopicName, NUMBER_OF_PARTITION)
-        CachedTopic cachedTopic = CachedTopicsTestHelper.cachedTopic(topic)
-        KafkaConsumer consumer = createConsumer(consumerGroupId, kafkaTopicName)
-
-        when:
-        1.upto(10) {
-            brokerMessageProducer.send(generateAvroMessage(null), cachedTopic, null)
-            waitForRecordPublishing(consumer)
-        }
-
-        then:
-        consumer.close()
-
-        List<OffsetAndMetadata> partitionsWithMessagesData = adminClient
-                .listConsumerGroupOffsets(consumerGroupId.asString())
-                .partitionsToOffsetAndMetadata()
-                .get().values().stream()
-                .filter { metadata -> metadata.offset() != 0 }
-                .collect(Collectors.toList())
-
-        partitionsWithMessagesData.size() == NUMBER_OF_PARTITION
-    }
-
     private static AvroMessage generateAvroMessage(String partitionKey) {
         def avroUser = new AvroUser()
-        return new AvroMessage(UUID.randomUUID().toString(), avroUser.asBytes(), 0L, avroUser.compiledSchema, partitionKey)
+        return new AvroMessage(UUID.randomUUID().toString(), avroUser.asBytes(), 0L, avroUser.compiledSchema,
+                partitionKey, emptyMap())
     }
 
     private static def createTestSubscription(Topic topic, String subscriptionName) {
         Subscription.create(topic.getQualifiedName(), subscriptionName, null, Subscription.State.PENDING, "test", [:], false, null, null,
-                null, ContentType.JSON, DeliveryType.SERIAL, [], SubscriptionMode.ANYCAST, [], null, null, false, false, false
+                null, ContentType.JSON, DeliveryType.SERIAL, [], SubscriptionMode.ANYCAST, [], null, null, false, false, 0, false, false
         )
     }
 
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/MultiDatacenterMessageProducerTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/MultiDatacenterMessageProducerTest.groovy
new file mode 100644
index 0000000000..596105bc7a
--- /dev/null
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/MultiDatacenterMessageProducerTest.groovy
@@ -0,0 +1,279 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka
+
+import org.apache.kafka.clients.producer.Callback
+import org.apache.kafka.clients.producer.ProducerRecord
+import pl.allegro.tech.hermes.api.Topic
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic
+import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback
+import pl.allegro.tech.hermes.frontend.publishing.message.JsonMessage
+import pl.allegro.tech.hermes.frontend.publishing.message.Message
+import pl.allegro.tech.hermes.frontend.readiness.AdminReadinessService
+import pl.allegro.tech.hermes.frontend.server.CachedTopicsTestHelper
+import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder
+import spock.lang.Specification
+import spock.util.concurrent.PollingConditions
+
+import java.time.Duration
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.atomic.AtomicInteger
+
+import static java.util.Collections.emptyMap
+
+class MultiDatacenterMessageProducerTest extends Specification {
+    ScheduledExecutorService fallbackScheduler = Executors.newSingleThreadScheduledExecutor();
+    ExecutorService testExecutor = Executors.newSingleThreadExecutor();
+
+
+    Duration speculativeSendDelay = Duration.ofMillis(250);
+    Message message = new JsonMessage('id', [2] as byte[], 0L, null, emptyMap());
+
+    private static final String localDC = "LOCAL"
+    private static final String remoteDC = "REMOTE"
+
+    class VerificationCallback implements PublishingCallback {
+        AtomicInteger onUnpublished = new AtomicInteger(0)
+        AtomicInteger onPublished = new AtomicInteger(0)
+        AtomicInteger publishedToLocal = new AtomicInteger(0)
+        AtomicInteger publishedToRemote = new AtomicInteger(0)
+        volatile String exception = ""
+
+        @Override
+        void onUnpublished(Message message, Topic topic, Exception exception) {
+            onUnpublished.incrementAndGet();
+            this.exception = exception;
+        }
+
+        @Override
+        void onPublished(Message message, Topic topic) {
+            onPublished.incrementAndGet();
+        }
+
+        @Override
+        void onEachPublished(Message message, Topic topic, String datacenter) {
+            if (datacenter == localDC) {
+                publishedToLocal.incrementAndGet()
+            } else if (datacenter == remoteDC) {
+                publishedToRemote.incrementAndGet()
+            }
+        }
+    }
+
+    def "should send to local DC only if the send is successful before speculativeSendDelay elapses"() {
+        given:
+        CachedTopic cachedTopic = CachedTopicsTestHelper.cachedTopic(TopicBuilder.topicWithRandomName().build())
+
+        def localSender = successfulSender(localDC)
+        def remoteSender = successfulSender(remoteDC)
+
+        def producer = producer(localSender, remoteSender)
+
+        PublishingCallback callback = new VerificationCallback();
+
+        when:
+        testExecutor.execute { producer.send(message, cachedTopic, callback) }
+
+        then:
+        // wait until speculative send delay elapses
+        Thread.sleep(speculativeSendDelay.plusMillis(200).toMillis())
+        callback.publishedToLocal.get() == 1
+        callback.publishedToRemote.get() == 0
+        callback.onPublished.get() == 1
+        callback.onUnpublished.get() == 0
+
+    }
+
+    def "should send to remote DC if local DC fails"() {
+        given:
+        CachedTopic cachedTopic = CachedTopicsTestHelper.cachedTopic(TopicBuilder.topicWithRandomName().build())
+
+        def localSender = failingSender(localDC)
+        def remoteSender = successfulSender(remoteDC)
+
+        def producer = producer(localSender, remoteSender)
+
+
+        PublishingCallback callback = new VerificationCallback();
+
+        when:
+        testExecutor.execute { producer.send(message, cachedTopic, callback) }
+
+        then:
+        new PollingConditions(timeout: 10).eventually {
+            callback.publishedToLocal.get() == 0
+            callback.publishedToRemote.get() == 1
+            callback.onPublished.get() == 1
+            callback.onUnpublished.get() == 0
+        }
+    }
+
+    def "should send to remote DC when local does not respond before speculativeSendDelay elapses"() {
+        given:
+        CachedTopic cachedTopic = CachedTopicsTestHelper.cachedTopic(TopicBuilder.topicWithRandomName().build())
+
+        def localSender = stuckLocalSender()
+        def remoteSender = successfulSender(remoteDC)
+
+        def producer = producer(localSender, remoteSender)
+
+        PublishingCallback callback = new VerificationCallback();
+
+        when:
+        def start = System.currentTimeMillis()
+        testExecutor.execute { producer.send(message, cachedTopic, callback) }
+
+        then:
+        new PollingConditions(timeout: 10).eventually {
+            callback.publishedToLocal.get() == 0
+            callback.publishedToRemote.get() == 1
+            callback.onPublished.get() == 1
+            callback.onUnpublished.get() == 0
+            System.currentTimeMillis() - start > speculativeSendDelay.toMillis()
+        }
+    }
+
+    def "should publish to local DC and remote DC when local send is slower than speculativeSendDelay but it eventually succeeds"() {
+        given:
+        CachedTopic cachedTopic = CachedTopicsTestHelper.cachedTopic(TopicBuilder.topicWithRandomName().build())
+
+        def localSender = delayedSender(localDC, speculativeSendDelay.plusMillis(100).toMillis())
+        def remoteSender = successfulSender(remoteDC)
+
+        def producer = producer(localSender, remoteSender)
+
+        PublishingCallback callback = new VerificationCallback();
+
+        when:
+        testExecutor.execute { producer.send(message, cachedTopic, callback) }
+
+        then:
+        new PollingConditions(timeout: 10).eventually {
+            callback.publishedToLocal.get() == 1
+            callback.publishedToRemote.get() == 1
+            callback.onPublished.get() == 1
+            callback.onUnpublished.get() == 0
+        }
+    }
+
+    def "should invoke onUnpublished when both DCs fail"() {
+        given:
+        CachedTopic cachedTopic = CachedTopicsTestHelper.cachedTopic(TopicBuilder.topicWithRandomName().build())
+
+        def localSender = failingSender(localDC, "network error")
+        def remoteSender = failingSender(remoteDC, "not leader or follower")
+
+        def producer = producer(localSender, remoteSender)
+
+
+        PublishingCallback callback = new VerificationCallback();
+
+        when:
+        testExecutor.execute { producer.send(message, cachedTopic, callback) }
+
+        then:
+        new PollingConditions(timeout: 10).eventually {
+            callback.publishedToLocal.get() == 0
+            callback.publishedToRemote.get() == 0
+            callback.onPublished.get() == 0
+            callback.onUnpublished.get() == 1
+            callback.exception.contains("[LOCAL]: RuntimeException: network error")
+            callback.exception.contains("[REMOTE]: RuntimeException: not leader or follower")
+        }
+    }
+
+    def "should publish to remote DC once when both scheduled fallback (after speculativeSendDelay) and immediate fallback are run"() {
+        given:
+        CachedTopic cachedTopic = CachedTopicsTestHelper.cachedTopic(TopicBuilder.topicWithRandomName().build())
+
+        def localSender = delayedFailingSender(localDC, speculativeSendDelay.toMillis() + 5)
+        def remoteSender = successfulSender(remoteDC)
+
+        def producer = producer(localSender, remoteSender)
+
+        PublishingCallback callback = new VerificationCallback()
+
+        when:
+        testExecutor.execute { producer.send(message, cachedTopic, callback) }
+
+        then:
+        Thread.sleep(speculativeSendDelay.toMillis() + 100)
+        callback.publishedToLocal.get() == 0
+        callback.publishedToRemote.get() == 1
+        callback.onPublished.get() == 1
+        callback.onUnpublished.get() == 0
+    }
+
+
+    KafkaMessageSender stuckLocalSender() {
+        return Mock(KafkaMessageSender) {
+            getDatacenter() >> localDC
+        }
+    }
+
+    KafkaMessageSender delayedSender(String sender, long delayMillis) {
+        return Mock(KafkaMessageSender) {
+            getDatacenter() >> sender
+            send(*_) >> (arguments) -> {
+                Thread.sleep(delayMillis)
+                callback(arguments).onCompletion(null, null)
+            }
+        }
+    }
+
+    KafkaMessageSender delayedFailingSender(String sender, long delayMillis, String exceptionMsg = "fail") {
+        return Mock(KafkaMessageSender) {
+            getDatacenter() >> sender
+            send(*_) >> (arguments) -> {
+                Thread.sleep(delayMillis)
+                callback(arguments).onCompletion(null, new RuntimeException(exceptionMsg))
+            }
+        }
+    }
+
+    KafkaMessageSender failingSender(String sender, String exceptionMsg = "fail") {
+        return Mock(KafkaMessageSender) {
+            getDatacenter() >> sender
+            send(*_) >> {
+                arguments -> callback(arguments).onCompletion(null, new RuntimeException(exceptionMsg))
+            }
+        }
+    }
+
+    KafkaMessageSender successfulSender(String sender) {
+        return Mock(KafkaMessageSender) {
+            getDatacenter() >> sender
+            send(*_) >> {
+                arguments -> callback(arguments).onCompletion(null, null)
+            }
+        }
+    }
+
+    // callback argument from pl.allegro.tech.hermes.frontend.producer.kafka.KafkaMessageSender#send
+    Callback callback(arguments) {
+        return (arguments[3] as Callback)
+    }
+
+    MultiDatacenterMessageProducer producer(KafkaMessageSender localSender, KafkaMessageSender remoteSender) {
+        MessageToKafkaProducerRecordConverter messageConverter = Mock(MessageToKafkaProducerRecordConverter) {
+            convertToProducerRecord(*_) >> new ProducerRecord("topic", new byte[]{0x0}, new byte[]{0x0})
+        }
+
+        def adminReadinessService = Mock(AdminReadinessService) {
+            isDatacenterReady(_) >> true
+        }
+
+        KafkaMessageSenders senders = new KafkaMessageSenders(
+                Mock(TopicMetadataLoadingExecutor),
+                Mock(MinInSyncReplicasLoader),
+                new KafkaMessageSenders.Tuple(
+                        localSender, localSender
+                ),
+                [new KafkaMessageSenders.Tuple(remoteSender, remoteSender)]
+        )
+
+        return new MultiDatacenterMessageProducer(
+                senders, adminReadinessService, messageConverter, speculativeSendDelay, fallbackScheduler
+        )
+    }
+}
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoadingExecutorTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoadingExecutorTest.groovy
new file mode 100644
index 0000000000..cdbf903c09
--- /dev/null
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/producer/kafka/TopicMetadataLoadingExecutorTest.groovy
@@ -0,0 +1,109 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka
+
+import com.google.common.collect.ImmutableList
+import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic
+import spock.lang.Shared
+import spock.lang.Specification
+
+import java.time.Duration
+
+import static pl.allegro.tech.hermes.frontend.producer.kafka.TopicMetadataLoader.*
+import static pl.allegro.tech.hermes.frontend.producer.kafka.TopicMetadataLoader.MetadataLoadingResult.*
+import static pl.allegro.tech.hermes.frontend.server.CachedTopicsTestHelper.cachedTopic
+
+class TopicMetadataLoadingExecutorTest extends Specification {
+
+    @Shared
+    List<String> topics = ["g1.topicA", "g1.topicB", "g2.topicC"]
+
+    @Shared
+    Map<String, CachedTopic> cachedTopics = new HashMap<>()
+
+    @Shared
+    TopicsCache topicsCache
+
+    def setupSpec() {
+        for (String topic : topics) {
+            cachedTopics.put(topic, cachedTopic(topic))
+        }
+        topicsCache = Mock() {
+            getTopics() >> ImmutableList.copyOf(cachedTopics.values())
+        }
+    }
+
+    def "should load topic metadata"() {
+        given:
+        TopicMetadataLoader loader = Mock()
+        def executor = new TopicMetadataLoadingExecutor(topicsCache, 2, Duration.ofSeconds(10), 2)
+
+        when:
+        boolean status = executor.execute([loader])
+
+        then:
+        for (String topic : topics) {
+            1 * loader.load(cachedTopics.get(topic)) >> success(topic)
+        }
+        status
+    }
+
+    def "should retry loading topic metadata"() {
+        given:
+        TopicMetadataLoader loader = Mock()
+        def executor = new TopicMetadataLoadingExecutor(topicsCache, 2, Duration.ofSeconds(10), 4)
+
+        when:
+        boolean status = executor.execute([loader])
+
+        then:
+        1 * loader.load(cachedTopics.get("g1.topicA")) >> failure("g1.topicA")
+        1 * loader.load(cachedTopics.get("g1.topicA")) >> success("g1.topicA")
+
+        1 * loader.load(cachedTopics.get("g1.topicB")) >> success("g1.topicB")
+
+        2 * loader.load(cachedTopics.get("g2.topicC")) >> failure("g2.topicC")
+        1 * loader.load(cachedTopics.get("g2.topicC")) >> success("g2.topicC")
+
+        status
+    }
+
+    def "should leave retry loop when reached max retries and failed to load metadata"() {
+        given:
+        TopicMetadataLoader loader = Mock()
+        def executor = new TopicMetadataLoadingExecutor(topicsCache, 2, Duration.ofSeconds(10), 4)
+
+        when:
+        boolean status = executor.execute([loader])
+
+        then:
+        3 * loader.load(cachedTopics.get("g1.topicA")) >> failure("g1.topicA")
+        1 * loader.load(cachedTopics.get("g1.topicB")) >> success("g1.topicB")
+        1 * loader.load(cachedTopics.get("g2.topicC")) >> success("g2.topicC")
+
+        !status
+    }
+
+    def "should not throw exception when no topics exist"() {
+        given:
+        TopicMetadataLoader loader = Mock()
+        TopicsCache emptyCache = Mock() {
+            getTopics() >> []
+        }
+        def executor = new TopicMetadataLoadingExecutor(emptyCache, 2, Duration.ofSeconds(10), 4)
+
+        when:
+        boolean status = executor.execute([loader])
+
+        then:
+        noExceptionThrown()
+        status
+    }
+
+    private MetadataLoadingResult success(String topicName) {
+        return success(cachedTopics.get(topicName).topic.name, "dc1")
+    }
+
+    private MetadataLoadingResult failure(String topicName) {
+        return failure(cachedTopics.get(topicName).topic.name, "dc1")
+    }
+}
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/message/MessageToJsonConverterTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/message/MessageToJsonConverterTest.groovy
index 34bb4dbcab..efd0d0a074 100644
--- a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/message/MessageToJsonConverterTest.groovy
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/message/MessageToJsonConverterTest.groovy
@@ -5,6 +5,8 @@ import pl.allegro.tech.hermes.frontend.publishing.avro.AvroMessage
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser
 import spock.lang.Specification
 
+import static java.util.Collections.emptyMap
+
 class MessageToJsonConverterTest extends Specification {
 
     def 'should convert avro to JSON'() {
@@ -12,10 +14,12 @@ class MessageToJsonConverterTest extends Specification {
         def avroUser = new AvroUser('name', 16, 'favourite-colour')
 
         when:
-        def converted = new MessageToJsonConverter().convert(new AvroMessage('message-id', avroUser.asBytes(), 0L, avroUser.compiledSchema, "partition-key"), false)
+        def converted = new MessageToJsonConverter().convert(new AvroMessage(
+                'message-id', avroUser.asBytes(), 0L, avroUser.compiledSchema, "partition-key", emptyMap()), false)
 
         then:
-        new String(converted) == JsonOutput.toJson([__metadata: null, name: 'name', age: 16, favoriteColor: 'favourite-colour'])
+        new String(converted) == JsonOutput.toJson(
+                [__metadata: null, name: 'name', age: 16, favoriteColor: 'favourite-colour'])
     }
 
     def 'should return bytes when decoding fails'() {
@@ -23,7 +27,8 @@ class MessageToJsonConverterTest extends Specification {
         def avroUser = new AvroUser('name', 16, 'favourite-colour')
 
         when:
-        def converted = new MessageToJsonConverter().convert(new AvroMessage('message-id', 'unable-to-decode'.getBytes(), 0L, avroUser.compiledSchema, null), false)
+        def converted = new MessageToJsonConverter().convert(new AvroMessage(
+                'message-id', 'unable-to-decode'.getBytes(), 0L, avroUser.compiledSchema, null, emptyMap()), false)
 
         then:
         new String(converted) == 'unable-to-decode'
@@ -31,7 +36,8 @@ class MessageToJsonConverterTest extends Specification {
 
     def 'should return the same when no avro provided'() {
         when:
-        def converted = new MessageToJsonConverter().convert(new JsonMessage('message-id', 'given-message'.bytes, 0L, null), false)
+        def converted = new MessageToJsonConverter().convert(new JsonMessage(
+                'message-id', 'given-message'.bytes, 0L, null, emptyMap()), false)
 
         then:
         new String(converted) == 'given-message'
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/metadata/DefaultHeadersPropagatorTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/metadata/DefaultHeadersPropagatorTest.groovy
index 43e46bf5c5..ce8de9aca6 100644
--- a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/metadata/DefaultHeadersPropagatorTest.groovy
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/metadata/DefaultHeadersPropagatorTest.groovy
@@ -1,15 +1,23 @@
 package pl.allegro.tech.hermes.frontend.publishing.metadata
 
+import io.undertow.util.HeaderMap
+import io.undertow.util.HttpString
+import pl.allegro.tech.hermes.frontend.config.HTTPHeadersProperties
 import spock.lang.Specification
 
 class DefaultHeadersPropagatorTest extends Specification {
 
     def 'should propagate all headers when enabled and no filter'() {
         given:
-            def propagator = new DefaultHeadersPropagator(true, "")
+            def properties = new HTTPHeadersProperties()
+            properties.setPropagationEnabled(true)
+            def propagator = new DefaultHeadersPropagator(properties)
 
+            HeaderMap headerMap = new HeaderMap()
+            headerMap.add(new HttpString("header1"), "value1")
+            headerMap.add(new HttpString("header2"), "value2")
         when:
-            def extracted = propagator.extract(["header1": "value1", "header2": "value2"])
+            def extracted = propagator.extract(headerMap)
 
         then:
             extracted.size() == 2
@@ -17,26 +25,53 @@ class DefaultHeadersPropagatorTest extends Specification {
             extracted["header2"] == "value2"
     }
 
-    def 'should not propagate headers when disabled'() {
+    def 'should not propagate headers when propagation is disabled by default'() {
         given:
-            def propagator = new DefaultHeadersPropagator(false, "")
-
+            def propagator = new DefaultHeadersPropagator(new HTTPHeadersProperties())
+            HeaderMap headerMap = new HeaderMap()
+            headerMap.add(new HttpString("header1"), "value1")
         when:
-            def extracted = propagator.extract(["header1": "value1", "header2": "value2"])
+            def extracted = propagator.extract(headerMap)
 
         then:
             extracted.size() == 0
     }
 
-    def 'should propagate only filtered headers when enabled and filter defined'() {
+    def 'should propagate only allowed headers when enabled and allowed defined'() {
         given:
-            def propagator = new DefaultHeadersPropagator(true, "other-header, header1")
-
+            def properties = new HTTPHeadersProperties()
+            properties.setPropagationEnabled(true)
+            properties.setAllowedSet(["header1", "other-header"] as Set)
+            properties.setAdditionalAllowedSetToLog(["service-name"] as Set)
+            def propagator = new DefaultHeadersPropagator(properties)
+            HeaderMap headerMap = new HeaderMap()
+            headerMap.add(new HttpString("header1"), "value1")
+            headerMap.add(new HttpString("header2"), "value2")
+            headerMap.add(new HttpString("service-name"), "value2")
         when:
-            def extracted = propagator.extract(["header1": "value1", "header2": "value2"])
+            def extracted = propagator.extract(headerMap)
 
         then:
             extracted.size() == 1
             extracted["header1"] == "value1"
     }
-}
\ No newline at end of file
+
+    def 'should extract "log only" headers'() {
+        given:
+            def properties = new HTTPHeadersProperties()
+            properties.setPropagationEnabled(true)
+            properties.setAllowedSet(["header1", "other-header"] as Set)
+            properties.setAdditionalAllowedSetToLog(["service-name"] as Set)
+            def propagator = new DefaultHeadersPropagator(properties)
+            HeaderMap headerMap = new HeaderMap()
+            headerMap.add(new HttpString("header1"), "value1")
+            headerMap.add(new HttpString("service-name"), "value2")
+        when:
+            def extracted = propagator.extractHeadersToLog(headerMap)
+
+        then:
+            extracted.size() == 2
+            extracted["header1"] == "value1"
+            extracted["service-name"] == "value2"
+    }
+}
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/metric/ThroughputRegistryTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/metric/ThroughputRegistryTest.groovy
new file mode 100644
index 0000000000..b5d5d397a0
--- /dev/null
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/metric/ThroughputRegistryTest.groovy
@@ -0,0 +1,67 @@
+package pl.allegro.tech.hermes.frontend.publishing.metric
+
+import com.codahale.metrics.MetricRegistry
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry
+import org.assertj.core.api.Assertions
+import org.awaitility.Awaitility
+import pl.allegro.tech.hermes.api.Topic
+import pl.allegro.tech.hermes.common.metric.MetricsFacade
+import pl.allegro.tech.hermes.frontend.metric.ThroughputMeter
+import pl.allegro.tech.hermes.frontend.metric.ThroughputRegistry
+import spock.lang.Shared
+import spock.lang.Specification
+
+import java.time.Duration
+
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic
+
+class ThroughputRegistryTest extends Specification {
+    @Shared
+    Topic topicA = topic("group.topicA").build()
+    @Shared
+    Topic topicB = topic("group.topicB").build()
+    @Shared
+    Topic topicC = topic("group.topicC").build();
+
+    private final MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry());
+    private final ThroughputRegistry throughputRegistry = new ThroughputRegistry(metricsFacade, new MetricRegistry())
+
+    def "topic throughput should be preserved for instances of the same topic"() {
+        given: "throughput meter for a topic with recorded value"
+        ThroughputMeter meter = throughputRegistry.forTopic(topicA.getName())
+        assert meter.oneMinuteRate == 0.0d
+
+        meter.increment(1024)
+
+        when: "new throughput meter is obtained for the same topic"
+        meter = throughputRegistry.forTopic(topicA.getName())
+
+        then: "throughput is preserved"
+        Awaitility.await().atMost(Duration.ofSeconds(10)).untilAsserted {
+            Assertions.assertThat(meter.oneMinuteRate).isGreaterThan(0.0d)
+        }
+    }
+
+    def "global throughput should be shared for all topics"() {
+        given: "given throughput meters for two topics"
+        ThroughputMeter topicBMeter = throughputRegistry.forTopic(topicB.getName())
+        ThroughputMeter topicCMeter = throughputRegistry.forTopic(topicC.getName())
+        assert topicBMeter.oneMinuteRate == 0.0d
+        assert topicCMeter.oneMinuteRate == 0.0d
+
+        when: "throughput for both meters is recorded"
+        topicBMeter.increment(1024)
+        topicCMeter.increment(1024)
+
+        then: "global throughput is a sum of topic throughput"
+        Awaitility.await().atMost(Duration.ofSeconds(10)).untilAsserted {
+            def topicAValue = topicBMeter.oneMinuteRate
+            def topicBValue = topicCMeter.oneMinuteRate
+            def globalValue = throughputRegistry.globalThroughputOneMinuteRate
+            Assertions.assertThat(topicAValue).isGreaterThan(0.0d)
+            Assertions.assertThat(topicBValue).isGreaterThan(0.0d)
+            Assertions.assertThat(globalValue).isGreaterThan(topicAValue)
+        }
+    }
+
+}
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewFactoryTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewFactoryTest.groovy
index d62a1deb63..c60de37224 100644
--- a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewFactoryTest.groovy
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewFactoryTest.groovy
@@ -7,6 +7,8 @@ import pl.allegro.tech.hermes.test.helper.avro.AvroUser
 import spock.lang.Specification
 import spock.lang.Subject
 
+import static java.util.Collections.emptyMap
+
 class MessagePreviewFactoryTest extends Specification {
 
     @Subject
@@ -16,7 +18,7 @@ class MessagePreviewFactoryTest extends Specification {
         given:
             factory = new MessagePreviewFactory(maxContentSize)
         when:
-            MessagePreview preview = factory.create(new JsonMessage('message-id', new byte[messageSize], 0L, "partition-key"), false)
+            MessagePreview preview = factory.create(new JsonMessage('message-id', new byte[messageSize], 0L, "partition-key", emptyMap()), false)
         then:
             preview.truncated == shouldTruncate
         where:
@@ -31,7 +33,7 @@ class MessagePreviewFactoryTest extends Specification {
     def "should truncate message preview if it is too large after decoding to JSON"() {
         given:
             def avroUser = new AvroUser()
-            def message = new AvroMessage('message-id', avroUser.asBytes(), 0L, avroUser.compiledSchema, null)
+            def message = new AvroMessage('message-id', avroUser.asBytes(), 0L, avroUser.compiledSchema, null, emptyMap())
             factory = new MessagePreviewFactory((avroUser.asJson().length() - 1) / 1024 as int)
         when:
             MessagePreview preview = factory.create(message, false)
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewLogTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewLogTest.groovy
index 3a481b5e7c..275d73c50c 100644
--- a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewLogTest.groovy
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/publishing/preview/MessagePreviewLogTest.groovy
@@ -12,6 +12,7 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
+import static java.util.Collections.emptyMap
 import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName
 
 class MessagePreviewLogTest extends Specification {
@@ -20,8 +21,8 @@ class MessagePreviewLogTest extends Specification {
 
     def "should persist JSON messages for topics"() {
         given:
-        log.add(TopicBuilder.topic('group.topic-1').build(), new JsonMessage('id', [1] as byte[], 0L, "partition-key"))
-        log.add(TopicBuilder.topic('group.topic-2').build(), new JsonMessage('id', [2] as byte[], 0L, null))
+        log.add(TopicBuilder.topic('group.topic-1').build(), new JsonMessage('id', [1] as byte[], 0L, "partition-key", emptyMap()))
+        log.add(TopicBuilder.topic('group.topic-2').build(), new JsonMessage('id', [2] as byte[], 0L, null, emptyMap()))
 
         when:
         def messages = log.snapshotAndClean()
@@ -33,7 +34,7 @@ class MessagePreviewLogTest extends Specification {
     def "should persist Avro messages for topics"() {
         given:
         def avroUser = new AvroUser()
-        def message = new AvroMessage('message-id', avroUser.asBytes(), 0L, avroUser.compiledSchema, null)
+        def message = new AvroMessage('message-id', avroUser.asBytes(), 0L, avroUser.compiledSchema, null, emptyMap())
 
         log.add(TopicBuilder.topic('group.topic-1').build(), message)
 
@@ -51,7 +52,8 @@ class MessagePreviewLogTest extends Specification {
     def "should persist Avro messages for schema aware topics"() {
         given:
         def avroUser = new AvroUser()
-        def message = new AvroMessage('message-id', SchemaAwareSerDe.serialize(avroUser.compiledSchema.id, avroUser.asBytes()), 0L, avroUser.compiledSchema, null)
+        def message = new AvroMessage('message-id', SchemaAwareSerDe.serialize(avroUser.compiledSchema.id,
+                avroUser.asBytes()), 0L, avroUser.compiledSchema, null, emptyMap())
 
         log.add(TopicBuilder.topic('group.topic-1').withSchemaIdAwareSerialization().build(), message)
 
@@ -68,9 +70,9 @@ class MessagePreviewLogTest extends Specification {
 
     def "should persist no more than two messages for topic"() {
         given:
-        log.add(TopicBuilder.topic('group.topic-1').build(), new JsonMessage('id', [1] as byte[], 0L, null))
-        log.add(TopicBuilder.topic('group.topic-1').build(), new JsonMessage('id', [2] as byte[], 0L, null))
-        log.add(TopicBuilder.topic('group.topic-1').build(), new JsonMessage('id', [3] as byte[], 0L, null))
+        log.add(TopicBuilder.topic('group.topic-1').build(), new JsonMessage('id', [1] as byte[], 0L, null, emptyMap()))
+        log.add(TopicBuilder.topic('group.topic-1').build(), new JsonMessage('id', [2] as byte[], 0L, null, emptyMap()))
+        log.add(TopicBuilder.topic('group.topic-1').build(), new JsonMessage('id', [3] as byte[], 0L, null, emptyMap()))
 
         when:
         def messages = log.snapshotAndClean()
@@ -88,7 +90,8 @@ class MessagePreviewLogTest extends Specification {
         threads.times {
             int executor = it
             executorService.submit({
-                1000.times { log.add(TopicBuilder.topic("group.topic").build(), new JsonMessage('id', [executor, it] as byte[], 0L, null)) }
+                1000.times { log.add(TopicBuilder.topic("group.topic").build(),
+                        new JsonMessage('id', [executor, it] as byte[], 0L, null, emptyMap())) }
                 latch.countDown()
             })
         }
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/CachedTopicsTestHelper.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/CachedTopicsTestHelper.groovy
index 08cd79fc9f..a76d3d4eaa 100644
--- a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/CachedTopicsTestHelper.groovy
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/CachedTopicsTestHelper.groovy
@@ -7,26 +7,23 @@ import pl.allegro.tech.hermes.api.Topic
 import pl.allegro.tech.hermes.common.kafka.KafkaTopic
 import pl.allegro.tech.hermes.common.kafka.KafkaTopicName
 import pl.allegro.tech.hermes.common.kafka.KafkaTopics
-import pl.allegro.tech.hermes.common.metric.HermesMetrics
 import pl.allegro.tech.hermes.common.metric.MetricsFacade
 import pl.allegro.tech.hermes.frontend.metric.CachedTopic
-import pl.allegro.tech.hermes.metrics.PathsCompiler
+import pl.allegro.tech.hermes.frontend.metric.ThroughputRegistry
 import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder
 
 class CachedTopicsTestHelper {
 
-    static HermesMetrics hermesMetrics = new HermesMetrics(
-            new MetricRegistry(), new PathsCompiler("localhost"))
-
-    static MetricsFacade micrometerHermesMetrics = new MetricsFacade(new SimpleMeterRegistry(), hermesMetrics)
+    static MetricsFacade micrometerHermesMetrics = new MetricsFacade(new SimpleMeterRegistry())
+    static ThroughputRegistry registry = new ThroughputRegistry(micrometerHermesMetrics, new MetricRegistry())
 
     static CachedTopic cachedTopic(String name) {
         def kafkaTopics = new KafkaTopics(new KafkaTopic(KafkaTopicName.valueOf(name), ContentType.JSON))
-        return new CachedTopic(TopicBuilder.topic(name).build(), micrometerHermesMetrics, kafkaTopics)
+        return new CachedTopic(TopicBuilder.topic(name).build(), micrometerHermesMetrics, registry, kafkaTopics)
     }
 
     static CachedTopic cachedTopic(Topic topic) {
         def kafkaTopics = new KafkaTopics(new KafkaTopic(KafkaTopicName.valueOf(topic.qualifiedName), ContentType.JSON))
-        return new CachedTopic(topic, micrometerHermesMetrics, kafkaTopics)
+        return new CachedTopic(topic, micrometerHermesMetrics, registry, kafkaTopics)
     }
 }
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingRunnerTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingRunnerTest.groovy
deleted file mode 100644
index 3adff22679..0000000000
--- a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/TopicMetadataLoadingRunnerTest.groovy
+++ /dev/null
@@ -1,94 +0,0 @@
-package pl.allegro.tech.hermes.frontend.server
-
-import com.google.common.collect.ImmutableList
-import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache
-import pl.allegro.tech.hermes.frontend.metric.CachedTopic
-import pl.allegro.tech.hermes.frontend.producer.BrokerMessageProducer
-import spock.lang.Shared
-import spock.lang.Specification
-
-import java.time.Duration
-
-import static pl.allegro.tech.hermes.frontend.server.CachedTopicsTestHelper.cachedTopic
-
-class TopicMetadataLoadingRunnerTest extends Specification {
-
-    @Shared
-    List<String> topics = ["g1.topicA", "g1.topicB", "g2.topicC"]
-
-    @Shared
-    Map<String, CachedTopic> cachedTopics = new HashMap<>()
-
-    @Shared
-    TopicsCache topicsCache
-
-    def setupSpec() {
-        for (String topic : topics) {
-            cachedTopics.put(topic, cachedTopic(topic))
-        }
-        topicsCache = Mock() {
-            getTopics() >> ImmutableList.copyOf(cachedTopics.values())
-        }
-    }
-
-    def "should load topic metadata"() {
-        given:
-        BrokerMessageProducer producer = Mock()
-        def hook = new TopicMetadataLoadingRunner(producer, topicsCache, 2, Duration.ofSeconds(10), 2)
-
-        when:
-        hook.refreshMetadata()
-
-        then:
-        for (String topic : topics) {
-            1 * producer.isTopicAvailable(cachedTopics.get(topic)) >> true
-        }
-    }
-
-    def "should retry loading topic metadata"() {
-        given:
-        BrokerMessageProducer producer = Mock()
-        def hook = new TopicMetadataLoadingRunner(producer, topicsCache, 2, Duration.ofSeconds(10), 4)
-
-        when:
-        hook.refreshMetadata()
-
-        then:
-        1 * producer.isTopicAvailable(cachedTopics.get("g1.topicA")) >> false
-        1 * producer.isTopicAvailable(cachedTopics.get("g1.topicA")) >> true
-
-        1 * producer.isTopicAvailable(cachedTopics.get("g1.topicB")) >> true
-
-        2 * producer.isTopicAvailable(cachedTopics.get("g2.topicC")) >> false
-        1 * producer.isTopicAvailable(cachedTopics.get("g2.topicC")) >> true
-    }
-
-    def "should leave retry loop when reached max retries and failed to load metadata"() {
-        given:
-        BrokerMessageProducer producer = Mock()
-        def hook = new TopicMetadataLoadingRunner(producer, topicsCache, 2, Duration.ofSeconds(10), 4)
-
-        when:
-        hook.refreshMetadata()
-
-        then:
-        3 * producer.isTopicAvailable(cachedTopics.get("g1.topicA")) >> false
-        1 * producer.isTopicAvailable(cachedTopics.get("g1.topicB")) >> true
-        1 * producer.isTopicAvailable(cachedTopics.get("g2.topicC")) >> true
-    }
-
-    def "should not throw exception when no topics exist"() {
-        given:
-        BrokerMessageProducer producer = Mock()
-        TopicsCache emptyCache = Mock() {
-            getTopics() >> []
-        }
-        def hook = new TopicMetadataLoadingRunner(producer, emptyCache, 2, Duration.ofSeconds(10), 4)
-
-        when:
-        hook.refreshMetadata()
-
-        then:
-        noExceptionThrown()
-    }
-}
diff --git a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/CompletableFuturesHelperTest.groovy b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/utils/CompletableFuturesHelperTest.groovy
similarity index 97%
rename from hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/CompletableFuturesHelperTest.groovy
rename to hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/utils/CompletableFuturesHelperTest.groovy
index 720817d3e4..a3bfd0b54f 100644
--- a/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/server/CompletableFuturesHelperTest.groovy
+++ b/hermes-frontend/src/test/groovy/pl/allegro/tech/hermes/frontend/utils/CompletableFuturesHelperTest.groovy
@@ -1,4 +1,4 @@
-package pl.allegro.tech.hermes.frontend.server
+package pl.allegro.tech.hermes.frontend.utils
 
 import spock.lang.Specification
 
diff --git a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BackupFilesManagerTest.java b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BackupFilesManagerTest.java
index 3e83fd364c..febb4c09bc 100644
--- a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BackupFilesManagerTest.java
+++ b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BackupFilesManagerTest.java
@@ -1,11 +1,8 @@
 package pl.allegro.tech.hermes.frontend.buffer;
 
-import com.google.common.io.Files;
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.io.Files;
 import java.io.File;
 import java.io.IOException;
 import java.time.Clock;
@@ -13,110 +10,118 @@
 import java.time.ZoneId;
 import java.util.List;
 import java.util.Optional;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class BackupFilesManagerTest {
 
-    private final Clock clock = Clock.fixed(Instant.ofEpochMilli(12345), ZoneId.systemDefault());
-
-    private File tempDir;
-
-    @Before
-    public void setup() {
-        tempDir = Files.createTempDir();
-    }
-
-    @After
-    public void cleanup() throws IOException {
-        FileUtils.deleteDirectory(tempDir);
-    }
-
-    @Test
-    public void shouldRolloverExistingBackupFile() throws IOException {
-        // given
-        new File(tempDir, "hermes-buffer-v3.dat").createNewFile();
-        BackupFilesManager backupFilesManager = new BackupFilesManager(tempDir.getAbsolutePath(), clock);
-
-        // when
-        Optional<File> backupFile = backupFilesManager.rolloverBackupFileIfExists();
-
-        // then
-        assertThat(backupFile.get().getName()).isEqualTo("hermes-buffer-v3-12345.dat");
-    }
-
-    @Test
-    public void shouldReadBackupFilesList() throws IOException {
-        // given
-        final BackupFilesManager backupFilesManager = new BackupFilesManager(tempDir.getAbsolutePath(), clock);
-        File timestampedBackup1 = new File(tempDir, "hermes-buffer-v3-001.dat");
-        File timestampedBackup2 = new File(tempDir, "hermes-buffer-v3-002.dat");
-        File customBackup = new File(tempDir, "hermes-buffer-v3-old.dat");
-
-        // and
-        timestampedBackup1.createNewFile();
-        timestampedBackup2.createNewFile();
-        customBackup.createNewFile();
-
-        // when
-        List<File> backups = backupFilesManager.getRolledBackupFiles();
-
-        // then
-        assertThat(backups).containsOnly(timestampedBackup1, timestampedBackup2);
-    }
-
-    @Test
-    public void shouldReadEmptyBackupFileList() {
-        // given
-        BackupFilesManager backupFilesManager = new BackupFilesManager(tempDir.getAbsolutePath(), clock);
-
-        // when
-        List<File> backups = backupFilesManager.getRolledBackupFiles();
-
-        // then
-        assertThat(backups).isEmpty();
-    }
-
-    @Test
-    public void shouldNotRolloverNotExistsBackupFile() {
-        // given
-        BackupFilesManager backupFilesManager = new BackupFilesManager(tempDir.getAbsolutePath(), clock);
-        // when
-        Optional<File> backupFile = backupFilesManager.rolloverBackupFileIfExists();
-
-        // when & then
-        assertThat(backupFile.isPresent()).isFalse();
-    }
-
-    @Test
-    public void shouldUseNewNamingSchemeWhenNoFilesAvailable() {
-        // given
-        BackupFilesManager backupFilesManager = new BackupFilesManager(tempDir.getAbsolutePath(), clock);
-
-        // when
-        File file = backupFilesManager.getCurrentBackupFile();
-
-        // then
-        assertThat(file.getName()).isEqualTo("hermes-buffer-v3.dat");
-    }
-
-    @Test
-    public void shouldLoadAllTemporaryBackupV2Files() throws IOException {
-        // given
-        final BackupFilesManager backupFilesManager = new BackupFilesManager(tempDir.getAbsolutePath(), clock);
-        File temporaryBackup1 = new File(tempDir, "hermes-buffer-v2-old.tmp");
-        File temporaryBackup2 = new File(tempDir, "hermes-buffer-002-v2-old.tmp");
-        File customBackup = new File(tempDir, "hermes-buffer.dat");
-
-        // and
-        temporaryBackup1.createNewFile();
-        temporaryBackup2.createNewFile();
-        customBackup.createNewFile();
-
-        // when
-        List<File> files = backupFilesManager.getTemporaryBackupV2Files(tempDir.getAbsolutePath());
-
-        // then
-        assertThat(files.size()).isEqualTo(2);
-    }
-}
\ No newline at end of file
+  private final Clock clock = Clock.fixed(Instant.ofEpochMilli(12345), ZoneId.systemDefault());
+
+  private File tempDir;
+
+  @Before
+  public void setup() {
+    tempDir = Files.createTempDir();
+  }
+
+  @After
+  public void cleanup() throws IOException {
+    FileUtils.deleteDirectory(tempDir);
+  }
+
+  @Test
+  public void shouldRolloverExistingBackupFile() throws IOException {
+    // given
+    new File(tempDir, "hermes-buffer-v3.dat").createNewFile();
+    BackupFilesManager backupFilesManager =
+        new BackupFilesManager(tempDir.getAbsolutePath(), clock);
+
+    // when
+    Optional<File> backupFile = backupFilesManager.rolloverBackupFileIfExists();
+
+    // then
+    assertThat(backupFile.get().getName()).isEqualTo("hermes-buffer-v3-12345.dat");
+  }
+
+  @Test
+  public void shouldReadBackupFilesList() throws IOException {
+    // given
+    final BackupFilesManager backupFilesManager =
+        new BackupFilesManager(tempDir.getAbsolutePath(), clock);
+    File timestampedBackup1 = new File(tempDir, "hermes-buffer-v3-001.dat");
+    File timestampedBackup2 = new File(tempDir, "hermes-buffer-v3-002.dat");
+    File customBackup = new File(tempDir, "hermes-buffer-v3-old.dat");
+
+    // and
+    timestampedBackup1.createNewFile();
+    timestampedBackup2.createNewFile();
+    customBackup.createNewFile();
+
+    // when
+    List<File> backups = backupFilesManager.getRolledBackupFiles();
+
+    // then
+    assertThat(backups).containsOnly(timestampedBackup1, timestampedBackup2);
+  }
+
+  @Test
+  public void shouldReadEmptyBackupFileList() {
+    // given
+    BackupFilesManager backupFilesManager =
+        new BackupFilesManager(tempDir.getAbsolutePath(), clock);
+
+    // when
+    List<File> backups = backupFilesManager.getRolledBackupFiles();
+
+    // then
+    assertThat(backups).isEmpty();
+  }
+
+  @Test
+  public void shouldNotRolloverNotExistsBackupFile() {
+    // given
+    BackupFilesManager backupFilesManager =
+        new BackupFilesManager(tempDir.getAbsolutePath(), clock);
+    // when
+    Optional<File> backupFile = backupFilesManager.rolloverBackupFileIfExists();
+
+    // when & then
+    assertThat(backupFile.isPresent()).isFalse();
+  }
+
+  @Test
+  public void shouldUseNewNamingSchemeWhenNoFilesAvailable() {
+    // given
+    BackupFilesManager backupFilesManager =
+        new BackupFilesManager(tempDir.getAbsolutePath(), clock);
+
+    // when
+    File file = backupFilesManager.getCurrentBackupFile();
+
+    // then
+    assertThat(file.getName()).isEqualTo("hermes-buffer-v3.dat");
+  }
+
+  @Test
+  public void shouldLoadAllTemporaryBackupV2Files() throws IOException {
+    // given
+    final BackupFilesManager backupFilesManager =
+        new BackupFilesManager(tempDir.getAbsolutePath(), clock);
+    File temporaryBackup1 = new File(tempDir, "hermes-buffer-v2-old.tmp");
+    File temporaryBackup2 = new File(tempDir, "hermes-buffer-002-v2-old.tmp");
+    File customBackup = new File(tempDir, "hermes-buffer.dat");
+
+    // and
+    temporaryBackup1.createNewFile();
+    temporaryBackup2.createNewFile();
+    customBackup.createNewFile();
+
+    // when
+    List<File> files = backupFilesManager.getTemporaryBackupV2Files(tempDir.getAbsolutePath());
+
+    // then
+    assertThat(files.size()).isEqualTo(2);
+  }
+}
diff --git a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoaderTest.java b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoaderTest.java
index a182d2adb8..ec40e054e9 100644
--- a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoaderTest.java
+++ b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BackupMessagesLoaderTest.java
@@ -1,8 +1,24 @@
 package pl.allegro.tech.hermes.frontend.buffer;
 
+import static java.time.LocalDateTime.now;
+import static java.time.ZoneOffset.UTC;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.google.common.io.Files;
 import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.io.File;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -26,219 +42,213 @@
 import pl.allegro.tech.hermes.tracker.frontend.NoOperationPublishingTracker;
 import pl.allegro.tech.hermes.tracker.frontend.Trackers;
 
-import java.io.File;
-import java.time.Duration;
-import java.util.List;
-import java.util.Optional;
-
-import static java.time.LocalDateTime.now;
-import static java.time.ZoneOffset.UTC;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 public class BackupMessagesLoaderTest {
 
-    private static final int ENTRIES = 100;
-    private static final int AVERAGE_MESSAGE_SIZE = 600;
-
-    private final BrokerMessageProducer producer = mock(BrokerMessageProducer.class);
-
-    private final BrokerListeners listeners = mock(BrokerListeners.class);
-
-    private final TopicsCache topicsCache = mock(TopicsCache.class);
-
-    private final Trackers trackers = mock(Trackers.class);
-
-    private final CachedTopic cachedTopic = mock(CachedTopic.class);
-
-    private final SchemaRepository schemaRepository = mock(SchemaRepository.class);
-
-    private final SchemaExistenceEnsurer schemaExistenceEnsurer = mock(SchemaExistenceEnsurer.class);
-
-    private File tempDir;
-
-    private final Topic topic = TopicBuilder.topic("pl.allegro.tech.hermes.test").build();
-
-    @Before
-    public void setUp() {
-        tempDir = Files.createTempDir();
-
-        Timer micrometerTimer = new SimpleMeterRegistry().timer("broker-latency");
-        com.codahale.metrics.Timer graphiteTimer = new com.codahale.metrics.Timer();
-        when(cachedTopic.getTopic()).thenReturn(topic);
-        when(cachedTopic.startBrokerLatencyTimer()).thenReturn(HermesTimerContext.from(micrometerTimer, graphiteTimer));
-        when(topicsCache.getTopic(topic.getQualifiedName())).thenReturn(Optional.of(cachedTopic));
-        when(producer.isTopicAvailable(cachedTopic)).thenReturn(true);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        FileUtils.deleteDirectory(tempDir);
-    }
-
-    @Test
-    public void shouldNotSendOldMessages() {
-        //given
-        LocalMessageStorageProperties localMessageStorageProperties = new LocalMessageStorageProperties();
-        localMessageStorageProperties.setMaxAge(Duration.ofHours(8));
-        localMessageStorageProperties.setMaxResendRetries(2);
-
-        MessageRepository messageRepository = new ChronicleMapMessageRepository(
-                new File(tempDir.getAbsoluteFile(), "messages.dat"),
-                ENTRIES,
-                AVERAGE_MESSAGE_SIZE
-        );
-
-        final BackupMessagesLoader backupMessagesLoader =
-            new BackupMessagesLoader(
-                producer,
-                listeners,
-                topicsCache,
-                schemaRepository,
-                schemaExistenceEnsurer,
-                trackers,
-                localMessageStorageProperties
-            );
-
-        messageRepository.save(messageOfAge(1), topic);
-        messageRepository.save(messageOfAge(10), topic);
-        messageRepository.save(messageOfAge(10), topic);
-
-        //when
-        backupMessagesLoader.loadMessages(messageRepository.findAll());
-
-        //then
-        verify(producer, times(1)).send(any(JsonMessage.class), eq(cachedTopic), any(PublishingCallback.class));
-    }
-
-    @Test
-    public void shouldSendAndResendMessages() {
-        //given
-        int noOfSentCalls = 2;
-        LocalMessageStorageProperties localMessageStorageProperties = new LocalMessageStorageProperties();
-        localMessageStorageProperties.setMaxAge(Duration.ofHours(8));
-        localMessageStorageProperties.setMaxResendRetries(noOfSentCalls - 1);
-        when(trackers.get(eq(topic))).thenReturn(new NoOperationPublishingTracker());
-
-        doAnswer(invocation -> {
-            Object[] args = invocation.getArguments();
-            ((PublishingCallback) args[2]).onUnpublished((Message) args[0], ((CachedTopic) args[1]).getTopic(), new Exception("test"));
-            return "";
-        }).when(producer).send(any(JsonMessage.class), eq(cachedTopic), any(PublishingCallback.class));
-
-
-        MessageRepository messageRepository = new ChronicleMapMessageRepository(
-                new File(tempDir.getAbsoluteFile(), "messages.dat"),
-                ENTRIES,
-                AVERAGE_MESSAGE_SIZE
-        );
-        BackupMessagesLoader backupMessagesLoader =
-            new BackupMessagesLoader(
-                producer,
-                listeners,
-                topicsCache,
-                schemaRepository,
-                schemaExistenceEnsurer,
-                trackers,
-                localMessageStorageProperties
-            );
-
-        messageRepository.save(messageOfAge(1), topic);
-
-        //when
-        backupMessagesLoader.loadMessages(messageRepository.findAll());
-
-        //then
-        verify(producer, times(noOfSentCalls)).send(any(JsonMessage.class), eq(cachedTopic), any(PublishingCallback.class));
-        verify(listeners, times(noOfSentCalls)).onError(any(JsonMessage.class), eq(topic), any(Exception.class));
-    }
-
-    @Test
-    public void shouldSendOnlyWhenBrokerTopicIsAvailable() {
-        // given
-        LocalMessageStorageProperties localMessageStorageProperties = new LocalMessageStorageProperties();
-        localMessageStorageProperties.setMaxAge(Duration.ofHours(8));
-
-        when(producer.isTopicAvailable(cachedTopic)).thenReturn(false).thenReturn(false).thenReturn(true);
-
-        BackupMessagesLoader backupMessagesLoader =
-            new BackupMessagesLoader(
-                producer,
-                listeners,
-                topicsCache,
-                schemaRepository,
-                schemaExistenceEnsurer,
-                trackers,
-                localMessageStorageProperties
-            );
-        MessageRepository messageRepository = new ChronicleMapMessageRepository(
-                new File(tempDir.getAbsoluteFile(), "messages.dat"),
-                ENTRIES,
-                AVERAGE_MESSAGE_SIZE
-        );
-        messageRepository.save(messageOfAge(1), topic);
-
-        // when
-        backupMessagesLoader.loadMessages(messageRepository.findAll());
-
-        // then
-        verify(producer, times(3)).isTopicAvailable(cachedTopic);
-        verify(producer, times(1)).send(any(JsonMessage.class), eq(cachedTopic), any(PublishingCallback.class));
-    }
-
-    @Test
-    public void shouldSendMessageWithAllArgumentsFromBackupMessage() {
-        //given
-        LocalMessageStorageProperties localMessageStorageProperties = new LocalMessageStorageProperties();
-        localMessageStorageProperties.setMaxAge(Duration.ofHours(8));
-        localMessageStorageProperties.setMaxResendRetries(2);
-
-        MessageRepository messageRepository = new ChronicleMapMessageRepository(
-                new File(tempDir.getAbsoluteFile(), "messages.dat"),
-                ENTRIES,
-                AVERAGE_MESSAGE_SIZE
-        );
-
-        BackupMessagesLoader backupMessagesLoader =
-            new BackupMessagesLoader(
-                producer,
-                listeners,
-                topicsCache,
-                schemaRepository,
-                schemaExistenceEnsurer,
-                trackers,
-                localMessageStorageProperties
-            );
-
-        messageRepository.save(messageOfAge(1), topic);
-
-        //when
-        List<BackupMessage> backupMessages = messageRepository.findAll();
-        backupMessagesLoader.loadMessages(backupMessages);
-
-        //then
-        ArgumentCaptor<Message> messageArgument = ArgumentCaptor.forClass(Message.class);
-
-        verify(producer, times(1)).send(messageArgument.capture(), eq(cachedTopic), any(PublishingCallback.class));
-        Message sendMessage = messageArgument.getValue();
-        assertThat(sendMessage.getPartitionKey()).isEqualTo(backupMessages.get(0).getPartitionKey());
-        assertThat(sendMessage.getData()).isEqualTo(backupMessages.get(0).getData());
-        assertThat(sendMessage.getId()).isEqualTo(backupMessages.get(0).getMessageId());
-        assertThat(sendMessage.getTimestamp()).isEqualTo(backupMessages.get(0).getTimestamp());
-    }
-
-    private Message messageOfAge(int ageHours) {
-        return new JsonMessage(
-                MessageIdGenerator.generate(),
-                "{'a':'b'}".getBytes(),
-                now().minusHours(ageHours).toInstant(UTC).toEpochMilli(),
-                "partition-key"
-        );
-    }
+  private static final int ENTRIES = 100;
+  private static final int AVERAGE_MESSAGE_SIZE = 600;
+
+  private final BrokerMessageProducer producer = mock(BrokerMessageProducer.class);
+
+  private final BrokerListeners listeners = mock(BrokerListeners.class);
+
+  private final TopicsCache topicsCache = mock(TopicsCache.class);
+
+  private final Trackers trackers = mock(Trackers.class);
+
+  private final CachedTopic cachedTopic = mock(CachedTopic.class);
+
+  private final SchemaRepository schemaRepository = mock(SchemaRepository.class);
+
+  private final SchemaExistenceEnsurer schemaExistenceEnsurer = mock(SchemaExistenceEnsurer.class);
+
+  private File tempDir;
+
+  private final Topic topic = TopicBuilder.topic("pl.allegro.tech.hermes.test").build();
+
+  @Before
+  public void setUp() {
+    tempDir = Files.createTempDir();
+
+    Timer micrometerTimer = new SimpleMeterRegistry().timer("broker-latency");
+    when(cachedTopic.getTopic()).thenReturn(topic);
+    when(cachedTopic.startBrokerLatencyTimer())
+        .thenReturn(HermesTimerContext.from(micrometerTimer));
+    when(topicsCache.getTopic(topic.getQualifiedName())).thenReturn(Optional.of(cachedTopic));
+    when(producer.isTopicAvailable(cachedTopic)).thenReturn(true);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    FileUtils.deleteDirectory(tempDir);
+  }
+
+  @Test
+  public void shouldNotSendOldMessages() {
+    // given
+    LocalMessageStorageProperties localMessageStorageProperties =
+        new LocalMessageStorageProperties();
+    localMessageStorageProperties.setMaxAge(Duration.ofHours(8));
+    localMessageStorageProperties.setMaxResendRetries(2);
+
+    MessageRepository messageRepository =
+        new ChronicleMapMessageRepository(
+            new File(tempDir.getAbsoluteFile(), "messages.dat"), ENTRIES, AVERAGE_MESSAGE_SIZE);
+
+    final BackupMessagesLoader backupMessagesLoader =
+        new BackupMessagesLoader(
+            producer,
+            producer,
+            listeners,
+            topicsCache,
+            schemaRepository,
+            schemaExistenceEnsurer,
+            trackers,
+            localMessageStorageProperties);
+
+    messageRepository.save(messageOfAge(1), topic);
+    messageRepository.save(messageOfAge(10), topic);
+    messageRepository.save(messageOfAge(10), topic);
+
+    // when
+    backupMessagesLoader.loadMessages(messageRepository.findAll());
+
+    // then
+    verify(producer, times(1))
+        .send(any(JsonMessage.class), eq(cachedTopic), any(PublishingCallback.class));
+  }
+
+  @Test
+  public void shouldSendAndResendMessages() {
+    // given
+    int noOfSentCalls = 2;
+    LocalMessageStorageProperties localMessageStorageProperties =
+        new LocalMessageStorageProperties();
+    localMessageStorageProperties.setMaxAge(Duration.ofHours(8));
+    localMessageStorageProperties.setMaxResendRetries(noOfSentCalls - 1);
+    when(trackers.get(eq(topic))).thenReturn(new NoOperationPublishingTracker());
+
+    doAnswer(
+            invocation -> {
+              Object[] args = invocation.getArguments();
+              ((PublishingCallback) args[2])
+                  .onUnpublished(
+                      (Message) args[0], ((CachedTopic) args[1]).getTopic(), new Exception("test"));
+              return "";
+            })
+        .when(producer)
+        .send(any(JsonMessage.class), eq(cachedTopic), any(PublishingCallback.class));
+
+    MessageRepository messageRepository =
+        new ChronicleMapMessageRepository(
+            new File(tempDir.getAbsoluteFile(), "messages.dat"), ENTRIES, AVERAGE_MESSAGE_SIZE);
+    BackupMessagesLoader backupMessagesLoader =
+        new BackupMessagesLoader(
+            producer,
+            producer,
+            listeners,
+            topicsCache,
+            schemaRepository,
+            schemaExistenceEnsurer,
+            trackers,
+            localMessageStorageProperties);
+
+    messageRepository.save(messageOfAge(1), topic);
+
+    // when
+    backupMessagesLoader.loadMessages(messageRepository.findAll());
+
+    // then
+    verify(producer, times(noOfSentCalls))
+        .send(any(JsonMessage.class), eq(cachedTopic), any(PublishingCallback.class));
+    verify(listeners, times(noOfSentCalls))
+        .onError(any(JsonMessage.class), eq(topic), any(Exception.class));
+  }
+
+  @Test
+  public void shouldSendOnlyWhenBrokerTopicIsAvailable() {
+    // given
+    LocalMessageStorageProperties localMessageStorageProperties =
+        new LocalMessageStorageProperties();
+    localMessageStorageProperties.setMaxAge(Duration.ofHours(8));
+
+    when(producer.isTopicAvailable(cachedTopic))
+        .thenReturn(false)
+        .thenReturn(false)
+        .thenReturn(true);
+
+    BackupMessagesLoader backupMessagesLoader =
+        new BackupMessagesLoader(
+            producer,
+            producer,
+            listeners,
+            topicsCache,
+            schemaRepository,
+            schemaExistenceEnsurer,
+            trackers,
+            localMessageStorageProperties);
+    MessageRepository messageRepository =
+        new ChronicleMapMessageRepository(
+            new File(tempDir.getAbsoluteFile(), "messages.dat"), ENTRIES, AVERAGE_MESSAGE_SIZE);
+    messageRepository.save(messageOfAge(1), topic);
+
+    // when
+    backupMessagesLoader.loadMessages(messageRepository.findAll());
+
+    // then
+    verify(producer, times(3)).isTopicAvailable(cachedTopic);
+    verify(producer, times(1))
+        .send(any(JsonMessage.class), eq(cachedTopic), any(PublishingCallback.class));
+  }
+
+  @Test
+  public void shouldSendMessageWithAllArgumentsFromBackupMessage() {
+    // given
+    LocalMessageStorageProperties localMessageStorageProperties =
+        new LocalMessageStorageProperties();
+    localMessageStorageProperties.setMaxAge(Duration.ofHours(8));
+    localMessageStorageProperties.setMaxResendRetries(2);
+
+    MessageRepository messageRepository =
+        new ChronicleMapMessageRepository(
+            new File(tempDir.getAbsoluteFile(), "messages.dat"), ENTRIES, AVERAGE_MESSAGE_SIZE);
+
+    BackupMessagesLoader backupMessagesLoader =
+        new BackupMessagesLoader(
+            producer,
+            producer,
+            listeners,
+            topicsCache,
+            schemaRepository,
+            schemaExistenceEnsurer,
+            trackers,
+            localMessageStorageProperties);
+
+    messageRepository.save(messageOfAge(1), topic);
+
+    // when
+    List<BackupMessage> backupMessages = messageRepository.findAll();
+    backupMessagesLoader.loadMessages(backupMessages);
+
+    // then
+    ArgumentCaptor<Message> messageArgument = ArgumentCaptor.forClass(Message.class);
+
+    verify(producer, times(1))
+        .send(messageArgument.capture(), eq(cachedTopic), any(PublishingCallback.class));
+    Message sendMessage = messageArgument.getValue();
+    assertThat(sendMessage.getPartitionKey()).isEqualTo(backupMessages.get(0).getPartitionKey());
+    assertThat(sendMessage.getData()).isEqualTo(backupMessages.get(0).getData());
+    assertThat(sendMessage.getId()).isEqualTo(backupMessages.get(0).getMessageId());
+    assertThat(sendMessage.getTimestamp()).isEqualTo(backupMessages.get(0).getTimestamp());
+    assertThat(sendMessage.getHTTPHeaders().get("propagated-http-header"))
+        .isEqualTo("example-value");
+  }
+
+  private Message messageOfAge(int ageHours) {
+    return new JsonMessage(
+        MessageIdGenerator.generate(),
+        "{'a':'b'}".getBytes(),
+        now().minusHours(ageHours).toInstant(UTC).toEpochMilli(),
+        "partition-key",
+        Map.of("propagated-http-header", "example-value"));
+  }
 }
diff --git a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BufferSerializationCompatibilityTest.java b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BufferSerializationCompatibilityTest.java
index 204a3a5282..e738284700 100644
--- a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BufferSerializationCompatibilityTest.java
+++ b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/BufferSerializationCompatibilityTest.java
@@ -1,23 +1,22 @@
 package pl.allegro.tech.hermes.frontend.buffer;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Test;
 import pl.allegro.tech.hermes.frontend.buffer.chronicle.ChronicleMapEntryValue;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
- * This test protects against unintended changes to ChronicleMapEntryValue class. As ChronicleMap uses Java serialization
- * when writing the class to offheap (and to the file), any change in canonical class name breaks the compatibility
- * of buffers. Incompatible buffer will not be read from disk, which might lead to losing some messages between the
- * updates.
+ * This test protects against unintended changes to ChronicleMapEntryValue class. As ChronicleMap
+ * uses Java serialization when writing the class to offheap (and to the file), any change in
+ * canonical class name breaks the compatibility of buffers. Incompatible buffer will not be read
+ * from disk, which might lead to losing some messages between the updates.
  */
 public class BufferSerializationCompatibilityTest {
 
-    @Test
-    public void shouldKeepChronicleMapEntryValueClassCanonicalNameConsistent() {
-        // then
-        assertThat(ChronicleMapEntryValue.class.getCanonicalName())
-                .isEqualTo("pl.allegro.tech.hermes.frontend.buffer.chronicle.ChronicleMapEntryValue");
-    }
-
+  @Test
+  public void shouldKeepChronicleMapEntryValueClassCanonicalNameConsistent() {
+    // then
+    assertThat(ChronicleMapEntryValue.class.getCanonicalName())
+        .isEqualTo("pl.allegro.tech.hermes.frontend.buffer.chronicle.ChronicleMapEntryValue");
+  }
 }
diff --git a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/ChronicleMapMessageRepositoryTest.java b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/ChronicleMapMessageRepositoryTest.java
index 542a1e772c..d8689373c6 100644
--- a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/ChronicleMapMessageRepositoryTest.java
+++ b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/buffer/ChronicleMapMessageRepositoryTest.java
@@ -1,9 +1,24 @@
 package pl.allegro.tech.hermes.frontend.buffer;
 
-import com.google.common.io.Files;
+import static java.nio.charset.Charset.defaultCharset;
+import static java.util.Collections.emptyMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import org.junit.Before;
 import org.junit.Test;
 import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.common.message.wrapper.CompositeMessageContentWrapper;
+import pl.allegro.tech.hermes.common.message.wrapper.JsonMessageContentWrapper;
 import pl.allegro.tech.hermes.frontend.buffer.chronicle.ChronicleMapMessageRepository;
 import pl.allegro.tech.hermes.frontend.publishing.avro.AvroMessage;
 import pl.allegro.tech.hermes.frontend.publishing.message.JsonMessage;
@@ -13,179 +28,203 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
 
-import java.io.File;
-import java.util.UUID;
+public class ChronicleMapMessageRepositoryTest {
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+  private static final int ENTRIES = 100;
+  private static final int AVERAGE_MESSAGE_SIZE = 600;
 
-public class ChronicleMapMessageRepositoryTest {
+  private File file;
+  private MessageRepository messageRepository;
+
+  @Before
+  public void setUp() throws Throwable {
+    file = File.createTempFile("local_backup", ".dat");
+    messageRepository = new ChronicleMapMessageRepository(file, ENTRIES, AVERAGE_MESSAGE_SIZE);
+  }
+
+  @Test
+  public void shouldSaveFindAndDeleteMessage() {
+    // given
+    String qualifiedName = "groupName.topic";
+
+    Message message = generateJsonMessage();
+    String id = message.getId();
+
+    Topic topic = topic(qualifiedName).build();
+
+    // when
+    messageRepository.save(message, topic);
+
+    // then
+    assertThat(messageRepository.findAll()).contains(backupMessage(message, qualifiedName));
+
+    // when
+    messageRepository.delete(id);
+
+    // then
+    assertThat(messageRepository.findAll()).isEmpty();
+  }
+
+  @Test
+  public void shouldSaveMultipleTimesFindAndDeleteMessage() {
+    // given
+    String messageContent = "hello world";
+    Message message1 = generateJsonMessage(messageContent);
+    Message message2 = generateJsonMessage(messageContent);
+    String qualifiedName = "groupName.topic";
+
+    Topic topic = topic(qualifiedName).build();
 
-    private static final int ENTRIES = 100;
-    private static final int AVERAGE_MESSAGE_SIZE = 600;
-
-    private File file;
-    private MessageRepository messageRepository;
-
-    @Before
-    public void setUp() throws Throwable {
-        file = File.createTempFile("local_backup", ".dat");
-        messageRepository = new ChronicleMapMessageRepository(file, ENTRIES, AVERAGE_MESSAGE_SIZE);
-    }
-
-    @Test
-    public void shouldSaveFindAndDeleteMessage() {
-        //given
-        String qualifiedName = "groupName.topic";
-
-        Message message = generateJsonMessage();
-        String id = message.getId();
-        byte[] messageContent = message.getData();
-        long timestamp = message.getTimestamp();
-
-        Topic topic = topic(qualifiedName).build();
-
-        //when
-        messageRepository.save(message, topic);
-
-        //then
-        assertThat(messageRepository.findAll()).contains(
-                new BackupMessage(id, messageContent, timestamp, qualifiedName, message.getPartitionKey(), null, null));
-
-        //when
-        messageRepository.delete(id);
-
-        //then
-        assertThat(messageRepository.findAll()).isEmpty();
-    }
-
-    @Test
-    public void shouldSaveMultipleTimesFindAndDeleteMessage() {
-        //given
-        String messageContent = "hello world";
-        Message message1 = generateJsonMessage(messageContent);
-        Message message2 = generateJsonMessage(messageContent);
-        final String id1 = message1.getId();
-        final String id2 = message2.getId();
-        String qualifiedName = "groupName.topic";
-
-        Topic topic = topic(qualifiedName).build();
-
-        //when
-        messageRepository.save(message1, topic);
-        messageRepository.save(message2, topic);
-        messageRepository.save(message1, topic);
-        messageRepository.save(message2, topic);
-
-        //then
-        assertThat(messageRepository.findAll()).contains(
-            new BackupMessage(
-                id1,
-                messageContent.getBytes(),
-                message1.getTimestamp(),
-                qualifiedName,
-                message1.getPartitionKey(),
-                null,
-                null
-            )
-        );
-
-        //when
-        messageRepository.delete(id1);
-
-        //then
-        assertThat(messageRepository.findAll()).hasSize(1);
-        assertThat(messageRepository.findAll()).contains(
-            new BackupMessage(
-                id2,
-                messageContent.getBytes(),
-                message2.getTimestamp(),
-                qualifiedName,
-                message2.getPartitionKey(),
-                null,
-                null)
-        );
-    }
-
-    @Test
-    public void shouldCreateRepositoryFromFile() {
-        //given
-        String baseDir = Files.createTempDir().getAbsolutePath();
-        File file = new File(baseDir, "messages.dat");
-
-        //when
-        new ChronicleMapMessageRepository(file, ENTRIES, AVERAGE_MESSAGE_SIZE);
-
-        //then
-        assertThat(file).exists();
-    }
-
-    @Test
-    public void shouldCreateRepositoryThenCloseAndRestore() {
-        //given
-        Message message = generateJsonMessage();
-        String qualifiedName = "groupName.topic";
-        Topic topic = topic(qualifiedName).build();
-
-        String baseDir = Files.createTempDir().getAbsolutePath();
-        File file = new File(baseDir, "messages.dat");
-
-        messageRepository = new ChronicleMapMessageRepository(file, ENTRIES, AVERAGE_MESSAGE_SIZE);
-
-        //when
-        messageRepository.save(message, topic);
-
-        //then
-        messageRepository.close();
-
-        //when
-        messageRepository = new ChronicleMapMessageRepository(file, ENTRIES, AVERAGE_MESSAGE_SIZE);
-
-        //then
-        assertThat(messageRepository.findAll()).contains(new BackupMessage(
-                message.getId(), message.getData(), message.getTimestamp(), qualifiedName, message.getPartitionKey(), null, null));
-    }
-
-    @Test
-    public void shouldSaveFindAndDeleteMessageAvroMessage() {
-        //given
-        String qualifiedName = "groupName.topic";
-
-        AvroUser avroUser = new AvroUser("Bob", 18, "blue");
-        String id = MessageIdGenerator.generate();
-        Message message = new AvroMessage(id, avroUser.asBytes(), System.currentTimeMillis(),
-                CompiledSchema.of(AvroUserSchemaLoader.load(), 1, 1), "partition-key");
-
-        byte[] messageContent = message.getData();
-        long timestamp = message.getTimestamp();
-
-        Topic topic = topic(qualifiedName).build();
-
-        //when
-        messageRepository.save(message, topic);
-
-        //then
-        assertThat(messageRepository.findAll()).contains(
-                new BackupMessage(id, messageContent, timestamp, qualifiedName, message.getPartitionKey(), 1, 1));
-
-        //when
-        messageRepository.delete(id);
-
-        //then
-        assertThat(messageRepository.findAll()).isEmpty();
-    }
-
-    private Message generateJsonMessage() {
-        return generateJsonMessage(UUID.randomUUID().toString());
-    }
-
-    private Message generateJsonMessage(String content) {
-        return generateJsonMessage(content, System.currentTimeMillis());
-    }
-
-    private Message generateJsonMessage(String content, long timestamp) {
-        byte[] messageContent = content.getBytes();
-        String id = MessageIdGenerator.generate();
-        return new JsonMessage(id, messageContent, timestamp, "partition-key");
-    }
+    // when
+    messageRepository.save(message1, topic);
+    messageRepository.save(message2, topic);
+    messageRepository.save(message1, topic);
+    messageRepository.save(message2, topic);
+
+    // then
+    assertThat(messageRepository.findAll()).contains(backupMessage(message1, qualifiedName));
+
+    // when
+    messageRepository.delete(message1.getId());
+
+    // then
+    assertThat(messageRepository.findAll()).hasSize(1);
+    assertThat(messageRepository.findAll()).contains(backupMessage(message2, qualifiedName));
+  }
+
+  @Test
+  public void shouldCreateRepositoryFromFile() throws IOException {
+    // given
+    File file = Files.createTempFile("backup", "messages.dat").toFile();
+
+    // when
+    new ChronicleMapMessageRepository(file, ENTRIES, AVERAGE_MESSAGE_SIZE);
+
+    // then
+    assertThat(file).exists();
+  }
+
+  @Test
+  public void shouldCreateRepositoryThenCloseAndRestore() throws IOException {
+    // given
+    Message message = generateJsonMessage();
+    String qualifiedName = "groupName.topic";
+    Topic topic = topic(qualifiedName).build();
+
+    File file = Files.createTempFile("backup", "messages.dat").toFile();
+
+    messageRepository = new ChronicleMapMessageRepository(file, ENTRIES, AVERAGE_MESSAGE_SIZE);
+
+    // when
+    messageRepository.save(message, topic);
+
+    // then
+    messageRepository.close();
+
+    // when
+    messageRepository = new ChronicleMapMessageRepository(file, ENTRIES, AVERAGE_MESSAGE_SIZE);
+
+    // then
+    assertThat(messageRepository.findAll()).contains(backupMessage(message, qualifiedName));
+  }
+
+  @Test
+  public void shouldSaveFindAndDeleteMessageAvroMessage() {
+    // given
+    String qualifiedName = "groupName.topic";
+
+    AvroUser avroUser = new AvroUser("Bob", 18, "blue");
+    String id = MessageIdGenerator.generate();
+    Message message =
+        new AvroMessage(
+            id,
+            avroUser.asBytes(),
+            System.currentTimeMillis(),
+            CompiledSchema.of(AvroUserSchemaLoader.load(), 1, 1),
+            "partition-key",
+            emptyMap());
+
+    Topic topic = topic(qualifiedName).build();
+
+    // when
+    messageRepository.save(message, topic);
+
+    // then
+    assertThat(messageRepository.findAll()).contains(backupMessage(message, qualifiedName));
+
+    // when
+    messageRepository.delete(id);
+
+    // then
+    assertThat(messageRepository.findAll()).isEmpty();
+  }
+
+  @Test
+  public void shouldLoadMessagesSavedByVersion2_5_0() throws IOException {
+    // given
+    // The hermes-buffer-v3_2-5-0.dat file has been generated by running
+    // pl.allegro.tech.hermes.integration.MessageBufferLoadingTest#backupFileWithOneMessage
+    // against version 2.5.0 (https://github.com/allegro/hermes/tree/hermes-2.5.0).
+    InputStream fileSavedBy2_5_0 = getClass().getResourceAsStream("/hermes-buffer-v3_2-5-0.dat");
+    String tempDirPath = Files.createTempDirectory("backup").toAbsolutePath().toString();
+    Path backupFile = Path.of(tempDirPath, "/hermes-buffer-v3.dat");
+    Files.copy(fileSavedBy2_5_0, backupFile);
+
+    ChronicleMapMessageRepository messageRepository =
+        new ChronicleMapMessageRepository(backupFile.toFile(), ENTRIES, AVERAGE_MESSAGE_SIZE);
+
+    // when
+    List<BackupMessage> loadedMessages = messageRepository.findAll();
+
+    // then
+    assertThat(loadedMessages).hasSize(1);
+    BackupMessage message = loadedMessages.get(0);
+    assertThat(message.getMessageId()).isEqualTo("573e570c-890d-49c6-8916-434a1ecb6c66");
+    assertThat(message.getTimestamp()).isEqualTo(1704280749690L);
+    assertThat(message.getQualifiedTopicName())
+        .isEqualTo("backupGroup.topic-2e760871-954e-4823-935c-dfdadbb1be09");
+    assertThat(message.getPartitionKey()).isNull();
+    assertThat(message.getPropagatedHTTPHeaders()).isEmpty();
+    assertThat(message.getSchemaVersion()).isNull();
+    assertThat(message.getSchemaId()).isNull();
+
+    JsonMessageContentWrapper contentWrapper =
+        new JsonMessageContentWrapper("message", "metadata", new ObjectMapper());
+    CompositeMessageContentWrapper wrapper =
+        new CompositeMessageContentWrapper(contentWrapper, null, null, null, null, null);
+    byte[] content =
+        wrapper.wrapJson(
+            "message".getBytes(defaultCharset()),
+            message.getMessageId(),
+            message.getTimestamp(),
+            emptyMap());
+    assertThat(message.getData()).isEqualTo(content);
+  }
+
+  private Message generateJsonMessage() {
+    return generateJsonMessage(UUID.randomUUID().toString());
+  }
+
+  private Message generateJsonMessage(String content) {
+    return generateJsonMessage(content, System.currentTimeMillis());
+  }
+
+  private Message generateJsonMessage(String content, long timestamp) {
+    byte[] messageContent = content.getBytes();
+    String id = MessageIdGenerator.generate();
+    return new JsonMessage(
+        id, messageContent, timestamp, "partition-key", Map.of("propagated-http-header", "value"));
+  }
+
+  private BackupMessage backupMessage(Message m, String qualifiedTopicName) {
+    return new BackupMessage(
+        m.getId(),
+        m.getData(),
+        m.getTimestamp(),
+        qualifiedTopicName,
+        m.getPartitionKey(),
+        m.getCompiledSchema().map(cs -> cs.getVersion().value()).orElse(null),
+        m.getCompiledSchema().map(cs -> cs.getId().value()).orElse(null),
+        m.getHTTPHeaders());
+  }
 }
diff --git a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducerTest.java b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducerTest.java
deleted file mode 100644
index d0bffcb30c..0000000000
--- a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducerTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package pl.allegro.tech.hermes.frontend.producer.kafka;
-
-import com.codahale.metrics.MetricRegistry;
-import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import org.apache.kafka.clients.producer.MockProducer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.serialization.ByteArraySerializer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-import pl.allegro.tech.hermes.common.kafka.NamespaceKafkaNamesMapper;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
-import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.frontend.config.KafkaHeaderNameProperties;
-import pl.allegro.tech.hermes.frontend.config.KafkaProducerProperties;
-import pl.allegro.tech.hermes.frontend.config.SchemaProperties;
-import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
-import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
-import pl.allegro.tech.hermes.frontend.publishing.message.JsonMessage;
-import pl.allegro.tech.hermes.frontend.publishing.message.Message;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.jayway.awaitility.Awaitility.await;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
-@RunWith(MockitoJUnitRunner.class)
-public class KafkaBrokerMessageProducerTest {
-
-    private static final Long TIMESTAMP = 1L;
-    private static final String PARTITION_KEY = "partition-key";
-    private static final String MESSAGE_ID = "id";
-    private static final Topic TOPIC = topic("group.topic").build();
-    private static final byte[] CONTENT = "{\"data\":\"json\"}".getBytes(UTF_8);
-    private static final Message MESSAGE = new JsonMessage(MESSAGE_ID, CONTENT, TIMESTAMP, PARTITION_KEY);
-
-    private final ByteArraySerializer serializer = new ByteArraySerializer();
-    private final MockProducer<byte[], byte[]> leaderConfirmsProducer = new MockProducer<>(true, serializer, serializer);
-    private final MockProducer<byte[], byte[]> everyoneConfirmProducer = new MockProducer<>(true, serializer, serializer);
-    private final KafkaHeaderNameProperties kafkaHeaderNameProperties = new KafkaHeaderNameProperties();
-    private final KafkaProducerProperties kafkaProducerProperties = new KafkaProducerProperties();
-    private final Producers producers =
-        new Producers(leaderConfirmsProducer, everyoneConfirmProducer, kafkaProducerProperties.isReportNodeMetricsEnabled());
-
-    private KafkaBrokerMessageProducer producer;
-    private final KafkaNamesMapper kafkaNamesMapper = new NamespaceKafkaNamesMapper("ns", "_");
-    private final KafkaHeaderFactory kafkaHeaderFactory = new KafkaHeaderFactory(kafkaHeaderNameProperties);
-
-    @Mock
-    private HermesMetrics hermesMetrics = new HermesMetrics(new MetricRegistry(), new PathsCompiler(""));
-
-    private final MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry(), hermesMetrics);
-
-    @Mock
-    private KafkaTopicMetadataFetcher kafkaTopicMetadataFetcher;
-
-    private CachedTopic cachedTopic;
-
-    private final SchemaProperties schemaProperties = new SchemaProperties();
-
-    @Before
-    public void before() {
-        cachedTopic = new CachedTopic(TOPIC, metricsFacade, kafkaNamesMapper.toKafkaTopics(TOPIC));
-        MessageToKafkaProducerRecordConverter messageConverter =
-            new MessageToKafkaProducerRecordConverter(kafkaHeaderFactory, schemaProperties.isIdHeaderEnabled());
-        producer = new KafkaBrokerMessageProducer(producers, kafkaTopicMetadataFetcher, metricsFacade, messageConverter);
-    }
-
-    @After
-    public void after() {
-        leaderConfirmsProducer.clear();
-        everyoneConfirmProducer.clear();
-    }
-
-    @Test
-    public void shouldPublishOnTopicUsingKafkaTopicName() {
-        //when
-        producer.send(MESSAGE, cachedTopic, new DoNothing());
-
-        //then
-        List<ProducerRecord<byte[], byte[]>> records = leaderConfirmsProducer.history();
-        assertThat(records.size()).isEqualTo(1);
-        assertThat(records.get(0).topic()).isEqualTo("ns_group.topic");
-    }
-
-    @Test
-    public void shouldPublishOnTheSamePartition() {
-        //when
-        producer.send(MESSAGE, cachedTopic, new DoNothing());
-        producer.send(MESSAGE, cachedTopic, new DoNothing());
-        producer.send(MESSAGE, cachedTopic, new DoNothing());
-
-        //then
-        List<ProducerRecord<byte[], byte[]>> records = leaderConfirmsProducer.history();
-        assertThat(records.size()).isEqualTo(3);
-        assertThat(records.stream().filter(record -> PARTITION_KEY.equals(new String(record.key()))).count()).isEqualTo(3);
-    }
-
-    @Test
-    public void shouldCallCallbackOnSend() {
-        //given
-        final AtomicBoolean callbackCalled = new AtomicBoolean(false);
-
-        //when
-        producer.send(MESSAGE, cachedTopic, new PublishingCallback() {
-            @Override
-            public void onUnpublished(Message message, Topic topic, Exception exception) {
-                callbackCalled.set(true);
-            }
-
-            @Override
-            public void onPublished(Message message, Topic topic) {
-                callbackCalled.set(true);
-            }
-        });
-
-        //then
-        await().until(callbackCalled::get);
-    }
-
-    @Test
-    public void shouldUseEveryoneConfirmProducerForTopicWithAckAll() {
-        //given
-        Topic topic = topic("group.all").withAck(Topic.Ack.ALL).build();
-        CachedTopic cachedTopic = new CachedTopic(topic, metricsFacade,
-                kafkaNamesMapper.toKafkaTopics(topic));
-
-        //when
-        producer.send(MESSAGE, cachedTopic, new DoNothing());
-
-        //then
-        List<ProducerRecord<byte[], byte[]>> records = everyoneConfirmProducer.history();
-        assertThat(records.size()).isEqualTo(1);
-        assertThat(records.get(0).topic()).isEqualTo("ns_group.all");
-    }
-
-    private static class DoNothing implements PublishingCallback {
-        public void onUnpublished(Message message, Topic topic, Exception exception) {
-        }
-
-        public void onPublished(Message message, Topic topic) {
-        }
-    }
-
-}
diff --git a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducerTest.java b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducerTest.java
new file mode 100644
index 0000000000..81d9eafa10
--- /dev/null
+++ b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/producer/kafka/LocalDatacenterMessageProducerTest.java
@@ -0,0 +1,210 @@
+package pl.allegro.tech.hermes.frontend.producer.kafka;
+
+import static com.google.common.base.Charsets.UTF_8;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.producer.MockProducer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.ByteArraySerializer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.common.kafka.HTTPHeadersPropagationAsKafkaHeadersProperties;
+import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
+import pl.allegro.tech.hermes.common.kafka.NamespaceKafkaNamesMapper;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
+import pl.allegro.tech.hermes.frontend.cache.topic.TopicsCache;
+import pl.allegro.tech.hermes.frontend.config.HTTPHeadersProperties;
+import pl.allegro.tech.hermes.frontend.config.KafkaHeaderNameProperties;
+import pl.allegro.tech.hermes.frontend.config.SchemaProperties;
+import pl.allegro.tech.hermes.frontend.metric.CachedTopic;
+import pl.allegro.tech.hermes.frontend.metric.ThroughputRegistry;
+import pl.allegro.tech.hermes.frontend.producer.BrokerLatencyReporter;
+import pl.allegro.tech.hermes.frontend.publishing.PublishingCallback;
+import pl.allegro.tech.hermes.frontend.publishing.message.JsonMessage;
+import pl.allegro.tech.hermes.frontend.publishing.message.Message;
+
+@RunWith(MockitoJUnitRunner.class)
+public class LocalDatacenterMessageProducerTest {
+
+  private static final Long TIMESTAMP = 1L;
+  private static final String PARTITION_KEY = "partition-key";
+  private static final String MESSAGE_ID = "id";
+  private static final String datacenter = "dc";
+  private static final Topic TOPIC = topic("group.topic").build();
+  private static final byte[] CONTENT = "{\"data\":\"json\"}".getBytes(UTF_8);
+  private static final Message MESSAGE =
+      new JsonMessage(MESSAGE_ID, CONTENT, TIMESTAMP, PARTITION_KEY, emptyMap());
+
+  private final ByteArraySerializer serializer = new ByteArraySerializer();
+  private final MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry());
+
+  private final BrokerLatencyReporter brokerLatencyReporter =
+      new BrokerLatencyReporter(
+          false, metricsFacade, Duration.ZERO, Executors.newSingleThreadExecutor());
+
+  private final ScheduledExecutorService chaosScheduler =
+      Executors.newSingleThreadScheduledExecutor();
+
+  private final MockProducer<byte[], byte[]> leaderConfirmsProducer =
+      new MockProducer<>(true, serializer, serializer);
+  private final MockProducer<byte[], byte[]> everyoneConfirmProducer =
+      new MockProducer<>(true, serializer, serializer);
+  private final KafkaMessageSender<byte[], byte[]> leaderConfirmsProduceWrapper =
+      new KafkaMessageSender<>(
+          leaderConfirmsProducer, brokerLatencyReporter, metricsFacade, datacenter, chaosScheduler);
+  private final KafkaMessageSender<byte[], byte[]> everyoneConfirmsProduceWrapper =
+      new KafkaMessageSender<>(
+          everyoneConfirmProducer,
+          brokerLatencyReporter,
+          metricsFacade,
+          datacenter,
+          chaosScheduler);
+
+  private final KafkaHeaderNameProperties kafkaHeaderNameProperties =
+      new KafkaHeaderNameProperties();
+  private final HTTPHeadersPropagationAsKafkaHeadersProperties
+      httpHeadersPropagationAsKafkaHeadersProperties =
+          new HTTPHeadersProperties.PropagationAsKafkaHeadersProperties();
+  @Mock private TopicsCache topicsCache;
+  private final TopicMetadataLoadingExecutor topicMetadataLoadingExecutor =
+      new TopicMetadataLoadingExecutor(topicsCache, 2, Duration.ofSeconds(10), 2);
+  @Mock private AdminClient adminClient;
+  private final MinInSyncReplicasLoader localMinInSyncReplicasLoader =
+      new MinInSyncReplicasLoader(adminClient, Duration.ofMinutes(1));
+  private final KafkaMessageSenders kafkaMessageSenders =
+      new KafkaMessageSenders(
+          topicMetadataLoadingExecutor,
+          localMinInSyncReplicasLoader,
+          new KafkaMessageSenders.Tuple(
+              leaderConfirmsProduceWrapper, everyoneConfirmsProduceWrapper),
+          emptyList());
+
+  private LocalDatacenterMessageProducer producer;
+  private final KafkaNamesMapper kafkaNamesMapper = new NamespaceKafkaNamesMapper("ns", "_");
+  private final KafkaHeaderFactory kafkaHeaderFactory =
+      new KafkaHeaderFactory(
+          kafkaHeaderNameProperties, httpHeadersPropagationAsKafkaHeadersProperties);
+
+  private CachedTopic cachedTopic;
+
+  private final SchemaProperties schemaProperties = new SchemaProperties();
+
+  @Mock private ThroughputRegistry throughputRegistry;
+
+  @Before
+  public void before() {
+    cachedTopic =
+        new CachedTopic(
+            TOPIC, metricsFacade, throughputRegistry, kafkaNamesMapper.toKafkaTopics(TOPIC));
+    MessageToKafkaProducerRecordConverter messageConverter =
+        new MessageToKafkaProducerRecordConverter(
+            kafkaHeaderFactory, schemaProperties.isIdHeaderEnabled());
+    producer = new LocalDatacenterMessageProducer(kafkaMessageSenders, messageConverter);
+  }
+
+  @After
+  public void after() {
+    leaderConfirmsProducer.clear();
+    everyoneConfirmProducer.clear();
+  }
+
+  @Test
+  public void shouldPublishOnTopicUsingKafkaTopicName() {
+    // when
+    producer.send(MESSAGE, cachedTopic, new DoNothing());
+
+    // then
+    List<ProducerRecord<byte[], byte[]>> records = leaderConfirmsProducer.history();
+    assertThat(records.size()).isEqualTo(1);
+    assertThat(records.get(0).topic()).isEqualTo("ns_group.topic");
+  }
+
+  @Test
+  public void shouldPublishOnTheSamePartition() {
+    // when
+    producer.send(MESSAGE, cachedTopic, new DoNothing());
+    producer.send(MESSAGE, cachedTopic, new DoNothing());
+    producer.send(MESSAGE, cachedTopic, new DoNothing());
+
+    // then
+    List<ProducerRecord<byte[], byte[]>> records = leaderConfirmsProducer.history();
+    assertThat(records.size()).isEqualTo(3);
+    assertThat(
+            records.stream()
+                .filter(record -> PARTITION_KEY.equals(new String(record.key())))
+                .count())
+        .isEqualTo(3);
+  }
+
+  @Test
+  public void shouldCallCallbackOnSend() {
+    // given
+    final AtomicBoolean callbackCalled = new AtomicBoolean(false);
+
+    // when
+    producer.send(
+        MESSAGE,
+        cachedTopic,
+        new PublishingCallback() {
+          @Override
+          public void onUnpublished(Message message, Topic topic, Exception exception) {
+            callbackCalled.set(true);
+          }
+
+          @Override
+          public void onPublished(Message message, Topic topic) {
+            callbackCalled.set(true);
+          }
+
+          @Override
+          public void onEachPublished(Message message, Topic topic, String datacenter) {
+            callbackCalled.set(true);
+          }
+        });
+
+    // then
+    await().until(callbackCalled::get);
+  }
+
+  @Test
+  public void shouldUseEveryoneConfirmProducerForTopicWithAckAll() {
+    // given
+    Topic topic = topic("group.all").withAck(Topic.Ack.ALL).build();
+    CachedTopic cachedTopic =
+        new CachedTopic(
+            topic, metricsFacade, throughputRegistry, kafkaNamesMapper.toKafkaTopics(topic));
+
+    // when
+    producer.send(MESSAGE, cachedTopic, new DoNothing());
+
+    // then
+    List<ProducerRecord<byte[], byte[]>> records = everyoneConfirmProducer.history();
+    assertThat(records.size()).isEqualTo(1);
+    assertThat(records.get(0).topic()).isEqualTo("ns_group.all");
+  }
+
+  private static class DoNothing implements PublishingCallback {
+    public void onUnpublished(Message message, Topic topic, Exception exception) {}
+
+    public void onPublished(Message message, Topic topic) {}
+
+    @Override
+    public void onEachPublished(Message message, Topic topic, String datacenter) {}
+  }
+}
diff --git a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcerTest.java b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcerTest.java
index c76b7d81d1..bab826c62d 100644
--- a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcerTest.java
+++ b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcerTest.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.frontend.publishing.message;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import jakarta.ws.rs.core.MediaType;
 import org.apache.avro.Schema;
 import org.junit.Test;
@@ -11,76 +13,87 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
 import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class MessageContentTypeEnforcerTest {
 
-    private final MessageContentTypeEnforcer enforcer = new MessageContentTypeEnforcer();
-
-    private final Topic topic = TopicBuilder.topic("test.Topic").withContentType(ContentType.AVRO).build();
-    private final AvroUser avroMessage = new AvroUser("Bob", 30, "black");
-    private final CompiledSchema<Schema> schema = CompiledSchema.of(avroMessage.getSchema(), 1, 0);
-    private final CompiledSchema<Schema> testSchema = CompiledSchema.of(AvroUserSchemaLoader.load(), 1, 0);
-
-    @Test
-    public void shouldConvertToAvroWhenReceivedJSONOnAvroTopic() {
-        // when
-        byte[] enforcedMessage = enforcer.enforceAvro("application/json", avroMessage.asJson().getBytes(), schema.getSchema(), topic);
-
-        // then
-        assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
-    }
-
-    @Test
-    public void sh1ouldConvertToAvroWhenReceivedJSONOnAvroTopic() {
-        // when
-        byte[] enforcedMessage = enforcer.enforceAvro("application/json", avroMessage.asJson().getBytes(), testSchema.getSchema(), topic);
-
-        // then
-        assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
-    }
-
-
-    @Test
-    public void shouldConvertToAvroWhenReceivedAvroJSONOnAvroTopic() {
-        // when
-        byte[] enforcedMessage = enforcer.enforceAvro("avro/json", avroMessage.asAvroEncodedJson().getBytes(), schema.getSchema(), topic);
-
-        // then
-        assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
-    }
-
-    @Test
-    public void shouldStringContentTypeOfAdditionalOptionsWhenInterpretingIt() {
-        // when
-        byte[] enforcedMessage =
-            enforcer.enforceAvro("application/json;encoding=utf-8", avroMessage.asJson().getBytes(), schema.getSchema(), topic);
-
-        // then
-        assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
-    }
-
-    @Test
-    public void shouldNotConvertWhenReceivingAvroOnAvroTopic() {
-        // when
-        byte[] enforcedMessage = enforcer.enforceAvro("avro/binary", avroMessage.asBytes(), schema.getSchema(), topic);
-
-        // then
-        assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
-    }
-
-    @Test
-    public void shouldBeCaseInsensitiveForPayloadContentType() {
-        // when
-        byte[] enforcedMessage = enforcer.enforceAvro("AVRO/Binary", avroMessage.asBytes(), schema.getSchema(), topic);
-
-        // then
-        assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
-    }
-
-    @Test(expected = UnsupportedContentTypeException.class)
-    public void shouldThrowUnsupportedContentTypeExceptionWhenReceivedWrongContentType() {
-        // when
-        enforcer.enforceAvro(MediaType.TEXT_PLAIN, avroMessage.asBytes(), schema.getSchema(), topic);
-    }
+  private final MessageContentTypeEnforcer enforcer = new MessageContentTypeEnforcer();
+
+  private final Topic topic =
+      TopicBuilder.topic("test.Topic").withContentType(ContentType.AVRO).build();
+  private final AvroUser avroMessage = new AvroUser("Bob", 30, "black");
+  private final CompiledSchema<Schema> schema = CompiledSchema.of(avroMessage.getSchema(), 1, 0);
+  private final CompiledSchema<Schema> testSchema =
+      CompiledSchema.of(AvroUserSchemaLoader.load(), 1, 0);
+
+  @Test
+  public void shouldConvertToAvroWhenReceivedJSONOnAvroTopic() {
+    // when
+    byte[] enforcedMessage =
+        enforcer.enforceAvro(
+            "application/json", avroMessage.asJson().getBytes(), schema.getSchema(), topic);
+
+    // then
+    assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
+  }
+
+  @Test
+  public void sh1ouldConvertToAvroWhenReceivedJSONOnAvroTopic() {
+    // when
+    byte[] enforcedMessage =
+        enforcer.enforceAvro(
+            "application/json", avroMessage.asJson().getBytes(), testSchema.getSchema(), topic);
+
+    // then
+    assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
+  }
+
+  @Test
+  public void shouldConvertToAvroWhenReceivedAvroJSONOnAvroTopic() {
+    // when
+    byte[] enforcedMessage =
+        enforcer.enforceAvro(
+            "avro/json", avroMessage.asAvroEncodedJson().getBytes(), schema.getSchema(), topic);
+
+    // then
+    assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
+  }
+
+  @Test
+  public void shouldStringContentTypeOfAdditionalOptionsWhenInterpretingIt() {
+    // when
+    byte[] enforcedMessage =
+        enforcer.enforceAvro(
+            "application/json;encoding=utf-8",
+            avroMessage.asJson().getBytes(),
+            schema.getSchema(),
+            topic);
+
+    // then
+    assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
+  }
+
+  @Test
+  public void shouldNotConvertWhenReceivingAvroOnAvroTopic() {
+    // when
+    byte[] enforcedMessage =
+        enforcer.enforceAvro("avro/binary", avroMessage.asBytes(), schema.getSchema(), topic);
+
+    // then
+    assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
+  }
+
+  @Test
+  public void shouldBeCaseInsensitiveForPayloadContentType() {
+    // when
+    byte[] enforcedMessage =
+        enforcer.enforceAvro("AVRO/Binary", avroMessage.asBytes(), schema.getSchema(), topic);
+
+    // then
+    assertThat(enforcedMessage).isEqualTo(avroMessage.asBytes());
+  }
+
+  @Test(expected = UnsupportedContentTypeException.class)
+  public void shouldThrowUnsupportedContentTypeExceptionWhenReceivedWrongContentType() {
+    // when
+    enforcer.enforceAvro(MediaType.TEXT_PLAIN, avroMessage.asBytes(), schema.getSchema(), topic);
+  }
 }
diff --git a/hermes-frontend/src/test/resources/allure.properties b/hermes-frontend/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-frontend/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-frontend/src/test/resources/hermes-buffer-v3_2-5-0.dat b/hermes-frontend/src/test/resources/hermes-buffer-v3_2-5-0.dat
new file mode 100644
index 0000000000..7cd24d55f4
Binary files /dev/null and b/hermes-frontend/src/test/resources/hermes-buffer-v3_2-5-0.dat differ
diff --git a/hermes-management/build.gradle b/hermes-management/build.gradle
index 33e6e67390..1370341e63 100644
--- a/hermes-management/build.gradle
+++ b/hermes-management/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'application'
-    id "com.github.node-gradle.node" version "2.2.4"
+    id "com.github.node-gradle.node" version "7.0.2"
 }
 
 mainClassName = 'pl.allegro.tech.hermes.management.HermesManagement'
@@ -15,27 +15,25 @@ dependencies {
     api group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.spring
     api group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: versions.spring
     api group: 'org.springframework.boot', name: 'spring-boot-starter-jersey', version: versions.spring
-    implementation group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '4.8'
+    implementation group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4'
     implementation group: 'org.glassfish.jersey.ext', name: 'jersey-mvc-freemarker', version: versions.jersey
 
-    implementation (group: 'io.swagger', name: 'swagger-jersey2-jaxrs', version: '1.6.3') {
+    implementation (group: 'io.swagger', name: 'swagger-jersey2-jaxrs', version: '1.6.14') {
         exclude group: 'javax.validation', module: 'validation-api'
     }
 
     implementation group: 'org.apache.kafka', name: 'kafka-clients', version: versions.kafka
 
-    implementation group: 'commons-codec', name: 'commons-codec', version: '1.9'
-    implementation (group: 'com.github.fge', name: 'json-schema-validator', version: '2.2.6') {
-        exclude group: 'net.sf.jopt-simple'
-    }
+    implementation group: 'commons-codec', name: 'commons-codec', version: '1.16.1'
+    implementation group: 'com.github.java-json-tools', name: 'json-schema-validator', version: '2.2.14'
 
     implementation group: 'commons-jxpath', name: 'commons-jxpath', version: '1.3'
-    implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1'
+    implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1'
 
-    api group: 'org.javers', name: 'javers-core', version: '5.2.5'
+    api group: 'org.javers', name: 'javers-core', version: '7.4.2'
 
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: versions.jackson
-    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
 
     testImplementation project(':hermes-test-helper')
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.spring
@@ -53,20 +51,30 @@ node {
     version = '20.4.0'
     distBaseUrl = 'https://nodejs.org/dist'
     download = true
-    workDir = file("${project.buildDir}/nodejs")
-    npmWorkDir = file("${project.buildDir}/npm")
-    nodeModulesDir = file("${project.rootDir}/hermes-console-vue")
+    workDir.set(file("${project.buildDir}/nodejs"))
+    npmWorkDir.set(file("${project.buildDir}/npm"))
+    nodeProjectDir.set(file("${project.rootDir}/hermes-console"))
 }
 
 yarnSetup.dependsOn(nodeSetup)
 yarn.dependsOn(npmSetup)
 
 task buildHermesConsole(type: YarnTask, dependsOn: yarn) {
+    def tasksThatDontRequireConsole = [
+            'integrationTest',
+            'slowIntegrationTest',
+            'check'
+    ]
+
+    onlyIf {
+        tasksThatDontRequireConsole.intersect(gradle.startParameter.taskNames).isEmpty()
+    }
+
     args = ['build-only']
 }
 
 task attachHermesConsole(type: Copy, dependsOn: 'buildHermesConsole') {
-    from '../hermes-console-vue/dist'
+    from '../hermes-console/dist'
     def staticDirectory = sourceSets.main.output.resourcesDir.path + '/static'
     // remove previous static dir if exists and start with clear setup
     delete staticDirectory
@@ -82,3 +90,6 @@ tasks.register('prepareIndexTemplate') {
 }
 
 jar.dependsOn(attachHermesConsole, 'prepareIndexTemplate')
+
+run.dependsOn(attachHermesConsole, 'prepareIndexTemplate')
+
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/HermesManagement.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/HermesManagement.java
index 284681c868..3372816d20 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/HermesManagement.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/HermesManagement.java
@@ -6,8 +6,7 @@
 @SpringBootApplication
 public class HermesManagement {
 
-    public static void main(String[] args) {
-        SpringApplication.run(HermesManagement.class, args);
-    }
-
+  public static void main(String[] args) {
+    SpringApplication.run(HermesManagement.class, args);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/AllTopicClientsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/AllTopicClientsEndpoint.java
index b6038c2740..aa0060f119 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/AllTopicClientsEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/AllTopicClientsEndpoint.java
@@ -1,30 +1,29 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
+
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
+import java.util.List;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.management.domain.clients.AllTopicClientsService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
-
 @Component
 @Path("topics/{topic}/clients")
 public class AllTopicClientsEndpoint {
 
-    private final AllTopicClientsService allTopicClientsService;
+  private final AllTopicClientsService allTopicClientsService;
 
-    public AllTopicClientsEndpoint(AllTopicClientsService allTopicClientsService) {
-        this.allTopicClientsService = allTopicClientsService;
-    }
+  public AllTopicClientsEndpoint(AllTopicClientsService allTopicClientsService) {
+    this.allTopicClientsService = allTopicClientsService;
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    public List<String> getTopicClients(@PathParam("topic") String topic) {
-        return allTopicClientsService.getAllClientsByTopic(fromQualifiedName(topic));
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  public List<String> getTopicClients(@PathParam("topic") String topic) {
+    return allTopicClientsService.getAllClientsByTopic(fromQualifiedName(topic));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/BlacklistEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/BlacklistEndpoint.java
index bd796708ad..60d2600382 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/BlacklistEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/BlacklistEndpoint.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.status;
+import static pl.allegro.tech.hermes.api.BlacklistStatus.BLACKLISTED;
+import static pl.allegro.tech.hermes.api.BlacklistStatus.NOT_BLACKLISTED;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jakarta.annotation.security.RolesAllowed;
@@ -14,6 +19,7 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.BlacklistStatus;
@@ -22,65 +28,58 @@
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
 import pl.allegro.tech.hermes.management.domain.blacklist.TopicBlacklistService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.Response.status;
-import static pl.allegro.tech.hermes.api.BlacklistStatus.BLACKLISTED;
-import static pl.allegro.tech.hermes.api.BlacklistStatus.NOT_BLACKLISTED;
-
 @Component
 @Path("/blacklist")
 @Api(value = "/blacklist", description = "Operations on topics")
 public class BlacklistEndpoint {
 
-    private final TopicBlacklistService topicBlacklistService;
+  private final TopicBlacklistService topicBlacklistService;
 
-    @Autowired
-    public BlacklistEndpoint(TopicBlacklistService topicBlacklistService) {
-        this.topicBlacklistService = topicBlacklistService;
-    }
+  @Autowired
+  public BlacklistEndpoint(TopicBlacklistService topicBlacklistService) {
+    this.topicBlacklistService = topicBlacklistService;
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/topics/{topicName}")
-    @ApiOperation(value = "Is topic blacklisted", httpMethod = HttpMethod.GET)
-    public BlacklistStatus isTopicBlacklisted(@PathParam("topicName") String qualifiedTopicName) {
-        return topicBlacklistService.isBlacklisted(qualifiedTopicName) ? BLACKLISTED : NOT_BLACKLISTED;
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/topics/{topicName}")
+  @ApiOperation(value = "Is topic blacklisted", httpMethod = HttpMethod.GET)
+  public BlacklistStatus isTopicBlacklisted(@PathParam("topicName") String qualifiedTopicName) {
+    return topicBlacklistService.isBlacklisted(qualifiedTopicName) ? BLACKLISTED : NOT_BLACKLISTED;
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/topics")
-    @RolesAllowed(Roles.ADMIN)
-    public List<String> topicsBlacklist() {
-        return topicBlacklistService.list();
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/topics")
+  @RolesAllowed(Roles.ADMIN)
+  public List<String> topicsBlacklist() {
+    return topicBlacklistService.list();
+  }
 
-    @POST
-    @Produces(APPLICATION_JSON)
-    @Consumes(APPLICATION_JSON)
-    @Path("/topics")
-    @RolesAllowed(Roles.ADMIN)
-    @ApiOperation(value = "Blacklist topics", httpMethod = HttpMethod.POST)
-    public Response blacklistTopics(
-            List<String> qualifiedTopicNames,
-            @Context ContainerRequestContext requestContext) {
-        RequestUser blacklistRequester = new HermesSecurityAwareRequestUser(requestContext);
-        qualifiedTopicNames.forEach(topicName -> topicBlacklistService.blacklist(topicName, blacklistRequester));
-        return status(Response.Status.OK).build();
-    }
+  @POST
+  @Produces(APPLICATION_JSON)
+  @Consumes(APPLICATION_JSON)
+  @Path("/topics")
+  @RolesAllowed(Roles.ADMIN)
+  @ApiOperation(value = "Blacklist topics", httpMethod = HttpMethod.POST)
+  public Response blacklistTopics(
+      List<String> qualifiedTopicNames, @Context ContainerRequestContext requestContext) {
+    RequestUser blacklistRequester = new HermesSecurityAwareRequestUser(requestContext);
+    qualifiedTopicNames.forEach(
+        topicName -> topicBlacklistService.blacklist(topicName, blacklistRequester));
+    return status(Response.Status.OK).build();
+  }
 
-    @DELETE
-    @Produces(APPLICATION_JSON)
-    @Path("/topics/{topicName}")
-    @RolesAllowed(Roles.ADMIN)
-    @ApiOperation(value = "Unblacklist topic", httpMethod = HttpMethod.DELETE)
-    public Response unblacklistTopic(
-            @PathParam("topicName") String qualifiedTopicName,
-            @Context ContainerRequestContext requestContext) {
-        RequestUser unblacklistRequester = new HermesSecurityAwareRequestUser(requestContext);
-        topicBlacklistService.unblacklist(qualifiedTopicName, unblacklistRequester);
-        return status(Response.Status.OK).build();
-    }
+  @DELETE
+  @Produces(APPLICATION_JSON)
+  @Path("/topics/{topicName}")
+  @RolesAllowed(Roles.ADMIN)
+  @ApiOperation(value = "Unblacklist topic", httpMethod = HttpMethod.DELETE)
+  public Response unblacklistTopic(
+      @PathParam("topicName") String qualifiedTopicName,
+      @Context ContainerRequestContext requestContext) {
+    RequestUser unblacklistRequester = new HermesSecurityAwareRequestUser(requestContext);
+    topicBlacklistService.unblacklist(qualifiedTopicName, unblacklistRequester);
+    return status(Response.Status.OK).build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsistencyEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsistencyEndpoint.java
index bb835b5112..2bd3cbf987 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsistencyEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsistencyEndpoint.java
@@ -1,78 +1,114 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.GenericEntity;
 import jakarta.ws.rs.core.Response;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.InconsistentGroup;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.management.api.auth.HermesSecurityAwareRequestUser;
 import pl.allegro.tech.hermes.management.api.auth.Roles;
 import pl.allegro.tech.hermes.management.domain.consistency.DcConsistencyService;
 import pl.allegro.tech.hermes.management.domain.consistency.KafkaHermesConsistencyService;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Component
 @RolesAllowed(Roles.ADMIN)
 @Path("consistency")
 public class ConsistencyEndpoint {
-    private final DcConsistencyService dcConsistencyService;
-    private final KafkaHermesConsistencyService kafkaHermesConsistencyService;
+  private final DcConsistencyService dcConsistencyService;
+  private final KafkaHermesConsistencyService kafkaHermesConsistencyService;
+
+  public ConsistencyEndpoint(
+      DcConsistencyService dcConsistencyService,
+      KafkaHermesConsistencyService kafkaHermesConsistencyService) {
+    this.dcConsistencyService = dcConsistencyService;
+    this.kafkaHermesConsistencyService = kafkaHermesConsistencyService;
+  }
+
+  @GET
+  @Produces({APPLICATION_JSON})
+  @Path("/inconsistencies/groups")
+  public Response listInconsistentGroups(@QueryParam("groupNames") List<String> groupNames) {
+    List<InconsistentGroup> inconsistentGroups =
+        dcConsistencyService.listInconsistentGroups(new HashSet<>(groupNames));
+    return Response.ok()
+        .entity(new GenericEntity<List<InconsistentGroup>>(inconsistentGroups) {})
+        .build();
+  }
+
+  @POST
+  @Produces({APPLICATION_JSON})
+  @Path("/sync/groups/{groupName}")
+  public Response syncGroup(
+      @PathParam("groupName") String groupName,
+      @QueryParam("primaryDatacenter") String primaryDatacenter) {
+    dcConsistencyService.syncGroup(groupName, primaryDatacenter);
+    return Response.ok().build();
+  }
 
-    public ConsistencyEndpoint(DcConsistencyService dcConsistencyService,
-                               KafkaHermesConsistencyService kafkaHermesConsistencyService) {
-        this.dcConsistencyService = dcConsistencyService;
-        this.kafkaHermesConsistencyService = kafkaHermesConsistencyService;
-    }
+  @POST
+  @Produces({APPLICATION_JSON})
+  @Path("/sync/topics/{topicName}")
+  public Response syncTopic(
+      @PathParam("topicName") String topicName,
+      @QueryParam("primaryDatacenter") String primaryDatacenter) {
+    dcConsistencyService.syncTopic(TopicName.fromQualifiedName(topicName), primaryDatacenter);
+    return Response.ok().build();
+  }
 
-    @GET
-    @Produces({APPLICATION_JSON})
-    @Path("/inconsistencies/groups")
-    public Response listInconsistentGroups(@QueryParam("groupNames") List<String> groupNames) {
-        List<InconsistentGroup> inconsistentGroups = dcConsistencyService.listInconsistentGroups(new HashSet<>(groupNames));
-        return Response.ok()
-                .entity(new GenericEntity<List<InconsistentGroup>>(inconsistentGroups) {
-                })
-                .build();
-    }
+  @POST
+  @Produces({APPLICATION_JSON})
+  @Path("/sync/topics/{topicName}/subscriptions/{subscriptionName}")
+  public Response syncSubscription(
+      @PathParam("topicName") String topicName,
+      @PathParam("subscriptionName") String subscriptionName,
+      @QueryParam("primaryDatacenter") String primaryDatacenter) {
+    SubscriptionName name =
+        new SubscriptionName(subscriptionName, TopicName.fromQualifiedName(topicName));
+    dcConsistencyService.syncSubscription(name, primaryDatacenter);
+    return Response.ok().build();
+  }
 
-    @GET
-    @Produces({APPLICATION_JSON})
-    @Path("/inconsistencies/topics")
-    public Response listInconsistentTopics() {
-        return Response
-                .ok(new GenericEntity<Set<String>>(kafkaHermesConsistencyService.listInconsistentTopics()) {
-                })
-                .build();
-    }
+  @GET
+  @Produces({APPLICATION_JSON})
+  @Path("/inconsistencies/topics")
+  public Response listInconsistentTopics() {
+    return Response.ok(
+            new GenericEntity<Set<String>>(
+                kafkaHermesConsistencyService.listInconsistentTopics()) {})
+        .build();
+  }
 
-    @DELETE
-    @Produces({APPLICATION_JSON})
-    @Path("/inconsistencies/topics")
-    public Response removeTopicByName(@QueryParam("topicName") String topicName, @Context ContainerRequestContext requestContext) {
-        kafkaHermesConsistencyService.removeTopic(topicName, new HermesSecurityAwareRequestUser(requestContext));
-        return Response.ok().build();
-    }
+  @DELETE
+  @Produces({APPLICATION_JSON})
+  @Path("/inconsistencies/topics")
+  public Response removeTopicByName(
+      @QueryParam("topicName") String topicName, @Context ContainerRequestContext requestContext) {
+    kafkaHermesConsistencyService.removeTopic(
+        topicName, new HermesSecurityAwareRequestUser(requestContext));
+    return Response.ok().build();
+  }
 
-    @GET
-    @Produces({APPLICATION_JSON})
-    @Path("/groups")
-    public Response listAllGroups() {
-        Set<String> groupNames = dcConsistencyService.listAllGroupNames();
-        return Response.ok()
-                .entity(new GenericEntity<Set<String>>(groupNames) {
-                })
-                .build();
-    }
+  @GET
+  @Produces({APPLICATION_JSON})
+  @Path("/groups")
+  public Response listAllGroups() {
+    Set<String> groupNames = dcConsistencyService.listAllGroupNames();
+    return Response.ok().entity(new GenericEntity<Set<String>>(groupNames) {}).build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsoleEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsoleEndpoint.java
index e2b4fa5288..b31f3e6e68 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsoleEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsoleEndpoint.java
@@ -14,26 +14,26 @@
 @Api(value = "/", description = "Hermes console")
 public class ConsoleEndpoint {
 
-    private ConsoleService service;
+  private ConsoleService service;
 
-    public ConsoleEndpoint(ConsoleService service) {
-        this.service = service;
-    }
+  public ConsoleEndpoint(ConsoleService service) {
+    this.service = service;
+  }
 
-    @GET
-    @Path("/console")
-    @Produces("application/javascript")
-    @ApiOperation(value = "Hermes console configuration", httpMethod = HttpMethod.GET)
-    @Deprecated
-    public String getConfiguration() {
-        return service.getConfiguration();
-    }
+  @GET
+  @Path("/console")
+  @Produces("application/javascript")
+  @ApiOperation(value = "Hermes console configuration", httpMethod = HttpMethod.GET)
+  @Deprecated
+  public String getConfiguration() {
+    return service.getConfiguration();
+  }
 
-    @GET
-    @Path("/console")
-    @Produces("application/json")
-    @ApiOperation(value = "Hermes console configuration", httpMethod = HttpMethod.GET)
-    public String getConfigurationJson() {
-        return service.getConfigurationJson();
-    }
+  @GET
+  @Path("/console")
+  @Produces("application/json")
+  @ApiOperation(value = "Hermes console configuration", httpMethod = HttpMethod.GET)
+  public String getConfigurationJson() {
+    return service.getConfigurationJson();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/CorsFilter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/CorsFilter.java
index 0cc80867fe..7247f47692 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/CorsFilter.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/CorsFilter.java
@@ -11,27 +11,27 @@
 @Provider
 public class CorsFilter implements ContainerResponseFilter {
 
-    private final CorsProperties corsProperties;
+  private final CorsProperties corsProperties;
 
-    @Autowired
-    public CorsFilter(CorsProperties corsProperties) {
-        this.corsProperties = corsProperties;
-    }
+  @Autowired
+  public CorsFilter(CorsProperties corsProperties) {
+    this.corsProperties = corsProperties;
+  }
 
-    @Override
-    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) {
-        MultivaluedMap<String, Object> headers = responseContext.getHeaders();
-        headers.add("Access-Control-Allow-Origin", corsProperties.getAllowedOrigin());
-        headers.add("Access-Control-Allow-Methods", "POST,PUT,GET,HEAD,DELETE");
-        headers.add("Access-Control-Max-Age", "1209600");
-        headers.addAll(
-                "Access-Control-Allow-Headers",
-                "X-Requested-With",
-                "Content-Type",
-                "Accept",
-                "Origin",
-                "Authorization",
-                "Hermes-Admin-Password"
-        );
-    }
+  @Override
+  public void filter(
+      ContainerRequestContext requestContext, ContainerResponseContext responseContext) {
+    MultivaluedMap<String, Object> headers = responseContext.getHeaders();
+    headers.add("Access-Control-Allow-Origin", corsProperties.getAllowedOrigin());
+    headers.add("Access-Control-Allow-Methods", "POST,PUT,GET,HEAD,DELETE");
+    headers.add("Access-Control-Max-Age", "1209600");
+    headers.addAll(
+        "Access-Control-Allow-Headers",
+        "X-Requested-With",
+        "Content-Type",
+        "Accept",
+        "Origin",
+        "Authorization",
+        "Hermes-Admin-Password");
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/FilterEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/FilterEndpoint.java
index 104eaa6553..446d4ab725 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/FilterEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/FilterEndpoint.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
@@ -11,23 +13,21 @@
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.management.domain.filtering.FilteringService;
 
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Component
 @Path("filters")
 public class FilterEndpoint {
-    private final FilteringService filteringService;
+  private final FilteringService filteringService;
 
-    public FilterEndpoint(FilteringService filteringService) {
-        this.filteringService = filteringService;
-    }
+  public FilterEndpoint(FilteringService filteringService) {
+    this.filteringService = filteringService;
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    public MessageFiltersVerificationResult verify(@PathParam("topicName") String qualifiedTopicName,
-                                                   MessageFiltersVerificationInput input) {
-        return filteringService.verify(input, TopicName.fromQualifiedName(qualifiedTopicName));
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/{topicName}")
+  public MessageFiltersVerificationResult verify(
+      @PathParam("topicName") String qualifiedTopicName, MessageFiltersVerificationInput input) {
+    return filteringService.verify(input, TopicName.fromQualifiedName(qualifiedTopicName));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/GroupsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/GroupsEndpoint.java
index 58a0663ae7..b0a9ae82a5 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/GroupsEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/GroupsEndpoint.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jakarta.annotation.security.RolesAllowed;
@@ -15,6 +17,7 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.Group;
@@ -25,83 +28,81 @@
 import pl.allegro.tech.hermes.management.api.validator.ApiPreconditions;
 import pl.allegro.tech.hermes.management.domain.group.GroupService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Component
 @Path("/groups")
 @Api(value = "/groups", description = "Operations on groups")
 public class GroupsEndpoint {
 
-    private final GroupService groupService;
+  private final GroupService groupService;
 
-    private final ApiPreconditions preconditions;
+  private final ApiPreconditions preconditions;
 
-    private final ManagementRights managementRights;
+  private final ManagementRights managementRights;
 
-    @Autowired
-    public GroupsEndpoint(GroupService groupService,
-                          ApiPreconditions preconditions,
-                          ManagementRights managementRights) {
-        this.groupService = groupService;
-        this.preconditions = preconditions;
-        this.managementRights = managementRights;
-    }
+  @Autowired
+  public GroupsEndpoint(
+      GroupService groupService,
+      ApiPreconditions preconditions,
+      ManagementRights managementRights) {
+    this.groupService = groupService;
+    this.preconditions = preconditions;
+    this.managementRights = managementRights;
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "List groups", response = List.class, httpMethod = HttpMethod.GET)
-    public List<String> list() {
-        return groupService.listGroupNames();
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "List groups", response = List.class, httpMethod = HttpMethod.GET)
+  public List<String> list() {
+    return groupService.listGroupNames();
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{groupName}")
-    @ApiOperation(value = "Get group details", response = Group.class, httpMethod = HttpMethod.GET)
-    public Group get(@PathParam("groupName") String groupName) {
-        return groupService.getGroupDetails(groupName);
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{groupName}")
+  @ApiOperation(value = "Get group details", response = Group.class, httpMethod = HttpMethod.GET)
+  public Group get(@PathParam("groupName") String groupName) {
+    return groupService.getGroupDetails(groupName);
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Create group", response = String.class, httpMethod = HttpMethod.POST)
-    @RolesAllowed(Roles.ANY)
-    public Response create(Group group, @Context ContainerRequestContext requestContext) {
-        preconditions.checkConstraints(group, false);
-        groupService.createGroup(
-                group,
-                new HermesSecurityAwareRequestUser(requestContext),
-                managementRights.getGroupCreatorRights(requestContext)
-        );
-        return Response.status(Response.Status.CREATED).build();
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "Create group", response = String.class, httpMethod = HttpMethod.POST)
+  @RolesAllowed(Roles.ANY)
+  public Response create(Group group, @Context ContainerRequestContext requestContext) {
+    preconditions.checkConstraints(group, false);
+    groupService.createGroup(
+        group,
+        new HermesSecurityAwareRequestUser(requestContext),
+        managementRights.getGroupCreatorRights(requestContext));
+    return Response.status(Response.Status.CREATED).build();
+  }
 
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{groupName}")
-    @ApiOperation(value = "Update group", response = String.class, httpMethod = HttpMethod.PUT)
-    @RolesAllowed(Roles.ADMIN)
-    public Response update(@PathParam("groupName") String groupName,
-                           PatchData patch,
-                           @Context ContainerRequestContext requestContext) {
-        groupService.updateGroup(groupName, patch, new HermesSecurityAwareRequestUser(requestContext));
-        return responseStatus(Response.Status.NO_CONTENT);
-    }
+  @PUT
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/{groupName}")
+  @ApiOperation(value = "Update group", response = String.class, httpMethod = HttpMethod.PUT)
+  @RolesAllowed(Roles.ADMIN)
+  public Response update(
+      @PathParam("groupName") String groupName,
+      PatchData patch,
+      @Context ContainerRequestContext requestContext) {
+    groupService.updateGroup(groupName, patch, new HermesSecurityAwareRequestUser(requestContext));
+    return responseStatus(Response.Status.NO_CONTENT);
+  }
 
-    @DELETE
-    @Path("/{groupName}")
-    @ApiOperation(value = "Remove group", response = String.class, httpMethod = HttpMethod.DELETE)
-    @RolesAllowed(Roles.ANY)
-    public Response delete(@PathParam("groupName") String groupName, @Context ContainerRequestContext requestContext) {
-        groupService.removeGroup(groupName, new HermesSecurityAwareRequestUser(requestContext));
-        return responseStatus(Response.Status.OK);
-    }
+  @DELETE
+  @Path("/{groupName}")
+  @ApiOperation(value = "Remove group", response = String.class, httpMethod = HttpMethod.DELETE)
+  @RolesAllowed(Roles.ANY)
+  public Response delete(
+      @PathParam("groupName") String groupName, @Context ContainerRequestContext requestContext) {
+    groupService.removeGroup(groupName, new HermesSecurityAwareRequestUser(requestContext));
+    return responseStatus(Response.Status.OK);
+  }
 
-    private Response responseStatus(Response.Status responseStatus) {
-        return Response.status(responseStatus).build();
-    }
+  private Response responseStatus(Response.Status responseStatus) {
+    return Response.status(responseStatus).build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/MetricsDashboardUrlEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/MetricsDashboardUrlEndpoint.java
index 9491e193d8..6d71dbf1b2 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/MetricsDashboardUrlEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/MetricsDashboardUrlEndpoint.java
@@ -1,10 +1,13 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Response;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -13,52 +16,53 @@
 import pl.allegro.tech.hermes.management.domain.MetricsDashboardUrl;
 import pl.allegro.tech.hermes.management.domain.MetricsDashboardUrlService;
 
-import java.util.Optional;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Component
 @Path("/dashboards")
 public class MetricsDashboardUrlEndpoint {
 
-    private static final Logger logger = LoggerFactory.getLogger(MetricsDashboardUrlEndpoint.class);
+  private static final Logger logger = LoggerFactory.getLogger(MetricsDashboardUrlEndpoint.class);
 
-    private final Optional<MetricsDashboardUrlService> metricsDashboardUrlService;
+  private final Optional<MetricsDashboardUrlService> metricsDashboardUrlService;
 
-    MetricsDashboardUrlEndpoint(Optional<MetricsDashboardUrlService> metricsDashboardUrlService) {
-        if (metricsDashboardUrlService.isEmpty()) {
-            logger.info("Dashboards url bean is absent");
-        }
-        this.metricsDashboardUrlService = metricsDashboardUrlService;
+  MetricsDashboardUrlEndpoint(Optional<MetricsDashboardUrlService> metricsDashboardUrlService) {
+    if (metricsDashboardUrlService.isEmpty()) {
+      logger.info("Dashboards url bean is absent");
     }
+    this.metricsDashboardUrlService = metricsDashboardUrlService;
+  }
 
-    @GET
-    @Path("/topics/{topic}")
-    @Produces(APPLICATION_JSON)
-    public Response fetchUrlForTopic(@PathParam("topic") String topic) {
-        return metricsDashboardUrlService
-                .map(service -> Response.ok(new MetricsDashboardUrl(service.getUrlForTopic(topic))).build())
-                .orElseThrow(MetricsDashboardUrlEndpoint.MetricsDashboardUrlAbsentException::new);
-    }
+  @GET
+  @Path("/topics/{topic}")
+  @Produces(APPLICATION_JSON)
+  public Response fetchUrlForTopic(@PathParam("topic") String topic) {
+    return metricsDashboardUrlService
+        .map(service -> Response.ok(new MetricsDashboardUrl(service.getUrlForTopic(topic))).build())
+        .orElseThrow(MetricsDashboardUrlEndpoint.MetricsDashboardUrlAbsentException::new);
+  }
 
-    @GET
-    @Path("/topics/{topic}/subscriptions/{subscription}")
-    @Produces(APPLICATION_JSON)
-    public Response fetchUrlForSubscription(@PathParam("topic") String topic, @PathParam("subscription") String subscription) {
-        return metricsDashboardUrlService
-                .map(service -> Response.ok(new MetricsDashboardUrl(service.getUrlForSubscription(topic, subscription))).build())
-                .orElseThrow(MetricsDashboardUrlEndpoint.MetricsDashboardUrlAbsentException::new);
-    }
+  @GET
+  @Path("/topics/{topic}/subscriptions/{subscription}")
+  @Produces(APPLICATION_JSON)
+  public Response fetchUrlForSubscription(
+      @PathParam("topic") String topic, @PathParam("subscription") String subscription) {
+    return metricsDashboardUrlService
+        .map(
+            service ->
+                Response.ok(
+                        new MetricsDashboardUrl(service.getUrlForSubscription(topic, subscription)))
+                    .build())
+        .orElseThrow(MetricsDashboardUrlEndpoint.MetricsDashboardUrlAbsentException::new);
+  }
 
-    private static class MetricsDashboardUrlAbsentException extends ManagementException {
+  private static class MetricsDashboardUrlAbsentException extends ManagementException {
 
-        MetricsDashboardUrlAbsentException() {
-            super("Dashboard url implementation is absent");
-        }
+    MetricsDashboardUrlAbsentException() {
+      super("Dashboard url implementation is absent");
+    }
 
-        @Override
-        public ErrorCode getCode() {
-            return ErrorCode.IMPLEMENTATION_ABSENT;
-        }
+    @Override
+    public ErrorCode getCode() {
+      return ErrorCode.IMPLEMENTATION_ABSENT;
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java
index b8abc1c208..e3fdb8d5b0 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_ONLY_ADMIN;
+import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_WRITE;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jakarta.annotation.security.RolesAllowed;
@@ -14,48 +19,46 @@
 import pl.allegro.tech.hermes.management.api.auth.Roles;
 import pl.allegro.tech.hermes.management.domain.mode.ModeService;
 
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_ONLY_ADMIN;
-import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_WRITE;
-
 @Component
 @Path("/mode")
 @Api(value = "/mode", description = "Operations on management mode")
 public class ModeEndpoint {
 
-    private final ModeService modeService;
+  private final ModeService modeService;
 
-    public ModeEndpoint(ModeService modeService) {
-        this.modeService = modeService;
-    }
+  public ModeEndpoint(ModeService modeService) {
+    this.modeService = modeService;
+  }
 
-    @GET
-    @Produces(TEXT_PLAIN)
-    @ApiOperation(value = "Get management mode", response = String.class, httpMethod = HttpMethod.GET)
-    public String getMode() {
-        return modeService.getMode().toString();
-    }
+  @GET
+  @Produces(TEXT_PLAIN)
+  @ApiOperation(value = "Get management mode", response = String.class, httpMethod = HttpMethod.GET)
+  public String getMode() {
+    return modeService.getMode().toString();
+  }
 
-    @POST
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Set management mode", response = String.class, httpMethod = HttpMethod.POST)
-    @RolesAllowed(Roles.ADMIN)
-    public Response setMode(@QueryParam("mode") String mode) {
-        if (mode == null) {
-            return Response.status(Response.Status.BAD_REQUEST).build();
-        }
-        switch (mode) {
-            case ModeService.READ_WRITE:
-                modeService.setModeByAdmin(READ_WRITE);
-                break;
-            case ModeService.READ_ONLY:
-            case ModeService.READ_ONLY_ADMIN:
-                modeService.setModeByAdmin(READ_ONLY_ADMIN);
-                break;
-            default:
-                return Response.status(Response.Status.BAD_REQUEST).build();
-        }
-        return Response.status(Response.Status.OK).build();
+  @POST
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(
+      value = "Set management mode",
+      response = String.class,
+      httpMethod = HttpMethod.POST)
+  @RolesAllowed(Roles.ADMIN)
+  public Response setMode(@QueryParam("mode") String mode) {
+    if (mode == null) {
+      return Response.status(Response.Status.BAD_REQUEST).build();
+    }
+    switch (mode) {
+      case ModeService.READ_WRITE:
+        modeService.setModeByAdmin(READ_WRITE);
+        break;
+      case ModeService.READ_ONLY:
+      case ModeService.READ_ONLY_ADMIN:
+        modeService.setModeByAdmin(READ_ONLY_ADMIN);
+        break;
+      default:
+        return Response.status(Response.Status.BAD_REQUEST).build();
     }
+    return Response.status(Response.Status.OK).build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OAuthProvidersEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OAuthProvidersEndpoint.java
index c4daf90171..06316bd363 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OAuthProvidersEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OAuthProvidersEndpoint.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.status;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jakarta.annotation.security.RolesAllowed;
@@ -15,6 +18,7 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.OAuthProvider;
@@ -23,69 +27,69 @@
 import pl.allegro.tech.hermes.management.api.auth.Roles;
 import pl.allegro.tech.hermes.management.domain.oauth.OAuthProviderService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.Response.status;
-
 @Component
 @Path("/oauth/providers")
 @Api(value = "/oauth/providers", description = "Operations on OAuth providers")
 public class OAuthProvidersEndpoint {
 
-    private final OAuthProviderService service;
+  private final OAuthProviderService service;
 
-    @Autowired
-    public OAuthProvidersEndpoint(OAuthProviderService service) {
-        this.service = service;
-    }
+  @Autowired
+  public OAuthProvidersEndpoint(OAuthProviderService service) {
+    this.service = service;
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "List OAuth providers", httpMethod = HttpMethod.GET)
-    public List<String> list() {
-        return service.listOAuthProviderNames();
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "List OAuth providers", httpMethod = HttpMethod.GET)
+  public List<String> list() {
+    return service.listOAuthProviderNames();
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{oAuthProviderName}")
-    @ApiOperation(value = "OAuth provider details", httpMethod = HttpMethod.GET)
-    public OAuthProvider get(@PathParam("oAuthProviderName") String oAuthProviderName) {
-        return service.getOAuthProviderDetails(oAuthProviderName);
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{oAuthProviderName}")
+  @ApiOperation(value = "OAuth provider details", httpMethod = HttpMethod.GET)
+  public OAuthProvider get(@PathParam("oAuthProviderName") String oAuthProviderName) {
+    return service.getOAuthProviderDetails(oAuthProviderName);
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ADMIN)
-    @ApiOperation(value = "Create OAuth provider", httpMethod = HttpMethod.POST)
-    public Response create(OAuthProvider oAuthProvider,
-                           @Context ContainerRequestContext requestContext) {
-        service.createOAuthProvider(oAuthProvider, new HermesSecurityAwareRequestUser(requestContext));
-        return status(Response.Status.CREATED).build();
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ADMIN)
+  @ApiOperation(value = "Create OAuth provider", httpMethod = HttpMethod.POST)
+  public Response create(
+      OAuthProvider oAuthProvider, @Context ContainerRequestContext requestContext) {
+    service.createOAuthProvider(oAuthProvider, new HermesSecurityAwareRequestUser(requestContext));
+    return status(Response.Status.CREATED).build();
+  }
 
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ADMIN)
-    @Path("/{oAuthProviderName}")
-    @ApiOperation(value = "Update OAuth provider", httpMethod = HttpMethod.PUT)
-    public Response update(@PathParam("oAuthProviderName") String oAuthProviderName, PatchData patch,
-                           @Context ContainerRequestContext requestContext) {
-        service.updateOAuthProvider(oAuthProviderName, patch, new HermesSecurityAwareRequestUser(requestContext));
-        return status(Response.Status.OK).build();
-    }
+  @PUT
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ADMIN)
+  @Path("/{oAuthProviderName}")
+  @ApiOperation(value = "Update OAuth provider", httpMethod = HttpMethod.PUT)
+  public Response update(
+      @PathParam("oAuthProviderName") String oAuthProviderName,
+      PatchData patch,
+      @Context ContainerRequestContext requestContext) {
+    service.updateOAuthProvider(
+        oAuthProviderName, patch, new HermesSecurityAwareRequestUser(requestContext));
+    return status(Response.Status.OK).build();
+  }
 
-    @DELETE
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ADMIN)
-    @Path("/{oAuthProviderName}")
-    @ApiOperation(value = "Remove OAuth provider", httpMethod = HttpMethod.DELETE)
-    public Response remove(@PathParam("oAuthProviderName") String oAuthProviderName,
-                           @Context ContainerRequestContext requestContext) {
-        service.removeOAuthProvider(oAuthProviderName, new HermesSecurityAwareRequestUser(requestContext));
-        return status(Response.Status.OK).build();
-    }
+  @DELETE
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ADMIN)
+  @Path("/{oAuthProviderName}")
+  @ApiOperation(value = "Remove OAuth provider", httpMethod = HttpMethod.DELETE)
+  public Response remove(
+      @PathParam("oAuthProviderName") String oAuthProviderName,
+      @Context ContainerRequestContext requestContext) {
+    service.removeOAuthProvider(
+        oAuthProviderName, new HermesSecurityAwareRequestUser(requestContext));
+    return status(Response.Status.OK).build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineClientsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineClientsEndpoint.java
index 25bc4d382a..aeb03c99cc 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineClientsEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineClientsEndpoint.java
@@ -1,10 +1,13 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Response;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -14,44 +17,44 @@
 import pl.allegro.tech.hermes.management.domain.clients.IframeSource;
 import pl.allegro.tech.hermes.management.domain.clients.OfflineClientsService;
 
-import java.util.Optional;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Component
 @Path("/topics")
 public class OfflineClientsEndpoint {
 
-    private static final Logger logger = LoggerFactory.getLogger(OfflineClientsEndpoint.class);
+  private static final Logger logger = LoggerFactory.getLogger(OfflineClientsEndpoint.class);
 
-    private final Optional<OfflineClientsService> offlineClientsService;
+  private final Optional<OfflineClientsService> offlineClientsService;
 
-    OfflineClientsEndpoint(Optional<OfflineClientsService> offlineClientsService) {
-        if (!offlineClientsService.isPresent()) {
-            logger.info("Offline clients bean is absent");
-        }
-        this.offlineClientsService = offlineClientsService;
+  OfflineClientsEndpoint(Optional<OfflineClientsService> offlineClientsService) {
+    if (!offlineClientsService.isPresent()) {
+      logger.info("Offline clients bean is absent");
     }
-
-    @GET
-    @Path("/{topic}/offline-clients-source")
-    @Produces(APPLICATION_JSON)
-    public Response find(@PathParam("topic") String topic) {
-        return offlineClientsService
-                .map(service -> Response.ok(new IframeSource(service.getIframeSource(TopicName.fromQualifiedName(topic)))).build())
-                .orElseThrow(OfflineClientsServiceAbsentException::new);
+    this.offlineClientsService = offlineClientsService;
+  }
+
+  @GET
+  @Path("/{topic}/offline-clients-source")
+  @Produces(APPLICATION_JSON)
+  public Response find(@PathParam("topic") String topic) {
+    return offlineClientsService
+        .map(
+            service ->
+                Response.ok(
+                        new IframeSource(
+                            service.getIframeSource(TopicName.fromQualifiedName(topic))))
+                    .build())
+        .orElseThrow(OfflineClientsServiceAbsentException::new);
+  }
+
+  private static class OfflineClientsServiceAbsentException extends ManagementException {
+
+    OfflineClientsServiceAbsentException() {
+      super("Offline clients implementation is absent");
     }
 
-    private static class OfflineClientsServiceAbsentException extends ManagementException {
-
-        OfflineClientsServiceAbsentException() {
-            super("Offline clients implementation is absent");
-        }
-
-        @Override
-        public ErrorCode getCode() {
-            return ErrorCode.IMPLEMENTATION_ABSENT;
-        }
+    @Override
+    public ErrorCode getCode() {
+      return ErrorCode.IMPLEMENTATION_ABSENT;
     }
+  }
 }
-
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineRetransmissionEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineRetransmissionEndpoint.java
index 2349656f48..1b3fe564a8 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineRetransmissionEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineRetransmissionEndpoint.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import io.swagger.annotations.Api;
 import jakarta.validation.Valid;
 import jakarta.ws.rs.Consumes;
@@ -12,93 +14,118 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
 import pl.allegro.tech.hermes.api.OfflineRetransmissionTask;
-import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.domain.topic.TopicRepository;
 import pl.allegro.tech.hermes.management.api.auth.ManagementRights;
 import pl.allegro.tech.hermes.management.domain.PermissionDeniedException;
 import pl.allegro.tech.hermes.management.domain.retransmit.OfflineRetransmissionService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Component
 @Path("offline-retransmission/tasks")
 @Api(value = "offline-retransmission/tasks", description = "Offline retransmission operations")
 public class OfflineRetransmissionEndpoint {
 
-    private final OfflineRetransmissionService retransmissionService;
-    private final RetransmissionPermissions permissions;
-    private final OfflineRetransmissionAuditor auditor;
-
-    public OfflineRetransmissionEndpoint(OfflineRetransmissionService retransmissionService,
-                                         TopicRepository topicRepository, ManagementRights managementRights) {
-        this.retransmissionService = retransmissionService;
-        this.permissions = new RetransmissionPermissions(topicRepository, managementRights);
-        this.auditor = new OfflineRetransmissionAuditor();
+  private final OfflineRetransmissionService retransmissionService;
+  private final RetransmissionPermissions permissions;
+  private final OfflineRetransmissionAuditor auditor;
+  private final Logger logger = LoggerFactory.getLogger(OfflineRetransmissionEndpoint.class);
+
+  public OfflineRetransmissionEndpoint(
+      OfflineRetransmissionService retransmissionService,
+      TopicRepository topicRepository,
+      ManagementRights managementRights) {
+    this.retransmissionService = retransmissionService;
+    this.permissions = new RetransmissionPermissions(topicRepository, managementRights);
+    this.auditor = new OfflineRetransmissionAuditor();
+  }
+
+  @POST
+  @Consumes(APPLICATION_JSON)
+  public Response createRetransmissionTask(
+      @Valid OfflineRetransmissionRequest request,
+      @Context ContainerRequestContext requestContext) {
+    logger.info("Offline retransmission request: {}", request);
+    retransmissionService.validateRequest(request);
+    permissions.ensurePermissions(request, requestContext);
+    var task = retransmissionService.createTask(request);
+    auditor.auditRetransmissionCreation(request, requestContext, task);
+    return Response.status(Response.Status.CREATED).build();
+  }
+
+  @GET
+  @Produces(APPLICATION_JSON)
+  public List<OfflineRetransmissionTask> getAllRetransmissionTasks() {
+    return retransmissionService.getAllTasks();
+  }
+
+  @DELETE
+  @Path("/{taskId}")
+  public Response deleteRetransmissionTask(@PathParam("taskId") String taskId) {
+    retransmissionService.deleteTask(taskId);
+    return Response.status(Response.Status.OK).build();
+  }
+
+  private static class RetransmissionPermissions {
+    private final Logger logger = LoggerFactory.getLogger(RetransmissionPermissions.class);
+    private final TopicRepository topicRepository;
+    private final ManagementRights managementRights;
+
+    private RetransmissionPermissions(
+        TopicRepository topicRepository, ManagementRights managementRights) {
+      this.topicRepository = topicRepository;
+      this.managementRights = managementRights;
     }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    public Response createRetransmissionTask(@Valid OfflineRetransmissionRequest request, @Context ContainerRequestContext requestContext) {
-        retransmissionService.validateRequest(request);
-        permissions.ensurePermissionsToBothTopics(request, requestContext);
-        retransmissionService.createTask(request);
-        auditor.auditRetransmissionCreation(request, requestContext);
-        return Response.status(Response.Status.CREATED).build();
+    private void ensurePermissions(
+        OfflineRetransmissionRequest request, ContainerRequestContext requestContext) {
+      var targetTopic =
+          topicRepository.getTopicDetails(TopicName.fromQualifiedName(request.getTargetTopic()));
+      var hasPermissions =
+          validateSourceTopic(request.getSourceTopic(), requestContext)
+              && managementRights.isUserAllowedToManageTopic(targetTopic, requestContext);
+      if (!hasPermissions) {
+        logger.info(
+            "User {} has no permissions to make offline retransmission {}",
+            requestContext.getSecurityContext().getUserPrincipal(),
+            request);
+        throw new PermissionDeniedException("User needs permissions to source and target topics.");
+      }
     }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    public List<OfflineRetransmissionTask> getAllRetransmissionTasks() {
-        return retransmissionService.getAllTasks();
+    private boolean validateSourceTopic(
+        Optional<String> sourceTopic, ContainerRequestContext requestContext) {
+      return sourceTopic.isEmpty()
+          || managementRights.isUserAllowedToManageTopic(
+              topicRepository.getTopicDetails(TopicName.fromQualifiedName(sourceTopic.get())),
+              requestContext);
     }
-
-    @DELETE
-    @Path("/{taskId}")
-    public Response deleteRetransmissionTask(@PathParam("taskId") String taskId) {
-        retransmissionService.deleteTask(taskId);
-        return Response.status(Response.Status.OK).build();
+  }
+
+  private static class OfflineRetransmissionAuditor {
+    private static final Logger logger =
+        LoggerFactory.getLogger(OfflineRetransmissionAuditor.class);
+
+    public void auditRetransmissionCreation(
+        OfflineRetransmissionRequest request,
+        ContainerRequestContext requestContext,
+        OfflineRetransmissionTask task) {
+      String username = extractUsername(requestContext);
+      logger.info(
+          "User {} created offline retransmission task: {}, taskId: {}",
+          username,
+          request,
+          task.getTaskId());
     }
 
-    private static class RetransmissionPermissions {
-        private final TopicRepository topicRepository;
-        private final ManagementRights managementRights;
-
-
-        private RetransmissionPermissions(TopicRepository topicRepository, ManagementRights managementRights) {
-            this.topicRepository = topicRepository;
-            this.managementRights = managementRights;
-        }
-
-        private void ensurePermissionsToBothTopics(OfflineRetransmissionRequest request, ContainerRequestContext requestContext) {
-            Topic sourceTopic = topicRepository.getTopicDetails(TopicName.fromQualifiedName(request.getSourceTopic()));
-            Topic targetTopic = topicRepository.getTopicDetails(TopicName.fromQualifiedName(request.getTargetTopic()));
-            boolean hasPermissions = managementRights.isUserAllowedToManageTopic(sourceTopic, requestContext)
-                    && managementRights.isUserAllowedToManageTopic(targetTopic, requestContext);
-            if (!hasPermissions) {
-                throw new PermissionDeniedException("User needs permissions to source and target topics.");
-            }
-        }
-    }
-
-    private static class OfflineRetransmissionAuditor {
-        private static final Logger logger = LoggerFactory.getLogger(OfflineRetransmissionAuditor.class);
-
-        public void auditRetransmissionCreation(OfflineRetransmissionRequest request, ContainerRequestContext requestContext) {
-            String username = extractUsername(requestContext);
-            logger.info("User {} created retransmission task: {}", username, request);
-        }
-
-        private String extractUsername(ContainerRequestContext requestContext) {
-            return requestContext.getSecurityContext().getUserPrincipal().getName();
-        }
+    private String extractUsername(ContainerRequestContext requestContext) {
+      return requestContext.getSecurityContext().getUserPrincipal().getName();
     }
+  }
 }
-
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OwnersEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OwnersEndpoint.java
index e6b9cb7ccc..225d1e6ab6 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OwnersEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OwnersEndpoint.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -9,6 +11,9 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.Owner;
@@ -16,76 +21,73 @@
 import pl.allegro.tech.hermes.management.domain.owner.OwnerSourceNotFound;
 import pl.allegro.tech.hermes.management.domain.owner.OwnerSources;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Component
 @Path("/owners")
 @Api(value = "/owners", description = "Provides owners information")
 public class OwnersEndpoint {
 
-    private final OwnerSources ownerSources;
-
-    @Autowired
-    public OwnersEndpoint(OwnerSources ownerSources) {
-        this.ownerSources = ownerSources;
+  private final OwnerSources ownerSources;
+
+  @Autowired
+  public OwnersEndpoint(OwnerSources ownerSources) {
+    this.ownerSources = ownerSources;
+  }
+
+  @GET
+  @Path("/sources/{source}")
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(
+      value = "Lists owners from the given source matching the search string",
+      response = List.class,
+      httpMethod = HttpMethod.GET)
+  public List<Owner> search(
+      @PathParam("source") String source, @QueryParam("search") String searchString) {
+    return ownerSources.getAutocompletionFor(source).ownersMatching(searchString);
+  }
+
+  @GET
+  @Path("/sources/{source}/{id}")
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(
+      value = "Returns owner from the given source of the given id",
+      response = List.class,
+      httpMethod = HttpMethod.GET)
+  public Owner get(@PathParam("source") String source, @PathParam("id") String id) {
+    return ownerSources
+        .getByName(source)
+        .map(s -> s.get(id))
+        .orElseThrow(() -> new OwnerSourceNotFound(source));
+  }
+
+  @GET
+  @Path("/sources")
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "Lists owner sources", response = List.class, httpMethod = HttpMethod.GET)
+  public List<SourceDescriptor> listSources() {
+    return StreamSupport.stream(ownerSources.spliterator(), false)
+        .map(SourceDescriptor::of)
+        .collect(Collectors.toList());
+  }
+
+  private static class SourceDescriptor {
+
+    @JsonProperty("name")
+    private final String name;
+
+    @JsonProperty("autocomplete")
+    private final boolean autocomplete;
+
+    @JsonProperty("deprecated")
+    private final boolean deprecated;
+
+    private SourceDescriptor(OwnerSource source) {
+      this.name = source.name();
+      this.autocomplete = source.autocompletion().isPresent();
+      this.deprecated = source.isDeprecated();
     }
 
-    @GET
-    @Path("/sources/{source}")
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Lists owners from the given source matching the search string",
-            response = List.class, httpMethod = HttpMethod.GET)
-    public List<Owner> search(@PathParam("source") String source,
-                              @QueryParam("search") String searchString) {
-        return ownerSources.getAutocompletionFor(source).ownersMatching(searchString);
+    static SourceDescriptor of(OwnerSource source) {
+      return new SourceDescriptor(source);
     }
-
-    @GET
-    @Path("/sources/{source}/{id}")
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Returns owner from the given source of the given id", response = List.class, httpMethod = HttpMethod.GET)
-    public Owner get(@PathParam("source") String source,
-                     @PathParam("id") String id) {
-        return ownerSources.getByName(source)
-                .map(s -> s.get(id))
-                .orElseThrow(() -> new OwnerSourceNotFound(source));
-    }
-
-    @GET
-    @Path("/sources")
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Lists owner sources", response = List.class, httpMethod = HttpMethod.GET)
-    public List<SourceDescriptor> listSources() {
-        return StreamSupport.stream(ownerSources.spliterator(), false)
-                .map(SourceDescriptor::of)
-                .collect(Collectors.toList());
-    }
-
-    private static class SourceDescriptor {
-
-        @JsonProperty("name")
-        private final String name;
-
-        @JsonProperty("autocomplete")
-        private final boolean autocomplete;
-
-        @JsonProperty("deprecated")
-        private final boolean deprecated;
-
-        private SourceDescriptor(OwnerSource source) {
-            this.name = source.name();
-            this.autocomplete = source.autocompletion().isPresent();
-            this.deprecated = source.isDeprecated();
-        }
-
-        static SourceDescriptor of(OwnerSource source) {
-            return new SourceDescriptor(source);
-        }
-
-    }
-
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/QueryEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/QueryEndpoint.java
index c7c8bf183d..fc895347db 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/QueryEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/QueryEndpoint.java
@@ -1,9 +1,12 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.Group;
@@ -16,63 +19,62 @@
 import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService;
 import pl.allegro.tech.hermes.management.domain.topic.TopicService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Path("query")
 @Component
 public class QueryEndpoint {
 
-    private final SubscriptionService subscriptionService;
-    private final TopicService topicService;
-    private final GroupService groupService;
-
-    @Autowired
-    public QueryEndpoint(SubscriptionService subscriptionService, TopicService topicService, GroupService groupService) {
-        this.subscriptionService = subscriptionService;
-        this.topicService = topicService;
-        this.groupService = groupService;
-    }
+  private final SubscriptionService subscriptionService;
+  private final TopicService topicService;
+  private final GroupService groupService;
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/groups")
-    public List<Group> queryGroups(Query<Group> query) {
-        return groupService.queryGroup(query);
-    }
+  @Autowired
+  public QueryEndpoint(
+      SubscriptionService subscriptionService,
+      TopicService topicService,
+      GroupService groupService) {
+    this.subscriptionService = subscriptionService;
+    this.topicService = topicService;
+    this.groupService = groupService;
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/topics")
-    public List<Topic> queryTopics(Query<Topic> query) {
-        return topicService.queryTopic(query);
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/groups")
+  public List<Group> queryGroups(Query<Group> query) {
+    return groupService.queryGroup(query);
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/subscriptions")
-    public List<Subscription> querySubscriptions(Query<Subscription> query) {
-        return subscriptionService.querySubscription(query);
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/topics")
+  public List<Topic> queryTopics(Query<Topic> query) {
+    return topicService.queryTopic(query);
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/topics/metrics")
-    public List<TopicNameWithMetrics> queryTopicsMetrics(Query<TopicNameWithMetrics> query) {
-        return topicService.queryTopicsMetrics(query);
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/subscriptions")
+  public List<Subscription> querySubscriptions(Query<Subscription> query) {
+    return subscriptionService.querySubscription(query);
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("subscriptions/metrics")
-    public List<SubscriptionNameWithMetrics> querySubscriptionsMetrics(Query<SubscriptionNameWithMetrics> query) {
-        return subscriptionService.querySubscriptionsMetrics(query);
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/topics/metrics")
+  public List<TopicNameWithMetrics> queryTopicsMetrics(Query<TopicNameWithMetrics> query) {
+    return topicService.queryTopicsMetrics(query);
+  }
 
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("subscriptions/metrics")
+  public List<SubscriptionNameWithMetrics> querySubscriptionsMetrics(
+      Query<SubscriptionNameWithMetrics> query) {
+    return subscriptionService.querySubscriptionsMetrics(query);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadOnlyFilter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadOnlyFilter.java
index 1a552e6003..369c3a6d37 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadOnlyFilter.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadOnlyFilter.java
@@ -5,54 +5,53 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerRequestFilter;
 import jakarta.ws.rs.ext.Provider;
+import java.io.IOException;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import pl.allegro.tech.hermes.management.api.auth.AuthorizationFilter;
 import pl.allegro.tech.hermes.management.api.auth.Roles;
 import pl.allegro.tech.hermes.management.domain.mode.ModeService;
 
-import java.io.IOException;
-
 @Provider
 @Priority(AuthorizationFilter.AUTHORIZATION_FILTER_PRIORITY + 2)
 public class ReadOnlyFilter implements ContainerRequestFilter {
-    private static final String READ_ONLY_ERROR_MESSAGE = "Action forbidden due to read-only mode";
+  private static final String READ_ONLY_ERROR_MESSAGE = "Action forbidden due to read-only mode";
+
+  private final ModeService modeService;
+
+  @Autowired
+  public ReadOnlyFilter(ModeService modeService) {
+    this.modeService = modeService;
+  }
+
+  @Override
+  public void filter(ContainerRequestContext requestContext) throws IOException {
+    if (modeService.isReadOnlyEnabled()) {
+      ContainerRequest req = (ContainerRequest) requestContext.getRequest();
+      if (!isWhitelisted(req) && !isAdmin(requestContext)) {
+        throw new ServiceUnavailableException(READ_ONLY_ERROR_MESSAGE);
+      }
+    }
+  }
 
-    private final ModeService modeService;
+  private boolean isAdmin(ContainerRequestContext requestContext) {
+    return requestContext.getSecurityContext().isUserInRole(Roles.ADMIN);
+  }
 
-    @Autowired
-    public ReadOnlyFilter(ModeService modeService) {
-        this.modeService = modeService;
+  private boolean isWhitelisted(ContainerRequest req) {
+    if (req.getMethod().equals("GET")) {
+      return true;
     }
-
-    @Override
-    public void filter(ContainerRequestContext requestContext) throws IOException {
-        if (modeService.isReadOnlyEnabled()) {
-            ContainerRequest req = (ContainerRequest) requestContext.getRequest();
-            if (!isWhitelisted(req) && !isAdmin(requestContext)) {
-                throw new ServiceUnavailableException(READ_ONLY_ERROR_MESSAGE);
-            }
-        }
+    String requestURI = req.getUriInfo().getPath();
+    if (requestURI.startsWith("/query")) {
+      return true;
     }
-
-    private boolean isAdmin(ContainerRequestContext requestContext) {
-        return requestContext.getSecurityContext().isUserInRole(Roles.ADMIN);
+    if (requestURI.startsWith("/mode")) {
+      return true;
     }
-
-    private boolean isWhitelisted(ContainerRequest req) {
-        if (req.getMethod().equals("GET")) {
-            return true;
-        }
-        String requestURI = req.getUriInfo().getPath();
-        if (requestURI.startsWith("/query")) {
-            return true;
-        }
-        if (requestURI.startsWith("/mode")) {
-            return true;
-        }
-        if (requestURI.startsWith("/topics") && requestURI.endsWith("query")) {
-            return true;
-        }
-        return false;
+    if (requestURI.startsWith("/topics") && requestURI.endsWith("query")) {
+      return true;
     }
+    return false;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadinessEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadinessEndpoint.java
index f8f3b379be..fa181ccd92 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadinessEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadinessEndpoint.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.NOT_READY;
+import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.READY;
+
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
@@ -8,43 +12,39 @@
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.DatacenterReadiness;
 import pl.allegro.tech.hermes.api.Readiness;
 import pl.allegro.tech.hermes.management.api.auth.Roles;
 import pl.allegro.tech.hermes.management.domain.readiness.ReadinessService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.NOT_READY;
-import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.READY;
-
 @Path("readiness/datacenters")
 @Component
 public class ReadinessEndpoint {
 
-    private final ReadinessService readinessService;
-
-    public ReadinessEndpoint(ReadinessService readinessService) {
-        this.readinessService = readinessService;
-    }
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ADMIN)
-    @Path("/{datacenter}")
-    public Response setReadiness(@PathParam("datacenter") String datacenter, Readiness readiness) {
-        readinessService.setReady(new DatacenterReadiness(datacenter, readiness.isReady() ? READY : NOT_READY));
-        return Response.status(Response.Status.ACCEPTED).build();
-    }
-
-    @GET
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ADMIN)
-    public List<DatacenterReadiness> getReadiness() {
-        return readinessService.getDatacentersReadinesses();
-    }
+  private final ReadinessService readinessService;
+
+  public ReadinessEndpoint(ReadinessService readinessService) {
+    this.readinessService = readinessService;
+  }
+
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ADMIN)
+  @Path("/{datacenter}")
+  public Response setReadiness(@PathParam("datacenter") String datacenter, Readiness readiness) {
+    readinessService.setReady(
+        new DatacenterReadiness(datacenter, readiness.isReady() ? READY : NOT_READY));
+    return Response.status(Response.Status.ACCEPTED).build();
+  }
+
+  @GET
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ADMIN)
+  public List<DatacenterReadiness> getReadiness() {
+    return readinessService.getDatacentersReadiness();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/RolesEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/RolesEndpoint.java
index 3ef288a9ed..80e7ea5231 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/RolesEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/RolesEndpoint.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jakarta.ws.rs.GET;
@@ -8,63 +10,61 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.SecurityContext;
-import org.springframework.stereotype.Component;
-import pl.allegro.tech.hermes.management.api.auth.Roles;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.function.Consumer;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import org.springframework.stereotype.Component;
+import pl.allegro.tech.hermes.management.api.auth.Roles;
 
 @Component
 @Path("/roles")
 @Api(value = "/roles", description = "Get user roles for given resource")
 public class RolesEndpoint {
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Get general user roles", httpMethod = HttpMethod.GET)
-    public Collection<String> getRoles(ContainerRequestContext requestContext) {
-        return getRoles(requestContext, Collections.emptyList());
-    }
-
-    private Collection<String> getRoles(ContainerRequestContext requestContext, Collection<String> additionalRoles) {
-        SecurityContext securityContext = requestContext.getSecurityContext();
-        Collection<String> roles = new ArrayList<>();
+  @GET
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "Get general user roles", httpMethod = HttpMethod.GET)
+  public Collection<String> getRoles(ContainerRequestContext requestContext) {
+    return getRoles(requestContext, Collections.emptyList());
+  }
 
-        ifUserInRoleDo(securityContext, Roles.ADMIN, roles::add);
-        ifUserInRoleDo(securityContext, Roles.ANY, roles::add);
+  private Collection<String> getRoles(
+      ContainerRequestContext requestContext, Collection<String> additionalRoles) {
+    SecurityContext securityContext = requestContext.getSecurityContext();
+    Collection<String> roles = new ArrayList<>();
 
-        for (String role : additionalRoles) {
-            ifUserInRoleDo(securityContext, role, roles::add);
-        }
+    ifUserInRoleDo(securityContext, Roles.ADMIN, roles::add);
+    ifUserInRoleDo(securityContext, Roles.ANY, roles::add);
 
-        return roles;
+    for (String role : additionalRoles) {
+      ifUserInRoleDo(securityContext, role, roles::add);
     }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/topics/{topicName}")
-    @ApiOperation(value = "Get topic user roles", httpMethod = HttpMethod.GET)
-    public Collection<String> getTopicRoles(ContainerRequestContext requestContext) {
-        return getRoles(requestContext, Collections.singletonList(Roles.TOPIC_OWNER));
-    }
+    return roles;
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/topics/{topicName}/subscriptions/{subscriptionName}")
-    @ApiOperation(value = "Get subscription user roles", httpMethod = HttpMethod.GET)
-    public Collection<String> getSubscriptionRoles(ContainerRequestContext requestContext) {
-        return getRoles(requestContext, Arrays.asList(Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER));
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/topics/{topicName}")
+  @ApiOperation(value = "Get topic user roles", httpMethod = HttpMethod.GET)
+  public Collection<String> getTopicRoles(ContainerRequestContext requestContext) {
+    return getRoles(requestContext, Collections.singletonList(Roles.TOPIC_OWNER));
+  }
 
-    private void ifUserInRoleDo(SecurityContext securityContext, String role, Consumer<String> consumer) {
-        if (securityContext.isUserInRole(role)) {
-            consumer.accept(role);
-        }
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/topics/{topicName}/subscriptions/{subscriptionName}")
+  @ApiOperation(value = "Get subscription user roles", httpMethod = HttpMethod.GET)
+  public Collection<String> getSubscriptionRoles(ContainerRequestContext requestContext) {
+    return getRoles(requestContext, Arrays.asList(Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER));
+  }
 
+  private void ifUserInRoleDo(
+      SecurityContext securityContext, String role, Consumer<String> consumer) {
+    if (securityContext.isUserInRole(role)) {
+      consumer.accept(role);
+    }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SchemaEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SchemaEndpoint.java
index 6403dd031e..d3d2a4505e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SchemaEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SchemaEndpoint.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
+
 import io.swagger.annotations.ApiOperation;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.ws.rs.Consumes;
@@ -15,6 +18,7 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import pl.allegro.tech.hermes.api.RawSchema;
 import pl.allegro.tech.hermes.api.Topic;
@@ -26,79 +30,82 @@
 import pl.allegro.tech.hermes.schema.SchemaId;
 import pl.allegro.tech.hermes.schema.SchemaVersion;
 
-import java.util.Optional;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
-
 @Path("topics/{topicName}/schema")
 public class SchemaEndpoint {
 
-    private final SchemaService schemaService;
-    private final TopicService topicService;
+  private final SchemaService schemaService;
+  private final TopicService topicService;
 
-    @Autowired
-    public SchemaEndpoint(SchemaService schemaService, TopicService topicService) {
-        this.schemaService = schemaService;
-        this.topicService = topicService;
-    }
+  @Autowired
+  public SchemaEndpoint(SchemaService schemaService, TopicService topicService) {
+    this.schemaService = schemaService;
+    this.topicService = topicService;
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Get schema", httpMethod = HttpMethod.GET)
-    public Response get(@PathParam("topicName") String qualifiedTopicName) {
-        Optional<RawSchema> rawSchema = schemaService.getSchema(qualifiedTopicName);
-        return rawSchema.map(RawSchema::value)
-                .map(v -> Response.ok(v).build())
-                .orElse(Response.noContent().build());
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "Get schema", httpMethod = HttpMethod.GET)
+  public Response get(@PathParam("topicName") String qualifiedTopicName) {
+    Optional<RawSchema> rawSchema = schemaService.getSchema(qualifiedTopicName);
+    return rawSchema
+        .map(RawSchema::value)
+        .map(v -> Response.ok(v).build())
+        .orElse(Response.noContent().build());
+  }
 
-    @GET
-    @Path("versions/{version}")
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Get schema", httpMethod = HttpMethod.GET)
-    public Response getByVersion(@PathParam("topicName") String qualifiedTopicName, @PathParam("version") int version) {
-        Optional<RawSchema> rawSchema = schemaService.getSchema(qualifiedTopicName, SchemaVersion.valueOf(version));
-        return rawSchema.map(RawSchema::value)
-                .map(v -> Response.ok(v).build())
-                .orElse(Response.noContent().build());
-    }
+  @GET
+  @Path("versions/{version}")
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "Get schema", httpMethod = HttpMethod.GET)
+  public Response getByVersion(
+      @PathParam("topicName") String qualifiedTopicName, @PathParam("version") int version) {
+    Optional<RawSchema> rawSchema =
+        schemaService.getSchema(qualifiedTopicName, SchemaVersion.valueOf(version));
+    return rawSchema
+        .map(RawSchema::value)
+        .map(v -> Response.ok(v).build())
+        .orElse(Response.noContent().build());
+  }
 
-    @GET
-    @Path("ids/{id}")
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Get schema", httpMethod = HttpMethod.GET)
-    public Response getById(@PathParam("topicName") String qualifiedTopicName, @PathParam("id") int id) {
-        Optional<RawSchema> rawSchema = schemaService.getSchema(qualifiedTopicName, SchemaId.valueOf(id));
-        return rawSchema.map(RawSchema::value)
-                .map(v -> Response.ok(v).build())
-                .orElse(Response.noContent().build());
-    }
+  @GET
+  @Path("ids/{id}")
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "Get schema", httpMethod = HttpMethod.GET)
+  public Response getById(
+      @PathParam("topicName") String qualifiedTopicName, @PathParam("id") int id) {
+    Optional<RawSchema> rawSchema =
+        schemaService.getSchema(qualifiedTopicName, SchemaId.valueOf(id));
+    return rawSchema
+        .map(RawSchema::value)
+        .map(v -> Response.ok(v).build())
+        .orElse(Response.noContent().build());
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @RolesAllowed({Roles.TOPIC_OWNER, Roles.ADMIN})
-    @ApiOperation(value = "Save schema", httpMethod = HttpMethod.POST)
-    public Response save(@PathParam("topicName") String qualifiedTopicName,
-                         @DefaultValue("true") @QueryParam(value = "validate") boolean validate,
-                         @Context ContainerRequestContext requestContext,
-                         String schema) {
-        Topic topic = topicService.getTopicDetails(fromQualifiedName(qualifiedTopicName));
-        RequestUser user = new HermesSecurityAwareRequestUser(requestContext);
-        schemaService.registerSchema(topic, schema, validate);
-        notifyFrontendSchemaChanged(qualifiedTopicName, user);
-        return Response.status(Response.Status.CREATED).build();
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @RolesAllowed({Roles.TOPIC_OWNER, Roles.ADMIN})
+  @ApiOperation(value = "Save schema", httpMethod = HttpMethod.POST)
+  public Response save(
+      @PathParam("topicName") String qualifiedTopicName,
+      @DefaultValue("true") @QueryParam(value = "validate") boolean validate,
+      @Context ContainerRequestContext requestContext,
+      String schema) {
+    Topic topic = topicService.getTopicDetails(fromQualifiedName(qualifiedTopicName));
+    RequestUser user = new HermesSecurityAwareRequestUser(requestContext);
+    schemaService.registerSchema(topic, schema, validate);
+    notifyFrontendSchemaChanged(qualifiedTopicName, user);
+    return Response.status(Response.Status.CREATED).build();
+  }
 
-    private void notifyFrontendSchemaChanged(String qualifiedTopicName, RequestUser changedBy) {
-        topicService.scheduleTouchTopic(fromQualifiedName(qualifiedTopicName), changedBy);
-    }
+  private void notifyFrontendSchemaChanged(String qualifiedTopicName, RequestUser changedBy) {
+    topicService.scheduleTouchTopic(fromQualifiedName(qualifiedTopicName), changedBy);
+  }
 
-    @DELETE
-    @RolesAllowed({Roles.TOPIC_OWNER, Roles.ADMIN})
-    @ApiOperation(value = "Delete schema", httpMethod = HttpMethod.DELETE)
-    public Response delete(@PathParam("topicName") String qualifiedTopicName) {
-        schemaService.deleteAllSchemaVersions(qualifiedTopicName);
-        return Response.status(Response.Status.OK).build();
-    }
+  @DELETE
+  @RolesAllowed({Roles.TOPIC_OWNER, Roles.ADMIN})
+  @ApiOperation(value = "Delete schema", httpMethod = HttpMethod.DELETE)
+  public Response delete(@PathParam("topicName") String qualifiedTopicName) {
+    schemaService.deleteAllSchemaVersions(qualifiedTopicName);
+    return Response.status(Response.Status.OK).build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/StatsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/StatsEndpoint.java
index ef998c6ae6..99ef1fbc3f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/StatsEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/StatsEndpoint.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import io.swagger.annotations.ApiOperation;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.HttpMethod;
@@ -12,29 +14,26 @@
 import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService;
 import pl.allegro.tech.hermes.management.domain.topic.TopicService;
 
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Path("stats")
 public class StatsEndpoint {
-    private final SubscriptionService subscriptionService;
-    private final TopicService topicService;
-
-    @Autowired
-    public StatsEndpoint(SubscriptionService subscriptionService, TopicService topicService) {
-        this.subscriptionService = subscriptionService;
-        this.topicService = topicService;
-    }
+  private final SubscriptionService subscriptionService;
+  private final TopicService topicService;
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Get topic and subscription stats", response = Stats.class, httpMethod = HttpMethod.GET)
-    public Stats getStats() {
-        TopicStats topicStats = topicService.getStats();
-        SubscriptionStats subscriptionStats = subscriptionService.getStats();
-        return new Stats(
-                topicStats,
-                subscriptionStats
-        );
-    }
+  @Autowired
+  public StatsEndpoint(SubscriptionService subscriptionService, TopicService topicService) {
+    this.subscriptionService = subscriptionService;
+    this.topicService = topicService;
+  }
 
+  @GET
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(
+      value = "Get topic and subscription stats",
+      response = Stats.class,
+      httpMethod = HttpMethod.GET)
+  public Stats getStats() {
+    TopicStats topicStats = topicService.getStats();
+    SubscriptionStats subscriptionStats = subscriptionService.getStats();
+    return new Stats(topicStats, subscriptionStats);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsEndpoint.java
index 9eaf69334e..4c92836529 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsEndpoint.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
+import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
+
 import io.swagger.annotations.ApiOperation;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.validation.Valid;
@@ -17,6 +22,8 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import pl.allegro.tech.hermes.api.ConsumerGroup;
 import pl.allegro.tech.hermes.api.MessageTrace;
@@ -38,252 +45,283 @@
 import pl.allegro.tech.hermes.management.infrastructure.kafka.MultiDCAwareService;
 import pl.allegro.tech.hermes.management.infrastructure.kafka.MultiDCOffsetChangeSummary;
 
-import java.util.List;
-import java.util.Optional;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
-import static jakarta.ws.rs.core.Response.Status.OK;
-import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
-
 @Path("topics/{topicName}/subscriptions")
 public class SubscriptionsEndpoint {
 
-    private final SubscriptionService subscriptionService;
-    private final TopicService topicService;
-    private final MultiDCAwareService multiDCAwareService;
-
-    @Autowired
-    public SubscriptionsEndpoint(SubscriptionService subscriptionService,
-                                 TopicService topicService,
-                                 MultiDCAwareService multiDCAwareService) {
-        this.subscriptionService = subscriptionService;
-        this.topicService = topicService;
-        this.multiDCAwareService = multiDCAwareService;
-    }
+  private final SubscriptionService subscriptionService;
+  private final TopicService topicService;
+  private final MultiDCAwareService multiDCAwareService;
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "Lists subscriptions", response = List.class, httpMethod = HttpMethod.GET)
-    public List<String> list(
-            @PathParam("topicName") String qualifiedTopicName,
-            @DefaultValue("false") @QueryParam("tracked") boolean tracked) {
+  @Autowired
+  public SubscriptionsEndpoint(
+      SubscriptionService subscriptionService,
+      TopicService topicService,
+      MultiDCAwareService multiDCAwareService) {
+    this.subscriptionService = subscriptionService;
+    this.topicService = topicService;
+    this.multiDCAwareService = multiDCAwareService;
+  }
 
-        return tracked
-                ? subscriptionService.listTrackedSubscriptionNames(fromQualifiedName(qualifiedTopicName))
-                : subscriptionService.listSubscriptionNames(fromQualifiedName(qualifiedTopicName));
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(value = "Lists subscriptions", response = List.class, httpMethod = HttpMethod.GET)
+  public List<String> list(
+      @PathParam("topicName") String qualifiedTopicName,
+      @DefaultValue("false") @QueryParam("tracked") boolean tracked) {
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/query")
-    @ApiOperation(value = "Queries subscriptions", response = List.class, httpMethod = HttpMethod.POST)
-    public List<String> queryList(
-            @PathParam("topicName") String qualifiedTopicName,
-            Query<Subscription> query) {
-        return subscriptionService.listFilteredSubscriptionNames(fromQualifiedName(qualifiedTopicName), query);
-    }
+    return tracked
+        ? subscriptionService.listTrackedSubscriptionNames(fromQualifiedName(qualifiedTopicName))
+        : subscriptionService.listSubscriptionNames(fromQualifiedName(qualifiedTopicName));
+  }
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @RolesAllowed({Roles.ANY})
-    @ApiOperation(value = "Create subscription", httpMethod = HttpMethod.POST)
-    public Response create(@PathParam("topicName") String qualifiedTopicName,
-                           Subscription subscription,
-                           @Context ContainerRequestContext requestContext) {
-        subscriptionService.createSubscription(
-                subscription,
-                new HermesSecurityAwareRequestUser(requestContext),
-                qualifiedTopicName
-        );
-        return responseStatus(Response.Status.CREATED);
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/query")
+  @ApiOperation(
+      value = "Queries subscriptions",
+      response = List.class,
+      httpMethod = HttpMethod.POST)
+  public List<String> queryList(
+      @PathParam("topicName") String qualifiedTopicName, Query<Subscription> query) {
+    return subscriptionService.listFilteredSubscriptionNames(
+        fromQualifiedName(qualifiedTopicName), query);
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}")
-    @ApiOperation(value = "Get subscription details", response = Subscription.class, httpMethod = HttpMethod.GET)
-    public Subscription get(@PathParam("topicName") String qualifiedTopicName,
-                            @PathParam("subscriptionName") String subscriptionName) {
-        return subscriptionService.getSubscriptionDetails(fromQualifiedName(qualifiedTopicName), subscriptionName);
-    }
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @RolesAllowed({Roles.ANY})
+  @ApiOperation(value = "Create subscription", httpMethod = HttpMethod.POST)
+  public Response create(
+      @PathParam("topicName") String qualifiedTopicName,
+      Subscription subscription,
+      @Context ContainerRequestContext requestContext) {
+    subscriptionService.createSubscription(
+        subscription, new HermesSecurityAwareRequestUser(requestContext), qualifiedTopicName);
+    return responseStatus(Response.Status.CREATED);
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/state")
-    @ApiOperation(value = "Get subscription state", response = Subscription.State.class, httpMethod = HttpMethod.GET)
-    public Subscription.State getState(@PathParam("topicName") String qualifiedTopicName,
-                                       @PathParam("subscriptionName") String subscriptionName) {
-        return subscriptionService.getSubscriptionState(fromQualifiedName(qualifiedTopicName), subscriptionName);
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{subscriptionName}")
+  @ApiOperation(
+      value = "Get subscription details",
+      response = Subscription.class,
+      httpMethod = HttpMethod.GET)
+  public Subscription get(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    return subscriptionService.getSubscriptionDetails(
+        fromQualifiedName(qualifiedTopicName), subscriptionName);
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
-    @Path("/{subscriptionName}/undelivered/last")
-    @ApiOperation(value = "Get latest undelivered message", response = SentMessageTrace.class, httpMethod = HttpMethod.GET)
-    public Response getLatestUndeliveredMessage(@PathParam("topicName") String qualifiedTopicName,
-                                                @PathParam("subscriptionName") String subscriptionName) {
-        Optional<SentMessageTrace> result = subscriptionService.getLatestUndeliveredMessage(
-                fromQualifiedName(qualifiedTopicName), subscriptionName
-        );
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{subscriptionName}/state")
+  @ApiOperation(
+      value = "Get subscription state",
+      response = Subscription.State.class,
+      httpMethod = HttpMethod.GET)
+  public Subscription.State getState(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    return subscriptionService.getSubscriptionState(
+        fromQualifiedName(qualifiedTopicName), subscriptionName);
+  }
 
-        return result.isPresent() ? Response.status(OK).entity(result.get()).build() : responseStatus(NOT_FOUND);
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
+  @Path("/{subscriptionName}/undelivered/last")
+  @ApiOperation(
+      value = "Get latest undelivered message",
+      response = SentMessageTrace.class,
+      httpMethod = HttpMethod.GET)
+  public Response getLatestUndeliveredMessage(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    Optional<SentMessageTrace> result =
+        subscriptionService.getLatestUndeliveredMessage(
+            fromQualifiedName(qualifiedTopicName), subscriptionName);
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
-    @Path("/{subscriptionName}/undelivered")
-    @ApiOperation(value = "Get latest undelivered messages", response = List.class, httpMethod = HttpMethod.GET)
-    public Response getLatestUndeliveredMessages(@PathParam("topicName") String qualifiedTopicName,
-                                                 @PathParam("subscriptionName") String subscriptionName) {
-        List<SentMessageTrace> result = subscriptionService.getLatestUndeliveredMessagesTrackerLogs(
-                fromQualifiedName(qualifiedTopicName), subscriptionName
-        );
-        return Response.status(OK).entity(result).build();
-    }
+    return result.isPresent()
+        ? Response.status(OK).entity(result.get()).build()
+        : responseStatus(NOT_FOUND);
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/metrics")
-    @ApiOperation(value = "Get subscription metrics", response = SubscriptionMetrics.class, httpMethod = HttpMethod.GET)
-    public SubscriptionMetrics getMetrics(@PathParam("topicName") String qualifiedTopicName,
-                                          @PathParam("subscriptionName") String subscriptionName) {
-        return subscriptionService.getSubscriptionMetrics(fromQualifiedName(qualifiedTopicName), subscriptionName);
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
+  @Path("/{subscriptionName}/undelivered")
+  @ApiOperation(
+      value = "Get latest undelivered messages",
+      response = List.class,
+      httpMethod = HttpMethod.GET)
+  public Response getLatestUndeliveredMessages(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    List<SentMessageTrace> result =
+        subscriptionService.getLatestUndeliveredMessagesTrackerLogs(
+            fromQualifiedName(qualifiedTopicName), subscriptionName);
+    return Response.status(OK).entity(result).build();
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/metrics/persistent")
-    @ApiOperation(
-            value = "Get persistent subscription metrics", response = PersistentSubscriptionMetrics.class, httpMethod = HttpMethod.GET)
-    public PersistentSubscriptionMetrics getPersistentMetrics(@PathParam("topicName") String qualifiedTopicName,
-                                                              @PathParam("subscriptionName") String subscriptionName) {
-        return subscriptionService.getPersistentSubscriptionMetrics(fromQualifiedName(qualifiedTopicName), subscriptionName);
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{subscriptionName}/metrics")
+  @ApiOperation(
+      value = "Get subscription metrics",
+      response = SubscriptionMetrics.class,
+      httpMethod = HttpMethod.GET)
+  public SubscriptionMetrics getMetrics(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    return subscriptionService.getSubscriptionMetrics(
+        fromQualifiedName(qualifiedTopicName), subscriptionName);
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/health")
-    @ApiOperation(value = "Get subscription health", response = SubscriptionHealth.class, httpMethod = HttpMethod.GET)
-    public SubscriptionHealth getHealth(@PathParam("topicName") String qualifiedTopicName,
-                                        @PathParam("subscriptionName") String subscriptionName) {
-        return subscriptionService.getSubscriptionHealth(fromQualifiedName(qualifiedTopicName), subscriptionName);
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{subscriptionName}/metrics/persistent")
+  @ApiOperation(
+      value = "Get persistent subscription metrics",
+      response = PersistentSubscriptionMetrics.class,
+      httpMethod = HttpMethod.GET)
+  public PersistentSubscriptionMetrics getPersistentMetrics(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    return subscriptionService.getPersistentSubscriptionMetrics(
+        fromQualifiedName(qualifiedTopicName), subscriptionName);
+  }
 
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Path("/{subscriptionName}/state")
-    @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
-    @ApiOperation(value = "Update subscription state", httpMethod = HttpMethod.PUT)
-    public Response updateState(@PathParam("topicName") String qualifiedTopicName,
-                                @PathParam("subscriptionName") String subscriptionName,
-                                Subscription.State state,
-                                @Context ContainerRequestContext requestContext) {
-        subscriptionService.updateSubscriptionState(
-                fromQualifiedName(qualifiedTopicName),
-                subscriptionName,
-                state,
-                new HermesSecurityAwareRequestUser(requestContext)
-        );
-        return responseStatus(OK);
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{subscriptionName}/health")
+  @ApiOperation(
+      value = "Get subscription health",
+      response = SubscriptionHealth.class,
+      httpMethod = HttpMethod.GET)
+  public SubscriptionHealth getHealth(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    return subscriptionService.getSubscriptionHealth(
+        fromQualifiedName(qualifiedTopicName), subscriptionName);
+  }
 
-    @DELETE
-    @Path("/{subscriptionName}")
-    @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
-    @ApiOperation(value = "Remove subscription", httpMethod = HttpMethod.DELETE)
-    public Response remove(@PathParam("topicName") String qualifiedTopicName,
-                           @PathParam("subscriptionName") String subscriptionId,
-                           @Context ContainerRequestContext requestContext) {
-        subscriptionService.removeSubscription(
-                fromQualifiedName(qualifiedTopicName),
-                subscriptionId,
-                new HermesSecurityAwareRequestUser(requestContext)
-        );
-        return responseStatus(OK);
-    }
+  @PUT
+  @Consumes(APPLICATION_JSON)
+  @Path("/{subscriptionName}/state")
+  @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
+  @ApiOperation(value = "Update subscription state", httpMethod = HttpMethod.PUT)
+  public Response updateState(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName,
+      Subscription.State state,
+      @Context ContainerRequestContext requestContext) {
+    subscriptionService.updateSubscriptionState(
+        fromQualifiedName(qualifiedTopicName),
+        subscriptionName,
+        state,
+        new HermesSecurityAwareRequestUser(requestContext));
+    return responseStatus(OK);
+  }
 
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Path("/{subscriptionName}")
-    @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
-    @ApiOperation(value = "Update subscription", httpMethod = HttpMethod.PUT)
-    public Response update(@PathParam("topicName") String qualifiedTopicName,
-                           @PathParam("subscriptionName") String subscriptionName,
-                           PatchData patch,
-                           @Context ContainerRequestContext requestContext) {
-        subscriptionService.updateSubscription(
-                TopicName.fromQualifiedName(qualifiedTopicName),
-                subscriptionName,
-                patch,
-                new HermesSecurityAwareRequestUser(requestContext)
-        );
-        return responseStatus(OK);
-    }
+  @DELETE
+  @Path("/{subscriptionName}")
+  @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
+  @ApiOperation(value = "Remove subscription", httpMethod = HttpMethod.DELETE)
+  public Response remove(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionId,
+      @Context ContainerRequestContext requestContext) {
+    subscriptionService.removeSubscription(
+        fromQualifiedName(qualifiedTopicName),
+        subscriptionId,
+        new HermesSecurityAwareRequestUser(requestContext));
+    return responseStatus(OK);
+  }
 
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/retransmission")
-    @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
-    @ApiOperation(value = "Update subscription offset", httpMethod = HttpMethod.PUT)
-    public Response retransmit(@PathParam("topicName") String qualifiedTopicName,
-                               @PathParam("subscriptionName") String subscriptionName,
-                               @DefaultValue("false") @QueryParam("dryRun") boolean dryRun,
-                               @Valid OffsetRetransmissionDate offsetRetransmissionDate,
-                               @Context ContainerRequestContext requestContext) {
+  @PUT
+  @Consumes(APPLICATION_JSON)
+  @Path("/{subscriptionName}")
+  @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
+  @ApiOperation(value = "Update subscription", httpMethod = HttpMethod.PUT)
+  public Response update(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName,
+      PatchData patch,
+      @Context ContainerRequestContext requestContext) {
+    subscriptionService.updateSubscription(
+        TopicName.fromQualifiedName(qualifiedTopicName),
+        subscriptionName,
+        patch,
+        new HermesSecurityAwareRequestUser(requestContext));
+    return responseStatus(OK);
+  }
 
-        MultiDCOffsetChangeSummary summary = multiDCAwareService.retransmit(
-                topicService.getTopicDetails(TopicName.fromQualifiedName(qualifiedTopicName)),
-                subscriptionName,
-                offsetRetransmissionDate.getRetransmissionDate().toInstant().toEpochMilli(),
-                dryRun,
-                new HermesSecurityAwareRequestUser(requestContext)
-        );
+  @PUT
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/{subscriptionName}/retransmission")
+  @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER, Roles.SUBSCRIPTION_OWNER})
+  @ApiOperation(value = "Update subscription offset", httpMethod = HttpMethod.PUT)
+  public Response retransmit(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName,
+      @DefaultValue("false") @QueryParam("dryRun") boolean dryRun,
+      @Valid OffsetRetransmissionDate offsetRetransmissionDate,
+      @Context ContainerRequestContext requestContext) {
 
-        return Response.status(OK).entity(summary).build();
-    }
+    MultiDCOffsetChangeSummary summary =
+        multiDCAwareService.retransmit(
+            topicService.getTopicDetails(TopicName.fromQualifiedName(qualifiedTopicName)),
+            subscriptionName,
+            offsetRetransmissionDate.getRetransmissionDate().toInstant().toEpochMilli(),
+            dryRun,
+            new HermesSecurityAwareRequestUser(requestContext));
 
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed({Roles.ADMIN})
-    @Path("/{subscriptionName}/moveOffsetsToTheEnd")
-    public Response moveOffsetsToTheEnd(@PathParam("topicName") String qualifiedTopicName,
-                                        @PathParam("subscriptionName") String subscriptionName) {
-        TopicName topicName = fromQualifiedName(qualifiedTopicName);
-        multiDCAwareService.moveOffsetsToTheEnd(
-                topicService.getTopicDetails(topicName),
-                new SubscriptionName(subscriptionName, topicName));
-        return responseStatus(OK);
-    }
+    return Response.status(OK).entity(summary).build();
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/events/{messageId}/trace")
-    public Response getMessageTrace(@PathParam("topicName") String qualifiedTopicName,
-                                    @PathParam("subscriptionName") String subscriptionName,
-                                    @PathParam("messageId") String messageId) {
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed({Roles.ADMIN})
+  @Path("/{subscriptionName}/moveOffsetsToTheEnd")
+  public Response moveOffsetsToTheEnd(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    TopicName topicName = fromQualifiedName(qualifiedTopicName);
+    multiDCAwareService.moveOffsetsToTheEnd(
+        topicService.getTopicDetails(topicName), new SubscriptionName(subscriptionName, topicName));
+    return responseStatus(OK);
+  }
 
-        List<MessageTrace> status = subscriptionService.getMessageStatus(qualifiedTopicName, subscriptionName, messageId);
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{subscriptionName}/events/{messageId}/trace")
+  public Response getMessageTrace(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName,
+      @PathParam("messageId") String messageId) {
 
-        return Response.status(OK).entity(status).build();
-    }
+    List<MessageTrace> status =
+        subscriptionService.getMessageStatus(qualifiedTopicName, subscriptionName, messageId);
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{subscriptionName}/consumer-groups")
-    public List<ConsumerGroup> describeConsumerGroups(@PathParam("topicName") String qualifiedTopicName,
-                                                      @PathParam("subscriptionName") String subscriptionName) {
-        Topic topic = topicService.getTopicDetails(fromQualifiedName(qualifiedTopicName));
-        return multiDCAwareService.describeConsumerGroups(topic, subscriptionName);
-    }
+    return Response.status(OK).entity(status).build();
+  }
 
-    private Response responseStatus(Response.Status responseStatus) {
-        return Response.status(responseStatus).build();
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{subscriptionName}/consumer-groups")
+  public List<ConsumerGroup> describeConsumerGroups(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("subscriptionName") String subscriptionName) {
+    Topic topic = topicService.getTopicDetails(fromQualifiedName(qualifiedTopicName));
+    return multiDCAwareService.describeConsumerGroups(topic, subscriptionName);
+  }
 
+  private Response responseStatus(Response.Status responseStatus) {
+    return Response.status(responseStatus).build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsOwnershipEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsOwnershipEndpoint.java
index c6ad63e80c..8406550335 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsOwnershipEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsOwnershipEndpoint.java
@@ -1,9 +1,12 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import pl.allegro.tech.hermes.api.OwnerId;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -12,37 +15,36 @@
 import pl.allegro.tech.hermes.management.domain.owner.OwnerSources;
 import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-
 @Path("subscriptions/owner")
 public class SubscriptionsOwnershipEndpoint {
 
-    private final OwnerSources ownerSources;
-    private final SubscriptionService subscriptionService;
-
-    @Autowired
-    public SubscriptionsOwnershipEndpoint(OwnerSources ownerSources,
-                                          SubscriptionService subscriptionService) {
-        this.ownerSources = ownerSources;
-        this.subscriptionService = subscriptionService;
-    }
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{ownerSourceName}/{ownerId}")
-    public List<Subscription> listForOwner(@PathParam("ownerSourceName") String ownerSourceName, @PathParam("ownerId") String id) {
-        OwnerId ownerId = resolveOwnerId(ownerSourceName, id);
-        return subscriptionService.getForOwnerId(ownerId);
-    }
-
-    private OwnerId resolveOwnerId(String ownerSourceName, String id) {
-        OwnerSource ownerSource = ownerSources.getByName(ownerSourceName)
-                .orElseThrow(() -> new OwnerSourceNotFound(ownerSourceName));
-        if (!ownerSource.exists(id)) {
-            throw new OwnerSource.OwnerNotFound(ownerSourceName, id);
-        }
-        return new OwnerId(ownerSource.name(), id);
+  private final OwnerSources ownerSources;
+  private final SubscriptionService subscriptionService;
+
+  @Autowired
+  public SubscriptionsOwnershipEndpoint(
+      OwnerSources ownerSources, SubscriptionService subscriptionService) {
+    this.ownerSources = ownerSources;
+    this.subscriptionService = subscriptionService;
+  }
+
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{ownerSourceName}/{ownerId}")
+  public List<Subscription> listForOwner(
+      @PathParam("ownerSourceName") String ownerSourceName, @PathParam("ownerId") String id) {
+    OwnerId ownerId = resolveOwnerId(ownerSourceName, id);
+    return subscriptionService.getForOwnerId(ownerId);
+  }
+
+  private OwnerId resolveOwnerId(String ownerSourceName, String id) {
+    OwnerSource ownerSource =
+        ownerSources
+            .getByName(ownerSourceName)
+            .orElseThrow(() -> new OwnerSourceNotFound(ownerSourceName));
+    if (!ownerSource.exists(id)) {
+      throw new OwnerSource.OwnerNotFound(ownerSourceName, id);
     }
+    return new OwnerId(ownerSource.name(), id);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/TopicsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/TopicsEndpoint.java
index 7f87849f30..8f2f53284e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/TopicsEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/TopicsEndpoint.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
+import static jakarta.ws.rs.core.Response.status;
+import static java.lang.String.format;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jakarta.annotation.security.RolesAllowed;
@@ -18,6 +24,8 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.MessageTextPreview;
@@ -40,172 +48,184 @@
 import pl.allegro.tech.hermes.management.domain.topic.SingleMessageReaderException;
 import pl.allegro.tech.hermes.management.domain.topic.TopicService;
 
-import java.util.List;
-import java.util.Optional;
-
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
-import static jakarta.ws.rs.core.Response.status;
-import static java.lang.String.format;
-
 @Component
 @Path("/topics")
 @Api(value = "/topics", description = "Operations on topics")
 public class TopicsEndpoint {
 
-    private final TopicService topicService;
-    private final ManagementRights managementRights;
-    private final OwnerSources ownerSources;
-
-    @Autowired
-    public TopicsEndpoint(TopicService topicService,
-                          ManagementRights managementRights,
-                          OwnerSources ownerSources) {
-        this.topicService = topicService;
-        this.managementRights = managementRights;
-        this.ownerSources = ownerSources;
-    }
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @ApiOperation(value = "List topics from group", response = List.class, httpMethod = HttpMethod.GET)
-    public List<String> list(
-            @DefaultValue("") @QueryParam("groupName") String groupName,
-            @DefaultValue("false") @QueryParam("tracked") boolean tracked) {
-
-        return tracked ? listTracked(groupName) : listNames(groupName);
-    }
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/query")
-    @ApiOperation(value = "Queries topics from group", response = List.class, httpMethod = HttpMethod.POST)
-    public List<String> queryList(
-            @DefaultValue("") @QueryParam("groupName") String groupName,
-            Query<Topic> query) {
-
-        return isNullOrEmpty(groupName)
-                ? topicService.listFilteredTopicNames(query)
-                : topicService.listFilteredTopicNames(groupName, query);
-    }
-
-    @POST
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ANY)
-    @ApiOperation(value = "Create topic", httpMethod = HttpMethod.POST)
-    public Response create(TopicWithSchema topicWithSchema, @Context ContainerRequestContext requestContext) {
-        RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
-        CreatorRights isAllowedToManage = checkedTopic -> managementRights.isUserAllowedToManageTopic(checkedTopic, requestContext);
-        topicService.createTopicWithSchema(topicWithSchema, requestUser, isAllowedToManage);
-        return status(Response.Status.CREATED).build();
+  private final TopicService topicService;
+  private final ManagementRights managementRights;
+  private final OwnerSources ownerSources;
+
+  @Autowired
+  public TopicsEndpoint(
+      TopicService topicService, ManagementRights managementRights, OwnerSources ownerSources) {
+    this.topicService = topicService;
+    this.managementRights = managementRights;
+    this.ownerSources = ownerSources;
+  }
+
+  @GET
+  @Produces(APPLICATION_JSON)
+  @ApiOperation(
+      value = "List topics from group",
+      response = List.class,
+      httpMethod = HttpMethod.GET)
+  public List<String> list(
+      @DefaultValue("") @QueryParam("groupName") String groupName,
+      @DefaultValue("false") @QueryParam("tracked") boolean tracked) {
+
+    return tracked ? listTracked(groupName) : listNames(groupName);
+  }
+
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/query")
+  @ApiOperation(
+      value = "Queries topics from group",
+      response = List.class,
+      httpMethod = HttpMethod.POST)
+  public List<String> queryList(
+      @DefaultValue("") @QueryParam("groupName") String groupName, Query<Topic> query) {
+
+    return isNullOrEmpty(groupName)
+        ? topicService.listFilteredTopicNames(query)
+        : topicService.listFilteredTopicNames(groupName, query);
+  }
+
+  @POST
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ANY)
+  @ApiOperation(value = "Create topic", httpMethod = HttpMethod.POST)
+  public Response create(
+      TopicWithSchema topicWithSchema, @Context ContainerRequestContext requestContext) {
+    RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
+    CreatorRights isAllowedToManage =
+        checkedTopic -> managementRights.isUserAllowedToManageTopic(checkedTopic, requestContext);
+    topicService.createTopicWithSchema(topicWithSchema, requestUser, isAllowedToManage);
+    return status(Response.Status.CREATED).build();
+  }
+
+  @DELETE
+  @Produces(APPLICATION_JSON)
+  @Path("/{topicName}")
+  @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER})
+  @ApiOperation(value = "Remove topic", httpMethod = HttpMethod.DELETE)
+  public Response remove(
+      @PathParam("topicName") String qualifiedTopicName,
+      @Context ContainerRequestContext requestContext) {
+    RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
+    topicService.removeTopicWithSchema(
+        topicService.getTopicDetails(TopicName.fromQualifiedName(qualifiedTopicName)), requestUser);
+    return status(Response.Status.OK).build();
+  }
+
+  @PUT
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @Path("/{topicName}")
+  @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER})
+  @ApiOperation(value = "Update topic", httpMethod = HttpMethod.PUT)
+  public Response update(
+      @PathParam("topicName") String qualifiedTopicName,
+      PatchData patch,
+      @Context ContainerRequestContext requestContext) {
+    RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
+    topicService.updateTopicWithSchema(
+        TopicName.fromQualifiedName(qualifiedTopicName), patch, requestUser);
+    return status(Response.Status.OK).build();
+  }
+
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{topicName}")
+  @ApiOperation(value = "Topic details", httpMethod = HttpMethod.GET)
+  public TopicWithSchema get(@PathParam("topicName") String qualifiedTopicName) {
+    return topicService.getTopicWithSchema(TopicName.fromQualifiedName(qualifiedTopicName));
+  }
+
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{topicName}/metrics")
+  @ApiOperation(value = "Topic metrics", httpMethod = HttpMethod.GET)
+  public TopicMetrics getMetrics(@PathParam("topicName") String qualifiedTopicName) {
+    return topicService.getTopicMetrics(TopicName.fromQualifiedName(qualifiedTopicName));
+  }
+
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{topicName}/preview")
+  @ApiOperation(value = "Topic publisher preview", httpMethod = HttpMethod.GET)
+  public List<MessageTextPreview> getPreview(@PathParam("topicName") String qualifiedTopicName) {
+    return topicService.previewText(TopicName.fromQualifiedName(qualifiedTopicName));
+  }
+
+  @GET
+  @Produces(APPLICATION_OCTET_STREAM)
+  @Path("/{topicName}/preview/{idx}")
+  @ApiOperation(value = "Topic publisher preview", httpMethod = HttpMethod.GET)
+  public byte[] getPreviewRaw(
+      @PathParam("topicName") String qualifiedTopicName, @PathParam("idx") Integer idx) {
+    TopicName topicName = TopicName.fromQualifiedName(qualifiedTopicName);
+    Optional<byte[]> preview = topicService.preview(topicName, idx);
+    if (preview.isPresent()) {
+      return preview.get();
+    } else {
+      throw new NotFoundException(
+          format("Message preview not found for topic %s and offset %d", topicName, idx));
     }
-
-    @DELETE
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER})
-    @ApiOperation(value = "Remove topic", httpMethod = HttpMethod.DELETE)
-    public Response remove(@PathParam("topicName") String qualifiedTopicName, @Context ContainerRequestContext requestContext) {
-        RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
-        topicService.removeTopicWithSchema(topicService.getTopicDetails(TopicName.fromQualifiedName(qualifiedTopicName)),
-                requestUser);
-        return status(Response.Status.OK).build();
-    }
-
-    @PUT
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    @RolesAllowed({Roles.ADMIN, Roles.TOPIC_OWNER})
-    @ApiOperation(value = "Update topic", httpMethod = HttpMethod.PUT)
-    public Response update(@PathParam("topicName") String qualifiedTopicName, PatchData patch,
-                           @Context ContainerRequestContext requestContext) {
-        RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
-        topicService.updateTopicWithSchema(TopicName.fromQualifiedName(qualifiedTopicName), patch, requestUser);
-        return status(Response.Status.OK).build();
+  }
+
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/{topicName}/preview/cluster/{brokersClusterName}/partition/{partition}/offset/{offset}")
+  @RolesAllowed({Roles.ADMIN})
+  @ApiOperation(
+      value = "Fetch single message from specified brokers cluster",
+      httpMethod = HttpMethod.GET)
+  public String preview(
+      @PathParam("topicName") String qualifiedTopicName,
+      @PathParam("brokersClusterName") String brokersClusterName,
+      @PathParam("partition") Integer partition,
+      @PathParam("offset") Long offset) {
+    try {
+      return topicService.fetchSingleMessageFromPrimary(
+          brokersClusterName, TopicName.fromQualifiedName(qualifiedTopicName), partition, offset);
+    } catch (BrokerNotFoundForPartitionException | SingleMessageReaderException exception) {
+      throw new NotFoundException(
+          format(
+              "Message not found for brokers cluster %s, topic %s, partition %d and offset %d",
+              brokersClusterName, qualifiedTopicName, partition, offset));
     }
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}")
-    @ApiOperation(value = "Topic details", httpMethod = HttpMethod.GET)
-    public TopicWithSchema get(@PathParam("topicName") String qualifiedTopicName) {
-        return topicService.getTopicWithSchema(TopicName.fromQualifiedName(qualifiedTopicName));
-    }
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}/metrics")
-    @ApiOperation(value = "Topic metrics", httpMethod = HttpMethod.GET)
-    public TopicMetrics getMetrics(@PathParam("topicName") String qualifiedTopicName) {
-        return topicService.getTopicMetrics(TopicName.fromQualifiedName(qualifiedTopicName));
-    }
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}/preview")
-    @ApiOperation(value = "Topic publisher preview", httpMethod = HttpMethod.GET)
-    public List<MessageTextPreview> getPreview(@PathParam("topicName") String qualifiedTopicName) {
-        return topicService.previewText(TopicName.fromQualifiedName(qualifiedTopicName));
-    }
-
-    @GET
-    @Produces(APPLICATION_OCTET_STREAM)
-    @Path("/{topicName}/preview/{idx}")
-    @ApiOperation(value = "Topic publisher preview", httpMethod = HttpMethod.GET)
-    public byte[] getPreviewRaw(@PathParam("topicName") String qualifiedTopicName, @PathParam("idx") Integer idx) {
-        TopicName topicName = TopicName.fromQualifiedName(qualifiedTopicName);
-        Optional<byte[]> preview = topicService.preview(topicName, idx);
-        if (preview.isPresent()) {
-            return preview.get();
-        } else {
-            throw new NotFoundException(format(
-                    "Message preview not found for topic %s and offset %d",
-                    topicName, idx
-            ));
-        }
-    }
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/{topicName}/preview/cluster/{brokersClusterName}/partition/{partition}/offset/{offset}")
-    @RolesAllowed({Roles.ADMIN})
-    @ApiOperation(value = "Fetch single message from specified brokers cluster", httpMethod = HttpMethod.GET)
-    public String preview(@PathParam("topicName") String qualifiedTopicName,
-                          @PathParam("brokersClusterName") String brokersClusterName,
-                          @PathParam("partition") Integer partition,
-                          @PathParam("offset") Long offset) {
-        try {
-            return topicService.fetchSingleMessageFromPrimary(brokersClusterName, TopicName.fromQualifiedName(qualifiedTopicName),
-                    partition, offset);
-        } catch (BrokerNotFoundForPartitionException | SingleMessageReaderException exception) {
-            throw new NotFoundException(
-                    format("Message not found for brokers cluster %s, topic %s, partition %d and offset %d", brokersClusterName,
-                            qualifiedTopicName, partition, offset));
-        }
-    }
-
-    @GET
-    @Produces(APPLICATION_JSON)
-    @Path("/owner/{ownerSourceName}/{ownerId}")
-    public List<Topic> listForOwner(@PathParam("ownerSourceName") String ownerSourceName, @PathParam("ownerId") String id) {
-        OwnerSource ownerSource = ownerSources.getByName(ownerSourceName)
-                .orElseThrow(() -> new OwnerSourceNotFound(ownerSourceName));
-        if (!ownerSource.exists(id)) {
-            throw new OwnerSource.OwnerNotFound(ownerSourceName, id);
-        }
-        OwnerId ownerId = new OwnerId(ownerSource.name(), id);
-        return topicService.listForOwnerId(ownerId);
-    }
-
-    private List<String> listTracked(String groupName) {
-        return isNullOrEmpty(groupName) ? topicService.listTrackedTopicNames() : topicService.listTrackedTopicNames(groupName);
-    }
-
-    private List<String> listNames(String groupName) {
-        return isNullOrEmpty(groupName) ? topicService.listQualifiedTopicNames() : topicService.listQualifiedTopicNames(groupName);
+  }
+
+  @GET
+  @Produces(APPLICATION_JSON)
+  @Path("/owner/{ownerSourceName}/{ownerId}")
+  public List<Topic> listForOwner(
+      @PathParam("ownerSourceName") String ownerSourceName, @PathParam("ownerId") String id) {
+    OwnerSource ownerSource =
+        ownerSources
+            .getByName(ownerSourceName)
+            .orElseThrow(() -> new OwnerSourceNotFound(ownerSourceName));
+    if (!ownerSource.exists(id)) {
+      throw new OwnerSource.OwnerNotFound(ownerSourceName, id);
     }
+    OwnerId ownerId = new OwnerId(ownerSource.name(), id);
+    return topicService.listForOwnerId(ownerId);
+  }
+
+  private List<String> listTracked(String groupName) {
+    return isNullOrEmpty(groupName)
+        ? topicService.listTrackedTopicNames()
+        : topicService.listTrackedTopicNames(groupName);
+  }
+
+  private List<String> listNames(String groupName) {
+    return isNullOrEmpty(groupName)
+        ? topicService.listQualifiedTopicNames()
+        : topicService.listQualifiedTopicNames(groupName);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UiResource.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UiResource.java
index 6876248077..fc845778d7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UiResource.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UiResource.java
@@ -1,17 +1,17 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.TEXT_HTML;
+
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import org.glassfish.jersey.server.mvc.Viewable;
 
-import static jakarta.ws.rs.core.MediaType.TEXT_HTML;
-
 @Path("/")
 public class UiResource {
-    @GET
-    @Produces(TEXT_HTML)
-    public Viewable getIndex() {
-        return new Viewable("/index.html");
-    }
+  @GET
+  @Produces(TEXT_HTML)
+  public Viewable getIndex() {
+    return new Viewable("/index.html");
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UnhealthyEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UnhealthyEndpoint.java
index b28ac97321..beae414ee4 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UnhealthyEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UnhealthyEndpoint.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+
 import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
@@ -7,6 +10,8 @@
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.GenericEntity;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import pl.allegro.tech.hermes.api.OwnerId;
 import pl.allegro.tech.hermes.api.UnhealthySubscription;
@@ -14,53 +19,52 @@
 import pl.allegro.tech.hermes.management.domain.owner.OwnerSources;
 import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService;
 
-import java.util.List;
-import java.util.Optional;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-
 @Path("unhealthy")
 public class UnhealthyEndpoint {
 
-    private final OwnerSources ownerSources;
-    private final SubscriptionService subscriptionService;
+  private final OwnerSources ownerSources;
+  private final SubscriptionService subscriptionService;
 
-    @Autowired
-    public UnhealthyEndpoint(OwnerSources ownerSources,
-                             SubscriptionService subscriptionService) {
-        this.ownerSources = ownerSources;
-        this.subscriptionService = subscriptionService;
-    }
+  @Autowired
+  public UnhealthyEndpoint(OwnerSources ownerSources, SubscriptionService subscriptionService) {
+    this.ownerSources = ownerSources;
+    this.subscriptionService = subscriptionService;
+  }
 
-    @GET
-    @Produces({APPLICATION_JSON, TEXT_PLAIN})
-    @Path("/")
-    public Response listUnhealthy(
-            @QueryParam("ownerSourceName") String ownerSourceName,
-            @QueryParam("ownerId") String id,
-            @DefaultValue("true") @QueryParam("respectMonitoringSeverity") boolean respectMonitoringSeverity,
-            @QueryParam("subscriptionNames") List<String> subscriptionNames,
-            @QueryParam("qualifiedTopicNames") List<String> qualifiedTopicNames) {
+  @GET
+  @Produces({APPLICATION_JSON, TEXT_PLAIN})
+  @Path("/")
+  public Response listUnhealthy(
+      @QueryParam("ownerSourceName") String ownerSourceName,
+      @QueryParam("ownerId") String id,
+      @DefaultValue("true") @QueryParam("respectMonitoringSeverity")
+          boolean respectMonitoringSeverity,
+      @QueryParam("subscriptionNames") List<String> subscriptionNames,
+      @QueryParam("qualifiedTopicNames") List<String> qualifiedTopicNames) {
 
-        List<UnhealthySubscription> unhealthySubscriptions = areEmpty(ownerSourceName, id)
-                ? subscriptionService.getAllUnhealthy(respectMonitoringSeverity, subscriptionNames, qualifiedTopicNames)
-                : resolveOwnerId(ownerSourceName, id)
-                .map(ownerId -> subscriptionService.getUnhealthyForOwner(
-                        ownerId, respectMonitoringSeverity, subscriptionNames, qualifiedTopicNames
-                ))
+    List<UnhealthySubscription> unhealthySubscriptions =
+        areEmpty(ownerSourceName, id)
+            ? subscriptionService.getAllUnhealthy(
+                respectMonitoringSeverity, subscriptionNames, qualifiedTopicNames)
+            : resolveOwnerId(ownerSourceName, id)
+                .map(
+                    ownerId ->
+                        subscriptionService.getUnhealthyForOwner(
+                            ownerId,
+                            respectMonitoringSeverity,
+                            subscriptionNames,
+                            qualifiedTopicNames))
                 .orElseThrow(() -> new OwnerSource.OwnerNotFound(ownerSourceName, id));
-        return Response.ok()
-                .entity(new GenericEntity<>(unhealthySubscriptions) {
-                })
-                .build();
-    }
+    return Response.ok().entity(new GenericEntity<>(unhealthySubscriptions) {}).build();
+  }
 
-    private boolean areEmpty(String ownerSourceName, String id) {
-        return ownerSourceName == null && id == null;
-    }
+  private boolean areEmpty(String ownerSourceName, String id) {
+    return ownerSourceName == null && id == null;
+  }
 
-    private Optional<OwnerId> resolveOwnerId(String ownerSourceName, String id) {
-        return ownerSources.getByName(ownerSourceName).map(ownerSource -> new OwnerId(ownerSource.name(), id));
-    }
+  private Optional<OwnerId> resolveOwnerId(String ownerSourceName, String id) {
+    return ownerSources
+        .getByName(ownerSourceName)
+        .map(ownerSource -> new OwnerId(ownerSource.name(), id));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/WorkloadConstraintsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/WorkloadConstraintsEndpoint.java
index 6a43d32208..9b29c8e283 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/WorkloadConstraintsEndpoint.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/WorkloadConstraintsEndpoint.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.management.api;
 
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jakarta.annotation.security.RolesAllowed;
@@ -15,6 +19,7 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
+import java.util.List;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.SubscriptionConstraints;
 import pl.allegro.tech.hermes.api.SubscriptionName;
@@ -26,91 +31,107 @@
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
 import pl.allegro.tech.hermes.management.domain.workload.constraints.WorkloadConstraintsService;
 
-import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
-import static jakarta.ws.rs.core.Response.Status.CREATED;
-import static jakarta.ws.rs.core.Response.Status.OK;
-
 @Component
 @Path("/workload-constraints")
 @Api(value = "/workload-constraints", description = "Operations on workload constraints")
 public class WorkloadConstraintsEndpoint {
 
-    private final WorkloadConstraintsService service;
+  private final WorkloadConstraintsService service;
 
-    public WorkloadConstraintsEndpoint(WorkloadConstraintsService service) {
-        this.service = service;
-    }
+  public WorkloadConstraintsEndpoint(WorkloadConstraintsService service) {
+    this.service = service;
+  }
 
-    @GET
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ANY)
-    @ApiOperation(value = "All workload constraints", response = List.class, httpMethod = HttpMethod.GET)
-    public ConsumersWorkloadConstraints getConsumersWorkloadConstraints() {
-        return service.getConsumersWorkloadConstraints();
-    }
+  @GET
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ANY)
+  @ApiOperation(
+      value = "All workload constraints",
+      response = List.class,
+      httpMethod = HttpMethod.GET)
+  public ConsumersWorkloadConstraints getConsumersWorkloadConstraints() {
+    return service.getConsumersWorkloadConstraints();
+  }
 
-    @PUT
-    @Path("/topic")
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ADMIN)
-    @ApiOperation(value = "Create or update topic constraints", response = String.class, httpMethod = HttpMethod.PUT)
-    public Response createOrUpdateTopicConstraints(
-            @Valid TopicConstraints topicConstraints,
-            @Context ContainerRequestContext requestContext) {
-        RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
-        if (service.constraintsExist(topicConstraints.getTopicName())) {
-            service.updateConstraints(topicConstraints.getTopicName(), topicConstraints.getConstraints(), requestUser);
-            return Response.status(OK).build();
-        } else {
-            service.createConstraints(topicConstraints.getTopicName(), topicConstraints.getConstraints(), requestUser);
-            return Response.status(CREATED).build();
-        }
+  @PUT
+  @Path("/topic")
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ADMIN)
+  @ApiOperation(
+      value = "Create or update topic constraints",
+      response = String.class,
+      httpMethod = HttpMethod.PUT)
+  public Response createOrUpdateTopicConstraints(
+      @Valid TopicConstraints topicConstraints, @Context ContainerRequestContext requestContext) {
+    RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
+    if (service.constraintsExist(topicConstraints.getTopicName())) {
+      service.updateConstraints(
+          topicConstraints.getTopicName(), topicConstraints.getConstraints(), requestUser);
+      return Response.status(OK).build();
+    } else {
+      service.createConstraints(
+          topicConstraints.getTopicName(), topicConstraints.getConstraints(), requestUser);
+      return Response.status(CREATED).build();
     }
+  }
 
-    @DELETE
-    @Path("/topic/{topicName}")
-    @RolesAllowed(Roles.ADMIN)
-    @ApiOperation(value = "Remove topic constraints", response = String.class, httpMethod = HttpMethod.DELETE)
-    public Response deleteTopicConstraints(
-            @PathParam("topicName") String topicName,
-            @Context ContainerRequestContext requestContext) {
-        service.deleteConstraints(TopicName.fromQualifiedName(topicName), new HermesSecurityAwareRequestUser(requestContext));
-        return Response.status(OK).build();
-    }
+  @DELETE
+  @Path("/topic/{topicName}")
+  @RolesAllowed(Roles.ADMIN)
+  @ApiOperation(
+      value = "Remove topic constraints",
+      response = String.class,
+      httpMethod = HttpMethod.DELETE)
+  public Response deleteTopicConstraints(
+      @PathParam("topicName") String topicName, @Context ContainerRequestContext requestContext) {
+    service.deleteConstraints(
+        TopicName.fromQualifiedName(topicName), new HermesSecurityAwareRequestUser(requestContext));
+    return Response.status(OK).build();
+  }
 
-    @PUT
-    @Path("/subscription")
-    @Consumes(APPLICATION_JSON)
-    @Produces(APPLICATION_JSON)
-    @RolesAllowed(Roles.ADMIN)
-    @ApiOperation(value = "Create or update subscription constraints", response = String.class, httpMethod = HttpMethod.PUT)
-    public Response createOrUpdateSubscriptionConstraints(
-            @Valid SubscriptionConstraints subscriptionConstraints,
-            @Context ContainerRequestContext requestContext) {
-        RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
-        if (service.constraintsExist(subscriptionConstraints.getSubscriptionName())) {
-            service.updateConstraints(subscriptionConstraints.getSubscriptionName(), subscriptionConstraints.getConstraints(), requestUser);
-            return Response.status(OK).build();
-        } else {
-            service.createConstraints(subscriptionConstraints.getSubscriptionName(), subscriptionConstraints.getConstraints(), requestUser);
-            return Response.status(CREATED).build();
-        }
+  @PUT
+  @Path("/subscription")
+  @Consumes(APPLICATION_JSON)
+  @Produces(APPLICATION_JSON)
+  @RolesAllowed(Roles.ADMIN)
+  @ApiOperation(
+      value = "Create or update subscription constraints",
+      response = String.class,
+      httpMethod = HttpMethod.PUT)
+  public Response createOrUpdateSubscriptionConstraints(
+      @Valid SubscriptionConstraints subscriptionConstraints,
+      @Context ContainerRequestContext requestContext) {
+    RequestUser requestUser = new HermesSecurityAwareRequestUser(requestContext);
+    if (service.constraintsExist(subscriptionConstraints.getSubscriptionName())) {
+      service.updateConstraints(
+          subscriptionConstraints.getSubscriptionName(),
+          subscriptionConstraints.getConstraints(),
+          requestUser);
+      return Response.status(OK).build();
+    } else {
+      service.createConstraints(
+          subscriptionConstraints.getSubscriptionName(),
+          subscriptionConstraints.getConstraints(),
+          requestUser);
+      return Response.status(CREATED).build();
     }
+  }
 
-    @DELETE
-    @Path("/subscription/{topicName}/{subscriptionName}")
-    @RolesAllowed(Roles.ADMIN)
-    @ApiOperation(value = "Remove subscription constraints", response = String.class, httpMethod = HttpMethod.DELETE)
-    public Response deleteSubscriptionConstraints(@PathParam("topicName") String topicName,
-                                                  @PathParam("subscriptionName") String subscriptionName,
-                                                  @Context ContainerRequestContext requestContext) {
-        service.deleteConstraints(
-                new SubscriptionName(subscriptionName, TopicName.fromQualifiedName(topicName)),
-                new HermesSecurityAwareRequestUser(requestContext)
-        );
-        return Response.status(OK).build();
-    }
+  @DELETE
+  @Path("/subscription/{topicName}/{subscriptionName}")
+  @RolesAllowed(Roles.ADMIN)
+  @ApiOperation(
+      value = "Remove subscription constraints",
+      response = String.class,
+      httpMethod = HttpMethod.DELETE)
+  public Response deleteSubscriptionConstraints(
+      @PathParam("topicName") String topicName,
+      @PathParam("subscriptionName") String subscriptionName,
+      @Context ContainerRequestContext requestContext) {
+    service.deleteConstraints(
+        new SubscriptionName(subscriptionName, TopicName.fromQualifiedName(topicName)),
+        new HermesSecurityAwareRequestUser(requestContext));
+    return Response.status(OK).build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AllowAllSecurityProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AllowAllSecurityProvider.java
index 214e99c5fd..37cfe540d9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AllowAllSecurityProvider.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AllowAllSecurityProvider.java
@@ -2,46 +2,45 @@
 
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.SecurityContext;
-import org.apache.commons.lang.NotImplementedException;
-
 import java.security.Principal;
+import org.apache.commons.lang3.NotImplementedException;
 
 public class AllowAllSecurityProvider implements SecurityProvider {
 
-    @Override
-    public HermesSecurity security(ContainerRequestContext requestContext) {
-        return new HermesSecurity(securityContext(requestContext), ownerId -> true);
-    }
+  @Override
+  public HermesSecurity security(ContainerRequestContext requestContext) {
+    return new HermesSecurity(securityContext(requestContext), ownerId -> true);
+  }
+
+  private SecurityContext securityContext(ContainerRequestContext requestContext) {
+    return new SecurityContext() {
+      @Override
+      public Principal getUserPrincipal() {
+        return new AnonymousUserPrincipal();
+      }
+
+      @Override
+      public boolean isUserInRole(String role) {
+        return true;
+      }
+
+      @Override
+      public boolean isSecure() {
+        throw new NotImplementedException();
+      }
+
+      @Override
+      public String getAuthenticationScheme() {
+        throw new NotImplementedException();
+      }
+    };
+  }
+
+  private static class AnonymousUserPrincipal implements Principal {
 
-    private SecurityContext securityContext(ContainerRequestContext requestContext) {
-        return new SecurityContext() {
-            @Override
-            public Principal getUserPrincipal() {
-                return new AnonymousUserPrincipal();
-            }
-
-            @Override
-            public boolean isUserInRole(String role) {
-                return true;
-            }
-
-            @Override
-            public boolean isSecure() {
-                throw new NotImplementedException();
-            }
-
-            @Override
-            public String getAuthenticationScheme() {
-                throw new NotImplementedException();
-            }
-        };
-    }
-
-    private static class AnonymousUserPrincipal implements Principal {
-
-        @Override
-        public String getName() {
-            return "[anonymous user]";
-        }
+    @Override
+    public String getName() {
+      return "[anonymous user]";
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthException.java
index 3c5906e062..3ba296bb34 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthException.java
@@ -5,16 +5,16 @@
 
 public class AuthException extends ManagementException {
 
-    public AuthException(String message) {
-        super(message);
-    }
-    
-    public AuthException(RuntimeException ex) {
-        super("Exception while authorization: " + ex.getMessage(), ex);
-    }
+  public AuthException(String message) {
+    super(message);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.AUTH_ERROR;
-    }
+  public AuthException(RuntimeException ex) {
+    super("Exception while authorization: " + ex.getMessage(), ex);
+  }
+
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.AUTH_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthorizationFilter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthorizationFilter.java
index 9e8ba437fd..197a39e634 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthorizationFilter.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthorizationFilter.java
@@ -4,30 +4,30 @@
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerRequestFilter;
 import jakarta.ws.rs.ext.Provider;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import java.io.IOException;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @Provider
 @Priority(AuthorizationFilter.AUTHORIZATION_FILTER_PRIORITY)
 public class AuthorizationFilter implements ContainerRequestFilter {
 
-    public static final String OWNERSHIP_RESOLVER = "ownership-resolver";
+  public static final String OWNERSHIP_RESOLVER = "ownership-resolver";
 
-    // fixing equal values reordering issue of Jersey's 2.23.2 RankedComparator (Priorities.AUTHORIZATION=2000)
-    public static final int AUTHORIZATION_FILTER_PRIORITY = 1999;
+  // fixing equal values reordering issue of Jersey's 2.23.2 RankedComparator
+  // (Priorities.AUTHORIZATION=2000)
+  public static final int AUTHORIZATION_FILTER_PRIORITY = 1999;
 
-    private final SecurityProvider securityProvider;
+  private final SecurityProvider securityProvider;
 
-    @Autowired
-    public AuthorizationFilter(SecurityProvider securityProvider) {
-        this.securityProvider = securityProvider;
-    }
+  @Autowired
+  public AuthorizationFilter(SecurityProvider securityProvider) {
+    this.securityProvider = securityProvider;
+  }
 
-    @Override
-    public void filter(ContainerRequestContext requestContext) throws IOException {
-        SecurityProvider.HermesSecurity security = securityProvider.security(requestContext);
-        requestContext.setSecurityContext(security.getSecurityContext());
-        requestContext.setProperty(OWNERSHIP_RESOLVER, security.getOwnershipResolver());
-    }
+  @Override
+  public void filter(ContainerRequestContext requestContext) throws IOException {
+    SecurityProvider.HermesSecurity security = securityProvider.security(requestContext);
+    requestContext.setSecurityContext(security.getSecurityContext());
+    requestContext.setProperty(OWNERSHIP_RESOLVER, security.getOwnershipResolver());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/CreatorRights.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/CreatorRights.java
index fd2daad8bb..2e95c3f3b0 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/CreatorRights.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/CreatorRights.java
@@ -2,7 +2,7 @@
 
 public interface CreatorRights<T> {
 
-    boolean allowedToManage(T entity);
+  boolean allowedToManage(T entity);
 
-    boolean allowedToCreate(T entity);
+  boolean allowedToCreate(T entity);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/HermesSecurityAwareRequestUser.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/HermesSecurityAwareRequestUser.java
index d137b15701..316217f367 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/HermesSecurityAwareRequestUser.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/HermesSecurityAwareRequestUser.java
@@ -7,29 +7,30 @@
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
 
 public class HermesSecurityAwareRequestUser implements RequestUser {
-    private final String username;
-    private final boolean isAdmin;
-    private final OwnershipResolver ownershipResolver;
+  private final String username;
+  private final boolean isAdmin;
+  private final OwnershipResolver ownershipResolver;
 
-    public HermesSecurityAwareRequestUser(ContainerRequestContext requestContext) {
-        SecurityContext securityContext = requestContext.getSecurityContext();
-        username = securityContext.getUserPrincipal().getName();
-        isAdmin = securityContext.isUserInRole(Roles.ADMIN);
-        ownershipResolver = (OwnershipResolver) requestContext.getProperty(AuthorizationFilter.OWNERSHIP_RESOLVER);
-    }
+  public HermesSecurityAwareRequestUser(ContainerRequestContext requestContext) {
+    SecurityContext securityContext = requestContext.getSecurityContext();
+    username = securityContext.getUserPrincipal().getName();
+    isAdmin = securityContext.isUserInRole(Roles.ADMIN);
+    ownershipResolver =
+        (OwnershipResolver) requestContext.getProperty(AuthorizationFilter.OWNERSHIP_RESOLVER);
+  }
 
-    @Override
-    public String getUsername() {
-        return username;
-    }
+  @Override
+  public String getUsername() {
+    return username;
+  }
 
-    @Override
-    public boolean isAdmin() {
-        return isAdmin;
-    }
+  @Override
+  public boolean isAdmin() {
+    return isAdmin;
+  }
 
-    @Override
-    public boolean isOwner(OwnerId ownerId) {
-        return ownershipResolver.isUserAnOwner(ownerId);
-    }
+  @Override
+  public boolean isOwner(OwnerId ownerId) {
+    return ownershipResolver.isUserAnOwner(ownerId);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/ManagementRights.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/ManagementRights.java
index 65c8c3b83e..5584e886e4 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/ManagementRights.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/ManagementRights.java
@@ -8,58 +8,61 @@
 import pl.allegro.tech.hermes.management.config.GroupProperties;
 
 /**
- * Make sure these implementations conform to what is configured via RolesAllowed annotations in endpoints.
+ * Make sure these implementations conform to what is configured via RolesAllowed annotations in
+ * endpoints.
  */
 @Component
 public class ManagementRights {
 
-    private final GroupProperties groupProperties;
+  private final GroupProperties groupProperties;
 
-    @Autowired
-    public ManagementRights(GroupProperties groupProperties) {
-        this.groupProperties = groupProperties;
-    }
+  @Autowired
+  public ManagementRights(GroupProperties groupProperties) {
+    this.groupProperties = groupProperties;
+  }
 
-    public boolean isUserAllowedToManageTopic(Topic topic, ContainerRequestContext requestContext) {
-        return isAdmin(requestContext)
-                || getOwnershipResolver(requestContext).isUserAnOwner(topic.getOwner());
-    }
+  public boolean isUserAllowedToManageTopic(Topic topic, ContainerRequestContext requestContext) {
+    return isAdmin(requestContext)
+        || getOwnershipResolver(requestContext).isUserAnOwner(topic.getOwner());
+  }
 
-    public boolean isUserAllowedToCreateGroup(ContainerRequestContext requestContext) {
-        return isAdmin(requestContext) || groupProperties.isNonAdminCreationEnabled();
-    }
+  public boolean isUserAllowedToCreateGroup(ContainerRequestContext requestContext) {
+    return isAdmin(requestContext) || groupProperties.isNonAdminCreationEnabled();
+  }
 
-    private boolean isUserAllowedToManageGroup(ContainerRequestContext requestContext) {
-        return isAdmin(requestContext);
-    }
+  private boolean isUserAllowedToManageGroup(ContainerRequestContext requestContext) {
+    return isAdmin(requestContext);
+  }
 
-    private boolean isAdmin(ContainerRequestContext requestContext) {
-        return requestContext.getSecurityContext().isUserInRole(Roles.ADMIN);
-    }
+  private boolean isAdmin(ContainerRequestContext requestContext) {
+    return requestContext.getSecurityContext().isUserInRole(Roles.ADMIN);
+  }
 
-    private SecurityProvider.OwnershipResolver getOwnershipResolver(ContainerRequestContext requestContext) {
-        return (SecurityProvider.OwnershipResolver) requestContext.getProperty(AuthorizationFilter.OWNERSHIP_RESOLVER);
-    }
+  private SecurityProvider.OwnershipResolver getOwnershipResolver(
+      ContainerRequestContext requestContext) {
+    return (SecurityProvider.OwnershipResolver)
+        requestContext.getProperty(AuthorizationFilter.OWNERSHIP_RESOLVER);
+  }
 
-    public CreatorRights<Group> getGroupCreatorRights(ContainerRequestContext requestContext) {
-        return new GroupCreatorRights(requestContext);
-    }
+  public CreatorRights<Group> getGroupCreatorRights(ContainerRequestContext requestContext) {
+    return new GroupCreatorRights(requestContext);
+  }
 
-    class GroupCreatorRights implements CreatorRights<Group> {
-        private ContainerRequestContext requestContext;
+  class GroupCreatorRights implements CreatorRights<Group> {
+    private ContainerRequestContext requestContext;
 
-        GroupCreatorRights(ContainerRequestContext requestContext) {
-            this.requestContext = requestContext;
-        }
+    GroupCreatorRights(ContainerRequestContext requestContext) {
+      this.requestContext = requestContext;
+    }
 
-        @Override
-        public boolean allowedToManage(Group group) {
-            return ManagementRights.this.isUserAllowedToManageGroup(requestContext);
-        }
+    @Override
+    public boolean allowedToManage(Group group) {
+      return ManagementRights.this.isUserAllowedToManageGroup(requestContext);
+    }
 
-        @Override
-        public boolean allowedToCreate(Group group) {
-            return ManagementRights.this.isUserAllowedToCreateGroup(requestContext);
-        }
+    @Override
+    public boolean allowedToCreate(Group group) {
+      return ManagementRights.this.isUserAllowedToCreateGroup(requestContext);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/Roles.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/Roles.java
index 2a8f7a84d9..5bff68ddb2 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/Roles.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/Roles.java
@@ -1,8 +1,8 @@
 package pl.allegro.tech.hermes.management.api.auth;
 
 public final class Roles {
-    public static final String ANY = "any";
-    public static final String ADMIN = "admin";
-    public static final String TOPIC_OWNER = "topicOwner";
-    public static final String SUBSCRIPTION_OWNER = "subscriptionOwner";
+  public static final String ANY = "any";
+  public static final String ADMIN = "admin";
+  public static final String TOPIC_OWNER = "topicOwner";
+  public static final String SUBSCRIPTION_OWNER = "subscriptionOwner";
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/SecurityProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/SecurityProvider.java
index 7806a61420..ccfd7ae87b 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/SecurityProvider.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/SecurityProvider.java
@@ -6,28 +6,27 @@
 
 public interface SecurityProvider {
 
-    HermesSecurity security(ContainerRequestContext requestContext);
+  HermesSecurity security(ContainerRequestContext requestContext);
 
-    class HermesSecurity {
-        private final SecurityContext securityContext;
-        private final OwnershipResolver ownershipResolver;
+  class HermesSecurity {
+    private final SecurityContext securityContext;
+    private final OwnershipResolver ownershipResolver;
 
-        public HermesSecurity(SecurityContext securityContext, OwnershipResolver ownershipResolver) {
-            this.securityContext = securityContext;
-            this.ownershipResolver = ownershipResolver;
-        }
-
-        public SecurityContext getSecurityContext() {
-            return securityContext;
-        }
+    public HermesSecurity(SecurityContext securityContext, OwnershipResolver ownershipResolver) {
+      this.securityContext = securityContext;
+      this.ownershipResolver = ownershipResolver;
+    }
 
-        public OwnershipResolver getOwnershipResolver() {
-            return ownershipResolver;
-        }
+    public SecurityContext getSecurityContext() {
+      return securityContext;
     }
 
-    interface OwnershipResolver {
-        boolean isUserAnOwner(OwnerId owner);
+    public OwnershipResolver getOwnershipResolver() {
+      return ownershipResolver;
     }
+  }
 
+  interface OwnershipResolver {
+    boolean isUserAnOwner(OwnerId owner);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AbstractExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AbstractExceptionMapper.java
index 512ba3b3e6..46aa32d93b 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AbstractExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AbstractExceptionMapper.java
@@ -8,20 +8,19 @@
 
 abstract class AbstractExceptionMapper<T extends Throwable> implements ExceptionMapper<T> {
 
-    @Override
-    public Response toResponse(T exception) {
-        return Response
-            .status(httpStatus())
-            .type(MediaType.APPLICATION_JSON_TYPE)
-            .entity(new ErrorDescription(errorMessage(exception), errorCode()))
-            .build();
-    }
+  @Override
+  public Response toResponse(T exception) {
+    return Response.status(httpStatus())
+        .type(MediaType.APPLICATION_JSON_TYPE)
+        .entity(new ErrorDescription(errorMessage(exception), errorCode()))
+        .build();
+  }
 
-    String errorMessage(T exception) {
-        return exception.getMessage();
-    }
+  String errorMessage(T exception) {
+    return exception.getMessage();
+  }
 
-    abstract Response.Status httpStatus();
+  abstract Response.Status httpStatus();
 
-    abstract ErrorCode errorCode();
+  abstract ErrorCode errorCode();
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AuthExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AuthExceptionMapper.java
index c10e42caab..2ff79c0b05 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AuthExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AuthExceptionMapper.java
@@ -8,13 +8,13 @@
 @Provider
 public class AuthExceptionMapper extends AbstractExceptionMapper<AuthException> {
 
-    @Override
-    Response.Status httpStatus() {
-        return Response.Status.FORBIDDEN;
-    }
+  @Override
+  Response.Status httpStatus() {
+    return Response.Status.FORBIDDEN;
+  }
 
-    @Override
-    ErrorCode errorCode() {
-        return ErrorCode.AUTH_ERROR;
-    }
-}
\ No newline at end of file
+  @Override
+  ErrorCode errorCode() {
+    return ErrorCode.AUTH_ERROR;
+  }
+}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ConstraintViolationMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ConstraintViolationMapper.java
index 69a6054a31..a16acfa69a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ConstraintViolationMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ConstraintViolationMapper.java
@@ -6,43 +6,44 @@
 import jakarta.validation.ConstraintViolationException;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
+import java.util.List;
 import org.glassfish.jersey.server.validation.ValidationErrorData;
 import org.glassfish.jersey.server.validation.internal.ValidationHelper;
 import pl.allegro.tech.hermes.api.ErrorCode;
 
-import java.util.List;
-
 @Provider
-public class ConstraintViolationMapper extends AbstractExceptionMapper<ConstraintViolationException> {
-
+public class ConstraintViolationMapper
+    extends AbstractExceptionMapper<ConstraintViolationException> {
+
+  @Override
+  Response.Status httpStatus() {
+    return Response.Status.BAD_REQUEST;
+  }
+
+  @Override
+  ErrorCode errorCode() {
+    return ErrorCode.VALIDATION_ERROR;
+  }
+
+  @Override
+  public String errorMessage(ConstraintViolationException exception) {
+    return prepareMessage(exception);
+  }
+
+  private String prepareMessage(ConstraintViolationException ex) {
+    List<String> errors =
+        Lists.transform(
+            ValidationHelper.constraintViolationToValidationErrors(ex),
+            new ValidationErrorDataConverter());
+
+    return Joiner.on("; ").join(errors);
+  }
+
+  private static final class ValidationErrorDataConverter
+      implements Function<ValidationErrorData, String> {
     @Override
-    Response.Status httpStatus() {
-        return Response.Status.BAD_REQUEST;
-    }
-
-    @Override
-    ErrorCode errorCode() {
-        return ErrorCode.VALIDATION_ERROR;
-    }
-
-    @Override
-    public String errorMessage(ConstraintViolationException exception) {
-        return prepareMessage(exception);
-    }
-
-    private String prepareMessage(ConstraintViolationException ex) {
-        List<String> errors = Lists.transform(
-                ValidationHelper.constraintViolationToValidationErrors(ex),
-                new ValidationErrorDataConverter()
-        );
-
-        return Joiner.on("; ").join(errors);
-    }
-
-    private static final class ValidationErrorDataConverter implements Function<ValidationErrorData, String> {
-        @Override
-        public String apply(ValidationErrorData input) {
-            return input.getPath() + " " + input.getMessage();
-        }
+    public String apply(ValidationErrorData input) {
+      return input.getPath() + " " + input.getMessage();
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/HermesExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/HermesExceptionMapper.java
index 0939d066f6..0b96a6ed8c 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/HermesExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/HermesExceptionMapper.java
@@ -10,12 +10,11 @@
 @Provider
 public class HermesExceptionMapper implements ExceptionMapper<HermesException> {
 
-    @Override
-    public Response toResponse(HermesException exception) {
-        return Response
-                .status(exception.getCode().getHttpCode())
-                .type(MediaType.APPLICATION_JSON_TYPE)
-                .entity(new ErrorDescription(exception.getMessage(), exception.getCode()))
-                .build();
-    }
+  @Override
+  public Response toResponse(HermesException exception) {
+    return Response.status(exception.getCode().getHttpCode())
+        .type(MediaType.APPLICATION_JSON_TYPE)
+        .entity(new ErrorDescription(exception.getMessage(), exception.getCode()))
+        .build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IOExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IOExceptionMapper.java
index 7c2e24a17a..c0dc20b126 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IOExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IOExceptionMapper.java
@@ -2,20 +2,19 @@
 
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
-import pl.allegro.tech.hermes.api.ErrorCode;
-
 import java.io.IOException;
+import pl.allegro.tech.hermes.api.ErrorCode;
 
 @Provider
 public class IOExceptionMapper extends AbstractExceptionMapper<IOException> {
 
-    @Override
-    Response.Status httpStatus() {
-        return Response.Status.BAD_REQUEST;
-    }
+  @Override
+  Response.Status httpStatus() {
+    return Response.Status.BAD_REQUEST;
+  }
 
-    @Override
-    ErrorCode errorCode() {
-        return ErrorCode.OTHER;
-    }
+  @Override
+  ErrorCode errorCode() {
+    return ErrorCode.OTHER;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IllegalArgumentExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IllegalArgumentExceptionMapper.java
index 2e0fa74bf1..5353a52c33 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IllegalArgumentExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IllegalArgumentExceptionMapper.java
@@ -5,15 +5,16 @@
 import pl.allegro.tech.hermes.api.ErrorCode;
 
 @Provider
-public class IllegalArgumentExceptionMapper extends AbstractExceptionMapper<IllegalArgumentException> {
+public class IllegalArgumentExceptionMapper
+    extends AbstractExceptionMapper<IllegalArgumentException> {
 
-    @Override
-    Response.Status httpStatus() {
-        return Response.Status.BAD_REQUEST;
-    }
+  @Override
+  Response.Status httpStatus() {
+    return Response.Status.BAD_REQUEST;
+  }
 
-    @Override
-    ErrorCode errorCode() {
-        return ErrorCode.OTHER;
-    }
+  @Override
+  ErrorCode errorCode() {
+    return ErrorCode.OTHER;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonMappingExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonMappingExceptionMapper.java
index 145ac5d5dd..6d6587b8b2 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonMappingExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonMappingExceptionMapper.java
@@ -8,13 +8,13 @@
 @Provider
 public class JsonMappingExceptionMapper extends AbstractExceptionMapper<JsonMappingException> {
 
-    @Override
-    Response.Status httpStatus() {
-        return Response.Status.BAD_REQUEST;
-    }
+  @Override
+  Response.Status httpStatus() {
+    return Response.Status.BAD_REQUEST;
+  }
 
-    @Override
-    ErrorCode errorCode() {
-        return ErrorCode.FORMAT_ERROR;
-    }
+  @Override
+  ErrorCode errorCode() {
+    return ErrorCode.FORMAT_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonParseExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonParseExceptionMapper.java
index df1c7b5e50..4d7a85579f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonParseExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonParseExceptionMapper.java
@@ -8,13 +8,13 @@
 @Provider
 public class JsonParseExceptionMapper extends AbstractExceptionMapper<JsonParseException> {
 
-    @Override
-    Response.Status httpStatus() {
-        return Response.Status.BAD_REQUEST;
-    }
+  @Override
+  Response.Status httpStatus() {
+    return Response.Status.BAD_REQUEST;
+  }
 
-    @Override
-    ErrorCode errorCode() {
-        return ErrorCode.FORMAT_ERROR;
-    }
+  @Override
+  ErrorCode errorCode() {
+    return ErrorCode.FORMAT_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ManagementExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ManagementExceptionMapper.java
index 8b713d23cd..d28950cfb3 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ManagementExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ManagementExceptionMapper.java
@@ -10,12 +10,11 @@
 @Provider
 public class ManagementExceptionMapper implements ExceptionMapper<ManagementException> {
 
-    @Override
-    public Response toResponse(ManagementException exception) {
-        return Response
-                .status(exception.getCode().getHttpCode())
-                .type(MediaType.APPLICATION_JSON_TYPE)
-                .entity(new ErrorDescription(exception.getMessage(), exception.getCode()))
-                .build();
-    }
+  @Override
+  public Response toResponse(ManagementException exception) {
+    return Response.status(exception.getCode().getHttpCode())
+        .type(MediaType.APPLICATION_JSON_TYPE)
+        .entity(new ErrorDescription(exception.getMessage(), exception.getCode()))
+        .build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/NotSupportedExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/NotSupportedExceptionMapper.java
index 199880661e..dea6828f4f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/NotSupportedExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/NotSupportedExceptionMapper.java
@@ -8,13 +8,13 @@
 @Provider
 public class NotSupportedExceptionMapper extends AbstractExceptionMapper<NotSupportedException> {
 
-    @Override
-    Response.Status httpStatus() {
-        return Response.Status.UNSUPPORTED_MEDIA_TYPE;
-    }
+  @Override
+  Response.Status httpStatus() {
+    return Response.Status.UNSUPPORTED_MEDIA_TYPE;
+  }
 
-    @Override
-    ErrorCode errorCode() {
-        return ErrorCode.VALIDATION_ERROR;
-    }
+  @Override
+  ErrorCode errorCode() {
+    return ErrorCode.VALIDATION_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ParseExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ParseExceptionMapper.java
index 1818c91371..d57ee86b6f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ParseExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ParseExceptionMapper.java
@@ -8,13 +8,13 @@
 @Provider
 public class ParseExceptionMapper extends AbstractExceptionMapper<ParseException> {
 
-    @Override
-    Response.Status httpStatus() {
-        return Response.Status.BAD_REQUEST;
-    }
+  @Override
+  Response.Status httpStatus() {
+    return Response.Status.BAD_REQUEST;
+  }
 
-    @Override
-    ErrorCode errorCode() {
-        return ErrorCode.FORMAT_ERROR;
-    }
+  @Override
+  ErrorCode errorCode() {
+    return ErrorCode.FORMAT_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/RuntimeExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/RuntimeExceptionMapper.java
index 18884b3171..5960a476cb 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/RuntimeExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/RuntimeExceptionMapper.java
@@ -12,15 +12,14 @@
 @Provider
 public class RuntimeExceptionMapper implements ExceptionMapper<RuntimeException> {
 
-    private final Logger logger = LoggerFactory.getLogger(RuntimeExceptionMapper.class);
+  private final Logger logger = LoggerFactory.getLogger(RuntimeExceptionMapper.class);
 
-    @Override
-    public Response toResponse(RuntimeException exception) {
-        logger.warn("Caught unmapped exception: {}", exception.getClass().getSimpleName(), exception);
-        return Response
-                .status(Response.Status.INTERNAL_SERVER_ERROR)
-                .type(MediaType.APPLICATION_JSON_TYPE)
-                .entity(new ErrorDescription(exception.getMessage(), ErrorCode.OTHER))
-                .build();
-    }
+  @Override
+  public Response toResponse(RuntimeException exception) {
+    logger.warn("Caught unmapped exception: {}", exception.getClass().getSimpleName(), exception);
+    return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+        .type(MediaType.APPLICATION_JSON_TYPE)
+        .entity(new ErrorDescription(exception.getMessage(), ErrorCode.OTHER))
+        .build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/SchemaExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/SchemaExceptionMapper.java
index 547661b082..f1ac42de30 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/SchemaExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/SchemaExceptionMapper.java
@@ -10,12 +10,11 @@
 @Provider
 public class SchemaExceptionMapper implements ExceptionMapper<SchemaException> {
 
-    @Override
-    public Response toResponse(SchemaException exception) {
-        return Response
-                .status(exception.getCode().getHttpCode())
-                .type(MediaType.APPLICATION_JSON_TYPE)
-                .entity(new ErrorDescription(exception.getMessage(), exception.getCode()))
-                .build();
-    }
+  @Override
+  public Response toResponse(SchemaException exception) {
+    return Response.status(exception.getCode().getHttpCode())
+        .type(MediaType.APPLICATION_JSON_TYPE)
+        .entity(new ErrorDescription(exception.getMessage(), exception.getCode()))
+        .build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/WebApplicationExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/WebApplicationExceptionMapper.java
index e3680aced5..53b5e6c20d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/WebApplicationExceptionMapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/WebApplicationExceptionMapper.java
@@ -11,12 +11,11 @@
 @Provider
 public class WebApplicationExceptionMapper implements ExceptionMapper<WebApplicationException> {
 
-    @Override
-    public Response toResponse(WebApplicationException exception) {
-        return Response
-                .status(exception.getResponse().getStatus())
-                .type(MediaType.APPLICATION_JSON_TYPE)
-                .entity(new ErrorDescription(exception.getMessage(), ErrorCode.OTHER))
-                .build();
-    }
+  @Override
+  public Response toResponse(WebApplicationException exception) {
+    return Response.status(exception.getResponse().getStatus())
+        .type(MediaType.APPLICATION_JSON_TYPE)
+        .entity(new ErrorDescription(exception.getMessage(), ErrorCode.OTHER))
+        .build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/reader/QueryBodyReader.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/reader/QueryBodyReader.java
index 33cdedf61d..2d06bb9a9e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/reader/QueryBodyReader.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/reader/QueryBodyReader.java
@@ -6,45 +6,47 @@
 import jakarta.ws.rs.core.MultivaluedMap;
 import jakarta.ws.rs.ext.MessageBodyReader;
 import jakarta.ws.rs.ext.Provider;
-import org.springframework.beans.factory.annotation.Autowired;
-import pl.allegro.tech.hermes.api.Query;
-import pl.allegro.tech.hermes.management.infrastructure.query.parser.QueryParser;
-import pl.allegro.tech.hermes.management.infrastructure.query.parser.json.JsonQueryParser;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import org.springframework.beans.factory.annotation.Autowired;
+import pl.allegro.tech.hermes.api.Query;
+import pl.allegro.tech.hermes.management.infrastructure.query.parser.QueryParser;
+import pl.allegro.tech.hermes.management.infrastructure.query.parser.json.JsonQueryParser;
 
 @Provider
 public class QueryBodyReader implements MessageBodyReader<Query> {
 
-    private final ObjectMapper objectMapper;
-
-    @Autowired
-    public QueryBodyReader(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-    }
-
-    @Override
-    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
-        return type == Query.class;
-    }
-
-    @Override
-    public Query readFrom(Class<Query> type,
-                          Type genericType,
-                          Annotation[] annotations,
-                          MediaType mediaType,
-                          MultivaluedMap<String, String> httpHeaders,
-                          InputStream entityStream) throws IOException, WebApplicationException {
-
-        Class<?> queryType = Object.class;
-        if (genericType instanceof ParameterizedType) {
-            queryType = (Class<?>) ((ParameterizedType) genericType).getRawType();
-        }
-        QueryParser parser = new JsonQueryParser(objectMapper);
-        return parser.parse(entityStream, queryType);
+  private final ObjectMapper objectMapper;
+
+  @Autowired
+  public QueryBodyReader(ObjectMapper objectMapper) {
+    this.objectMapper = objectMapper;
+  }
+
+  @Override
+  public boolean isReadable(
+      Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+    return type == Query.class;
+  }
+
+  @Override
+  public Query readFrom(
+      Class<Query> type,
+      Type genericType,
+      Annotation[] annotations,
+      MediaType mediaType,
+      MultivaluedMap<String, String> httpHeaders,
+      InputStream entityStream)
+      throws IOException, WebApplicationException {
+
+    Class<?> queryType = Object.class;
+    if (genericType instanceof ParameterizedType) {
+      queryType = (Class<?>) ((ParameterizedType) genericType).getRawType();
     }
+    QueryParser parser = new JsonQueryParser(objectMapper);
+    return parser.parse(entityStream, queryType);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/validator/ApiPreconditions.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/validator/ApiPreconditions.java
index 4c4b8cadd1..ff3fd65501 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/validator/ApiPreconditions.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/validator/ApiPreconditions.java
@@ -5,29 +5,28 @@
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 import jakarta.validation.groups.Default;
+import java.util.Set;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.constraints.AdminPermitted;
 
-import java.util.Set;
-
 @Component
 public class ApiPreconditions {
 
-    private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
+  private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
 
-    public <T> void checkConstraints(T object, boolean skipAdminPermitted) {
-        Class<?>[] groups = groupsToValidate(skipAdminPermitted);
-        Set<ConstraintViolation<T>> violations = validator.validate(object, groups);
-        if (!violations.isEmpty()) {
-            throw new ConstraintViolationException(violations);
-        }
+  public <T> void checkConstraints(T object, boolean skipAdminPermitted) {
+    Class<?>[] groups = groupsToValidate(skipAdminPermitted);
+    Set<ConstraintViolation<T>> violations = validator.validate(object, groups);
+    if (!violations.isEmpty()) {
+      throw new ConstraintViolationException(violations);
     }
+  }
 
-    private Class<?>[] groupsToValidate(boolean skipAdminPermitted) {
-        if (skipAdminPermitted) {
-            return new Class[] {Default.class};
-        } else {
-            return new Class[] {Default.class, AdminPermitted.class};
-        }
+  private Class<?>[] groupsToValidate(boolean skipAdminPermitted) {
+    if (skipAdminPermitted) {
+      return new Class[] {Default.class};
+    } else {
+      return new Class[] {Default.class, AdminPermitted.class};
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/writer/UnhealthySubscriptionListPlainTextBodyWriter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/writer/UnhealthySubscriptionListPlainTextBodyWriter.java
index 0226d34d77..9517209b89 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/writer/UnhealthySubscriptionListPlainTextBodyWriter.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/writer/UnhealthySubscriptionListPlainTextBodyWriter.java
@@ -1,65 +1,71 @@
 package pl.allegro.tech.hermes.management.api.writer;
 
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+import static java.util.stream.Collectors.joining;
+
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.MultivaluedMap;
 import jakarta.ws.rs.ext.MessageBodyWriter;
 import jakarta.ws.rs.ext.Provider;
-import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
-import pl.allegro.tech.hermes.api.UnhealthySubscription;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
-
-import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-import static java.util.stream.Collectors.joining;
+import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
+import pl.allegro.tech.hermes.api.UnhealthySubscription;
 
 @Provider
 @Produces(TEXT_PLAIN)
-public class UnhealthySubscriptionListPlainTextBodyWriter implements MessageBodyWriter<List<UnhealthySubscription>> {
+public class UnhealthySubscriptionListPlainTextBodyWriter
+    implements MessageBodyWriter<List<UnhealthySubscription>> {
 
-    private static String toPlainText(UnhealthySubscription unhealthySubscription) {
-        String problemDescriptions = unhealthySubscription.getProblems().stream()
-                .map(SubscriptionHealthProblem::getDescription)
-                .collect(joining("; "));
-        return unhealthySubscription.getName() + " - " + problemDescriptions;
-    }
+  private static String toPlainText(UnhealthySubscription unhealthySubscription) {
+    String problemDescriptions =
+        unhealthySubscription.getProblems().stream()
+            .map(SubscriptionHealthProblem::getDescription)
+            .collect(joining("; "));
+    return unhealthySubscription.getName() + " - " + problemDescriptions;
+  }
 
-    @Override
-    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
-        if (List.class.isAssignableFrom(type) && genericType instanceof ParameterizedType) {
-            ParameterizedType parameterizedType = (ParameterizedType) genericType;
-            Type[] actualTypeArgs = parameterizedType.getActualTypeArguments();
-            return actualTypeArgs.length == 1 && actualTypeArgs[0].equals(UnhealthySubscription.class);
-        }
-        return false;
+  @Override
+  public boolean isWriteable(
+      Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+    if (List.class.isAssignableFrom(type) && genericType instanceof ParameterizedType) {
+      ParameterizedType parameterizedType = (ParameterizedType) genericType;
+      Type[] actualTypeArgs = parameterizedType.getActualTypeArguments();
+      return actualTypeArgs.length == 1 && actualTypeArgs[0].equals(UnhealthySubscription.class);
     }
+    return false;
+  }
 
-    @Override
-    public long getSize(List<UnhealthySubscription> unhealthySubscriptionList,
-                        Class<?> type,
-                        Type genericType,
-                        Annotation[] annotations,
-                        MediaType mediaType) {
-        return -1; // According to JAX-RS 2.0 spec this method is deprecated and should return -1
-    }
+  @Override
+  public long getSize(
+      List<UnhealthySubscription> unhealthySubscriptionList,
+      Class<?> type,
+      Type genericType,
+      Annotation[] annotations,
+      MediaType mediaType) {
+    return -1; // According to JAX-RS 2.0 spec this method is deprecated and should return -1
+  }
 
-    @Override
-    public void writeTo(List<UnhealthySubscription> unhealthySubscriptionList,
-                        Class<?> type,
-                        Type genericType,
-                        Annotation[] annotations,
-                        MediaType mediaType,
-                        MultivaluedMap<String, Object> httpHeaders,
-                        OutputStream entityStream) throws IOException, WebApplicationException {
-        String body = unhealthySubscriptionList.stream()
-                .map(UnhealthySubscriptionListPlainTextBodyWriter::toPlainText)
-                .collect(joining("\r\n"));
-        entityStream.write(body.getBytes());
-    }
+  @Override
+  public void writeTo(
+      List<UnhealthySubscription> unhealthySubscriptionList,
+      Class<?> type,
+      Type genericType,
+      Annotation[] annotations,
+      MediaType mediaType,
+      MultivaluedMap<String, Object> httpHeaders,
+      OutputStream entityStream)
+      throws IOException, WebApplicationException {
+    String body =
+        unhealthySubscriptionList.stream()
+            .map(UnhealthySubscriptionListPlainTextBodyWriter::toPlainText)
+            .collect(joining("\r\n"));
+    entityStream.write(body.getBytes());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AllTopicClientsConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AllTopicClientsConfiguration.java
index d2286cdcfc..4e40b57c72 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AllTopicClientsConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AllTopicClientsConfiguration.java
@@ -12,12 +12,13 @@
 @Configuration
 public class AllTopicClientsConfiguration {
 
-    private static final Logger logger = LoggerFactory.getLogger(AllTopicClientsConfiguration.class);
+  private static final Logger logger = LoggerFactory.getLogger(AllTopicClientsConfiguration.class);
 
-    @Bean
-    @ConditionalOnMissingBean(AllTopicClientsService.class)
-    public AllTopicClientsService allTopicClientsService(SubscriptionRepository subscriptionRepository) {
-        logger.info("Creating allTopicClientsService bean");
-        return new DefaultAllTopicClientsService(subscriptionRepository);
-    }
+  @Bean
+  @ConditionalOnMissingBean(AllTopicClientsService.class)
+  public AllTopicClientsService allTopicClientsService(
+      SubscriptionRepository subscriptionRepository) {
+    logger.info("Creating allTopicClientsService bean");
+    return new DefaultAllTopicClientsService(subscriptionRepository);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AuditConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AuditConfiguration.java
index 9b6c4b3f4f..b2d4c44eef 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AuditConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AuditConfiguration.java
@@ -1,6 +1,7 @@
 package pl.allegro.tech.hermes.management.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collection;
 import org.javers.core.Javers;
 import org.javers.core.JaversBuilder;
 import org.javers.core.metamodel.clazz.EntityDefinitionBuilder;
@@ -24,58 +25,60 @@
 import pl.allegro.tech.hermes.management.infrastructure.audit.EventAuditor;
 import pl.allegro.tech.hermes.management.infrastructure.audit.LoggingAuditor;
 
-import java.util.Collection;
-
 @Configuration
 @EnableConfigurationProperties({AuditProperties.class})
 public class AuditConfiguration {
 
-    private static final Logger logger = LoggerFactory.getLogger(AuditConfiguration.class);
+  private static final Logger logger = LoggerFactory.getLogger(AuditConfiguration.class);
 
-    @Bean(name = "eventAuditorRestTemplate")
-    @ConditionalOnMissingBean(name = "eventAuditorRestTemplate")
-    public RestTemplate eventAuditorRestTemplate() {
-        logger.info("Creating eventAuditorRestTemplate bean");
-        return new RestTemplateBuilder().build();
-    }
+  @Bean(name = "eventAuditorRestTemplate")
+  @ConditionalOnMissingBean(name = "eventAuditorRestTemplate")
+  public RestTemplate eventAuditorRestTemplate() {
+    logger.info("Creating eventAuditorRestTemplate bean");
+    return new RestTemplateBuilder().build();
+  }
 
-    @Bean
-    @ConditionalOnProperty(prefix = "audit", value = "isLoggingAuditEnabled", havingValue = "true")
-    public LoggingAuditor loggingAuditor(ObjectMapper objectMapper) {
-        return new LoggingAuditor(javers(), objectMapper);
-    }
+  @Bean
+  @ConditionalOnProperty(prefix = "audit", value = "isLoggingAuditEnabled", havingValue = "true")
+  public LoggingAuditor loggingAuditor(ObjectMapper objectMapper) {
+    return new LoggingAuditor(javers(), objectMapper);
+  }
 
-    @Bean
-    @ConditionalOnProperty(prefix = "audit", value = "isEventAuditEnabled", havingValue = "true")
-    public EventAuditor eventAuditor(
-            AuditProperties auditProperties,
-            @Qualifier("eventAuditorRestTemplate") RestTemplate eventAuditorRestTemplate,
-            ObjectMapper objectMapper
-    ) {
-        return new EventAuditor(javers(), eventAuditorRestTemplate, auditProperties.getEventUrl(), objectMapper);
-    }
+  @Bean
+  @ConditionalOnProperty(prefix = "audit", value = "isEventAuditEnabled", havingValue = "true")
+  public EventAuditor eventAuditor(
+      AuditProperties auditProperties,
+      @Qualifier("eventAuditorRestTemplate") RestTemplate eventAuditorRestTemplate,
+      ObjectMapper objectMapper) {
+    return new EventAuditor(
+        javers(), eventAuditorRestTemplate, auditProperties.getEventUrl(), objectMapper);
+  }
 
-    @Bean
-    @Primary
-    public CompositeAuditor compositeAuditor(Collection<Auditor> auditors) {
-        return new CompositeAuditor(auditors);
-    }
+  @Bean
+  @Primary
+  public CompositeAuditor compositeAuditor(Collection<Auditor> auditors) {
+    return new CompositeAuditor(auditors);
+  }
 
-    private Javers javers() {
-        return JaversBuilder.javers()
-                .withPrettyPrint(false)
-                .registerEntity(EntityDefinitionBuilder.entityDefinition(Group.class)
-                        .withIdPropertyName("groupName")
-                        .build())
-                .registerEntity(EntityDefinitionBuilder.entityDefinition(Topic.class)
-                        .withIdPropertyName("name")
-                        .build())
-                .registerEntity(EntityDefinitionBuilder.entityDefinition(Subscription.class)
-                        .withIdPropertyName("name")
-                        .build())
-                .registerEntity(EntityDefinitionBuilder.entityDefinition(OAuthProvider.class)
-                        .withIdPropertyName("name")
-                        .build())
-                .build();
-    }
+  private Javers javers() {
+    return JaversBuilder.javers()
+        .withPrettyPrint(false)
+        .registerEntity(
+            EntityDefinitionBuilder.entityDefinition(Group.class)
+                .withIdPropertyName("groupName")
+                .build())
+        .registerEntity(
+            EntityDefinitionBuilder.entityDefinition(Topic.class)
+                .withIdPropertyName("name")
+                .build())
+        .registerEntity(
+            EntityDefinitionBuilder.entityDefinition(Subscription.class)
+                .withIdPropertyName("name")
+                .build())
+        .registerEntity(
+            EntityDefinitionBuilder.entityDefinition(OAuthProvider.class)
+                .withIdPropertyName("name")
+                .build())
+        .build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AuditProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AuditProperties.java
index f4d63f41d6..b1c2797e8b 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AuditProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AuditProperties.java
@@ -5,13 +5,13 @@
 @ConfigurationProperties(prefix = "audit")
 class AuditProperties {
 
-    private String eventUrl = null;
+  private String eventUrl = null;
 
-    public String getEventUrl() {
-        return eventUrl;
-    }
+  public String getEventUrl() {
+    return eventUrl;
+  }
 
-    public void setEventUrl(String eventUrl) {
-        this.eventUrl = eventUrl;
-    }
+  public void setEventUrl(String eventUrl) {
+    this.eventUrl = eventUrl;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AvroConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AvroConfiguration.java
index a1f87c8376..4dd4feeaa5 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AvroConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/AvroConfiguration.java
@@ -7,8 +7,8 @@
 @Configuration
 public class AvroConfiguration {
 
-    @Bean
-    JsonAvroConverter jsonAvroConverter() {
-        return new JsonAvroConverter();
-    }
+  @Bean
+  JsonAvroConverter jsonAvroConverter() {
+    return new JsonAvroConverter();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ConsistencyCheckerProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ConsistencyCheckerProperties.java
index 382e2c2ca5..87388fa4ad 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ConsistencyCheckerProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ConsistencyCheckerProperties.java
@@ -1,17 +1,45 @@
 package pl.allegro.tech.hermes.management.config;
 
+import java.time.Duration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "consistency-checker")
 public class ConsistencyCheckerProperties {
 
-    private int threadPoolSize = 2;
+  private int threadPoolSize = 2;
+  private boolean periodicCheckEnabled = false;
+  private Duration refreshInterval = Duration.ofMinutes(15);
+  private Duration initialRefreshDelay = Duration.ofMinutes(2);
 
-    public int getThreadPoolSize() {
-        return threadPoolSize;
-    }
+  public int getThreadPoolSize() {
+    return threadPoolSize;
+  }
 
-    public void setThreadPoolSize(int threadPoolSize) {
-        this.threadPoolSize = threadPoolSize;
-    }
+  public void setThreadPoolSize(int threadPoolSize) {
+    this.threadPoolSize = threadPoolSize;
+  }
+
+  public boolean isPeriodicCheckEnabled() {
+    return periodicCheckEnabled;
+  }
+
+  public void setPeriodicCheckEnabled(boolean periodicCheckEnabled) {
+    this.periodicCheckEnabled = periodicCheckEnabled;
+  }
+
+  public Duration getRefreshInterval() {
+    return refreshInterval;
+  }
+
+  public void setRefreshInterval(Duration refreshInterval) {
+    this.refreshInterval = refreshInterval;
+  }
+
+  public Duration getInitialRefreshDelay() {
+    return initialRefreshDelay;
+  }
+
+  public void setInitialRefreshDelay(Duration initialRefreshDelay) {
+    this.initialRefreshDelay = initialRefreshDelay;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CorsConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CorsConfiguration.java
index 093f9d1ff4..aef7d39534 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CorsConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CorsConfiguration.java
@@ -5,6 +5,4 @@
 
 @Configuration
 @EnableConfigurationProperties(CorsProperties.class)
-public class CorsConfiguration {
-
-}
+public class CorsConfiguration {}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CorsProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CorsProperties.java
index 249b842b38..3558e46e79 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CorsProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CorsProperties.java
@@ -5,14 +5,13 @@
 @ConfigurationProperties("cors")
 public class CorsProperties {
 
-    private String allowedOrigin = "*";
+  private String allowedOrigin = "*";
 
-    public String getAllowedOrigin() {
-        return allowedOrigin;
-    }
-
-    public void setAllowedOrigin(String allowedOrigin) {
-        this.allowedOrigin = allowedOrigin;
-    }
+  public String getAllowedOrigin() {
+    return allowedOrigin;
+  }
 
+  public void setAllowedOrigin(String allowedOrigin) {
+    this.allowedOrigin = allowedOrigin;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdConfiguration.java
deleted file mode 100644
index 8539c9b2e7..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdConfiguration.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package pl.allegro.tech.hermes.management.config;
-
-import org.apache.hc.client5.http.classic.HttpClient;
-import org.apache.hc.client5.http.config.ConnectionConfig;
-import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
-import org.apache.hc.core5.util.Timeout;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.web.client.RestTemplate;
-import pl.allegro.tech.hermes.management.domain.owner.CrowdOwnerSource;
-import pl.allegro.tech.hermes.management.domain.owner.PlaintextOwnerSource;
-import pl.allegro.tech.hermes.management.infrastructure.crowd.CachedCrowdClient;
-import pl.allegro.tech.hermes.management.infrastructure.crowd.RestCrowdClient;
-
-@Configuration
-@EnableConfigurationProperties(CrowdProperties.class)
-@ConditionalOnProperty("owner.crowd.enabled")
-public class CrowdConfiguration {
-
-    @Bean("managementRequestFactory")
-    @ConfigurationProperties(prefix = "management.rest-template")
-    public ClientHttpRequestFactory clientHttpRequestFactory() {
-        return new HttpComponentsClientHttpRequestFactory();
-    }
-
-    @Bean(name = "crowdRestTemplate")
-    public RestTemplate restTemplate(CrowdProperties properties) {
-        PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
-                .setMaxConnTotal(properties.getMaxConnections())
-                .setMaxConnPerRoute(properties.getMaxConnectionsPerRoute())
-                .setDefaultConnectionConfig(
-                        ConnectionConfig.custom()
-                                .setSocketTimeout(Timeout.ofMilliseconds(properties.getSocketTimeoutMillis()))
-                                .setConnectTimeout(Timeout.ofMilliseconds(properties.getConnectionTimeoutMillis()))
-                                .build())
-                .build();
-
-        RequestConfig requestConfig = RequestConfig.custom()
-                .setConnectTimeout(Timeout.ofMilliseconds(properties.getConnectionTimeoutMillis()))
-                .setResponseTimeout(Timeout.ofMilliseconds(properties.getSocketTimeoutMillis()))
-                .build();
-
-        HttpClient client = HttpClientBuilder.create()
-                .setDefaultRequestConfig(requestConfig)
-                .setConnectionManager(connectionManager)
-                .build();
-
-        ClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(client);
-
-        return new RestTemplate(clientHttpRequestFactory);
-    }
-
-    @Bean
-    @Order(PlaintextOwnerSource.ORDER + 1)
-    public CrowdOwnerSource crowdOwnerSource(CrowdProperties crowdProperties, @Qualifier("crowdRestTemplate") RestTemplate restTemplate) {
-        return new CrowdOwnerSource(new CachedCrowdClient(new RestCrowdClient(restTemplate, crowdProperties), crowdProperties));
-    }
-
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdProperties.java
deleted file mode 100644
index 93c423fcc5..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdProperties.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package pl.allegro.tech.hermes.management.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import java.net.URL;
-
-@ConfigurationProperties(prefix = "owner.crowd")
-public class CrowdProperties {
-
-    private boolean enabled = false;
-
-    private String userName;
-
-    private String password;
-
-    private URL path;
-
-    private Long cacheDurationSeconds = 300L;
-
-    private Long cacheSize = 1000L;
-
-    private int connectionTimeoutMillis = 1000;
-
-    private int socketTimeoutMillis = 2000;
-
-    private int maxConnections = 100;
-
-    private int maxConnectionsPerRoute = 10;
-
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public URL getPath() {
-        return path;
-    }
-
-    public void setPath(URL path) {
-        this.path = path;
-    }
-
-    public Long getCacheDurationSeconds() {
-        return cacheDurationSeconds;
-    }
-
-    public void setCacheDurationSeconds(Long cacheDurationSeconds) {
-        this.cacheDurationSeconds = cacheDurationSeconds;
-    }
-
-    public Long getCacheSize() {
-        return cacheSize;
-    }
-
-    public void setCacheSize(Long cacheSize) {
-        this.cacheSize = cacheSize;
-    }
-
-    public int getConnectionTimeoutMillis() {
-        return connectionTimeoutMillis;
-    }
-
-    public void setConnectionTimeoutMillis(int connectionTimeoutMillis) {
-        this.connectionTimeoutMillis = connectionTimeoutMillis;
-    }
-
-    public int getSocketTimeoutMillis() {
-        return socketTimeoutMillis;
-    }
-
-    public void setSocketTimeoutMillis(int socketTimeoutMillis) {
-        this.socketTimeoutMillis = socketTimeoutMillis;
-    }
-
-    public int getMaxConnections() {
-        return maxConnections;
-    }
-
-    public void setMaxConnections(int maxConnections) {
-        this.maxConnections = maxConnections;
-    }
-
-    public int getMaxConnectionsPerRoute() {
-        return maxConnectionsPerRoute;
-    }
-
-    public void setMaxConnectionsPerRoute(int maxConnectionsPerRoute) {
-        this.maxConnectionsPerRoute = maxConnectionsPerRoute;
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/EndpointConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/EndpointConfiguration.java
index a349cc666d..f087a3f9b6 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/EndpointConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/EndpointConfiguration.java
@@ -12,17 +12,16 @@
 @EnableConfigurationProperties(JerseyProperties.class)
 public class EndpointConfiguration {
 
-    @Autowired
-    private JerseyProperties jerseyProperties;
+  @Autowired private JerseyProperties jerseyProperties;
 
-    @Bean
-    JerseyResourceConfig resourceConfig() {
-        return new JerseyResourceConfig(jerseyProperties);
-    }
+  @Bean
+  JerseyResourceConfig resourceConfig() {
+    return new JerseyResourceConfig(jerseyProperties);
+  }
 
-    @Bean
-    @ConditionalOnMissingBean(SecurityProvider.class)
-    SecurityProvider authorization() {
-        return new AllowAllSecurityProvider();
-    }
+  @Bean
+  @ConditionalOnMissingBean(SecurityProvider.class)
+  SecurityProvider authorization() {
+    return new AllowAllSecurityProvider();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ExternalMonitoringClientProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ExternalMonitoringClientProperties.java
index 92f20ea63c..43bd2fc5fa 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ExternalMonitoringClientProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ExternalMonitoringClientProperties.java
@@ -2,73 +2,92 @@
 
 public class ExternalMonitoringClientProperties {
 
-    private int connectionTimeoutMillis = 1000;
+  private int connectionTimeoutMillis = 1000;
 
-    private int socketTimeoutMillis = 2000;
+  private int socketTimeoutMillis = 2000;
 
-    private int maxConnections = 100;
+  private int maxConnections = 100;
 
-    private int maxConnectionsPerRoute = 10;
+  private int maxConnectionsPerRoute = 100;
 
-    private int cacheTtlSeconds = 55;
+  private int cacheTtlSeconds = 55;
 
-    private int cacheSize = 100_000;
+  private int cacheSize = 100_000;
 
-    private String externalMonitoringUrl = "http://localhost:18090";
+  private int fetchingTimeoutMillis = 5000;
+  private int fetchingThreads = 30;
 
-    public int getConnectionTimeoutMillis() {
-        return connectionTimeoutMillis;
-    }
+  private String externalMonitoringUrl = "http://localhost:18090";
 
-    public void setConnectionTimeoutMillis(int connectionTimeoutMillis) {
-        this.connectionTimeoutMillis = connectionTimeoutMillis;
-    }
+  public int getConnectionTimeoutMillis() {
+    return connectionTimeoutMillis;
+  }
 
-    public int getSocketTimeoutMillis() {
-        return socketTimeoutMillis;
-    }
+  public void setConnectionTimeoutMillis(int connectionTimeoutMillis) {
+    this.connectionTimeoutMillis = connectionTimeoutMillis;
+  }
 
-    public void setSocketTimeoutMillis(int socketTimeoutMillis) {
-        this.socketTimeoutMillis = socketTimeoutMillis;
-    }
+  public int getSocketTimeoutMillis() {
+    return socketTimeoutMillis;
+  }
 
-    public int getCacheTtlSeconds() {
-        return cacheTtlSeconds;
-    }
+  public void setSocketTimeoutMillis(int socketTimeoutMillis) {
+    this.socketTimeoutMillis = socketTimeoutMillis;
+  }
 
-    public void setCacheTtlSeconds(int cacheTtlSeconds) {
-        this.cacheTtlSeconds = cacheTtlSeconds;
-    }
+  public int getCacheTtlSeconds() {
+    return cacheTtlSeconds;
+  }
 
-    public int getCacheSize() {
-        return cacheSize;
-    }
+  public void setCacheTtlSeconds(int cacheTtlSeconds) {
+    this.cacheTtlSeconds = cacheTtlSeconds;
+  }
 
-    public void setCacheSize(int cacheSize) {
-        this.cacheSize = cacheSize;
-    }
+  public int getCacheSize() {
+    return cacheSize;
+  }
 
-    public int getMaxConnections() {
-        return maxConnections;
-    }
+  public void setCacheSize(int cacheSize) {
+    this.cacheSize = cacheSize;
+  }
 
-    public void setMaxConnections(int maxConnections) {
-        this.maxConnections = maxConnections;
-    }
+  public int getMaxConnections() {
+    return maxConnections;
+  }
 
-    public int getMaxConnectionsPerRoute() {
-        return maxConnectionsPerRoute;
-    }
+  public void setMaxConnections(int maxConnections) {
+    this.maxConnections = maxConnections;
+  }
 
-    public void setMaxConnectionsPerRoute(int maxConnectionsPerRoute) {
-        this.maxConnectionsPerRoute = maxConnectionsPerRoute;
-    }
+  public int getMaxConnectionsPerRoute() {
+    return maxConnectionsPerRoute;
+  }
 
-    public String getExternalMonitoringUrl() {
-        return externalMonitoringUrl;
-    }
+  public void setMaxConnectionsPerRoute(int maxConnectionsPerRoute) {
+    this.maxConnectionsPerRoute = maxConnectionsPerRoute;
+  }
 
-    public void setExternalMonitoringUrl(String externalMonitoringUrl) {
-        this.externalMonitoringUrl = externalMonitoringUrl;
-    }
+  public String getExternalMonitoringUrl() {
+    return externalMonitoringUrl;
+  }
+
+  public void setExternalMonitoringUrl(String externalMonitoringUrl) {
+    this.externalMonitoringUrl = externalMonitoringUrl;
+  }
+
+  public int getFetchingThreads() {
+    return fetchingThreads;
+  }
+
+  public void setFetchingThreads(int fetchingThreads) {
+    this.fetchingThreads = fetchingThreads;
+  }
+
+  public int getFetchingTimeoutMillis() {
+    return fetchingTimeoutMillis;
+  }
+
+  public void setFetchingTimeoutMillis(int fetchingTimeoutMillis) {
+    this.fetchingTimeoutMillis = fetchingTimeoutMillis;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ExternalMonitoringConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ExternalMonitoringConfiguration.java
index e3a828a463..714de3a5fb 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ExternalMonitoringConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ExternalMonitoringConfiguration.java
@@ -1,5 +1,13 @@
 package pl.allegro.tech.hermes.management.config;
 
+import static com.google.common.base.Ticker.systemTicker;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.micrometer.core.instrument.MeterRegistry;
+import java.net.URI;
+import java.time.Duration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
@@ -7,91 +15,84 @@
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
 import org.apache.hc.core5.util.Timeout;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
-import pl.allegro.tech.hermes.management.infrastructure.graphite.CachingGraphiteClient;
-import pl.allegro.tech.hermes.management.infrastructure.graphite.GraphiteClient;
-import pl.allegro.tech.hermes.management.infrastructure.graphite.GraphiteMetricsProvider;
-import pl.allegro.tech.hermes.management.infrastructure.graphite.RestTemplateGraphiteClient;
 import pl.allegro.tech.hermes.management.infrastructure.prometheus.CachingPrometheusClient;
 import pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient;
+import pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusMetricsProvider;
 import pl.allegro.tech.hermes.management.infrastructure.prometheus.RestTemplatePrometheusClient;
-import pl.allegro.tech.hermes.management.infrastructure.prometheus.VictoriaMetricsMetricsProvider;
-
-import java.net.URI;
-
-import static com.google.common.base.Ticker.systemTicker;
 
 @Configuration
+@ConditionalOnProperty(value = "prometheus.client.enabled", havingValue = "true")
 public class ExternalMonitoringConfiguration {
 
-    @Bean
-    @ConditionalOnProperty(value = "graphite.client.enabled", havingValue = "true")
-    public GraphiteMetricsProvider graphiteMetricsProvider(GraphiteClient graphiteClient,
-                                                           GraphiteMonitoringMetricsProperties properties) {
-        return new GraphiteMetricsProvider(graphiteClient, properties.getPrefix());
-    }
-
-    @Bean
-    @ConditionalOnProperty(value = "graphite.client.enabled", havingValue = "true")
-    public GraphiteClient graphiteClient(@Qualifier("monitoringRestTemplate") RestTemplate graphiteRestTemplate,
-                                         GraphiteMonitoringMetricsProperties graphiteClientProperties) {
-        RestTemplateGraphiteClient underlyingGraphiteClient =
-                new RestTemplateGraphiteClient(graphiteRestTemplate, URI.create(graphiteClientProperties.getExternalMonitoringUrl()));
-        return new CachingGraphiteClient(
-                underlyingGraphiteClient,
-                systemTicker(),
-                graphiteClientProperties.getCacheTtlSeconds(),
-                graphiteClientProperties.getCacheSize()
-        );
-    }
-
-    @Bean
-    @ConditionalOnProperty(value = "prometheus.client.enabled", havingValue = "true")
-    public VictoriaMetricsMetricsProvider prometheusMetricsProvider(PrometheusClient prometheusClient,
-                                                                    PrometheusMonitoringClientProperties properties) {
-        return new VictoriaMetricsMetricsProvider(prometheusClient,
-                properties.getConsumersMetricsPrefix(), properties.getFrontendMetricsPrefix(),
-                properties.getAdditionalFilters());
-    }
+  @Bean
+  public PrometheusMetricsProvider prometheusMetricsProvider(
+      PrometheusClient prometheusClient, PrometheusMonitoringClientProperties properties) {
+    return new PrometheusMetricsProvider(
+        prometheusClient,
+        properties.getConsumersMetricsPrefix(),
+        properties.getFrontendMetricsPrefix(),
+        properties.getAdditionalFilters());
+  }
 
-    @Bean
-    @ConditionalOnProperty(value = "prometheus.client.enabled", havingValue = "true")
-    public PrometheusClient prometheusClient(@Qualifier("monitoringRestTemplate") RestTemplate graphiteRestTemplate,
-                                             PrometheusMonitoringClientProperties clientProperties) {
-        RestTemplatePrometheusClient underlyingPrometheusClient =
-                new RestTemplatePrometheusClient(graphiteRestTemplate, URI.create(clientProperties.getExternalMonitoringUrl()));
-        return new CachingPrometheusClient(
-                underlyingPrometheusClient,
-                systemTicker(),
-                clientProperties.getCacheTtlSeconds(),
-                clientProperties.getCacheSize()
-        );
-    }
+  @Bean
+  public PrometheusClient prometheusClient(
+      @Qualifier("monitoringRestTemplate") RestTemplate monitoringRestTemplate,
+      PrometheusMonitoringClientProperties clientProperties,
+      @Qualifier("prometheusFetcherExecutorService") ExecutorService executorService,
+      MeterRegistry meterRegistry) {
+    RestTemplatePrometheusClient underlyingPrometheusClient =
+        new RestTemplatePrometheusClient(
+            monitoringRestTemplate,
+            URI.create(clientProperties.getExternalMonitoringUrl()),
+            executorService,
+            Duration.ofMillis(clientProperties.getFetchingTimeoutMillis()),
+            meterRegistry);
+    return new CachingPrometheusClient(
+        underlyingPrometheusClient,
+        systemTicker(),
+        clientProperties.getCacheTtlSeconds(),
+        clientProperties.getCacheSize());
+  }
 
-    @Bean("monitoringRestTemplate")
-    public RestTemplate restTemplate(ExternalMonitoringClientProperties clientProperties) {
-        PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
-                .setMaxConnTotal(clientProperties.getMaxConnections())
-                .setMaxConnPerRoute(clientProperties.getMaxConnectionsPerRoute())
-                .build();
+  @Bean("monitoringRestTemplate")
+  @ConditionalOnMissingBean(name = "monitoringRestTemplate")
+  public RestTemplate restTemplate(ExternalMonitoringClientProperties clientProperties) {
+    PoolingHttpClientConnectionManager connectionManager =
+        PoolingHttpClientConnectionManagerBuilder.create()
+            .setMaxConnTotal(clientProperties.getMaxConnections())
+            .setMaxConnPerRoute(clientProperties.getMaxConnectionsPerRoute())
+            .build();
 
-        RequestConfig requestConfig = RequestConfig.custom()
-                .setConnectTimeout(Timeout.ofMilliseconds(clientProperties.getConnectionTimeoutMillis()))
-                .setResponseTimeout(Timeout.ofMilliseconds(clientProperties.getSocketTimeoutMillis()))
-                .build();
+    RequestConfig requestConfig =
+        RequestConfig.custom()
+            .setConnectTimeout(
+                Timeout.ofMilliseconds(clientProperties.getConnectionTimeoutMillis()))
+            .setResponseTimeout(Timeout.ofMilliseconds(clientProperties.getSocketTimeoutMillis()))
+            .build();
 
-        HttpClient client = HttpClientBuilder.create()
-                .setDefaultRequestConfig(requestConfig)
-                .setConnectionManager(connectionManager)
-                .build();
+    HttpClient client =
+        HttpClientBuilder.create()
+            .setDefaultRequestConfig(requestConfig)
+            .setConnectionManager(connectionManager)
+            .build();
 
-        ClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(client);
+    ClientHttpRequestFactory clientHttpRequestFactory =
+        new HttpComponentsClientHttpRequestFactory(client);
+    return new RestTemplate(clientHttpRequestFactory);
+  }
 
-        return new RestTemplate(clientHttpRequestFactory);
-    }
+  @Bean("prometheusFetcherExecutorService")
+  @ConditionalOnMissingBean(name = "prometheusFetcherExecutorService")
+  public ExecutorService executorService(ExternalMonitoringClientProperties clientProperties) {
+    return Executors.newFixedThreadPool(
+        clientProperties.getFetchingThreads(),
+        new ThreadFactoryBuilder().setNameFormat("prometheus-metrics-fetcher-%d").build());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/FilteringConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/FilteringConfiguration.java
index c10411f5a3..cb2ecedd30 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/FilteringConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/FilteringConfiguration.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.management.config;
 
+import static java.util.Collections.emptyList;
+
+import java.util.Arrays;
+import java.util.List;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import pl.allegro.tech.hermes.domain.filtering.MessageFilters;
@@ -9,22 +13,17 @@
 import pl.allegro.tech.hermes.domain.filtering.header.HeaderSubscriptionMessageFilterCompiler;
 import pl.allegro.tech.hermes.domain.filtering.json.JsonPathSubscriptionMessageFilterCompiler;
 
-import java.util.Arrays;
-import java.util.List;
-
-import static java.util.Collections.emptyList;
-
 @Configuration
 public class FilteringConfiguration {
 
-    @Bean
-    FilterChainFactory filterChainFactory() {
-        List<SubscriptionMessageFilterCompiler> subscriptionFilterCompilers = Arrays.asList(
-                new AvroPathSubscriptionMessageFilterCompiler(),
-                new JsonPathSubscriptionMessageFilterCompiler(),
-                new HeaderSubscriptionMessageFilterCompiler()
-        );
-        MessageFilters messageFilters = new MessageFilters(emptyList(), subscriptionFilterCompilers);
-        return new FilterChainFactory(messageFilters);
-    }
+  @Bean
+  FilterChainFactory filterChainFactory() {
+    List<SubscriptionMessageFilterCompiler> subscriptionFilterCompilers =
+        Arrays.asList(
+            new AvroPathSubscriptionMessageFilterCompiler(),
+            new JsonPathSubscriptionMessageFilterCompiler(),
+            new HeaderSubscriptionMessageFilterCompiler());
+    MessageFilters messageFilters = new MessageFilters(emptyList(), subscriptionFilterCompilers);
+    return new FilterChainFactory(messageFilters);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GraphiteMonitoringMetricsProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GraphiteMonitoringMetricsProperties.java
deleted file mode 100644
index 4ae837902f..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GraphiteMonitoringMetricsProperties.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package pl.allegro.tech.hermes.management.config;
-
-public class GraphiteMonitoringMetricsProperties extends ExternalMonitoringClientProperties {
-
-    private String prefix = "stats.tech.hermes";
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GroupProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GroupProperties.java
index 3c5dfe0688..ce26f8ecfe 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GroupProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GroupProperties.java
@@ -7,23 +7,23 @@
 @ConfigurationProperties(prefix = "group")
 public class GroupProperties {
 
-    private boolean nonAdminCreationEnabled = false;
+  private boolean nonAdminCreationEnabled = false;
 
-    private String allowedGroupNameRegex = "^[a-zA-Z0-9.]+$";
+  private String allowedGroupNameRegex = "^[a-zA-Z0-9.]+$";
 
-    public boolean isNonAdminCreationEnabled() {
-        return nonAdminCreationEnabled;
-    }
+  public boolean isNonAdminCreationEnabled() {
+    return nonAdminCreationEnabled;
+  }
 
-    public void setNonAdminCreationEnabled(boolean nonAdminCreationEnabled) {
-        this.nonAdminCreationEnabled = nonAdminCreationEnabled;
-    }
+  public void setNonAdminCreationEnabled(boolean nonAdminCreationEnabled) {
+    this.nonAdminCreationEnabled = nonAdminCreationEnabled;
+  }
 
-    public String getAllowedGroupNameRegex() {
-        return allowedGroupNameRegex;
-    }
+  public String getAllowedGroupNameRegex() {
+    return allowedGroupNameRegex;
+  }
 
-    public void setAllowedGroupNameRegex(String allowedGroupNameRegex) {
-        this.allowedGroupNameRegex = allowedGroupNameRegex;
-    }
+  public void setAllowedGroupNameRegex(String allowedGroupNameRegex) {
+    this.allowedGroupNameRegex = allowedGroupNameRegex;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/HttpClientProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/HttpClientProperties.java
index 654e749e44..a3432003c9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/HttpClientProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/HttpClientProperties.java
@@ -5,22 +5,22 @@
 @ConfigurationProperties(prefix = "http-client")
 public class HttpClientProperties {
 
-    private int readTimeout = 3000;
-    private int connectTimeout = 3000;
+  private int readTimeout = 3000;
+  private int connectTimeout = 3000;
 
-    public int getReadTimeout() {
-        return readTimeout;
-    }
+  public int getReadTimeout() {
+    return readTimeout;
+  }
 
-    public void setReadTimeout(int readTimeout) {
-        this.readTimeout = readTimeout;
-    }
+  public void setReadTimeout(int readTimeout) {
+    this.readTimeout = readTimeout;
+  }
 
-    public int getConnectTimeout() {
-        return connectTimeout;
-    }
+  public int getConnectTimeout() {
+    return connectTimeout;
+  }
 
-    public void setConnectTimeout(int connectTimeout) {
-        this.connectTimeout = connectTimeout;
-    }
+  public void setConnectTimeout(int connectTimeout) {
+    this.connectTimeout = connectTimeout;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyProperties.java
index 16d285a1e3..7fc4ded509 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyProperties.java
@@ -1,29 +1,28 @@
 package pl.allegro.tech.hermes.management.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "jersey")
 public class JerseyProperties {
 
-    private List<String> packagesToScan = new ArrayList<>();
-    private String filterStaticContentRegexp = "(/status/|/assets/|/favicon.ico).*";
+  private List<String> packagesToScan = new ArrayList<>();
+  private String filterStaticContentRegexp = "(/status/|/assets/|/favicon.ico).*";
 
-    public List<String> getPackagesToScan() {
-        return packagesToScan;
-    }
+  public List<String> getPackagesToScan() {
+    return packagesToScan;
+  }
 
-    public void setPackagesToScan(List<String> packagesToScan) {
-        this.packagesToScan = packagesToScan;
-    }
+  public void setPackagesToScan(List<String> packagesToScan) {
+    this.packagesToScan = packagesToScan;
+  }
 
-    public String getFilterStaticContentRegexp() {
-        return filterStaticContentRegexp;
-    }
+  public String getFilterStaticContentRegexp() {
+    return filterStaticContentRegexp;
+  }
 
-    public void setFilterStaticContentRegexp(String filterStaticContentRegexp) {
-        this.filterStaticContentRegexp = filterStaticContentRegexp;
-    }
+  public void setFilterStaticContentRegexp(String filterStaticContentRegexp) {
+    this.filterStaticContentRegexp = filterStaticContentRegexp;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyResourceConfig.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyResourceConfig.java
index a183f9ed0b..4eff4e2ece 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyResourceConfig.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyResourceConfig.java
@@ -12,19 +12,21 @@
 @ApplicationPath("/")
 public class JerseyResourceConfig extends ResourceConfig {
 
-    private static final Logger logger = LoggerFactory.getLogger(JerseyResourceConfig.class);
+  private static final Logger logger = LoggerFactory.getLogger(JerseyResourceConfig.class);
 
-    public JerseyResourceConfig(JerseyProperties jerseyProperties) {
-        packages(true, "pl.allegro.tech.hermes.management.api");
+  public JerseyResourceConfig(JerseyProperties jerseyProperties) {
+    packages(true, "pl.allegro.tech.hermes.management.api");
 
-        for (String packageToScan : jerseyProperties.getPackagesToScan()) {
-            packages(true, packageToScan);
-            logger.info("Scanning Jersey resources in: {}", packageToScan);
-        }
-        property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true);
-        property(ServletProperties.FILTER_STATIC_CONTENT_REGEX, jerseyProperties.getFilterStaticContentRegexp());
-        register(RolesAllowedDynamicFeature.class);
-        property(FreemarkerMvcFeature.TEMPLATE_BASE_PATH, "static");
-        register(FreemarkerMvcFeature.class);
+    for (String packageToScan : jerseyProperties.getPackagesToScan()) {
+      packages(true, packageToScan);
+      logger.info("Scanning Jersey resources in: {}", packageToScan);
     }
+    property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true);
+    property(
+        ServletProperties.FILTER_STATIC_CONTENT_REGEX,
+        jerseyProperties.getFilterStaticContentRegexp());
+    register(RolesAllowedDynamicFeature.class);
+    property(FreemarkerMvcFeature.TEMPLATE_BASE_PATH, "static");
+    register(FreemarkerMvcFeature.class);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/LogRepositoryConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/LogRepositoryConfiguration.java
index 609f919df8..da2b9c195d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/LogRepositoryConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/LogRepositoryConfiguration.java
@@ -9,10 +9,9 @@
 @Configuration
 public class LogRepositoryConfiguration {
 
-    @Bean
-    @ConditionalOnMissingBean(LogRepository.class)
-    public LogRepository logRepository() {
-        return new NoOperationLogRepository();
-    }
-
+  @Bean
+  @ConditionalOnMissingBean(LogRepository.class)
+  public LogRepository logRepository() {
+    return new NoOperationLogRepository();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ManagementConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ManagementConfiguration.java
index 8277843789..93139d4803 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ManagementConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ManagementConfiguration.java
@@ -1,13 +1,14 @@
 package pl.allegro.tech.hermes.management.config;
 
-import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import io.micrometer.core.instrument.MeterRegistry;
+import java.time.Clock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -15,7 +16,6 @@
 import org.springframework.context.annotation.Configuration;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.clock.ClockFactory;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.common.util.InetAddressInstanceIdResolver;
 import pl.allegro.tech.hermes.common.util.InstanceIdResolver;
@@ -23,75 +23,66 @@
 import pl.allegro.tech.hermes.management.infrastructure.metrics.NoOpSubscriptionLagSource;
 import pl.allegro.tech.hermes.metrics.PathsCompiler;
 
-import java.time.Clock;
-
 @Configuration
 @EnableConfigurationProperties({
-        TopicProperties.class,
-        HttpClientProperties.class,
-        ConsistencyCheckerProperties.class,
-        PrometheusProperties.class,
-        MicrometerRegistryProperties.class
+  TopicProperties.class,
+  HttpClientProperties.class,
+  ConsistencyCheckerProperties.class,
+  PrometheusProperties.class,
+  MicrometerRegistryProperties.class
 })
 public class ManagementConfiguration {
 
-    @Autowired
-    TopicProperties topicProperties;
-
-    @Bean
-    public ObjectMapper objectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        mapper.disable(SerializationFeature.WRITE_NULL_MAP_VALUES);
-        mapper.registerModule(new JavaTimeModule());
-
-        final InjectableValues defaultSchemaIdAwareSerializationEnabled = new InjectableValues.Std().addValue(
+  @Autowired TopicProperties topicProperties;
+
+  @Bean
+  public ObjectMapper objectMapper() {
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    mapper.disable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+    mapper.registerModules(
+        new JavaTimeModule(),
+        new Jdk8Module()); // Jdk8Module is required for Jackson to serialize & deserialize Optional
+    // type
+
+    final InjectableValues defaultSchemaIdAwareSerializationEnabled =
+        new InjectableValues.Std()
+            .addValue(
                 Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY,
-                topicProperties.isDefaultSchemaIdAwareSerializationEnabled());
-
-        mapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
-
-        return mapper;
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public MetricRegistry metricRegistry() {
-        return new MetricRegistry();
-    }
-
-    @Bean
-    public InstanceIdResolver instanceIdResolver() {
-        return new InetAddressInstanceIdResolver();
-    }
-
-    @Bean
-    public PathsCompiler pathsCompiler(InstanceIdResolver instanceIdResolver) {
-        return new PathsCompiler(instanceIdResolver.resolve());
-    }
-
-    @Bean
-    public HermesMetrics hermesMetrics(MetricRegistry metricRegistry,
-                                       PathsCompiler pathsCompiler) {
-        return new HermesMetrics(metricRegistry, pathsCompiler);
-    }
-
-    @Bean
-    public MetricsFacade micrometerHermesMetrics(MeterRegistry meterRegistry, HermesMetrics hermesMetrics) {
-        return new MetricsFacade(meterRegistry, hermesMetrics);
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public SubscriptionLagSource consumerLagSource() {
-        return new NoOpSubscriptionLagSource();
-    }
-
-    @Bean
-    public Clock clock() {
-        return new ClockFactory().provide();
-    }
-
-
+                topicProperties.isDefaultSchemaIdAwareSerializationEnabled())
+            .addValue(
+                Topic.DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY,
+                topicProperties.isDefaultFallbackToRemoteDatacenterEnabled());
+
+    mapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
+
+    return mapper;
+  }
+
+  @Bean
+  public InstanceIdResolver instanceIdResolver() {
+    return new InetAddressInstanceIdResolver();
+  }
+
+  @Bean
+  public PathsCompiler pathsCompiler(InstanceIdResolver instanceIdResolver) {
+    return new PathsCompiler(instanceIdResolver.resolve());
+  }
+
+  @Bean
+  public MetricsFacade micrometerHermesMetrics(MeterRegistry meterRegistry) {
+    return new MetricsFacade(meterRegistry);
+  }
+
+  @Bean
+  @ConditionalOnMissingBean
+  public SubscriptionLagSource consumerLagSource() {
+    return new NoOpSubscriptionLagSource();
+  }
+
+  @Bean
+  public Clock clock() {
+    return new ClockFactory().provide();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MessageConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MessageConfiguration.java
index cb4ae5dfa3..1f71bc9b8e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MessageConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MessageConfiguration.java
@@ -1,6 +1,7 @@
 package pl.allegro.tech.hermes.management.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.time.Clock;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,47 +15,56 @@
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 
-import java.time.Clock;
-
 @Configuration
 @EnableConfigurationProperties(MessageProperties.class)
 public class MessageConfiguration {
 
-    @Bean
-    CompositeMessageContentWrapper messageContentWrapper(
-            MessageProperties messageProperties,
-            Clock clock,
-            ObjectMapper objectMapper,
-            SchemaRepository schemaRepository,
-            MetricsFacade metricsFacade) {
-        AvroMessageContentWrapper avroWrapper = new AvroMessageContentWrapper(clock);
-        JsonMessageContentWrapper jsonWrapper = jsonMessageContentWrapper(messageProperties, objectMapper);
-
-        AvroMessageHeaderSchemaVersionContentWrapper headerSchemaVersionWrapper =
-                new AvroMessageHeaderSchemaVersionContentWrapper(schemaRepository, avroWrapper, metricsFacade);
-
-        AvroMessageHeaderSchemaIdContentWrapper headerSchemaIdWrapper =
-                new AvroMessageHeaderSchemaIdContentWrapper(schemaRepository, avroWrapper, metricsFacade,
-                        messageProperties.isSchemaIdHeaderEnabled());
-
-        AvroMessageSchemaIdAwareContentWrapper schemaAwareWrapper =
-                new AvroMessageSchemaIdAwareContentWrapper(schemaRepository, avroWrapper, metricsFacade);
-
-        AvroMessageSchemaVersionTruncationContentWrapper schemaVersionTruncationContentWrapper =
-                new AvroMessageSchemaVersionTruncationContentWrapper(schemaRepository, avroWrapper, metricsFacade,
-                        messageProperties.isSchemaVersionTruncationEnabled());
-
-        return new CompositeMessageContentWrapper(
-                jsonWrapper,
-                avroWrapper,
-                schemaAwareWrapper,
-                headerSchemaVersionWrapper,
-                headerSchemaIdWrapper,
-                schemaVersionTruncationContentWrapper);
-    }
-
-    private JsonMessageContentWrapper jsonMessageContentWrapper(MessageProperties messageProperties, ObjectMapper objectMapper) {
-        return new JsonMessageContentWrapper(messageProperties.getContentRoot(), messageProperties.getMetadataContentRoot(), objectMapper);
-    }
+  @Bean
+  CompositeMessageContentWrapper messageContentWrapper(
+      MessageProperties messageProperties,
+      Clock clock,
+      ObjectMapper objectMapper,
+      SchemaRepository schemaRepository,
+      MetricsFacade metricsFacade) {
+    AvroMessageContentWrapper avroWrapper = new AvroMessageContentWrapper(clock);
+    JsonMessageContentWrapper jsonWrapper =
+        jsonMessageContentWrapper(messageProperties, objectMapper);
+
+    AvroMessageHeaderSchemaVersionContentWrapper headerSchemaVersionWrapper =
+        new AvroMessageHeaderSchemaVersionContentWrapper(
+            schemaRepository, avroWrapper, metricsFacade);
+
+    AvroMessageHeaderSchemaIdContentWrapper headerSchemaIdWrapper =
+        new AvroMessageHeaderSchemaIdContentWrapper(
+            schemaRepository,
+            avroWrapper,
+            metricsFacade,
+            messageProperties.isSchemaIdHeaderEnabled());
+
+    AvroMessageSchemaIdAwareContentWrapper schemaAwareWrapper =
+        new AvroMessageSchemaIdAwareContentWrapper(schemaRepository, avroWrapper, metricsFacade);
+
+    AvroMessageSchemaVersionTruncationContentWrapper schemaVersionTruncationContentWrapper =
+        new AvroMessageSchemaVersionTruncationContentWrapper(
+            schemaRepository,
+            avroWrapper,
+            metricsFacade,
+            messageProperties.isSchemaVersionTruncationEnabled());
+
+    return new CompositeMessageContentWrapper(
+        jsonWrapper,
+        avroWrapper,
+        schemaAwareWrapper,
+        headerSchemaVersionWrapper,
+        headerSchemaIdWrapper,
+        schemaVersionTruncationContentWrapper);
+  }
 
+  private JsonMessageContentWrapper jsonMessageContentWrapper(
+      MessageProperties messageProperties, ObjectMapper objectMapper) {
+    return new JsonMessageContentWrapper(
+        messageProperties.getContentRoot(),
+        messageProperties.getMetadataContentRoot(),
+        objectMapper);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MessageProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MessageProperties.java
index cedb11437c..a7c127c199 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MessageProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MessageProperties.java
@@ -5,43 +5,43 @@
 @ConfigurationProperties(prefix = "message")
 public class MessageProperties {
 
-    private String contentRoot = "message";
+  private String contentRoot = "message";
 
-    private String metadataContentRoot = "metadata";
+  private String metadataContentRoot = "metadata";
 
-    private boolean schemaIdHeaderEnabled = false;
+  private boolean schemaIdHeaderEnabled = false;
 
-    private boolean schemaVersionTruncationEnabled = false;
+  private boolean schemaVersionTruncationEnabled = false;
 
-    public String getContentRoot() {
-        return contentRoot;
-    }
+  public String getContentRoot() {
+    return contentRoot;
+  }
 
-    public void setContentRoot(String contentRoot) {
-        this.contentRoot = contentRoot;
-    }
+  public void setContentRoot(String contentRoot) {
+    this.contentRoot = contentRoot;
+  }
 
-    public String getMetadataContentRoot() {
-        return metadataContentRoot;
-    }
+  public String getMetadataContentRoot() {
+    return metadataContentRoot;
+  }
 
-    public void setMetadataContentRoot(String metadataContentRoot) {
-        this.metadataContentRoot = metadataContentRoot;
-    }
+  public void setMetadataContentRoot(String metadataContentRoot) {
+    this.metadataContentRoot = metadataContentRoot;
+  }
 
-    public boolean isSchemaIdHeaderEnabled() {
-        return schemaIdHeaderEnabled;
-    }
+  public boolean isSchemaIdHeaderEnabled() {
+    return schemaIdHeaderEnabled;
+  }
 
-    public void setSchemaIdHeaderEnabled(boolean schemaIdHeaderEnabled) {
-        this.schemaIdHeaderEnabled = schemaIdHeaderEnabled;
-    }
+  public void setSchemaIdHeaderEnabled(boolean schemaIdHeaderEnabled) {
+    this.schemaIdHeaderEnabled = schemaIdHeaderEnabled;
+  }
 
-    public boolean isSchemaVersionTruncationEnabled() {
-        return schemaVersionTruncationEnabled;
-    }
+  public boolean isSchemaVersionTruncationEnabled() {
+    return schemaVersionTruncationEnabled;
+  }
 
-    public void setSchemaVersionTruncationEnabled(boolean schemaVersionTruncationEnabled) {
-        this.schemaVersionTruncationEnabled = schemaVersionTruncationEnabled;
-    }
+  public void setSchemaVersionTruncationEnabled(boolean schemaVersionTruncationEnabled) {
+    this.schemaVersionTruncationEnabled = schemaVersionTruncationEnabled;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MicrometerRegistryProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MicrometerRegistryProperties.java
index 9f131b66c8..65b012a02a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MicrometerRegistryProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MicrometerRegistryProperties.java
@@ -1,19 +1,18 @@
 package pl.allegro.tech.hermes.management.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "metrics.micrometer")
 public class MicrometerRegistryProperties {
 
-    private List<Double> percentiles = List.of(0.5, 0.99, 0.999);
+  private List<Double> percentiles = List.of(0.5, 0.99, 0.999);
 
-    public List<Double> getPercentiles() {
-        return percentiles;
-    }
+  public List<Double> getPercentiles() {
+    return percentiles;
+  }
 
-    public void setPercentiles(List<Double> percentiles) {
-        this.percentiles = percentiles;
-    }
+  public void setPercentiles(List<Double> percentiles) {
+    this.percentiles = percentiles;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MonitoringClientPropertiesConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MonitoringClientPropertiesConfiguration.java
index a67745dc33..8f2018ca86 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MonitoringClientPropertiesConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/MonitoringClientPropertiesConfiguration.java
@@ -11,17 +11,11 @@
  */
 @Configuration
 public class MonitoringClientPropertiesConfiguration {
-    @Bean
-    @ConfigurationProperties("graphite.client")
-    @ConditionalOnProperty(value = "graphite.client.enabled", havingValue = "true")
-    public GraphiteMonitoringMetricsProperties graphiteMonitoringClientProperties() {
-        return new GraphiteMonitoringMetricsProperties();
-    }
 
-    @Bean
-    @ConfigurationProperties("prometheus.client")
-    @ConditionalOnProperty(value = "prometheus.client.enabled", havingValue = "true")
-    public PrometheusMonitoringClientProperties prometheusMonitoringClientProperties() {
-        return new PrometheusMonitoringClientProperties();
-    }
+  @Bean
+  @ConfigurationProperties("prometheus.client")
+  @ConditionalOnProperty(value = "prometheus.client.enabled", havingValue = "true")
+  public PrometheusMonitoringClientProperties prometheusMonitoringClientProperties() {
+    return new PrometheusMonitoringClientProperties();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/OfflineRetransmissionConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/OfflineRetransmissionConfiguration.java
index faaf98e25a..f7c16ac3f7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/OfflineRetransmissionConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/OfflineRetransmissionConfiguration.java
@@ -11,18 +11,21 @@
 
 @Configuration
 public class OfflineRetransmissionConfiguration {
-    @Bean
-    @Qualifier("dcAwareOfflineRetransmissionRepository")
-    OfflineRetransmissionRepository dcAwareOfflineRetransmissionRepository(
-            MultiDatacenterRepositoryCommandExecutor commandExecutor,
-            @Qualifier("zookeeperOfflineRetransmissionRepository") OfflineRetransmissionRepository offlineRetransmissionRepository) {
-        return new DcAwareOfflineRetransmissionRepository(commandExecutor, offlineRetransmissionRepository);
-    }
+  @Bean
+  @Qualifier("dcAwareOfflineRetransmissionRepository")
+  OfflineRetransmissionRepository dcAwareOfflineRetransmissionRepository(
+      MultiDatacenterRepositoryCommandExecutor commandExecutor,
+      @Qualifier("zookeeperOfflineRetransmissionRepository")
+          OfflineRetransmissionRepository offlineRetransmissionRepository) {
+    return new DcAwareOfflineRetransmissionRepository(
+        commandExecutor, offlineRetransmissionRepository);
+  }
 
-    @Bean
-    OfflineRetransmissionService offlineRetransmissionService(
-            @Qualifier("dcAwareOfflineRetransmissionRepository") OfflineRetransmissionRepository taskRepository,
-            TopicRepository topicRepository) {
-        return new OfflineRetransmissionService(taskRepository, topicRepository);
-    }
+  @Bean
+  OfflineRetransmissionService offlineRetransmissionService(
+      @Qualifier("dcAwareOfflineRetransmissionRepository")
+          OfflineRetransmissionRepository taskRepository,
+      TopicRepository topicRepository) {
+    return new OfflineRetransmissionService(taskRepository, topicRepository);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/OwnerConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/OwnerConfiguration.java
index 96f67f78cd..b7bde4ffad 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/OwnerConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/OwnerConfiguration.java
@@ -1,20 +1,18 @@
 package pl.allegro.tech.hermes.management.config;
 
+import java.util.List;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import pl.allegro.tech.hermes.management.domain.owner.OwnerSource;
 import pl.allegro.tech.hermes.management.domain.owner.OwnerSources;
 
-import java.util.List;
-
 @Configuration
 public class OwnerConfiguration {
 
-    @Bean
-    @ConditionalOnMissingBean
-    public OwnerSources ownerSources(List<OwnerSource> ownerSources) {
-        return new OwnerSources(ownerSources);
-    }
-
+  @Bean
+  @ConditionalOnMissingBean
+  public OwnerSources ownerSources(List<OwnerSource> ownerSources) {
+    return new OwnerSources(ownerSources);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfigAdapter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfigAdapter.java
index b7bc154b40..4d4eba794d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfigAdapter.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfigAdapter.java
@@ -1,32 +1,29 @@
 package pl.allegro.tech.hermes.management.config;
 
 import io.micrometer.prometheus.PrometheusConfig;
-
 import java.time.Duration;
 
 public class PrometheusConfigAdapter implements PrometheusConfig {
 
-    private final PrometheusProperties prometheusReporterProperties;
+  private final PrometheusProperties prometheusReporterProperties;
 
-    public PrometheusConfigAdapter(PrometheusProperties prometheusReporterProperties) {
-        this.prometheusReporterProperties = prometheusReporterProperties;
-    }
+  public PrometheusConfigAdapter(PrometheusProperties prometheusReporterProperties) {
+    this.prometheusReporterProperties = prometheusReporterProperties;
+  }
 
-    @Override
-    public boolean descriptions() {
-        return prometheusReporterProperties.getDescriptions();
-    }
+  @Override
+  public boolean descriptions() {
+    return prometheusReporterProperties.getDescriptions();
+  }
 
-    @Override
-    public Duration step() {
-        return prometheusReporterProperties.getStep();
-    }
+  @Override
+  public Duration step() {
+    return prometheusReporterProperties.getStep();
+  }
 
-    /**
-     * Returning null is fine since we override all the methods from PrometheusConfig.
-     */
-    @Override
-    public String get(String key) {
-        return null;  // Nothing to see here, move along.
-    }
+  /** Returning null is fine since we override all the methods from PrometheusConfig. */
+  @Override
+  public String get(String key) {
+    return null; // Nothing to see here, move along.
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfiguration.java
index c5d9ed53ff..38eca0a4f6 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfiguration.java
@@ -14,53 +14,60 @@
 @EnableConfigurationProperties(MicrometerRegistryProperties.class)
 public class PrometheusConfiguration {
 
-    @Bean
-    @ConditionalOnMissingBean
-    public PrometheusMeterRegistry micrometerRegistry(MicrometerRegistryProperties properties,
-                                                      PrometheusConfig prometheusConfig) {
-        return new PrometheusMeterRegistryFactory(properties,
-                prometheusConfig, "hermes-management").provide();
-    }
+  @Bean
+  @ConditionalOnMissingBean
+  public PrometheusMeterRegistry micrometerRegistry(
+      MicrometerRegistryProperties properties, PrometheusConfig prometheusConfig) {
+    return new PrometheusMeterRegistryFactory(properties, prometheusConfig, "hermes-management")
+        .provide();
+  }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public PrometheusConfig prometheusConfig(PrometheusProperties properties) {
-        return new PrometheusConfigAdapter(properties);
-    }
+  @Bean
+  @ConditionalOnMissingBean
+  public PrometheusConfig prometheusConfig(PrometheusProperties properties) {
+    return new PrometheusConfigAdapter(properties);
+  }
 
-    public static class PrometheusMeterRegistryFactory {
-        private final MicrometerRegistryProperties parameters;
-        private final PrometheusConfig prometheusConfig;
-        private final String prefix;
+  public static class PrometheusMeterRegistryFactory {
+    private final MicrometerRegistryProperties parameters;
+    private final PrometheusConfig prometheusConfig;
+    private final String prefix;
 
-        public PrometheusMeterRegistryFactory(MicrometerRegistryProperties properties,
-                                       PrometheusConfig prometheusConfig,
-                                       String prefix) {
-            this.parameters = properties;
-            this.prometheusConfig = prometheusConfig;
-            this.prefix = prefix + "_";
-        }
+    public PrometheusMeterRegistryFactory(
+        MicrometerRegistryProperties properties, PrometheusConfig prometheusConfig, String prefix) {
+      this.parameters = properties;
+      this.prometheusConfig = prometheusConfig;
+      this.prefix = prefix + "_";
+    }
 
-        public PrometheusMeterRegistry provide() {
-            PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(prometheusConfig);
-            applyFilters(meterRegistry);
-            return meterRegistry;
-        }
+    public PrometheusMeterRegistry provide() {
+      PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(prometheusConfig);
+      applyFilters(meterRegistry);
+      return meterRegistry;
+    }
 
-        private void applyFilters(PrometheusMeterRegistry meterRegistry) {
-            meterRegistry.config().meterFilter(new MeterFilter() {
+    private void applyFilters(PrometheusMeterRegistry meterRegistry) {
+      meterRegistry
+          .config()
+          .meterFilter(
+              new MeterFilter() {
                 @Override
                 public Meter.Id map(Meter.Id id) {
-                    return id.withName(prefix + id.getName());
+                  return id.withName(prefix + id.getName());
                 }
 
                 @Override
-                public DistributionStatisticConfig configure(Meter.Id id, DistributionStatisticConfig config) {
-                    return DistributionStatisticConfig.builder()
-                            .percentiles(parameters.getPercentiles().stream().mapToDouble(Double::doubleValue).toArray()
-                    ).build().merge(config);
+                public DistributionStatisticConfig configure(
+                    Meter.Id id, DistributionStatisticConfig config) {
+                  return DistributionStatisticConfig.builder()
+                      .percentiles(
+                          parameters.getPercentiles().stream()
+                              .mapToDouble(Double::doubleValue)
+                              .toArray())
+                      .build()
+                      .merge(config);
                 }
-            });
-        }
+              });
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusMonitoringClientProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusMonitoringClientProperties.java
index cdf4ce2cdb..1e6ba49dfd 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusMonitoringClientProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusMonitoringClientProperties.java
@@ -1,31 +1,31 @@
 package pl.allegro.tech.hermes.management.config;
 
 public class PrometheusMonitoringClientProperties extends ExternalMonitoringClientProperties {
-    private String consumersMetricsPrefix = "hermes_consumers";
-    private String frontendMetricsPrefix = "hermes_frontend";
-    private String additionalFilters = "";
+  private String consumersMetricsPrefix = "hermes_consumers";
+  private String frontendMetricsPrefix = "hermes_frontend";
+  private String additionalFilters = "";
 
-    public String getConsumersMetricsPrefix() {
-        return consumersMetricsPrefix;
-    }
+  public String getConsumersMetricsPrefix() {
+    return consumersMetricsPrefix;
+  }
 
-    public void setConsumersMetricsPrefix(String consumersMetricsPrefix) {
-        this.consumersMetricsPrefix = consumersMetricsPrefix;
-    }
+  public void setConsumersMetricsPrefix(String consumersMetricsPrefix) {
+    this.consumersMetricsPrefix = consumersMetricsPrefix;
+  }
 
-    public String getFrontendMetricsPrefix() {
-        return frontendMetricsPrefix;
-    }
+  public String getFrontendMetricsPrefix() {
+    return frontendMetricsPrefix;
+  }
 
-    public void setFrontendMetricsPrefix(String frontendMetricsPrefix) {
-        this.frontendMetricsPrefix = frontendMetricsPrefix;
-    }
+  public void setFrontendMetricsPrefix(String frontendMetricsPrefix) {
+    this.frontendMetricsPrefix = frontendMetricsPrefix;
+  }
 
-    public String getAdditionalFilters() {
-        return additionalFilters;
-    }
+  public String getAdditionalFilters() {
+    return additionalFilters;
+  }
 
-    public void setAdditionalFilters(String additionalFilters) {
-        this.additionalFilters = additionalFilters;
-    }
+  public void setAdditionalFilters(String additionalFilters) {
+    this.additionalFilters = additionalFilters;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusProperties.java
index 1dcebc1eaf..c7da900f77 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusProperties.java
@@ -1,28 +1,27 @@
 package pl.allegro.tech.hermes.management.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "metrics.prometheus")
 public class PrometheusProperties {
 
-    private Duration step = Duration.ofMinutes(1);
-    private boolean descriptions = true;
+  private Duration step = Duration.ofMinutes(1);
+  private boolean descriptions = true;
 
-    public Duration getStep() {
-        return this.step;
-    }
+  public Duration getStep() {
+    return this.step;
+  }
 
-    public void setStep(Duration step) {
-        this.step = step;
-    }
+  public void setStep(Duration step) {
+    this.step = step;
+  }
 
-    public boolean getDescriptions() {
-        return this.descriptions;
-    }
+  public boolean getDescriptions() {
+    return this.descriptions;
+  }
 
-    public void setDescriptions(boolean descriptions) {
-        this.descriptions = descriptions;
-    }
+  public void setDescriptions(boolean descriptions) {
+    this.descriptions = descriptions;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ReadinessConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ReadinessConfiguration.java
index cef5e831dc..d6906b3532 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ReadinessConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/ReadinessConfiguration.java
@@ -1,16 +1,26 @@
 package pl.allegro.tech.hermes.management.config;
 
+import java.util.List;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import pl.allegro.tech.hermes.management.config.storage.StorageClustersProperties;
+import pl.allegro.tech.hermes.management.config.storage.StorageProperties;
 import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryCommandExecutor;
-import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryQueryExecutor;
+import pl.allegro.tech.hermes.management.domain.readiness.DatacenterReadinessRepository;
 import pl.allegro.tech.hermes.management.domain.readiness.ReadinessService;
 
 @Configuration
 public class ReadinessConfiguration {
-    @Bean
-    ReadinessService readinessService(MultiDatacenterRepositoryCommandExecutor commandExecutor,
-                                      MultiDatacenterRepositoryQueryExecutor queryExecutor) {
-        return new ReadinessService(commandExecutor, queryExecutor);
-    }
+
+  @Bean
+  ReadinessService readinessService(
+      MultiDatacenterRepositoryCommandExecutor commandExecutor,
+      DatacenterReadinessRepository readinessRepository,
+      StorageClustersProperties storageClustersProperties) {
+    List<String> datacenters =
+        storageClustersProperties.getClusters().stream()
+            .map(StorageProperties::getDatacenter)
+            .toList();
+    return new ReadinessService(commandExecutor, readinessRepository, datacenters);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaCacheProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaCacheProperties.java
index d54a05483c..9dcf228d77 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaCacheProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaCacheProperties.java
@@ -5,31 +5,31 @@
 @ConfigurationProperties(prefix = "schema.cache")
 public class SchemaCacheProperties {
 
-    private int poolSize = 2;
-    private int refreshAfterWriteMinutes = 10;
-    private int expireAfterWriteMinutes = 60 * 24;
+  private int poolSize = 2;
+  private int refreshAfterWriteMinutes = 10;
+  private int expireAfterWriteMinutes = 60 * 24;
 
-    public int getPoolSize() {
-        return poolSize;
-    }
+  public int getPoolSize() {
+    return poolSize;
+  }
 
-    public void setPoolSize(int poolSize) {
-        this.poolSize = poolSize;
-    }
+  public void setPoolSize(int poolSize) {
+    this.poolSize = poolSize;
+  }
 
-    public int getRefreshAfterWriteMinutes() {
-        return refreshAfterWriteMinutes;
-    }
+  public int getRefreshAfterWriteMinutes() {
+    return refreshAfterWriteMinutes;
+  }
 
-    public void setRefreshAfterWriteMinutes(int refreshAfterWriteMinutes) {
-        this.refreshAfterWriteMinutes = refreshAfterWriteMinutes;
-    }
+  public void setRefreshAfterWriteMinutes(int refreshAfterWriteMinutes) {
+    this.refreshAfterWriteMinutes = refreshAfterWriteMinutes;
+  }
 
-    public int getExpireAfterWriteMinutes() {
-        return expireAfterWriteMinutes;
-    }
+  public int getExpireAfterWriteMinutes() {
+    return expireAfterWriteMinutes;
+  }
 
-    public void setExpireAfterWriteMinutes(int expireAfterWriteMinutes) {
-        this.expireAfterWriteMinutes = expireAfterWriteMinutes;
-    }
+  public void setExpireAfterWriteMinutes(int expireAfterWriteMinutes) {
+    this.expireAfterWriteMinutes = expireAfterWriteMinutes;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryConfiguration.java
index ccbd520dc1..601972e1af 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryConfiguration.java
@@ -1,9 +1,12 @@
 package pl.allegro.tech.hermes.management.config;
 
+import static pl.allegro.tech.hermes.schema.SubjectNamingStrategy.qualifiedName;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
+import java.net.URI;
 import org.apache.avro.Schema;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
@@ -28,66 +31,70 @@
 import pl.allegro.tech.hermes.schema.resolver.DefaultSchemaRepositoryInstanceResolver;
 import pl.allegro.tech.hermes.schema.resolver.SchemaRepositoryInstanceResolver;
 
-import java.net.URI;
-
-import static pl.allegro.tech.hermes.schema.SubjectNamingStrategy.qualifiedName;
-
 @Configuration
 @EnableConfigurationProperties({SchemaRepositoryProperties.class})
 public class SchemaRepositoryConfiguration {
 
-    @Autowired
-    @Lazy
-    TopicService topicService;
-
-    @Autowired
-    private SchemaRepositoryProperties schemaRepositoryProperties;
+  @Autowired @Lazy TopicService topicService;
 
-    @Bean(name = "schemaRepositoryClient")
-    public Client schemaRepositoryClient(ObjectMapper mapper) {
-        ClientConfig config = new ClientConfig()
-                .property(ClientProperties.CONNECT_TIMEOUT, schemaRepositoryProperties.getConnectionTimeoutMillis())
-                .property(ClientProperties.READ_TIMEOUT, schemaRepositoryProperties.getSocketTimeoutMillis())
-                .register(new JacksonJsonProvider(mapper));
+  @Autowired private SchemaRepositoryProperties schemaRepositoryProperties;
 
-        return ClientBuilder.newClient(config);
-    }
+  @Bean(name = "schemaRepositoryClient")
+  public Client schemaRepositoryClient(ObjectMapper mapper) {
+    ClientConfig config =
+        new ClientConfig()
+            .property(
+                ClientProperties.CONNECT_TIMEOUT,
+                schemaRepositoryProperties.getConnectionTimeoutMillis())
+            .property(
+                ClientProperties.READ_TIMEOUT, schemaRepositoryProperties.getSocketTimeoutMillis())
+            .register(new JacksonJsonProvider(mapper));
 
-    @Bean
-    public SubjectNamingStrategy subjectNamingStrategy(KafkaClustersProperties kafkaClustersProperties) {
-        return qualifiedName
-                .withNamespacePrefixIf(
-                        schemaRepositoryProperties.isSubjectNamespaceEnabled(),
-                        new SubjectNamingStrategy.Namespace(kafkaClustersProperties.getDefaultNamespace(),
-                                kafkaClustersProperties.getNamespaceSeparator()))
-                .withValueSuffixIf(schemaRepositoryProperties.isSubjectSuffixEnabled());
-    }
+    return ClientBuilder.newClient(config);
+  }
 
-    @Bean
-    @ConditionalOnMissingBean(RawSchemaClient.class)
-    public RawSchemaClient schemaRegistryRawSchemaClient(
-            SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver,
-            ObjectMapper objectMapper,
-            SubjectNamingStrategy subjectNamingStrategy
-    ) {
-        return new SchemaRegistryRawSchemaClient(schemaRepositoryInstanceResolver, objectMapper,
-                schemaRepositoryProperties.isValidationEnabled(), schemaRepositoryProperties.getDeleteSchemaPathSuffix(),
-                subjectNamingStrategy);
-    }
+  @Bean
+  public SubjectNamingStrategy subjectNamingStrategy(
+      KafkaClustersProperties kafkaClustersProperties) {
+    return qualifiedName
+        .withNamespacePrefixIf(
+            schemaRepositoryProperties.isSubjectNamespaceEnabled(),
+            new SubjectNamingStrategy.Namespace(
+                kafkaClustersProperties.getDefaultNamespace(),
+                kafkaClustersProperties.getNamespaceSeparator()))
+        .withValueSuffixIf(schemaRepositoryProperties.isSubjectSuffixEnabled());
+  }
 
-    @Bean
-    @ConditionalOnMissingBean(SchemaRepositoryInstanceResolver.class)
-    public SchemaRepositoryInstanceResolver defaultSchemaRepositoryInstanceResolver(@Qualifier("schemaRepositoryClient") Client client) {
-        return new DefaultSchemaRepositoryInstanceResolver(client, URI.create(schemaRepositoryProperties.getServerUrl()));
-    }
+  @Bean
+  @ConditionalOnMissingBean(RawSchemaClient.class)
+  public RawSchemaClient schemaRegistryRawSchemaClient(
+      SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver,
+      ObjectMapper objectMapper,
+      SubjectNamingStrategy subjectNamingStrategy) {
+    return new SchemaRegistryRawSchemaClient(
+        schemaRepositoryInstanceResolver,
+        objectMapper,
+        schemaRepositoryProperties.isValidationEnabled(),
+        schemaRepositoryProperties.getDeleteSchemaPathSuffix(),
+        subjectNamingStrategy);
+  }
 
-    @Bean
-    public SchemaRepository aggregateSchemaRepository(RawSchemaClient rawSchemaClient) {
-        SchemaVersionsRepository versionsRepository = new DirectSchemaVersionsRepository(rawSchemaClient);
-        CompiledSchemaRepository<Schema> avroSchemaRepository = new DirectCompiledSchemaRepository<>(
-                rawSchemaClient, SchemaCompilersFactory.avroSchemaCompiler());
+  @Bean
+  @ConditionalOnMissingBean(SchemaRepositoryInstanceResolver.class)
+  public SchemaRepositoryInstanceResolver defaultSchemaRepositoryInstanceResolver(
+      @Qualifier("schemaRepositoryClient") Client client) {
+    return new DefaultSchemaRepositoryInstanceResolver(
+        client, URI.create(schemaRepositoryProperties.getServerUrl()));
+  }
 
-        return new SchemaRepository(versionsRepository, avroSchemaRepository);
-    }
+  @Bean
+  public SchemaRepository aggregateSchemaRepository(RawSchemaClient rawSchemaClient) {
+    SchemaVersionsRepository versionsRepository =
+        new DirectSchemaVersionsRepository(rawSchemaClient);
+    CompiledSchemaRepository<Schema> avroSchemaRepository =
+        new DirectCompiledSchemaRepository<>(
+            rawSchemaClient, SchemaCompilersFactory.avroSchemaCompiler());
 
+    return new SchemaRepository(versionsRepository, avroSchemaRepository);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryProperties.java
index 085cfac8c9..4df89b9b92 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryProperties.java
@@ -5,72 +5,72 @@
 @ConfigurationProperties(prefix = "schema.repository")
 public class SchemaRepositoryProperties {
 
-    private String serverUrl = "http://localhost:8888/";
+  private String serverUrl = "http://localhost:8888/";
 
-    private boolean validationEnabled = false;
+  private boolean validationEnabled = false;
 
-    private int connectionTimeoutMillis = 1000;
+  private int connectionTimeoutMillis = 1000;
 
-    private int socketTimeoutMillis = 3000;
-    private String deleteSchemaPathSuffix = "versions";
+  private int socketTimeoutMillis = 3000;
+  private String deleteSchemaPathSuffix = "versions";
 
-    private boolean subjectSuffixEnabled = false;
+  private boolean subjectSuffixEnabled = false;
 
-    private boolean subjectNamespaceEnabled = false;
+  private boolean subjectNamespaceEnabled = false;
 
-    public String getServerUrl() {
-        return serverUrl;
-    }
+  public String getServerUrl() {
+    return serverUrl;
+  }
 
-    public void setServerUrl(String serverUrl) {
-        this.serverUrl = serverUrl;
-    }
+  public void setServerUrl(String serverUrl) {
+    this.serverUrl = serverUrl;
+  }
 
-    public boolean isValidationEnabled() {
-        return validationEnabled;
-    }
+  public boolean isValidationEnabled() {
+    return validationEnabled;
+  }
 
-    public void setValidationEnabled(boolean validationEnabled) {
-        this.validationEnabled = validationEnabled;
-    }
+  public void setValidationEnabled(boolean validationEnabled) {
+    this.validationEnabled = validationEnabled;
+  }
 
-    public int getConnectionTimeoutMillis() {
-        return connectionTimeoutMillis;
-    }
+  public int getConnectionTimeoutMillis() {
+    return connectionTimeoutMillis;
+  }
 
-    public void setConnectionTimeoutMillis(int connectionTimeoutMillis) {
-        this.connectionTimeoutMillis = connectionTimeoutMillis;
-    }
+  public void setConnectionTimeoutMillis(int connectionTimeoutMillis) {
+    this.connectionTimeoutMillis = connectionTimeoutMillis;
+  }
 
-    public int getSocketTimeoutMillis() {
-        return socketTimeoutMillis;
-    }
+  public int getSocketTimeoutMillis() {
+    return socketTimeoutMillis;
+  }
 
-    public String getDeleteSchemaPathSuffix() {
-        return deleteSchemaPathSuffix;
-    }
+  public String getDeleteSchemaPathSuffix() {
+    return deleteSchemaPathSuffix;
+  }
 
-    public void setDeleteSchemaPathSuffix(String deleteSchemaPathSuffix) {
-        this.deleteSchemaPathSuffix = deleteSchemaPathSuffix;
-    }
+  public void setDeleteSchemaPathSuffix(String deleteSchemaPathSuffix) {
+    this.deleteSchemaPathSuffix = deleteSchemaPathSuffix;
+  }
 
-    public void setSocketTimeoutMillis(int socketTimeoutMillis) {
-        this.socketTimeoutMillis = socketTimeoutMillis;
-    }
+  public void setSocketTimeoutMillis(int socketTimeoutMillis) {
+    this.socketTimeoutMillis = socketTimeoutMillis;
+  }
 
-    public boolean isSubjectSuffixEnabled() {
-        return subjectSuffixEnabled;
-    }
+  public boolean isSubjectSuffixEnabled() {
+    return subjectSuffixEnabled;
+  }
 
-    public void setSubjectSuffixEnabled(boolean subjectSuffixEnabled) {
-        this.subjectSuffixEnabled = subjectSuffixEnabled;
-    }
+  public void setSubjectSuffixEnabled(boolean subjectSuffixEnabled) {
+    this.subjectSuffixEnabled = subjectSuffixEnabled;
+  }
 
-    public boolean isSubjectNamespaceEnabled() {
-        return subjectNamespaceEnabled;
-    }
+  public boolean isSubjectNamespaceEnabled() {
+    return subjectNamespaceEnabled;
+  }
 
-    public void setSubjectNamespaceEnabled(boolean subjectNamespaceEnabled) {
-        this.subjectNamespaceEnabled = subjectNamespaceEnabled;
-    }
+  public void setSubjectNamespaceEnabled(boolean subjectNamespaceEnabled) {
+    this.subjectNamespaceEnabled = subjectNamespaceEnabled;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionConfiguration.java
index 9ea4e1b0fb..c90f380386 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionConfiguration.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.management.config;
 
+import static java.util.stream.Collectors.toList;
+
+import java.util.List;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,52 +17,50 @@
 import pl.allegro.tech.hermes.management.domain.subscription.validator.SubscriptionValidator;
 import pl.allegro.tech.hermes.management.domain.topic.TopicService;
 
-import java.util.List;
-
-import static java.util.stream.Collectors.toList;
-
 @Configuration
 @EnableConfigurationProperties(SubscriptionProperties.class)
 public class SubscriptionConfiguration {
 
-    @Bean
-    public SubscriptionValidator subscriptionValidator(OwnerIdValidator ownerIdValidator,
-                                                       ApiPreconditions apiPreconditions,
-                                                       TopicService topicService,
-                                                       SubscriptionRepository subscriptionRepository,
-                                                       List<EndpointAddressValidator> endpointAddressValidators,
-                                                       EndpointOwnershipValidator endpointOwnershipValidator,
-                                                       SubscriptionProperties subscriptionProperties) {
-        return new SubscriptionValidator(
-                ownerIdValidator,
-                apiPreconditions,
-                topicService,
-                subscriptionRepository,
-                endpointAddressValidators,
-                endpointOwnershipValidator,
-                createListOfSubscribersWithAccessToAnyTopic(subscriptionProperties)
-        );
-    }
+  @Bean
+  public SubscriptionValidator subscriptionValidator(
+      OwnerIdValidator ownerIdValidator,
+      ApiPreconditions apiPreconditions,
+      TopicService topicService,
+      SubscriptionRepository subscriptionRepository,
+      List<EndpointAddressValidator> endpointAddressValidators,
+      EndpointOwnershipValidator endpointOwnershipValidator,
+      SubscriptionProperties subscriptionProperties) {
+    return new SubscriptionValidator(
+        ownerIdValidator,
+        apiPreconditions,
+        topicService,
+        subscriptionRepository,
+        endpointAddressValidators,
+        endpointOwnershipValidator,
+        createListOfSubscribersWithAccessToAnyTopic(subscriptionProperties));
+  }
 
-    private List<SubscriberWithAccessToAnyTopic> createListOfSubscribersWithAccessToAnyTopic(
-            SubscriptionProperties subscriptionProperties
-    ) {
-        return subscriptionProperties.getSubscribersWithAccessToAnyTopic().stream()
-                .map(subscriber -> new SubscriberWithAccessToAnyTopic(
-                        subscriber.getOwnerSource(),
-                        subscriber.getOwnerId(),
-                        subscriber.getProtocols())
-                )
-                .collect(toList());
-    }
+  private List<SubscriberWithAccessToAnyTopic> createListOfSubscribersWithAccessToAnyTopic(
+      SubscriptionProperties subscriptionProperties) {
+    return subscriptionProperties.getSubscribersWithAccessToAnyTopic().stream()
+        .map(
+            subscriber ->
+                new SubscriberWithAccessToAnyTopic(
+                    subscriber.getOwnerSource(),
+                    subscriber.getOwnerId(),
+                    subscriber.getProtocols()))
+        .collect(toList());
+  }
 
-    @Bean
-    public EndpointOwnershipValidator defaultEndpointOwnershipValidator() {
-        return new NoOpEndpointOwnershipValidator();
-    }
+  @Bean
+  public EndpointOwnershipValidator defaultEndpointOwnershipValidator() {
+    return new NoOpEndpointOwnershipValidator();
+  }
 
-    @Bean
-    public EndpointAddressValidator endpointAddressFormatValidator(SubscriptionProperties subscriptionProperties) {
-        return new EndpointAddressFormatValidator(subscriptionProperties.getAdditionalEndpointProtocols());
-    }
+  @Bean
+  public EndpointAddressValidator endpointAddressFormatValidator(
+      SubscriptionProperties subscriptionProperties) {
+    return new EndpointAddressFormatValidator(
+        subscriptionProperties.getAdditionalEndpointProtocols());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionHealthConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionHealthConfiguration.java
index a8c176c362..7918c413b3 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionHealthConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionHealthConfiguration.java
@@ -1,6 +1,7 @@
 package pl.allegro.tech.hermes.management.config;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.Executors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -26,105 +27,107 @@
 import pl.allegro.tech.hermes.management.infrastructure.kafka.MultiDCAwareService;
 import pl.allegro.tech.hermes.tracker.management.LogRepository;
 
-import java.util.concurrent.Executors;
-
 @Configuration
 @EnableConfigurationProperties({SubscriptionHealthProperties.class})
 public class SubscriptionHealthConfiguration {
-    private static final DisabledIndicator DISABLED_INDICATOR = new DisabledIndicator();
+  private static final DisabledIndicator DISABLED_INDICATOR = new DisabledIndicator();
 
-    @Autowired
-    private SubscriptionHealthProperties subscriptionHealthProperties;
+  @Autowired private SubscriptionHealthProperties subscriptionHealthProperties;
 
-    @Bean
-    public SubscriptionHealthProblemIndicator laggingIndicator() {
-        if (subscriptionHealthProperties.isLaggingIndicatorEnabled()) {
-            return new LaggingIndicator(subscriptionHealthProperties.getMaxLagInSeconds());
-        }
-        return DISABLED_INDICATOR;
+  @Bean
+  public SubscriptionHealthProblemIndicator laggingIndicator() {
+    if (subscriptionHealthProperties.isLaggingIndicatorEnabled()) {
+      return new LaggingIndicator(subscriptionHealthProperties.getMaxLagInSeconds());
     }
+    return DISABLED_INDICATOR;
+  }
 
-    @Bean
-    public SubscriptionHealthProblemIndicator unreachableIndicator() {
-        if (subscriptionHealthProperties.isUnreachableIndicatorEnabled()) {
-            return new UnreachableIndicator(
-                    subscriptionHealthProperties.getMaxOtherErrorsRatio(),
-                    subscriptionHealthProperties.getMinSubscriptionRateForReliableMetrics());
-        }
-        return DISABLED_INDICATOR;
+  @Bean
+  public SubscriptionHealthProblemIndicator unreachableIndicator() {
+    if (subscriptionHealthProperties.isUnreachableIndicatorEnabled()) {
+      return new UnreachableIndicator(
+          subscriptionHealthProperties.getMaxOtherErrorsRatio(),
+          subscriptionHealthProperties.getMinSubscriptionRateForReliableMetrics());
     }
+    return DISABLED_INDICATOR;
+  }
 
-    @Bean
-    public SubscriptionHealthProblemIndicator timingOutIndicator() {
-        if (subscriptionHealthProperties.isTimingOutIndicatorEnabled()) {
-            return new TimingOutIndicator(
-                    subscriptionHealthProperties.getMaxTimeoutsRatio(),
-                    subscriptionHealthProperties.getMinSubscriptionRateForReliableMetrics());
-        }
-        return DISABLED_INDICATOR;
+  @Bean
+  public SubscriptionHealthProblemIndicator timingOutIndicator() {
+    if (subscriptionHealthProperties.isTimingOutIndicatorEnabled()) {
+      return new TimingOutIndicator(
+          subscriptionHealthProperties.getMaxTimeoutsRatio(),
+          subscriptionHealthProperties.getMinSubscriptionRateForReliableMetrics());
     }
+    return DISABLED_INDICATOR;
+  }
 
-    @Bean
-    public SubscriptionHealthProblemIndicator malfunctioningIndicator() {
-        if (subscriptionHealthProperties.isMalfunctioningIndicatorEnabled()) {
-            return new MalfunctioningIndicator(
-                    subscriptionHealthProperties.getMax5xxErrorsRatio(),
-                    subscriptionHealthProperties.getMinSubscriptionRateForReliableMetrics());
-        }
-        return DISABLED_INDICATOR;
+  @Bean
+  public SubscriptionHealthProblemIndicator malfunctioningIndicator() {
+    if (subscriptionHealthProperties.isMalfunctioningIndicatorEnabled()) {
+      return new MalfunctioningIndicator(
+          subscriptionHealthProperties.getMax5xxErrorsRatio(),
+          subscriptionHealthProperties.getMinSubscriptionRateForReliableMetrics());
     }
+    return DISABLED_INDICATOR;
+  }
 
-    @Bean
-    public SubscriptionHealthProblemIndicator receivingMalformedMessagesIndicator() {
-        if (subscriptionHealthProperties.isReceivingMalformedMessagesIndicatorEnabled()) {
-            return new ReceivingMalformedMessagesIndicator(
-                    subscriptionHealthProperties.getMax4xxErrorsRatio(),
-                    subscriptionHealthProperties.getMinSubscriptionRateForReliableMetrics());
-        }
-        return DISABLED_INDICATOR;
+  @Bean
+  public SubscriptionHealthProblemIndicator receivingMalformedMessagesIndicator() {
+    if (subscriptionHealthProperties.isReceivingMalformedMessagesIndicatorEnabled()) {
+      return new ReceivingMalformedMessagesIndicator(
+          subscriptionHealthProperties.getMax4xxErrorsRatio(),
+          subscriptionHealthProperties.getMinSubscriptionRateForReliableMetrics());
     }
+    return DISABLED_INDICATOR;
+  }
 
-    @Bean
-    public SubscriptionService subscriptionService(SubscriptionRepository subscriptionRepository,
-                                                   SubscriptionOwnerCache subscriptionOwnerCache,
-                                                   TopicService topicService,
-                                                   SubscriptionMetricsRepository metricsRepository,
-                                                   SubscriptionHealthChecker subscriptionHealthChecker,
-                                                   LogRepository logRepository,
-                                                   SubscriptionValidator subscriptionValidator,
-                                                   Auditor auditor,
-                                                   MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
-                                                   MultiDCAwareService multiDCAwareService,
-                                                   RepositoryManager repositoryManager,
-                                                   SubscriptionHealthProperties subscriptionHealthProperties,
-                                                   SubscriptionRemover subscriptionRemover) {
-        return new SubscriptionService(
-                subscriptionRepository,
-                subscriptionOwnerCache,
-                topicService,
-                metricsRepository,
-                subscriptionHealthChecker,
-                logRepository,
-                subscriptionValidator,
-                auditor,
-                multiDcExecutor,
-                multiDCAwareService,
-                repositoryManager,
-                Executors.newFixedThreadPool(
-                        subscriptionHealthProperties.getThreads(),
-                        new ThreadFactoryBuilder().setNameFormat("subscription-health-check-executor-%d").build()
-                ),
-                subscriptionHealthProperties.getTimeoutMillis(),
-                subscriptionRemover
-        );
-    }
+  @Bean
+  public SubscriptionService subscriptionService(
+      SubscriptionRepository subscriptionRepository,
+      SubscriptionOwnerCache subscriptionOwnerCache,
+      TopicService topicService,
+      SubscriptionMetricsRepository metricsRepository,
+      SubscriptionHealthChecker subscriptionHealthChecker,
+      LogRepository logRepository,
+      SubscriptionValidator subscriptionValidator,
+      Auditor auditor,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
+      MultiDCAwareService multiDCAwareService,
+      RepositoryManager repositoryManager,
+      SubscriptionHealthProperties subscriptionHealthProperties,
+      SubscriptionRemover subscriptionRemover) {
+    return new SubscriptionService(
+        subscriptionRepository,
+        subscriptionOwnerCache,
+        topicService,
+        metricsRepository,
+        subscriptionHealthChecker,
+        logRepository,
+        subscriptionValidator,
+        auditor,
+        multiDcExecutor,
+        multiDCAwareService,
+        repositoryManager,
+        Executors.newFixedThreadPool(
+            subscriptionHealthProperties.getThreads(),
+            new ThreadFactoryBuilder()
+                .setNameFormat("subscription-health-check-executor-%d")
+                .build()),
+        subscriptionHealthProperties.getTimeoutMillis(),
+        subscriptionRemover);
+  }
 
-    @Bean
-    public SubscriptionRemover subscriptionRemover(Auditor auditor,
-                                                   MultiDatacenterRepositoryCommandExecutor multiDatacenterRepositoryCommandExecutor,
-                                                   SubscriptionOwnerCache subscriptionOwnerCache,
-                                                   SubscriptionRepository subscriptionRepository) {
-        return new SubscriptionRemover(auditor, multiDatacenterRepositoryCommandExecutor,
-                subscriptionOwnerCache, subscriptionRepository);
-    }
+  @Bean
+  public SubscriptionRemover subscriptionRemover(
+      Auditor auditor,
+      MultiDatacenterRepositoryCommandExecutor multiDatacenterRepositoryCommandExecutor,
+      SubscriptionOwnerCache subscriptionOwnerCache,
+      SubscriptionRepository subscriptionRepository) {
+    return new SubscriptionRemover(
+        auditor,
+        multiDatacenterRepositoryCommandExecutor,
+        subscriptionOwnerCache,
+        subscriptionRepository);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionHealthProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionHealthProperties.java
index bfb677cbd0..1d23217ea6 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionHealthProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionHealthProperties.java
@@ -4,121 +4,123 @@
 
 @ConfigurationProperties(prefix = "subscription-health")
 public class SubscriptionHealthProperties {
-    private int maxLagInSeconds = 600;
-    private double maxOtherErrorsRatio = 0.5;
-    private double maxTimeoutsRatio = 0.1;
-    private double max5xxErrorsRatio = 0.1;
-    private double max4xxErrorsRatio = 0.1;
-    private double minSubscriptionRateForReliableMetrics = 2.0;
-    private boolean laggingIndicatorEnabled = true;
-    private boolean malfunctioningIndicatorEnabled = true;
-    private boolean receivingMalformedMessagesIndicatorEnabled = true;
-    private boolean timingOutIndicatorEnabled = true;
-    private boolean unreachableIndicatorEnabled = true;
-    private long timeoutMillis = 8000;
-    private int threads = 16;
-
-    public int getMaxLagInSeconds() {
-        return maxLagInSeconds;
-    }
-
-    public void setMaxLagInSeconds(int maxLagInSeconds) {
-        this.maxLagInSeconds = maxLagInSeconds;
-    }
-
-    public double getMaxOtherErrorsRatio() {
-        return maxOtherErrorsRatio;
-    }
-
-    public void setMaxOtherErrorsRatio(double maxOtherErrorsRatio) {
-        this.maxOtherErrorsRatio = maxOtherErrorsRatio;
-    }
-
-    public double getMaxTimeoutsRatio() {
-        return maxTimeoutsRatio;
-    }
-
-    public void setMaxTimeoutsRatio(double maxTimeoutsRatio) {
-        this.maxTimeoutsRatio = maxTimeoutsRatio;
-    }
-
-    public double getMax5xxErrorsRatio() {
-        return max5xxErrorsRatio;
-    }
-
-    public void setMax5xxErrorsRatio(double max5xxErrorsRatio) {
-        this.max5xxErrorsRatio = max5xxErrorsRatio;
-    }
-
-    public double getMax4xxErrorsRatio() {
-        return max4xxErrorsRatio;
-    }
-
-    public void setMax4xxErrorsRatio(double max4xxErrorsRatio) {
-        this.max4xxErrorsRatio = max4xxErrorsRatio;
-    }
-
-    public double getMinSubscriptionRateForReliableMetrics() {
-        return minSubscriptionRateForReliableMetrics;
-    }
-
-    public void setMinSubscriptionRateForReliableMetrics(double minSubscriptionRateForReliableMetrics) {
-        this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
-    }
-
-    public boolean isLaggingIndicatorEnabled() {
-        return laggingIndicatorEnabled;
-    }
-
-    public void setLaggingIndicatorEnabled(boolean laggingIndicatorEnabled) {
-        this.laggingIndicatorEnabled = laggingIndicatorEnabled;
-    }
-
-    public boolean isMalfunctioningIndicatorEnabled() {
-        return malfunctioningIndicatorEnabled;
-    }
-
-    public void setMalfunctioningIndicatorEnabled(boolean malfunctioningIndicatorEnabled) {
-        this.malfunctioningIndicatorEnabled = malfunctioningIndicatorEnabled;
-    }
-
-    public boolean isReceivingMalformedMessagesIndicatorEnabled() {
-        return receivingMalformedMessagesIndicatorEnabled;
-    }
-
-    public void setReceivingMalformedMessagesIndicatorEnabled(boolean receivingMalformedMessagesIndicatorEnabled) {
-        this.receivingMalformedMessagesIndicatorEnabled = receivingMalformedMessagesIndicatorEnabled;
-    }
-
-    public boolean isTimingOutIndicatorEnabled() {
-        return timingOutIndicatorEnabled;
-    }
-
-    public void setTimingOutIndicatorEnabled(boolean timingOutIndicatorEnabled) {
-        this.timingOutIndicatorEnabled = timingOutIndicatorEnabled;
-    }
-
-    public boolean isUnreachableIndicatorEnabled() {
-        return unreachableIndicatorEnabled;
-    }
-
-    public void setUnreachableIndicatorEnabled(boolean unreachableIndicatorEnabled) {
-        this.unreachableIndicatorEnabled = unreachableIndicatorEnabled;
-    }
-
-    public long getTimeoutMillis() {
-        return timeoutMillis;
-    }
-
-    public void setTimeoutMillis(long timeoutMillis) {
-        this.timeoutMillis = timeoutMillis;
-    }
-
-    public int getThreads() {
-        return threads;
-    }
-
-    public void setThreads(int threads) {
-        this.threads = threads;
-    }
+  private int maxLagInSeconds = 600;
+  private double maxOtherErrorsRatio = 0.5;
+  private double maxTimeoutsRatio = 0.1;
+  private double max5xxErrorsRatio = 0.1;
+  private double max4xxErrorsRatio = 0.1;
+  private double minSubscriptionRateForReliableMetrics = 2.0;
+  private boolean laggingIndicatorEnabled = true;
+  private boolean malfunctioningIndicatorEnabled = true;
+  private boolean receivingMalformedMessagesIndicatorEnabled = true;
+  private boolean timingOutIndicatorEnabled = true;
+  private boolean unreachableIndicatorEnabled = true;
+  private long timeoutMillis = 8000;
+  private int threads = 16;
+
+  public int getMaxLagInSeconds() {
+    return maxLagInSeconds;
+  }
+
+  public void setMaxLagInSeconds(int maxLagInSeconds) {
+    this.maxLagInSeconds = maxLagInSeconds;
+  }
+
+  public double getMaxOtherErrorsRatio() {
+    return maxOtherErrorsRatio;
+  }
+
+  public void setMaxOtherErrorsRatio(double maxOtherErrorsRatio) {
+    this.maxOtherErrorsRatio = maxOtherErrorsRatio;
+  }
+
+  public double getMaxTimeoutsRatio() {
+    return maxTimeoutsRatio;
+  }
+
+  public void setMaxTimeoutsRatio(double maxTimeoutsRatio) {
+    this.maxTimeoutsRatio = maxTimeoutsRatio;
+  }
+
+  public double getMax5xxErrorsRatio() {
+    return max5xxErrorsRatio;
+  }
+
+  public void setMax5xxErrorsRatio(double max5xxErrorsRatio) {
+    this.max5xxErrorsRatio = max5xxErrorsRatio;
+  }
+
+  public double getMax4xxErrorsRatio() {
+    return max4xxErrorsRatio;
+  }
+
+  public void setMax4xxErrorsRatio(double max4xxErrorsRatio) {
+    this.max4xxErrorsRatio = max4xxErrorsRatio;
+  }
+
+  public double getMinSubscriptionRateForReliableMetrics() {
+    return minSubscriptionRateForReliableMetrics;
+  }
+
+  public void setMinSubscriptionRateForReliableMetrics(
+      double minSubscriptionRateForReliableMetrics) {
+    this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
+  }
+
+  public boolean isLaggingIndicatorEnabled() {
+    return laggingIndicatorEnabled;
+  }
+
+  public void setLaggingIndicatorEnabled(boolean laggingIndicatorEnabled) {
+    this.laggingIndicatorEnabled = laggingIndicatorEnabled;
+  }
+
+  public boolean isMalfunctioningIndicatorEnabled() {
+    return malfunctioningIndicatorEnabled;
+  }
+
+  public void setMalfunctioningIndicatorEnabled(boolean malfunctioningIndicatorEnabled) {
+    this.malfunctioningIndicatorEnabled = malfunctioningIndicatorEnabled;
+  }
+
+  public boolean isReceivingMalformedMessagesIndicatorEnabled() {
+    return receivingMalformedMessagesIndicatorEnabled;
+  }
+
+  public void setReceivingMalformedMessagesIndicatorEnabled(
+      boolean receivingMalformedMessagesIndicatorEnabled) {
+    this.receivingMalformedMessagesIndicatorEnabled = receivingMalformedMessagesIndicatorEnabled;
+  }
+
+  public boolean isTimingOutIndicatorEnabled() {
+    return timingOutIndicatorEnabled;
+  }
+
+  public void setTimingOutIndicatorEnabled(boolean timingOutIndicatorEnabled) {
+    this.timingOutIndicatorEnabled = timingOutIndicatorEnabled;
+  }
+
+  public boolean isUnreachableIndicatorEnabled() {
+    return unreachableIndicatorEnabled;
+  }
+
+  public void setUnreachableIndicatorEnabled(boolean unreachableIndicatorEnabled) {
+    this.unreachableIndicatorEnabled = unreachableIndicatorEnabled;
+  }
+
+  public long getTimeoutMillis() {
+    return timeoutMillis;
+  }
+
+  public void setTimeoutMillis(long timeoutMillis) {
+    this.timeoutMillis = timeoutMillis;
+  }
+
+  public int getThreads() {
+    return threads;
+  }
+
+  public void setThreads(int threads) {
+    this.threads = threads;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionProperties.java
index 01cfc1b4f9..26d17e67bb 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SubscriptionProperties.java
@@ -1,90 +1,92 @@
 package pl.allegro.tech.hermes.management.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties("subscription")
 public class SubscriptionProperties {
 
-    private List<String> additionalEndpointProtocols = new ArrayList<>();
+  private List<String> additionalEndpointProtocols = new ArrayList<>();
 
-    private List<SubscriberProperties> subscribersWithAccessToAnyTopic = new ArrayList<>();
+  private List<SubscriberProperties> subscribersWithAccessToAnyTopic = new ArrayList<>();
 
-    private int intervalBetweenCheckinIfOffsetsMovedInMillis = 50;
+  private int intervalBetweenCheckinIfOffsetsMovedInMillis = 50;
 
-    private int offsetsMovedTimeoutInSeconds = 30;
+  private int offsetsMovedTimeoutInSeconds = 30;
 
-    private boolean createConsumerGroupManuallyEnabled = true;
+  private boolean createConsumerGroupManuallyEnabled = true;
 
-    public List<String> getAdditionalEndpointProtocols() {
-        return additionalEndpointProtocols;
-    }
+  public List<String> getAdditionalEndpointProtocols() {
+    return additionalEndpointProtocols;
+  }
 
-    public void setAdditionalEndpointProtocols(List<String> additionalEndpointProtocols) {
-        this.additionalEndpointProtocols = additionalEndpointProtocols;
-    }
+  public void setAdditionalEndpointProtocols(List<String> additionalEndpointProtocols) {
+    this.additionalEndpointProtocols = additionalEndpointProtocols;
+  }
 
-    public int getIntervalBetweenCheckinIfOffsetsMovedInMillis() {
-        return intervalBetweenCheckinIfOffsetsMovedInMillis;
-    }
+  public int getIntervalBetweenCheckinIfOffsetsMovedInMillis() {
+    return intervalBetweenCheckinIfOffsetsMovedInMillis;
+  }
 
-    public void setIntervalBetweenCheckinIfOffsetsMovedInMillis(int intervalBetweenCheckinIfOffsetsMovedInMillis) {
-        this.intervalBetweenCheckinIfOffsetsMovedInMillis = intervalBetweenCheckinIfOffsetsMovedInMillis;
-    }
+  public void setIntervalBetweenCheckinIfOffsetsMovedInMillis(
+      int intervalBetweenCheckinIfOffsetsMovedInMillis) {
+    this.intervalBetweenCheckinIfOffsetsMovedInMillis =
+        intervalBetweenCheckinIfOffsetsMovedInMillis;
+  }
 
-    public int getOffsetsMovedTimeoutInSeconds() {
-        return offsetsMovedTimeoutInSeconds;
-    }
+  public int getOffsetsMovedTimeoutInSeconds() {
+    return offsetsMovedTimeoutInSeconds;
+  }
 
-    public void setOffsetsMovedTimeoutInSeconds(int offsetsMovedTimeoutInSeconds) {
-        this.offsetsMovedTimeoutInSeconds = offsetsMovedTimeoutInSeconds;
-    }
+  public void setOffsetsMovedTimeoutInSeconds(int offsetsMovedTimeoutInSeconds) {
+    this.offsetsMovedTimeoutInSeconds = offsetsMovedTimeoutInSeconds;
+  }
 
-    public boolean isCreateConsumerGroupManuallyEnabled() {
-        return createConsumerGroupManuallyEnabled;
-    }
+  public boolean isCreateConsumerGroupManuallyEnabled() {
+    return createConsumerGroupManuallyEnabled;
+  }
 
-    public void setCreateConsumerGroupManuallyEnabled(boolean createConsumerGroupManuallyEnabled) {
-        this.createConsumerGroupManuallyEnabled = createConsumerGroupManuallyEnabled;
-    }
+  public void setCreateConsumerGroupManuallyEnabled(boolean createConsumerGroupManuallyEnabled) {
+    this.createConsumerGroupManuallyEnabled = createConsumerGroupManuallyEnabled;
+  }
 
-    public List<SubscriberProperties> getSubscribersWithAccessToAnyTopic() {
-        return subscribersWithAccessToAnyTopic;
-    }
+  public List<SubscriberProperties> getSubscribersWithAccessToAnyTopic() {
+    return subscribersWithAccessToAnyTopic;
+  }
 
-    public void setSubscribersWithAccessToAnyTopic(List<SubscriberProperties> subscribersWithAccessToAnyTopic) {
-        this.subscribersWithAccessToAnyTopic = subscribersWithAccessToAnyTopic;
-    }
+  public void setSubscribersWithAccessToAnyTopic(
+      List<SubscriberProperties> subscribersWithAccessToAnyTopic) {
+    this.subscribersWithAccessToAnyTopic = subscribersWithAccessToAnyTopic;
+  }
 
-    public static class SubscriberProperties {
-        private String ownerSource;
-        private String ownerId;
-        private List<String> protocols = new ArrayList<>();
+  public static class SubscriberProperties {
+    private String ownerSource;
+    private String ownerId;
+    private List<String> protocols = new ArrayList<>();
 
-        public String getOwnerSource() {
-            return ownerSource;
-        }
+    public String getOwnerSource() {
+      return ownerSource;
+    }
 
-        public void setOwnerSource(String ownerSource) {
-            this.ownerSource = ownerSource;
-        }
+    public void setOwnerSource(String ownerSource) {
+      this.ownerSource = ownerSource;
+    }
 
-        public String getOwnerId() {
-            return ownerId;
-        }
+    public String getOwnerId() {
+      return ownerId;
+    }
 
-        public void setOwnerId(String ownerId) {
-            this.ownerId = ownerId;
-        }
+    public void setOwnerId(String ownerId) {
+      this.ownerId = ownerId;
+    }
 
-        public List<String> getProtocols() {
-            return protocols;
-        }
+    public List<String> getProtocols() {
+      return protocols;
+    }
 
-        public void setProtocols(List<String> protocols) {
-            this.protocols = protocols;
-        }
+    public void setProtocols(List<String> protocols) {
+      this.protocols = protocols;
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/TopicProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/TopicProperties.java
index 11b2fe876b..725982233d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/TopicProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/TopicProperties.java
@@ -1,166 +1,174 @@
 package pl.allegro.tech.hermes.management.config;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import pl.allegro.tech.hermes.api.ContentType;
-import pl.allegro.tech.hermes.api.TopicLabel;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import pl.allegro.tech.hermes.api.ContentType;
+import pl.allegro.tech.hermes.api.TopicLabel;
 
 @ConfigurationProperties(prefix = "topic")
 public class TopicProperties {
 
-    private int replicationFactor = 1;
-
-    private int partitions = 10;
-
-    private boolean allowRemoval = false;
+  private int replicationFactor = 1;
 
-    private boolean removeSchema = false;
+  private int partitions = 10;
 
-    private List<ContentType> allowedContentTypes = Arrays.asList(ContentType.AVRO, ContentType.JSON);
+  private boolean allowRemoval = false;
 
-    private Set<TopicLabel> allowedTopicLabels = Collections.emptySet();
+  private boolean removeSchema = false;
 
-    private boolean uncleanLeaderElectionEnabled = false;
+  private List<ContentType> allowedContentTypes = Arrays.asList(ContentType.AVRO, ContentType.JSON);
 
-    private int touchDelayInSeconds = 120;
+  private Set<TopicLabel> allowedTopicLabels = Collections.emptySet();
 
-    private boolean touchSchedulerEnabled = true;
+  private boolean uncleanLeaderElectionEnabled = false;
 
-    private int subscriptionsAssignmentsCompletedTimeoutSeconds = 30;
+  private int touchDelayInSeconds = 120;
 
-    private boolean defaultSchemaIdAwareSerializationEnabled = false;
+  private boolean touchSchedulerEnabled = true;
 
-    private boolean avroContentTypeMetadataRequired = true;
+  private int subscriptionsAssignmentsCompletedTimeoutSeconds = 30;
 
-    /**
-     * <p>Introduced in Kafka 0.11.0.0 mechanism of splitting oversized batches does not respect configuration of maximum
-     * message size which broker can accept. It can cause an infinite loop of resending the same records in one batch.
-     * To avoid the issue this parameter should be greater than or equal to maximum size of request that the producer
-     * can send (parameter kafka.producer.max.request.size). Note that if you change this setting, it is necessary to
-     * manually update max.message.bytes for existing topics on broker side.</p>
-     *
-     * <p>For more information see:</p>
-     * <ul>
-     * <li>
-     *     <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=68715855">
-     *         Kafka Confluence: KIP-126 – Allow KafkaProducer to split and resend oversized batches.
-     *        </a>
-     * </li>
-     * <li>
-     *     <a href="https://issues.apache.org/jira/browse/KAFKA-8202">
-     *      Kafka Jira: KAFKA-8202 – StackOverflowError on producer when splitting batches
-     *     </a>
- *     </li>
-     * </ul>
-     */
-    private int maxMessageSize = 1024 * 1024;
+  private boolean defaultSchemaIdAwareSerializationEnabled = false;
 
-    public int getReplicationFactor() {
-        return replicationFactor;
-    }
+  private boolean defaultFallbackToRemoteDatacenterEnabled = false;
 
-    public void setReplicationFactor(int replicationFactor) {
-        this.replicationFactor = replicationFactor;
-    }
+  private boolean avroContentTypeMetadataRequired = true;
 
-    public int getPartitions() {
-        return partitions;
-    }
+  /**
+   * Introduced in Kafka 0.11.0.0 mechanism of splitting oversized batches does not respect
+   * configuration of maximum message size which broker can accept. It can cause an infinite loop of
+   * resending the same records in one batch. To avoid the issue this parameter should be greater
+   * than or equal to maximum size of request that the producer can send (parameter
+   * kafka.producer.max.request.size). Note that if you change this setting, it is necessary to
+   * manually update max.message.bytes for existing topics on broker side.
+   *
+   * <p>For more information see:
+   *
+   * <ul>
+   *   <li><a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=68715855">Kafka
+   *       Confluence: KIP-126 – Allow KafkaProducer to split and resend oversized batches. </a>
+   *   <li><a href="https://issues.apache.org/jira/browse/KAFKA-8202">Kafka Jira: KAFKA-8202 –
+   *       StackOverflowError on producer when splitting batches </a>
+   * </ul>
+   */
+  private int maxMessageSize = 1024 * 1024;
 
-    public void setPartitions(int partitions) {
-        this.partitions = partitions;
-    }
+  public int getReplicationFactor() {
+    return replicationFactor;
+  }
 
-    public boolean isAllowRemoval() {
-        return allowRemoval;
-    }
+  public void setReplicationFactor(int replicationFactor) {
+    this.replicationFactor = replicationFactor;
+  }
 
-    public void setAllowRemoval(boolean allowRemoval) {
-        this.allowRemoval = allowRemoval;
-    }
+  public int getPartitions() {
+    return partitions;
+  }
 
-    public boolean isRemoveSchema() {
-        return removeSchema;
-    }
+  public void setPartitions(int partitions) {
+    this.partitions = partitions;
+  }
 
-    public void setRemoveSchema(boolean removeSchema) {
-        this.removeSchema = removeSchema;
-    }
+  public boolean isAllowRemoval() {
+    return allowRemoval;
+  }
 
-    public List<ContentType> getAllowedContentTypes() {
-        return allowedContentTypes;
-    }
+  public void setAllowRemoval(boolean allowRemoval) {
+    this.allowRemoval = allowRemoval;
+  }
 
-    public void setAllowedContentTypes(List<ContentType> allowedContentTypes) {
-        this.allowedContentTypes = allowedContentTypes;
-    }
+  public boolean isRemoveSchema() {
+    return removeSchema;
+  }
 
-    public Set<TopicLabel> getAllowedTopicLabels() {
-        return allowedTopicLabels;
-    }
+  public void setRemoveSchema(boolean removeSchema) {
+    this.removeSchema = removeSchema;
+  }
 
-    public void setAllowedTopicLabels(Set<TopicLabel> allowedTopicLabels) {
-        this.allowedTopicLabels = allowedTopicLabels;
-    }
+  public List<ContentType> getAllowedContentTypes() {
+    return allowedContentTypes;
+  }
 
-    public boolean isUncleanLeaderElectionEnabled() {
-        return uncleanLeaderElectionEnabled;
-    }
+  public void setAllowedContentTypes(List<ContentType> allowedContentTypes) {
+    this.allowedContentTypes = allowedContentTypes;
+  }
 
-    public void setUncleanLeaderElectionEnabled(boolean uncleanLeaderElectionEnabled) {
-        this.uncleanLeaderElectionEnabled = uncleanLeaderElectionEnabled;
-    }
+  public Set<TopicLabel> getAllowedTopicLabels() {
+    return allowedTopicLabels;
+  }
 
-    public int getTouchDelayInSeconds() {
-        return touchDelayInSeconds;
-    }
+  public void setAllowedTopicLabels(Set<TopicLabel> allowedTopicLabels) {
+    this.allowedTopicLabels = allowedTopicLabels;
+  }
 
-    public void setTouchDelayInSeconds(int touchDelayInSeconds) {
-        this.touchDelayInSeconds = touchDelayInSeconds;
-    }
-
-    public boolean isTouchSchedulerEnabled() {
-        return touchSchedulerEnabled;
-    }
-
-    public void setTouchSchedulerEnabled(boolean touchSchedulerEnabled) {
-        this.touchSchedulerEnabled = touchSchedulerEnabled;
-    }
-
-    public int getSubscriptionsAssignmentsCompletedTimeoutSeconds() {
-        return subscriptionsAssignmentsCompletedTimeoutSeconds;
-    }
-
-    public void setSubscriptionsAssignmentsCompletedTimeoutSeconds(int subscriptionsAssignmentsCompletedTimeoutSeconds) {
-        this.subscriptionsAssignmentsCompletedTimeoutSeconds = subscriptionsAssignmentsCompletedTimeoutSeconds;
-    }
-
-    public int getMaxMessageSize() {
-        return maxMessageSize;
-    }
-
-    public void setMaxMessageSize(int maxMessageSize) {
-        this.maxMessageSize = maxMessageSize;
-    }
-
-    public boolean isDefaultSchemaIdAwareSerializationEnabled() {
-        return defaultSchemaIdAwareSerializationEnabled;
-    }
-
-    public void setDefaultSchemaIdAwareSerializationEnabled(boolean defaultSchemaIdAwareSerializationEnabled) {
-        this.defaultSchemaIdAwareSerializationEnabled = defaultSchemaIdAwareSerializationEnabled;
-    }
+  public boolean isUncleanLeaderElectionEnabled() {
+    return uncleanLeaderElectionEnabled;
+  }
 
-    public boolean isAvroContentTypeMetadataRequired() {
-        return avroContentTypeMetadataRequired;
-    }
+  public void setUncleanLeaderElectionEnabled(boolean uncleanLeaderElectionEnabled) {
+    this.uncleanLeaderElectionEnabled = uncleanLeaderElectionEnabled;
+  }
 
-    public void setAvroContentTypeMetadataRequired(boolean avroContentTypeMetadataRequired) {
-        this.avroContentTypeMetadataRequired = avroContentTypeMetadataRequired;
-    }
+  public int getTouchDelayInSeconds() {
+    return touchDelayInSeconds;
+  }
 
+  public void setTouchDelayInSeconds(int touchDelayInSeconds) {
+    this.touchDelayInSeconds = touchDelayInSeconds;
+  }
+
+  public boolean isTouchSchedulerEnabled() {
+    return touchSchedulerEnabled;
+  }
+
+  public void setTouchSchedulerEnabled(boolean touchSchedulerEnabled) {
+    this.touchSchedulerEnabled = touchSchedulerEnabled;
+  }
+
+  public int getSubscriptionsAssignmentsCompletedTimeoutSeconds() {
+    return subscriptionsAssignmentsCompletedTimeoutSeconds;
+  }
+
+  public void setSubscriptionsAssignmentsCompletedTimeoutSeconds(
+      int subscriptionsAssignmentsCompletedTimeoutSeconds) {
+    this.subscriptionsAssignmentsCompletedTimeoutSeconds =
+        subscriptionsAssignmentsCompletedTimeoutSeconds;
+  }
+
+  public int getMaxMessageSize() {
+    return maxMessageSize;
+  }
+
+  public void setMaxMessageSize(int maxMessageSize) {
+    this.maxMessageSize = maxMessageSize;
+  }
+
+  public boolean isDefaultSchemaIdAwareSerializationEnabled() {
+    return defaultSchemaIdAwareSerializationEnabled;
+  }
+
+  public void setDefaultSchemaIdAwareSerializationEnabled(
+      boolean defaultSchemaIdAwareSerializationEnabled) {
+    this.defaultSchemaIdAwareSerializationEnabled = defaultSchemaIdAwareSerializationEnabled;
+  }
+
+  public boolean isDefaultFallbackToRemoteDatacenterEnabled() {
+    return defaultFallbackToRemoteDatacenterEnabled;
+  }
+
+  public void setDefaultFallbackToRemoteDatacenterEnabled(
+      boolean defaultFallbackToRemoteDatacenterEnabled) {
+    this.defaultFallbackToRemoteDatacenterEnabled = defaultFallbackToRemoteDatacenterEnabled;
+  }
+
+  public boolean isAvroContentTypeMetadataRequired() {
+    return avroContentTypeMetadataRequired;
+  }
+
+  public void setAvroContentTypeMetadataRequired(boolean avroContentTypeMetadataRequired) {
+    this.avroContentTypeMetadataRequired = avroContentTypeMetadataRequired;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleConfigProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleConfigProperties.java
index f1f97eb740..ff77fe9982 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleConfigProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleConfigProperties.java
@@ -1,63 +1,64 @@
 package pl.allegro.tech.hermes.management.config.console;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "console.config")
 public class ConsoleConfigProperties {
 
-    private String location = "console/config-local.json";
-    private ConfigurationType type = ConfigurationType.SPRING_CONFIG;
-    private HttpClientProperties httpClient = new HttpClientProperties();
+  private String location = "console/config-local.json";
+  private ConfigurationType type = ConfigurationType.SPRING_CONFIG;
+  private HttpClientProperties httpClient = new HttpClientProperties();
 
-    public String getLocation() {
-        return location;
-    }
+  public String getLocation() {
+    return location;
+  }
 
-    public void setLocation(String location) {
-        this.location = location;
-    }
+  public void setLocation(String location) {
+    this.location = location;
+  }
 
-    public ConfigurationType getType() {
-        return type;
-    }
+  public ConfigurationType getType() {
+    return type;
+  }
 
-    public void setType(ConfigurationType type) {
-        this.type = type;
-    }
+  public void setType(ConfigurationType type) {
+    this.type = type;
+  }
 
-    public HttpClientProperties getHttpClient() {
-        return httpClient;
-    }
-
-    public void setHttpClient(HttpClientProperties httpClient) {
-        this.httpClient = httpClient;
-    }
+  public HttpClientProperties getHttpClient() {
+    return httpClient;
+  }
 
-    public static class HttpClientProperties {
+  public void setHttpClient(HttpClientProperties httpClient) {
+    this.httpClient = httpClient;
+  }
 
-        private Duration connectTimeout = Duration.ofMillis(500);
-        private Duration readTimeout = Duration.ofSeconds(3);
+  public static class HttpClientProperties {
 
-        public Duration getConnectTimeout() {
-            return connectTimeout;
-        }
+    private Duration connectTimeout = Duration.ofMillis(500);
+    private Duration readTimeout = Duration.ofSeconds(3);
 
-        public void setConnectTimeout(Duration connectTimeout) {
-            this.connectTimeout = connectTimeout;
-        }
+    public Duration getConnectTimeout() {
+      return connectTimeout;
+    }
 
-        public Duration getReadTimeout() {
-            return readTimeout;
-        }
+    public void setConnectTimeout(Duration connectTimeout) {
+      this.connectTimeout = connectTimeout;
+    }
 
-        public void setReadTimeout(Duration readTimeout) {
-            this.readTimeout = readTimeout;
-        }
+    public Duration getReadTimeout() {
+      return readTimeout;
     }
 
-    public enum ConfigurationType {
-        CLASSPATH_RESOURCE, HTTP_RESOURCE, SPRING_CONFIG
+    public void setReadTimeout(Duration readTimeout) {
+      this.readTimeout = readTimeout;
     }
+  }
+
+  public enum ConfigurationType {
+    CLASSPATH_RESOURCE,
+    HTTP_RESOURCE,
+    SPRING_CONFIG
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleConfiguration.java
index 9faa8cabc8..fc2ea5b350 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleConfiguration.java
@@ -1,6 +1,10 @@
 package pl.allegro.tech.hermes.management.config.console;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.concurrent.TimeUnit;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.core5.http.io.SocketConfig;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -17,34 +21,47 @@
 @EnableConfigurationProperties({ConsoleConfigProperties.class, ConsoleProperties.class})
 public class ConsoleConfiguration {
 
-    @Bean
-    FilterRegistrationBean<FrontendRoutesFilter> frontendRoutesFilter() {
-        FilterRegistrationBean<FrontendRoutesFilter> registrationBean = new FilterRegistrationBean<>();
-        registrationBean.setFilter(new FrontendRoutesFilter());
-        return registrationBean;
-    }
-
-    @Bean
-    ConsoleConfigurationRepository consoleConfigurationRepository(
-            ConsoleConfigProperties properties, ObjectMapper objectMapper, ConsoleProperties consoleProperties) {
-        switch (properties.getType()) {
-            case CLASSPATH_RESOURCE:
-                return new ClasspathFileConsoleConfigurationRepository(properties);
-            case HTTP_RESOURCE:
-                return httpConsoleConfigurationRepository(properties);
-            case SPRING_CONFIG:
-                return new SpringConfigConsoleConfigurationRepository(objectMapper, consoleProperties);
-            default:
-                throw new IllegalArgumentException("Unsupported console config type");
-        }
-    }
+  @Bean
+  FilterRegistrationBean<FrontendRoutesFilter> frontendRoutesFilter() {
+    FilterRegistrationBean<FrontendRoutesFilter> registrationBean = new FilterRegistrationBean<>();
+    registrationBean.setFilter(new FrontendRoutesFilter());
+    return registrationBean;
+  }
 
-    private ConsoleConfigurationRepository httpConsoleConfigurationRepository(ConsoleConfigProperties properties) {
-        HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
-        requestFactory.setConnectTimeout((int) properties.getHttpClient().getConnectTimeout().toMillis());
-        requestFactory.setReadTimeout((int) properties.getHttpClient().getReadTimeout().toMillis());
-        RestTemplate restTemplate = new RestTemplate(requestFactory);
-        return new HttpConsoleConfigurationRepository(properties, restTemplate);
+  @Bean
+  ConsoleConfigurationRepository consoleConfigurationRepository(
+      ConsoleConfigProperties properties,
+      ObjectMapper objectMapper,
+      ConsoleProperties consoleProperties) {
+    switch (properties.getType()) {
+      case CLASSPATH_RESOURCE:
+        return new ClasspathFileConsoleConfigurationRepository(properties);
+      case HTTP_RESOURCE:
+        return httpConsoleConfigurationRepository(properties);
+      case SPRING_CONFIG:
+        return new SpringConfigConsoleConfigurationRepository(objectMapper, consoleProperties);
+      default:
+        throw new IllegalArgumentException("Unsupported console config type");
     }
+  }
 
+  private ConsoleConfigurationRepository httpConsoleConfigurationRepository(
+      ConsoleConfigProperties properties) {
+    var httpClientProperties = properties.getHttpClient();
+    var socketConfig =
+        SocketConfig.custom()
+            .setSoTimeout(
+                (int) httpClientProperties.getReadTimeout().toMillis(), TimeUnit.MILLISECONDS)
+            .build();
+    var connectionManager =
+        PoolingHttpClientConnectionManagerBuilder.create()
+            .setDefaultSocketConfig(socketConfig)
+            .build();
+    var client = HttpClientBuilder.create().setConnectionManager(connectionManager).build();
+    HttpComponentsClientHttpRequestFactory requestFactory =
+        new HttpComponentsClientHttpRequestFactory(client);
+    requestFactory.setConnectTimeout(properties.getHttpClient().getConnectTimeout());
+    RestTemplate restTemplate = new RestTemplate(requestFactory);
+    return new HttpConsoleConfigurationRepository(properties, restTemplate);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java
index 17f15c1fb5..c36fe397b9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java
@@ -1,891 +1,887 @@
 package pl.allegro.tech.hermes.management.config.console;
 
 import com.google.common.collect.Lists;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * This class could have a much better structure, however it has this one due to compatibility with old JSON config file format.
+ * This class could have a much better structure, however it has this one due to compatibility with
+ * old JSON config file format.
  */
 @ConfigurationProperties(prefix = "console")
 public class ConsoleProperties {
-    private Console console = new Console();
-    private Dashboard dashboard = new Dashboard();
-    private Hermes hermes = new Hermes();
-    private Metrics metrics = new Metrics();
-    private Auth auth = new Auth();
-    private Owner owner = new Owner();
-    private TopicView topic = new TopicView();
-    private SubscriptionView subscription = new SubscriptionView();
-    private ConsistencyView consistency = new ConsistencyView();
-    private GroupView group = new GroupView();
-    private Costs costs = new Costs();
+  private Console console = new Console();
+  private Dashboard dashboard = new Dashboard();
+  private Hermes hermes = new Hermes();
+  private Metrics metrics = new Metrics();
+  private Auth auth = new Auth();
+  private Owner owner = new Owner();
+  private TopicView topic = new TopicView();
+  private SubscriptionView subscription = new SubscriptionView();
+  private ConsistencyView consistency = new ConsistencyView();
+  private GroupView group = new GroupView();
+  private Costs costs = new Costs();
+
+  public Dashboard getDashboard() {
+    return dashboard;
+  }
+
+  public void setDashboard(Dashboard dashboard) {
+    this.dashboard = dashboard;
+  }
+
+  public Hermes getHermes() {
+    return hermes;
+  }
+
+  public void setHermes(Hermes hermes) {
+    this.hermes = hermes;
+  }
+
+  public Metrics getMetrics() {
+    return metrics;
+  }
+
+  public void setMetrics(Metrics metrics) {
+    this.metrics = metrics;
+  }
+
+  public Auth getAuth() {
+    return auth;
+  }
+
+  public void setAuth(Auth auth) {
+    this.auth = auth;
+  }
+
+  public Console getConsole() {
+    return console;
+  }
+
+  public void setConsole(Console console) {
+    this.console = console;
+  }
+
+  public ConsistencyView getConsistency() {
+    return consistency;
+  }
+
+  public void setConsistency(ConsistencyView consistency) {
+    this.consistency = consistency;
+  }
+
+  public GroupView getGroup() {
+    return group;
+  }
+
+  public void setGroup(GroupView group) {
+    this.group = group;
+  }
+
+  public Costs getCosts() {
+    return costs;
+  }
 
-    public Dashboard getDashboard() {
-        return dashboard;
+  public void setCosts(Costs costs) {
+    this.costs = costs;
+  }
+
+  public static final class Console {
+    private String title = "hermes console";
+    private String contactLink = "";
+    private String environmentName = "LOCAL";
+
+    private boolean criticalEnvironment = false;
+
+    public String getTitle() {
+      return title;
     }
 
-    public void setDashboard(Dashboard dashboard) {
-        this.dashboard = dashboard;
+    public void setTitle(String title) {
+      this.title = title;
     }
 
-    public Hermes getHermes() {
-        return hermes;
+    public String getContactLink() {
+      return contactLink;
     }
 
-    public void setHermes(Hermes hermes) {
-        this.hermes = hermes;
+    public void setContactLink(String contactLink) {
+      this.contactLink = contactLink;
     }
 
-    public Metrics getMetrics() {
-        return metrics;
+    public boolean isCriticalEnvironment() {
+      return criticalEnvironment;
     }
 
-    public void setMetrics(Metrics metrics) {
-        this.metrics = metrics;
+    public void setCriticalEnvironment(boolean isCriticalEnvironment) {
+      this.criticalEnvironment = isCriticalEnvironment;
     }
 
-    public Auth getAuth() {
-        return auth;
+    public String getEnvironmentName() {
+      return environmentName;
     }
 
-    public void setAuth(Auth auth) {
-        this.auth = auth;
+    public void setEnvironmentName(String environmentName) {
+      this.environmentName = environmentName;
     }
+  }
+
+  public Owner getOwner() {
+    return owner;
+  }
+
+  public void setOwner(Owner owner) {
+    this.owner = owner;
+  }
+
+  public TopicView getTopic() {
+    return topic;
+  }
+
+  public void setTopic(TopicView topic) {
+    this.topic = topic;
+  }
+
+  public SubscriptionView getSubscription() {
+    return subscription;
+  }
+
+  public void setSubscription(SubscriptionView subscription) {
+    this.subscription = subscription;
+  }
 
-    public Console getConsole() {
-        return console;
+  public static final class Dashboard {
+    private String metrics = "http://localhost:8082";
+    private String docs = "http://hermes-pubsub.rtfd.org";
+
+    public String getMetrics() {
+      return metrics;
     }
 
-    public void setConsole(Console console) {
-        this.console = console;
+    public void setMetrics(String metrics) {
+      this.metrics = metrics;
     }
 
-    public ConsistencyView getConsistency() {
-        return consistency;
+    public String getDocs() {
+      return docs;
     }
 
-    public void setConsistency(ConsistencyView consistency) {
-        this.consistency = consistency;
+    public void setDocs(String docs) {
+      this.docs = docs;
     }
+  }
+
+  public static final class Hermes {
+    private Discovery discovery = new Discovery();
 
-    public GroupView getGroup() {
-        return group;
+    public Discovery getDiscovery() {
+      return discovery;
     }
 
-    public void setGroup(GroupView group) {
-        this.group = group;
+    public void setDiscovery(Discovery discovery) {
+      this.discovery = discovery;
     }
+  }
 
-    public Costs getCosts() {
-        return costs;
+  public static final class Discovery {
+    private String type = "simple";
+    private SimpleDiscovery simple = new SimpleDiscovery();
+
+    public String getType() {
+      return type;
     }
 
-    public void setCosts(Costs costs) {
-        this.costs = costs;
+    public void setType(String type) {
+      this.type = type;
     }
 
-    public static final class Console {
-        private String title = "hermes console";
-        private String contactLink = "";
-        private String environmentName = "LOCAL";
+    public SimpleDiscovery getSimple() {
+      return simple;
+    }
 
-        private boolean criticalEnvironment = false;
+    public void setSimple(SimpleDiscovery simple) {
+      this.simple = simple;
+    }
+  }
 
-        public String getTitle() {
-            return title;
-        }
+  public static final class SimpleDiscovery {
+    private String url = "";
 
-        public void setTitle(String title) {
-            this.title = title;
-        }
+    public String getUrl() {
+      return url;
+    }
 
-        public String getContactLink() {
-            return contactLink;
-        }
+    public void setUrl(String url) {
+      this.url = url;
+    }
+  }
 
-        public void setContactLink(String contactLink) {
-            this.contactLink = contactLink;
-        }
+  public static final class Metrics {
+    private boolean fetchingDashboardUrlEnabled = false;
 
-        public boolean isCriticalEnvironment() {
-            return criticalEnvironment;
-        }
+    public boolean isFetchingDashboardUrlEnabled() {
+      return fetchingDashboardUrlEnabled;
+    }
 
-        public void setCriticalEnvironment(boolean isCriticalEnvironment) {
-            this.criticalEnvironment = isCriticalEnvironment;
-        }
+    public void setFetchingDashboardUrlEnabled(boolean fetchingDashboardUrlEnabled) {
+      this.fetchingDashboardUrlEnabled = fetchingDashboardUrlEnabled;
+    }
+  }
 
-        public String getEnvironmentName() {
-            return environmentName;
-        }
+  public static final class Auth {
+    private OAuth oauth = new OAuth();
+    private AuthHeaders headers = new AuthHeaders();
 
-        public void setEnvironmentName(String environmentName) {
-            this.environmentName = environmentName;
-        }
+    public OAuth getOauth() {
+      return oauth;
     }
 
-    public Owner getOwner() {
-        return owner;
+    public void setOauth(OAuth oauth) {
+      this.oauth = oauth;
     }
 
-    public void setOwner(Owner owner) {
-        this.owner = owner;
+    public AuthHeaders getHeaders() {
+      return headers;
     }
 
-    public TopicView getTopic() {
-        return topic;
+    public void setHeaders(AuthHeaders headers) {
+      this.headers = headers;
     }
+  }
+
+  public static final class OAuth {
+    private boolean enabled = false;
+    private String url = "localhost:8092";
+    private String authorizationEndpoint = "/auth/oauth/authorize";
+    private String tokenEndpoint = "/auth/oauth/token";
+    private String clientId = "hermes";
+    private String scope = "hermes";
 
-    public void setTopic(TopicView topic) {
-        this.topic = topic;
+    public boolean isEnabled() {
+      return enabled;
     }
 
-    public SubscriptionView getSubscription() {
-        return subscription;
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
     }
 
-    public void setSubscription(SubscriptionView subscription) {
-        this.subscription = subscription;
+    public String getUrl() {
+      return url;
     }
 
-    public static final class Dashboard {
-        private String metrics = "http://localhost:8082";
-        private String docs = "http://hermes-pubsub.rtfd.org";
+    public void setUrl(String url) {
+      this.url = url;
+    }
 
-        public String getMetrics() {
-            return metrics;
-        }
+    public String getAuthorizationEndpoint() {
+      return authorizationEndpoint;
+    }
 
-        public void setMetrics(String metrics) {
-            this.metrics = metrics;
-        }
+    public void setAuthorizationEndpoint(String authorizationEndpoint) {
+      this.authorizationEndpoint = authorizationEndpoint;
+    }
 
-        public String getDocs() {
-            return docs;
-        }
+    public String getTokenEndpoint() {
+      return tokenEndpoint;
+    }
 
-        public void setDocs(String docs) {
-            this.docs = docs;
-        }
+    public void setTokenEndpoint(String tokenEndpoint) {
+      this.tokenEndpoint = tokenEndpoint;
     }
 
-    public static final class Hermes {
-        private Discovery discovery = new Discovery();
+    public String getClientId() {
+      return clientId;
+    }
 
-        public Discovery getDiscovery() {
-            return discovery;
-        }
+    public void setClientId(String clientId) {
+      this.clientId = clientId;
+    }
 
-        public void setDiscovery(Discovery discovery) {
-            this.discovery = discovery;
-        }
+    public String getScope() {
+      return scope;
     }
 
-    public static final class Discovery {
-        private String type = "simple";
-        private SimpleDiscovery simple = new SimpleDiscovery();
+    public void setScope(String scope) {
+      this.scope = scope;
+    }
+  }
 
-        public String getType() {
-            return type;
-        }
+  public static final class AuthHeaders {
+    private boolean enabled = false;
+    private String adminHeader = "Hermes-Admin-Password";
 
-        public void setType(String type) {
-            this.type = type;
-        }
+    public boolean isEnabled() {
+      return enabled;
+    }
 
-        public SimpleDiscovery getSimple() {
-            return simple;
-        }
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
 
-        public void setSimple(SimpleDiscovery simple) {
-            this.simple = simple;
-        }
+    public String getAdminHeader() {
+      return adminHeader;
     }
 
-    public static final class SimpleDiscovery {
-        private String url = "";
+    public void setAdminHeader(String adminHeader) {
+      this.adminHeader = adminHeader;
+    }
+  }
 
-        public String getUrl() {
-            return url;
-        }
+  public static final class TopicView {
+    private boolean messagePreviewEnabled = true;
+    private boolean offlineClientsEnabled = false;
+    private boolean authEnabled = true;
+    private DefaultTopicView defaults = new DefaultTopicView();
+    private String buttonsExtension = "";
+    private boolean removeSchema = false;
+    private boolean schemaIdAwareSerializationEnabled = false;
+    private boolean avroContentTypeMetadataRequired = true;
+    private List<TopicContentType> contentTypes =
+        Lists.newArrayList(
+            new TopicContentType("AVRO", "AVRO"), new TopicContentType("JSON", "JSON"));
+    private boolean readOnlyModeEnabled = false;
+    private Set<String> allowedTopicLabels = Collections.emptySet();
+    private List<RetentionUnit> retentionUnits =
+        Lists.newArrayList(new RetentionUnit("DAYS", "DAYS"));
+    private boolean offlineRetransmissionEnabled = false;
+    private String offlineRetransmissionDescription = "Offline retransmission";
 
-        public void setUrl(String url) {
-            this.url = url;
-        }
+    public boolean isMessagePreviewEnabled() {
+      return messagePreviewEnabled;
     }
 
-    public static final class Metrics {
-        private boolean fetchingDashboardUrlEnabled = false;
+    public void setMessagePreviewEnabled(boolean messagePreviewEnabled) {
+      this.messagePreviewEnabled = messagePreviewEnabled;
+    }
 
-        public boolean isFetchingDashboardUrlEnabled() {
-            return fetchingDashboardUrlEnabled;
-        }
+    public boolean isOfflineClientsEnabled() {
+      return offlineClientsEnabled;
+    }
 
-        public void setFetchingDashboardUrlEnabled(boolean fetchingDashboardUrlEnabled) {
-            this.fetchingDashboardUrlEnabled = fetchingDashboardUrlEnabled;
-        }
+    public void setOfflineClientsEnabled(boolean offlineClientsEnabled) {
+      this.offlineClientsEnabled = offlineClientsEnabled;
     }
 
-    public static final class Auth {
-        private OAuth oauth = new OAuth();
-        private AuthHeaders headers = new AuthHeaders();
+    public boolean isAuthEnabled() {
+      return authEnabled;
+    }
 
-        public OAuth getOauth() {
-            return oauth;
-        }
+    public void setAuthEnabled(boolean authEnabled) {
+      this.authEnabled = authEnabled;
+    }
 
-        public void setOauth(OAuth oauth) {
-            this.oauth = oauth;
-        }
+    public DefaultTopicView getDefaults() {
+      return defaults;
+    }
 
-        public AuthHeaders getHeaders() {
-            return headers;
-        }
+    public void setDefaults(DefaultTopicView defaults) {
+      this.defaults = defaults;
+    }
 
-        public void setHeaders(AuthHeaders headers) {
-            this.headers = headers;
-        }
+    public List<TopicContentType> getContentTypes() {
+      return contentTypes;
     }
 
-    public static final class OAuth {
-        private boolean enabled = false;
-        private String url = "localhost:8092";
-        private String authorizationEndpoint = "/auth/oauth/authorize";
-        private String tokenEndpoint = "/auth/oauth/token";
-        private String clientId = "hermes";
-        private String scope = "hermes";
+    public void setContentTypes(List<TopicContentType> contentTypes) {
+      this.contentTypes = contentTypes;
+    }
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+    public Set<String> getAllowedTopicLabels() {
+      return allowedTopicLabels;
+    }
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    public void setAllowedTopicLabels(Set<String> allowedTopicLabels) {
+      this.allowedTopicLabels = allowedTopicLabels;
+    }
 
-        public String getUrl() {
-            return url;
-        }
+    public String getButtonsExtension() {
+      return buttonsExtension;
+    }
 
-        public void setUrl(String url) {
-            this.url = url;
-        }
+    public void setButtonsExtension(String buttonsExtension) {
+      this.buttonsExtension = buttonsExtension;
+    }
 
-        public String getAuthorizationEndpoint() {
-            return authorizationEndpoint;
-        }
+    public boolean isRemoveSchema() {
+      return removeSchema;
+    }
 
-        public void setAuthorizationEndpoint(String authorizationEndpoint) {
-            this.authorizationEndpoint = authorizationEndpoint;
-        }
+    public void setRemoveSchema(boolean removeSchema) {
+      this.removeSchema = removeSchema;
+    }
 
-        public String getTokenEndpoint() {
-            return tokenEndpoint;
-        }
+    public boolean isSchemaIdAwareSerializationEnabled() {
+      return schemaIdAwareSerializationEnabled;
+    }
 
-        public void setTokenEndpoint(String tokenEndpoint) {
-            this.tokenEndpoint = tokenEndpoint;
-        }
+    public void setSchemaIdAwareSerializationEnabled(boolean schemaIdAwareSerializationEnabled) {
+      this.schemaIdAwareSerializationEnabled = schemaIdAwareSerializationEnabled;
+    }
 
-        public String getClientId() {
-            return clientId;
-        }
+    public boolean isAvroContentTypeMetadataRequired() {
+      return avroContentTypeMetadataRequired;
+    }
 
-        public void setClientId(String clientId) {
-            this.clientId = clientId;
-        }
+    public void setAvroContentTypeMetadataRequired(boolean avroContentTypeMetadataRequired) {
+      this.avroContentTypeMetadataRequired = avroContentTypeMetadataRequired;
+    }
 
-        public String getScope() {
-            return scope;
-        }
+    public boolean isReadOnlyModeEnabled() {
+      return readOnlyModeEnabled;
+    }
 
-        public void setScope(String scope) {
-            this.scope = scope;
-        }
-    }
-
-    public static final class AuthHeaders {
-        private boolean enabled = false;
-        private String adminHeader = "Hermes-Admin-Password";
-
-        public boolean isEnabled() {
-            return enabled;
-        }
-
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
-
-        public String getAdminHeader() {
-            return adminHeader;
-        }
-
-        public void setAdminHeader(String adminHeader) {
-            this.adminHeader = adminHeader;
-        }
-    }
-
-    public static final class TopicView {
-        private boolean messagePreviewEnabled = true;
-        private boolean offlineClientsEnabled = false;
-        private boolean authEnabled = true;
-        private DefaultTopicView defaults = new DefaultTopicView();
-        private String buttonsExtension = "";
-        private boolean removeSchema = false;
-        private boolean schemaIdAwareSerializationEnabled = false;
-        private boolean avroContentTypeMetadataRequired = true;
-        private List<TopicContentType> contentTypes = Lists.newArrayList(
-                new TopicContentType("AVRO", "AVRO"),
-                new TopicContentType("JSON", "JSON")
-        );
-        private boolean readOnlyModeEnabled = false;
-        private Set<String> allowedTopicLabels = Collections.emptySet();
-        private List<RetentionUnit> retentionUnits = Lists.newArrayList(
-                new RetentionUnit("DAYS", "DAYS")
-        );
-        private boolean offlineRetransmissionEnabled = false;
-        private String offlineRetransmissionDescription = "Offline retransmission";
-
-        public boolean isMessagePreviewEnabled() {
-            return messagePreviewEnabled;
-        }
-
-        public void setMessagePreviewEnabled(boolean messagePreviewEnabled) {
-            this.messagePreviewEnabled = messagePreviewEnabled;
-        }
-
-        public boolean isOfflineClientsEnabled() {
-            return offlineClientsEnabled;
-        }
-
-        public void setOfflineClientsEnabled(boolean offlineClientsEnabled) {
-            this.offlineClientsEnabled = offlineClientsEnabled;
-        }
-
-        public boolean isAuthEnabled() {
-            return authEnabled;
-        }
-
-        public void setAuthEnabled(boolean authEnabled) {
-            this.authEnabled = authEnabled;
-        }
-
-        public DefaultTopicView getDefaults() {
-            return defaults;
-        }
-
-        public void setDefaults(DefaultTopicView defaults) {
-            this.defaults = defaults;
-        }
-
-        public List<TopicContentType> getContentTypes() {
-            return contentTypes;
-        }
-
-        public void setContentTypes(List<TopicContentType> contentTypes) {
-            this.contentTypes = contentTypes;
-        }
-
-        public Set<String> getAllowedTopicLabels() {
-            return allowedTopicLabels;
-        }
-
-        public void setAllowedTopicLabels(Set<String> allowedTopicLabels) {
-            this.allowedTopicLabels = allowedTopicLabels;
-        }
-
-        public String getButtonsExtension() {
-            return buttonsExtension;
-        }
-
-        public void setButtonsExtension(String buttonsExtension) {
-            this.buttonsExtension = buttonsExtension;
-        }
-
-        public boolean isRemoveSchema() {
-            return removeSchema;
-        }
-
-        public void setRemoveSchema(boolean removeSchema) {
-            this.removeSchema = removeSchema;
-        }
-
-        public boolean isSchemaIdAwareSerializationEnabled() {
-            return schemaIdAwareSerializationEnabled;
-        }
-
-        public void setSchemaIdAwareSerializationEnabled(boolean schemaIdAwareSerializationEnabled) {
-            this.schemaIdAwareSerializationEnabled = schemaIdAwareSerializationEnabled;
-        }
-
-        public boolean isAvroContentTypeMetadataRequired() {
-            return avroContentTypeMetadataRequired;
-        }
-
-        public void setAvroContentTypeMetadataRequired(boolean avroContentTypeMetadataRequired) {
-            this.avroContentTypeMetadataRequired = avroContentTypeMetadataRequired;
-        }
-
-        public boolean isReadOnlyModeEnabled() {
-            return readOnlyModeEnabled;
-        }
-
-        public void setReadOnlyModeEnabled(boolean readOnlyModeEnabled) {
-            this.readOnlyModeEnabled = readOnlyModeEnabled;
-        }
-
-        public List<RetentionUnit> getRetentionUnits() {
-            return retentionUnits;
-        }
+    public void setReadOnlyModeEnabled(boolean readOnlyModeEnabled) {
+      this.readOnlyModeEnabled = readOnlyModeEnabled;
+    }
 
-        public void setRetentionUnits(List<RetentionUnit> retentionUnits) {
-            this.retentionUnits = retentionUnits;
-        }
+    public List<RetentionUnit> getRetentionUnits() {
+      return retentionUnits;
+    }
 
-        public boolean getOfflineRetransmissionEnabled() {
-            return offlineRetransmissionEnabled;
-        }
+    public void setRetentionUnits(List<RetentionUnit> retentionUnits) {
+      this.retentionUnits = retentionUnits;
+    }
 
-        public void setOfflineRetransmissionEnabled(boolean offlineRetransmissionEnabled) {
-            this.offlineRetransmissionEnabled = offlineRetransmissionEnabled;
-        }
+    public boolean getOfflineRetransmissionEnabled() {
+      return offlineRetransmissionEnabled;
+    }
 
-        public String getOfflineRetransmissionDescription() {
-            return offlineRetransmissionDescription;
-        }
+    public void setOfflineRetransmissionEnabled(boolean offlineRetransmissionEnabled) {
+      this.offlineRetransmissionEnabled = offlineRetransmissionEnabled;
+    }
 
-        public void setOfflineRetransmissionDescription(String offlineRetransmissionDescription) {
-            this.offlineRetransmissionDescription = offlineRetransmissionDescription;
-        }
+    public String getOfflineRetransmissionDescription() {
+      return offlineRetransmissionDescription;
     }
 
-    public static final class DefaultTopicView {
-        private String ack = "LEADER";
-        private String contentType = "JSON";
-        private RetentionTime retentionTime = new RetentionTime();
-        private DefaultOfflineStorageView offlineStorage = new DefaultOfflineStorageView();
+    public void setOfflineRetransmissionDescription(String offlineRetransmissionDescription) {
+      this.offlineRetransmissionDescription = offlineRetransmissionDescription;
+    }
+  }
 
-        public String getAck() {
-            return ack;
-        }
+  public static final class DefaultTopicView {
+    private String ack = "LEADER";
+    private String contentType = "JSON";
+    private RetentionTime retentionTime = new RetentionTime();
+    private DefaultOfflineStorageView offlineStorage = new DefaultOfflineStorageView();
 
-        public void setAck(String ack) {
-            this.ack = ack;
-        }
+    public String getAck() {
+      return ack;
+    }
 
-        public String getContentType() {
-            return contentType;
-        }
+    public void setAck(String ack) {
+      this.ack = ack;
+    }
 
-        public void setContentType(String contentType) {
-            this.contentType = contentType;
-        }
+    public String getContentType() {
+      return contentType;
+    }
 
-        public RetentionTime getRetentionTime() {
-            return retentionTime;
-        }
+    public void setContentType(String contentType) {
+      this.contentType = contentType;
+    }
 
-        public void setRetentionTime(RetentionTime retentionTime) {
-            this.retentionTime = retentionTime;
-        }
+    public RetentionTime getRetentionTime() {
+      return retentionTime;
+    }
 
-        public DefaultOfflineStorageView getOfflineStorage() {
-            return offlineStorage;
-        }
+    public void setRetentionTime(RetentionTime retentionTime) {
+      this.retentionTime = retentionTime;
+    }
 
-        public void setOfflineStorage(DefaultOfflineStorageView offlineStorage) {
-            this.offlineStorage = offlineStorage;
-        }
+    public DefaultOfflineStorageView getOfflineStorage() {
+      return offlineStorage;
     }
 
-    public static final class DefaultOfflineStorageView {
-        private boolean enabled = false;
-        private RetentionTime retentionTime = new RetentionTime();
+    public void setOfflineStorage(DefaultOfflineStorageView offlineStorage) {
+      this.offlineStorage = offlineStorage;
+    }
+  }
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+  public static final class DefaultOfflineStorageView {
+    private boolean enabled = false;
+    private RetentionTime retentionTime = new RetentionTime();
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    public boolean isEnabled() {
+      return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
 
-        public RetentionTime getRetentionTime() {
-            return retentionTime;
-        }
+    public RetentionTime getRetentionTime() {
+      return retentionTime;
+    }
 
-        public void setRetentionTime(RetentionTime retentionTime) {
-            this.retentionTime = retentionTime;
-        }
+    public void setRetentionTime(RetentionTime retentionTime) {
+      this.retentionTime = retentionTime;
     }
+  }
 
-    public static final class RetentionTime {
-        private int duration = 1;
-        private TimeUnit retentionUnit = TimeUnit.DAYS;
+  public static final class RetentionTime {
+    private int duration = 1;
+    private TimeUnit retentionUnit = TimeUnit.DAYS;
 
-        public int getDuration() {
-            return duration;
-        }
+    public int getDuration() {
+      return duration;
+    }
 
-        public void setDuration(int duration) {
-            this.duration = duration;
-        }
+    public void setDuration(int duration) {
+      this.duration = duration;
+    }
 
-        public TimeUnit getRetentionUnit() {
-            return retentionUnit;
-        }
+    public TimeUnit getRetentionUnit() {
+      return retentionUnit;
+    }
 
-        public void setRetentionUnit(TimeUnit retentionUnit) {
-            this.retentionUnit = retentionUnit;
-        }
+    public void setRetentionUnit(TimeUnit retentionUnit) {
+      this.retentionUnit = retentionUnit;
     }
+  }
 
-    public static final class TopicContentType {
-        private String value = "";
-        private String label = "";
+  public static final class TopicContentType {
+    private String value = "";
+    private String label = "";
 
-        public TopicContentType() {
-        }
+    public TopicContentType() {}
 
-        public TopicContentType(String value, String label) {
-            this.value = value;
-            this.label = label;
-        }
+    public TopicContentType(String value, String label) {
+      this.value = value;
+      this.label = label;
+    }
 
-        public String getValue() {
-            return value;
-        }
+    public String getValue() {
+      return value;
+    }
 
-        public void setValue(String value) {
-            this.value = value;
-        }
+    public void setValue(String value) {
+      this.value = value;
+    }
 
-        public String getLabel() {
-            return label;
-        }
+    public String getLabel() {
+      return label;
+    }
 
-        public void setLabel(String label) {
-            this.label = label;
-        }
+    public void setLabel(String label) {
+      this.label = label;
     }
+  }
 
-    public static final class RetentionUnit {
-        private String value = "";
-        private String label = "";
+  public static final class RetentionUnit {
+    private String value = "";
+    private String label = "";
 
-        public RetentionUnit() {
-        }
+    public RetentionUnit() {}
 
-        public RetentionUnit(String value, String label) {
-            this.value = value;
-            this.label = label;
-        }
+    public RetentionUnit(String value, String label) {
+      this.value = value;
+      this.label = label;
+    }
 
-        public String getValue() {
-            return value;
-        }
+    public String getValue() {
+      return value;
+    }
 
-        public void setValue(String value) {
-            this.value = value;
-        }
+    public void setValue(String value) {
+      this.value = value;
+    }
 
-        public String getLabel() {
-            return label;
-        }
+    public String getLabel() {
+      return label;
+    }
 
-        public void setLabel(String label) {
-            this.label = label;
-        }
+    public void setLabel(String label) {
+      this.label = label;
     }
+  }
 
-    public static final class Owner {
-        private List<OwnerSource> sources = Lists.newArrayList(
-                new OwnerSource("Crowd", "Crowd group (or groups separated by ',')"));
+  public static final class Owner {
+    private List<OwnerSource> sources =
+        Lists.newArrayList(new OwnerSource("Plaintext", "Name of the owner"));
 
-        public List<OwnerSource> getSources() {
-            return sources;
-        }
+    public List<OwnerSource> getSources() {
+      return sources;
+    }
 
-        public void setSources(List<OwnerSource> sources) {
-            this.sources = sources;
-        }
+    public void setSources(List<OwnerSource> sources) {
+      this.sources = sources;
     }
+  }
 
-    public static final class OwnerSource {
-        private String name = "";
-        private String placeholder = "";
+  public static final class OwnerSource {
+    private String name = "";
+    private String placeholder = "";
 
-        public OwnerSource() {
-        }
+    public OwnerSource() {}
 
-        public OwnerSource(String name, String placeholder) {
-            this.name = name;
-            this.placeholder = placeholder;
-        }
+    public OwnerSource(String name, String placeholder) {
+      this.name = name;
+      this.placeholder = placeholder;
+    }
 
-        public String getName() {
-            return name;
-        }
+    public String getName() {
+      return name;
+    }
 
-        public void setName(String name) {
-            this.name = name;
-        }
+    public void setName(String name) {
+      this.name = name;
+    }
 
-        public String getPlaceholder() {
-            return placeholder;
-        }
+    public String getPlaceholder() {
+      return placeholder;
+    }
 
-        public void setPlaceholder(String placeholder) {
-            this.placeholder = placeholder;
-        }
+    public void setPlaceholder(String placeholder) {
+      this.placeholder = placeholder;
     }
+  }
 
-    public static final class SubscriptionView {
-        private Map<String, EndpointAddressResolverMetadata> endpointAddressResolverMetadata = new HashMap<>();
-        private boolean showHeadersFilter = false;
-        private boolean showFixedHeaders = false;
-        private int requestTimeoutWarningThreshold = 1001;
-        private DefaultSubscriptionView defaults = new DefaultSubscriptionView();
-        private List<SubscriptionDeliveryType> deliveryTypes = Lists.newArrayList(
-                new SubscriptionDeliveryType("SERIAL", "SERIAL"),
-                new SubscriptionDeliveryType("BATCH", "BATCH")
-        );
+  public static final class SubscriptionView {
+    private Map<String, EndpointAddressResolverMetadata> endpointAddressResolverMetadata =
+        new HashMap<>();
+    private boolean showHeadersFilter = false;
+    private boolean showFixedHeaders = false;
+    private int requestTimeoutWarningThreshold = 1001;
+    private DefaultSubscriptionView defaults = new DefaultSubscriptionView();
+    private List<SubscriptionDeliveryType> deliveryTypes =
+        Lists.newArrayList(
+            new SubscriptionDeliveryType("SERIAL", "SERIAL"),
+            new SubscriptionDeliveryType("BATCH", "BATCH"));
 
-        public Map<String, EndpointAddressResolverMetadata> getEndpointAddressResolverMetadata() {
-            return endpointAddressResolverMetadata;
-        }
+    public Map<String, EndpointAddressResolverMetadata> getEndpointAddressResolverMetadata() {
+      return endpointAddressResolverMetadata;
+    }
 
-        public void setEndpointAddressResolverMetadata(Map<String, EndpointAddressResolverMetadata> endpointAddressResolverMetadata) {
-            this.endpointAddressResolverMetadata = endpointAddressResolverMetadata;
-        }
+    public void setEndpointAddressResolverMetadata(
+        Map<String, EndpointAddressResolverMetadata> endpointAddressResolverMetadata) {
+      this.endpointAddressResolverMetadata = endpointAddressResolverMetadata;
+    }
 
-        public boolean isShowHeadersFilter() {
-            return showHeadersFilter;
-        }
+    public boolean isShowHeadersFilter() {
+      return showHeadersFilter;
+    }
 
-        public void setShowHeadersFilter(boolean showHeadersFilter) {
-            this.showHeadersFilter = showHeadersFilter;
-        }
+    public void setShowHeadersFilter(boolean showHeadersFilter) {
+      this.showHeadersFilter = showHeadersFilter;
+    }
 
-        public DefaultSubscriptionView getDefaults() {
-            return defaults;
-        }
+    public DefaultSubscriptionView getDefaults() {
+      return defaults;
+    }
 
-        public void setDefaults(DefaultSubscriptionView defaults) {
-            this.defaults = defaults;
-        }
+    public void setDefaults(DefaultSubscriptionView defaults) {
+      this.defaults = defaults;
+    }
 
-        public List<SubscriptionDeliveryType> getDeliveryTypes() {
-            return deliveryTypes;
-        }
+    public List<SubscriptionDeliveryType> getDeliveryTypes() {
+      return deliveryTypes;
+    }
 
-        public void setDeliveryTypes(List<SubscriptionDeliveryType> deliveryTypes) {
-            this.deliveryTypes = deliveryTypes;
-        }
+    public void setDeliveryTypes(List<SubscriptionDeliveryType> deliveryTypes) {
+      this.deliveryTypes = deliveryTypes;
+    }
 
-        public boolean isShowFixedHeaders() {
-            return showFixedHeaders;
-        }
+    public boolean isShowFixedHeaders() {
+      return showFixedHeaders;
+    }
 
-        public void setShowFixedHeaders(boolean showFixedHeaders) {
-            this.showFixedHeaders = showFixedHeaders;
-        }
+    public void setShowFixedHeaders(boolean showFixedHeaders) {
+      this.showFixedHeaders = showFixedHeaders;
+    }
 
-        public int getRequestTimeoutWarningThreshold() {
-            return requestTimeoutWarningThreshold;
-        }
+    public int getRequestTimeoutWarningThreshold() {
+      return requestTimeoutWarningThreshold;
+    }
 
-        public void setRequestTimeoutWarningThreshold(int requestTimeoutWarningThreshold) {
-            this.requestTimeoutWarningThreshold = requestTimeoutWarningThreshold;
-        }
+    public void setRequestTimeoutWarningThreshold(int requestTimeoutWarningThreshold) {
+      this.requestTimeoutWarningThreshold = requestTimeoutWarningThreshold;
     }
+  }
 
-    public static final class GroupView {
-        private boolean nonAdminCreationEnabled = false;
+  public static final class GroupView {
+    private boolean nonAdminCreationEnabled = false;
 
-        public boolean isNonAdminCreationEnabled() {
-            return nonAdminCreationEnabled;
-        }
+    public boolean isNonAdminCreationEnabled() {
+      return nonAdminCreationEnabled;
+    }
 
-        public void setNonAdminCreationEnabled(boolean nonAdminCreationEnabled) {
-            this.nonAdminCreationEnabled = nonAdminCreationEnabled;
-        }
+    public void setNonAdminCreationEnabled(boolean nonAdminCreationEnabled) {
+      this.nonAdminCreationEnabled = nonAdminCreationEnabled;
     }
+  }
 
-    public static final class EndpointAddressResolverMetadata {
-        private String title;
-        private String type;
-        private String hint;
+  public static final class EndpointAddressResolverMetadata {
+    private String title;
+    private String type;
+    private String hint;
 
-        public String getTitle() {
-            return title;
-        }
+    public String getTitle() {
+      return title;
+    }
 
-        public void setTitle(String title) {
-            this.title = title;
-        }
+    public void setTitle(String title) {
+      this.title = title;
+    }
 
-        public String getType() {
-            return type;
-        }
+    public String getType() {
+      return type;
+    }
 
-        public void setType(String type) {
-            this.type = type;
-        }
+    public void setType(String type) {
+      this.type = type;
+    }
 
-        public String getHint() {
-            return hint;
-        }
+    public String getHint() {
+      return hint;
+    }
 
-        public void setHint(String hint) {
-            this.hint = hint;
-        }
+    public void setHint(String hint) {
+      this.hint = hint;
     }
+  }
 
-    public static final class DefaultSubscriptionView {
-        private SubscriptionPolicy subscriptionPolicy = new SubscriptionPolicy();
-        private String deliveryType = "SERIAL";
+  public static final class DefaultSubscriptionView {
+    private SubscriptionPolicy subscriptionPolicy = new SubscriptionPolicy();
+    private String deliveryType = "SERIAL";
 
-        public SubscriptionPolicy getSubscriptionPolicy() {
-            return subscriptionPolicy;
-        }
+    public SubscriptionPolicy getSubscriptionPolicy() {
+      return subscriptionPolicy;
+    }
 
-        public void setSubscriptionPolicy(SubscriptionPolicy subscriptionPolicy) {
-            this.subscriptionPolicy = subscriptionPolicy;
-        }
+    public void setSubscriptionPolicy(SubscriptionPolicy subscriptionPolicy) {
+      this.subscriptionPolicy = subscriptionPolicy;
+    }
 
-        public String getDeliveryType() {
-            return deliveryType;
-        }
+    public String getDeliveryType() {
+      return deliveryType;
+    }
 
-        public void setDeliveryType(String deliveryType) {
-            this.deliveryType = deliveryType;
-        }
+    public void setDeliveryType(String deliveryType) {
+      this.deliveryType = deliveryType;
     }
+  }
 
-    public static final class SubscriptionPolicy {
-        private int messageTtl = 3600;
-        private int requestTimeout = 1000;
+  public static final class SubscriptionPolicy {
+    private int messageTtl = 3600;
+    private int requestTimeout = 1000;
 
-        public int getMessageTtl() {
-            return messageTtl;
-        }
+    public int getMessageTtl() {
+      return messageTtl;
+    }
 
-        public void setMessageTtl(int messageTtl) {
-            this.messageTtl = messageTtl;
-        }
+    public void setMessageTtl(int messageTtl) {
+      this.messageTtl = messageTtl;
+    }
 
-        public int getRequestTimeout() {
-            return requestTimeout;
-        }
+    public int getRequestTimeout() {
+      return requestTimeout;
+    }
 
-        public void setRequestTimeout(int requestTimeout) {
-            this.requestTimeout = requestTimeout;
-        }
+    public void setRequestTimeout(int requestTimeout) {
+      this.requestTimeout = requestTimeout;
     }
+  }
 
-    public static final class SubscriptionDeliveryType {
-        private String value = "";
-        private String label = "";
+  public static final class SubscriptionDeliveryType {
+    private String value = "";
+    private String label = "";
 
-        public SubscriptionDeliveryType() {
-        }
+    public SubscriptionDeliveryType() {}
 
-        public SubscriptionDeliveryType(String value, String label) {
-            this.value = value;
-            this.label = label;
-        }
+    public SubscriptionDeliveryType(String value, String label) {
+      this.value = value;
+      this.label = label;
+    }
 
-        public String getValue() {
-            return value;
-        }
+    public String getValue() {
+      return value;
+    }
 
-        public void setValue(String value) {
-            this.value = value;
-        }
+    public void setValue(String value) {
+      this.value = value;
+    }
 
-        public String getLabel() {
-            return label;
-        }
+    public String getLabel() {
+      return label;
+    }
 
-        public void setLabel(String label) {
-            this.label = label;
-        }
+    public void setLabel(String label) {
+      this.label = label;
     }
+  }
 
-    public static final class ConsistencyView {
-        private int maxGroupBatchSize = 10;
+  public static final class ConsistencyView {
+    private int maxGroupBatchSize = 10;
 
-        public int getMaxGroupBatchSize() {
-            return maxGroupBatchSize;
-        }
+    public int getMaxGroupBatchSize() {
+      return maxGroupBatchSize;
+    }
 
-        public void setMaxGroupBatchSize(int maxGroupBatchSize) {
-            this.maxGroupBatchSize = maxGroupBatchSize;
-        }
+    public void setMaxGroupBatchSize(int maxGroupBatchSize) {
+      this.maxGroupBatchSize = maxGroupBatchSize;
     }
+  }
 
-    public static final class Costs {
-        private boolean enabled = false;
-        private String globalDetailsUrl = "";
-        private String topicIframeUrl = "";
-        private String topicDetailsUrl = "";
-        private String subscriptionIframeUrl = "";
-        private String subscriptionDetailsUrl = "";
+  public static final class Costs {
+    private boolean enabled = false;
+    private String globalDetailsUrl = "";
+    private String topicIframeUrl = "";
+    private String topicDetailsUrl = "";
+    private String subscriptionIframeUrl = "";
+    private String subscriptionDetailsUrl = "";
 
-        public boolean isEnabled() {
-            return enabled;
-        }
+    public boolean isEnabled() {
+      return enabled;
+    }
 
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
+    public void setEnabled(boolean enabled) {
+      this.enabled = enabled;
+    }
 
-        public String getTopicIframeUrl() {
-            return topicIframeUrl;
-        }
+    public String getTopicIframeUrl() {
+      return topicIframeUrl;
+    }
 
-        public void setTopicIframeUrl(String topicIframeUrl) {
-            this.topicIframeUrl = topicIframeUrl;
-        }
+    public void setTopicIframeUrl(String topicIframeUrl) {
+      this.topicIframeUrl = topicIframeUrl;
+    }
 
-        public String getGlobalDetailsUrl() {
-            return globalDetailsUrl;
-        }
+    public String getGlobalDetailsUrl() {
+      return globalDetailsUrl;
+    }
 
-        public void setGlobalDetailsUrl(String globalDetailsUrl) {
-            this.globalDetailsUrl = globalDetailsUrl;
-        }
+    public void setGlobalDetailsUrl(String globalDetailsUrl) {
+      this.globalDetailsUrl = globalDetailsUrl;
+    }
 
-        public String getTopicDetailsUrl() {
-            return topicDetailsUrl;
-        }
+    public String getTopicDetailsUrl() {
+      return topicDetailsUrl;
+    }
 
-        public void setTopicDetailsUrl(String topicDetailsUrl) {
-            this.topicDetailsUrl = topicDetailsUrl;
-        }
+    public void setTopicDetailsUrl(String topicDetailsUrl) {
+      this.topicDetailsUrl = topicDetailsUrl;
+    }
 
-        public String getSubscriptionIframeUrl() {
-            return subscriptionIframeUrl;
-        }
+    public String getSubscriptionIframeUrl() {
+      return subscriptionIframeUrl;
+    }
 
-        public void setSubscriptionIframeUrl(String subscriptionIframeUrl) {
-            this.subscriptionIframeUrl = subscriptionIframeUrl;
-        }
+    public void setSubscriptionIframeUrl(String subscriptionIframeUrl) {
+      this.subscriptionIframeUrl = subscriptionIframeUrl;
+    }
 
-        public String getSubscriptionDetailsUrl() {
-            return subscriptionDetailsUrl;
-        }
+    public String getSubscriptionDetailsUrl() {
+      return subscriptionDetailsUrl;
+    }
 
-        public void setSubscriptionDetailsUrl(String subscriptionDetailsUrl) {
-            this.subscriptionDetailsUrl = subscriptionDetailsUrl;
-        }
+    public void setSubscriptionDetailsUrl(String subscriptionDetailsUrl) {
+      this.subscriptionDetailsUrl = subscriptionDetailsUrl;
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaClustersProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaClustersProperties.java
index 6ba7cc8bb4..695a7d2e93 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaClustersProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaClustersProperties.java
@@ -1,38 +1,36 @@
 package pl.allegro.tech.hermes.management.config.kafka;
 
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "kafka")
 public class KafkaClustersProperties {
-    private List<KafkaProperties> clusters = new ArrayList<>();
-    private String defaultNamespace = "";
-    private String namespaceSeparator = "_";
+  private List<KafkaProperties> clusters = new ArrayList<>();
+  private String defaultNamespace = "";
+  private String namespaceSeparator = "_";
 
-    public List<KafkaProperties> getClusters() {
-        return clusters;
-    }
+  public List<KafkaProperties> getClusters() {
+    return clusters;
+  }
 
-    public void setClusters(List<KafkaProperties> clusters) {
-        this.clusters = clusters;
-    }
+  public void setClusters(List<KafkaProperties> clusters) {
+    this.clusters = clusters;
+  }
 
-    public String getDefaultNamespace() {
-        return defaultNamespace;
-    }
+  public String getDefaultNamespace() {
+    return defaultNamespace;
+  }
 
-    public void setDefaultNamespace(String defaultNamespace) {
-        this.defaultNamespace = defaultNamespace;
-    }
+  public void setDefaultNamespace(String defaultNamespace) {
+    this.defaultNamespace = defaultNamespace;
+  }
 
-    public String getNamespaceSeparator() {
-        return namespaceSeparator;
-    }
+  public String getNamespaceSeparator() {
+    return namespaceSeparator;
+  }
 
-    public void setNamespaceSeparator(String namespaceSeparator) {
-        this.namespaceSeparator = namespaceSeparator;
-    }
+  public void setNamespaceSeparator(String namespaceSeparator) {
+    this.namespaceSeparator = namespaceSeparator;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaConfiguration.java
index cf5fcdcb7e..a09e205432 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaConfiguration.java
@@ -1,5 +1,19 @@
 package pl.allegro.tech.hermes.management.config.kafka;
 
+import static java.time.Duration.ofMillis;
+import static java.time.Duration.ofSeconds;
+import static java.util.stream.Collectors.toList;
+import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.kafka.clients.CommonClientConfigs.DEFAULT_SECURITY_PROTOCOL;
+import static org.apache.kafka.clients.CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG;
+import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
+import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
+import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
+
+import java.time.Clock;
+import java.util.List;
+import java.util.Properties;
+import java.util.stream.Collectors;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -34,152 +48,162 @@
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 import tech.allegro.schema.json2avro.converter.JsonAvroConverter;
 
-import java.time.Clock;
-import java.util.List;
-import java.util.Properties;
-import java.util.stream.Collectors;
-
-import static java.time.Duration.ofMillis;
-import static java.time.Duration.ofSeconds;
-import static java.util.stream.Collectors.toList;
-import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG;
-import static org.apache.kafka.clients.CommonClientConfigs.DEFAULT_SECURITY_PROTOCOL;
-import static org.apache.kafka.clients.CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG;
-import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
-import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
-import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
-
 @Configuration
 @EnableConfigurationProperties(KafkaClustersProperties.class)
 public class KafkaConfiguration implements MultipleDcKafkaNamesMappersFactory {
 
-    @Autowired
-    KafkaClustersProperties kafkaClustersProperties;
-
-    @Autowired
-    TopicProperties topicProperties;
-
-    @Autowired
-    SubscriptionProperties subscriptionProperties;
-
-    @Autowired
-    CompositeMessageContentWrapper compositeMessageContentWrapper;
-
-    @Autowired
-    ZookeeperRepositoryManager zookeeperRepositoryManager;
-
-    @Autowired
-    MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
-
-    @Bean
-    MultiDCAwareService multiDCAwareService(KafkaNamesMappers kafkaNamesMappers, SchemaRepository schemaRepository,
-                                            Clock clock, JsonAvroConverter jsonAvroConverter) {
-        List<DatacenterBoundRepositoryHolder<SubscriptionOffsetChangeIndicator>> repositories =
-                zookeeperRepositoryManager.getRepositories(SubscriptionOffsetChangeIndicator.class);
-
-        List<BrokersClusterService> clusters = kafkaClustersProperties.getClusters().stream().map(kafkaProperties -> {
-            KafkaNamesMapper kafkaNamesMapper = kafkaNamesMappers.getMapper(kafkaProperties.getQualifiedClusterName());
-            AdminClient brokerAdminClient = brokerAdminClient(kafkaProperties);
-            BrokerStorage storage = brokersStorage(brokerAdminClient);
-            BrokerTopicManagement brokerTopicManagement =
-                    new KafkaBrokerTopicManagement(topicProperties, brokerAdminClient, kafkaNamesMapper);
-            KafkaConsumerPool consumerPool = kafkaConsumersPool(kafkaProperties, storage, kafkaProperties.getBootstrapKafkaServer());
-            KafkaRawMessageReader kafkaRawMessageReader =
-                    new KafkaRawMessageReader(consumerPool, kafkaProperties.getKafkaConsumer().getPollTimeoutMillis());
-            SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicator = getRepository(repositories, kafkaProperties);
-            KafkaRetransmissionService retransmissionService = new KafkaRetransmissionService(
-                    storage,
-                    subscriptionOffsetChangeIndicator,
-                    consumerPool,
-                    kafkaNamesMapper
-            );
-            KafkaSingleMessageReader messageReader =
-                    new KafkaSingleMessageReader(kafkaRawMessageReader, schemaRepository, jsonAvroConverter);
-            return new BrokersClusterService(kafkaProperties.getQualifiedClusterName(), messageReader,
-                    retransmissionService, brokerTopicManagement, kafkaNamesMapper,
-                    new OffsetsAvailableChecker(consumerPool, storage), new LogEndOffsetChecker(consumerPool),
-                    brokerAdminClient, createConsumerGroupManager(kafkaProperties, kafkaNamesMapper),
-                    createKafkaConsumerManager(kafkaProperties, kafkaNamesMapper));
-        }).collect(toList());
-
-        return new MultiDCAwareService(
-                clusters,
-                clock,
-                ofMillis(subscriptionProperties.getIntervalBetweenCheckinIfOffsetsMovedInMillis()),
-                ofSeconds(subscriptionProperties.getOffsetsMovedTimeoutInSeconds()),
-                multiDcExecutor);
+  @Autowired KafkaClustersProperties kafkaClustersProperties;
+
+  @Autowired TopicProperties topicProperties;
+
+  @Autowired SubscriptionProperties subscriptionProperties;
+
+  @Autowired CompositeMessageContentWrapper compositeMessageContentWrapper;
+
+  @Autowired ZookeeperRepositoryManager zookeeperRepositoryManager;
+
+  @Autowired MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+
+  @Bean
+  MultiDCAwareService multiDCAwareService(
+      KafkaNamesMappers kafkaNamesMappers,
+      SchemaRepository schemaRepository,
+      Clock clock,
+      JsonAvroConverter jsonAvroConverter) {
+    List<DatacenterBoundRepositoryHolder<SubscriptionOffsetChangeIndicator>> repositories =
+        zookeeperRepositoryManager.getRepositories(SubscriptionOffsetChangeIndicator.class);
+
+    List<BrokersClusterService> clusters =
+        kafkaClustersProperties.getClusters().stream()
+            .map(
+                kafkaProperties -> {
+                  KafkaNamesMapper kafkaNamesMapper =
+                      kafkaNamesMappers.getMapper(kafkaProperties.getQualifiedClusterName());
+                  AdminClient brokerAdminClient = brokerAdminClient(kafkaProperties);
+                  BrokerStorage storage = brokersStorage(brokerAdminClient);
+                  BrokerTopicManagement brokerTopicManagement =
+                      new KafkaBrokerTopicManagement(
+                          topicProperties,
+                          brokerAdminClient,
+                          kafkaNamesMapper,
+                          kafkaProperties.getDatacenter());
+                  KafkaConsumerPool consumerPool =
+                      kafkaConsumersPool(kafkaProperties, storage, kafkaProperties.getBrokerList());
+                  KafkaRawMessageReader kafkaRawMessageReader =
+                      new KafkaRawMessageReader(
+                          consumerPool, kafkaProperties.getKafkaConsumer().getPollTimeoutMillis());
+                  SubscriptionOffsetChangeIndicator subscriptionOffsetChangeIndicator =
+                      getRepository(repositories, kafkaProperties);
+                  KafkaRetransmissionService retransmissionService =
+                      new KafkaRetransmissionService(
+                          storage,
+                          subscriptionOffsetChangeIndicator,
+                          consumerPool,
+                          kafkaNamesMapper);
+                  KafkaSingleMessageReader messageReader =
+                      new KafkaSingleMessageReader(
+                          kafkaRawMessageReader, schemaRepository, jsonAvroConverter);
+                  return new BrokersClusterService(
+                      kafkaProperties.getQualifiedClusterName(),
+                      messageReader,
+                      retransmissionService,
+                      brokerTopicManagement,
+                      kafkaNamesMapper,
+                      new OffsetsAvailableChecker(consumerPool, storage),
+                      new LogEndOffsetChecker(consumerPool),
+                      brokerAdminClient,
+                      createConsumerGroupManager(kafkaProperties, kafkaNamesMapper),
+                      createKafkaConsumerManager(kafkaProperties, kafkaNamesMapper));
+                })
+            .collect(toList());
+
+    return new MultiDCAwareService(
+        clusters,
+        clock,
+        ofMillis(subscriptionProperties.getIntervalBetweenCheckinIfOffsetsMovedInMillis()),
+        ofSeconds(subscriptionProperties.getOffsetsMovedTimeoutInSeconds()),
+        multiDcExecutor);
+  }
+
+  private ConsumerGroupManager createConsumerGroupManager(
+      KafkaProperties kafkaProperties, KafkaNamesMapper kafkaNamesMapper) {
+    return subscriptionProperties.isCreateConsumerGroupManuallyEnabled()
+        ? new KafkaConsumerGroupManager(
+            kafkaNamesMapper,
+            kafkaProperties.getQualifiedClusterName(),
+            kafkaProperties.getBrokerList(),
+            kafkaProperties)
+        : new NoOpConsumerGroupManager();
+  }
+
+  private KafkaConsumerManager createKafkaConsumerManager(
+      KafkaProperties kafkaProperties, KafkaNamesMapper kafkaNamesMapper) {
+    return new KafkaConsumerManager(
+        kafkaProperties, kafkaNamesMapper, kafkaProperties.getBrokerList());
+  }
+
+  private SubscriptionOffsetChangeIndicator getRepository(
+      List<DatacenterBoundRepositoryHolder<SubscriptionOffsetChangeIndicator>> repositories,
+      KafkaProperties kafkaProperties) {
+    if (repositories.size() == 1) {
+      return repositories.get(0).getRepository();
     }
-
-    private ConsumerGroupManager createConsumerGroupManager(KafkaProperties kafkaProperties, KafkaNamesMapper kafkaNamesMapper) {
-        return subscriptionProperties.isCreateConsumerGroupManuallyEnabled()
-                ? new KafkaConsumerGroupManager(kafkaNamesMapper, kafkaProperties.getQualifiedClusterName(),
-                        kafkaProperties.getBootstrapKafkaServer(), kafkaProperties)
-                : new NoOpConsumerGroupManager();
-    }
-
-    private KafkaConsumerManager createKafkaConsumerManager(KafkaProperties kafkaProperties,
-                                                            KafkaNamesMapper kafkaNamesMapper) {
-        return new KafkaConsumerManager(kafkaProperties, kafkaNamesMapper, kafkaProperties.getBootstrapKafkaServer());
-    }
-
-    private SubscriptionOffsetChangeIndicator getRepository(
-            List<DatacenterBoundRepositoryHolder<SubscriptionOffsetChangeIndicator>> repositories,
-            KafkaProperties kafkaProperties) {
-        if (repositories.size() == 1) {
-            return repositories.get(0).getRepository();
-        }
-        return repositories.stream()
-                .filter(repository -> kafkaProperties.getDatacenter().equals(repository.getDatacenterName()))
-                .findFirst().orElseThrow(() ->
-                        new IllegalArgumentException(
-                                String.format("Kafka cluster dc name '%s' not matched with Zookeeper dc names: %s",
-                                        kafkaProperties.getDatacenter(),
-                                        repositories.stream()
-                                                .map(DatacenterBoundRepositoryHolder::getDatacenterName)
-                                                .collect(Collectors.joining(","))
-                                )
-                        )
-                )
-                .getRepository();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    KafkaNamesMappers kafkaNameMappers() {
-        return createDefaultKafkaNamesMapper(kafkaClustersProperties);
-    }
-
-    private BrokerStorage brokersStorage(AdminClient kafkaAdminClient) {
-        return new KafkaBrokerStorage(kafkaAdminClient);
-    }
-
-    private KafkaConsumerPool kafkaConsumersPool(KafkaProperties kafkaProperties, BrokerStorage brokerStorage,
-                                                 String configuredBootstrapServers) {
-        KafkaConsumerPoolConfig config = new KafkaConsumerPoolConfig(
-                kafkaProperties.getKafkaConsumer().getCacheExpirationSeconds(),
-                kafkaProperties.getKafkaConsumer().getBufferSizeBytes(),
-                kafkaProperties.getKafkaConsumer().getFetchMaxWaitMillis(),
-                kafkaProperties.getKafkaConsumer().getFetchMinBytes(),
-                kafkaProperties.getKafkaConsumer().getNamePrefix(),
-                kafkaProperties.getKafkaConsumer().getConsumerGroupName(),
-                kafkaProperties.getSasl().isEnabled(),
-                kafkaProperties.getSasl().getMechanism(),
-                kafkaProperties.getSasl().getProtocol(),
-                kafkaProperties.getSasl().getJaasConfig());
-
-        return new KafkaConsumerPool(config, brokerStorage, configuredBootstrapServers);
-    }
-
-    private AdminClient brokerAdminClient(KafkaProperties kafkaProperties) {
-        Properties props = new Properties();
-        props.put(BOOTSTRAP_SERVERS_CONFIG, kafkaProperties.getBootstrapKafkaServer());
-        props.put(SECURITY_PROTOCOL_CONFIG, DEFAULT_SECURITY_PROTOCOL);
-        props.put(REQUEST_TIMEOUT_MS_CONFIG, kafkaProperties.getKafkaServerRequestTimeoutMillis());
-        if (kafkaProperties.getSasl().isEnabled()) {
-            props.put(SASL_MECHANISM, kafkaProperties.getSasl().getMechanism());
-            props.put(SECURITY_PROTOCOL_CONFIG, kafkaProperties.getSasl().getProtocol());
-            props.put(SASL_JAAS_CONFIG, kafkaProperties.getSasl().getJaasConfig());
-        }
-        return AdminClient.create(props);
+    return repositories.stream()
+        .filter(
+            repository -> kafkaProperties.getDatacenter().equals(repository.getDatacenterName()))
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    String.format(
+                        "Kafka cluster dc name '%s' not matched with Zookeeper dc names: %s",
+                        kafkaProperties.getDatacenter(),
+                        repositories.stream()
+                            .map(DatacenterBoundRepositoryHolder::getDatacenterName)
+                            .collect(Collectors.joining(",")))))
+        .getRepository();
+  }
+
+  @Bean
+  @ConditionalOnMissingBean
+  KafkaNamesMappers kafkaNameMappers() {
+    return createDefaultKafkaNamesMapper(kafkaClustersProperties);
+  }
+
+  private BrokerStorage brokersStorage(AdminClient kafkaAdminClient) {
+    return new KafkaBrokerStorage(kafkaAdminClient);
+  }
+
+  private KafkaConsumerPool kafkaConsumersPool(
+      KafkaProperties kafkaProperties,
+      BrokerStorage brokerStorage,
+      String configuredBootstrapServers) {
+    KafkaConsumerPoolConfig config =
+        new KafkaConsumerPoolConfig(
+            kafkaProperties.getKafkaConsumer().getCacheExpirationSeconds(),
+            kafkaProperties.getKafkaConsumer().getBufferSizeBytes(),
+            kafkaProperties.getKafkaConsumer().getFetchMaxWaitMillis(),
+            kafkaProperties.getKafkaConsumer().getFetchMinBytes(),
+            kafkaProperties.getKafkaConsumer().getNamePrefix(),
+            kafkaProperties.getKafkaConsumer().getConsumerGroupName(),
+            kafkaProperties.getAuthentication().isEnabled(),
+            kafkaProperties.getAuthentication().getMechanism(),
+            kafkaProperties.getAuthentication().getProtocol(),
+            kafkaProperties.getAuthentication().getJaasConfig());
+
+    return new KafkaConsumerPool(config, brokerStorage, configuredBootstrapServers);
+  }
+
+  private AdminClient brokerAdminClient(KafkaProperties kafkaProperties) {
+    Properties props = new Properties();
+    props.put(BOOTSTRAP_SERVERS_CONFIG, kafkaProperties.getBrokerList());
+    props.put(SECURITY_PROTOCOL_CONFIG, DEFAULT_SECURITY_PROTOCOL);
+    props.put(REQUEST_TIMEOUT_MS_CONFIG, kafkaProperties.getKafkaServerRequestTimeoutMillis());
+    if (kafkaProperties.getAuthentication().isEnabled()) {
+      props.put(SASL_MECHANISM, kafkaProperties.getAuthentication().getMechanism());
+      props.put(SECURITY_PROTOCOL_CONFIG, kafkaProperties.getAuthentication().getProtocol());
+      props.put(SASL_JAAS_CONFIG, kafkaProperties.getAuthentication().getJaasConfig());
     }
+    return AdminClient.create(props);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaNamesMappers.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaNamesMappers.java
index 2e26a2586a..25c51e8aa5 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaNamesMappers.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaNamesMappers.java
@@ -1,19 +1,18 @@
 package pl.allegro.tech.hermes.management.config.kafka;
 
 import com.google.common.collect.ImmutableMap;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-
 import java.util.Map;
+import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
 
 public class KafkaNamesMappers {
 
-    private final Map<String, KafkaNamesMapper> mappers;
+  private final Map<String, KafkaNamesMapper> mappers;
 
-    public KafkaNamesMappers(Map<String, KafkaNamesMapper> mappers) {
-        this.mappers = ImmutableMap.copyOf(mappers);
-    }
+  public KafkaNamesMappers(Map<String, KafkaNamesMapper> mappers) {
+    this.mappers = ImmutableMap.copyOf(mappers);
+  }
 
-    public KafkaNamesMapper getMapper(String clusterName) {
-        return mappers.get(clusterName);
-    }
-}
\ No newline at end of file
+  public KafkaNamesMapper getMapper(String clusterName) {
+    return mappers.get(clusterName);
+  }
+}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaProperties.java
index 080d689006..6f9c1ba09a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaProperties.java
@@ -1,219 +1,254 @@
 package pl.allegro.tech.hermes.management.config.kafka;
 
-public class KafkaProperties {
+import pl.allegro.tech.hermes.common.config.KafkaAuthenticationProperties;
+import pl.allegro.tech.hermes.common.kafka.KafkaParameters;
 
-    private String datacenter = "datacenter";
+public class KafkaProperties implements KafkaParameters {
 
-    private String clusterName = "primary";
+  private String datacenter = "datacenter";
 
-    private String bootstrapKafkaServer = "localhost:9093";
+  private String clusterName = "primary";
 
-    private int kafkaServerRequestTimeoutMillis = 3000;
+  private String brokerList = "localhost:9092";
 
-    private int sessionTimeoutMillis = 10000;
+  private int kafkaServerRequestTimeoutMillis = 3000;
 
-    private int connectionTimeoutMillis = 3000;
+  private int sessionTimeoutMillis = 10000;
 
-    private int maxInflight = 10;
+  private int connectionTimeoutMillis = 3000;
 
-    private int retryTimes = 3;
+  private int maxInflight = 10;
 
-    private int retrySleepMillis = 1000;
+  private int retryTimes = 3;
 
-    private String offsetsStorage = "kafka";
+  private int retrySleepMillis = 1000;
 
-    private boolean dualCommitEnabled = false;
+  private String offsetsStorage = "kafka";
 
-    private String namespace = "";
+  private boolean dualCommitEnabled = false;
 
-    private KafkaConsumer kafkaConsumer = new KafkaConsumer();
+  private String namespace = "";
 
-    private KafkaSaslProperties sasl = new KafkaSaslProperties();
+  private KafkaConsumer kafkaConsumer = new KafkaConsumer();
 
-    public static final class KafkaConsumer {
+  private KafkaAuthenticationProperties authentication = new KafkaAuthenticationProperties();
 
-        private int cacheExpirationSeconds = 60;
+  @Override
+  public boolean isAuthenticationEnabled() {
+    return authentication.isEnabled();
+  }
 
-        private int bufferSizeBytes = 64 * 1024;
+  @Override
+  public String getAuthenticationMechanism() {
+    return authentication.getMechanism();
+  }
 
-        private int timeoutMillis = 5000;
+  @Override
+  public String getAuthenticationProtocol() {
+    return authentication.getProtocol();
+  }
 
-        private String namePrefix = "offsetChecker";
+  @Override
+  public String getBrokerList() {
+    return brokerList;
+  }
 
-        private int pollTimeoutMillis = 50;
+  @Override
+  public String getJaasConfig() {
+    authentication.getJaasConfig();
+    return null;
+  }
 
-        private final int fetchMaxWaitMillis = 30;
+  public static final class KafkaConsumer {
 
-        private final int fetchMinBytes = 1;
+    private int cacheExpirationSeconds = 60;
 
-        private String consumerGroupName = "RETRANSMISSION_GROUP";
+    private int bufferSizeBytes = 64 * 1024;
 
-        public int getCacheExpirationSeconds() {
-            return cacheExpirationSeconds;
-        }
+    private int timeoutMillis = 5000;
 
-        public void setCacheExpirationSeconds(int cacheExpirationSeconds) {
-            this.cacheExpirationSeconds = cacheExpirationSeconds;
-        }
+    private String namePrefix = "offsetChecker";
 
-        public int getBufferSizeBytes() {
-            return bufferSizeBytes;
-        }
+    private int pollTimeoutMillis = 50;
 
-        public void setBufferSizeBytes(int bufferSizeBytes) {
-            this.bufferSizeBytes = bufferSizeBytes;
-        }
+    private final int fetchMaxWaitMillis = 30;
 
-        public int getTimeoutMillis() {
-            return timeoutMillis;
-        }
+    private final int fetchMinBytes = 1;
 
-        public void setTimeoutMillis(int timeoutMillis) {
-            this.timeoutMillis = timeoutMillis;
-        }
+    private String consumerGroupName = "RETRANSMISSION_GROUP";
 
-        public String getNamePrefix() {
-            return namePrefix;
-        }
-
-        public void setNamePrefix(String namePrefix) {
-            this.namePrefix = namePrefix;
-        }
-
-        public int getPollTimeoutMillis() {
-            return pollTimeoutMillis;
-        }
-
-        public void setPollTimeoutMillis(int pollTimeoutMillis) {
-            this.pollTimeoutMillis = pollTimeoutMillis;
-        }
-
-        public String getConsumerGroupName() {
-            return consumerGroupName;
-        }
-
-        public void setConsumerGroupName(String consumerGroupName) {
-            this.consumerGroupName = consumerGroupName;
-        }
-
-        public int getFetchMaxWaitMillis() {
-            return fetchMaxWaitMillis;
-        }
-
-        public int getFetchMinBytes() {
-            return fetchMinBytes;
-        }
+    public int getCacheExpirationSeconds() {
+      return cacheExpirationSeconds;
     }
 
-    public int getSessionTimeoutMillis() {
-        return sessionTimeoutMillis;
+    public void setCacheExpirationSeconds(int cacheExpirationSeconds) {
+      this.cacheExpirationSeconds = cacheExpirationSeconds;
     }
 
-    public void setSessionTimeoutMillis(int sessionTimeoutMillis) {
-        this.sessionTimeoutMillis = sessionTimeoutMillis;
+    public int getBufferSizeBytes() {
+      return bufferSizeBytes;
     }
 
-    public int getConnectionTimeoutMillis() {
-        return connectionTimeoutMillis;
+    public void setBufferSizeBytes(int bufferSizeBytes) {
+      this.bufferSizeBytes = bufferSizeBytes;
     }
 
-    public void setConnectionTimeoutMillis(int connectionTimeoutMillis) {
-        this.connectionTimeoutMillis = connectionTimeoutMillis;
+    public int getTimeoutMillis() {
+      return timeoutMillis;
     }
 
-    public int getRetryTimes() {
-        return retryTimes;
+    public void setTimeoutMillis(int timeoutMillis) {
+      this.timeoutMillis = timeoutMillis;
     }
 
-    public void setRetryTimes(int retryTimes) {
-        this.retryTimes = retryTimes;
+    public String getNamePrefix() {
+      return namePrefix;
     }
 
-    public int getRetrySleepMillis() {
-        return retrySleepMillis;
+    public void setNamePrefix(String namePrefix) {
+      this.namePrefix = namePrefix;
     }
 
-    public void setRetrySleepMillis(int retrySleepMillis) {
-        this.retrySleepMillis = retrySleepMillis;
+    public int getPollTimeoutMillis() {
+      return pollTimeoutMillis;
     }
 
-    public KafkaConsumer getKafkaConsumer() {
-        return kafkaConsumer;
+    public void setPollTimeoutMillis(int pollTimeoutMillis) {
+      this.pollTimeoutMillis = pollTimeoutMillis;
     }
 
-    public void setKafkaConsumer(KafkaConsumer kafkaConsumer) {
-        this.kafkaConsumer = kafkaConsumer;
+    public String getConsumerGroupName() {
+      return consumerGroupName;
     }
 
-    public KafkaSaslProperties getSasl() {
-        return sasl;
+    public void setConsumerGroupName(String consumerGroupName) {
+      this.consumerGroupName = consumerGroupName;
     }
 
-    public void setSasl(KafkaSaslProperties sasl) {
-        this.sasl = sasl;
+    public int getFetchMaxWaitMillis() {
+      return fetchMaxWaitMillis;
     }
 
-    public String getDatacenter() {
-        return datacenter;
+    public int getFetchMinBytes() {
+      return fetchMinBytes;
     }
+  }
 
-    public void setDatacenter(String datacenter) {
-        this.datacenter = datacenter;
-    }
+  public int getSessionTimeoutMillis() {
+    return sessionTimeoutMillis;
+  }
 
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
+  public void setSessionTimeoutMillis(int sessionTimeoutMillis) {
+    this.sessionTimeoutMillis = sessionTimeoutMillis;
+  }
 
-    public String getQualifiedClusterName() {
-        return clusterName + "-" + datacenter;
-    }
+  public int getConnectionTimeoutMillis() {
+    return connectionTimeoutMillis;
+  }
 
-    public String getOffsetsStorage() {
-        return offsetsStorage;
-    }
+  public void setConnectionTimeoutMillis(int connectionTimeoutMillis) {
+    this.connectionTimeoutMillis = connectionTimeoutMillis;
+  }
 
-    public void setOffsetsStorage(String offsetsStorage) {
-        this.offsetsStorage = offsetsStorage;
-    }
+  public int getRetryTimes() {
+    return retryTimes;
+  }
 
-    public boolean isDualCommitEnabled() {
-        return dualCommitEnabled;
-    }
+  public void setRetryTimes(int retryTimes) {
+    this.retryTimes = retryTimes;
+  }
 
-    public void setDualCommitEnabled(boolean dualCommitEnabled) {
-        this.dualCommitEnabled = dualCommitEnabled;
-    }
+  public int getRetrySleepMillis() {
+    return retrySleepMillis;
+  }
 
-    public String getNamespace() {
-        return namespace;
-    }
+  public void setRetrySleepMillis(int retrySleepMillis) {
+    this.retrySleepMillis = retrySleepMillis;
+  }
 
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
+  public KafkaConsumer getKafkaConsumer() {
+    return kafkaConsumer;
+  }
 
-    public int getMaxInflight() {
-        return maxInflight;
-    }
+  public void setKafkaConsumer(KafkaConsumer kafkaConsumer) {
+    this.kafkaConsumer = kafkaConsumer;
+  }
 
-    public void setMaxInflight(int maxInflight) {
-        this.maxInflight = maxInflight;
-    }
+  public KafkaAuthenticationProperties getAuthentication() {
+    return authentication;
+  }
 
-    public String getBootstrapKafkaServer() {
-        return bootstrapKafkaServer;
-    }
+  @Deprecated
+  public void setSasl(KafkaAuthenticationProperties sasl) {
+    this.authentication = sasl;
+  }
 
-    public void setBootstrapKafkaServer(String bootstrapKafkaServer) {
-        this.bootstrapKafkaServer = bootstrapKafkaServer;
-    }
+  public void setAuthentication(KafkaAuthenticationProperties authentication) {
+    this.authentication = authentication;
+  }
 
-    public int getKafkaServerRequestTimeoutMillis() {
-        return kafkaServerRequestTimeoutMillis;
-    }
+  public String getDatacenter() {
+    return datacenter;
+  }
 
-    public void setKafkaServerRequestTimeoutMillis(int kafkaServerRequestTimeoutMillis) {
-        this.kafkaServerRequestTimeoutMillis = kafkaServerRequestTimeoutMillis;
-    }
+  public void setDatacenter(String datacenter) {
+    this.datacenter = datacenter;
+  }
+
+  public void setClusterName(String clusterName) {
+    this.clusterName = clusterName;
+  }
+
+  public String getQualifiedClusterName() {
+    return clusterName + "-" + datacenter;
+  }
+
+  public String getOffsetsStorage() {
+    return offsetsStorage;
+  }
+
+  public void setOffsetsStorage(String offsetsStorage) {
+    this.offsetsStorage = offsetsStorage;
+  }
+
+  public boolean isDualCommitEnabled() {
+    return dualCommitEnabled;
+  }
+
+  public void setDualCommitEnabled(boolean dualCommitEnabled) {
+    this.dualCommitEnabled = dualCommitEnabled;
+  }
+
+  public String getNamespace() {
+    return namespace;
+  }
+
+  public void setNamespace(String namespace) {
+    this.namespace = namespace;
+  }
+
+  public int getMaxInflight() {
+    return maxInflight;
+  }
+
+  public void setMaxInflight(int maxInflight) {
+    this.maxInflight = maxInflight;
+  }
+
+  @Deprecated
+  public void setBootstrapKafkaServer(String bootstrapKafkaServer) {
+    this.brokerList = bootstrapKafkaServer;
+  }
+
+  public void setBrokerList(String brokerList) {
+    this.brokerList = brokerList;
+  }
+
+  public int getKafkaServerRequestTimeoutMillis() {
+    return kafkaServerRequestTimeoutMillis;
+  }
+
+  public void setKafkaServerRequestTimeoutMillis(int kafkaServerRequestTimeoutMillis) {
+    this.kafkaServerRequestTimeoutMillis = kafkaServerRequestTimeoutMillis;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaSaslProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaSaslProperties.java
deleted file mode 100644
index cfeacfe0a7..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/KafkaSaslProperties.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package pl.allegro.tech.hermes.management.config.kafka;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "sasl")
-public class KafkaSaslProperties {
-    private boolean isEnabled = false;
-    private String mechanism = "PLAIN";
-    private String protocol = "PLAINTEXT";
-    private String username = "admin";
-    private String password = "admin-secret";
-    private String jaasConfig;
-
-    public boolean isEnabled() {
-        return isEnabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        isEnabled = enabled;
-    }
-
-    public String getMechanism() {
-        return mechanism;
-    }
-
-    public void setMechanism(String mechanism) {
-        this.mechanism = mechanism;
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getJaasConfig() {
-        return "org.apache.kafka.common.security.plain.PlainLoginModule required\n"
-                + "username=\"" + username + "\"\n"
-                + "password=\"" + password + "\";";
-    }
-
-    public void setJaasConfig(String jaasConfig) {
-        this.jaasConfig = jaasConfig;
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/MultipleDcKafkaNamesMappersFactory.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/MultipleDcKafkaNamesMappersFactory.java
index 9f23ad0186..6bd2e853ef 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/MultipleDcKafkaNamesMappersFactory.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/kafka/MultipleDcKafkaNamesMappersFactory.java
@@ -1,32 +1,42 @@
 package pl.allegro.tech.hermes.management.config.kafka;
 
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-import pl.allegro.tech.hermes.common.kafka.NamespaceKafkaNamesMapper;
+import static java.util.stream.Collectors.toMap;
 
 import java.util.Map;
 import java.util.function.Function;
-
-import static java.util.stream.Collectors.toMap;
+import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
+import pl.allegro.tech.hermes.common.kafka.NamespaceKafkaNamesMapper;
 
 public interface MultipleDcKafkaNamesMappersFactory {
 
-    default KafkaNamesMappers createDefaultKafkaNamesMapper(KafkaClustersProperties clustersProperties) {
-        return createKafkaNamesMapper(clustersProperties,
-                namespace -> new NamespaceKafkaNamesMapper(namespace, clustersProperties.getNamespaceSeparator()));
-    }
-
-    default KafkaNamesMappers createKafkaNamesMapper(KafkaClustersProperties clustersProperties,
-                                                     Function<String, KafkaNamesMapper> factoryFunction) {
-        Map<String, KafkaNamesMapper> mappers = clustersProperties.getClusters().stream()
-                .filter(c -> c.getNamespace().isEmpty())
-                .collect(toMap(KafkaProperties::getQualifiedClusterName,
-                        kafkaProperties -> factoryFunction.apply(clustersProperties.getDefaultNamespace())));
-
-        mappers.putAll(clustersProperties.getClusters().stream()
-                .filter(c -> !c.getNamespace().isEmpty())
-                .collect(toMap(KafkaProperties::getQualifiedClusterName,
-                        kafkaProperties -> factoryFunction.apply(kafkaProperties.getNamespace()))));
-
-        return new KafkaNamesMappers(mappers);
-    }
+  default KafkaNamesMappers createDefaultKafkaNamesMapper(
+      KafkaClustersProperties clustersProperties) {
+    return createKafkaNamesMapper(
+        clustersProperties,
+        namespace ->
+            new NamespaceKafkaNamesMapper(namespace, clustersProperties.getNamespaceSeparator()));
+  }
+
+  default KafkaNamesMappers createKafkaNamesMapper(
+      KafkaClustersProperties clustersProperties,
+      Function<String, KafkaNamesMapper> factoryFunction) {
+    Map<String, KafkaNamesMapper> mappers =
+        clustersProperties.getClusters().stream()
+            .filter(c -> c.getNamespace().isEmpty())
+            .collect(
+                toMap(
+                    KafkaProperties::getQualifiedClusterName,
+                    kafkaProperties ->
+                        factoryFunction.apply(clustersProperties.getDefaultNamespace())));
+
+    mappers.putAll(
+        clustersProperties.getClusters().stream()
+            .filter(c -> !c.getNamespace().isEmpty())
+            .collect(
+                toMap(
+                    KafkaProperties::getQualifiedClusterName,
+                    kafkaProperties -> factoryFunction.apply(kafkaProperties.getNamespace()))));
+
+    return new KafkaNamesMappers(mappers);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/DefaultZookeeperGroupRepositoryFactory.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/DefaultZookeeperGroupRepositoryFactory.java
index 9483f0364b..cb1330a5e3 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/DefaultZookeeperGroupRepositoryFactory.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/DefaultZookeeperGroupRepositoryFactory.java
@@ -7,8 +7,9 @@
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
 public class DefaultZookeeperGroupRepositoryFactory implements ZookeeperGroupRepositoryFactory {
-    @Override
-    public GroupRepository create(CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
-        return new ZookeeperGroupRepository(zookeeper, mapper, paths);
-    }
+  @Override
+  public GroupRepository create(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    return new ZookeeperGroupRepository(zookeeper, mapper, paths);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageAuthorizationProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageAuthorizationProperties.java
index 90a05251a9..457d829be6 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageAuthorizationProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageAuthorizationProperties.java
@@ -5,31 +5,31 @@
 @ConfigurationProperties(prefix = "authorization")
 public class StorageAuthorizationProperties {
 
-    private String scheme;
-    private String user;
-    private String password;
+  private String scheme;
+  private String user;
+  private String password;
 
-    public String getScheme() {
-        return scheme;
-    }
+  public String getScheme() {
+    return scheme;
+  }
 
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
+  public void setScheme(String scheme) {
+    this.scheme = scheme;
+  }
 
-    public String getUser() {
-        return user;
-    }
+  public String getUser() {
+    return user;
+  }
 
-    public void setUser(String user) {
-        this.user = user;
-    }
+  public void setUser(String user) {
+    this.user = user;
+  }
 
-    public String getPassword() {
-        return password;
-    }
+  public String getPassword() {
+    return password;
+  }
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+  public void setPassword(String password) {
+    this.password = password;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageClustersProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageClustersProperties.java
index 0244233f7c..f2175fafa7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageClustersProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageClustersProperties.java
@@ -1,133 +1,130 @@
 package pl.allegro.tech.hermes.management.config.storage;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import pl.allegro.tech.hermes.infrastructure.dc.DcNameSource;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @ConfigurationProperties(prefix = "storage")
 public class StorageClustersProperties {
 
-    private String pathPrefix = "/hermes";
-    private int retryTimes = 3;
-    private int retrySleep = 1000;
-    private int sharedCountersExpiration = 72;
-    private DcNameSource datacenterNameSource;
-    private String datacenterNameSourceEnv = "DC";
-    private boolean transactional = true;
-    private int maxConcurrentOperations = 100;
-    private String connectionString = "localhost:2181";
-    private int sessionTimeout = 10000;
-    private int connectTimeout = 1000;
-    private List<StorageProperties> clusters = new ArrayList<>();
-
-    @NestedConfigurationProperty
-    private StorageAuthorizationProperties authorization;
-
-    public String getPathPrefix() {
-        return pathPrefix;
-    }
-
-    public void setPathPrefix(String pathPrefix) {
-        this.pathPrefix = pathPrefix;
-    }
-
-    public int getRetryTimes() {
-        return retryTimes;
-    }
-
-    public void setRetryTimes(int retryTimes) {
-        this.retryTimes = retryTimes;
-    }
-
-    public int getRetrySleep() {
-        return retrySleep;
-    }
-
-    public void setRetrySleep(int retrySleep) {
-        this.retrySleep = retrySleep;
-    }
-
-    public int getSharedCountersExpiration() {
-        return sharedCountersExpiration;
-    }
-
-    public void setSharedCountersExpiration(int sharedCountersExpiration) {
-        this.sharedCountersExpiration = sharedCountersExpiration;
-    }
-
-    public StorageAuthorizationProperties getAuthorization() {
-        return authorization;
-    }
-
-    public void setAuthorization(StorageAuthorizationProperties authorization) {
-        this.authorization = authorization;
-    }
-
-    public List<StorageProperties> getClusters() {
-        return clusters;
-    }
-
-    public void setClusters(List<StorageProperties> clusters) {
-        this.clusters = clusters;
-    }
-
-    public DcNameSource getDatacenterNameSource() {
-        return datacenterNameSource;
-    }
-
-    public void setDatacenterNameSource(DcNameSource datacenterNameSource) {
-        this.datacenterNameSource = datacenterNameSource;
-    }
-
-    public String getDatacenterNameSourceEnv() {
-        return datacenterNameSourceEnv;
-    }
-
-    public void setDatacenterNameSourceEnv(String datacenterNameSourceEnv) {
-        this.datacenterNameSourceEnv = datacenterNameSourceEnv;
-    }
-
-    public boolean isTransactional() {
-        return transactional;
-    }
-
-    public void setTransactional(boolean transactional) {
-        this.transactional = transactional;
-    }
-
-    public int getMaxConcurrentOperations() {
-        return maxConcurrentOperations;
-    }
-
-    public void setMaxConcurrentOperations(int maxConcurrentOperations) {
-        this.maxConcurrentOperations = maxConcurrentOperations;
-    }
-
-    public String getConnectionString() {
-        return connectionString;
-    }
-
-    public void setConnectionString(String connectionString) {
-        this.connectionString = connectionString;
-    }
-
-    public int getSessionTimeout() {
-        return sessionTimeout;
-    }
-
-    public void setSessionTimeout(int sessionTimeout) {
-        this.sessionTimeout = sessionTimeout;
-    }
-
-    public int getConnectTimeout() {
-        return connectTimeout;
-    }
+  private String pathPrefix = "/hermes";
+  private int retryTimes = 3;
+  private int retrySleep = 1000;
+  private int sharedCountersExpiration = 72;
+  private DcNameSource datacenterNameSource;
+  private String datacenterNameSourceEnv = "DC";
+  private boolean transactional = true;
+  private int maxConcurrentOperations = 100;
+  private String connectionString = "localhost:2181";
+  private int sessionTimeout = 10000;
+  private int connectTimeout = 1000;
+  private List<StorageProperties> clusters = new ArrayList<>();
+
+  @NestedConfigurationProperty private StorageAuthorizationProperties authorization;
+
+  public String getPathPrefix() {
+    return pathPrefix;
+  }
+
+  public void setPathPrefix(String pathPrefix) {
+    this.pathPrefix = pathPrefix;
+  }
+
+  public int getRetryTimes() {
+    return retryTimes;
+  }
+
+  public void setRetryTimes(int retryTimes) {
+    this.retryTimes = retryTimes;
+  }
+
+  public int getRetrySleep() {
+    return retrySleep;
+  }
+
+  public void setRetrySleep(int retrySleep) {
+    this.retrySleep = retrySleep;
+  }
+
+  public int getSharedCountersExpiration() {
+    return sharedCountersExpiration;
+  }
+
+  public void setSharedCountersExpiration(int sharedCountersExpiration) {
+    this.sharedCountersExpiration = sharedCountersExpiration;
+  }
+
+  public StorageAuthorizationProperties getAuthorization() {
+    return authorization;
+  }
+
+  public void setAuthorization(StorageAuthorizationProperties authorization) {
+    this.authorization = authorization;
+  }
+
+  public List<StorageProperties> getClusters() {
+    return clusters;
+  }
+
+  public void setClusters(List<StorageProperties> clusters) {
+    this.clusters = clusters;
+  }
+
+  public DcNameSource getDatacenterNameSource() {
+    return datacenterNameSource;
+  }
+
+  public void setDatacenterNameSource(DcNameSource datacenterNameSource) {
+    this.datacenterNameSource = datacenterNameSource;
+  }
+
+  public String getDatacenterNameSourceEnv() {
+    return datacenterNameSourceEnv;
+  }
+
+  public void setDatacenterNameSourceEnv(String datacenterNameSourceEnv) {
+    this.datacenterNameSourceEnv = datacenterNameSourceEnv;
+  }
+
+  public boolean isTransactional() {
+    return transactional;
+  }
+
+  public void setTransactional(boolean transactional) {
+    this.transactional = transactional;
+  }
+
+  public int getMaxConcurrentOperations() {
+    return maxConcurrentOperations;
+  }
+
+  public void setMaxConcurrentOperations(int maxConcurrentOperations) {
+    this.maxConcurrentOperations = maxConcurrentOperations;
+  }
+
+  public String getConnectionString() {
+    return connectionString;
+  }
+
+  public void setConnectionString(String connectionString) {
+    this.connectionString = connectionString;
+  }
+
+  public int getSessionTimeout() {
+    return sessionTimeout;
+  }
+
+  public void setSessionTimeout(int sessionTimeout) {
+    this.sessionTimeout = sessionTimeout;
+  }
 
-    public void setConnectTimeout(int connectTimeout) {
-        this.connectTimeout = connectTimeout;
-    }
+  public int getConnectTimeout() {
+    return connectTimeout;
+  }
 
+  public void setConnectTimeout(int connectTimeout) {
+    this.connectTimeout = connectTimeout;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageConfiguration.java
index 2dfe56d48c..ef050ca2d5 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageConfiguration.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageConfiguration.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.config.storage;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,143 +31,150 @@
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperWorkloadConstraintsRepository;
 import pl.allegro.tech.hermes.management.domain.blacklist.TopicBlacklistRepository;
 import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryCommandExecutor;
-import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryQueryExecutor;
 import pl.allegro.tech.hermes.management.domain.mode.ModeService;
+import pl.allegro.tech.hermes.management.domain.readiness.DatacenterReadinessRepository;
 import pl.allegro.tech.hermes.management.domain.retransmit.OfflineRetransmissionRepository;
 import pl.allegro.tech.hermes.management.infrastructure.blacklist.ZookeeperTopicBlacklistRepository;
 import pl.allegro.tech.hermes.management.infrastructure.metrics.SummedSharedCounter;
+import pl.allegro.tech.hermes.management.infrastructure.readiness.ZookeeperDatacenterReadinessRepository;
 import pl.allegro.tech.hermes.management.infrastructure.retransmit.ZookeeperOfflineRetransmissionRepository;
 import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClient;
 import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClientManager;
 import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperRepositoryManager;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 @Configuration
 @EnableConfigurationProperties(StorageClustersProperties.class)
 public class StorageConfiguration {
 
-    private static final Logger logger = getLogger(StorageConfiguration.class);
-
-    @Autowired
-    StorageClustersProperties storageClustersProperties;
-
-    @Autowired
-    ObjectMapper objectMapper;
-
-    @Bean
-    DatacenterNameProvider dcNameProvider() {
-        if (storageClustersProperties.getDatacenterNameSource() == DcNameSource.ENV) {
-            return new EnvironmentVariableDatacenterNameProvider(storageClustersProperties.getDatacenterNameSourceEnv());
-        } else {
-            return new DefaultDatacenterNameProvider();
-        }
-    }
-
-    @Bean(initMethod = "start", destroyMethod = "stop")
-    ZookeeperClientManager clientManager() {
-        return new ZookeeperClientManager(storageClustersProperties, dcNameProvider());
-    }
-
-    @Bean
-    ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory() {
-        return new DefaultZookeeperGroupRepositoryFactory();
-    }
-
-    @Bean(initMethod = "start")
-    ZookeeperRepositoryManager repositoryManager(ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory) {
-        return new ZookeeperRepositoryManager(clientManager(), dcNameProvider(), objectMapper,
-                zookeeperPaths(), zookeeperGroupRepositoryFactory);
-    }
-
-    @Bean
-    ZookeeperPaths zookeeperPaths() {
-        return new ZookeeperPaths(storageClustersProperties.getPathPrefix());
-    }
-
-    @Bean
-    MultiDatacenterRepositoryCommandExecutor multiDcRepositoryCommandExecutor(
-            ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory,
-            ModeService modeService
-    ) {
-        return new MultiDatacenterRepositoryCommandExecutor(
-                repositoryManager(zookeeperGroupRepositoryFactory),
-                storageClustersProperties.isTransactional(),
-                modeService
-        );
-    }
-
-    @Bean
-    MultiDatacenterRepositoryQueryExecutor multiDcRepositoryQueryExecutor(
-            ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory) {
-        return new MultiDatacenterRepositoryQueryExecutor(repositoryManager(zookeeperGroupRepositoryFactory));
-    }
-
-    @Bean
-    SummedSharedCounter summedSharedCounter(ZookeeperClientManager manager) {
-        return new SummedSharedCounter(
-                manager.getClients(),
-                storageClustersProperties.getSharedCountersExpiration(),
-                storageClustersProperties.getRetrySleep(),
-                storageClustersProperties.getRetryTimes()
-        );
-    }
-
-    @Bean
-    GroupRepository groupRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperGroupRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
-    }
-
-    @Bean
-    CredentialsRepository credentialsRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperCredentialsRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
-    }
-
-    @Bean
-    TopicRepository topicRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperTopicRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths(),
-                groupRepository());
-    }
-
-    @Bean
-    SubscriptionRepository subscriptionRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperSubscriptionRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths(),
-                topicRepository());
-    }
-
-    @Bean
-    OAuthProviderRepository oAuthProviderRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperOAuthProviderRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
-    }
-
-    @Bean
-    MessagePreviewRepository messagePreviewRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperMessagePreviewRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
-    }
-
-    @Bean
-    TopicBlacklistRepository topicBlacklistRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperTopicBlacklistRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
-    }
-
-    @Bean
-    WorkloadConstraintsRepository workloadConstraintsRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperWorkloadConstraintsRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
-    }
-
-    @Bean
-    @Primary
-    @Qualifier("zookeeperOfflineRetransmissionRepository")
-    OfflineRetransmissionRepository zookeeperOfflineRetransmissionRepository() {
-        ZookeeperClient localClient = clientManager().getLocalClient();
-        return new ZookeeperOfflineRetransmissionRepository(localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
-    }
+  private static final Logger logger = getLogger(StorageConfiguration.class);
+
+  @Autowired StorageClustersProperties storageClustersProperties;
+
+  @Autowired ObjectMapper objectMapper;
+
+  @Bean
+  DatacenterNameProvider dcNameProvider() {
+    if (storageClustersProperties.getDatacenterNameSource() == DcNameSource.ENV) {
+      return new EnvironmentVariableDatacenterNameProvider(
+          storageClustersProperties.getDatacenterNameSourceEnv());
+    } else {
+      return new DefaultDatacenterNameProvider();
+    }
+  }
+
+  @Bean(initMethod = "start", destroyMethod = "stop")
+  ZookeeperClientManager clientManager() {
+    return new ZookeeperClientManager(storageClustersProperties, dcNameProvider());
+  }
+
+  @Bean
+  ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory() {
+    return new DefaultZookeeperGroupRepositoryFactory();
+  }
+
+  @Bean(initMethod = "start")
+  ZookeeperRepositoryManager repositoryManager(
+      ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory) {
+    return new ZookeeperRepositoryManager(
+        clientManager(),
+        dcNameProvider(),
+        objectMapper,
+        zookeeperPaths(),
+        zookeeperGroupRepositoryFactory);
+  }
+
+  @Bean
+  ZookeeperPaths zookeeperPaths() {
+    return new ZookeeperPaths(storageClustersProperties.getPathPrefix());
+  }
+
+  @Bean
+  MultiDatacenterRepositoryCommandExecutor multiDcRepositoryCommandExecutor(
+      ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory, ModeService modeService) {
+    return new MultiDatacenterRepositoryCommandExecutor(
+        repositoryManager(zookeeperGroupRepositoryFactory),
+        storageClustersProperties.isTransactional(),
+        modeService);
+  }
+
+  @Bean
+  SummedSharedCounter summedSharedCounter(ZookeeperClientManager manager) {
+    return new SummedSharedCounter(
+        manager.getClients(),
+        storageClustersProperties.getSharedCountersExpiration(),
+        storageClustersProperties.getRetrySleep(),
+        storageClustersProperties.getRetryTimes());
+  }
+
+  @Bean
+  GroupRepository groupRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperGroupRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
+  }
+
+  @Bean
+  CredentialsRepository credentialsRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperCredentialsRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
+  }
+
+  @Bean
+  TopicRepository topicRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperTopicRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths(), groupRepository());
+  }
+
+  @Bean
+  SubscriptionRepository subscriptionRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperSubscriptionRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths(), topicRepository());
+  }
+
+  @Bean
+  OAuthProviderRepository oAuthProviderRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperOAuthProviderRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
+  }
+
+  @Bean
+  MessagePreviewRepository messagePreviewRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperMessagePreviewRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
+  }
+
+  @Bean
+  TopicBlacklistRepository topicBlacklistRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperTopicBlacklistRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
+  }
+
+  @Bean
+  WorkloadConstraintsRepository workloadConstraintsRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperWorkloadConstraintsRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
+  }
+
+  @Bean
+  @Primary
+  @Qualifier("zookeeperOfflineRetransmissionRepository")
+  OfflineRetransmissionRepository zookeeperOfflineRetransmissionRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperOfflineRetransmissionRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
+  }
+
+  @Bean
+  DatacenterReadinessRepository readinessRepository() {
+    ZookeeperClient localClient = clientManager().getLocalClient();
+    return new ZookeeperDatacenterReadinessRepository(
+        localClient.getCuratorFramework(), objectMapper, zookeeperPaths());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageProperties.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageProperties.java
index 03990431e9..2ff15c277f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageProperties.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageProperties.java
@@ -1,50 +1,49 @@
 package pl.allegro.tech.hermes.management.config.storage;
 
-
 public class StorageProperties {
-    private String datacenter = "dc";
-    private String clusterName = "zk";
-    private String connectionString = "localhost:2181";
-    private int sessionTimeout = 10000;
-    private int connectTimeout = 1000;
-
-    public String getConnectionString() {
-        return connectionString;
-    }
-
-    public void setConnectionString(String connectionString) {
-        this.connectionString = connectionString;
-    }
-
-    public int getSessionTimeout() {
-        return sessionTimeout;
-    }
-
-    public void setSessionTimeout(int sessionTimeout) {
-        this.sessionTimeout = sessionTimeout;
-    }
-
-    public int getConnectTimeout() {
-        return connectTimeout;
-    }
-
-    public void setConnectTimeout(int connectTimeout) {
-        this.connectTimeout = connectTimeout;
-    }
-
-    public String getDatacenter() {
-        return datacenter;
-    }
-
-    public void setDatacenter(String datacenter) {
-        this.datacenter = datacenter;
-    }
-
-    public String getClusterName() {
-        return clusterName;
-    }
-
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
+  private String datacenter = "dc";
+  private String clusterName = "zk";
+  private String connectionString = "localhost:2181";
+  private int sessionTimeout = 10000;
+  private int connectTimeout = 1000;
+
+  public String getConnectionString() {
+    return connectionString;
+  }
+
+  public void setConnectionString(String connectionString) {
+    this.connectionString = connectionString;
+  }
+
+  public int getSessionTimeout() {
+    return sessionTimeout;
+  }
+
+  public void setSessionTimeout(int sessionTimeout) {
+    this.sessionTimeout = sessionTimeout;
+  }
+
+  public int getConnectTimeout() {
+    return connectTimeout;
+  }
+
+  public void setConnectTimeout(int connectTimeout) {
+    this.connectTimeout = connectTimeout;
+  }
+
+  public String getDatacenter() {
+    return datacenter;
+  }
+
+  public void setDatacenter(String datacenter) {
+    this.datacenter = datacenter;
+  }
+
+  public String getClusterName() {
+    return clusterName;
+  }
+
+  public void setClusterName(String clusterName) {
+    this.clusterName = clusterName;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/ZookeeperGroupRepositoryFactory.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/ZookeeperGroupRepositoryFactory.java
index 50b8b965a5..b50445b48e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/ZookeeperGroupRepositoryFactory.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/ZookeeperGroupRepositoryFactory.java
@@ -6,5 +6,5 @@
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
 
 public interface ZookeeperGroupRepositoryFactory {
-    GroupRepository create(CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths);
+  GroupRepository create(CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/Auditor.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/Auditor.java
index e9cf18116d..eb6b23ff73 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/Auditor.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/Auditor.java
@@ -5,37 +5,33 @@
 
 public interface Auditor {
 
-    default void beforeObjectCreation(String username, Object createdObject) {
-    }
+  default void beforeObjectCreation(String username, Object createdObject) {}
 
-    default void beforeObjectCreation(String username, Anonymizable createdObject) {
-        beforeObjectCreation(username, (Object) createdObject.anonymize());
-    }
+  default void beforeObjectCreation(String username, Anonymizable createdObject) {
+    beforeObjectCreation(username, (Object) createdObject.anonymize());
+  }
 
-    default void beforeObjectRemoval(String username, String removedObjectType, String removedObjectName) {
-    }
+  default void beforeObjectRemoval(
+      String username, String removedObjectType, String removedObjectName) {}
 
-    default void beforeObjectUpdate(String username, String objectClassName, Object objectName, PatchData patchData) {
-    }
+  default void beforeObjectUpdate(
+      String username, String objectClassName, Object objectName, PatchData patchData) {}
 
-    default void objectCreated(String username, Object createdObject) {
-    }
+  default void objectCreated(String username, Object createdObject) {}
 
-    default void objectCreated(String username, Anonymizable createdObject) {
-        objectCreated(username, (Object) createdObject.anonymize());
-    }
+  default void objectCreated(String username, Anonymizable createdObject) {
+    objectCreated(username, (Object) createdObject.anonymize());
+  }
 
-    default void objectRemoved(String username, Object removedObject) {
-    }
+  default void objectRemoved(String username, Object removedObject) {}
 
-    default void objectRemoved(String username, Anonymizable removedObject) {
-        objectRemoved(username, (Object) removedObject.anonymize());
-    }
+  default void objectRemoved(String username, Anonymizable removedObject) {
+    objectRemoved(username, (Object) removedObject.anonymize());
+  }
 
-    default void objectUpdated(String username, Object oldObject, Object newObject) {
-    }
+  default void objectUpdated(String username, Object oldObject, Object newObject) {}
 
-    default void objectUpdated(String username, Anonymizable oldObject, Anonymizable newObject) {
-        objectUpdated(username, (Object) oldObject.anonymize(), (Object) newObject.anonymize());
-    }
+  default void objectUpdated(String username, Anonymizable oldObject, Anonymizable newObject) {
+    objectUpdated(username, (Object) oldObject.anonymize(), (Object) newObject.anonymize());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/GroupNameIsNotAllowedException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/GroupNameIsNotAllowedException.java
index b41d1d0330..181696ff4d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/GroupNameIsNotAllowedException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/GroupNameIsNotAllowedException.java
@@ -3,12 +3,12 @@
 import pl.allegro.tech.hermes.api.ErrorCode;
 
 public class GroupNameIsNotAllowedException extends ManagementException {
-    public GroupNameIsNotAllowedException(String message) {
-        super(message);
-    }
+  public GroupNameIsNotAllowedException(String message) {
+    super(message);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.GROUP_NAME_IS_INVALID;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.GROUP_NAME_IS_INVALID;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/ManagementException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/ManagementException.java
index 725e071a86..e540451b02 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/ManagementException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/ManagementException.java
@@ -4,18 +4,17 @@
 
 public abstract class ManagementException extends RuntimeException {
 
-    public ManagementException(Throwable t) {
-        super(t);
-    }
+  public ManagementException(Throwable t) {
+    super(t);
+  }
 
-    public ManagementException(String message) {
-        super(message);
-    }
+  public ManagementException(String message) {
+    super(message);
+  }
 
-    public ManagementException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public abstract ErrorCode getCode();
+  public ManagementException(String message, Throwable cause) {
+    super(message, cause);
+  }
 
+  public abstract ErrorCode getCode();
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/MetricsDashboardUrl.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/MetricsDashboardUrl.java
index 1725089a5f..c134303ea9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/MetricsDashboardUrl.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/MetricsDashboardUrl.java
@@ -2,39 +2,38 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public class MetricsDashboardUrl {
 
-    private final String url;
+  private final String url;
 
-    @JsonCreator
-    public MetricsDashboardUrl(@JsonProperty("url") String url) {
-        this.url = url;
-    }
+  @JsonCreator
+  public MetricsDashboardUrl(@JsonProperty("url") String url) {
+    this.url = url;
+  }
 
-    public String getUrl() {
-        return url;
-    }
+  public String getUrl() {
+    return url;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
 
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
 
-        MetricsDashboardUrl that = (MetricsDashboardUrl) o;
+    MetricsDashboardUrl that = (MetricsDashboardUrl) o;
 
-        return Objects.equals(url, that.url);
-    }
+    return Objects.equals(url, that.url);
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(url);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(url);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/MetricsDashboardUrlService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/MetricsDashboardUrlService.java
index 91a04ac1a7..d4d5142e4d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/MetricsDashboardUrlService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/MetricsDashboardUrlService.java
@@ -2,7 +2,7 @@
 
 public interface MetricsDashboardUrlService {
 
-    String getUrlForTopic(String topic);
+  String getUrlForTopic(String topic);
 
-    String getUrlForSubscription(String topic, String subscription);
+  String getUrlForSubscription(String topic, String subscription);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/PermissionDeniedException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/PermissionDeniedException.java
index 20e28aa49c..6d3affd7ea 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/PermissionDeniedException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/PermissionDeniedException.java
@@ -3,12 +3,12 @@
 import pl.allegro.tech.hermes.api.ErrorCode;
 
 public class PermissionDeniedException extends ManagementException {
-    public PermissionDeniedException(String message) {
-        super(message);
-    }
+  public PermissionDeniedException(String message) {
+    super(message);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.PERMISSION_DENIED;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.PERMISSION_DENIED;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/auth/RequestUser.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/auth/RequestUser.java
index 4a9b121843..939890dfa1 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/auth/RequestUser.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/auth/RequestUser.java
@@ -4,9 +4,9 @@
 
 public interface RequestUser {
 
-    String getUsername();
+  String getUsername();
 
-    boolean isAdmin();
+  boolean isAdmin();
 
-    boolean isOwner(OwnerId ownerId);
+  boolean isOwner(OwnerId ownerId);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/NotUnblacklistedException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/NotUnblacklistedException.java
index 510b8cd51f..5334ae963b 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/NotUnblacklistedException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/NotUnblacklistedException.java
@@ -1,22 +1,22 @@
 package pl.allegro.tech.hermes.management.domain.blacklist;
 
+import static pl.allegro.tech.hermes.api.ErrorCode.TOPIC_NOT_UNBLACKLISTED;
+
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.common.exception.HermesException;
 
-import static pl.allegro.tech.hermes.api.ErrorCode.TOPIC_NOT_UNBLACKLISTED;
-
 public class NotUnblacklistedException extends HermesException {
 
-    @Override
-    public ErrorCode getCode() {
-        return TOPIC_NOT_UNBLACKLISTED;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return TOPIC_NOT_UNBLACKLISTED;
+  }
 
-    public NotUnblacklistedException(String qualifiedTopicName, Throwable cause) {
-        super("Topic not unblacklisted: " + qualifiedTopicName, cause);
-    }
+  public NotUnblacklistedException(String qualifiedTopicName, Throwable cause) {
+    super("Topic not unblacklisted: " + qualifiedTopicName, cause);
+  }
 
-    public NotUnblacklistedException(String qualifiedTopicName) {
-        this(qualifiedTopicName, null);
-    }
+  public NotUnblacklistedException(String qualifiedTopicName) {
+    this(qualifiedTopicName, null);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/TopicBlacklistRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/TopicBlacklistRepository.java
index ae62045264..63dc586869 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/TopicBlacklistRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/TopicBlacklistRepository.java
@@ -4,11 +4,11 @@
 
 public interface TopicBlacklistRepository {
 
-    void add(String qualifiedTopicName);
+  void add(String qualifiedTopicName);
 
-    void remove(String qualifiedTopicName);
+  void remove(String qualifiedTopicName);
 
-    boolean isBlacklisted(String qualifiedTopicName);
+  boolean isBlacklisted(String qualifiedTopicName);
 
-    List<String> list();
+  List<String> list();
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/TopicBlacklistService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/TopicBlacklistService.java
index 3e5350ecc5..2d775897ff 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/TopicBlacklistService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/TopicBlacklistService.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.management.domain.blacklist;
 
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
@@ -7,35 +8,35 @@
 import pl.allegro.tech.hermes.management.domain.blacklist.commands.RemoveTopicFromBlacklistRepositoryCommand;
 import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryCommandExecutor;
 
-import java.util.List;
-
 @Component
 public class TopicBlacklistService {
 
-    private final TopicBlacklistRepository repository;
-    private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
-
-    @Autowired
-    public TopicBlacklistService(TopicBlacklistRepository repository,
-                                 MultiDatacenterRepositoryCommandExecutor multiDcExecutor) {
-        this.repository = repository;
-        this.multiDcExecutor = multiDcExecutor;
-    }
-
-    public void blacklist(String qualifiedTopicName, RequestUser blacklistRequester) {
-        multiDcExecutor.executeByUser(new AddTopicToBlacklistRepositoryCommand(qualifiedTopicName), blacklistRequester);
-    }
-
-    public void unblacklist(String qualifiedTopicName, RequestUser unblacklistRequester) {
-        multiDcExecutor.executeByUser(new RemoveTopicFromBlacklistRepositoryCommand(qualifiedTopicName), unblacklistRequester);
-    }
-
-    public boolean isBlacklisted(String qualifiedTopicName) {
-        return repository.isBlacklisted(qualifiedTopicName);
-    }
-
-    public List<String> list() {
-        return repository.list();
-    }
-
+  private final TopicBlacklistRepository repository;
+  private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+
+  @Autowired
+  public TopicBlacklistService(
+      TopicBlacklistRepository repository,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor) {
+    this.repository = repository;
+    this.multiDcExecutor = multiDcExecutor;
+  }
+
+  public void blacklist(String qualifiedTopicName, RequestUser blacklistRequester) {
+    multiDcExecutor.executeByUser(
+        new AddTopicToBlacklistRepositoryCommand(qualifiedTopicName), blacklistRequester);
+  }
+
+  public void unblacklist(String qualifiedTopicName, RequestUser unblacklistRequester) {
+    multiDcExecutor.executeByUser(
+        new RemoveTopicFromBlacklistRepositoryCommand(qualifiedTopicName), unblacklistRequester);
+  }
+
+  public boolean isBlacklisted(String qualifiedTopicName) {
+    return repository.isBlacklisted(qualifiedTopicName);
+  }
+
+  public List<String> list() {
+    return repository.list();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/commands/AddTopicToBlacklistRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/commands/AddTopicToBlacklistRepositoryCommand.java
index 2bd07569ce..76692ba517 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/commands/AddTopicToBlacklistRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/commands/AddTopicToBlacklistRepositoryCommand.java
@@ -4,34 +4,36 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class AddTopicToBlacklistRepositoryCommand extends RepositoryCommand<TopicBlacklistRepository> {
-
-    private final String qualifiedTopicName;
-
-    public AddTopicToBlacklistRepositoryCommand(String qualifiedTopicName) {
-        this.qualifiedTopicName = qualifiedTopicName;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {}
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {
-        holder.getRepository().add(qualifiedTopicName);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {
-        holder.getRepository().remove(qualifiedTopicName);
-    }
-
-    @Override
-    public Class<TopicBlacklistRepository> getRepositoryType() {
-        return TopicBlacklistRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "AddTopicToBlacklist(" + qualifiedTopicName + ")";
-    }
+public class AddTopicToBlacklistRepositoryCommand
+    extends RepositoryCommand<TopicBlacklistRepository> {
+
+  private final String qualifiedTopicName;
+
+  public AddTopicToBlacklistRepositoryCommand(String qualifiedTopicName) {
+    this.qualifiedTopicName = qualifiedTopicName;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {}
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {
+    holder.getRepository().add(qualifiedTopicName);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder, Exception exception) {
+    holder.getRepository().remove(qualifiedTopicName);
+  }
+
+  @Override
+  public Class<TopicBlacklistRepository> getRepositoryType() {
+    return TopicBlacklistRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "AddTopicToBlacklist(" + qualifiedTopicName + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/commands/RemoveTopicFromBlacklistRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/commands/RemoveTopicFromBlacklistRepositoryCommand.java
index 8515befcc1..a69ec307fe 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/commands/RemoveTopicFromBlacklistRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/blacklist/commands/RemoveTopicFromBlacklistRepositoryCommand.java
@@ -4,38 +4,40 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class RemoveTopicFromBlacklistRepositoryCommand extends RepositoryCommand<TopicBlacklistRepository> {
-    private final String qualifiedTopicName;
-    private boolean exists = false;
-
-    public RemoveTopicFromBlacklistRepositoryCommand(String qualifiedTopicName) {
-        this.qualifiedTopicName = qualifiedTopicName;
+public class RemoveTopicFromBlacklistRepositoryCommand
+    extends RepositoryCommand<TopicBlacklistRepository> {
+  private final String qualifiedTopicName;
+  private boolean exists = false;
+
+  public RemoveTopicFromBlacklistRepositoryCommand(String qualifiedTopicName) {
+    this.qualifiedTopicName = qualifiedTopicName;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {
+    exists = holder.getRepository().isBlacklisted(qualifiedTopicName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {
+    holder.getRepository().remove(qualifiedTopicName);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder, Exception exception) {
+    if (exists) {
+      holder.getRepository().add(qualifiedTopicName);
     }
+  }
 
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {
-        exists = holder.getRepository().isBlacklisted(qualifiedTopicName);
-    }
+  @Override
+  public Class<TopicBlacklistRepository> getRepositoryType() {
+    return TopicBlacklistRepository.class;
+  }
 
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {
-        holder.getRepository().remove(qualifiedTopicName);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<TopicBlacklistRepository> holder) {
-        if (exists) {
-            holder.getRepository().add(qualifiedTopicName);
-        }
-    }
-
-    @Override
-    public Class<TopicBlacklistRepository> getRepositoryType() {
-        return TopicBlacklistRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "RemoveTopicFromBlacklist(" + qualifiedTopicName + ")";
-    }
+  @Override
+  public String toString() {
+    return "RemoveTopicFromBlacklist(" + qualifiedTopicName + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/AllTopicClientsService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/AllTopicClientsService.java
index 1930721a3f..beefbc050f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/AllTopicClientsService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/AllTopicClientsService.java
@@ -1,10 +1,9 @@
 package pl.allegro.tech.hermes.management.domain.clients;
 
-import pl.allegro.tech.hermes.api.TopicName;
-
 import java.util.List;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public interface AllTopicClientsService {
 
-    List<String> getAllClientsByTopic(TopicName topicName);
+  List<String> getAllClientsByTopic(TopicName topicName);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/DefaultAllTopicClientsService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/DefaultAllTopicClientsService.java
index 40a137a1ca..0cc6a08490 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/DefaultAllTopicClientsService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/DefaultAllTopicClientsService.java
@@ -1,22 +1,23 @@
 package pl.allegro.tech.hermes.management.domain.clients;
 
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
-
 import java.util.List;
 import java.util.stream.Collectors;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 
 public class DefaultAllTopicClientsService implements AllTopicClientsService {
 
-    private final SubscriptionRepository subscriptionRepository;
+  private final SubscriptionRepository subscriptionRepository;
 
-    public DefaultAllTopicClientsService(SubscriptionRepository subscriptionRepository) {
-        this.subscriptionRepository = subscriptionRepository;
-    }
+  public DefaultAllTopicClientsService(SubscriptionRepository subscriptionRepository) {
+    this.subscriptionRepository = subscriptionRepository;
+  }
 
-    @Override
-    public List<String> getAllClientsByTopic(TopicName topicName) {
-        return subscriptionRepository.listSubscriptions(topicName)
-                .stream().map(subscription -> subscription.getOwner().getId()).distinct().collect(Collectors.toList());
-    }
+  @Override
+  public List<String> getAllClientsByTopic(TopicName topicName) {
+    return subscriptionRepository.listSubscriptions(topicName).stream()
+        .map(subscription -> subscription.getOwner().getId())
+        .distinct()
+        .collect(Collectors.toList());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/IframeSource.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/IframeSource.java
index 96e83c6ae5..e611e4228a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/IframeSource.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/IframeSource.java
@@ -2,36 +2,35 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 public final class IframeSource {
 
-    private final String source;
+  private final String source;
 
-    @JsonCreator
-    public IframeSource(@JsonProperty("source") String source) {
-        this.source = source;
-    }
+  @JsonCreator
+  public IframeSource(@JsonProperty("source") String source) {
+    this.source = source;
+  }
 
-    public String getSource() {
-        return source;
-    }
+  public String getSource() {
+    return source;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        IframeSource that = (IframeSource) o;
-        return Objects.equals(source, that.source);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(source);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    IframeSource that = (IframeSource) o;
+    return Objects.equals(source, that.source);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(source);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/OfflineClientsService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/OfflineClientsService.java
index 4be43c29e7..a5f5225a50 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/OfflineClientsService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/clients/OfflineClientsService.java
@@ -3,5 +3,5 @@
 import pl.allegro.tech.hermes.api.TopicName;
 
 public interface OfflineClientsService {
-    String getIframeSource(TopicName topic);
+  String getIframeSource(TopicName topic);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/ConsistencyCheckingException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/ConsistencyCheckingException.java
index 279c2fd1e4..a25508af61 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/ConsistencyCheckingException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/ConsistencyCheckingException.java
@@ -2,7 +2,7 @@
 
 public class ConsistencyCheckingException extends RuntimeException {
 
-    ConsistencyCheckingException(String message, Throwable th) {
-        super(message, th);
-    }
+  ConsistencyCheckingException(String message, Throwable th) {
+    super(message, th);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyService.java
index 2b23998d36..3f193cf672 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyService.java
@@ -1,9 +1,31 @@
 package pl.allegro.tech.hermes.management.domain.consistency;
 
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import jakarta.annotation.PreDestroy;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.Group;
 import pl.allegro.tech.hermes.api.InconsistentGroup;
@@ -11,10 +33,13 @@
 import pl.allegro.tech.hermes.api.InconsistentSubscription;
 import pl.allegro.tech.hermes.api.InconsistentTopic;
 import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.domain.group.GroupNotExistsException;
 import pl.allegro.tech.hermes.domain.group.GroupRepository;
+import pl.allegro.tech.hermes.domain.subscription.SubscriptionNotExistsException;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 import pl.allegro.tech.hermes.domain.topic.TopicNotExistsException;
 import pl.allegro.tech.hermes.domain.topic.TopicRepository;
@@ -22,190 +47,318 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryManager;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.function.Function;
-
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
-
 @Component
 public class DcConsistencyService {
-    private final ExecutorService executor;
-    private final List<DatacenterBoundRepositoryHolder<GroupRepository>> groupRepositories;
-    private final List<DatacenterBoundRepositoryHolder<TopicRepository>> topicRepositories;
-    private final List<DatacenterBoundRepositoryHolder<SubscriptionRepository>> subscriptionRepositories;
-    private final ObjectMapper objectMapper;
-
-    public DcConsistencyService(RepositoryManager repositoryManager,
-                                ObjectMapper objectMapper,
-                                ConsistencyCheckerProperties properties) {
-        this.groupRepositories = repositoryManager.getRepositories(GroupRepository.class);
-        this.topicRepositories = repositoryManager.getRepositories(TopicRepository.class);
-        this.subscriptionRepositories = repositoryManager.getRepositories(SubscriptionRepository.class);
-        this.objectMapper = objectMapper;
-        this.executor = Executors.newFixedThreadPool(
-                properties.getThreadPoolSize(),
-                new ThreadFactoryBuilder()
-                        .setNameFormat("consistency-checker-%d")
-                        .build()
-        );
-    }
-
-    @PreDestroy
-    public void stop() {
-        executor.shutdown();
-    }
-
-    public List<InconsistentGroup> listInconsistentGroups(Set<String> groupNames) {
-        List<InconsistentGroup> inconsistentGroups = new ArrayList<>();
-        for (MetadataCopies copies : listCopiesOfGroups(groupNames)) {
-            List<InconsistentMetadata> inconsistentMetadata = findInconsistentMetadata(copies);
-            List<InconsistentTopic> inconsistentTopics = listInconsistentTopics(copies.getId());
-            if (!inconsistentMetadata.isEmpty() || !inconsistentTopics.isEmpty()) {
-                inconsistentGroups.add(new InconsistentGroup(copies.getId(), inconsistentMetadata, inconsistentTopics));
-            }
-        }
-        return inconsistentGroups;
-    }
-
-    private List<MetadataCopies> listCopiesOfGroups(Set<String> groupNames) {
-        Map<String, Future<List<Group>>> futuresPerDatacenter = new HashMap<>();
-        for (DatacenterBoundRepositoryHolder<GroupRepository> repositoryHolder : groupRepositories) {
-            Future<List<Group>> future = executor.submit(() -> listGroups(repositoryHolder.getRepository(), groupNames));
-            futuresPerDatacenter.put(repositoryHolder.getDatacenterName(), future);
-        }
-        return listCopies(futuresPerDatacenter, Group::getGroupName);
-    }
-
-    private List<Group> listGroups(GroupRepository repository, Set<String> groupNames) {
-        List<Group> groups = new ArrayList<>();
-        for (String groupName : groupNames) {
-            try {
-                Group group = repository.getGroupDetails(groupName);
-                groups.add(group);
-            } catch (GroupNotExistsException e) {
-                // ignore
-            }
-        }
-        return groups;
-    }
-
-    private List<InconsistentTopic> listInconsistentTopics(String group) {
-        List<InconsistentTopic> inconsistentTopics = new ArrayList<>();
-        for (MetadataCopies copies : listCopiesOfTopicsFromGroup(group)) {
-            List<InconsistentMetadata> inconsistentMetadata = findInconsistentMetadata(copies);
-            List<InconsistentSubscription> inconsistentSubscriptions = listInconsistentSubscriptions(copies.getId());
-            if (!inconsistentMetadata.isEmpty() || !inconsistentSubscriptions.isEmpty()) {
-                inconsistentTopics.add(new InconsistentTopic(copies.getId(), inconsistentMetadata, inconsistentSubscriptions));
-            }
-        }
-        return inconsistentTopics;
-    }
-
-    private List<MetadataCopies> listCopiesOfTopicsFromGroup(String group) {
-        Map<String, Future<List<Topic>>> futuresPerDatacenter = new HashMap<>();
-        for (DatacenterBoundRepositoryHolder<TopicRepository> repositoryHolder : topicRepositories) {
-            Future<List<Topic>> future = executor.submit(() -> listTopics(repositoryHolder.getRepository(), group));
-            futuresPerDatacenter.put(repositoryHolder.getDatacenterName(), future);
-        }
-        return listCopies(futuresPerDatacenter, Topic::getQualifiedName);
-    }
-
-    private List<Topic> listTopics(TopicRepository topicRepository, String group) {
-        try {
-            return topicRepository.listTopics(group);
-        } catch (GroupNotExistsException e) {
-            return emptyList();
-        }
-    }
-
-    private List<InconsistentSubscription> listInconsistentSubscriptions(String topic) {
-        return listCopiesOfSubscriptionsFromTopic(topic).stream()
-                .filter(copies -> !copies.areAllEqual())
-                .map(copies -> new InconsistentSubscription(copies.getId(), findInconsistentMetadata(copies)))
-                .collect(toList());
-    }
-
-    private List<MetadataCopies> listCopiesOfSubscriptionsFromTopic(String topic) {
-        Map<String, Future<List<Subscription>>> futuresPerDatacenter = new HashMap<>();
-        for (DatacenterBoundRepositoryHolder<SubscriptionRepository> repositoryHolder : subscriptionRepositories) {
-            Future<List<Subscription>> future = executor.submit(
-                    () -> listSubscriptions(repositoryHolder.getRepository(), topic)
-            );
-            futuresPerDatacenter.put(repositoryHolder.getDatacenterName(), future);
-        }
-        return listCopies(futuresPerDatacenter, subscription -> subscription.getQualifiedName().getQualifiedName());
-    }
-
-    private List<Subscription> listSubscriptions(SubscriptionRepository subscriptionRepository, String topic) {
-        try {
-            return subscriptionRepository.listSubscriptions(TopicName.fromQualifiedName(topic));
-        } catch (TopicNotExistsException e) {
-            return emptyList();
-        }
-    }
-
-    private <T> List<MetadataCopies> listCopies(Map<String, Future<List<T>>> futuresPerDatacenter, Function<T, String> idResolver) {
-        Map<String, MetadataCopies> copiesPerId = new HashMap<>();
-        Set<String> datacenters = futuresPerDatacenter.keySet();
-        for (Map.Entry<String, Future<List<T>>> entry : futuresPerDatacenter.entrySet()) {
-            List<T> entities = resolveFuture(entry.getValue());
-            String datacenter = entry.getKey();
-            for (T entity : entities) {
-                String id = idResolver.apply(entity);
-                MetadataCopies copies = copiesPerId.getOrDefault(id, new MetadataCopies(id, datacenters));
-                copies.put(datacenter, entity);
-                copiesPerId.put(id, copies);
-            }
-        }
-        return new ArrayList<>(copiesPerId.values());
-    }
-
-    private List<InconsistentMetadata> findInconsistentMetadata(MetadataCopies copies) {
-        if (copies.areAllEqual()) {
-            return emptyList();
-        }
-        return copies.getCopyPerDatacenter().entrySet().stream()
-                .map(entry -> mapToInconsistentMetadata(entry.getKey(), entry.getValue()))
-                .collect(toList());
-    }
-
-    private InconsistentMetadata mapToInconsistentMetadata(String id, Object content) {
-        try {
-            if (content == null) {
-                return new InconsistentMetadata(id, null);
-            }
-            return new InconsistentMetadata(id, objectMapper.writeValueAsString(content));
-        } catch (JsonProcessingException e) {
-            throw new ConsistencyCheckingException("Metadata serialization failed", e);
-        }
-    }
-
-    public Set<String> listAllGroupNames() {
-        List<Future<List<String>>> results = new ArrayList<>();
-        for (DatacenterBoundRepositoryHolder<GroupRepository> repositoryHolder : groupRepositories) {
-            Future<List<String>> submit = executor.submit(() -> repositoryHolder.getRepository().listGroupNames());
-            results.add(submit);
-        }
-        return results.stream().map(this::resolveFuture)
-                .flatMap(Collection::stream)
-                .collect(toSet());
-    }
-
-    private <T> T resolveFuture(Future<T> future) {
-        try {
-            return future.get();
-        } catch (Exception e) {
-            throw new ConsistencyCheckingException("Fetching metadata failed", e);
-        }
+  private static final Logger logger = LoggerFactory.getLogger(DcConsistencyService.class);
+
+  private final ExecutorService executor;
+  private final ScheduledExecutorService scheduler;
+  private final List<DatacenterBoundRepositoryHolder<GroupRepository>> groupRepositories;
+  private final List<DatacenterBoundRepositoryHolder<TopicRepository>> topicRepositories;
+  private final List<DatacenterBoundRepositoryHolder<SubscriptionRepository>>
+      subscriptionRepositories;
+  private final ObjectMapper objectMapper;
+  private final AtomicBoolean isStorageConsistent = new AtomicBoolean(true);
+
+  public DcConsistencyService(
+      RepositoryManager repositoryManager,
+      ObjectMapper objectMapper,
+      ConsistencyCheckerProperties properties,
+      MetricsFacade metricsFacade) {
+    this.groupRepositories = repositoryManager.getRepositories(GroupRepository.class);
+    this.topicRepositories = repositoryManager.getRepositories(TopicRepository.class);
+    this.subscriptionRepositories = repositoryManager.getRepositories(SubscriptionRepository.class);
+    this.objectMapper = objectMapper;
+    this.executor =
+        Executors.newFixedThreadPool(
+            properties.getThreadPoolSize(),
+            new ThreadFactoryBuilder().setNameFormat("consistency-checker-%d").build());
+    this.scheduler =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactoryBuilder().setNameFormat("consistency-checker-scheduler-%d").build());
+    if (properties.isPeriodicCheckEnabled()) {
+      scheduler.scheduleAtFixedRate(
+          this::reportConsistency,
+          properties.getInitialRefreshDelay().getSeconds(),
+          properties.getRefreshInterval().getSeconds(),
+          TimeUnit.SECONDS);
+      metricsFacade
+          .consistency()
+          .registerStorageConsistencyGauge(
+              isStorageConsistent, isConsistent -> isConsistent.get() ? 1 : 0);
+    }
+  }
+
+  @PreDestroy
+  public void stop() {
+    executor.shutdown();
+    scheduler.shutdown();
+  }
+
+  private void reportConsistency() {
+    long start = System.currentTimeMillis();
+    Set<String> groups = listAllGroupNames();
+    List<InconsistentGroup> inconsistentGroups = listInconsistentGroups(groups);
+    long durationSeconds = (System.currentTimeMillis() - start) / 1000;
+    logger.info(
+        "Consistency check finished in {}s, number of inconsistent groups: {}",
+        durationSeconds,
+        inconsistentGroups.size());
+    isStorageConsistent.set(inconsistentGroups.isEmpty());
+  }
+
+  public List<InconsistentGroup> listInconsistentGroups(Set<String> groupNames) {
+    List<InconsistentGroup> inconsistentGroups = new ArrayList<>();
+    for (MetadataCopies copies : listCopiesOfGroups(groupNames)) {
+      List<InconsistentMetadata> inconsistentMetadata = findInconsistentMetadata(copies);
+      List<InconsistentTopic> inconsistentTopics = listInconsistentTopics(copies.getId());
+      if (!inconsistentMetadata.isEmpty() || !inconsistentTopics.isEmpty()) {
+        inconsistentGroups.add(
+            new InconsistentGroup(copies.getId(), inconsistentMetadata, inconsistentTopics));
+      }
+    }
+    return inconsistentGroups;
+  }
+
+  public void syncGroup(String groupName, String primaryDatacenter) {
+    sync(
+        groupRepositories,
+        primaryDatacenter,
+        repo -> repo.groupExists(groupName),
+        repo -> {
+          try {
+            return Optional.of(repo.getGroupDetails(groupName));
+          } catch (GroupNotExistsException ignored) {
+            return Optional.empty();
+          }
+        },
+        GroupRepository::createGroup,
+        GroupRepository::updateGroup,
+        repo -> repo.removeGroup(groupName));
+  }
+
+  public void syncTopic(TopicName topicName, String primaryDatacenter) {
+    sync(
+        topicRepositories,
+        primaryDatacenter,
+        repo -> repo.topicExists(topicName),
+        repo -> {
+          try {
+            return Optional.of(repo.getTopicDetails(topicName));
+          } catch (TopicNotExistsException ignored) {
+            return Optional.empty();
+          }
+        },
+        TopicRepository::createTopic,
+        TopicRepository::updateTopic,
+        repo -> repo.removeTopic(topicName));
+  }
+
+  public void syncSubscription(SubscriptionName subscriptionName, String primaryDatacenter) {
+    sync(
+        subscriptionRepositories,
+        primaryDatacenter,
+        repo ->
+            repo.subscriptionExists(subscriptionName.getTopicName(), subscriptionName.getName()),
+        repo -> {
+          try {
+            return Optional.of(repo.getSubscriptionDetails(subscriptionName));
+          } catch (SubscriptionNotExistsException ignored) {
+            return Optional.empty();
+          }
+        },
+        SubscriptionRepository::createSubscription,
+        SubscriptionRepository::updateSubscription,
+        repo ->
+            repo.removeSubscription(subscriptionName.getTopicName(), subscriptionName.getName()));
+  }
+
+  private <R, S> void sync(
+      List<DatacenterBoundRepositoryHolder<R>> repositories,
+      String sourceOfTruthDatacenter,
+      Function<R, Boolean> exists,
+      Function<R, Optional<S>> get,
+      BiConsumer<R, S> create,
+      BiConsumer<R, S> update,
+      Consumer<R> delete) {
+    var request = partition(repositories, sourceOfTruthDatacenter);
+    var primaryRepository = request.primaryHolder.getRepository();
+    Optional<S> primary = get.apply(primaryRepository);
+    var primaryPresent = primary.isPresent();
+
+    for (var holder : request.replicaHolders) {
+      var repository = holder.getRepository();
+      var replicaPresent = exists.apply(repository);
+
+      if (primaryPresent && replicaPresent) {
+        update.accept(repository, primary.get());
+      } else if (primaryPresent) {
+        create.accept(repository, primary.get());
+      } else if (replicaPresent) {
+        delete.accept(repository);
+      }
+    }
+  }
+
+  private List<MetadataCopies> listCopiesOfGroups(Set<String> groupNames) {
+    Map<String, Future<List<Group>>> futuresPerDatacenter = new HashMap<>();
+    for (DatacenterBoundRepositoryHolder<GroupRepository> repositoryHolder : groupRepositories) {
+      Future<List<Group>> future =
+          executor.submit(() -> listGroups(repositoryHolder.getRepository(), groupNames));
+      futuresPerDatacenter.put(repositoryHolder.getDatacenterName(), future);
+    }
+    return listCopies(futuresPerDatacenter, Group::getGroupName);
+  }
+
+  private List<Group> listGroups(GroupRepository repository, Set<String> groupNames) {
+    List<Group> groups = new ArrayList<>();
+    for (String groupName : groupNames) {
+      try {
+        Group group = repository.getGroupDetails(groupName);
+        groups.add(group);
+      } catch (GroupNotExistsException e) {
+        // ignore
+      }
+    }
+    return groups;
+  }
+
+  private List<InconsistentTopic> listInconsistentTopics(String group) {
+    List<InconsistentTopic> inconsistentTopics = new ArrayList<>();
+    for (MetadataCopies copies : listCopiesOfTopicsFromGroup(group)) {
+      List<InconsistentMetadata> inconsistentMetadata = findInconsistentMetadata(copies);
+      List<InconsistentSubscription> inconsistentSubscriptions =
+          listInconsistentSubscriptions(copies.getId());
+      if (!inconsistentMetadata.isEmpty() || !inconsistentSubscriptions.isEmpty()) {
+        inconsistentTopics.add(
+            new InconsistentTopic(copies.getId(), inconsistentMetadata, inconsistentSubscriptions));
+      }
+    }
+    return inconsistentTopics;
+  }
+
+  private List<MetadataCopies> listCopiesOfTopicsFromGroup(String group) {
+    Map<String, Future<List<Topic>>> futuresPerDatacenter = new HashMap<>();
+    for (DatacenterBoundRepositoryHolder<TopicRepository> repositoryHolder : topicRepositories) {
+      Future<List<Topic>> future =
+          executor.submit(() -> listTopics(repositoryHolder.getRepository(), group));
+      futuresPerDatacenter.put(repositoryHolder.getDatacenterName(), future);
+    }
+    return listCopies(futuresPerDatacenter, Topic::getQualifiedName);
+  }
+
+  private List<Topic> listTopics(TopicRepository topicRepository, String group) {
+    try {
+      return topicRepository.listTopics(group);
+    } catch (GroupNotExistsException e) {
+      return emptyList();
+    }
+  }
+
+  private List<InconsistentSubscription> listInconsistentSubscriptions(String topic) {
+    return listCopiesOfSubscriptionsFromTopic(topic).stream()
+        .filter(copies -> !copies.areAllEqual())
+        .map(
+            copies ->
+                new InconsistentSubscription(copies.getId(), findInconsistentMetadata(copies)))
+        .collect(toList());
+  }
+
+  private List<MetadataCopies> listCopiesOfSubscriptionsFromTopic(String topic) {
+    Map<String, Future<List<Subscription>>> futuresPerDatacenter = new HashMap<>();
+    for (DatacenterBoundRepositoryHolder<SubscriptionRepository> repositoryHolder :
+        subscriptionRepositories) {
+      Future<List<Subscription>> future =
+          executor.submit(() -> listSubscriptions(repositoryHolder.getRepository(), topic));
+      futuresPerDatacenter.put(repositoryHolder.getDatacenterName(), future);
+    }
+    return listCopies(
+        futuresPerDatacenter, subscription -> subscription.getQualifiedName().getQualifiedName());
+  }
+
+  private List<Subscription> listSubscriptions(
+      SubscriptionRepository subscriptionRepository, String topic) {
+    try {
+      return subscriptionRepository.listSubscriptions(TopicName.fromQualifiedName(topic));
+    } catch (TopicNotExistsException e) {
+      return emptyList();
+    }
+  }
+
+  private <T> List<MetadataCopies> listCopies(
+      Map<String, Future<List<T>>> futuresPerDatacenter, Function<T, String> idResolver) {
+    Map<String, MetadataCopies> copiesPerId = new HashMap<>();
+    Set<String> datacenters = futuresPerDatacenter.keySet();
+    for (Map.Entry<String, Future<List<T>>> entry : futuresPerDatacenter.entrySet()) {
+      List<T> entities = resolveFuture(entry.getValue());
+      String datacenter = entry.getKey();
+      for (T entity : entities) {
+        String id = idResolver.apply(entity);
+        MetadataCopies copies = copiesPerId.getOrDefault(id, new MetadataCopies(id, datacenters));
+        copies.put(datacenter, entity);
+        copiesPerId.put(id, copies);
+      }
+    }
+    return new ArrayList<>(copiesPerId.values());
+  }
+
+  private List<InconsistentMetadata> findInconsistentMetadata(MetadataCopies copies) {
+    if (copies.areAllEqual()) {
+      return emptyList();
+    }
+    return copies.getCopyPerDatacenter().entrySet().stream()
+        .map(entry -> mapToInconsistentMetadata(entry.getKey(), entry.getValue()))
+        .collect(toList());
+  }
+
+  private InconsistentMetadata mapToInconsistentMetadata(String id, Object content) {
+    try {
+      if (content == null) {
+        return new InconsistentMetadata(id, null);
+      }
+      return new InconsistentMetadata(id, objectMapper.writeValueAsString(content));
+    } catch (JsonProcessingException e) {
+      throw new ConsistencyCheckingException("Metadata serialization failed", e);
+    }
+  }
+
+  public Set<String> listAllGroupNames() {
+    List<Future<List<String>>> results = new ArrayList<>();
+    for (DatacenterBoundRepositoryHolder<GroupRepository> repositoryHolder : groupRepositories) {
+      Future<List<String>> submit =
+          executor.submit(() -> repositoryHolder.getRepository().listGroupNames());
+      results.add(submit);
+    }
+    return results.stream().map(this::resolveFuture).flatMap(Collection::stream).collect(toSet());
+  }
+
+  private <T> T resolveFuture(Future<T> future) {
+    try {
+      return future.get();
+    } catch (Exception e) {
+      throw new ConsistencyCheckingException("Fetching metadata failed", e);
+    }
+  }
+
+  private record DatacenterRepositoryHolderSyncRequest<R>(
+      DatacenterBoundRepositoryHolder<R> primaryHolder,
+      List<DatacenterBoundRepositoryHolder<R>> replicaHolders) {}
+
+  private <R> DatacenterRepositoryHolderSyncRequest<R> partition(
+      List<DatacenterBoundRepositoryHolder<R>> repositoryHolders, String primaryDatacenter) {
+    List<DatacenterBoundRepositoryHolder<R>> replicas = new ArrayList<>();
+    DatacenterBoundRepositoryHolder<R> primary = null;
+    for (DatacenterBoundRepositoryHolder<R> repositoryHolder : repositoryHolders) {
+      if (repositoryHolder.getDatacenterName().equals(primaryDatacenter)) {
+        primary = repositoryHolder;
+      } else {
+        replicas.add(repositoryHolder);
+      }
+    }
+    if (primary == null) {
+      throw new SynchronizationException(
+          "Source of truth datacenter not found: " + primaryDatacenter);
     }
+    return new DatacenterRepositoryHolderSyncRequest<>(primary, replicas);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/KafkaHermesConsistencyService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/KafkaHermesConsistencyService.java
index 171de26179..cf6310554f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/KafkaHermesConsistencyService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/KafkaHermesConsistencyService.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.management.domain.consistency;
 
+import static java.util.Arrays.asList;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -8,54 +13,56 @@
 import pl.allegro.tech.hermes.management.domain.topic.TopicService;
 import pl.allegro.tech.hermes.management.infrastructure.kafka.MultiDCAwareService;
 
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static java.util.Arrays.asList;
-
 @Component
 public class KafkaHermesConsistencyService {
 
-    private static final Logger logger = LoggerFactory.getLogger(KafkaHermesConsistencyService.class);
-
-    private static final String AVRO_SUFFIX = "_avro";
-    private static final List<String> IGNORED_TOPIC = asList("__consumer_offsets");
-    private final TopicService topicService;
-    private final MultiDCAwareService multiDCAwareService;
-    private final KafkaClustersProperties kafkaClustersProperties;
-
-    public KafkaHermesConsistencyService(
-        TopicService topicService,
-        MultiDCAwareService multiDCAwareService,
-        KafkaClustersProperties kafkaClustersProperties) {
-        this.topicService = topicService;
-        this.kafkaClustersProperties = kafkaClustersProperties;
-        this.multiDCAwareService = multiDCAwareService;
-    }
-
-    public Set<String> listInconsistentTopics() {
-        List<String> topicsFromHermes = topicService.listQualifiedTopicNames();
-
-        return multiDCAwareService.listTopicFromAllDC()
-            .stream()
-            .filter(topic -> !IGNORED_TOPIC.contains(topic) && !topicsFromHermes
-                .contains(mapToHermesFormat(topic)))
-            .collect(Collectors.toSet());
-    }
-
-    public void removeTopic(String topicName, RequestUser requestUser) {
-        logger.info("Removing topic {} only on brokers. Requested by {}", topicName, requestUser.getUsername());
-        multiDCAwareService.removeTopicByName(topicName);
-        logger.info("Successfully removed topic {} on brokers. Requested by {}", topicName, requestUser.getUsername());
-    }
-
-    private String mapToHermesFormat(String topic) {
-        String prefix = kafkaClustersProperties.getDefaultNamespace() + kafkaClustersProperties.getNamespaceSeparator();
-
-        int beginIndex = topic.startsWith(prefix) ? prefix.length() : 0;
-        int endIndex = topic.endsWith(AVRO_SUFFIX) ? topic.length() - AVRO_SUFFIX.length() : topic.length();
-
-        return topic.substring(beginIndex, endIndex);
-    }
+  private static final Logger logger = LoggerFactory.getLogger(KafkaHermesConsistencyService.class);
+
+  private static final String AVRO_SUFFIX = "_avro";
+  private static final List<String> IGNORED_TOPIC = asList("__consumer_offsets");
+  private final TopicService topicService;
+  private final MultiDCAwareService multiDCAwareService;
+  private final KafkaClustersProperties kafkaClustersProperties;
+
+  public KafkaHermesConsistencyService(
+      TopicService topicService,
+      MultiDCAwareService multiDCAwareService,
+      KafkaClustersProperties kafkaClustersProperties) {
+    this.topicService = topicService;
+    this.kafkaClustersProperties = kafkaClustersProperties;
+    this.multiDCAwareService = multiDCAwareService;
+  }
+
+  public Set<String> listInconsistentTopics() {
+    List<String> topicsFromHermes = topicService.listQualifiedTopicNames();
+
+    return multiDCAwareService.listTopicFromAllDC().stream()
+        .filter(
+            topic ->
+                !IGNORED_TOPIC.contains(topic)
+                    && !topicsFromHermes.contains(mapToHermesFormat(topic)))
+        .collect(Collectors.toSet());
+  }
+
+  public void removeTopic(String topicName, RequestUser requestUser) {
+    logger.info(
+        "Removing topic {} only on brokers. Requested by {}", topicName, requestUser.getUsername());
+    multiDCAwareService.removeTopicByName(topicName);
+    logger.info(
+        "Successfully removed topic {} on brokers. Requested by {}",
+        topicName,
+        requestUser.getUsername());
+  }
+
+  private String mapToHermesFormat(String topic) {
+    String prefix =
+        kafkaClustersProperties.getDefaultNamespace()
+            + kafkaClustersProperties.getNamespaceSeparator();
+
+    int beginIndex = topic.startsWith(prefix) ? prefix.length() : 0;
+    int endIndex =
+        topic.endsWith(AVRO_SUFFIX) ? topic.length() - AVRO_SUFFIX.length() : topic.length();
+
+    return topic.substring(beginIndex, endIndex);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/MetadataCopies.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/MetadataCopies.java
index 991e10a111..1270fa4008 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/MetadataCopies.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/MetadataCopies.java
@@ -5,30 +5,30 @@
 import java.util.Set;
 
 class MetadataCopies {
-    private final String id;
-    private final Map<String, Object> copyPerDatacenter = new HashMap<>();
+  private final String id;
+  private final Map<String, Object> copyPerDatacenter = new HashMap<>();
 
-    MetadataCopies(String id, Set<String> datacenters) {
-        this.id = id;
-        datacenters.forEach(dc -> copyPerDatacenter.put(dc, null));
-    }
+  MetadataCopies(String id, Set<String> datacenters) {
+    this.id = id;
+    datacenters.forEach(dc -> copyPerDatacenter.put(dc, null));
+  }
 
-    void put(String datacenter, Object value) {
-        if (!copyPerDatacenter.containsKey(datacenter)) {
-            throw new IllegalArgumentException("Invalid datacenter: " + datacenter);
-        }
-        copyPerDatacenter.put(datacenter, value);
+  void put(String datacenter, Object value) {
+    if (!copyPerDatacenter.containsKey(datacenter)) {
+      throw new IllegalArgumentException("Invalid datacenter: " + datacenter);
     }
+    copyPerDatacenter.put(datacenter, value);
+  }
 
-    boolean areAllEqual() {
-        return copyPerDatacenter.values().stream().distinct().count() == 1;
-    }
+  boolean areAllEqual() {
+    return copyPerDatacenter.values().stream().distinct().count() == 1;
+  }
 
-    String getId() {
-        return id;
-    }
+  String getId() {
+    return id;
+  }
 
-    Map<String, Object> getCopyPerDatacenter() {
-        return copyPerDatacenter;
-    }
+  Map<String, Object> getCopyPerDatacenter() {
+    return copyPerDatacenter;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/SynchronizationException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/SynchronizationException.java
new file mode 100644
index 0000000000..53a5f52d8e
--- /dev/null
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/SynchronizationException.java
@@ -0,0 +1,7 @@
+package pl.allegro.tech.hermes.management.domain.consistency;
+
+public class SynchronizationException extends RuntimeException {
+  public SynchronizationException(String message) {
+    super(message);
+  }
+}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/console/ConsoleConfigurationRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/console/ConsoleConfigurationRepository.java
index 4c9e54430c..bc4b544162 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/console/ConsoleConfigurationRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/console/ConsoleConfigurationRepository.java
@@ -2,5 +2,5 @@
 
 public interface ConsoleConfigurationRepository {
 
-    String getConfiguration();
+  String getConfiguration();
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/console/ConsoleService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/console/ConsoleService.java
index f715d3c0b4..60411abb1d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/console/ConsoleService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/console/ConsoleService.java
@@ -5,17 +5,17 @@
 @Service
 public class ConsoleService {
 
-    private ConsoleConfigurationRepository repository;
+  private ConsoleConfigurationRepository repository;
 
-    public ConsoleService(ConsoleConfigurationRepository repository) {
-        this.repository = repository;
-    }
+  public ConsoleService(ConsoleConfigurationRepository repository) {
+    this.repository = repository;
+  }
 
-    public String getConfiguration() {
-        return "var config = " + repository.getConfiguration();
-    }
+  public String getConfiguration() {
+    return "var config = " + repository.getConfiguration();
+  }
 
-    public String getConfigurationJson() {
-        return repository.getConfiguration();
-    }
+  public String getConfigurationJson() {
+    return repository.getConfiguration();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/credentials/CredentialsService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/credentials/CredentialsService.java
index 2584bd379b..ed179e9219 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/credentials/CredentialsService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/credentials/CredentialsService.java
@@ -13,26 +13,28 @@
 @Component
 public class CredentialsService {
 
-    private static final Logger logger = LoggerFactory.getLogger(CredentialsService.class);
+  private static final Logger logger = LoggerFactory.getLogger(CredentialsService.class);
 
-    private final ZookeeperPaths paths;
-    private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
-    private final CredentialsRepository credentialsRepository;
+  private final ZookeeperPaths paths;
+  private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+  private final CredentialsRepository credentialsRepository;
 
-    @Autowired
-    public CredentialsService(ZookeeperPaths paths,
-                              MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
-                              CredentialsRepository credentialsRepository) {
-        this.paths = paths;
-        this.multiDcExecutor = multiDcExecutor;
-        this.credentialsRepository = credentialsRepository;
-    }
+  @Autowired
+  public CredentialsService(
+      ZookeeperPaths paths,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
+      CredentialsRepository credentialsRepository) {
+    this.paths = paths;
+    this.multiDcExecutor = multiDcExecutor;
+    this.credentialsRepository = credentialsRepository;
+  }
 
-    public NodePassword readAdminPassword() {
-        return credentialsRepository.readAdminPassword();
-    }
+  public NodePassword readAdminPassword() {
+    return credentialsRepository.readAdminPassword();
+  }
 
-    public void overwriteAdminPassword(String password) {
-        multiDcExecutor.execute(new UpdateCredentialsRepositoryCommand(credentialsRepository, password));
-    }
+  public void overwriteAdminPassword(String password) {
+    multiDcExecutor.execute(
+        new UpdateCredentialsRepositoryCommand(credentialsRepository, password));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/credentials/commands/UpdateCredentialsRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/credentials/commands/UpdateCredentialsRepositoryCommand.java
index 44ea88c3c6..a432c8fd79 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/credentials/commands/UpdateCredentialsRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/credentials/commands/UpdateCredentialsRepositoryCommand.java
@@ -6,29 +6,28 @@
 
 public class UpdateCredentialsRepositoryCommand extends RepositoryCommand<CredentialsRepository> {
 
-    private final CredentialsRepository repository;
-    private final String password;
-
-    public UpdateCredentialsRepositoryCommand(CredentialsRepository repository, String password) {
-        this.repository = repository;
-        this.password = password;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<CredentialsRepository> holder) {
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<CredentialsRepository> holder) {
-        repository.overwriteAdminPassword(password);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<CredentialsRepository> holder) {
-    }
-
-    @Override
-    public Class<CredentialsRepository> getRepositoryType() {
-        return CredentialsRepository.class;
-    }
+  private final CredentialsRepository repository;
+  private final String password;
+
+  public UpdateCredentialsRepositoryCommand(CredentialsRepository repository, String password) {
+    this.repository = repository;
+    this.password = password;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<CredentialsRepository> holder) {}
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<CredentialsRepository> holder) {
+    repository.overwriteAdminPassword(password);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<CredentialsRepository> holder, Exception exception) {}
+
+  @Override
+  public Class<CredentialsRepository> getRepositoryType() {
+    return CredentialsRepository.class;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/DatacenterBoundQueryResult.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/DatacenterBoundQueryResult.java
index 3de8d6ce46..90bcb23f0c 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/DatacenterBoundQueryResult.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/DatacenterBoundQueryResult.java
@@ -1,20 +1,19 @@
 package pl.allegro.tech.hermes.management.domain.dc;
 
 public class DatacenterBoundQueryResult<T> {
-    private final String datacenterName;
-    private final T result;
+  private final String datacenterName;
+  private final T result;
 
-    public DatacenterBoundQueryResult(T result, String datacenterName) {
-        this.datacenterName = datacenterName;
-        this.result = result;
-    }
+  public DatacenterBoundQueryResult(T result, String datacenterName) {
+    this.datacenterName = datacenterName;
+    this.result = result;
+  }
 
-    public String getDatacenterName() {
-        return datacenterName;
-    }
-
-    public T getResult() {
-        return result;
-    }
+  public String getDatacenterName() {
+    return datacenterName;
+  }
 
+  public T getResult() {
+    return result;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/DatacenterBoundRepositoryHolder.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/DatacenterBoundRepositoryHolder.java
index 7a1b5639bc..9711499305 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/DatacenterBoundRepositoryHolder.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/DatacenterBoundRepositoryHolder.java
@@ -2,19 +2,19 @@
 
 public class DatacenterBoundRepositoryHolder<R> {
 
-    private final R repository;
-    private final String datacenterName;
+  private final R repository;
+  private final String datacenterName;
 
-    public DatacenterBoundRepositoryHolder(R repository, String datacenterName) {
-        this.repository = repository;
-        this.datacenterName = datacenterName;
-    }
+  public DatacenterBoundRepositoryHolder(R repository, String datacenterName) {
+    this.repository = repository;
+    this.datacenterName = datacenterName;
+  }
 
-    public R getRepository() {
-        return repository;
-    }
+  public R getRepository() {
+    return repository;
+  }
 
-    public String getDatacenterName() {
-        return datacenterName;
-    }
+  public String getDatacenterName() {
+    return datacenterName;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/ExceptionWrapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/ExceptionWrapper.java
index 8428d72928..caef4c84a3 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/ExceptionWrapper.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/ExceptionWrapper.java
@@ -4,12 +4,12 @@
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
 class ExceptionWrapper {
-     static RuntimeException wrapInInternalProcessingExceptionIfNeeded(Exception toWrap,
-                                                                       String command,
-                                                                       String dcName) {
-         if (toWrap instanceof HermesException) {
-             return (HermesException) toWrap;
-         }
-         return new InternalProcessingException("Execution of command '" + command + "' failed on DC '" + dcName + "'.", toWrap);
+  static RuntimeException wrapInInternalProcessingExceptionIfNeeded(
+      Exception toWrap, String command, String dcName) {
+    if (toWrap instanceof HermesException) {
+      return (HermesException) toWrap;
     }
+    return new InternalProcessingException(
+        "Execution of command '" + command + "' failed on DC '" + dcName + "'.", toWrap);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryCommandExecutor.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryCommandExecutor.java
index 6e4c7cf003..b343bd06ee 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryCommandExecutor.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryCommandExecutor.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.domain.dc;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
@@ -7,85 +9,126 @@
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
 import pl.allegro.tech.hermes.management.domain.mode.ModeService;
 
-import java.util.ArrayList;
-import java.util.List;
-
-
 public class MultiDatacenterRepositoryCommandExecutor {
 
-    private static final Logger logger = LoggerFactory.getLogger(MultiDatacenterRepositoryCommandExecutor.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(MultiDatacenterRepositoryCommandExecutor.class);
 
-    private final RepositoryManager repositoryManager;
-    private final boolean rollbackEnabled;
-    private final ModeService modeService;
+  private final RepositoryManager repositoryManager;
+  private final boolean rollbackEnabled;
+  private final ModeService modeService;
 
-    public MultiDatacenterRepositoryCommandExecutor(RepositoryManager repositoryManager, boolean rollbackEnabled, ModeService modeService) {
-        this.repositoryManager = repositoryManager;
-        this.rollbackEnabled = rollbackEnabled;
-        this.modeService = modeService;
-    }
+  public MultiDatacenterRepositoryCommandExecutor(
+      RepositoryManager repositoryManager, boolean rollbackEnabled, ModeService modeService) {
+    this.repositoryManager = repositoryManager;
+    this.rollbackEnabled = rollbackEnabled;
+    this.modeService = modeService;
+  }
 
-    public <T> void executeByUser(RepositoryCommand<T> command, RequestUser requestUser) {
-        if (requestUser.isAdmin() && modeService.isReadOnlyEnabled()) {
-            execute(command, false, false);
-        } else {
-            execute(command);
-        }
+  public <T> void executeByUser(RepositoryCommand<T> command, RequestUser requestUser) {
+    if (requestUser.isAdmin() && modeService.isReadOnlyEnabled()) {
+      execute(command, false, false);
+    } else {
+      execute(command);
     }
+  }
+
+  public <T> void execute(RepositoryCommand<T> command) {
+    execute(command, rollbackEnabled, true);
+  }
 
-    public <T> void execute(RepositoryCommand<T> command) {
-        execute(command, rollbackEnabled, true);
+  private <T> void execute(
+      RepositoryCommand<T> command,
+      boolean isRollbackEnabled,
+      boolean shouldStopExecutionOnFailure) {
+    if (isRollbackEnabled) {
+      backup(command);
     }
 
-    private <T> void execute(RepositoryCommand<T> command, boolean isRollbackEnabled, boolean shouldStopExecutionOnFailure) {
+    List<DatacenterBoundRepositoryHolder<T>> repoHolders =
+        repositoryManager.getRepositories(command.getRepositoryType());
+    List<DatacenterBoundRepositoryHolder<T>> executedRepoHolders = new ArrayList<>();
+
+    for (DatacenterBoundRepositoryHolder<T> repoHolder : repoHolders) {
+      long start = System.currentTimeMillis();
+      try {
+        executedRepoHolders.add(repoHolder);
+        logger.info(
+            "Executing repository command: {} in ZK dc: {}",
+            command,
+            repoHolder.getDatacenterName());
+        command.execute(repoHolder);
+        logger.info(
+            "Successfully executed repository command: {} in ZK dc: {} in: {} ms",
+            command,
+            repoHolder.getDatacenterName(),
+            System.currentTimeMillis() - start);
+      } catch (RepositoryNotAvailableException e) {
+        logger.warn("Execute failed with an RepositoryNotAvailableException error", e);
         if (isRollbackEnabled) {
-            backup(command);
+          rollback(executedRepoHolders, command, e);
         }
-
-        List<DatacenterBoundRepositoryHolder<T>> repoHolders = repositoryManager.getRepositories(command.getRepositoryType());
-        List<DatacenterBoundRepositoryHolder<T>> executedRepoHolders = new ArrayList<>();
-
-        for (DatacenterBoundRepositoryHolder<T> repoHolder : repoHolders) {
-            try {
-                executedRepoHolders.add(repoHolder);
-                command.execute(repoHolder);
-            } catch (RepositoryNotAvailableException e) {
-                logger.warn("Execute failed with an RepositoryNotAvailableException error", e);
-                if (isRollbackEnabled) {
-                    rollback(executedRepoHolders, command);
-                }
-                if (shouldStopExecutionOnFailure) {
-                    throw ExceptionWrapper.wrapInInternalProcessingExceptionIfNeeded(e, command.toString(), repoHolder.getDatacenterName());
-                }
-            } catch (Exception e) {
-                logger.warn("Execute failed with an error", e);
-                if (isRollbackEnabled) {
-                    rollback(executedRepoHolders, command);
-                }
-                throw ExceptionWrapper.wrapInInternalProcessingExceptionIfNeeded(e, command.toString(), repoHolder.getDatacenterName());
-            }
+        if (shouldStopExecutionOnFailure) {
+          throw ExceptionWrapper.wrapInInternalProcessingExceptionIfNeeded(
+              e, command.toString(), repoHolder.getDatacenterName());
         }
-    }
-
-    private <T> void rollback(List<DatacenterBoundRepositoryHolder<T>> repoHolders, RepositoryCommand<T> command) {
-        for (DatacenterBoundRepositoryHolder<T> repoHolder : repoHolders) {
-            try {
-                command.rollback(repoHolder);
-            } catch (Exception e) {
-                logger.error("Rollback procedure failed for command {} on DC {}", command, repoHolder.getDatacenterName(), e);
-            }
+      } catch (Exception e) {
+        logger.warn(
+            "Failed to execute repository command: {} in ZK dc: {} in: {} ms",
+            command,
+            repoHolder.getDatacenterName(),
+            System.currentTimeMillis() - start,
+            e);
+        if (isRollbackEnabled) {
+          rollback(executedRepoHolders, command, e);
         }
+        throw ExceptionWrapper.wrapInInternalProcessingExceptionIfNeeded(
+            e, command.toString(), repoHolder.getDatacenterName());
+      }
     }
+  }
 
-    private <T> void backup(RepositoryCommand<T> command) {
-        DatacenterBoundRepositoryHolder<T> repoHolder = repositoryManager.getLocalRepository(command.getRepositoryType());
-        try {
-            logger.debug("Creating backup for command: {}", command);
-            command.backup(repoHolder);
-        } catch (Exception e) {
-            throw new InternalProcessingException("Backup procedure for command '" + command
-                    + "' failed on DC '" + repoHolder.getDatacenterName() + "'.", e);
-        }
+  private <T> void rollback(
+      List<DatacenterBoundRepositoryHolder<T>> repoHolders,
+      RepositoryCommand<T> command,
+      Exception exception) {
+    long start = System.currentTimeMillis();
+    for (DatacenterBoundRepositoryHolder<T> repoHolder : repoHolders) {
+      logger.info(
+          "Executing rollback of repository command: {} in ZK dc: {}",
+          command,
+          repoHolder.getDatacenterName());
+      try {
+        command.rollback(repoHolder, exception);
+        logger.info(
+            "Successfully executed rollback of repository command: {} in ZK dc: {} in: {} ms",
+            command,
+            repoHolder.getDatacenterName(),
+            System.currentTimeMillis() - start);
+      } catch (Exception e) {
+        logger.error(
+            "Rollback procedure failed for command {} on DC {}",
+            command,
+            repoHolder.getDatacenterName(),
+            e);
+      }
     }
+  }
 
+  private <T> void backup(RepositoryCommand<T> command) {
+    DatacenterBoundRepositoryHolder<T> repoHolder =
+        repositoryManager.getLocalRepository(command.getRepositoryType());
+    try {
+      logger.debug("Creating backup for command: {}", command);
+      command.backup(repoHolder);
+    } catch (Exception e) {
+      throw new InternalProcessingException(
+          "Backup procedure for command '"
+              + command
+              + "' failed on DC '"
+              + repoHolder.getDatacenterName()
+              + "'.",
+          e);
+    }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryQueryExecutor.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryQueryExecutor.java
deleted file mode 100644
index 483e558ae4..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryQueryExecutor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package pl.allegro.tech.hermes.management.domain.dc;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class MultiDatacenterRepositoryQueryExecutor {
-
-    private static final Logger logger = LoggerFactory.getLogger(MultiDatacenterRepositoryQueryExecutor.class);
-
-    private final RepositoryManager repositoryManager;
-
-    public MultiDatacenterRepositoryQueryExecutor(RepositoryManager repositoryManager) {
-        this.repositoryManager = repositoryManager;
-    }
-
-    public <T, K> List<DatacenterBoundQueryResult<T>> execute(QueryCommand<T, K> command) {
-
-        List<DatacenterBoundRepositoryHolder<K>> repoHolders = repositoryManager.getRepositories(command.getRepositoryType());
-
-        return repoHolders.stream().map(holder -> {
-            try {
-                return new DatacenterBoundQueryResult<>(command.query(holder), holder.getDatacenterName());
-            } catch (Exception e) {
-                logger.warn("Execute failed with an error", e);
-                throw ExceptionWrapper.wrapInInternalProcessingExceptionIfNeeded(e, command.toString(), holder.getDatacenterName());
-            }
-        }).collect(Collectors.toList());
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/QueryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/QueryCommand.java
deleted file mode 100644
index b76d0c07c1..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/QueryCommand.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pl.allegro.tech.hermes.management.domain.dc;
-
-public abstract class QueryCommand<T, K> {
-    public abstract T query(DatacenterBoundRepositoryHolder<K> holder);
-
-    public abstract Class<K> getRepositoryType();
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/RepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/RepositoryCommand.java
index 246e0e3964..d0017abb51 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/RepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/RepositoryCommand.java
@@ -2,12 +2,11 @@
 
 public abstract class RepositoryCommand<T> {
 
-    public abstract void backup(DatacenterBoundRepositoryHolder<T> holder);
+  public abstract void backup(DatacenterBoundRepositoryHolder<T> holder);
 
-    public abstract void execute(DatacenterBoundRepositoryHolder<T> holder);
+  public abstract void execute(DatacenterBoundRepositoryHolder<T> holder);
 
-    public abstract void rollback(DatacenterBoundRepositoryHolder<T> holder);
-
-    public abstract Class<T> getRepositoryType();
+  public abstract void rollback(DatacenterBoundRepositoryHolder<T> holder, Exception exception);
 
+  public abstract Class<T> getRepositoryType();
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/RepositoryManager.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/RepositoryManager.java
index 07915686f4..4c9ef97f93 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/RepositoryManager.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/dc/RepositoryManager.java
@@ -4,7 +4,7 @@
 
 public interface RepositoryManager {
 
-    <T> DatacenterBoundRepositoryHolder<T> getLocalRepository(Class<T> repositoryType);
+  <T> DatacenterBoundRepositoryHolder<T> getLocalRepository(Class<T> repositoryType);
 
-    <T> List<DatacenterBoundRepositoryHolder<T>> getRepositories(Class<T> repositoryType);
+  <T> List<DatacenterBoundRepositoryHolder<T>> getRepositories(Class<T> repositoryType);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/filtering/FilteringService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/filtering/FilteringService.java
index 0cf4e1a8f0..14554f16c7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/filtering/FilteringService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/filtering/FilteringService.java
@@ -1,7 +1,15 @@
 package pl.allegro.tech.hermes.management.domain.filtering;
 
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.ERROR;
+import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.MATCHED;
+import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.NOT_MATCHED;
+
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.avro.Schema;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.MessageFiltersVerificationInput;
 import pl.allegro.tech.hermes.api.MessageFiltersVerificationResult;
@@ -16,80 +24,71 @@
 import tech.allegro.schema.json2avro.converter.AvroConversionException;
 import tech.allegro.schema.json2avro.converter.JsonAvroConverter;
 
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.ERROR;
-import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.MATCHED;
-import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.NOT_MATCHED;
-
 @Component
 public class FilteringService {
-    private final FilterChainFactory filterChainFactory;
-    private final SchemaRepository schemaRepository;
-    private final TopicService topicService;
-    private final JsonAvroConverter jsonAvroConverter;
+  private final FilterChainFactory filterChainFactory;
+  private final SchemaRepository schemaRepository;
+  private final TopicService topicService;
+  private final JsonAvroConverter jsonAvroConverter;
 
-    public FilteringService(FilterChainFactory filterChainFactory,
-                            SchemaRepository schemaRepository,
-                            TopicService topicService,
-                            JsonAvroConverter jsonAvroConverter) {
-        this.filterChainFactory = filterChainFactory;
-        this.schemaRepository = schemaRepository;
-        this.topicService = topicService;
-        this.jsonAvroConverter = jsonAvroConverter;
-    }
-
-    public MessageFiltersVerificationResult verify(MessageFiltersVerificationInput verification, TopicName topicName) {
-        Topic topic = topicService.getTopicDetails(topicName);
-        CompiledSchema<Schema> avroSchema = getLatestAvroSchemaIfExists(topic);
+  public FilteringService(
+      FilterChainFactory filterChainFactory,
+      SchemaRepository schemaRepository,
+      TopicService topicService,
+      JsonAvroConverter jsonAvroConverter) {
+    this.filterChainFactory = filterChainFactory;
+    this.schemaRepository = schemaRepository;
+    this.topicService = topicService;
+    this.jsonAvroConverter = jsonAvroConverter;
+  }
 
-        byte[] messageContent;
-        try {
-            messageContent = getBytes(verification.getMessage(), topic, avroSchema);
-        } catch (AvroConversionException e) {
-            return new MessageFiltersVerificationResult(ERROR, createErrorMessage(e));
-        }
+  public MessageFiltersVerificationResult verify(
+      MessageFiltersVerificationInput verification, TopicName topicName) {
+    Topic topic = topicService.getTopicDetails(topicName);
+    CompiledSchema<Schema> avroSchema = getLatestAvroSchemaIfExists(topic);
 
-        MessageForFiltersVerification message = new MessageForFiltersVerification(messageContent, topic.getContentType(), avroSchema);
-        FilterChain filterChain = filterChainFactory.create(verification.getFilters());
-        FilterResult result = filterChain.apply(message);
-        return toMessageFiltersVerificationResult(result);
+    byte[] messageContent;
+    try {
+      messageContent = getBytes(verification.getMessage(), topic, avroSchema);
+    } catch (AvroConversionException e) {
+      return new MessageFiltersVerificationResult(ERROR, createErrorMessage(e));
     }
 
-    private CompiledSchema<Schema> getLatestAvroSchemaIfExists(Topic topic) {
-        if (AVRO.equals(topic.getContentType())) {
-            return schemaRepository.getLatestAvroSchema(topic);
-        }
-        return null;
-    }
+    MessageForFiltersVerification message =
+        new MessageForFiltersVerification(messageContent, topic.getContentType(), avroSchema);
+    FilterChain filterChain = filterChainFactory.create(verification.getFilters());
+    FilterResult result = filterChain.apply(message);
+    return toMessageFiltersVerificationResult(result);
+  }
 
-    private byte[] getBytes(byte[] message, Topic topic, CompiledSchema<Schema> avroSchema) {
-        switch (topic.getContentType()) {
-            case JSON:
-                return message;
-            case AVRO:
-                return jsonAvroConverter.convertToAvro(message, avroSchema.getSchema());
-            default:
-                throw new IllegalArgumentException();
-        }
+  private CompiledSchema<Schema> getLatestAvroSchemaIfExists(Topic topic) {
+    if (AVRO.equals(topic.getContentType())) {
+      return schemaRepository.getLatestAvroSchema(topic);
     }
+    return null;
+  }
 
-    private MessageFiltersVerificationResult toMessageFiltersVerificationResult(FilterResult result) {
-        return new MessageFiltersVerificationResult(
-                result.isFiltered() ? NOT_MATCHED : MATCHED,
-                result.getCause()
-                        .map(this::createErrorMessage)
-                        .orElse(null)
-        );
+  private byte[] getBytes(byte[] message, Topic topic, CompiledSchema<Schema> avroSchema) {
+    switch (topic.getContentType()) {
+      case JSON:
+        return message;
+      case AVRO:
+        return jsonAvroConverter.convertToAvro(message, avroSchema.getSchema());
+      default:
+        throw new IllegalArgumentException();
     }
+  }
 
-    private String createErrorMessage(Throwable th) {
-        Throwable rootCause = ExceptionUtils.getRootCause(th);
-        return Stream.of(th.getMessage(), (rootCause != null ? rootCause.getMessage() : null))
-                .filter(Objects::nonNull)
-                .collect(Collectors.joining("\n"));
-    }
+  private MessageFiltersVerificationResult toMessageFiltersVerificationResult(FilterResult result) {
+    return new MessageFiltersVerificationResult(
+        result.isFiltered() ? NOT_MATCHED : MATCHED,
+        result.getCause().map(this::createErrorMessage).orElse(null));
+  }
+
+  private String createErrorMessage(Throwable th) {
+    Throwable rootCause = ExceptionUtils.getRootCause(th);
+    return Stream.of(th.getMessage(), (rootCause != null ? rootCause.getMessage() : null))
+        .filter(Objects::nonNull)
+        .collect(Collectors.joining("\n"));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/filtering/MessageForFiltersVerification.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/filtering/MessageForFiltersVerification.java
index 7a5da2cb91..4144972ebb 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/filtering/MessageForFiltersVerification.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/filtering/MessageForFiltersVerification.java
@@ -1,42 +1,42 @@
 package pl.allegro.tech.hermes.management.domain.filtering;
 
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.domain.filtering.FilterableMessage;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-
 class MessageForFiltersVerification implements FilterableMessage {
-    private final byte[] data;
-    private final ContentType contentType;
-    private final CompiledSchema<Schema> schema;
-
-    MessageForFiltersVerification(byte[] data, ContentType contentType, CompiledSchema<Schema> schema) {
-        this.data = data;
-        this.contentType = contentType;
-        this.schema = schema;
-    }
-
-    @Override
-    public ContentType getContentType() {
-        return contentType;
-    }
-
-    @Override
-    public Map<String, String> getExternalMetadata() {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public byte[] getData() {
-        return data;
-    }
-
-    @Override
-    public Optional<CompiledSchema<Schema>> getSchema() {
-        return Optional.ofNullable(schema);
-    }
+  private final byte[] data;
+  private final ContentType contentType;
+  private final CompiledSchema<Schema> schema;
+
+  MessageForFiltersVerification(
+      byte[] data, ContentType contentType, CompiledSchema<Schema> schema) {
+    this.data = data;
+    this.contentType = contentType;
+    this.schema = schema;
+  }
+
+  @Override
+  public ContentType getContentType() {
+    return contentType;
+  }
+
+  @Override
+  public Map<String, String> getExternalMetadata() {
+    return Collections.emptyMap();
+  }
+
+  @Override
+  public byte[] getData() {
+    return data;
+  }
+
+  @Override
+  public Optional<CompiledSchema<Schema>> getSchema() {
+    return Optional.ofNullable(schema);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupNameValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupNameValidator.java
index a243fe5347..87e0239d02 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupNameValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupNameValidator.java
@@ -1,20 +1,20 @@
 package pl.allegro.tech.hermes.management.domain.group;
 
-import pl.allegro.tech.hermes.management.domain.GroupNameIsNotAllowedException;
-
 import java.util.regex.Pattern;
+import pl.allegro.tech.hermes.management.domain.GroupNameIsNotAllowedException;
 
 class GroupNameValidator {
 
-    private final Pattern allowedPattern;
+  private final Pattern allowedPattern;
 
-    public GroupNameValidator(String allowedRegex) {
-        this.allowedPattern = Pattern.compile(allowedRegex);
-    }
+  public GroupNameValidator(String allowedRegex) {
+    this.allowedPattern = Pattern.compile(allowedRegex);
+  }
 
-    public void requireValid(String groupName) {
-        if (!allowedPattern.matcher(groupName).matches()) {
-            throw new GroupNameIsNotAllowedException(String.format("Group name should match pattern %s", allowedPattern));
-        }
+  public void requireValid(String groupName) {
+    if (!allowedPattern.matcher(groupName).matches()) {
+      throw new GroupNameIsNotAllowedException(
+          String.format("Group name should match pattern %s", allowedPattern));
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupService.java
index f5f38540d4..5ee724f80d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupService.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.domain.group;
 
+import java.util.List;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,77 +21,71 @@
 import pl.allegro.tech.hermes.management.domain.group.commands.RemoveGroupRepositoryCommand;
 import pl.allegro.tech.hermes.management.domain.group.commands.UpdateGroupRepositoryCommand;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Component
 public class GroupService {
 
-    private static final Logger logger = LoggerFactory.getLogger(GroupService.class);
+  private static final Logger logger = LoggerFactory.getLogger(GroupService.class);
 
-    private final GroupRepository groupRepository;
-    private final Auditor auditor;
-    private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
-    private final GroupValidator validator;
+  private final GroupRepository groupRepository;
+  private final Auditor auditor;
+  private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+  private final GroupValidator validator;
 
-    @Autowired
-    public GroupService(GroupRepository groupRepository,
-                        Auditor auditor,
-                        MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
-                        GroupValidator validator) {
-        this.groupRepository = groupRepository;
-        this.auditor = auditor;
-        this.multiDcExecutor = multiDcExecutor;
-        this.validator = validator;
-    }
+  @Autowired
+  public GroupService(
+      GroupRepository groupRepository,
+      Auditor auditor,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
+      GroupValidator validator) {
+    this.groupRepository = groupRepository;
+    this.auditor = auditor;
+    this.multiDcExecutor = multiDcExecutor;
+    this.validator = validator;
+  }
 
-    public List<Group> listGroups() {
-        return groupRepository.listGroups();
-    }
+  public List<Group> listGroups() {
+    return groupRepository.listGroups();
+  }
 
-    public List<String> listGroupNames() {
-        return groupRepository.listGroupNames();
-    }
+  public List<String> listGroupNames() {
+    return groupRepository.listGroupNames();
+  }
 
-    public Group getGroupDetails(String groupName) {
-        return groupRepository.getGroupDetails(groupName);
-    }
+  public Group getGroupDetails(String groupName) {
+    return groupRepository.getGroupDetails(groupName);
+  }
 
-    public void createGroup(Group group,
-                            RequestUser createdBy,
-                            CreatorRights<Group> creatorRights) {
-        validator.checkCreation(group, creatorRights);
-        multiDcExecutor.executeByUser(new CreateGroupRepositoryCommand(group), createdBy);
-        auditor.objectCreated(createdBy.getUsername(), group);
-    }
+  public void createGroup(Group group, RequestUser createdBy, CreatorRights<Group> creatorRights) {
+    validator.checkCreation(group, creatorRights);
+    multiDcExecutor.executeByUser(new CreateGroupRepositoryCommand(group), createdBy);
+    auditor.objectCreated(createdBy.getUsername(), group);
+  }
 
-    public void removeGroup(String groupName, RequestUser removedBy) {
-        multiDcExecutor.executeByUser(new RemoveGroupRepositoryCommand(groupName), removedBy);
-        auditor.objectRemoved(removedBy.getUsername(), Group.from(groupName));
-    }
+  public void removeGroup(String groupName, RequestUser removedBy) {
+    multiDcExecutor.executeByUser(new RemoveGroupRepositoryCommand(groupName), removedBy);
+    auditor.objectRemoved(removedBy.getUsername(), Group.from(groupName));
+  }
 
-    public void checkGroupExists(String groupName) {
-        if (!groupRepository.groupExists(groupName)) {
-            throw new GroupNotExistsException(groupName);
-        }
+  public void checkGroupExists(String groupName) {
+    if (!groupRepository.groupExists(groupName)) {
+      throw new GroupNotExistsException(groupName);
     }
+  }
 
-    public void updateGroup(String groupName, PatchData patch, RequestUser modifiedBy) {
-        try {
-            Group retrieved = groupRepository.getGroupDetails(groupName);
-            Group modified = Patch.apply(retrieved, patch);
-            multiDcExecutor.executeByUser(new UpdateGroupRepositoryCommand(modified), modifiedBy);
-            groupRepository.updateGroup(modified);
-            auditor.objectUpdated(modifiedBy.getUsername(), retrieved, modified);
-        } catch (MalformedDataException exception) {
-            logger.warn("Problem with reading details of group {}.", groupName);
-            throw exception;
-        }
+  public void updateGroup(String groupName, PatchData patch, RequestUser modifiedBy) {
+    try {
+      Group retrieved = groupRepository.getGroupDetails(groupName);
+      Group modified = Patch.apply(retrieved, patch);
+      multiDcExecutor.executeByUser(new UpdateGroupRepositoryCommand(modified), modifiedBy);
+      groupRepository.updateGroup(modified);
+      auditor.objectUpdated(modifiedBy.getUsername(), retrieved, modified);
+    } catch (MalformedDataException exception) {
+      logger.warn("Problem with reading details of group {}.", groupName);
+      throw exception;
     }
+  }
 
-    public List<Group> queryGroup(Query<Group> query) {
-        return query
-                .filter(listGroups())
-                .collect(Collectors.toList());
-    }
+  public List<Group> queryGroup(Query<Group> query) {
+    return query.filter(listGroups()).collect(Collectors.toList());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupValidator.java
index 1277ebdd67..de1d878f71 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/GroupValidator.java
@@ -11,24 +11,24 @@
 @Component
 public class GroupValidator {
 
-    private final GroupRepository repository;
+  private final GroupRepository repository;
 
-    private final GroupNameValidator groupNameValidator;
+  private final GroupNameValidator groupNameValidator;
 
-    public GroupValidator(GroupRepository repository, GroupProperties groupProperties) {
-        this.repository = repository;
-        this.groupNameValidator = new GroupNameValidator(groupProperties.getAllowedGroupNameRegex());
-    }
+  public GroupValidator(GroupRepository repository, GroupProperties groupProperties) {
+    this.repository = repository;
+    this.groupNameValidator = new GroupNameValidator(groupProperties.getAllowedGroupNameRegex());
+  }
 
-    public void checkCreation(Group toCheck, CreatorRights<Group> creatorRights) {
-        groupNameValidator.requireValid(toCheck.getGroupName());
+  public void checkCreation(Group toCheck, CreatorRights<Group> creatorRights) {
+    groupNameValidator.requireValid(toCheck.getGroupName());
 
-        if (!creatorRights.allowedToCreate(toCheck)) {
-            throw new PermissionDeniedException("You are not allowed to create groups");
-        }
+    if (!creatorRights.allowedToCreate(toCheck)) {
+      throw new PermissionDeniedException("You are not allowed to create groups");
+    }
 
-        if (repository.groupExists(toCheck.getGroupName())) {
-            throw new GroupAlreadyExistsException(toCheck.getGroupName());
-        }
+    if (repository.groupExists(toCheck.getGroupName())) {
+      throw new GroupAlreadyExistsException(toCheck.getGroupName());
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/CreateGroupRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/CreateGroupRepositoryCommand.java
index 3b67269d1b..4241f1db80 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/CreateGroupRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/CreateGroupRepositoryCommand.java
@@ -7,37 +7,38 @@
 
 public class CreateGroupRepositoryCommand extends RepositoryCommand<GroupRepository> {
 
-    private final Group group;
-    private boolean exists;
-
-    public CreateGroupRepositoryCommand(Group group) {
-        this.group = group;
+  private final Group group;
+  private boolean exists;
+
+  public CreateGroupRepositoryCommand(Group group) {
+    this.group = group;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
+    exists = holder.getRepository().groupExists(group.getGroupName());
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
+    holder.getRepository().createGroup(group);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<GroupRepository> holder, Exception exception) {
+    if (!exists) {
+      holder.getRepository().removeGroup(group.getGroupName());
     }
+  }
 
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        exists = holder.getRepository().groupExists(group.getGroupName());
-    }
+  @Override
+  public Class<GroupRepository> getRepositoryType() {
+    return GroupRepository.class;
+  }
 
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        holder.getRepository().createGroup(group);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        if (!exists) {
-            holder.getRepository().removeGroup(group.getGroupName());
-        }
-    }
-
-    @Override
-    public Class<GroupRepository> getRepositoryType() {
-        return GroupRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "CreateGroup(" + group.getGroupName() + ")";
-    }
+  @Override
+  public String toString() {
+    return "CreateGroup(" + group.getGroupName() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/RemoveGroupRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/RemoveGroupRepositoryCommand.java
index f9b41d8e6b..31856817c7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/RemoveGroupRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/RemoveGroupRepositoryCommand.java
@@ -7,36 +7,37 @@
 
 public class RemoveGroupRepositoryCommand extends RepositoryCommand<GroupRepository> {
 
-    private final String groupName;
-
-    private Group backup;
-
-    public RemoveGroupRepositoryCommand(String groupName) {
-        this.groupName = groupName;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        backup = holder.getRepository().getGroupDetails(groupName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        holder.getRepository().removeGroup(groupName);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        holder.getRepository().createGroup(backup);
-    }
-
-    @Override
-    public Class<GroupRepository> getRepositoryType() {
-        return GroupRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "RemoveGroup(" + groupName + ")";
-    }
+  private final String groupName;
+
+  private Group backup;
+
+  public RemoveGroupRepositoryCommand(String groupName) {
+    this.groupName = groupName;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
+    backup = holder.getRepository().getGroupDetails(groupName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
+    holder.getRepository().removeGroup(groupName);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<GroupRepository> holder, Exception exception) {
+    holder.getRepository().createGroup(backup);
+  }
+
+  @Override
+  public Class<GroupRepository> getRepositoryType() {
+    return GroupRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "RemoveGroup(" + groupName + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/UpdateGroupRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/UpdateGroupRepositoryCommand.java
index c25dcd73e3..14c2177d90 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/UpdateGroupRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/group/commands/UpdateGroupRepositoryCommand.java
@@ -7,36 +7,37 @@
 
 public class UpdateGroupRepositoryCommand extends RepositoryCommand<GroupRepository> {
 
-    private final Group group;
-
-    private Group backup;
-
-    public UpdateGroupRepositoryCommand(Group group) {
-        this.group = group;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        backup = holder.getRepository().getGroupDetails(group.getGroupName());
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        holder.getRepository().updateGroup(group);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
-        holder.getRepository().updateGroup(backup);
-    }
-
-    @Override
-    public Class<GroupRepository> getRepositoryType() {
-        return GroupRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "UpdateGroup(" + group.getGroupName() + ")";
-    }
+  private final Group group;
+
+  private Group backup;
+
+  public UpdateGroupRepositoryCommand(Group group) {
+    this.group = group;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
+    backup = holder.getRepository().getGroupDetails(group.getGroupName());
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<GroupRepository> holder) {
+    holder.getRepository().updateGroup(group);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<GroupRepository> holder, Exception exception) {
+    holder.getRepository().updateGroup(backup);
+  }
+
+  @Override
+  public Class<GroupRepository> getRepositoryType() {
+    return GroupRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "UpdateGroup(" + group.getGroupName() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/CouldNotResolveHostNameException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/CouldNotResolveHostNameException.java
index 048ee4f27d..fa1065eb28 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/CouldNotResolveHostNameException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/CouldNotResolveHostNameException.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.management.domain.health;
 
 class CouldNotResolveHostNameException extends RuntimeException {
-    CouldNotResolveHostNameException(Throwable cause) {
-        super(cause);
-    }
+  CouldNotResolveHostNameException(Throwable cause) {
+    super(cause);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckScheduler.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckScheduler.java
index 7958986dc6..b9920af761 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckScheduler.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckScheduler.java
@@ -4,6 +4,9 @@
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.micrometer.core.instrument.MeterRegistry;
 import jakarta.annotation.PostConstruct;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,64 +15,60 @@
 import pl.allegro.tech.hermes.management.domain.mode.ModeService;
 import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClientManager;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 @Component
 public class HealthCheckScheduler {
 
-    private static final Logger logger = LoggerFactory.getLogger(HealthCheckScheduler.class);
+  private static final Logger logger = LoggerFactory.getLogger(HealthCheckScheduler.class);
 
-    private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(
-            new ThreadFactoryBuilder().setNameFormat("storage-health-check-scheduler-%d").build()
-    );
-    private final ZookeeperClientManager zookeeperClientManager;
-    private final ZookeeperPaths zookeeperPaths;
-    private final NodeDataProvider nodeDataProvider;
-    private final ObjectMapper objectMapper;
-    private final ModeService modeService;
-    private final MeterRegistry meterRegistry;
-    private final Long periodSeconds;
-    private final boolean enabled;
+  private final ScheduledExecutorService executorService =
+      Executors.newSingleThreadScheduledExecutor(
+          new ThreadFactoryBuilder().setNameFormat("storage-health-check-scheduler-%d").build());
+  private final ZookeeperClientManager zookeeperClientManager;
+  private final ZookeeperPaths zookeeperPaths;
+  private final NodeDataProvider nodeDataProvider;
+  private final ObjectMapper objectMapper;
+  private final ModeService modeService;
+  private final MeterRegistry meterRegistry;
+  private final Long periodSeconds;
+  private final boolean enabled;
 
-    public HealthCheckScheduler(ZookeeperClientManager zookeeperClientManager,
-                                ZookeeperPaths zookeeperPaths,
-                                NodeDataProvider nodeDataProvider,
-                                ObjectMapper objectMapper,
-                                ModeService modeService,
-                                MeterRegistry meterRegistry,
-                                @Value("${management.health.periodSeconds:30}") Long periodSeconds,
-                                @Value("${management.health.enabled:false}") boolean enabled) {
-        this.zookeeperClientManager = zookeeperClientManager;
-        this.zookeeperPaths = zookeeperPaths;
-        this.nodeDataProvider = nodeDataProvider;
-        this.objectMapper = objectMapper;
-        this.modeService = modeService;
-        this.meterRegistry = meterRegistry;
-        this.periodSeconds = periodSeconds;
-        this.enabled = enabled;
-    }
+  public HealthCheckScheduler(
+      ZookeeperClientManager zookeeperClientManager,
+      ZookeeperPaths zookeeperPaths,
+      NodeDataProvider nodeDataProvider,
+      ObjectMapper objectMapper,
+      ModeService modeService,
+      MeterRegistry meterRegistry,
+      @Value("${management.health.periodSeconds:30}") Long periodSeconds,
+      @Value("${management.health.enabled:false}") boolean enabled) {
+    this.zookeeperClientManager = zookeeperClientManager;
+    this.zookeeperPaths = zookeeperPaths;
+    this.nodeDataProvider = nodeDataProvider;
+    this.objectMapper = objectMapper;
+    this.modeService = modeService;
+    this.meterRegistry = meterRegistry;
+    this.periodSeconds = periodSeconds;
+    this.enabled = enabled;
+  }
 
-    @PostConstruct
-    public void scheduleHealthCheck() {
-        if (enabled) {
-            logger.info("Starting the storage health check scheduler");
-            String healthCheckPath = zookeeperPaths.nodeHealthPathForManagementHost(
-                    nodeDataProvider.getHostname(),
-                    nodeDataProvider.getServerPort()
-            );
-            HealthCheckTask healthCheckTask = new HealthCheckTask(
-                    zookeeperClientManager.getClients(),
-                    healthCheckPath,
-                    objectMapper,
-                    modeService,
-                    meterRegistry
-            );
-            executorService.scheduleAtFixedRate(healthCheckTask, 0, periodSeconds, TimeUnit.SECONDS);
-        } else {
-            logger.info("Storage health check is disabled");
-            modeService.setMode(ModeService.ManagementMode.READ_WRITE);
-        }
+  @PostConstruct
+  public void scheduleHealthCheck() {
+    if (enabled) {
+      logger.info("Starting the storage health check scheduler");
+      String healthCheckPath =
+          zookeeperPaths.nodeHealthPathForManagementHost(
+              nodeDataProvider.getHostname(), nodeDataProvider.getServerPort());
+      HealthCheckTask healthCheckTask =
+          new HealthCheckTask(
+              zookeeperClientManager.getClients(),
+              healthCheckPath,
+              objectMapper,
+              modeService,
+              meterRegistry);
+      executorService.scheduleAtFixedRate(healthCheckTask, 0, periodSeconds, TimeUnit.SECONDS);
+    } else {
+      logger.info("Storage health check is disabled");
+      modeService.setMode(ModeService.ManagementMode.READ_WRITE);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckTask.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckTask.java
index 4a80112c0c..c89d9c109b 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckTask.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckTask.java
@@ -2,69 +2,74 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.core.instrument.MeterRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.management.domain.mode.ModeService;
-import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClient;
-
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.management.domain.mode.ModeService;
+import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClient;
 
 class HealthCheckTask implements Runnable {
 
-    private static final Logger logger = LoggerFactory.getLogger(HealthCheckTask.class);
+  private static final Logger logger = LoggerFactory.getLogger(HealthCheckTask.class);
 
-    private final Collection<ZookeeperClient> zookeeperClients;
-    private final String healthCheckPath;
-    private final ObjectMapper objectMapper;
-    private final ModeService modeService;
-    private final MeterRegistry meterRegistry;
+  private final Collection<ZookeeperClient> zookeeperClients;
+  private final String healthCheckPath;
+  private final ObjectMapper objectMapper;
+  private final ModeService modeService;
+  private final MeterRegistry meterRegistry;
 
-    HealthCheckTask(Collection<ZookeeperClient> zookeeperClients, String healthCheckPath, ObjectMapper objectMapper,
-                    ModeService modeService, MeterRegistry meterRegistry) {
-        this.zookeeperClients = zookeeperClients;
-        this.healthCheckPath = healthCheckPath;
-        this.objectMapper = objectMapper;
-        this.modeService = modeService;
-        this.meterRegistry = meterRegistry;
-    }
+  HealthCheckTask(
+      Collection<ZookeeperClient> zookeeperClients,
+      String healthCheckPath,
+      ObjectMapper objectMapper,
+      ModeService modeService,
+      MeterRegistry meterRegistry) {
+    this.zookeeperClients = zookeeperClients;
+    this.healthCheckPath = healthCheckPath;
+    this.objectMapper = objectMapper;
+    this.modeService = modeService;
+    this.meterRegistry = meterRegistry;
+  }
 
-    @Override
-    public void run() {
-        final List<HealthCheckResult> healthCheckResults = zookeeperClients.stream()
-                .map(this::doHealthCheck)
-                .collect(Collectors.toList());
-        updateMode(healthCheckResults);
-    }
+  @Override
+  public void run() {
+    final List<HealthCheckResult> healthCheckResults =
+        zookeeperClients.stream().map(this::doHealthCheck).collect(Collectors.toList());
+    updateMode(healthCheckResults);
+  }
 
-    private HealthCheckResult doHealthCheck(ZookeeperClient zookeeperClient) {
-        final String timestamp = LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
-        try {
-            zookeeperClient.ensureEphemeralNodeExists(healthCheckPath);
-            zookeeperClient.getCuratorFramework()
-                    .setData()
-                    .forPath(healthCheckPath, objectMapper.writeValueAsBytes(timestamp));
-            meterRegistry.counter("storage-health-check.successful").increment();
-            return HealthCheckResult.HEALTHY;
-        } catch (Exception e) {
-            meterRegistry.counter("storage-health-check.failed").increment();
-            logger.error("Storage health check failed for datacenter {}", zookeeperClient.getDatacenterName(), e);
-            return HealthCheckResult.UNHEALTHY;
-        }
+  private HealthCheckResult doHealthCheck(ZookeeperClient zookeeperClient) {
+    final String timestamp = LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+    try {
+      zookeeperClient.ensureEphemeralNodeExists(healthCheckPath);
+      zookeeperClient
+          .getCuratorFramework()
+          .setData()
+          .forPath(healthCheckPath, objectMapper.writeValueAsBytes(timestamp));
+      meterRegistry.counter("storage-health-check.successful").increment();
+      return HealthCheckResult.HEALTHY;
+    } catch (Exception e) {
+      meterRegistry.counter("storage-health-check.failed").increment();
+      logger.error(
+          "Storage health check failed for datacenter {}", zookeeperClient.getDatacenterName(), e);
+      return HealthCheckResult.UNHEALTHY;
     }
+  }
 
-    private void updateMode(List<HealthCheckResult> healthCheckResults) {
-        if (healthCheckResults.contains(HealthCheckResult.UNHEALTHY)) {
-            modeService.setMode(ModeService.ManagementMode.READ_ONLY);
-        } else {
-            modeService.setMode(ModeService.ManagementMode.READ_WRITE);
-        }
+  private void updateMode(List<HealthCheckResult> healthCheckResults) {
+    if (healthCheckResults.contains(HealthCheckResult.UNHEALTHY)) {
+      modeService.setMode(ModeService.ManagementMode.READ_ONLY);
+    } else {
+      modeService.setMode(ModeService.ManagementMode.READ_WRITE);
     }
+  }
 
-    private enum HealthCheckResult {
-        HEALTHY, UNHEALTHY
-    }
+  private enum HealthCheckResult {
+    HEALTHY,
+    UNHEALTHY
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/NodeDataProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/NodeDataProvider.java
index 5c0517c5d1..1cd5506171 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/NodeDataProvider.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/NodeDataProvider.java
@@ -1,29 +1,28 @@
 package pl.allegro.tech.hermes.management.domain.health;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component
 class NodeDataProvider {
 
-    private final String serverPort;
+  private final String serverPort;
 
-    NodeDataProvider(@Value("${server.port}") String serverPort) {
-        this.serverPort = serverPort;
-    }
+  NodeDataProvider(@Value("${server.port}") String serverPort) {
+    this.serverPort = serverPort;
+  }
 
-    String getHostname() {
-        try {
-            return InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException e) {
-            throw new CouldNotResolveHostNameException(e);
-        }
+  String getHostname() {
+    try {
+      return InetAddress.getLocalHost().getHostName();
+    } catch (UnknownHostException e) {
+      throw new CouldNotResolveHostNameException(e);
     }
+  }
 
-    String getServerPort() {
-        return serverPort;
-    }
+  String getServerPort() {
+    return serverPort;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/message/RetransmissionService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/message/RetransmissionService.java
index 4e217dbf95..5ad8f6fc35 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/message/RetransmissionService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/message/RetransmissionService.java
@@ -1,14 +1,13 @@
 package pl.allegro.tech.hermes.management.domain.message;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
 
-import java.util.List;
-
 public interface RetransmissionService {
 
-    List<PartitionOffset> indicateOffsetChange(Topic topic, String subscription, String brokersClusterName,
-                                                     long timestamp, boolean dryRun);
+  List<PartitionOffset> indicateOffsetChange(
+      Topic topic, String subscription, String brokersClusterName, long timestamp, boolean dryRun);
 
-    boolean areOffsetsMoved(Topic topic, String subscriptionName, String brokersClusterName);
+  boolean areOffsetsMoved(Topic topic, String subscriptionName, String brokersClusterName);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/mode/ModeService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/mode/ModeService.java
index 0c75cd6c3c..2e070fd479 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/mode/ModeService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/mode/ModeService.java
@@ -5,45 +5,45 @@
 @Component
 public class ModeService {
 
-    public static final String READ_WRITE = "readWrite";
-    public static final String READ_ONLY = "readOnly";
-    public static final String READ_ONLY_ADMIN = "readOnlyAdmin";
+  public static final String READ_WRITE = "readWrite";
+  public static final String READ_ONLY = "readOnly";
+  public static final String READ_ONLY_ADMIN = "readOnlyAdmin";
 
-    public enum ManagementMode {
-        READ_WRITE(ModeService.READ_WRITE),
-        READ_ONLY(ModeService.READ_ONLY),
-        READ_ONLY_ADMIN(ModeService.READ_ONLY_ADMIN);
+  public enum ManagementMode {
+    READ_WRITE(ModeService.READ_WRITE),
+    READ_ONLY(ModeService.READ_ONLY),
+    READ_ONLY_ADMIN(ModeService.READ_ONLY_ADMIN);
 
-        private final String text;
+    private final String text;
 
-        ManagementMode(String text) {
-            this.text = text;
-        }
+    ManagementMode(String text) {
+      this.text = text;
+    }
 
-        @Override
-        public String toString() {
-            return text;
-        }
+    @Override
+    public String toString() {
+      return text;
     }
+  }
 
-    private volatile ManagementMode mode = ManagementMode.READ_ONLY;
+  private volatile ManagementMode mode = ManagementMode.READ_ONLY;
 
-    public ManagementMode getMode() {
-        return mode;
-    }
+  public ManagementMode getMode() {
+    return mode;
+  }
 
-    public synchronized void setModeByAdmin(ManagementMode mode) {
-        this.mode = mode;
-    }
+  public synchronized void setModeByAdmin(ManagementMode mode) {
+    this.mode = mode;
+  }
 
-    public boolean isReadOnlyEnabled() {
-        return mode == ManagementMode.READ_ONLY || mode == ManagementMode.READ_ONLY_ADMIN;
-    }
+  public boolean isReadOnlyEnabled() {
+    return mode == ManagementMode.READ_ONLY || mode == ManagementMode.READ_ONLY_ADMIN;
+  }
 
-    public synchronized void setMode(ManagementMode newMode) {
-        /* READ_ONLY_ADMIN is a flag that can be changed only by admin */
-        if (!mode.equals(ManagementMode.READ_ONLY_ADMIN)) {
-            this.mode = newMode;
-        }
+  public synchronized void setMode(ManagementMode newMode) {
+    /* READ_ONLY_ADMIN is a flag that can be changed only by admin */
+    if (!mode.equals(ManagementMode.READ_ONLY_ADMIN)) {
+      this.mode = newMode;
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/OAuthProviderService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/OAuthProviderService.java
index dedff9b5e6..10e84e114e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/OAuthProviderService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/OAuthProviderService.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.management.domain.oauth;
 
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.OAuthProvider;
@@ -14,51 +15,55 @@
 import pl.allegro.tech.hermes.management.domain.oauth.commands.RemoveOAuthProviderRepositoryCommand;
 import pl.allegro.tech.hermes.management.domain.oauth.commands.UpdateOAuthProviderRepositoryCommand;
 
-import java.util.List;
-
 @Component
 public class OAuthProviderService {
 
-    private final OAuthProviderRepository repository;
-    private final ApiPreconditions preconditions;
-    private final Auditor auditor;
-    private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+  private final OAuthProviderRepository repository;
+  private final ApiPreconditions preconditions;
+  private final Auditor auditor;
+  private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
 
-    @Autowired
-    public OAuthProviderService(OAuthProviderRepository repository, ApiPreconditions preconditions, Auditor auditor,
-                                MultiDatacenterRepositoryCommandExecutor multiDcExecutor) {
-        this.repository = repository;
-        this.preconditions = preconditions;
-        this.auditor = auditor;
-        this.multiDcExecutor = multiDcExecutor;
-    }
+  @Autowired
+  public OAuthProviderService(
+      OAuthProviderRepository repository,
+      ApiPreconditions preconditions,
+      Auditor auditor,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor) {
+    this.repository = repository;
+    this.preconditions = preconditions;
+    this.auditor = auditor;
+    this.multiDcExecutor = multiDcExecutor;
+  }
 
-    public List<String> listOAuthProviderNames() {
-        return repository.listOAuthProviderNames();
-    }
+  public List<String> listOAuthProviderNames() {
+    return repository.listOAuthProviderNames();
+  }
 
-    public OAuthProvider getOAuthProviderDetails(String oAuthProviderName) {
-        return repository.getOAuthProviderDetails(oAuthProviderName).anonymize();
-    }
+  public OAuthProvider getOAuthProviderDetails(String oAuthProviderName) {
+    return repository.getOAuthProviderDetails(oAuthProviderName).anonymize();
+  }
 
-    public void createOAuthProvider(OAuthProvider oAuthProvider, RequestUser createdBy) {
-        preconditions.checkConstraints(oAuthProvider, false);
-        multiDcExecutor.executeByUser(new CreateOAuthProviderRepositoryCommand(oAuthProvider), createdBy);
-        auditor.objectCreated(createdBy.getUsername(), oAuthProvider);
-    }
+  public void createOAuthProvider(OAuthProvider oAuthProvider, RequestUser createdBy) {
+    preconditions.checkConstraints(oAuthProvider, false);
+    multiDcExecutor.executeByUser(
+        new CreateOAuthProviderRepositoryCommand(oAuthProvider), createdBy);
+    auditor.objectCreated(createdBy.getUsername(), oAuthProvider);
+  }
 
-    public void removeOAuthProvider(String oAuthProviderName, RequestUser removedBy) {
-        OAuthProvider oAuthProvider = repository.getOAuthProviderDetails(oAuthProviderName);
-        multiDcExecutor.executeByUser(new RemoveOAuthProviderRepositoryCommand(oAuthProviderName), removedBy);
-        auditor.objectRemoved(removedBy.getUsername(), oAuthProvider);
-    }
+  public void removeOAuthProvider(String oAuthProviderName, RequestUser removedBy) {
+    OAuthProvider oAuthProvider = repository.getOAuthProviderDetails(oAuthProviderName);
+    multiDcExecutor.executeByUser(
+        new RemoveOAuthProviderRepositoryCommand(oAuthProviderName), removedBy);
+    auditor.objectRemoved(removedBy.getUsername(), oAuthProvider);
+  }
 
-    public void updateOAuthProvider(String oAuthProviderName, PatchData patch, RequestUser updatedBy) {
-        OAuthProvider retrieved = repository.getOAuthProviderDetails(oAuthProviderName);
-        OAuthProvider updated = Patch.apply(retrieved, patch);
-        preconditions.checkConstraints(updated, false);
+  public void updateOAuthProvider(
+      String oAuthProviderName, PatchData patch, RequestUser updatedBy) {
+    OAuthProvider retrieved = repository.getOAuthProviderDetails(oAuthProviderName);
+    OAuthProvider updated = Patch.apply(retrieved, patch);
+    preconditions.checkConstraints(updated, false);
 
-        multiDcExecutor.executeByUser(new UpdateOAuthProviderRepositoryCommand(updated), updatedBy);
-        auditor.objectUpdated(updatedBy.getUsername(), retrieved, updated);
-    }
+    multiDcExecutor.executeByUser(new UpdateOAuthProviderRepositoryCommand(updated), updatedBy);
+    auditor.objectUpdated(updatedBy.getUsername(), retrieved, updated);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/CreateOAuthProviderRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/CreateOAuthProviderRepositoryCommand.java
index d5b641b998..b8f034fd8e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/CreateOAuthProviderRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/CreateOAuthProviderRepositoryCommand.java
@@ -5,34 +5,36 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class CreateOAuthProviderRepositoryCommand extends RepositoryCommand<OAuthProviderRepository> {
-
-    private final OAuthProvider provider;
-
-    public CreateOAuthProviderRepositoryCommand(OAuthProvider provider) {
-        this.provider = provider;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {}
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
-        holder.getRepository().createOAuthProvider(provider);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
-        holder.getRepository().removeOAuthProvider(provider.getName());
-    }
-
-    @Override
-    public Class<OAuthProviderRepository> getRepositoryType() {
-        return OAuthProviderRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "CreateOAuthProvider(" + provider.getName() + ")";
-    }
+public class CreateOAuthProviderRepositoryCommand
+    extends RepositoryCommand<OAuthProviderRepository> {
+
+  private final OAuthProvider provider;
+
+  public CreateOAuthProviderRepositoryCommand(OAuthProvider provider) {
+    this.provider = provider;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {}
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
+    holder.getRepository().createOAuthProvider(provider);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder, Exception exception) {
+    holder.getRepository().removeOAuthProvider(provider.getName());
+  }
+
+  @Override
+  public Class<OAuthProviderRepository> getRepositoryType() {
+    return OAuthProviderRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "CreateOAuthProvider(" + provider.getName() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/RemoveOAuthProviderRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/RemoveOAuthProviderRepositoryCommand.java
index 4ff7f08f3d..5a877f6d9f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/RemoveOAuthProviderRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/RemoveOAuthProviderRepositoryCommand.java
@@ -5,38 +5,40 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class RemoveOAuthProviderRepositoryCommand extends RepositoryCommand<OAuthProviderRepository> {
-
-    private final String providerName;
-
-    private OAuthProvider backup;
-
-    public RemoveOAuthProviderRepositoryCommand(String providerName) {
-        this.providerName = providerName;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
-        backup = holder.getRepository().getOAuthProviderDetails(providerName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
-        holder.getRepository().removeOAuthProvider(providerName);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
-        holder.getRepository().createOAuthProvider(backup);
-    }
-
-    @Override
-    public Class<OAuthProviderRepository> getRepositoryType() {
-        return OAuthProviderRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "RemoveOAuthProvider(" + providerName + ")";
-    }
+public class RemoveOAuthProviderRepositoryCommand
+    extends RepositoryCommand<OAuthProviderRepository> {
+
+  private final String providerName;
+
+  private OAuthProvider backup;
+
+  public RemoveOAuthProviderRepositoryCommand(String providerName) {
+    this.providerName = providerName;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
+    backup = holder.getRepository().getOAuthProviderDetails(providerName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
+    holder.getRepository().removeOAuthProvider(providerName);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder, Exception exception) {
+    holder.getRepository().createOAuthProvider(backup);
+  }
+
+  @Override
+  public Class<OAuthProviderRepository> getRepositoryType() {
+    return OAuthProviderRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "RemoveOAuthProvider(" + providerName + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/UpdateOAuthProviderRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/UpdateOAuthProviderRepositoryCommand.java
index cf6ba8bdca..8d536ec0ba 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/UpdateOAuthProviderRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/oauth/commands/UpdateOAuthProviderRepositoryCommand.java
@@ -5,38 +5,40 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class UpdateOAuthProviderRepositoryCommand extends RepositoryCommand<OAuthProviderRepository> {
-
-    private final OAuthProvider provider;
-
-    private OAuthProvider backup;
-
-    public UpdateOAuthProviderRepositoryCommand(OAuthProvider provider) {
-        this.provider = provider;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
-        backup = holder.getRepository().getOAuthProviderDetails(provider.getName());
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
-        holder.getRepository().updateOAuthProvider(provider);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
-        holder.getRepository().updateOAuthProvider(backup);
-    }
-
-    @Override
-    public Class<OAuthProviderRepository> getRepositoryType() {
-        return OAuthProviderRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "UpdateOAuthProvider(" + provider.getName() + ")";
-    }
+public class UpdateOAuthProviderRepositoryCommand
+    extends RepositoryCommand<OAuthProviderRepository> {
+
+  private final OAuthProvider provider;
+
+  private OAuthProvider backup;
+
+  public UpdateOAuthProviderRepositoryCommand(OAuthProvider provider) {
+    this.provider = provider;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
+    backup = holder.getRepository().getOAuthProviderDetails(provider.getName());
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder) {
+    holder.getRepository().updateOAuthProvider(provider);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<OAuthProviderRepository> holder, Exception exception) {
+    holder.getRepository().updateOAuthProvider(backup);
+  }
+
+  @Override
+  public Class<OAuthProviderRepository> getRepositoryType() {
+    return OAuthProviderRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "UpdateOAuthProvider(" + provider.getName() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/CrowdOwnerSource.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/CrowdOwnerSource.java
deleted file mode 100644
index bfb00aa25e..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/CrowdOwnerSource.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package pl.allegro.tech.hermes.management.domain.owner;
-
-import com.google.common.base.Strings;
-import pl.allegro.tech.hermes.api.Owner;
-import pl.allegro.tech.hermes.management.infrastructure.crowd.CrowdClient;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class CrowdOwnerSource implements OwnerSource {
-
-    public static final String NAME = "Crowd";
-
-    private final CrowdClient crowdClient;
-
-    public CrowdOwnerSource(CrowdClient crowdClient) {
-        this.crowdClient = crowdClient;
-    }
-
-    @Override
-    public String name() {
-        return NAME;
-    }
-
-    @Override
-    public boolean exists(String ownerId) {
-        return true;
-    }
-
-    @Override
-    public Owner get(String id) {
-        return new Owner(id, id);
-    }
-
-    @Override
-    public Optional<Autocompletion> autocompletion() {
-        return Optional.of(this::ownersMatching);
-    }
-
-    private List<Owner> ownersMatching(String searchString) {
-        if (Strings.isNullOrEmpty(searchString)) {
-            return Collections.emptyList();
-        }
-
-        List<String> stableBase = Arrays.stream(searchString.split(",")).map(String::trim).collect(Collectors.toList());
-        String searchedPrefix = stableBase.remove(stableBase.size() - 1);
-        return crowdClient.getGroups(searchedPrefix)
-                .stream()
-                .map(foundName -> Stream.concat(stableBase.stream(), Stream.of(foundName)).collect(Collectors.joining(", ")))
-                .map(x -> new Owner(x, x))
-                .collect(Collectors.toList());
-    }
-
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSource.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSource.java
index 4769fb5c35..50da8f49d5 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSource.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSource.java
@@ -1,45 +1,41 @@
 package pl.allegro.tech.hermes.management.domain.owner;
 
+import java.util.List;
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.api.Owner;
 import pl.allegro.tech.hermes.management.domain.ManagementException;
 
-import java.util.List;
-import java.util.Optional;
-
 public interface OwnerSource {
 
-    String name();
+  String name();
 
-    boolean exists(String ownerId);
+  boolean exists(String ownerId);
 
-    Owner get(String id) throws OwnerNotFound;
+  Owner get(String id) throws OwnerNotFound;
 
-    default boolean isDeprecated() {
-        return false;
-    }
+  default boolean isDeprecated() {
+    return false;
+  }
 
-    /**
-     * Override if the implemented owner source supports autocompletion.
-     */
-    default Optional<Autocompletion> autocompletion() {
-        return Optional.empty();
-    }
+  /** Override if the implemented owner source supports autocompletion. */
+  default Optional<Autocompletion> autocompletion() {
+    return Optional.empty();
+  }
 
-    interface Autocompletion {
-        List<Owner> ownersMatching(String searchString);
-    }
+  interface Autocompletion {
+    List<Owner> ownersMatching(String searchString);
+  }
 
-    class OwnerNotFound extends ManagementException {
+  class OwnerNotFound extends ManagementException {
 
-        public OwnerNotFound(String source, String id) {
-            super("Owner of id '" + id + "' not found in source " + source);
-        }
-
-        @Override
-        public ErrorCode getCode() {
-            return ErrorCode.OWNER_NOT_FOUND;
-        }
+    public OwnerNotFound(String source, String id) {
+      super("Owner of id '" + id + "' not found in source " + source);
     }
 
+    @Override
+    public ErrorCode getCode() {
+      return ErrorCode.OWNER_NOT_FOUND;
+    }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSourceNotFound.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSourceNotFound.java
index 2be616ef2d..4f195fe506 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSourceNotFound.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSourceNotFound.java
@@ -5,13 +5,12 @@
 
 public class OwnerSourceNotFound extends ManagementException {
 
-    public OwnerSourceNotFound(String name) {
-        super("Owner source named '" + name + "' not found");
-    }
-
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OWNER_SOURCE_NOT_FOUND;
-    }
+  public OwnerSourceNotFound(String name) {
+    super("Owner source named '" + name + "' not found");
+  }
 
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OWNER_SOURCE_NOT_FOUND;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSources.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSources.java
index 9b7d24a9b7..e9c9e63457 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSources.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/OwnerSources.java
@@ -1,63 +1,61 @@
 package pl.allegro.tech.hermes.management.domain.owner;
 
 import com.google.common.collect.ImmutableList;
-import pl.allegro.tech.hermes.api.ErrorCode;
-import pl.allegro.tech.hermes.common.exception.HermesException;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import pl.allegro.tech.hermes.api.ErrorCode;
+import pl.allegro.tech.hermes.common.exception.HermesException;
 
 public class OwnerSources implements Iterable<OwnerSource> {
 
-    private final Map<String, OwnerSource> ownerSourcesByNames;
+  private final Map<String, OwnerSource> ownerSourcesByNames;
 
-    private final List<OwnerSource> ownerSources;
+  private final List<OwnerSource> ownerSources;
 
-    public OwnerSources(List<OwnerSource> ownerSources) {
-        if (ownerSources.isEmpty()) {
-            throw new IllegalArgumentException("At least one owner source must be configured");
-        }
+  public OwnerSources(List<OwnerSource> ownerSources) {
+    if (ownerSources.isEmpty()) {
+      throw new IllegalArgumentException("At least one owner source must be configured");
+    }
 
-        this.ownerSourcesByNames = ownerSources.stream().collect(
+    this.ownerSourcesByNames =
+        ownerSources.stream()
+            .collect(
                 Collectors.toMap(
-                        OwnerSource::name,
-                        Function.identity(),
-                        (a, b) -> {
-                            throw new IllegalArgumentException("Duplicate owner source " + a.name());
-                        }
-                )
-        );
-
-        this.ownerSources = ImmutableList.copyOf(ownerSources);
-    }
+                    OwnerSource::name,
+                    Function.identity(),
+                    (a, b) -> {
+                      throw new IllegalArgumentException("Duplicate owner source " + a.name());
+                    }));
 
-    public Optional<OwnerSource> getByName(String name) {
-        return Optional.ofNullable(ownerSourcesByNames.get(name));
-    }
+    this.ownerSources = ImmutableList.copyOf(ownerSources);
+  }
 
-    public OwnerSource.Autocompletion getAutocompletionFor(String name) {
-        OwnerSource source = getByName(name).orElseThrow(() -> new OwnerSourceNotFound(name));
-        return source.autocompletion().orElseThrow(() -> new AutocompleteNotSupportedException(source));
-    }
+  public Optional<OwnerSource> getByName(String name) {
+    return Optional.ofNullable(ownerSourcesByNames.get(name));
+  }
 
-    public Iterator<OwnerSource> iterator() {
-        return ownerSources.iterator();
-    }
+  public OwnerSource.Autocompletion getAutocompletionFor(String name) {
+    OwnerSource source = getByName(name).orElseThrow(() -> new OwnerSourceNotFound(name));
+    return source.autocompletion().orElseThrow(() -> new AutocompleteNotSupportedException(source));
+  }
 
-    private static class AutocompleteNotSupportedException extends HermesException {
+  public Iterator<OwnerSource> iterator() {
+    return ownerSources.iterator();
+  }
 
-        AutocompleteNotSupportedException(OwnerSource source) {
-            super("Owner source '" + source.name() + "' doesn't support autocomplete");
-        }
+  private static class AutocompleteNotSupportedException extends HermesException {
 
-        @Override
-        public ErrorCode getCode() {
-            return ErrorCode.OWNER_SOURCE_DOESNT_SUPPORT_AUTOCOMPLETE;
-        }
+    AutocompleteNotSupportedException(OwnerSource source) {
+      super("Owner source '" + source.name() + "' doesn't support autocomplete");
+    }
 
+    @Override
+    public ErrorCode getCode() {
+      return ErrorCode.OWNER_SOURCE_DOESNT_SUPPORT_AUTOCOMPLETE;
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/PlaintextOwnerSource.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/PlaintextOwnerSource.java
index 279358164f..6c7ea8ccae 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/PlaintextOwnerSource.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/PlaintextOwnerSource.java
@@ -8,22 +8,21 @@
 @Order(PlaintextOwnerSource.ORDER)
 public class PlaintextOwnerSource implements OwnerSource {
 
-    public static final int ORDER = 0;
-    public static final String NAME = "Plaintext";
+  public static final int ORDER = 0;
+  public static final String NAME = "Plaintext";
 
-    @Override
-    public String name() {
-        return NAME;
-    }
+  @Override
+  public String name() {
+    return NAME;
+  }
 
-    @Override
-    public boolean exists(String ownerId) {
-        return true;
-    }
-
-    @Override
-    public Owner get(String id) throws OwnerNotFound {
-        return new Owner(id, id);
-    }
+  @Override
+  public boolean exists(String ownerId) {
+    return true;
+  }
 
+  @Override
+  public Owner get(String id) throws OwnerNotFound {
+    return new Owner(id, id);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/validator/OwnerIdValidationException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/validator/OwnerIdValidationException.java
index 5d0ce6ac00..03f5cc0722 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/validator/OwnerIdValidationException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/validator/OwnerIdValidationException.java
@@ -5,13 +5,12 @@
 
 public class OwnerIdValidationException extends ManagementException {
 
-    public OwnerIdValidationException(String message) {
-        super(message);
-    }
-
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.VALIDATION_ERROR;
-    }
+  public OwnerIdValidationException(String message) {
+    super(message);
+  }
 
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.VALIDATION_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/validator/OwnerIdValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/validator/OwnerIdValidator.java
index 9d3d8d2469..af94db4e78 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/validator/OwnerIdValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/owner/validator/OwnerIdValidator.java
@@ -9,19 +9,25 @@
 @Component
 public class OwnerIdValidator {
 
-    private final OwnerSources ownerSources;
+  private final OwnerSources ownerSources;
 
-    @Autowired
-    public OwnerIdValidator(OwnerSources ownerSources) {
-        this.ownerSources = ownerSources;
-    }
+  @Autowired
+  public OwnerIdValidator(OwnerSources ownerSources) {
+    this.ownerSources = ownerSources;
+  }
 
-    public void check(OwnerId toCheck) {
-        OwnerSource source = ownerSources.getByName(toCheck.getSource())
-                .orElseThrow(() -> new OwnerIdValidationException("Owner source '" + toCheck.getSource() + "' doesn't exist"));
+  public void check(OwnerId toCheck) {
+    OwnerSource source =
+        ownerSources
+            .getByName(toCheck.getSource())
+            .orElseThrow(
+                () ->
+                    new OwnerIdValidationException(
+                        "Owner source '" + toCheck.getSource() + "' doesn't exist"));
 
-        if (!source.exists(toCheck.getId())) {
-            throw new OwnerIdValidationException("Owner '" + toCheck.getId() + "' doesn't exist in source " + toCheck.getSource());
-        }
+    if (!source.exists(toCheck.getId())) {
+      throw new OwnerIdValidationException(
+          "Owner '" + toCheck.getId() + "' doesn't exist in source " + toCheck.getSource());
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/DatacenterReadinessRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/DatacenterReadinessRepository.java
new file mode 100644
index 0000000000..f86fde1491
--- /dev/null
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/DatacenterReadinessRepository.java
@@ -0,0 +1,11 @@
+package pl.allegro.tech.hermes.management.domain.readiness;
+
+import java.util.List;
+import pl.allegro.tech.hermes.api.DatacenterReadiness;
+
+public interface DatacenterReadinessRepository {
+
+  List<DatacenterReadiness> getReadiness();
+
+  void setReadiness(List<DatacenterReadiness> datacenterReadiness);
+}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/GetReadinessQuery.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/GetReadinessQuery.java
deleted file mode 100644
index 918592dd05..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/GetReadinessQuery.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package pl.allegro.tech.hermes.management.domain.readiness;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus;
-import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
-import pl.allegro.tech.hermes.management.domain.dc.QueryCommand;
-
-public class GetReadinessQuery extends QueryCommand<ReadinessStatus, ReadinessRepository> {
-
-    private static final Logger logger = LoggerFactory.getLogger(GetReadinessQuery.class);
-
-    @Override
-    public ReadinessStatus query(DatacenterBoundRepositoryHolder<ReadinessRepository> holder) {
-        try {
-            boolean ready = holder.getRepository().isReady();
-            return ready ? ReadinessStatus.READY : ReadinessStatus.NOT_READY;
-        } catch (Exception e) {
-            logger.error("Cannot obtain readiness status from {}", holder.getDatacenterName(), e);
-            return ReadinessStatus.UNDEFINED;
-        }
-    }
-
-    @Override
-    public Class<ReadinessRepository> getRepositoryType() {
-        return ReadinessRepository.class;
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/ReadinessRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/ReadinessRepository.java
deleted file mode 100644
index c33487f53e..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/ReadinessRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package pl.allegro.tech.hermes.management.domain.readiness;
-
-public interface ReadinessRepository {
-
-    boolean isReady();
-
-    void setReadiness(boolean isReady);
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/ReadinessService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/ReadinessService.java
index f9a01f4f52..a9d51f6555 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/ReadinessService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/ReadinessService.java
@@ -1,29 +1,59 @@
 package pl.allegro.tech.hermes.management.domain.readiness;
 
-import pl.allegro.tech.hermes.api.DatacenterReadiness;
-import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryCommandExecutor;
-import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryQueryExecutor;
+import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.READY;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
 import java.util.stream.Collectors;
+import pl.allegro.tech.hermes.api.DatacenterReadiness;
+import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryCommandExecutor;
 
 public class ReadinessService {
-    private final MultiDatacenterRepositoryCommandExecutor commandExecutor;
-    private final MultiDatacenterRepositoryQueryExecutor queryExecutor;
 
-    public ReadinessService(MultiDatacenterRepositoryCommandExecutor commandExecutor,
-                            MultiDatacenterRepositoryQueryExecutor queryExecutor) {
-        this.commandExecutor = commandExecutor;
-        this.queryExecutor = queryExecutor;
-    }
+  private final MultiDatacenterRepositoryCommandExecutor commandExecutor;
+  private final DatacenterReadinessRepository readinessRepository;
+  private final List<String> datacenters;
+
+  public ReadinessService(
+      MultiDatacenterRepositoryCommandExecutor commandExecutor,
+      DatacenterReadinessRepository readinessRepository,
+      List<String> datacenters) {
+    this.commandExecutor = commandExecutor;
+    this.readinessRepository = readinessRepository;
+    this.datacenters = datacenters;
+  }
 
-    public void setReady(DatacenterReadiness datacenterReadiness) {
-        commandExecutor.execute(new SetReadinessCommand(datacenterReadiness));
+  public void setReady(DatacenterReadiness datacenterReadiness) {
+    Map<String, DatacenterReadiness> current = getReadiness();
+    Map<String, DatacenterReadiness> toSave = new HashMap<>();
+    for (String datacenter : datacenters) {
+      toSave.put(datacenter, current.get(datacenter));
     }
+    toSave.put(datacenterReadiness.getDatacenter(), datacenterReadiness);
+    List<DatacenterReadiness> readiness =
+        toSave.values().stream().filter(Objects::nonNull).toList();
+    commandExecutor.execute(new SetReadinessCommand(readiness));
+  }
 
-    public List<DatacenterReadiness> getDatacentersReadinesses() {
-        return queryExecutor.execute(new GetReadinessQuery()).stream()
-                .map(r -> new DatacenterReadiness(r.getDatacenterName(), r.getResult()))
-                .collect(Collectors.toList());
+  public List<DatacenterReadiness> getDatacentersReadiness() {
+    Map<String, DatacenterReadiness> current = getReadiness();
+    Map<String, DatacenterReadiness> result = new HashMap<>();
+    for (String datacenter : datacenters) {
+      DatacenterReadiness datacenterReadiness = current.get(datacenter);
+      if (datacenterReadiness == null) {
+        result.put(datacenter, new DatacenterReadiness(datacenter, READY));
+      } else {
+        result.put(datacenter, datacenterReadiness);
+      }
     }
+    return result.values().stream().toList();
+  }
+
+  private Map<String, DatacenterReadiness> getReadiness() {
+    return readinessRepository.getReadiness().stream()
+        .collect(Collectors.toMap(DatacenterReadiness::getDatacenter, Function.identity()));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/SetReadinessCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/SetReadinessCommand.java
index a96f0caec9..3077c43fa9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/SetReadinessCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/readiness/SetReadinessCommand.java
@@ -1,48 +1,36 @@
 package pl.allegro.tech.hermes.management.domain.readiness;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.DatacenterReadiness;
-import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class SetReadinessCommand extends RepositoryCommand<ReadinessRepository> {
-    private final DatacenterReadiness readiness;
-
-    public SetReadinessCommand(DatacenterReadiness readiness) {
-        this.readiness = readiness;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<ReadinessRepository> holder) { }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<ReadinessRepository> holder) {
-        if (holder.getDatacenterName().equals(readiness.getDatacenter())) {
-            holder.getRepository().setReadiness(isReady());
-        }
-    }
-
-    private boolean isReady() {
-        switch (readiness.getStatus()) {
-            case READY:
-                return true;
-            case NOT_READY:
-                return false;
-            default:
-                throw new InternalProcessingException("Invalid readiness status: " + readiness.getStatus());
-        }
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<ReadinessRepository> holder) { }
-
-    @Override
-    public Class<ReadinessRepository> getRepositoryType() {
-        return ReadinessRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "SetReadinessCommand(" + readiness.toString() + ")";
-    }
+public class SetReadinessCommand extends RepositoryCommand<DatacenterReadinessRepository> {
+  private final List<DatacenterReadiness> readiness;
+
+  public SetReadinessCommand(List<DatacenterReadiness> readiness) {
+    this.readiness = readiness;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<DatacenterReadinessRepository> holder) {}
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<DatacenterReadinessRepository> holder) {
+    holder.getRepository().setReadiness(readiness);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<DatacenterReadinessRepository> holder, Exception exception) {}
+
+  @Override
+  public Class<DatacenterReadinessRepository> getRepositoryType() {
+    return DatacenterReadinessRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "SetReadinessCommand(" + readiness.toString() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/CreateOfflineRetransmissionTaskCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/CreateOfflineRetransmissionTaskCommand.java
index b6d070a7b7..6377d006fd 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/CreateOfflineRetransmissionTaskCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/CreateOfflineRetransmissionTaskCommand.java
@@ -4,34 +4,36 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-class CreateOfflineRetransmissionTaskCommand extends RepositoryCommand<OfflineRetransmissionRepository> {
-    private final OfflineRetransmissionTask task;
-
-    CreateOfflineRetransmissionTaskCommand(OfflineRetransmissionTask task) {
-        this.task = task;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {
-        holder.getRepository().saveTask(task);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {
-        holder.getRepository().deleteTask(task.getTaskId());
-    }
-
-    @Override
-    public Class<OfflineRetransmissionRepository> getRepositoryType() {
-        return OfflineRetransmissionRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "CreateOfflineRetransmissionTaskCommand(" + task.getTaskId() + ")";
-    }
+class CreateOfflineRetransmissionTaskCommand
+    extends RepositoryCommand<OfflineRetransmissionRepository> {
+  private final OfflineRetransmissionTask task;
+
+  CreateOfflineRetransmissionTaskCommand(OfflineRetransmissionTask task) {
+    this.task = task;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {}
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {
+    holder.getRepository().saveTask(task);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder,
+      Exception exception) {
+    holder.getRepository().deleteTask(task.getTaskId());
+  }
+
+  @Override
+  public Class<OfflineRetransmissionRepository> getRepositoryType() {
+    return OfflineRetransmissionRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "CreateOfflineRetransmissionTaskCommand(" + task.getTaskId() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/DcAwareOfflineRetransmissionRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/DcAwareOfflineRetransmissionRepository.java
index b627a4d097..c3f904e9d9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/DcAwareOfflineRetransmissionRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/DcAwareOfflineRetransmissionRepository.java
@@ -1,32 +1,32 @@
 package pl.allegro.tech.hermes.management.domain.retransmit;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.OfflineRetransmissionTask;
 import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryCommandExecutor;
 
-import java.util.List;
-
 public class DcAwareOfflineRetransmissionRepository implements OfflineRetransmissionRepository {
-    private final MultiDatacenterRepositoryCommandExecutor commandExecutor;
-    private final OfflineRetransmissionRepository offlineRetransmissionRepository;
+  private final MultiDatacenterRepositoryCommandExecutor commandExecutor;
+  private final OfflineRetransmissionRepository offlineRetransmissionRepository;
 
-    public DcAwareOfflineRetransmissionRepository(MultiDatacenterRepositoryCommandExecutor commandExecutor,
-                                                  OfflineRetransmissionRepository offlineRetransmissionRepository) {
-        this.commandExecutor = commandExecutor;
-        this.offlineRetransmissionRepository = offlineRetransmissionRepository;
-    }
+  public DcAwareOfflineRetransmissionRepository(
+      MultiDatacenterRepositoryCommandExecutor commandExecutor,
+      OfflineRetransmissionRepository offlineRetransmissionRepository) {
+    this.commandExecutor = commandExecutor;
+    this.offlineRetransmissionRepository = offlineRetransmissionRepository;
+  }
 
-    @Override
-    public void saveTask(OfflineRetransmissionTask task) {
-        commandExecutor.execute(new CreateOfflineRetransmissionTaskCommand(task));
-    }
+  @Override
+  public void saveTask(OfflineRetransmissionTask task) {
+    commandExecutor.execute(new CreateOfflineRetransmissionTaskCommand(task));
+  }
 
-    @Override
-    public List<OfflineRetransmissionTask> getAllTasks() {
-        return offlineRetransmissionRepository.getAllTasks();
-    }
+  @Override
+  public List<OfflineRetransmissionTask> getAllTasks() {
+    return offlineRetransmissionRepository.getAllTasks();
+  }
 
-    @Override
-    public void deleteTask(String taskId) {
-        commandExecutor.execute(new DeleteOfflineRetransmissionTaskCommand(taskId));
-    }
+  @Override
+  public void deleteTask(String taskId) {
+    commandExecutor.execute(new DeleteOfflineRetransmissionTaskCommand(taskId));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/DeleteOfflineRetransmissionTaskCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/DeleteOfflineRetransmissionTaskCommand.java
index 8697d50505..466ff67589 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/DeleteOfflineRetransmissionTaskCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/DeleteOfflineRetransmissionTaskCommand.java
@@ -3,30 +3,29 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-class DeleteOfflineRetransmissionTaskCommand extends RepositoryCommand<OfflineRetransmissionRepository> {
-    private final String taskId;
-
-    DeleteOfflineRetransmissionTaskCommand(String taskId) {
-        this.taskId = taskId;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {
-
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {
-        holder.getRepository().deleteTask(taskId);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {
-
-    }
-
-    @Override
-    public Class<OfflineRetransmissionRepository> getRepositoryType() {
-        return OfflineRetransmissionRepository.class;
-    }
+class DeleteOfflineRetransmissionTaskCommand
+    extends RepositoryCommand<OfflineRetransmissionRepository> {
+  private final String taskId;
+
+  DeleteOfflineRetransmissionTaskCommand(String taskId) {
+    this.taskId = taskId;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {}
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder) {
+    holder.getRepository().deleteTask(taskId);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<OfflineRetransmissionRepository> holder,
+      Exception exception) {}
+
+  @Override
+  public Class<OfflineRetransmissionRepository> getRepositoryType() {
+    return OfflineRetransmissionRepository.class;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionRepository.java
index deef876ce1..584d2aff3a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionRepository.java
@@ -1,13 +1,12 @@
 package pl.allegro.tech.hermes.management.domain.retransmit;
 
-import pl.allegro.tech.hermes.api.OfflineRetransmissionTask;
-
 import java.util.List;
+import pl.allegro.tech.hermes.api.OfflineRetransmissionTask;
 
 public interface OfflineRetransmissionRepository {
-    void saveTask(OfflineRetransmissionTask task);
+  void saveTask(OfflineRetransmissionTask task);
 
-    List<OfflineRetransmissionTask> getAllTasks();
+  List<OfflineRetransmissionTask> getAllTasks();
 
-    void deleteTask(String taskId);
+  void deleteTask(String taskId);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionService.java
index b8c49e281a..4cc6bfb061 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionService.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.management.domain.retransmit;
 
+import java.time.Instant;
+import java.util.List;
+import java.util.UUID;
 import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
 import pl.allegro.tech.hermes.api.OfflineRetransmissionTask;
 import pl.allegro.tech.hermes.api.Topic;
@@ -7,75 +10,74 @@
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 import pl.allegro.tech.hermes.domain.topic.TopicRepository;
 
-import java.time.Instant;
-import java.util.List;
-import java.util.UUID;
-
 public class OfflineRetransmissionService {
-    private final OfflineRetransmissionRepository offlineRetransmissionRepository;
-    private final TopicRepository topicRepository;
+  private final OfflineRetransmissionRepository offlineRetransmissionRepository;
+  private final TopicRepository topicRepository;
 
-    public OfflineRetransmissionService(OfflineRetransmissionRepository offlineRetransmissionRepository, TopicRepository topicRepository) {
-        this.offlineRetransmissionRepository = offlineRetransmissionRepository;
-        this.topicRepository = topicRepository;
-    }
+  public OfflineRetransmissionService(
+      OfflineRetransmissionRepository offlineRetransmissionRepository,
+      TopicRepository topicRepository) {
+    this.offlineRetransmissionRepository = offlineRetransmissionRepository;
+    this.topicRepository = topicRepository;
+  }
 
-    public void validateRequest(OfflineRetransmissionRequest request) {
-        TopicName sourceTopicName = TopicName.fromQualifiedName(request.getSourceTopic());
-        TopicName targetTopicName = TopicName.fromQualifiedName(request.getTargetTopic());
+  public void validateRequest(OfflineRetransmissionRequest request) {
+    TopicName sourceTopicName = TopicName.fromQualifiedName(request.getSourceTopic().orElse(null));
+    TopicName targetTopicName = TopicName.fromQualifiedName(request.getTargetTopic());
 
-        ensureTopicsExist(sourceTopicName, targetTopicName);
-        ensureTimeRangeIsProper(request);
-        ensureTopicIsNotStoredOffline(targetTopicName);
-    }
+    ensureTopicsExist(sourceTopicName, targetTopicName);
+    ensureTimeRangeIsProper(request);
+    ensureTopicIsNotStoredOffline(targetTopicName);
+  }
 
-    public void createTask(OfflineRetransmissionRequest request) {
-        saveTask(request);
-    }
+  public OfflineRetransmissionTask createTask(OfflineRetransmissionRequest request) {
+    return saveTask(request);
+  }
 
-    public List<OfflineRetransmissionTask> getAllTasks() {
-        return offlineRetransmissionRepository.getAllTasks();
-    }
+  public List<OfflineRetransmissionTask> getAllTasks() {
+    return offlineRetransmissionRepository.getAllTasks();
+  }
 
-    public void deleteTask(String taskId) {
-        try {
-            offlineRetransmissionRepository.deleteTask(taskId);
-        } catch (InternalProcessingException ex) {
-            if (ex.getCause() instanceof OfflineRetransmissionValidationException) {
-                throw (OfflineRetransmissionValidationException) ex.getCause();
-            }
-            throw ex;
-        }
+  public void deleteTask(String taskId) {
+    try {
+      offlineRetransmissionRepository.deleteTask(taskId);
+    } catch (InternalProcessingException ex) {
+      if (ex.getCause() instanceof OfflineRetransmissionValidationException) {
+        throw (OfflineRetransmissionValidationException) ex.getCause();
+      }
+      throw ex;
     }
+  }
 
-    private void ensureTopicsExist(TopicName sourceTopicName, TopicName targetTopicName) {
-        boolean sourceTopicExists = topicRepository.topicExists(sourceTopicName);
-        boolean targetTopicExists = topicRepository.topicExists(targetTopicName);
-        if (!sourceTopicExists) {
-            throw new OfflineRetransmissionValidationException("Source topic does not exist");
-        }
-        if (!targetTopicExists) {
-            throw new OfflineRetransmissionValidationException("Target topic does not exist");
-        }
+  private void ensureTopicsExist(TopicName sourceTopicName, TopicName targetTopicName) {
+    if (sourceTopicName != null && !topicRepository.topicExists(sourceTopicName)) {
+      throw new OfflineRetransmissionValidationException("Source topic does not exist");
     }
 
-    private void ensureTimeRangeIsProper(OfflineRetransmissionRequest request) {
-        if (request.getStartTimestamp().isAfter(request.getEndTimestamp())
-                || request.getStartTimestamp().equals(request.getEndTimestamp())) {
-            throw new OfflineRetransmissionValidationException("End timestamp must be greater than start timestamp");
-        }
+    if (!topicRepository.topicExists(targetTopicName)) {
+      throw new OfflineRetransmissionValidationException("Target topic does not exist");
     }
+  }
 
-    private void ensureTopicIsNotStoredOffline(TopicName targetTopicName) {
-        Topic targetTopic = topicRepository.getTopicDetails(targetTopicName);
-        if (targetTopic.getOfflineStorage().isEnabled()) {
-            throw new OfflineRetransmissionValidationException("Target topic must not be stored offline");
-        }
+  private void ensureTimeRangeIsProper(OfflineRetransmissionRequest request) {
+    if (request.getStartTimestamp().isAfter(request.getEndTimestamp())
+        || request.getStartTimestamp().equals(request.getEndTimestamp())) {
+      throw new OfflineRetransmissionValidationException(
+          "End timestamp must be greater than start timestamp");
     }
+  }
 
-    private void saveTask(OfflineRetransmissionRequest request) {
-        OfflineRetransmissionTask task =
-                new OfflineRetransmissionTask(UUID.randomUUID().toString(), request, Instant.now());
-        offlineRetransmissionRepository.saveTask(task);
+  private void ensureTopicIsNotStoredOffline(TopicName targetTopicName) {
+    Topic targetTopic = topicRepository.getTopicDetails(targetTopicName);
+    if (targetTopic.getOfflineStorage().isEnabled()) {
+      throw new OfflineRetransmissionValidationException("Target topic must not be stored offline");
     }
+  }
+
+  private OfflineRetransmissionTask saveTask(OfflineRetransmissionRequest request) {
+    OfflineRetransmissionTask task =
+        new OfflineRetransmissionTask(UUID.randomUUID().toString(), request, Instant.now());
+    offlineRetransmissionRepository.saveTask(task);
+    return task;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionValidationException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionValidationException.java
index 99872510af..9bdf79e70a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionValidationException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/OfflineRetransmissionValidationException.java
@@ -5,12 +5,12 @@
 
 public class OfflineRetransmissionValidationException extends HermesException {
 
-    public OfflineRetransmissionValidationException(String msg) {
-        super(msg);
-    }
+  public OfflineRetransmissionValidationException(String msg) {
+    super(msg);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.VALIDATION_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.VALIDATION_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/RetransmitCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/RetransmitCommand.java
index eccd673d2b..b225ab0232 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/RetransmitCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/retransmit/RetransmitCommand.java
@@ -7,28 +7,25 @@
 
 public class RetransmitCommand extends RepositoryCommand<AdminTool> {
 
-    private final SubscriptionName subscriptionName;
+  private final SubscriptionName subscriptionName;
 
-    public RetransmitCommand(SubscriptionName subscriptionName) {
-        this.subscriptionName = subscriptionName;
-    }
+  public RetransmitCommand(SubscriptionName subscriptionName) {
+    this.subscriptionName = subscriptionName;
+  }
 
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<AdminTool> holder) {
-    }
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<AdminTool> holder) {}
 
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<AdminTool> holder) {
-        holder.getRepository().retransmit(subscriptionName);
-    }
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<AdminTool> holder) {
+    holder.getRepository().retransmit(subscriptionName);
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<AdminTool> holder) {
+  @Override
+  public void rollback(DatacenterBoundRepositoryHolder<AdminTool> holder, Exception exception) {}
 
-    }
-
-    @Override
-    public Class<AdminTool> getRepositoryType() {
-        return AdminTool.class;
-    }
+  @Override
+  public Class<AdminTool> getRepositoryType() {
+    return AdminTool.class;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/ConsumerGroupManager.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/ConsumerGroupManager.java
index 0a9eede110..9a8a99a1d3 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/ConsumerGroupManager.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/ConsumerGroupManager.java
@@ -5,5 +5,5 @@
 
 public interface ConsumerGroupManager {
 
-    void createConsumerGroup(Topic topic, Subscription subscription);
+  void createConsumerGroup(Topic topic, Subscription subscription);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionLagSource.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionLagSource.java
index a67ce8984e..711da6806c 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionLagSource.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionLagSource.java
@@ -4,5 +4,5 @@
 import pl.allegro.tech.hermes.api.TopicName;
 
 public interface SubscriptionLagSource {
-    MetricLongValue getLag(TopicName topicName, String subscriptionName);
+  MetricLongValue getLag(TopicName topicName, String subscriptionName);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionMetricsRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionMetricsRepository.java
index 427fd1a1d2..d220e837c7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionMetricsRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionMetricsRepository.java
@@ -6,7 +6,7 @@
 
 public interface SubscriptionMetricsRepository {
 
-    SubscriptionMetrics loadMetrics(TopicName topicName, String subscriptionName);
+  SubscriptionMetrics loadMetrics(TopicName topicName, String subscriptionName);
 
-    PersistentSubscriptionMetrics loadZookeeperMetrics(TopicName topicName, String subscriptionName);
+  PersistentSubscriptionMetrics loadZookeeperMetrics(TopicName topicName, String subscriptionName);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionOwnerCache.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionOwnerCache.java
index 9604d8e9ea..08d7bdb582 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionOwnerCache.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionOwnerCache.java
@@ -5,6 +5,10 @@
 import com.google.common.collect.Multimaps;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import jakarta.annotation.PreDestroy;
+import java.util.Collection;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -15,69 +19,71 @@
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 
-import java.util.Collection;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 @Component
 public class SubscriptionOwnerCache {
 
-    private static final Logger logger = LoggerFactory.getLogger(SubscriptionOwnerCache.class);
+  private static final Logger logger = LoggerFactory.getLogger(SubscriptionOwnerCache.class);
 
-    private final SubscriptionRepository subscriptionRepository;
-    private final ScheduledExecutorService scheduledExecutorService;
+  private final SubscriptionRepository subscriptionRepository;
+  private final ScheduledExecutorService scheduledExecutorService;
 
-    private Multimap<OwnerId, SubscriptionName> cache = Multimaps.synchronizedMultimap(ArrayListMultimap.create());
+  private Multimap<OwnerId, SubscriptionName> cache =
+      Multimaps.synchronizedMultimap(ArrayListMultimap.create());
 
-    public SubscriptionOwnerCache(SubscriptionRepository subscriptionRepository,
-                                  @Value("${subscriptionOwnerCache.refreshRateInSeconds}") int refreshRateInSeconds) {
-        this.subscriptionRepository = subscriptionRepository;
-        scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(
-                new ThreadFactoryBuilder()
-                        .setNameFormat("subscription-owner-cache-%d")
-                        .build());
-        scheduledExecutorService.scheduleAtFixedRate(this::refillCache, 0, refreshRateInSeconds, TimeUnit.SECONDS);
-    }
+  public SubscriptionOwnerCache(
+      SubscriptionRepository subscriptionRepository,
+      @Value("${subscriptionOwnerCache.refreshRateInSeconds}") int refreshRateInSeconds) {
+    this.subscriptionRepository = subscriptionRepository;
+    scheduledExecutorService =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactoryBuilder().setNameFormat("subscription-owner-cache-%d").build());
+    scheduledExecutorService.scheduleAtFixedRate(
+        this::refillCache, 0, refreshRateInSeconds, TimeUnit.SECONDS);
+  }
 
-    @PreDestroy
-    public void stop() {
-        scheduledExecutorService.shutdown();
-    }
+  @PreDestroy
+  public void stop() {
+    scheduledExecutorService.shutdown();
+  }
 
-    Collection<SubscriptionName> get(OwnerId ownerId) {
-        return cache.get(ownerId);
-    }
+  Collection<SubscriptionName> get(OwnerId ownerId) {
+    return cache.get(ownerId);
+  }
 
-    Collection<SubscriptionName> getAll() {
-        return cache.values();
-    }
+  Collection<SubscriptionName> getAll() {
+    return cache.values();
+  }
 
-    void onRemovedSubscription(String subscriptionName, TopicName topicName) {
-        cache.entries().removeIf(entry -> entry.getValue().equals(new SubscriptionName(subscriptionName, topicName)));
-    }
+  void onRemovedSubscription(String subscriptionName, TopicName topicName) {
+    cache
+        .entries()
+        .removeIf(
+            entry -> entry.getValue().equals(new SubscriptionName(subscriptionName, topicName)));
+  }
 
-    void onCreatedSubscription(Subscription subscription) {
-        cache.put(subscription.getOwner(), subscription.getQualifiedName());
-    }
+  void onCreatedSubscription(Subscription subscription) {
+    cache.put(subscription.getOwner(), subscription.getQualifiedName());
+  }
 
-    void onUpdatedSubscription(Subscription oldSubscription, Subscription newSubscription) {
-        cache.remove(oldSubscription.getOwner(), oldSubscription.getQualifiedName());
-        cache.put(newSubscription.getOwner(), newSubscription.getQualifiedName());
-    }
+  void onUpdatedSubscription(Subscription oldSubscription, Subscription newSubscription) {
+    cache.remove(oldSubscription.getOwner(), oldSubscription.getQualifiedName());
+    cache.put(newSubscription.getOwner(), newSubscription.getQualifiedName());
+  }
 
-    private void refillCache() {
-        try {
-            logger.info("Starting filling SubscriptionOwnerCache");
-            long start = System.currentTimeMillis();
-            Multimap<OwnerId, SubscriptionName> cache = ArrayListMultimap.create();
-            subscriptionRepository.listAllSubscriptions()
-                    .forEach(subscription -> cache.put(subscription.getOwner(), subscription.getQualifiedName()));
-            this.cache = Multimaps.synchronizedMultimap(cache);
-            long end = System.currentTimeMillis();
-            logger.info("SubscriptionOwnerCache filled. Took {}ms", end - start);
-        } catch (Exception e) {
-            logger.error("Error while filling SubscriptionOwnerCache", e);
-        }
+  private void refillCache() {
+    try {
+      logger.info("Starting filling SubscriptionOwnerCache");
+      long start = System.currentTimeMillis();
+      Multimap<OwnerId, SubscriptionName> cache = ArrayListMultimap.create();
+      subscriptionRepository
+          .listAllSubscriptions()
+          .forEach(
+              subscription -> cache.put(subscription.getOwner(), subscription.getQualifiedName()));
+      this.cache = Multimaps.synchronizedMultimap(cache);
+      long end = System.currentTimeMillis();
+      logger.info("SubscriptionOwnerCache filled. Took {}ms", end - start);
+    } catch (Exception e) {
+      logger.error("Error while filling SubscriptionOwnerCache", e);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionRemover.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionRemover.java
index 4e9a90edfd..b83b57a72f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionRemover.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionRemover.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.management.domain.subscription;
 
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -12,50 +13,58 @@
 import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryCommandExecutor;
 import pl.allegro.tech.hermes.management.domain.subscription.commands.RemoveSubscriptionRepositoryCommand;
 
-import java.util.List;
-
 public class SubscriptionRemover {
 
-    private static final Logger logger = LoggerFactory.getLogger(SubscriptionRemover.class);
-    private final Auditor auditor;
-    private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
-    private final SubscriptionOwnerCache subscriptionOwnerCache;
-    private final SubscriptionRepository subscriptionRepository;
-
-
-    public SubscriptionRemover(Auditor auditor,
-                               MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
-                               SubscriptionOwnerCache subscriptionOwnerCache,
-                               SubscriptionRepository subscriptionRepository) {
-        this.auditor = auditor;
-        this.multiDcExecutor = multiDcExecutor;
-        this.subscriptionOwnerCache = subscriptionOwnerCache;
-        this.subscriptionRepository = subscriptionRepository;
-    }
+  private static final Logger logger = LoggerFactory.getLogger(SubscriptionRemover.class);
+  private final Auditor auditor;
+  private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+  private final SubscriptionOwnerCache subscriptionOwnerCache;
+  private final SubscriptionRepository subscriptionRepository;
 
-    public void removeSubscription(TopicName topicName, String subscriptionName, RequestUser removedBy) {
-        auditor.beforeObjectRemoval(removedBy.getUsername(), Subscription.class.getSimpleName(), subscriptionName);
-        Subscription subscription = subscriptionRepository.getSubscriptionDetails(topicName, subscriptionName);
-        multiDcExecutor.executeByUser(new RemoveSubscriptionRepositoryCommand(topicName, subscriptionName), removedBy);
-        auditor.objectRemoved(removedBy.getUsername(), subscription);
-        subscriptionOwnerCache.onRemovedSubscription(subscriptionName, topicName);
-    }
-
-    public void removeSubscriptionRelatedToTopic(Topic topic, RequestUser removedBy) {
-        List<Subscription> subscriptions = subscriptionRepository.listSubscriptions(topic.getName());
+  public SubscriptionRemover(
+      Auditor auditor,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
+      SubscriptionOwnerCache subscriptionOwnerCache,
+      SubscriptionRepository subscriptionRepository) {
+    this.auditor = auditor;
+    this.multiDcExecutor = multiDcExecutor;
+    this.subscriptionOwnerCache = subscriptionOwnerCache;
+    this.subscriptionRepository = subscriptionRepository;
+  }
 
-        ensureSubscriptionsHaveAutoRemove(subscriptions, topic.getName());
-        subscriptions.forEach(sub -> removeSubscription(topic.getName(), sub.getName(), removedBy));
-    }
+  public void removeSubscription(
+      TopicName topicName, String subscriptionName, RequestUser removedBy) {
+    auditor.beforeObjectRemoval(
+        removedBy.getUsername(), Subscription.class.getSimpleName(), subscriptionName);
+    Subscription subscription =
+        subscriptionRepository.getSubscriptionDetails(topicName, subscriptionName);
+    multiDcExecutor.executeByUser(
+        new RemoveSubscriptionRepositoryCommand(topicName, subscriptionName), removedBy);
+    auditor.objectRemoved(removedBy.getUsername(), subscription);
+    subscriptionOwnerCache.onRemovedSubscription(subscriptionName, topicName);
+  }
 
+  public void removeSubscriptionRelatedToTopic(Topic topic, RequestUser removedBy) {
+    List<Subscription> subscriptions = subscriptionRepository.listSubscriptions(topic.getName());
+    ensureSubscriptionsHaveAutoRemove(subscriptions, topic.getName());
+    logger.info(
+        "Removing subscriptions of topic: {}, subscriptions: {}", topic.getName(), subscriptions);
+    long start = System.currentTimeMillis();
+    subscriptions.forEach(sub -> removeSubscription(topic.getName(), sub.getName(), removedBy));
+    logger.info(
+        "Removed subscriptions of topic: {} in {} ms",
+        topic.getName(),
+        System.currentTimeMillis() - start);
+  }
 
-    private void ensureSubscriptionsHaveAutoRemove(List<Subscription> subscriptions, TopicName topicName) {
-        boolean anySubscriptionWithoutAutoRemove = subscriptions.stream()
-                .anyMatch(sub -> !sub.isAutoDeleteWithTopicEnabled());
+  private void ensureSubscriptionsHaveAutoRemove(
+      List<Subscription> subscriptions, TopicName topicName) {
+    boolean anySubscriptionWithoutAutoRemove =
+        subscriptions.stream().anyMatch(sub -> !sub.isAutoDeleteWithTopicEnabled());
 
-        if (anySubscriptionWithoutAutoRemove) {
-            logger.info("Cannot remove topic due to connected subscriptions");
-            throw new TopicNotEmptyException(topicName);
-        }
+    if (anySubscriptionWithoutAutoRemove) {
+      logger.info("Cannot remove topic due to connected subscriptions");
+      throw new TopicNotEmptyException(topicName);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionService.java
index 82b65febd6..c8d088e598 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionService.java
@@ -1,5 +1,23 @@
 package pl.allegro.tech.hermes.management.domain.subscription;
 
+import static java.util.stream.Collectors.toList;
+import static pl.allegro.tech.hermes.api.SubscriptionHealth.Status;
+import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,376 +54,411 @@
 import pl.allegro.tech.hermes.management.infrastructure.kafka.MultiDCAwareService;
 import pl.allegro.tech.hermes.tracker.management.LogRepository;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.util.stream.Collectors.toList;
-import static pl.allegro.tech.hermes.api.SubscriptionHealth.Status;
-import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
-
 public class SubscriptionService {
-    private static final Logger logger = LoggerFactory.getLogger(SubscriptionService.class);
-
-    private static final int LAST_MESSAGE_COUNT = 100;
-
-    private final SubscriptionRepository subscriptionRepository;
-    private final SubscriptionOwnerCache subscriptionOwnerCache;
-    private final TopicService topicService;
-    private final SubscriptionMetricsRepository metricsRepository;
-    private final SubscriptionHealthChecker subscriptionHealthChecker;
-    private final LogRepository logRepository;
-    private final SubscriptionValidator subscriptionValidator;
-    private final Auditor auditor;
-    private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
-    private final MultiDCAwareService multiDCAwareService;
-    private final RepositoryManager repositoryManager;
-    private final long subscriptionHealthCheckTimeoutMillis;
-    private final ExecutorService subscriptionHealthCheckExecutorService;
-    private final SubscriptionRemover subscriptionRemover;
-
-
-    public SubscriptionService(SubscriptionRepository subscriptionRepository,
-                               SubscriptionOwnerCache subscriptionOwnerCache,
-                               TopicService topicService,
-                               SubscriptionMetricsRepository metricsRepository,
-                               SubscriptionHealthChecker subscriptionHealthChecker,
-                               LogRepository logRepository,
-                               SubscriptionValidator subscriptionValidator,
-                               Auditor auditor,
-                               MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
-                               MultiDCAwareService multiDCAwareService,
-                               RepositoryManager repositoryManager,
-                               ExecutorService unhealthyGetExecutorService,
-                               long unhealthyGetTimeoutMillis,
-                               SubscriptionRemover subscriptionRemover) {
-        this.subscriptionRepository = subscriptionRepository;
-        this.subscriptionOwnerCache = subscriptionOwnerCache;
-        this.topicService = topicService;
-        this.metricsRepository = metricsRepository;
-        this.subscriptionHealthChecker = subscriptionHealthChecker;
-        this.logRepository = logRepository;
-        this.subscriptionValidator = subscriptionValidator;
-        this.auditor = auditor;
-        this.multiDcExecutor = multiDcExecutor;
-        this.multiDCAwareService = multiDCAwareService;
-        this.repositoryManager = repositoryManager;
-        this.subscriptionHealthCheckExecutorService = unhealthyGetExecutorService;
-        this.subscriptionHealthCheckTimeoutMillis = unhealthyGetTimeoutMillis;
-        this.subscriptionRemover = subscriptionRemover;
-    }
-
-    public List<String> listSubscriptionNames(TopicName topicName) {
-        return subscriptionRepository.listSubscriptionNames(topicName);
-    }
-
-    public List<String> listTrackedSubscriptionNames(TopicName topicName) {
-        return listSubscriptions(topicName).stream()
-                .filter(Subscription::isTrackingEnabled)
-                .map(Subscription::getName)
-                .collect(toList());
-    }
-
-    public List<String> listFilteredSubscriptionNames(TopicName topicName, Query<Subscription> query) {
-        return query.filter(listSubscriptions(topicName))
-                .map(Subscription::getName)
-                .collect(toList());
-    }
-
-    public List<Subscription> listSubscriptions(TopicName topicName) {
-        return subscriptionRepository.listSubscriptions(topicName);
-    }
-
-    public void createSubscription(Subscription subscription, RequestUser createdBy, String qualifiedTopicName) {
-        auditor.beforeObjectCreation(createdBy.getUsername(), subscription);
-        subscriptionValidator.checkCreation(subscription, createdBy);
-
-        Topic topic = topicService.getTopicDetails(fromQualifiedName(qualifiedTopicName));
-        multiDCAwareService.createConsumerGroups(topic, subscription);
-
-        multiDcExecutor.executeByUser(new CreateSubscriptionRepositoryCommand(subscription), createdBy);
-        auditor.objectCreated(createdBy.getUsername(), subscription);
-        subscriptionOwnerCache.onCreatedSubscription(subscription);
-    }
-
-    public Subscription getSubscriptionDetails(TopicName topicName, String subscriptionName) {
-        Subscription subscription = subscriptionRepository.getSubscriptionDetails(topicName, subscriptionName)
-                .anonymize();
-        subscription.setState(getEffectiveState(topicName, subscriptionName));
-        return subscription;
-    }
-
-    private CompletableFuture<List<Subscription>> getSubscriptionDetails(Collection<SubscriptionName> subscriptionNames) {
-        return CompletableFuture.supplyAsync(() ->
-                subscriptionRepository.getSubscriptionDetails(subscriptionNames), subscriptionHealthCheckExecutorService);
-    }
-
-    private Subscription.State getEffectiveState(TopicName topicName, String subscriptionName) {
-        Set<Subscription.State> states = loadSubscriptionStatesFromAllDc(topicName, subscriptionName);
-
-        if (states.size() > 1) {
-            logger.warn("Some states are out of sync: {}", states);
-        }
-
-        if (states.contains(Subscription.State.ACTIVE)) {
-            return Subscription.State.ACTIVE;
-        } else if (states.contains(Subscription.State.SUSPENDED)) {
-            return Subscription.State.SUSPENDED;
-        } else {
-            return Subscription.State.PENDING;
-        }
-    }
-
-    private Set<Subscription.State> loadSubscriptionStatesFromAllDc(TopicName topicName, String subscriptionName) {
-        List<DatacenterBoundRepositoryHolder<SubscriptionRepository>> holders =
-                repositoryManager.getRepositories(SubscriptionRepository.class);
-        Set<Subscription.State> states = new HashSet<>();
-        for (DatacenterBoundRepositoryHolder<SubscriptionRepository> holder : holders) {
-            try {
-                Subscription.State state = holder.getRepository().getSubscriptionDetails(topicName, subscriptionName)
-                        .getState();
-                states.add(state);
-            } catch (Exception e) {
-                logger.warn("Could not load state of subscription (topic: {}, name: {}) from DC {}.",
-                        topicName, subscriptionName, holder.getDatacenterName());
-            }
-        }
-        return states;
-    }
-
-    public void removeSubscription(TopicName topicName, String subscriptionName, RequestUser removedBy) {
-        subscriptionRemover.removeSubscription(topicName, subscriptionName, removedBy);
-    }
-
-    public void updateSubscription(TopicName topicName,
-                                   String subscriptionName,
-                                   PatchData patch,
-                                   RequestUser modifiedBy) {
-        auditor.beforeObjectUpdate(modifiedBy.getUsername(), Subscription.class.getSimpleName(),
-                new SubscriptionName(subscriptionName, topicName), patch);
-
-        Subscription retrieved = subscriptionRepository.getSubscriptionDetails(topicName, subscriptionName);
-        Subscription.State oldState = retrieved.getState();
-        Subscription updated = Patch.apply(retrieved, patch);
-        revertStateIfChangedToPending(updated, oldState);
-        subscriptionValidator.checkModification(updated, modifiedBy, retrieved);
-        subscriptionOwnerCache.onUpdatedSubscription(retrieved, updated);
-
-        if (!retrieved.equals(updated)) {
-            multiDcExecutor.executeByUser(new UpdateSubscriptionRepositoryCommand(updated), modifiedBy);
-            auditor.objectUpdated(modifiedBy.getUsername(), retrieved, updated);
-        }
-    }
-
-    private void revertStateIfChangedToPending(Subscription updated, Subscription.State oldState) {
-        if (updated.getState() == Subscription.State.PENDING) {
-            updated.setState(oldState);
-        }
-    }
-
-    public void updateSubscriptionState(TopicName topicName, String subscriptionName, Subscription.State state, RequestUser modifiedBy) {
-        if (state != Subscription.State.PENDING) {
-            PatchData patchData = PatchData.patchData().set("state", state).build();
-            auditor.beforeObjectUpdate(
-                    modifiedBy.getUsername(),
-                    Subscription.class.getSimpleName(),
-                    new SubscriptionName(subscriptionName, topicName),
-                    patchData);
-            Subscription retrieved = subscriptionRepository.getSubscriptionDetails(topicName, subscriptionName);
-            if (!retrieved.getState().equals(state)) {
-                Subscription updated = Patch.apply(retrieved, patchData);
-                multiDcExecutor.executeByUser(new UpdateSubscriptionRepositoryCommand(updated), modifiedBy);
-                auditor.objectUpdated(modifiedBy.getUsername(), retrieved, updated);
-            }
-        }
-    }
-
-    public Subscription.State getSubscriptionState(TopicName topicName, String subscriptionName) {
-        return getSubscriptionDetails(topicName, subscriptionName).getState();
-    }
-
-    public SubscriptionMetrics getSubscriptionMetrics(TopicName topicName, String subscriptionName) {
-        subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
-        return metricsRepository.loadMetrics(topicName, subscriptionName);
-    }
-
-    public PersistentSubscriptionMetrics getPersistentSubscriptionMetrics(TopicName topicName, String subscriptionName) {
-        subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
-        return metricsRepository.loadZookeeperMetrics(topicName, subscriptionName);
-    }
-
-    public SubscriptionHealth getSubscriptionHealth(TopicName topicName, String subscriptionName) {
-        Subscription subscription = getSubscriptionDetails(topicName, subscriptionName);
-        return getHealth(subscription);
-    }
-
-    public Optional<SentMessageTrace> getLatestUndeliveredMessage(TopicName topicName, String subscriptionName) {
-        List<DatacenterBoundRepositoryHolder<LastUndeliveredMessageReader>> holders =
-                repositoryManager.getRepositories(LastUndeliveredMessageReader.class);
-        List<SentMessageTrace> traces = new ArrayList<>();
-        for (DatacenterBoundRepositoryHolder<LastUndeliveredMessageReader> holder : holders) {
-            try {
-                holder.getRepository().last(topicName, subscriptionName).ifPresent(traces::add);
-            } catch (Exception e) {
-                logger.warn("Could not load latest undelivered message from DC: {}", holder.getDatacenterName());
-            }
-        }
-        return traces.stream().max(Comparator.comparing(SentMessageTrace::getTimestamp));
-    }
-
-    public List<SentMessageTrace> getLatestUndeliveredMessagesTrackerLogs(TopicName topicName, String subscriptionName) {
-        return logRepository.getLastUndeliveredMessages(topicName.qualifiedName(), subscriptionName, LAST_MESSAGE_COUNT);
-    }
-
-    public List<MessageTrace> getMessageStatus(String qualifiedTopicName, String subscriptionName, String messageId) {
-        return logRepository.getMessageStatus(qualifiedTopicName, subscriptionName, messageId);
-    }
-
-    public List<Subscription> querySubscription(Query<Subscription> query) {
-        return query
-                .filter(getAllSubscriptions())
-                .collect(toList());
-    }
-
-    public List<SubscriptionNameWithMetrics> querySubscriptionsMetrics(Query<SubscriptionNameWithMetrics> query) {
-        List<Subscription> filteredSubscriptions = query.filterNames(getAllSubscriptions())
-                .collect(toList());
-        return query.filter(getSubscriptionsMetrics(filteredSubscriptions))
-                .collect(toList());
-    }
-
-    public List<Subscription> getAllSubscriptions() {
-        return topicService.getAllTopics()
-                .stream()
-                .map(Topic::getName)
-                .map(this::listSubscriptions)
-                .flatMap(List::stream)
-                .map(Subscription::anonymize)
-                .collect(toList());
-    }
-
-    public List<Subscription> getForOwnerId(OwnerId ownerId) {
-        Collection<SubscriptionName> subscriptionNames = subscriptionOwnerCache.get(ownerId);
-        return subscriptionRepository.getSubscriptionDetails(subscriptionNames);
-    }
-
-    public List<UnhealthySubscription> getAllUnhealthy(boolean respectMonitoringSeverity,
-                                                       List<String> subscriptionNames,
-                                                       List<String> qualifiedTopicNames) {
-        return getUnhealthyList(subscriptionOwnerCache.getAll(), respectMonitoringSeverity, subscriptionNames, qualifiedTopicNames);
-    }
-
-    public List<UnhealthySubscription> getUnhealthyForOwner(OwnerId ownerId,
-                                                            boolean respectMonitoringSeverity,
-                                                            List<String> subscriptionNames,
-                                                            List<String> qualifiedTopicNames) {
-        return getUnhealthyList(subscriptionOwnerCache.get(ownerId), respectMonitoringSeverity, subscriptionNames, qualifiedTopicNames);
-    }
-
-    public SubscriptionStats getStats() {
-        List<Subscription> subscriptions = getAllSubscriptions();
-        long trackingEnabledSubscriptionsCount = subscriptions.stream().filter(Subscription::isTrackingEnabled).count();
-        long avroSubscriptionCount = subscriptions.stream().filter(s -> s.getContentType() == ContentType.AVRO).count();
-        return new SubscriptionStats(subscriptions.size(), trackingEnabledSubscriptionsCount, avroSubscriptionCount);
-    }
-
-    private List<UnhealthySubscription> getUnhealthyList(Collection<SubscriptionName> ownerSubscriptionNames,
-                                                         boolean respectMonitoringSeverity,
-                                                         List<String> subscriptionNames,
-                                                         List<String> qualifiedTopicNames) {
-        try {
-            return getSubscriptionDetails(ownerSubscriptionNames)
-                    .thenComposeAsync(ownerSubscriptions -> {
-                                List<CompletableFuture<UnhealthySubscription>> unhealthySubscriptions = filterSubscriptions(
-                                        ownerSubscriptions,
-                                        respectMonitoringSeverity,
-                                        subscriptionNames,
-                                        qualifiedTopicNames
-                                );
-                                return CompletableFuture.allOf(unhealthySubscriptions.toArray(new CompletableFuture[0])).thenApply(
-                                        v -> unhealthySubscriptions.stream()
-                                                .map(CompletableFuture::join)
-                                                .filter(Objects::nonNull)
-                                                .collect(Collectors.toList())
-                                );
-                            },
-                            subscriptionHealthCheckExecutorService
-                    )
-                    .get(subscriptionHealthCheckTimeoutMillis, TimeUnit.MILLISECONDS);
-        } catch (TimeoutException e) {
-            throw new UnhealthySubscriptionGetException("Fetching unhealthy subscriptions timed out.");
-        } catch (Exception e) {
-            throw new UnhealthySubscriptionGetException("Fetching unhealthy subscriptions failed.", e);
-        }
-    }
-
-    private List<CompletableFuture<UnhealthySubscription>> filterSubscriptions(Collection<Subscription> subscriptions,
-                                                                               boolean respectMonitoringSeverity,
-                                                                               List<String> subscriptionNames,
-                                                                               List<String> qualifiedTopicNames) {
-        boolean shouldFilterBySubscriptionNames = CollectionUtils.isNotEmpty(subscriptionNames);
-        boolean shouldFilterByQualifiedTopicNames = CollectionUtils.isNotEmpty(qualifiedTopicNames);
-
-        Stream<Subscription> subscriptionStream = subscriptions.stream()
-                .filter(s -> filterBySeverityMonitorFlag(respectMonitoringSeverity, s.isSeverityNotImportant()));
-
-        if (shouldFilterBySubscriptionNames) {
-            subscriptionStream = subscriptionStream.filter(s -> filterBySubscriptionNames(subscriptionNames, s.getName()));
-        }
-        if (shouldFilterByQualifiedTopicNames) {
-            subscriptionStream =
-                    subscriptionStream.filter(s -> filterByQualifiedTopicNames(qualifiedTopicNames, s.getQualifiedTopicName()));
-        }
-
-        return subscriptionStream
-                .map(s -> CompletableFuture.supplyAsync(() -> getUnhealthy(s), subscriptionHealthCheckExecutorService))
-                .collect(toList());
-    }
-
-    private boolean filterBySubscriptionNames(List<String> subscriptionNames, String subscriptionName) {
-        return subscriptionNames.contains(subscriptionName);
-    }
-
-    private boolean filterByQualifiedTopicNames(List<String> qualifiedTopicNames, String qualifiedTopicName) {
-        return qualifiedTopicNames.contains(qualifiedTopicName);
-    }
-
-    private boolean filterBySeverityMonitorFlag(boolean respectMonitoringSeverity, boolean isSeverityNotImportant) {
-        return !(respectMonitoringSeverity && isSeverityNotImportant);
-    }
-
-    private SubscriptionHealth getHealth(Subscription subscription) {
-        TopicName topicName = subscription.getTopicName();
-        TopicMetrics topicMetrics = topicService.getTopicMetrics(topicName);
-        SubscriptionMetrics subscriptionMetrics = getSubscriptionMetrics(topicName, subscription.getName());
-        return subscriptionHealthChecker.checkHealth(subscription, topicMetrics, subscriptionMetrics);
-    }
-
-    private UnhealthySubscription getUnhealthy(Subscription subscription) {
-        SubscriptionHealth subscriptionHealth = getHealth(subscription);
-        if (subscriptionHealth.getStatus() == Status.UNHEALTHY) {
-            return UnhealthySubscription.from(subscription, subscriptionHealth);
-        } else {
-            return null;
-        }
-    }
-
-    private List<SubscriptionNameWithMetrics> getSubscriptionsMetrics(List<Subscription> subscriptions) {
-        return subscriptions.stream()
-                .map(s -> {
-                    SubscriptionMetrics metrics = metricsRepository.loadMetrics(s.getTopicName(), s.getName());
-                    return SubscriptionNameWithMetrics.from(metrics, s.getName(), s.getQualifiedTopicName());
-                }).collect(toList());
-    }
+  private static final Logger logger = LoggerFactory.getLogger(SubscriptionService.class);
+
+  private static final int LAST_MESSAGE_COUNT = 100;
+
+  private final SubscriptionRepository subscriptionRepository;
+  private final SubscriptionOwnerCache subscriptionOwnerCache;
+  private final TopicService topicService;
+  private final SubscriptionMetricsRepository metricsRepository;
+  private final SubscriptionHealthChecker subscriptionHealthChecker;
+  private final LogRepository logRepository;
+  private final SubscriptionValidator subscriptionValidator;
+  private final Auditor auditor;
+  private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+  private final MultiDCAwareService multiDCAwareService;
+  private final RepositoryManager repositoryManager;
+  private final long subscriptionHealthCheckTimeoutMillis;
+  private final ExecutorService subscriptionHealthCheckExecutorService;
+  private final SubscriptionRemover subscriptionRemover;
+
+  public SubscriptionService(
+      SubscriptionRepository subscriptionRepository,
+      SubscriptionOwnerCache subscriptionOwnerCache,
+      TopicService topicService,
+      SubscriptionMetricsRepository metricsRepository,
+      SubscriptionHealthChecker subscriptionHealthChecker,
+      LogRepository logRepository,
+      SubscriptionValidator subscriptionValidator,
+      Auditor auditor,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
+      MultiDCAwareService multiDCAwareService,
+      RepositoryManager repositoryManager,
+      ExecutorService unhealthyGetExecutorService,
+      long unhealthyGetTimeoutMillis,
+      SubscriptionRemover subscriptionRemover) {
+    this.subscriptionRepository = subscriptionRepository;
+    this.subscriptionOwnerCache = subscriptionOwnerCache;
+    this.topicService = topicService;
+    this.metricsRepository = metricsRepository;
+    this.subscriptionHealthChecker = subscriptionHealthChecker;
+    this.logRepository = logRepository;
+    this.subscriptionValidator = subscriptionValidator;
+    this.auditor = auditor;
+    this.multiDcExecutor = multiDcExecutor;
+    this.multiDCAwareService = multiDCAwareService;
+    this.repositoryManager = repositoryManager;
+    this.subscriptionHealthCheckExecutorService = unhealthyGetExecutorService;
+    this.subscriptionHealthCheckTimeoutMillis = unhealthyGetTimeoutMillis;
+    this.subscriptionRemover = subscriptionRemover;
+  }
+
+  public List<String> listSubscriptionNames(TopicName topicName) {
+    return subscriptionRepository.listSubscriptionNames(topicName);
+  }
+
+  public List<String> listTrackedSubscriptionNames(TopicName topicName) {
+    return listSubscriptions(topicName).stream()
+        .filter(Subscription::isTrackingEnabled)
+        .map(Subscription::getName)
+        .collect(toList());
+  }
+
+  public List<String> listFilteredSubscriptionNames(
+      TopicName topicName, Query<Subscription> query) {
+    return query.filter(listSubscriptions(topicName)).map(Subscription::getName).collect(toList());
+  }
+
+  public List<Subscription> listSubscriptions(TopicName topicName) {
+    return subscriptionRepository.listSubscriptions(topicName);
+  }
+
+  public void createSubscription(
+      Subscription subscription, RequestUser createdBy, String qualifiedTopicName) {
+    auditor.beforeObjectCreation(createdBy.getUsername(), subscription);
+    subscriptionValidator.checkCreation(subscription, createdBy);
+
+    Topic topic = topicService.getTopicDetails(fromQualifiedName(qualifiedTopicName));
+    multiDCAwareService.createConsumerGroups(topic, subscription);
+
+    multiDcExecutor.executeByUser(new CreateSubscriptionRepositoryCommand(subscription), createdBy);
+    auditor.objectCreated(createdBy.getUsername(), subscription);
+    subscriptionOwnerCache.onCreatedSubscription(subscription);
+  }
+
+  public Subscription getSubscriptionDetails(TopicName topicName, String subscriptionName) {
+    Subscription subscription =
+        subscriptionRepository.getSubscriptionDetails(topicName, subscriptionName).anonymize();
+    subscription.setState(getEffectiveState(topicName, subscriptionName));
+    return subscription;
+  }
+
+  private CompletableFuture<List<Subscription>> getSubscriptionDetails(
+      Collection<SubscriptionName> subscriptionNames) {
+    return CompletableFuture.supplyAsync(
+        () -> subscriptionRepository.getSubscriptionDetails(subscriptionNames),
+        subscriptionHealthCheckExecutorService);
+  }
+
+  private Subscription.State getEffectiveState(TopicName topicName, String subscriptionName) {
+    Set<Subscription.State> states = loadSubscriptionStatesFromAllDc(topicName, subscriptionName);
+
+    if (states.size() > 1) {
+      logger.warn("Some states are out of sync: {}", states);
+    }
+
+    if (states.contains(Subscription.State.ACTIVE)) {
+      return Subscription.State.ACTIVE;
+    } else if (states.contains(Subscription.State.SUSPENDED)) {
+      return Subscription.State.SUSPENDED;
+    } else {
+      return Subscription.State.PENDING;
+    }
+  }
+
+  private Set<Subscription.State> loadSubscriptionStatesFromAllDc(
+      TopicName topicName, String subscriptionName) {
+    List<DatacenterBoundRepositoryHolder<SubscriptionRepository>> holders =
+        repositoryManager.getRepositories(SubscriptionRepository.class);
+    Set<Subscription.State> states = new HashSet<>();
+    for (DatacenterBoundRepositoryHolder<SubscriptionRepository> holder : holders) {
+      try {
+        Subscription.State state =
+            holder.getRepository().getSubscriptionDetails(topicName, subscriptionName).getState();
+        states.add(state);
+      } catch (Exception e) {
+        logger.warn(
+            "Could not load state of subscription (topic: {}, name: {}) from DC {}.",
+            topicName,
+            subscriptionName,
+            holder.getDatacenterName());
+      }
+    }
+    return states;
+  }
+
+  public void removeSubscription(
+      TopicName topicName, String subscriptionName, RequestUser removedBy) {
+    subscriptionRemover.removeSubscription(topicName, subscriptionName, removedBy);
+  }
+
+  public void updateSubscription(
+      TopicName topicName, String subscriptionName, PatchData patch, RequestUser modifiedBy) {
+    auditor.beforeObjectUpdate(
+        modifiedBy.getUsername(),
+        Subscription.class.getSimpleName(),
+        new SubscriptionName(subscriptionName, topicName),
+        patch);
+
+    Subscription retrieved =
+        subscriptionRepository.getSubscriptionDetails(topicName, subscriptionName);
+    Subscription.State oldState = retrieved.getState();
+    Subscription updated = Patch.apply(retrieved, patch);
+    revertStateIfChangedToPending(updated, oldState);
+    subscriptionValidator.checkModification(updated, modifiedBy, retrieved);
+    subscriptionOwnerCache.onUpdatedSubscription(retrieved, updated);
+
+    if (!retrieved.equals(updated)) {
+      multiDcExecutor.executeByUser(new UpdateSubscriptionRepositoryCommand(updated), modifiedBy);
+      auditor.objectUpdated(modifiedBy.getUsername(), retrieved, updated);
+    }
+  }
+
+  private void revertStateIfChangedToPending(Subscription updated, Subscription.State oldState) {
+    if (updated.getState() == Subscription.State.PENDING) {
+      updated.setState(oldState);
+    }
+  }
+
+  public void updateSubscriptionState(
+      TopicName topicName,
+      String subscriptionName,
+      Subscription.State state,
+      RequestUser modifiedBy) {
+    if (state != Subscription.State.PENDING) {
+      PatchData patchData = PatchData.patchData().set("state", state).build();
+      auditor.beforeObjectUpdate(
+          modifiedBy.getUsername(),
+          Subscription.class.getSimpleName(),
+          new SubscriptionName(subscriptionName, topicName),
+          patchData);
+      Subscription retrieved =
+          subscriptionRepository.getSubscriptionDetails(topicName, subscriptionName);
+      if (!retrieved.getState().equals(state)) {
+        Subscription updated = Patch.apply(retrieved, patchData);
+        multiDcExecutor.executeByUser(new UpdateSubscriptionRepositoryCommand(updated), modifiedBy);
+        auditor.objectUpdated(modifiedBy.getUsername(), retrieved, updated);
+      }
+    }
+  }
+
+  public Subscription.State getSubscriptionState(TopicName topicName, String subscriptionName) {
+    return getSubscriptionDetails(topicName, subscriptionName).getState();
+  }
+
+  public SubscriptionMetrics getSubscriptionMetrics(TopicName topicName, String subscriptionName) {
+    subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
+    return metricsRepository.loadMetrics(topicName, subscriptionName);
+  }
+
+  public PersistentSubscriptionMetrics getPersistentSubscriptionMetrics(
+      TopicName topicName, String subscriptionName) {
+    subscriptionRepository.ensureSubscriptionExists(topicName, subscriptionName);
+    return metricsRepository.loadZookeeperMetrics(topicName, subscriptionName);
+  }
+
+  public SubscriptionHealth getSubscriptionHealth(TopicName topicName, String subscriptionName) {
+    Subscription subscription = getSubscriptionDetails(topicName, subscriptionName);
+    return getHealth(subscription);
+  }
+
+  public Optional<SentMessageTrace> getLatestUndeliveredMessage(
+      TopicName topicName, String subscriptionName) {
+    List<DatacenterBoundRepositoryHolder<LastUndeliveredMessageReader>> holders =
+        repositoryManager.getRepositories(LastUndeliveredMessageReader.class);
+    List<SentMessageTrace> traces = new ArrayList<>();
+    for (DatacenterBoundRepositoryHolder<LastUndeliveredMessageReader> holder : holders) {
+      try {
+        holder.getRepository().last(topicName, subscriptionName).ifPresent(traces::add);
+      } catch (Exception e) {
+        logger.warn(
+            "Could not load latest undelivered message from DC: {}", holder.getDatacenterName());
+      }
+    }
+    return traces.stream().max(Comparator.comparing(SentMessageTrace::getTimestamp));
+  }
+
+  public List<SentMessageTrace> getLatestUndeliveredMessagesTrackerLogs(
+      TopicName topicName, String subscriptionName) {
+    return logRepository.getLastUndeliveredMessages(
+        topicName.qualifiedName(), subscriptionName, LAST_MESSAGE_COUNT);
+  }
+
+  public List<MessageTrace> getMessageStatus(
+      String qualifiedTopicName, String subscriptionName, String messageId) {
+    return logRepository.getMessageStatus(qualifiedTopicName, subscriptionName, messageId);
+  }
+
+  public List<Subscription> querySubscription(Query<Subscription> query) {
+    return query.filter(getAllSubscriptions()).collect(toList());
+  }
+
+  public List<SubscriptionNameWithMetrics> querySubscriptionsMetrics(
+      Query<SubscriptionNameWithMetrics> query) {
+    List<Subscription> filteredSubscriptions =
+        query.filterNames(getAllSubscriptions()).collect(toList());
+    return query.filter(getSubscriptionsMetrics(filteredSubscriptions)).collect(toList());
+  }
+
+  public List<Subscription> getAllSubscriptions() {
+    return topicService.getAllTopics().stream()
+        .map(Topic::getName)
+        .map(this::listSubscriptions)
+        .flatMap(List::stream)
+        .map(Subscription::anonymize)
+        .collect(toList());
+  }
+
+  public List<Subscription> getForOwnerId(OwnerId ownerId) {
+    Collection<SubscriptionName> subscriptionNames = subscriptionOwnerCache.get(ownerId);
+    return subscriptionRepository.getSubscriptionDetails(subscriptionNames);
+  }
+
+  public List<UnhealthySubscription> getAllUnhealthy(
+      boolean respectMonitoringSeverity,
+      List<String> subscriptionNames,
+      List<String> qualifiedTopicNames) {
+    return getUnhealthyList(
+        subscriptionOwnerCache.getAll(),
+        respectMonitoringSeverity,
+        subscriptionNames,
+        qualifiedTopicNames);
+  }
+
+  public List<UnhealthySubscription> getUnhealthyForOwner(
+      OwnerId ownerId,
+      boolean respectMonitoringSeverity,
+      List<String> subscriptionNames,
+      List<String> qualifiedTopicNames) {
+    return getUnhealthyList(
+        subscriptionOwnerCache.get(ownerId),
+        respectMonitoringSeverity,
+        subscriptionNames,
+        qualifiedTopicNames);
+  }
+
+  public SubscriptionStats getStats() {
+    List<Subscription> subscriptions = getAllSubscriptions();
+    long trackingEnabledSubscriptionsCount =
+        subscriptions.stream().filter(Subscription::isTrackingEnabled).count();
+    long avroSubscriptionCount =
+        subscriptions.stream().filter(s -> s.getContentType() == ContentType.AVRO).count();
+    return new SubscriptionStats(
+        subscriptions.size(), trackingEnabledSubscriptionsCount, avroSubscriptionCount);
+  }
+
+  private List<UnhealthySubscription> getUnhealthyList(
+      Collection<SubscriptionName> ownerSubscriptionNames,
+      boolean respectMonitoringSeverity,
+      List<String> subscriptionNames,
+      List<String> qualifiedTopicNames) {
+    try {
+      return getSubscriptionDetails(ownerSubscriptionNames)
+          .thenComposeAsync(
+              ownerSubscriptions -> {
+                List<CompletableFuture<UnhealthySubscription>> unhealthySubscriptions =
+                    filterSubscriptions(
+                        ownerSubscriptions,
+                        respectMonitoringSeverity,
+                        subscriptionNames,
+                        qualifiedTopicNames);
+                return CompletableFuture.allOf(
+                        unhealthySubscriptions.toArray(new CompletableFuture[0]))
+                    .thenApply(
+                        v ->
+                            unhealthySubscriptions.stream()
+                                .map(CompletableFuture::join)
+                                .filter(Objects::nonNull)
+                                .collect(Collectors.toList()));
+              },
+              subscriptionHealthCheckExecutorService)
+          .get(subscriptionHealthCheckTimeoutMillis, TimeUnit.MILLISECONDS);
+    } catch (TimeoutException e) {
+      logger.error("Timeout occurred while fetching unhealthy subscriptions...", e);
+      throw new UnhealthySubscriptionGetException("Fetching unhealthy subscriptions timed out.");
+    } catch (Exception e) {
+      logger.error("Fetching unhealthy subscriptions failed...", e);
+      throw new UnhealthySubscriptionGetException("Fetching unhealthy subscriptions failed.", e);
+    }
+  }
+
+  private List<CompletableFuture<UnhealthySubscription>> filterSubscriptions(
+      Collection<Subscription> subscriptions,
+      boolean respectMonitoringSeverity,
+      List<String> subscriptionNames,
+      List<String> qualifiedTopicNames) {
+    boolean shouldFilterBySubscriptionNames = CollectionUtils.isNotEmpty(subscriptionNames);
+    boolean shouldFilterByQualifiedTopicNames = CollectionUtils.isNotEmpty(qualifiedTopicNames);
+
+    Stream<Subscription> subscriptionStream =
+        subscriptions.stream()
+            .filter(
+                s ->
+                    filterBySeverityMonitorFlag(
+                        respectMonitoringSeverity, s.isSeverityNotImportant()));
+
+    if (shouldFilterBySubscriptionNames) {
+      subscriptionStream =
+          subscriptionStream.filter(s -> filterBySubscriptionNames(subscriptionNames, s.getName()));
+    }
+    if (shouldFilterByQualifiedTopicNames) {
+      subscriptionStream =
+          subscriptionStream.filter(
+              s -> filterByQualifiedTopicNames(qualifiedTopicNames, s.getQualifiedTopicName()));
+    }
+
+    return subscriptionStream
+        .map(
+            s ->
+                CompletableFuture.supplyAsync(
+                    () -> getUnhealthy(s), subscriptionHealthCheckExecutorService))
+        .collect(toList());
+  }
+
+  private boolean filterBySubscriptionNames(
+      List<String> subscriptionNames, String subscriptionName) {
+    return subscriptionNames.contains(subscriptionName);
+  }
+
+  private boolean filterByQualifiedTopicNames(
+      List<String> qualifiedTopicNames, String qualifiedTopicName) {
+    return qualifiedTopicNames.contains(qualifiedTopicName);
+  }
+
+  private boolean filterBySeverityMonitorFlag(
+      boolean respectMonitoringSeverity, boolean isSeverityNotImportant) {
+    return !(respectMonitoringSeverity && isSeverityNotImportant);
+  }
+
+  private SubscriptionHealth getHealth(Subscription subscription) {
+    TopicName topicName = subscription.getTopicName();
+    TopicMetrics topicMetrics = topicService.getTopicMetrics(topicName);
+    SubscriptionMetrics subscriptionMetrics =
+        getSubscriptionMetrics(topicName, subscription.getName());
+    return subscriptionHealthChecker.checkHealth(subscription, topicMetrics, subscriptionMetrics);
+  }
+
+  private UnhealthySubscription getUnhealthy(Subscription subscription) {
+    SubscriptionHealth subscriptionHealth = getHealth(subscription);
+    if (subscriptionHealth.getStatus() == Status.UNHEALTHY) {
+      return UnhealthySubscription.from(subscription, subscriptionHealth);
+    } else {
+      return null;
+    }
+  }
+
+  private List<SubscriptionNameWithMetrics> getSubscriptionsMetrics(
+      List<Subscription> subscriptions) {
+    return subscriptions.stream()
+        .map(
+            s -> {
+              SubscriptionMetrics metrics =
+                  metricsRepository.loadMetrics(s.getTopicName(), s.getName());
+              return SubscriptionNameWithMetrics.from(
+                  metrics, s.getName(), s.getQualifiedTopicName());
+            })
+        .collect(toList());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/UnhealthySubscriptionGetException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/UnhealthySubscriptionGetException.java
index 5537913596..f6d97ab707 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/UnhealthySubscriptionGetException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/UnhealthySubscriptionGetException.java
@@ -5,16 +5,16 @@
 
 public class UnhealthySubscriptionGetException extends ManagementException {
 
-    public UnhealthySubscriptionGetException(String message) {
-        super(message);
-    }
+  public UnhealthySubscriptionGetException(String message) {
+    super(message);
+  }
 
-    public UnhealthySubscriptionGetException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public UnhealthySubscriptionGetException(String message, Throwable cause) {
+    super(message, cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OTHER;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OTHER;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/CreateSubscriptionRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/CreateSubscriptionRepositoryCommand.java
index 7004608ff8..d32c884cc7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/CreateSubscriptionRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/CreateSubscriptionRepositoryCommand.java
@@ -1,38 +1,44 @@
 package pl.allegro.tech.hermes.management.domain.subscription.commands;
 
 import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.domain.subscription.SubscriptionAlreadyExistsException;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
 public class CreateSubscriptionRepositoryCommand extends RepositoryCommand<SubscriptionRepository> {
 
-    private final Subscription subscription;
+  private final Subscription subscription;
 
-    public CreateSubscriptionRepositoryCommand(Subscription subscription) {
-        this.subscription = subscription;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {}
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
-        holder.getRepository().createSubscription(subscription);
-    }
+  public CreateSubscriptionRepositoryCommand(Subscription subscription) {
+    this.subscription = subscription;
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
-        holder.getRepository().removeSubscription(subscription.getTopicName(), subscription.getName());
-    }
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {}
 
-    @Override
-    public Class<SubscriptionRepository> getRepositoryType() {
-        return SubscriptionRepository.class;
-    }
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
+    holder.getRepository().createSubscription(subscription);
+  }
 
-    @Override
-    public String toString() {
-        return "CreateSubscription(" + subscription.getQualifiedName() + ")";
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<SubscriptionRepository> holder, Exception exception) {
+    if (exception instanceof SubscriptionAlreadyExistsException) {
+      // prevents removal of already existing subscription
+      return;
     }
+    holder.getRepository().removeSubscription(subscription.getTopicName(), subscription.getName());
+  }
+
+  @Override
+  public Class<SubscriptionRepository> getRepositoryType() {
+    return SubscriptionRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "CreateSubscription(" + subscription.getQualifiedName() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/RemoveSubscriptionRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/RemoveSubscriptionRepositoryCommand.java
index 9d0c2d838d..f22f4fdc12 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/RemoveSubscriptionRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/RemoveSubscriptionRepositoryCommand.java
@@ -9,38 +9,41 @@
 
 public class RemoveSubscriptionRepositoryCommand extends RepositoryCommand<SubscriptionRepository> {
 
-    private final TopicName topicName;
-    private final String subscriptionName;
-
-    private Subscription backup;
-
-    public RemoveSubscriptionRepositoryCommand(TopicName topicName, String subscriptionName) {
-        this.topicName = topicName;
-        this.subscriptionName = subscriptionName;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
-        backup = holder.getRepository().getSubscriptionDetails(topicName, subscriptionName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
-        holder.getRepository().removeSubscription(topicName, subscriptionName);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
-        holder.getRepository().createSubscription(backup);
-    }
-
-    @Override
-    public Class<SubscriptionRepository> getRepositoryType() {
-        return SubscriptionRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "RemoveSubscription(" + new SubscriptionName(subscriptionName, topicName).getQualifiedName() + ")";
-    }
+  private final TopicName topicName;
+  private final String subscriptionName;
+
+  private Subscription backup;
+
+  public RemoveSubscriptionRepositoryCommand(TopicName topicName, String subscriptionName) {
+    this.topicName = topicName;
+    this.subscriptionName = subscriptionName;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
+    backup = holder.getRepository().getSubscriptionDetails(topicName, subscriptionName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
+    holder.getRepository().removeSubscription(topicName, subscriptionName);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<SubscriptionRepository> holder, Exception exception) {
+    holder.getRepository().createSubscription(backup);
+  }
+
+  @Override
+  public Class<SubscriptionRepository> getRepositoryType() {
+    return SubscriptionRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "RemoveSubscription("
+        + new SubscriptionName(subscriptionName, topicName).getQualifiedName()
+        + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/UpdateSubscriptionRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/UpdateSubscriptionRepositoryCommand.java
index 3d0684f2f1..98449f7771 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/UpdateSubscriptionRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/commands/UpdateSubscriptionRepositoryCommand.java
@@ -6,36 +6,40 @@
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
 public class UpdateSubscriptionRepositoryCommand extends RepositoryCommand<SubscriptionRepository> {
-    private final Subscription subscription;
-
-    private Subscription backup;
-
-    public UpdateSubscriptionRepositoryCommand(Subscription subscription) {
-        this.subscription = subscription;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
-        backup = holder.getRepository().getSubscriptionDetails(subscription.getTopicName(), subscription.getName());
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
-        holder.getRepository().updateSubscription(subscription);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
-        holder.getRepository().updateSubscription(backup);
-    }
-
-    @Override
-    public Class<SubscriptionRepository> getRepositoryType() {
-        return SubscriptionRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "UpdateSubscription(" + subscription.getQualifiedName() + ")";
-    }
+  private final Subscription subscription;
+
+  private Subscription backup;
+
+  public UpdateSubscriptionRepositoryCommand(Subscription subscription) {
+    this.subscription = subscription;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
+    backup =
+        holder
+            .getRepository()
+            .getSubscriptionDetails(subscription.getTopicName(), subscription.getName());
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<SubscriptionRepository> holder) {
+    holder.getRepository().updateSubscription(subscription);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<SubscriptionRepository> holder, Exception exception) {
+    holder.getRepository().updateSubscription(backup);
+  }
+
+  @Override
+  public Class<SubscriptionRepository> getRepositoryType() {
+    return SubscriptionRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "UpdateSubscription(" + subscription.getQualifiedName() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthChecker.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthChecker.java
index 7439f76999..01c34692a1 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthChecker.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthChecker.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health;
 
+import static java.util.stream.Collectors.toSet;
+import static pl.allegro.tech.hermes.api.Subscription.State.SUSPENDED;
+
+import java.util.Optional;
+import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -8,49 +13,50 @@
 import pl.allegro.tech.hermes.api.SubscriptionMetrics;
 import pl.allegro.tech.hermes.api.TopicMetrics;
 
-import java.util.Optional;
-import java.util.Set;
-
-import static java.util.stream.Collectors.toSet;
-import static pl.allegro.tech.hermes.api.Subscription.State.SUSPENDED;
-
 @Component
 public class SubscriptionHealthChecker {
-    private final Set<SubscriptionHealthProblemIndicator> problemIndicators;
-
-    @Autowired
-    public SubscriptionHealthChecker(Set<SubscriptionHealthProblemIndicator> problemIndicators) {
-        this.problemIndicators = problemIndicators;
-    }
-
-    public SubscriptionHealth checkHealth(Subscription subscription, TopicMetrics topicMetrics, SubscriptionMetrics subscriptionMetrics) {
-        if (isSuspended(subscription)) {
-            return SubscriptionHealth.HEALTHY;
-        } else {
-            return getActiveSubscriptionHealth(subscription, topicMetrics, subscriptionMetrics);
-        }
-    }
-
-    private boolean isSuspended(Subscription subscription) {
-        return subscription.getState() == SUSPENDED;
-    }
-
-    private SubscriptionHealth getActiveSubscriptionHealth(Subscription subscription,
-                                                           TopicMetrics topicMetrics,
-                                                           SubscriptionMetrics subscriptionMetrics) {
-        return SubscriptionHealthContext.createIfAllMetricsExist(subscription, topicMetrics, subscriptionMetrics)
-                .map(healthContext -> {
-                    Set<SubscriptionHealthProblem> healthProblems = getHealthProblems(healthContext);
-                    return SubscriptionHealth.of(healthProblems);
-                })
-                .orElse(SubscriptionHealth.NO_DATA);
-    }
-
-    private Set<SubscriptionHealthProblem> getHealthProblems(SubscriptionHealthContext healthContext) {
-        return problemIndicators.stream()
-                .map(indicator -> indicator.getProblem(healthContext))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(toSet());
+  private final Set<SubscriptionHealthProblemIndicator> problemIndicators;
+
+  @Autowired
+  public SubscriptionHealthChecker(Set<SubscriptionHealthProblemIndicator> problemIndicators) {
+    this.problemIndicators = problemIndicators;
+  }
+
+  public SubscriptionHealth checkHealth(
+      Subscription subscription,
+      TopicMetrics topicMetrics,
+      SubscriptionMetrics subscriptionMetrics) {
+    if (isSuspended(subscription)) {
+      return SubscriptionHealth.HEALTHY;
+    } else {
+      return getActiveSubscriptionHealth(subscription, topicMetrics, subscriptionMetrics);
     }
+  }
+
+  private boolean isSuspended(Subscription subscription) {
+    return subscription.getState() == SUSPENDED;
+  }
+
+  private SubscriptionHealth getActiveSubscriptionHealth(
+      Subscription subscription,
+      TopicMetrics topicMetrics,
+      SubscriptionMetrics subscriptionMetrics) {
+    return SubscriptionHealthContext.createIfAllMetricsExist(
+            subscription, topicMetrics, subscriptionMetrics)
+        .map(
+            healthContext -> {
+              Set<SubscriptionHealthProblem> healthProblems = getHealthProblems(healthContext);
+              return SubscriptionHealth.of(healthProblems);
+            })
+        .orElse(SubscriptionHealth.NO_DATA);
+  }
+
+  private Set<SubscriptionHealthProblem> getHealthProblems(
+      SubscriptionHealthContext healthContext) {
+    return problemIndicators.stream()
+        .map(indicator -> indicator.getProblem(healthContext))
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(toSet());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthContext.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthContext.java
index 17a79ecfd3..850c3b24d3 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthContext.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthContext.java
@@ -1,92 +1,94 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health;
 
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionMetrics;
 import pl.allegro.tech.hermes.api.TopicMetrics;
 
-import java.util.Optional;
-
 public final class SubscriptionHealthContext {
-    private final Subscription subscription;
-    private final double topicRate;
-    private final double subscriptionRate;
-    private final double timeoutsRate;
-    private final double otherErrorsRate;
-    private final double code4xxErrorsRate;
-    private final double code5xxErrorsRate;
-    private final double batchRate;
-    private final long lag;
+  private final Subscription subscription;
+  private final double topicRate;
+  private final double subscriptionRate;
+  private final double timeoutsRate;
+  private final double otherErrorsRate;
+  private final double code4xxErrorsRate;
+  private final double code5xxErrorsRate;
+  private final double batchRate;
+  private final long lag;
 
-    private SubscriptionHealthContext(Subscription subscription,
-                                      TopicMetrics topicMetrics,
-                                      SubscriptionMetrics subscriptionMetrics) {
-        this.subscription = subscription;
-        this.topicRate = topicMetrics.getRate().toDouble();
-        this.subscriptionRate = subscriptionMetrics.getRate().toDouble();
-        this.timeoutsRate = subscriptionMetrics.getTimeouts().toDouble();
-        this.otherErrorsRate = subscriptionMetrics.getOtherErrors().toDouble();
-        this.code4xxErrorsRate = subscriptionMetrics.getCodes4xx().toDouble();
-        this.code5xxErrorsRate = subscriptionMetrics.getCodes5xx().toDouble();
-        this.batchRate = subscriptionMetrics.getBatchRate().toDouble();
-        this.lag = subscriptionMetrics.getLag().toLong();
-    }
+  private SubscriptionHealthContext(
+      Subscription subscription,
+      TopicMetrics topicMetrics,
+      SubscriptionMetrics subscriptionMetrics) {
+    this.subscription = subscription;
+    this.topicRate = topicMetrics.getRate().toDouble();
+    this.subscriptionRate = subscriptionMetrics.getRate().toDouble();
+    this.timeoutsRate = subscriptionMetrics.getTimeouts().toDouble();
+    this.otherErrorsRate = subscriptionMetrics.getOtherErrors().toDouble();
+    this.code4xxErrorsRate = subscriptionMetrics.getCodes4xx().toDouble();
+    this.code5xxErrorsRate = subscriptionMetrics.getCodes5xx().toDouble();
+    this.batchRate = subscriptionMetrics.getBatchRate().toDouble();
+    this.lag = subscriptionMetrics.getLag().toLong();
+  }
 
-    static Optional<SubscriptionHealthContext> createIfAllMetricsExist(Subscription subscription,
-                                                                       TopicMetrics topicMetrics,
-                                                                       SubscriptionMetrics subscriptionMetrics) {
-        if (topicMetrics.getRate().isAvailable()
-                && subscriptionMetrics.getRate().isAvailable()
-                && subscriptionMetrics.getTimeouts().isAvailable()
-                && subscriptionMetrics.getOtherErrors().isAvailable()
-                && subscriptionMetrics.getCodes4xx().isAvailable()
-                && subscriptionMetrics.getCodes5xx().isAvailable()
-                && subscriptionMetrics.getBatchRate().isAvailable()
-                && subscriptionMetrics.getLag().isAvailable()) {
-            return Optional.of(new SubscriptionHealthContext(subscription, topicMetrics, subscriptionMetrics));
-        }
-        return Optional.empty();
+  static Optional<SubscriptionHealthContext> createIfAllMetricsExist(
+      Subscription subscription,
+      TopicMetrics topicMetrics,
+      SubscriptionMetrics subscriptionMetrics) {
+    if (topicMetrics.getRate().isAvailable()
+        && subscriptionMetrics.getRate().isAvailable()
+        && subscriptionMetrics.getTimeouts().isAvailable()
+        && subscriptionMetrics.getOtherErrors().isAvailable()
+        && subscriptionMetrics.getCodes4xx().isAvailable()
+        && subscriptionMetrics.getCodes5xx().isAvailable()
+        && subscriptionMetrics.getBatchRate().isAvailable()
+        && subscriptionMetrics.getLag().isAvailable()) {
+      return Optional.of(
+          new SubscriptionHealthContext(subscription, topicMetrics, subscriptionMetrics));
     }
+    return Optional.empty();
+  }
 
-    public boolean subscriptionHasRetryOnError() {
-        if (subscription.isBatchSubscription()) {
-            return subscription.getBatchSubscriptionPolicy().isRetryClientErrors();
-        } else {
-            return subscription.getSerialSubscriptionPolicy().isRetryClientErrors();
-        }
+  public boolean subscriptionHasRetryOnError() {
+    if (subscription.isBatchSubscription()) {
+      return subscription.getBatchSubscriptionPolicy().isRetryClientErrors();
+    } else {
+      return subscription.getSerialSubscriptionPolicy().isRetryClientErrors();
     }
+  }
 
-    public double getSubscriptionRateRespectingDeliveryType() {
-        if (subscription.isBatchSubscription()) {
-            return batchRate;
-        }
-        return subscriptionRate;
+  public double getSubscriptionRateRespectingDeliveryType() {
+    if (subscription.isBatchSubscription()) {
+      return batchRate;
     }
+    return subscriptionRate;
+  }
 
-    public double getOtherErrorsRate() {
-        return otherErrorsRate;
-    }
+  public double getOtherErrorsRate() {
+    return otherErrorsRate;
+  }
 
-    public double getTimeoutsRate() {
-        return timeoutsRate;
-    }
+  public double getTimeoutsRate() {
+    return timeoutsRate;
+  }
 
-    public double getCode4xxErrorsRate() {
-        return code4xxErrorsRate;
-    }
+  public double getCode4xxErrorsRate() {
+    return code4xxErrorsRate;
+  }
 
-    public double getCode5xxErrorsRate() {
-        return code5xxErrorsRate;
-    }
+  public double getCode5xxErrorsRate() {
+    return code5xxErrorsRate;
+  }
 
-    public long getLag() {
-        return lag;
-    }
+  public long getLag() {
+    return lag;
+  }
 
-    public double getTopicRate() {
-        return topicRate;
-    }
+  public double getTopicRate() {
+    return topicRate;
+  }
 
-    public Subscription getSubscription() {
-        return subscription;
-    }
+  public Subscription getSubscription() {
+    return subscription;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthProblemIndicator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthProblemIndicator.java
index dc33183951..dbca99ef62 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthProblemIndicator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/SubscriptionHealthProblemIndicator.java
@@ -1,9 +1,8 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health;
 
-import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
-
 import java.util.Optional;
+import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
 
 public interface SubscriptionHealthProblemIndicator {
-    Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context);
+  Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/DisabledIndicator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/DisabledIndicator.java
index 6de68151ca..c61a904b54 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/DisabledIndicator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/DisabledIndicator.java
@@ -1,15 +1,14 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health.problem;
 
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthContext;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthProblemIndicator;
 
-import java.util.Optional;
-
 public class DisabledIndicator implements SubscriptionHealthProblemIndicator {
 
-    @Override
-    public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
-        return Optional.empty();
-    }
+  @Override
+  public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
+    return Optional.empty();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/LaggingIndicator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/LaggingIndicator.java
index 0cdfc89636..be5ba18a8d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/LaggingIndicator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/LaggingIndicator.java
@@ -1,27 +1,27 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health.problem;
 
+import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.lagging;
+
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthContext;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthProblemIndicator;
 
-import java.util.Optional;
-
-import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.lagging;
-
 public class LaggingIndicator implements SubscriptionHealthProblemIndicator {
-    private final int maxLagInSeconds;
+  private final int maxLagInSeconds;
 
-    public LaggingIndicator(int maxLagInSeconds) {
-        this.maxLagInSeconds = maxLagInSeconds;
-    }
+  public LaggingIndicator(int maxLagInSeconds) {
+    this.maxLagInSeconds = maxLagInSeconds;
+  }
 
-    @Override
-    public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
-        long subscriptionLag = context.getLag();
-        double topicRate = context.getTopicRate();
-        if (topicRate > 0.0 && subscriptionLag > maxLagInSeconds * topicRate) {
-            return Optional.of(lagging(subscriptionLag, context.getSubscription().getQualifiedName().toString()));
-        }
-        return Optional.empty();
+  @Override
+  public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
+    long subscriptionLag = context.getLag();
+    double topicRate = context.getTopicRate();
+    if (topicRate > 0.0 && subscriptionLag > maxLagInSeconds * topicRate) {
+      return Optional.of(
+          lagging(subscriptionLag, context.getSubscription().getQualifiedName().toString()));
     }
+    return Optional.empty();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/MalfunctioningIndicator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/MalfunctioningIndicator.java
index 2d0c946f43..99dbeb1f89 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/MalfunctioningIndicator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/MalfunctioningIndicator.java
@@ -1,37 +1,41 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health.problem;
 
+import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.malfunctioning;
+
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthContext;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthProblemIndicator;
 
-import java.util.Optional;
-
-import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.malfunctioning;
-
 public class MalfunctioningIndicator implements SubscriptionHealthProblemIndicator {
-    private final double max5xxErrorsRatio;
-    private final double minSubscriptionRateForReliableMetrics;
-
-    public MalfunctioningIndicator(double max5xxErrorsRatio, double minSubscriptionRateForReliableMetrics) {
-        this.max5xxErrorsRatio = max5xxErrorsRatio;
-        this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
-    }
-
-    @Override
-    public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
-        if (areSubscriptionMetricsReliable(context) && isCode5xxErrorsRateHigh(context)) {
-            return Optional.of(malfunctioning(context.getCode5xxErrorsRate(), context.getSubscription().getQualifiedName().toString()));
-        }
-        return Optional.empty();
-    }
-
-    private boolean areSubscriptionMetricsReliable(SubscriptionHealthContext context) {
-        return context.getSubscriptionRateRespectingDeliveryType() > minSubscriptionRateForReliableMetrics;
-    }
-
-    private boolean isCode5xxErrorsRateHigh(SubscriptionHealthContext context) {
-        double code5xxErrorsRate = context.getCode5xxErrorsRate();
-        double rate = context.getSubscriptionRateRespectingDeliveryType();
-        return code5xxErrorsRate > max5xxErrorsRatio * rate;
+  private final double max5xxErrorsRatio;
+  private final double minSubscriptionRateForReliableMetrics;
+
+  public MalfunctioningIndicator(
+      double max5xxErrorsRatio, double minSubscriptionRateForReliableMetrics) {
+    this.max5xxErrorsRatio = max5xxErrorsRatio;
+    this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
+  }
+
+  @Override
+  public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
+    if (areSubscriptionMetricsReliable(context) && isCode5xxErrorsRateHigh(context)) {
+      return Optional.of(
+          malfunctioning(
+              context.getCode5xxErrorsRate(),
+              context.getSubscription().getQualifiedName().toString()));
     }
+    return Optional.empty();
+  }
+
+  private boolean areSubscriptionMetricsReliable(SubscriptionHealthContext context) {
+    return context.getSubscriptionRateRespectingDeliveryType()
+        > minSubscriptionRateForReliableMetrics;
+  }
+
+  private boolean isCode5xxErrorsRateHigh(SubscriptionHealthContext context) {
+    double code5xxErrorsRate = context.getCode5xxErrorsRate();
+    double rate = context.getSubscriptionRateRespectingDeliveryType();
+    return code5xxErrorsRate > max5xxErrorsRatio * rate;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/ReceivingMalformedMessagesIndicator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/ReceivingMalformedMessagesIndicator.java
index ba539228c4..389eb8fcc4 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/ReceivingMalformedMessagesIndicator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/ReceivingMalformedMessagesIndicator.java
@@ -1,41 +1,43 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health.problem;
 
+import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.receivingMalformedMessages;
+
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthContext;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthProblemIndicator;
 
-import java.util.Optional;
-
-import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.receivingMalformedMessages;
-
 public class ReceivingMalformedMessagesIndicator implements SubscriptionHealthProblemIndicator {
-    private final double max4xxErrorsRatio;
-    private final double minSubscriptionRateForReliableMetrics;
-
-    public ReceivingMalformedMessagesIndicator(double max4xxErrorsRatio, double minSubscriptionRateForReliableMetrics) {
-        this.max4xxErrorsRatio = max4xxErrorsRatio;
-        this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
-    }
-
-    @Override
-    public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
-        if (context.subscriptionHasRetryOnError()
-                && areSubscriptionMetricsReliable(context)
-                && isCode4xxErrorsRateHigh(context)) {
-            return Optional.of(
-                    receivingMalformedMessages(context.getCode4xxErrorsRate(), context.getSubscription().getQualifiedName().toString())
-            );
-        }
-        return Optional.empty();
-    }
-
-    private boolean areSubscriptionMetricsReliable(SubscriptionHealthContext context) {
-        return context.getSubscriptionRateRespectingDeliveryType() > minSubscriptionRateForReliableMetrics;
-    }
-
-    private boolean isCode4xxErrorsRateHigh(SubscriptionHealthContext context) {
-        double code4xxErrorsRate = context.getCode4xxErrorsRate();
-        double rate = context.getSubscriptionRateRespectingDeliveryType();
-        return code4xxErrorsRate > max4xxErrorsRatio * rate;
+  private final double max4xxErrorsRatio;
+  private final double minSubscriptionRateForReliableMetrics;
+
+  public ReceivingMalformedMessagesIndicator(
+      double max4xxErrorsRatio, double minSubscriptionRateForReliableMetrics) {
+    this.max4xxErrorsRatio = max4xxErrorsRatio;
+    this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
+  }
+
+  @Override
+  public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
+    if (context.subscriptionHasRetryOnError()
+        && areSubscriptionMetricsReliable(context)
+        && isCode4xxErrorsRateHigh(context)) {
+      return Optional.of(
+          receivingMalformedMessages(
+              context.getCode4xxErrorsRate(),
+              context.getSubscription().getQualifiedName().toString()));
     }
+    return Optional.empty();
+  }
+
+  private boolean areSubscriptionMetricsReliable(SubscriptionHealthContext context) {
+    return context.getSubscriptionRateRespectingDeliveryType()
+        > minSubscriptionRateForReliableMetrics;
+  }
+
+  private boolean isCode4xxErrorsRateHigh(SubscriptionHealthContext context) {
+    double code4xxErrorsRate = context.getCode4xxErrorsRate();
+    double rate = context.getSubscriptionRateRespectingDeliveryType();
+    return code4xxErrorsRate > max4xxErrorsRatio * rate;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/TimingOutIndicator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/TimingOutIndicator.java
index 293851a1b0..43ba4798ee 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/TimingOutIndicator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/TimingOutIndicator.java
@@ -1,36 +1,38 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health.problem;
 
+import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.timingOut;
+
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthContext;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthProblemIndicator;
 
-import java.util.Optional;
-
-import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.timingOut;
-
 public class TimingOutIndicator implements SubscriptionHealthProblemIndicator {
-    private final double maxTimeoutsRatio;
-    private final double minSubscriptionRateForReliableMetrics;
-
-    public TimingOutIndicator(double maxTimeoutsRatio, double minSubscriptionRateForReliableMetrics) {
-        this.maxTimeoutsRatio = maxTimeoutsRatio;
-        this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
-    }
-
-    @Override
-    public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
-        if (areSubscriptionMetricsReliable(context) && isTimeoutsRateHigh(context)) {
-            return Optional.of(timingOut(context.getTimeoutsRate(), context.getSubscription().getQualifiedName().toString()));
-        }
-        return Optional.empty();
-    }
-
-    private boolean areSubscriptionMetricsReliable(SubscriptionHealthContext context) {
-        return context.getSubscriptionRateRespectingDeliveryType() > minSubscriptionRateForReliableMetrics;
-    }
-
-    private boolean isTimeoutsRateHigh(SubscriptionHealthContext context) {
-        double timeoutsRate = context.getTimeoutsRate();
-        return timeoutsRate > maxTimeoutsRatio * context.getSubscriptionRateRespectingDeliveryType();
+  private final double maxTimeoutsRatio;
+  private final double minSubscriptionRateForReliableMetrics;
+
+  public TimingOutIndicator(double maxTimeoutsRatio, double minSubscriptionRateForReliableMetrics) {
+    this.maxTimeoutsRatio = maxTimeoutsRatio;
+    this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
+  }
+
+  @Override
+  public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
+    if (areSubscriptionMetricsReliable(context) && isTimeoutsRateHigh(context)) {
+      return Optional.of(
+          timingOut(
+              context.getTimeoutsRate(), context.getSubscription().getQualifiedName().toString()));
     }
+    return Optional.empty();
+  }
+
+  private boolean areSubscriptionMetricsReliable(SubscriptionHealthContext context) {
+    return context.getSubscriptionRateRespectingDeliveryType()
+        > minSubscriptionRateForReliableMetrics;
+  }
+
+  private boolean isTimeoutsRateHigh(SubscriptionHealthContext context) {
+    double timeoutsRate = context.getTimeoutsRate();
+    return timeoutsRate > maxTimeoutsRatio * context.getSubscriptionRateRespectingDeliveryType();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/UnreachableIndicator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/UnreachableIndicator.java
index 795e92c6d7..0ea2fdb201 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/UnreachableIndicator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/health/problem/UnreachableIndicator.java
@@ -1,36 +1,41 @@
 package pl.allegro.tech.hermes.management.domain.subscription.health.problem;
 
+import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.unreachable;
+
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.SubscriptionHealthProblem;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthContext;
 import pl.allegro.tech.hermes.management.domain.subscription.health.SubscriptionHealthProblemIndicator;
 
-import java.util.Optional;
-
-import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.unreachable;
-
 public class UnreachableIndicator implements SubscriptionHealthProblemIndicator {
-    private final double maxOtherErrorsRatio;
-    private final double minSubscriptionRateForReliableMetrics;
-
-    public UnreachableIndicator(double maxOtherErrorsRatio, double minSubscriptionRateForReliableMetrics) {
-        this.maxOtherErrorsRatio = maxOtherErrorsRatio;
-        this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
-    }
-
-    @Override
-    public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
-        if (areSubscriptionMetricsReliable(context) && isOtherErrorsRateHigh(context)) {
-            return Optional.of(unreachable(context.getOtherErrorsRate(), context.getSubscription().getQualifiedName().toString()));
-        }
-        return Optional.empty();
-    }
-
-    private boolean areSubscriptionMetricsReliable(SubscriptionHealthContext context) {
-        return context.getSubscriptionRateRespectingDeliveryType() > minSubscriptionRateForReliableMetrics;
-    }
-
-    private boolean isOtherErrorsRateHigh(SubscriptionHealthContext context) {
-        double otherErrorsRate = context.getOtherErrorsRate();
-        return otherErrorsRate > maxOtherErrorsRatio * context.getSubscriptionRateRespectingDeliveryType();
+  private final double maxOtherErrorsRatio;
+  private final double minSubscriptionRateForReliableMetrics;
+
+  public UnreachableIndicator(
+      double maxOtherErrorsRatio, double minSubscriptionRateForReliableMetrics) {
+    this.maxOtherErrorsRatio = maxOtherErrorsRatio;
+    this.minSubscriptionRateForReliableMetrics = minSubscriptionRateForReliableMetrics;
+  }
+
+  @Override
+  public Optional<SubscriptionHealthProblem> getProblem(SubscriptionHealthContext context) {
+    if (areSubscriptionMetricsReliable(context) && isOtherErrorsRateHigh(context)) {
+      return Optional.of(
+          unreachable(
+              context.getOtherErrorsRate(),
+              context.getSubscription().getQualifiedName().toString()));
     }
+    return Optional.empty();
+  }
+
+  private boolean areSubscriptionMetricsReliable(SubscriptionHealthContext context) {
+    return context.getSubscriptionRateRespectingDeliveryType()
+        > minSubscriptionRateForReliableMetrics;
+  }
+
+  private boolean isOtherErrorsRateHigh(SubscriptionHealthContext context) {
+    double otherErrorsRate = context.getOtherErrorsRate();
+    return otherErrorsRate
+        > maxOtherErrorsRatio * context.getSubscriptionRateRespectingDeliveryType();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointAddressFormatValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointAddressFormatValidator.java
index 52fca17e35..4820b16f76 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointAddressFormatValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointAddressFormatValidator.java
@@ -1,52 +1,54 @@
 package pl.allegro.tech.hermes.management.domain.subscription.validator;
 
-import com.damnhandy.uri.template.UriTemplate;
-import pl.allegro.tech.hermes.api.EndpointAddress;
+import static java.util.Arrays.asList;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
 
+import com.damnhandy.uri.template.UriTemplate;
 import java.net.URI;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import static java.util.Arrays.asList;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
+import pl.allegro.tech.hermes.api.EndpointAddress;
 
 public class EndpointAddressFormatValidator implements EndpointAddressValidator {
-    private final Set<String> availableProtocol = new HashSet<>();
-
-    public EndpointAddressFormatValidator(List<String> additionalEndpointProtocols) {
-        this.availableProtocol.addAll(additionalEndpointProtocols);
-        this.availableProtocol.add("http");
-        this.availableProtocol.add("https");
-        this.availableProtocol.add("jms");
-        this.availableProtocol.add("googlepubsub");
-    }
-
-    @Override
-    public void check(EndpointAddress address) {
-        checkIfProtocolIsValid(address);
-        checkIfUriIsValid(address);
-    }
-
-    private void checkIfProtocolIsValid(EndpointAddress address) {
-        if (!availableProtocol.contains(address.getProtocol())) {
-            throw new EndpointValidationException("Endpoint address has invalid format");
-        }
+  private final Set<String> availableProtocol = new HashSet<>();
+
+  public EndpointAddressFormatValidator(List<String> additionalEndpointProtocols) {
+    this.availableProtocol.addAll(additionalEndpointProtocols);
+    this.availableProtocol.add("http");
+    this.availableProtocol.add("https");
+    this.availableProtocol.add("jms");
+    this.availableProtocol.add("googlepubsub");
+  }
+
+  @Override
+  public void check(EndpointAddress address) {
+    checkIfProtocolIsValid(address);
+    checkIfUriIsValid(address);
+  }
+
+  private void checkIfProtocolIsValid(EndpointAddress address) {
+    if (!availableProtocol.contains(address.getProtocol())) {
+      throw new EndpointValidationException("Endpoint address has invalid format");
     }
+  }
 
-    private void checkIfUriIsValid(EndpointAddress address) {
-        UriTemplate template = UriTemplate.fromTemplate(address.getRawEndpoint());
-        if (isInvalidHost(template)) {
-            throw new EndpointValidationException("Endpoint contains invalid chars in host name. Underscore is one of them.");
-        }
+  private void checkIfUriIsValid(EndpointAddress address) {
+    UriTemplate template = UriTemplate.fromTemplate(address.getRawEndpoint());
+    if (isInvalidHost(template)) {
+      throw new EndpointValidationException(
+          "Endpoint contains invalid chars in host name. Underscore is one of them.");
     }
+  }
 
-    private boolean isInvalidHost(UriTemplate template) {
-        Map<String, Object> uriKeysWithEmptyValues = asList(template.getVariables()).stream().collect(toMap(identity(), v -> "empty"));
+  private boolean isInvalidHost(UriTemplate template) {
+    Map<String, Object> uriKeysWithEmptyValues =
+        asList(template.getVariables()).stream().collect(toMap(identity(), v -> "empty"));
 
-        //check if host is null due to bug in jdk https://bugs.java.com/bugdatabase/view_bug.do?bug_id=6587184
-        return URI.create(template.expand(uriKeysWithEmptyValues)).getHost() == null;
-    }
+    // check if host is null due to bug in jdk
+    // https://bugs.java.com/bugdatabase/view_bug.do?bug_id=6587184
+    return URI.create(template.expand(uriKeysWithEmptyValues)).getHost() == null;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointAddressValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointAddressValidator.java
index 2f94c91012..28eb074892 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointAddressValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointAddressValidator.java
@@ -4,5 +4,5 @@
 
 public interface EndpointAddressValidator {
 
-    void check(EndpointAddress address);
+  void check(EndpointAddress address);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointOwnershipValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointOwnershipValidator.java
index 29acc1448f..f05ea1c1fb 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointOwnershipValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointOwnershipValidator.java
@@ -5,5 +5,5 @@
 
 public interface EndpointOwnershipValidator {
 
-    void check(OwnerId owner, EndpointAddress endpoint);
+  void check(OwnerId owner, EndpointAddress endpoint);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointValidationException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointValidationException.java
index d8a064a1d0..656610181c 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointValidationException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/EndpointValidationException.java
@@ -5,12 +5,12 @@
 
 public class EndpointValidationException extends ManagementException {
 
-    public EndpointValidationException(String message) {
-        super(message);
-    }
+  public EndpointValidationException(String message) {
+    super(message);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.VALIDATION_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.VALIDATION_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/MessageFilterTypeValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/MessageFilterTypeValidator.java
index cfefee4f2b..7e65fe4c68 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/MessageFilterTypeValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/MessageFilterTypeValidator.java
@@ -1,63 +1,64 @@
 package pl.allegro.tech.hermes.management.domain.subscription.validator;
 
 import com.google.common.base.Objects;
-import pl.allegro.tech.hermes.api.ContentType;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.Topic;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+import pl.allegro.tech.hermes.api.ContentType;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.Topic;
 
 class MessageFilterTypeValidator {
 
-    private static final String ERROR_MESSAGE = "Message filter type %s doesn't match topic content type %s";
+  private static final String ERROR_MESSAGE =
+      "Message filter type %s doesn't match topic content type %s";
+
+  private static final Set<ContentTypeFilterTypePair> VALID_TYPES_COMBINATIONS =
+      new HashSet<>(
+          Arrays.asList(
+              new ContentTypeFilterTypePair(ContentType.JSON, "jsonpath"),
+              new ContentTypeFilterTypePair(ContentType.JSON, "header"),
+              new ContentTypeFilterTypePair(ContentType.AVRO, "avropath"),
+              new ContentTypeFilterTypePair(ContentType.AVRO, "header")));
+
+  void check(Subscription subscription, Topic topic) {
+    subscription.getFilters().stream()
+        .map(filter -> new ContentTypeFilterTypePair(topic.getContentType(), filter.getType()))
+        .forEach(this::checkTypeMaching);
+  }
+
+  private void checkTypeMaching(ContentTypeFilterTypePair pair) {
+    if (!VALID_TYPES_COMBINATIONS.contains(pair)) {
+      throw new SubscriptionValidationException(
+          String.format(ERROR_MESSAGE, pair.filterType, pair.contentType));
+    }
+  }
 
-    private static final Set<ContentTypeFilterTypePair> VALID_TYPES_COMBINATIONS = new HashSet<>(Arrays.asList(
-            new ContentTypeFilterTypePair(ContentType.JSON, "jsonpath"),
-            new ContentTypeFilterTypePair(ContentType.JSON, "header"),
-            new ContentTypeFilterTypePair(ContentType.AVRO, "avropath"),
-            new ContentTypeFilterTypePair(ContentType.AVRO, "header")
-    ));
+  static class ContentTypeFilterTypePair {
+    private final ContentType contentType;
+    private final String filterType;
 
-    void check(Subscription subscription, Topic topic) {
-        subscription.getFilters()
-                .stream()
-                .map(filter -> new ContentTypeFilterTypePair(topic.getContentType(), filter.getType()))
-                .forEach(this::checkTypeMaching);
+    ContentTypeFilterTypePair(ContentType contentType, String filterType) {
+      this.contentType = contentType;
+      this.filterType = filterType;
     }
 
-    private void checkTypeMaching(ContentTypeFilterTypePair pair) {
-        if (!VALID_TYPES_COMBINATIONS.contains(pair)) {
-            throw new SubscriptionValidationException(String.format(ERROR_MESSAGE, pair.filterType, pair.contentType));
-        }
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      ContentTypeFilterTypePair validPair = (ContentTypeFilterTypePair) o;
+      return contentType == validPair.contentType
+          && Objects.equal(filterType, validPair.filterType);
     }
 
-    static class ContentTypeFilterTypePair {
-        private final ContentType contentType;
-        private final String filterType;
-
-        ContentTypeFilterTypePair(ContentType contentType, String filterType) {
-            this.contentType = contentType;
-            this.filterType = filterType;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            ContentTypeFilterTypePair validPair = (ContentTypeFilterTypePair) o;
-            return contentType == validPair.contentType
-                    && Objects.equal(filterType, validPair.filterType);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(contentType, filterType);
-        }
+    @Override
+    public int hashCode() {
+      return Objects.hashCode(contentType, filterType);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/NoOpEndpointOwnershipValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/NoOpEndpointOwnershipValidator.java
index 0b2ce2636e..51af3e30d7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/NoOpEndpointOwnershipValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/NoOpEndpointOwnershipValidator.java
@@ -5,8 +5,6 @@
 
 public class NoOpEndpointOwnershipValidator implements EndpointOwnershipValidator {
 
-    @Override
-    public void check(OwnerId owner, EndpointAddress endpoint) {
-
-    }
+  @Override
+  public void check(OwnerId owner, EndpointAddress endpoint) {}
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriberWithAccessToAnyTopic.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriberWithAccessToAnyTopic.java
index f9b27c817b..5b27dce4bd 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriberWithAccessToAnyTopic.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriberWithAccessToAnyTopic.java
@@ -1,20 +1,21 @@
 package pl.allegro.tech.hermes.management.domain.subscription.validator;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.OwnerId;
 import pl.allegro.tech.hermes.api.Subscription;
 
-import java.util.List;
-
 public class SubscriberWithAccessToAnyTopic {
-    private final OwnerId ownerId;
-    private final List<String> protocols;
+  private final OwnerId ownerId;
+  private final List<String> protocols;
 
-    public SubscriberWithAccessToAnyTopic(String ownerSource, String ownerId, List<String> protocols) {
-        this.ownerId = new OwnerId(ownerSource, ownerId);
-        this.protocols = protocols;
-    }
+  public SubscriberWithAccessToAnyTopic(
+      String ownerSource, String ownerId, List<String> protocols) {
+    this.ownerId = new OwnerId(ownerSource, ownerId);
+    this.protocols = protocols;
+  }
 
-    boolean matches(Subscription subscription) {
-        return ownerId.equals(subscription.getOwner()) && protocols.contains(subscription.getEndpoint().getProtocol());
-    }
+  boolean matches(Subscription subscription) {
+    return ownerId.equals(subscription.getOwner())
+        && protocols.contains(subscription.getEndpoint().getProtocol());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriptionValidationException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriptionValidationException.java
index d1f3b05d36..ca71c7bb75 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriptionValidationException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriptionValidationException.java
@@ -5,12 +5,12 @@
 
 public class SubscriptionValidationException extends ManagementException {
 
-    public SubscriptionValidationException(String message) {
-        super(message);
-    }
+  public SubscriptionValidationException(String message) {
+    super(message);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.VALIDATION_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.VALIDATION_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriptionValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriptionValidator.java
index 2735eda153..b907359505 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriptionValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/validator/SubscriptionValidator.java
@@ -1,6 +1,9 @@
 package pl.allegro.tech.hermes.management.domain.subscription.validator;
 
+import java.util.List;
+import java.util.Objects;
 import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.SubscriptionPolicy;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionAlreadyExistsException;
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository;
@@ -10,105 +13,145 @@
 import pl.allegro.tech.hermes.management.domain.owner.validator.OwnerIdValidator;
 import pl.allegro.tech.hermes.management.domain.topic.TopicService;
 
-import java.util.List;
-
 public class SubscriptionValidator {
 
-    private final OwnerIdValidator ownerIdValidator;
-    private final ApiPreconditions apiPreconditions;
-    private final MessageFilterTypeValidator messageFilterTypeValidator;
-    private final TopicService topicService;
-    private final SubscriptionRepository subscriptionRepository;
-    private final List<EndpointAddressValidator> endpointAddressValidators;
-    private final EndpointOwnershipValidator endpointOwnershipValidator;
-    private final List<SubscriberWithAccessToAnyTopic> subscribersWithAccessToAnyTopic;
-
-    public SubscriptionValidator(OwnerIdValidator ownerIdValidator,
-                                 ApiPreconditions apiPreconditions,
-                                 TopicService topicService,
-                                 SubscriptionRepository subscriptionRepository,
-                                 List<EndpointAddressValidator> endpointAddressValidators,
-                                 EndpointOwnershipValidator endpointOwnershipValidator,
-                                 List<SubscriberWithAccessToAnyTopic> subscribersWithAccessToAnyTopic) {
-        this.ownerIdValidator = ownerIdValidator;
-        this.apiPreconditions = apiPreconditions;
-        this.messageFilterTypeValidator = new MessageFilterTypeValidator();
-        this.topicService = topicService;
-        this.subscriptionRepository = subscriptionRepository;
-        this.endpointAddressValidators = endpointAddressValidators;
-        this.endpointOwnershipValidator = endpointOwnershipValidator;
-        this.subscribersWithAccessToAnyTopic = subscribersWithAccessToAnyTopic;
+  private final OwnerIdValidator ownerIdValidator;
+  private final ApiPreconditions apiPreconditions;
+  private final MessageFilterTypeValidator messageFilterTypeValidator;
+  private final TopicService topicService;
+  private final SubscriptionRepository subscriptionRepository;
+  private final List<EndpointAddressValidator> endpointAddressValidators;
+  private final EndpointOwnershipValidator endpointOwnershipValidator;
+  private final List<SubscriberWithAccessToAnyTopic> subscribersWithAccessToAnyTopic;
+
+  public SubscriptionValidator(
+      OwnerIdValidator ownerIdValidator,
+      ApiPreconditions apiPreconditions,
+      TopicService topicService,
+      SubscriptionRepository subscriptionRepository,
+      List<EndpointAddressValidator> endpointAddressValidators,
+      EndpointOwnershipValidator endpointOwnershipValidator,
+      List<SubscriberWithAccessToAnyTopic> subscribersWithAccessToAnyTopic) {
+    this.ownerIdValidator = ownerIdValidator;
+    this.apiPreconditions = apiPreconditions;
+    this.messageFilterTypeValidator = new MessageFilterTypeValidator();
+    this.topicService = topicService;
+    this.subscriptionRepository = subscriptionRepository;
+    this.endpointAddressValidators = endpointAddressValidators;
+    this.endpointOwnershipValidator = endpointOwnershipValidator;
+    this.subscribersWithAccessToAnyTopic = subscribersWithAccessToAnyTopic;
+  }
+
+  public void checkCreation(Subscription toCheck, RequestUser createdBy) {
+    apiPreconditions.checkConstraints(toCheck, createdBy.isAdmin());
+    checkOwner(toCheck);
+    checkEndpoint(toCheck);
+    checkPermissionsToManageSubscription(toCheck, createdBy);
+    ensureCreatedSubscriptionInflightIsValid(toCheck, createdBy);
+    Topic topic = topicService.getTopicDetails(toCheck.getTopicName());
+    checkFilters(toCheck, topic);
+    checkIfSubscribingToTopicIsAllowed(toCheck, topic, createdBy);
+    if (subscriptionRepository.subscriptionExists(toCheck.getTopicName(), toCheck.getName())) {
+      throw new SubscriptionAlreadyExistsException(toCheck);
     }
+  }
 
-    public void checkCreation(Subscription toCheck, RequestUser createdBy) {
-        apiPreconditions.checkConstraints(toCheck, createdBy.isAdmin());
-        checkOwner(toCheck);
-        checkEndpoint(toCheck);
-        checkPermissionsToManageSubscription(toCheck, createdBy);
-        Topic topic = topicService.getTopicDetails(toCheck.getTopicName());
-        checkFilters(toCheck, topic);
-        checkIfSubscribingToTopicIsAllowed(toCheck, topic, createdBy);
-        if (subscriptionRepository.subscriptionExists(toCheck.getTopicName(), toCheck.getName())) {
-            throw new SubscriptionAlreadyExistsException(toCheck);
-        }
+  public void checkModification(
+      Subscription toCheck, RequestUser modifiedBy, Subscription previous) {
+    apiPreconditions.checkConstraints(toCheck, modifiedBy.isAdmin());
+    checkOwner(toCheck);
+    checkEndpoint(toCheck);
+    checkPermissionsToManageSubscription(toCheck, modifiedBy);
+    ensureUpdatedSubscriptionInflightIsValid(previous, toCheck, modifiedBy);
+    Topic topic = topicService.getTopicDetails(toCheck.getTopicName());
+    checkFilters(toCheck, topic);
+    if (!toCheck.getEndpoint().equals(previous.getEndpoint())) {
+      checkIfModifyingEndpointIsAllowed(toCheck, topic, modifiedBy);
     }
+    subscriptionRepository.ensureSubscriptionExists(toCheck.getTopicName(), toCheck.getName());
+  }
+
+  private void checkOwner(Subscription toCheck) {
+    ownerIdValidator.check(toCheck.getOwner());
+  }
 
-    public void checkModification(Subscription toCheck, RequestUser modifiedBy, Subscription previous) {
-        apiPreconditions.checkConstraints(toCheck, modifiedBy.isAdmin());
-        checkOwner(toCheck);
-        checkEndpoint(toCheck);
-        checkPermissionsToManageSubscription(toCheck, modifiedBy);
-        Topic topic = topicService.getTopicDetails(toCheck.getTopicName());
-        checkFilters(toCheck, topic);
-        if (!toCheck.getEndpoint().equals(previous.getEndpoint())) {
-            checkIfModifyingEndpointIsAllowed(toCheck, topic, modifiedBy);
-        }
-        subscriptionRepository.ensureSubscriptionExists(toCheck.getTopicName(), toCheck.getName());
+  private void checkEndpoint(Subscription toCheck) {
+    endpointAddressValidators.forEach(validator -> validator.check(toCheck.getEndpoint()));
+    endpointOwnershipValidator.check(toCheck.getOwner(), toCheck.getEndpoint());
+  }
+
+  private void checkFilters(Subscription toCheck, Topic topic) {
+    messageFilterTypeValidator.check(toCheck, topic);
+  }
+
+  private void checkIfSubscribingToTopicIsAllowed(
+      Subscription toCheck, Topic topic, RequestUser requester) {
+    if (isSubscribingForbidden(toCheck, topic, requester)) {
+      throw new PermissionDeniedException(
+          "Subscribing to this topic has been restricted. Contact the topic owner to create a new subscription.");
     }
+  }
 
-    private void checkOwner(Subscription toCheck) {
-        ownerIdValidator.check(toCheck.getOwner());
+  private void checkIfModifyingEndpointIsAllowed(
+      Subscription toCheck, Topic topic, RequestUser requester) {
+    if (isSubscribingForbidden(toCheck, topic, requester)) {
+      throw new PermissionDeniedException(
+          "Subscribing to this topic has been restricted. Contact the topic owner to modify the endpoint of this subscription.");
     }
+  }
 
-    private void checkEndpoint(Subscription toCheck) {
-        endpointAddressValidators.forEach(validator -> validator.check(toCheck.getEndpoint()));
-        endpointOwnershipValidator.check(toCheck.getOwner(), toCheck.getEndpoint());
+  private boolean isSubscribingForbidden(Subscription toCheck, Topic topic, RequestUser requester) {
+    if (topic.isSubscribingRestricted()) {
+      boolean privilegedSubscriber =
+          subscribersWithAccessToAnyTopic.stream()
+              .anyMatch(subscriber -> subscriber.matches(toCheck));
+      return !requester.isAdmin() && !requester.isOwner(topic.getOwner()) && !privilegedSubscriber;
     }
+    return false;
+  }
 
-    private void checkFilters(Subscription toCheck, Topic topic) {
-        messageFilterTypeValidator.check(toCheck, topic);
+  private void checkPermissionsToManageSubscription(Subscription toCheck, RequestUser requester) {
+    if (!requester.isAdmin() && !requester.isOwner(toCheck.getOwner())) {
+      throw new SubscriptionValidationException(
+          "Provide an owner that includes you, you would not be able to manage this subscription later");
     }
+  }
 
-    private void checkIfSubscribingToTopicIsAllowed(Subscription toCheck, Topic topic, RequestUser requester) {
-        if (isSubscribingForbidden(toCheck, topic, requester)) {
-            throw new PermissionDeniedException(
-                    "Subscribing to this topic has been restricted. Contact the topic owner to create a new subscription."
-            );
-        }
+  private void ensureCreatedSubscriptionInflightIsValid(
+      Subscription subscription, RequestUser requester) {
+    if (requester.isAdmin()) {
+      return;
+    }
+    SubscriptionPolicy subscriptionPolicy = subscription.getSerialSubscriptionPolicy();
+    if (subscriptionPolicy == null) {
+      return;
     }
+    if (subscriptionPolicy.getInflightSize() != null) {
+      throw new SubscriptionValidationException("Inflight size can't be set by non admin users");
+    }
+  }
 
-    private void checkIfModifyingEndpointIsAllowed(Subscription toCheck, Topic topic, RequestUser requester) {
-        if (isSubscribingForbidden(toCheck, topic, requester)) {
-            throw new PermissionDeniedException(
-                    "Subscribing to this topic has been restricted. Contact the topic owner to modify the endpoint of this subscription."
-            );
-        }
+  private void ensureUpdatedSubscriptionInflightIsValid(
+      Subscription previous, Subscription updated, RequestUser requester) {
+    if (requester.isAdmin()) {
+      return;
     }
 
-    private boolean isSubscribingForbidden(Subscription toCheck, Topic topic, RequestUser requester) {
-        if (topic.isSubscribingRestricted()) {
-            boolean privilegedSubscriber = subscribersWithAccessToAnyTopic.stream()
-                    .anyMatch(subscriber -> subscriber.matches(toCheck));
-            return !requester.isAdmin() && !requester.isOwner(topic.getOwner()) && !privilegedSubscriber;
-        }
-        return false;
+    SubscriptionPolicy updatedSubscriptionPolicy = updated.getSerialSubscriptionPolicy();
+    if (updatedSubscriptionPolicy == null) {
+      return;
     }
+    Integer updatedInflight = updatedSubscriptionPolicy.getInflightSize();
+
+    SubscriptionPolicy previousSubscriptionPolicy = previous.getSerialSubscriptionPolicy();
+    Integer previousInflight =
+        previousSubscriptionPolicy == null ? null : previousSubscriptionPolicy.getInflightSize();
 
-    private void checkPermissionsToManageSubscription(Subscription toCheck, RequestUser requester) {
-        if (!requester.isAdmin() && !requester.isOwner(toCheck.getOwner())) {
-            throw new SubscriptionValidationException(
-                    "Provide an owner that includes you, you would not be able to manage this subscription later"
-            );
-        }
+    if (!Objects.equals(previousInflight, updatedInflight)) {
+      throw new SubscriptionValidationException(
+          String.format(
+              "Inflight size can't be changed by non admin users. Changed from: %s, to: %s",
+              previousInflight, updatedInflight));
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/AssignmentsToSubscriptionsNotCompletedException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/AssignmentsToSubscriptionsNotCompletedException.java
index 0e395fd11f..95511e9ae0 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/AssignmentsToSubscriptionsNotCompletedException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/AssignmentsToSubscriptionsNotCompletedException.java
@@ -6,12 +6,13 @@
 
 public class AssignmentsToSubscriptionsNotCompletedException extends ManagementException {
 
-    public AssignmentsToSubscriptionsNotCompletedException(Topic topic) {
-        super("Not all subscriptions for topic " + topic.getQualifiedName() + "have assigned consumers");
-    }
+  public AssignmentsToSubscriptionsNotCompletedException(Topic topic) {
+    super(
+        "Not all subscriptions for topic " + topic.getQualifiedName() + "have assigned consumers");
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.UNABLE_TO_MOVE_OFFSETS_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.UNABLE_TO_MOVE_OFFSETS_EXCEPTION;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/BrokerTopicManagement.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/BrokerTopicManagement.java
index d50889531d..dcd1e26880 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/BrokerTopicManagement.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/BrokerTopicManagement.java
@@ -4,12 +4,11 @@
 
 public interface BrokerTopicManagement {
 
-    void createTopic(Topic topic);
+  void createTopic(Topic topic);
 
-    void removeTopic(Topic topic);
+  void removeTopic(Topic topic);
 
-    void updateTopic(Topic topic);
-
-    boolean topicExists(Topic topic);
+  void updateTopic(Topic topic);
 
+  boolean topicExists(Topic topic);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/CreatorRights.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/CreatorRights.java
index 91c7d1043c..4f948f7db5 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/CreatorRights.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/CreatorRights.java
@@ -4,6 +4,5 @@
 
 public interface CreatorRights {
 
-    boolean allowedToManage(Topic topic);
-
+  boolean allowedToManage(Topic topic);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/OffsetsNotAvailableException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/OffsetsNotAvailableException.java
index 05605ea8a8..2379580b60 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/OffsetsNotAvailableException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/OffsetsNotAvailableException.java
@@ -6,12 +6,13 @@
 
 public class OffsetsNotAvailableException extends ManagementException {
 
-    public OffsetsNotAvailableException(Topic topic) {
-        super("Not all offsets related to hermes topic " + topic.getQualifiedName() + " were available.");
-    }
+  public OffsetsNotAvailableException(Topic topic) {
+    super(
+        "Not all offsets related to hermes topic " + topic.getQualifiedName() + " were available.");
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OFFSETS_NOT_AVAILABLE_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OFFSETS_NOT_AVAILABLE_EXCEPTION;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/SingleMessageReader.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/SingleMessageReader.java
index 40ce2c165a..0cdb00b5b1 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/SingleMessageReader.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/SingleMessageReader.java
@@ -5,6 +5,5 @@
 
 public interface SingleMessageReader {
 
-    String readMessageAsJson(Topic topic, KafkaTopic kafkaTopic, int partition, long offset);
-
+  String readMessageAsJson(Topic topic, KafkaTopic kafkaTopic, int partition, long offset);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/SingleMessageReaderException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/SingleMessageReaderException.java
index 788cef9f11..86954d476a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/SingleMessageReaderException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/SingleMessageReaderException.java
@@ -5,16 +5,16 @@
 
 public class SingleMessageReaderException extends ManagementException {
 
-    public SingleMessageReaderException(String message) {
-        super(message);
-    }
+  public SingleMessageReaderException(String message) {
+    super(message);
+  }
 
-    public SingleMessageReaderException(String message, Throwable t) {
-        super(message, t);
-    }
+  public SingleMessageReaderException(String message, Throwable t) {
+    super(message, t);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SINGLE_MESSAGE_READER_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SINGLE_MESSAGE_READER_EXCEPTION;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicContentTypeMigrationService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicContentTypeMigrationService.java
index e2e338f6c4..44117189d9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicContentTypeMigrationService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicContentTypeMigrationService.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.management.domain.topic;
 
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,87 +16,89 @@
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
 import pl.allegro.tech.hermes.management.infrastructure.kafka.MultiDCAwareService;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 @Component
 public class TopicContentTypeMigrationService {
 
-    private static final Logger logger = LoggerFactory.getLogger(TopicContentTypeMigrationService.class);
-
-    private static final Duration CHECK_OFFSETS_AVAILABLE_TIMEOUT = Duration.ofSeconds(30);
-    private static final Duration INTERVAL_BETWEEN_OFFSETS_AVAILABLE_CHECK = Duration.ofMillis(500);
-    private static final Duration INTERVAL_BETWEEN_ASSIGNMENTS_COMPLETED_CHECK = Duration.ofMillis(500);
-
-    private final SubscriptionRepository subscriptionRepository;
-    private final MultiDCAwareService multiDCAwareService;
-    private final Clock clock;
-
-    @Autowired
-    public TopicContentTypeMigrationService(SubscriptionRepository subscriptionRepository,
-                                            MultiDCAwareService multiDCAwareService,
-                                            Clock clock) {
-        this.subscriptionRepository = subscriptionRepository;
-        this.multiDCAwareService = multiDCAwareService;
-        this.clock = clock;
-    }
-
-    void notifySubscriptions(Topic topic, Instant beforeMigrationInstant, RequestUser requester) {
-        waitUntilOffsetsAvailableOnAllKafkaTopics(topic, CHECK_OFFSETS_AVAILABLE_TIMEOUT);
-        logger.info("Offsets available on all partitions of topic {}", topic.getQualifiedName());
-        notSuspendedSubscriptionsForTopic(topic)
-                .map(Subscription::getName)
-                .forEach(sub -> notifySingleSubscription(topic, beforeMigrationInstant, sub, requester));
-    }
-
-    void waitUntilAllSubscriptionsHasConsumersAssigned(Topic topic, Duration assignmentCompletedTimeout) {
-        Instant abortAttemptsInstant = clock.instant().plus(assignmentCompletedTimeout);
-
-        while (!allSubscriptionsHaveConsumersAssigned(topic)) {
-            if (clock.instant().isAfter(abortAttemptsInstant)) {
-                throw new AssignmentsToSubscriptionsNotCompletedException(topic);
-            }
-            sleep(INTERVAL_BETWEEN_ASSIGNMENTS_COMPLETED_CHECK);
-        }
-    }
-
-    private void notifySingleSubscription(Topic topic, Instant beforeMigrationInstant, String subscriptionName, RequestUser requester) {
-        multiDCAwareService.retransmit(topic, subscriptionName, beforeMigrationInstant.toEpochMilli(), false, requester);
-    }
-
-    private void waitUntilOffsetsAvailableOnAllKafkaTopics(Topic topic, Duration offsetsAvailableTimeout) {
-        Instant abortAttemptsInstant = clock.instant().plus(offsetsAvailableTimeout);
-
-        while (!multiDCAwareService.areOffsetsAvailableOnAllKafkaTopics(topic)) {
-            if (clock.instant().isAfter(abortAttemptsInstant)) {
-                throw new OffsetsNotAvailableException(topic);
-            }
-            logger.info("Not all offsets related to hermes topic {} are available, will retry", topic.getQualifiedName());
-            sleep(INTERVAL_BETWEEN_OFFSETS_AVAILABLE_CHECK);
-        }
+  private static final Logger logger =
+      LoggerFactory.getLogger(TopicContentTypeMigrationService.class);
+
+  private static final Duration CHECK_OFFSETS_AVAILABLE_TIMEOUT = Duration.ofSeconds(30);
+  private static final Duration INTERVAL_BETWEEN_OFFSETS_AVAILABLE_CHECK = Duration.ofMillis(500);
+  private static final Duration INTERVAL_BETWEEN_ASSIGNMENTS_COMPLETED_CHECK =
+      Duration.ofMillis(500);
+
+  private final SubscriptionRepository subscriptionRepository;
+  private final MultiDCAwareService multiDCAwareService;
+  private final Clock clock;
+
+  @Autowired
+  public TopicContentTypeMigrationService(
+      SubscriptionRepository subscriptionRepository,
+      MultiDCAwareService multiDCAwareService,
+      Clock clock) {
+    this.subscriptionRepository = subscriptionRepository;
+    this.multiDCAwareService = multiDCAwareService;
+    this.clock = clock;
+  }
+
+  void notifySubscriptions(Topic topic, Instant beforeMigrationInstant, RequestUser requester) {
+    waitUntilOffsetsAvailableOnAllKafkaTopics(topic, CHECK_OFFSETS_AVAILABLE_TIMEOUT);
+    logger.info("Offsets available on all partitions of topic {}", topic.getQualifiedName());
+    notSuspendedSubscriptionsForTopic(topic)
+        .map(Subscription::getName)
+        .forEach(sub -> notifySingleSubscription(topic, beforeMigrationInstant, sub, requester));
+  }
+
+  void waitUntilAllSubscriptionsHasConsumersAssigned(
+      Topic topic, Duration assignmentCompletedTimeout) {
+    Instant abortAttemptsInstant = clock.instant().plus(assignmentCompletedTimeout);
+
+    while (!allSubscriptionsHaveConsumersAssigned(topic)) {
+      if (clock.instant().isAfter(abortAttemptsInstant)) {
+        throw new AssignmentsToSubscriptionsNotCompletedException(topic);
+      }
+      sleep(INTERVAL_BETWEEN_ASSIGNMENTS_COMPLETED_CHECK);
     }
-
-    private void sleep(Duration sleepDuration) {
-        try {
-            Thread.sleep(sleepDuration.toMillis());
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private boolean allSubscriptionsHaveConsumersAssigned(Topic topic) {
-        List<Subscription> notSuspendedSubscriptions = notSuspendedSubscriptionsForTopic(topic)
-                .collect(Collectors.toList());
-        return multiDCAwareService.allSubscriptionsHaveConsumersAssigned(topic, notSuspendedSubscriptions);
+  }
+
+  private void notifySingleSubscription(
+      Topic topic, Instant beforeMigrationInstant, String subscriptionName, RequestUser requester) {
+    multiDCAwareService.retransmit(
+        topic, subscriptionName, beforeMigrationInstant.toEpochMilli(), false, requester);
+  }
+
+  private void waitUntilOffsetsAvailableOnAllKafkaTopics(
+      Topic topic, Duration offsetsAvailableTimeout) {
+    Instant abortAttemptsInstant = clock.instant().plus(offsetsAvailableTimeout);
+
+    while (!multiDCAwareService.areOffsetsAvailableOnAllKafkaTopics(topic)) {
+      if (clock.instant().isAfter(abortAttemptsInstant)) {
+        throw new OffsetsNotAvailableException(topic);
+      }
+      logger.info(
+          "Not all offsets related to hermes topic {} are available, will retry",
+          topic.getQualifiedName());
+      sleep(INTERVAL_BETWEEN_OFFSETS_AVAILABLE_CHECK);
     }
+  }
 
-    private Stream<Subscription> notSuspendedSubscriptionsForTopic(Topic topic) {
-        return subscriptionRepository.listSubscriptions(topic.getName())
-                .stream()
-                .filter(sub -> Subscription.State.SUSPENDED != sub.getState());
+  private void sleep(Duration sleepDuration) {
+    try {
+      Thread.sleep(sleepDuration.toMillis());
+    } catch (InterruptedException e) {
+      throw new RuntimeException(e);
     }
+  }
+
+  private boolean allSubscriptionsHaveConsumersAssigned(Topic topic) {
+    List<Subscription> notSuspendedSubscriptions =
+        notSuspendedSubscriptionsForTopic(topic).collect(Collectors.toList());
+    return multiDCAwareService.allSubscriptionsHaveConsumersAssigned(
+        topic, notSuspendedSubscriptions);
+  }
+
+  private Stream<Subscription> notSuspendedSubscriptionsForTopic(Topic topic) {
+    return subscriptionRepository.listSubscriptions(topic.getName()).stream()
+        .filter(sub -> Subscription.State.SUSPENDED != sub.getState());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicMetricsRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicMetricsRepository.java
index 47a0c76a8c..a78fac1bbc 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicMetricsRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicMetricsRepository.java
@@ -5,6 +5,5 @@
 
 public interface TopicMetricsRepository {
 
-    TopicMetrics loadMetrics(TopicName topicName);
-
+  TopicMetrics loadMetrics(TopicName topicName);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicOwnerCache.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicOwnerCache.java
index d84f13e1df..ce76b8d97d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicOwnerCache.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicOwnerCache.java
@@ -5,6 +5,10 @@
 import com.google.common.collect.Multimaps;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import jakarta.annotation.PreDestroy;
+import java.util.Collection;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -15,68 +19,66 @@
 import pl.allegro.tech.hermes.domain.topic.TopicRepository;
 import pl.allegro.tech.hermes.management.domain.group.GroupService;
 
-import java.util.Collection;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 @Component
 public class TopicOwnerCache {
 
-    private static final Logger logger = LoggerFactory.getLogger(TopicOwnerCache.class);
+  private static final Logger logger = LoggerFactory.getLogger(TopicOwnerCache.class);
 
-    private final TopicRepository topicRepository;
-    private final GroupService groupService;
-    private final ScheduledExecutorService scheduledExecutorService;
+  private final TopicRepository topicRepository;
+  private final GroupService groupService;
+  private final ScheduledExecutorService scheduledExecutorService;
 
-    private Multimap<OwnerId, TopicName> cache = Multimaps.synchronizedMultimap(ArrayListMultimap.create());
+  private Multimap<OwnerId, TopicName> cache =
+      Multimaps.synchronizedMultimap(ArrayListMultimap.create());
 
-    public TopicOwnerCache(TopicRepository topicRepository, GroupService groupService,
-                           @Value("${topicOwnerCache.refreshRateInSeconds}") int refreshRateInSeconds) {
-        this.topicRepository = topicRepository;
-        this.groupService = groupService;
-        scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(
-                new ThreadFactoryBuilder()
-                        .setNameFormat("topic-owner-cache-%d")
-                        .build());
-        scheduledExecutorService.scheduleAtFixedRate(this::refillCache, 0, refreshRateInSeconds, TimeUnit.SECONDS);
-    }
+  public TopicOwnerCache(
+      TopicRepository topicRepository,
+      GroupService groupService,
+      @Value("${topicOwnerCache.refreshRateInSeconds}") int refreshRateInSeconds) {
+    this.topicRepository = topicRepository;
+    this.groupService = groupService;
+    scheduledExecutorService =
+        Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactoryBuilder().setNameFormat("topic-owner-cache-%d").build());
+    scheduledExecutorService.scheduleAtFixedRate(
+        this::refillCache, 0, refreshRateInSeconds, TimeUnit.SECONDS);
+  }
 
-    @PreDestroy
-    public void stop() {
-        scheduledExecutorService.shutdown();
-    }
+  @PreDestroy
+  public void stop() {
+    scheduledExecutorService.shutdown();
+  }
 
-    public Collection<TopicName> get(OwnerId ownerId) {
-        return cache.get(ownerId);
-    }
+  public Collection<TopicName> get(OwnerId ownerId) {
+    return cache.get(ownerId);
+  }
 
-    private void refillCache() {
-        try {
-            logger.info("Starting filling TopicOwnerCache cache");
-            long start = System.currentTimeMillis();
-            Multimap<OwnerId, TopicName> cache = ArrayListMultimap.create();
-            groupService.listGroupNames().stream()
-                    .flatMap(groupName -> topicRepository.listTopics(groupName).stream())
-                    .forEach(topic -> cache.put(topic.getOwner(), topic.getName()));
-            this.cache = Multimaps.synchronizedMultimap(cache);
-            long end = System.currentTimeMillis();
-            logger.info("TopicOwnerCache filled. Took {}ms", end - start);
-        } catch (Exception e) {
-            logger.error("Error while filling TopicOwnerCache", e);
-        }
+  private void refillCache() {
+    try {
+      logger.info("Starting filling TopicOwnerCache cache");
+      long start = System.currentTimeMillis();
+      Multimap<OwnerId, TopicName> cache = ArrayListMultimap.create();
+      groupService.listGroupNames().stream()
+          .flatMap(groupName -> topicRepository.listTopics(groupName).stream())
+          .forEach(topic -> cache.put(topic.getOwner(), topic.getName()));
+      this.cache = Multimaps.synchronizedMultimap(cache);
+      long end = System.currentTimeMillis();
+      logger.info("TopicOwnerCache filled. Took {}ms", end - start);
+    } catch (Exception e) {
+      logger.error("Error while filling TopicOwnerCache", e);
     }
+  }
 
-    void onRemovedTopic(Topic topic) {
-        cache.remove(topic.getOwner(), topic.getName());
-    }
+  void onRemovedTopic(Topic topic) {
+    cache.remove(topic.getOwner(), topic.getName());
+  }
 
-    void onCreatedTopic(Topic topic) {
-        cache.put(topic.getOwner(), topic.getName());
-    }
+  void onCreatedTopic(Topic topic) {
+    cache.put(topic.getOwner(), topic.getName());
+  }
 
-    void onUpdatedTopic(Topic oldTopic, Topic newTopic) {
-        cache.remove(oldTopic.getOwner(), oldTopic.getName());
-        cache.put(newTopic.getOwner(), newTopic.getName());
-    }
+  void onUpdatedTopic(Topic oldTopic, Topic newTopic) {
+    cache.remove(oldTopic.getOwner(), oldTopic.getName());
+    cache.put(newTopic.getOwner(), newTopic.getName());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicRemovalDisabledException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicRemovalDisabledException.java
index 37c302ae57..400a4b27d2 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicRemovalDisabledException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicRemovalDisabledException.java
@@ -6,13 +6,15 @@
 
 public class TopicRemovalDisabledException extends ManagementException {
 
-    public TopicRemovalDisabledException(Topic topic) {
-        super(String.format("Could not remove topic %s, this operation is currently disabled.", topic.getQualifiedName()));
-    }
-
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OPERATION_DISABLED;
-    }
+  public TopicRemovalDisabledException(Topic topic) {
+    super(
+        String.format(
+            "Could not remove topic %s, this operation is currently disabled.",
+            topic.getQualifiedName()));
+  }
 
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OPERATION_DISABLED;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicSchemaExistsException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicSchemaExistsException.java
index a4bbb84b31..e5c8c4cc77 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicSchemaExistsException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicSchemaExistsException.java
@@ -5,12 +5,12 @@
 
 public class TopicSchemaExistsException extends ManagementException {
 
-    TopicSchemaExistsException(String topic) {
-        super("Schema already exists for topic " + topic + ", please remove it before creating topic.");
-    }
+  TopicSchemaExistsException(String topic) {
+    super("Schema already exists for topic " + topic + ", please remove it before creating topic.");
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SCHEMA_ALREADY_EXISTS;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SCHEMA_ALREADY_EXISTS;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicService.java
index 55ba060834..4841fad67c 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicService.java
@@ -1,11 +1,25 @@
 package pl.allegro.tech.hermes.management.domain.topic;
 
+import static java.util.stream.Collectors.toList;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.nio.charset.StandardCharsets;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.MessageTextPreview;
 import pl.allegro.tech.hermes.api.OwnerId;
 import pl.allegro.tech.hermes.api.PatchData;
@@ -39,386 +53,402 @@
 import pl.allegro.tech.hermes.management.domain.topic.validator.TopicValidator;
 import pl.allegro.tech.hermes.management.infrastructure.kafka.MultiDCAwareService;
 
-import java.nio.charset.StandardCharsets;
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.stream.Collectors.toList;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-
 @Component
 public class TopicService {
 
-    private static final Logger logger = LoggerFactory.getLogger(TopicService.class);
-
-    private final TopicRepository topicRepository;
-    private final GroupService groupService;
-    private final TopicProperties topicProperties;
-    private final SchemaService schemaService;
-
-    private final TopicMetricsRepository metricRepository;
-    private final MultiDCAwareService multiDCAwareService;
-    private final TopicBlacklistService topicBlacklistService;
-    private final TopicValidator topicValidator;
-    private final TopicContentTypeMigrationService topicContentTypeMigrationService;
-    private final Clock clock;
-    private final Auditor auditor;
-    private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
-    private final RepositoryManager repositoryManager;
-    private final TopicOwnerCache topicOwnerCache;
-    private final SubscriptionRemover subscriptionRemover;
-    private final ScheduledExecutorService scheduledTopicExecutor = Executors.newSingleThreadScheduledExecutor(
-            new ThreadFactoryBuilder()
-                    .setNameFormat("scheduled-topic-executor-%d")
-                    .build());
-
-    @Autowired
-    public TopicService(MultiDCAwareService multiDCAwareService,
-                        TopicRepository topicRepository,
-                        GroupService groupService,
-                        TopicProperties topicProperties,
-                        SchemaService schemaService, TopicMetricsRepository metricRepository,
-                        TopicBlacklistService topicBlacklistService, TopicValidator topicValidator,
-                        TopicContentTypeMigrationService topicContentTypeMigrationService,
-                        Clock clock,
-                        Auditor auditor,
-                        MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
-                        RepositoryManager repositoryManager,
-                        TopicOwnerCache topicOwnerCache,
-                        SubscriptionRemover subscriptionRemover) {
-        this.multiDCAwareService = multiDCAwareService;
-        this.topicRepository = topicRepository;
-        this.groupService = groupService;
-        this.topicProperties = topicProperties;
-        this.schemaService = schemaService;
-        this.metricRepository = metricRepository;
-        this.topicBlacklistService = topicBlacklistService;
-        this.topicValidator = topicValidator;
-        this.topicContentTypeMigrationService = topicContentTypeMigrationService;
-        this.clock = clock;
-        this.auditor = auditor;
-        this.multiDcExecutor = multiDcExecutor;
-        this.repositoryManager = repositoryManager;
-        this.topicOwnerCache = topicOwnerCache;
-        this.subscriptionRemover = subscriptionRemover;
-    }
-
-    public void createTopicWithSchema(TopicWithSchema topicWithSchema, RequestUser createdBy, CreatorRights isAllowedToManage) {
-        Topic topic = topicWithSchema.getTopic();
-        auditor.beforeObjectCreation(createdBy.getUsername(), topic);
-        groupService.checkGroupExists(topic.getName().getGroupName());
-        topicValidator.ensureCreatedTopicIsValid(topic, createdBy, isAllowedToManage);
-        ensureTopicDoesNotExist(topic);
-
-        boolean validateAndRegisterSchema = AVRO.equals(topic.getContentType()) || (topic.isJsonToAvroDryRunEnabled()
-                && topicWithSchema.getSchema() != null);
-
-        validateSchema(validateAndRegisterSchema, topicWithSchema, topic);
-        registerAvroSchema(validateAndRegisterSchema, topicWithSchema, createdBy);
-        createTopic(topic, createdBy, isAllowedToManage);
-    }
-
-    public void removeTopicWithSchema(Topic topic, RequestUser removedBy) {
-        auditor.beforeObjectRemoval(removedBy.getUsername(), Topic.class.getSimpleName(), topic.getQualifiedName());
-        subscriptionRemover.removeSubscriptionRelatedToTopic(topic, removedBy);
-        removeSchema(topic);
-        if (!topicProperties.isAllowRemoval()) {
-            throw new TopicRemovalDisabledException(topic);
-        }
-        if (topicBlacklistService.isBlacklisted(topic.getQualifiedName())) {
-            topicBlacklistService.unblacklist(topic.getQualifiedName(), removedBy);
-        }
-        removeTopic(topic, removedBy);
-    }
-
-    public void updateTopicWithSchema(TopicName topicName, PatchData patch, RequestUser modifiedBy) {
-        Topic topic = getTopicDetails(topicName);
-        extractSchema(patch)
-                .ifPresent(schema -> {
-                    schemaService.registerSchema(topic, schema);
-                    scheduleTouchTopic(topicName, modifiedBy);
-                });
-        updateTopic(topicName, patch, modifiedBy);
-    }
-
-    public void updateTopic(TopicName topicName, PatchData patch, RequestUser modifiedBy) {
-        auditor.beforeObjectUpdate(modifiedBy.getUsername(), Topic.class.getSimpleName(), topicName, patch);
-        groupService.checkGroupExists(topicName.getGroupName());
-
-        Topic retrieved = getTopicDetails(topicName);
-        Topic modified = Patch.apply(retrieved, patch);
-
-        topicValidator.ensureUpdatedTopicIsValid(modified, retrieved, modifiedBy);
-
-        if (!retrieved.equals(modified)) {
-            Instant beforeMigrationInstant = clock.instant();
-            // TODO: this does not work as intended, uses == instead of equals
-            if (retrieved.getRetentionTime() != modified.getRetentionTime()) {
-                multiDCAwareService.manageTopic(brokerTopicManagement ->
-                        brokerTopicManagement.updateTopic(modified)
-                );
-            }
-            multiDcExecutor.executeByUser(new UpdateTopicRepositoryCommand(modified), modifiedBy);
-
-            if (!retrieved.wasMigratedFromJsonType() && modified.wasMigratedFromJsonType()) {
-                logger.info(
-                        "Waiting until all subscriptions have consumers assigned during topic {} content type migration...",
-                        topicName.qualifiedName());
-                topicContentTypeMigrationService.waitUntilAllSubscriptionsHasConsumersAssigned(modified,
-                        Duration.ofSeconds(topicProperties.getSubscriptionsAssignmentsCompletedTimeoutSeconds()));
-                logger.info("Notifying subscriptions' consumers about changes in topic {} content type...", topicName.qualifiedName());
-                topicContentTypeMigrationService.notifySubscriptions(modified, beforeMigrationInstant, modifiedBy);
-            }
-            auditor.objectUpdated(modifiedBy.getUsername(), retrieved, modified);
-            topicOwnerCache.onUpdatedTopic(retrieved, modified);
-        }
-    }
-
-    public void touchTopic(TopicName topicName, RequestUser touchedBy) {
-        logger.info("Touching topic {}", topicName.qualifiedName());
-        multiDcExecutor.executeByUser(new TouchTopicRepositoryCommand(topicName), touchedBy);
-    }
-
-    /**
-     * Topic is touched so other Hermes instances are notified to read latest topic schema from schema-registry.
-     * However, schema-registry can be distributed so when schema is written there then it can not be available on all nodes immediately.
-     * This is the reason why we delay touch of topic here, to wait until schema is distributed on schema-registry nodes.
-     */
-    public void scheduleTouchTopic(TopicName topicName, RequestUser touchedBy) {
-        if (topicProperties.isTouchSchedulerEnabled()) {
-            logger.info("Scheduling touch of topic {}", topicName.qualifiedName());
-            scheduledTopicExecutor.schedule(() -> touchTopic(topicName, touchedBy),
-                    topicProperties.getTouchDelayInSeconds(),
-                    TimeUnit.SECONDS
-            );
-        } else {
-            touchTopic(topicName, touchedBy);
-        }
-    }
-
-    public List<String> listQualifiedTopicNames(String groupName) {
-        return topicRepository.listTopicNames(groupName).stream()
-                .map(topicName -> new TopicName(groupName, topicName).qualifiedName())
-                .collect(toList());
-    }
-
-    public List<String> listQualifiedTopicNames() {
-        return groupService.listGroupNames().stream()
-                .map(this::listQualifiedTopicNames)
-                .flatMap(List::stream)
-                .sorted()
-                .collect(toList());
-    }
-
-    public List<Topic> listTopics(String groupName) {
-        return topicRepository.listTopics(groupName);
-    }
-
-    public Topic getTopicDetails(TopicName topicName) {
-        return topicRepository.getTopicDetails(topicName);
-    }
-
-    public TopicWithSchema getTopicWithSchema(TopicName topicName) {
-        Topic topic = getTopicDetails(topicName);
-        Optional<RawSchema> schema = Optional.empty();
-        if (AVRO.equals(topic.getContentType())) {
-            schema = schemaService.getSchema(topicName.qualifiedName());
-        }
-        return schema
-                .map(s -> topicWithSchema(topic, s.value()))
-                .orElseGet(() -> topicWithSchema(topic));
-    }
-
-    public TopicMetrics getTopicMetrics(TopicName topicName) {
-        return topicRepository.topicExists(topicName) ? metricRepository.loadMetrics(topicName) : TopicMetrics.unavailable();
-    }
-
-    public String fetchSingleMessageFromPrimary(String brokersClusterName, TopicName topicName, Integer partition, Long offset) {
-        return multiDCAwareService.readMessageFromPrimary(brokersClusterName, getTopicDetails(topicName), partition, offset);
-    }
-
-    public List<String> listTrackedTopicNames() {
-        return groupService.listGroupNames().stream()
-                .map(topicRepository::listTopics)
-                .flatMap(List::stream)
-                .filter(Topic::isTrackingEnabled)
-                .map(Topic::getQualifiedName)
-                .collect(toList());
-    }
-
-    public List<String> listTrackedTopicNames(String groupName) {
-        return listTopics(groupName).stream()
-                .filter(Topic::isTrackingEnabled)
-                .map(Topic::getQualifiedName)
-                .collect(toList());
-    }
-
-    public List<String> listFilteredTopicNames(Query<Topic> query) {
-        return queryTopic(query)
-                .stream()
-                .map(Topic::getQualifiedName)
-                .collect(toList());
-    }
-
-    public List<String> listFilteredTopicNames(String groupName, Query<Topic> query) {
-        return query.filter(listTopics(groupName))
-                .map(Topic::getQualifiedName)
-                .collect(toList());
-    }
-
-    public List<Topic> queryTopic(Query<Topic> query) {
-        return query
-                .filter(getAllTopics())
-                .collect(toList());
-    }
-
-    public List<Topic> getAllTopics() {
-        return topicRepository.listAllTopics();
-    }
-
-    public Optional<byte[]> preview(TopicName topicName, int idx) {
-        List<byte[]> result = loadMessagePreviewsFromAllDc(topicName)
-                .stream()
-                .map(MessagePreview::getContent)
-                .collect(toList());
-
-        if (idx >= 0 && idx < result.size()) {
-            return Optional.of(result.get(idx));
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    public List<MessageTextPreview> previewText(TopicName topicName) {
-        return loadMessagePreviewsFromAllDc(topicName).stream()
-                .map(p -> new MessageTextPreview(new String(p.getContent(), StandardCharsets.UTF_8), p.isTruncated()))
-                .collect(toList());
-    }
-
-    public List<TopicNameWithMetrics> queryTopicsMetrics(Query<TopicNameWithMetrics> query) {
-        List<Topic> filteredNames = query.filterNames(getAllTopics())
-                .collect(toList());
-        return query.filter(getTopicsMetrics(filteredNames))
-                .collect(toList());
-    }
-
-    public TopicStats getStats() {
-        List<Topic> topics = getAllTopics();
-        long ackAllTopicCount = topics.stream().filter(t -> t.getAck() == Topic.Ack.ALL).count();
-        long trackingEnabledTopicCount = topics.stream().filter(Topic::isTrackingEnabled).count();
-        long avroTopicCount = topics.stream().filter(t -> t.getContentType() == AVRO).count();
-        return new TopicStats(topics.size(), ackAllTopicCount, trackingEnabledTopicCount, avroTopicCount);
-    }
-
-    private void ensureTopicDoesNotExist(Topic topic) {
-        if (topicRepository.topicExists(topic.getName())) {
-            throw new TopicAlreadyExistsException(topic.getName());
-        }
-    }
-
-    private void validateSchema(boolean shouldValidate, TopicWithSchema topicWithSchema, Topic topic) {
-        if (shouldValidate) {
-            schemaService.validateSchema(topic, topicWithSchema.getSchema());
-            boolean schemaAlreadyRegistered = schemaService.getSchema(topic.getQualifiedName()).isPresent();
-            if (schemaAlreadyRegistered) {
-                throw new TopicSchemaExistsException(topic.getQualifiedName());
-            }
-        }
-    }
-
-    private void registerAvroSchema(boolean shouldRegister, TopicWithSchema topicWithSchema, RequestUser createdBy) {
-        if (shouldRegister) {
-            try {
-                schemaService.registerSchema(topicWithSchema.getTopic(), topicWithSchema.getSchema());
-            } catch (Exception e) {
-                logger.error("Rolling back topic {} creation due to schema registration error", topicWithSchema.getQualifiedName(), e);
-                removeTopic(topicWithSchema.getTopic(), createdBy);
-                throw e;
-            }
-        }
-    }
-
-    private void createTopic(Topic topic, RequestUser createdBy, CreatorRights creatorRights) {
-        topicValidator.ensureCreatedTopicIsValid(topic, createdBy, creatorRights);
-
-        if (!multiDCAwareService.topicExists(topic)) {
-            createTopicInBrokers(topic, createdBy);
-            auditor.objectCreated(createdBy.getUsername(), topic);
-            topicOwnerCache.onCreatedTopic(topic);
-        } else {
-            logger.info("Skipping creation of topic {} on brokers, topic already exists", topic.getQualifiedName());
-        }
-
-        multiDcExecutor.executeByUser(new CreateTopicRepositoryCommand(topic), createdBy);
-    }
-
-    private void createTopicInBrokers(Topic topic, RequestUser createdBy) {
-        try {
-            multiDCAwareService.manageTopic(brokerTopicManagement ->
-                    brokerTopicManagement.createTopic(topic)
-            );
-        } catch (Exception exception) {
-            logger.error(
-                    String.format("Could not create topic %s, rollback topic creation.", topic.getQualifiedName()),
-                    exception
-            );
-            multiDcExecutor.executeByUser(new RemoveTopicRepositoryCommand(topic.getName()), createdBy);
-        }
-    }
-
-    private void removeSchema(Topic topic) {
-        if (AVRO.equals(topic.getContentType()) && topicProperties.isRemoveSchema()) {
-            schemaService.getSchema(topic.getQualifiedName()).ifPresent(s ->
-                    schemaService.deleteAllSchemaVersions(topic.getQualifiedName()));
-        }
-    }
-
-    private void removeTopic(Topic topic, RequestUser removedBy) {
-        multiDcExecutor.executeByUser(new RemoveTopicRepositoryCommand(topic.getName()), removedBy);
-        multiDCAwareService.manageTopic(brokerTopicManagement -> brokerTopicManagement.removeTopic(topic));
-        auditor.objectRemoved(removedBy.getUsername(), topic);
-        topicOwnerCache.onRemovedTopic(topic);
-    }
-
-    private Optional<String> extractSchema(PatchData patch) {
-        return Optional.ofNullable(patch.getPatch().get("schema")).map(o -> (String) o);
-    }
-
-    private List<MessagePreview> loadMessagePreviewsFromAllDc(TopicName topicName) {
-        List<DatacenterBoundRepositoryHolder<MessagePreviewRepository>> repositories =
-                repositoryManager.getRepositories(MessagePreviewRepository.class);
-        List<MessagePreview> previews = new ArrayList<>();
-        for (DatacenterBoundRepositoryHolder<MessagePreviewRepository> holder : repositories) {
-            try {
-                previews.addAll(holder.getRepository().loadPreview(topicName));
-            } catch (Exception e) {
-                logger.warn("Could not load message preview for DC: {}", holder.getDatacenterName());
-            }
-        }
-        return previews;
-    }
-
-    private List<TopicNameWithMetrics> getTopicsMetrics(List<Topic> topics) {
-        return topics
-                .stream()
-                .map(t -> {
-                    TopicMetrics metrics = metricRepository.loadMetrics(t.getName());
-                    return TopicNameWithMetrics.from(metrics, t.getQualifiedName());
-                })
-                .collect(toList());
-    }
-
-    public List<Topic> listForOwnerId(OwnerId ownerId) {
-        Collection<TopicName> topicNames = topicOwnerCache.get(ownerId);
-        return topicRepository.getTopicsDetails(topicNames);
-    }
+  private static final Logger logger = LoggerFactory.getLogger(TopicService.class);
+
+  private final TopicRepository topicRepository;
+  private final GroupService groupService;
+  private final TopicProperties topicProperties;
+  private final SchemaService schemaService;
+
+  private final TopicMetricsRepository metricRepository;
+  private final MultiDCAwareService multiDCAwareService;
+  private final TopicBlacklistService topicBlacklistService;
+  private final TopicValidator topicValidator;
+  private final TopicContentTypeMigrationService topicContentTypeMigrationService;
+  private final Clock clock;
+  private final Auditor auditor;
+  private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+  private final RepositoryManager repositoryManager;
+  private final TopicOwnerCache topicOwnerCache;
+  private final SubscriptionRemover subscriptionRemover;
+  private final ScheduledExecutorService scheduledTopicExecutor =
+      Executors.newSingleThreadScheduledExecutor(
+          new ThreadFactoryBuilder().setNameFormat("scheduled-topic-executor-%d").build());
+
+  @Autowired
+  public TopicService(
+      MultiDCAwareService multiDCAwareService,
+      TopicRepository topicRepository,
+      GroupService groupService,
+      TopicProperties topicProperties,
+      SchemaService schemaService,
+      TopicMetricsRepository metricRepository,
+      TopicBlacklistService topicBlacklistService,
+      TopicValidator topicValidator,
+      TopicContentTypeMigrationService topicContentTypeMigrationService,
+      Clock clock,
+      Auditor auditor,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor,
+      RepositoryManager repositoryManager,
+      TopicOwnerCache topicOwnerCache,
+      SubscriptionRemover subscriptionRemover) {
+    this.multiDCAwareService = multiDCAwareService;
+    this.topicRepository = topicRepository;
+    this.groupService = groupService;
+    this.topicProperties = topicProperties;
+    this.schemaService = schemaService;
+    this.metricRepository = metricRepository;
+    this.topicBlacklistService = topicBlacklistService;
+    this.topicValidator = topicValidator;
+    this.topicContentTypeMigrationService = topicContentTypeMigrationService;
+    this.clock = clock;
+    this.auditor = auditor;
+    this.multiDcExecutor = multiDcExecutor;
+    this.repositoryManager = repositoryManager;
+    this.topicOwnerCache = topicOwnerCache;
+    this.subscriptionRemover = subscriptionRemover;
+  }
+
+  public void createTopicWithSchema(
+      TopicWithSchema topicWithSchema, RequestUser createdBy, CreatorRights isAllowedToManage) {
+    Topic topic = topicWithSchema.getTopic();
+    auditor.beforeObjectCreation(createdBy.getUsername(), topic);
+    groupService.checkGroupExists(topic.getName().getGroupName());
+    topicValidator.ensureCreatedTopicIsValid(topic, createdBy, isAllowedToManage);
+    ensureTopicDoesNotExist(topic);
+
+    boolean validateAndRegisterSchema =
+        AVRO.equals(topic.getContentType())
+            || (topic.isJsonToAvroDryRunEnabled() && topicWithSchema.getSchema() != null);
+
+    validateSchema(validateAndRegisterSchema, topicWithSchema, topic);
+    registerAvroSchema(validateAndRegisterSchema, topicWithSchema, createdBy);
+    createTopic(topic, createdBy, isAllowedToManage);
+  }
+
+  public void removeTopicWithSchema(Topic topic, RequestUser removedBy) {
+    auditor.beforeObjectRemoval(
+        removedBy.getUsername(), Topic.class.getSimpleName(), topic.getQualifiedName());
+    subscriptionRemover.removeSubscriptionRelatedToTopic(topic, removedBy);
+    removeSchema(topic);
+    if (!topicProperties.isAllowRemoval()) {
+      throw new TopicRemovalDisabledException(topic);
+    }
+    if (topicBlacklistService.isBlacklisted(topic.getQualifiedName())) {
+      topicBlacklistService.unblacklist(topic.getQualifiedName(), removedBy);
+    }
+    removeTopic(topic, removedBy);
+  }
+
+  public void updateTopicWithSchema(TopicName topicName, PatchData patch, RequestUser modifiedBy) {
+    Topic topic = getTopicDetails(topicName);
+    extractSchema(patch)
+        .ifPresent(
+            schema -> {
+              schemaService.registerSchema(topic, schema);
+              scheduleTouchTopic(topicName, modifiedBy);
+            });
+    updateTopic(topicName, patch, modifiedBy);
+  }
+
+  public void updateTopic(TopicName topicName, PatchData patch, RequestUser modifiedBy) {
+    auditor.beforeObjectUpdate(
+        modifiedBy.getUsername(), Topic.class.getSimpleName(), topicName, patch);
+    groupService.checkGroupExists(topicName.getGroupName());
+
+    Topic retrieved = getTopicDetails(topicName);
+    Topic modified = Patch.apply(retrieved, patch);
+
+    topicValidator.ensureUpdatedTopicIsValid(modified, retrieved, modifiedBy);
+
+    if (!retrieved.equals(modified)) {
+      Instant beforeMigrationInstant = clock.instant();
+      // TODO: this does not work as intended, uses == instead of equals
+      if (retrieved.getRetentionTime() != modified.getRetentionTime()) {
+        multiDCAwareService.manageTopic(
+            brokerTopicManagement -> brokerTopicManagement.updateTopic(modified));
+      }
+      multiDcExecutor.executeByUser(new UpdateTopicRepositoryCommand(modified), modifiedBy);
+
+      if (!retrieved.wasMigratedFromJsonType() && modified.wasMigratedFromJsonType()) {
+        logger.info(
+            "Waiting until all subscriptions have consumers assigned during topic {} content type migration...",
+            topicName.qualifiedName());
+        topicContentTypeMigrationService.waitUntilAllSubscriptionsHasConsumersAssigned(
+            modified,
+            Duration.ofSeconds(
+                topicProperties.getSubscriptionsAssignmentsCompletedTimeoutSeconds()));
+        logger.info(
+            "Notifying subscriptions' consumers about changes in topic {} content type...",
+            topicName.qualifiedName());
+        topicContentTypeMigrationService.notifySubscriptions(
+            modified, beforeMigrationInstant, modifiedBy);
+      }
+      auditor.objectUpdated(modifiedBy.getUsername(), retrieved, modified);
+      topicOwnerCache.onUpdatedTopic(retrieved, modified);
+    }
+  }
+
+  public void touchTopic(TopicName topicName, RequestUser touchedBy) {
+    logger.info("Touching topic {}", topicName.qualifiedName());
+    multiDcExecutor.executeByUser(new TouchTopicRepositoryCommand(topicName), touchedBy);
+  }
+
+  /**
+   * Topic is touched so other Hermes instances are notified to read latest topic schema from
+   * schema-registry. However, schema-registry can be distributed so when schema is written there
+   * then it can not be available on all nodes immediately. This is the reason why we delay touch of
+   * topic here, to wait until schema is distributed on schema-registry nodes.
+   */
+  public void scheduleTouchTopic(TopicName topicName, RequestUser touchedBy) {
+    if (topicProperties.isTouchSchedulerEnabled()) {
+      logger.info("Scheduling touch of topic {}", topicName.qualifiedName());
+      scheduledTopicExecutor.schedule(
+          () -> touchTopic(topicName, touchedBy),
+          topicProperties.getTouchDelayInSeconds(),
+          TimeUnit.SECONDS);
+    } else {
+      touchTopic(topicName, touchedBy);
+    }
+  }
+
+  public List<String> listQualifiedTopicNames(String groupName) {
+    return topicRepository.listTopicNames(groupName).stream()
+        .map(topicName -> new TopicName(groupName, topicName).qualifiedName())
+        .collect(toList());
+  }
+
+  public List<String> listQualifiedTopicNames() {
+    return groupService.listGroupNames().stream()
+        .map(this::listQualifiedTopicNames)
+        .flatMap(List::stream)
+        .sorted()
+        .collect(toList());
+  }
+
+  public List<Topic> listTopics(String groupName) {
+    return topicRepository.listTopics(groupName);
+  }
+
+  public Topic getTopicDetails(TopicName topicName) {
+    return topicRepository.getTopicDetails(topicName);
+  }
+
+  public TopicWithSchema getTopicWithSchema(TopicName topicName) {
+    Topic topic = getTopicDetails(topicName);
+    Optional<RawSchema> schema = Optional.empty();
+    if (AVRO.equals(topic.getContentType())) {
+      schema = schemaService.getSchema(topicName.qualifiedName());
+    }
+    return schema
+        .map(s -> topicWithSchema(topic, s.value()))
+        .orElseGet(() -> topicWithSchema(topic));
+  }
+
+  public TopicMetrics getTopicMetrics(TopicName topicName) {
+    return topicRepository.topicExists(topicName)
+        ? metricRepository.loadMetrics(topicName)
+        : TopicMetrics.unavailable();
+  }
+
+  public String fetchSingleMessageFromPrimary(
+      String brokersClusterName, TopicName topicName, Integer partition, Long offset) {
+    return multiDCAwareService.readMessageFromPrimary(
+        brokersClusterName, getTopicDetails(topicName), partition, offset);
+  }
+
+  public List<String> listTrackedTopicNames() {
+    return groupService.listGroupNames().stream()
+        .map(topicRepository::listTopics)
+        .flatMap(List::stream)
+        .filter(Topic::isTrackingEnabled)
+        .map(Topic::getQualifiedName)
+        .collect(toList());
+  }
+
+  public List<String> listTrackedTopicNames(String groupName) {
+    return listTopics(groupName).stream()
+        .filter(Topic::isTrackingEnabled)
+        .map(Topic::getQualifiedName)
+        .collect(toList());
+  }
+
+  public List<String> listFilteredTopicNames(Query<Topic> query) {
+    return queryTopic(query).stream().map(Topic::getQualifiedName).collect(toList());
+  }
+
+  public List<String> listFilteredTopicNames(String groupName, Query<Topic> query) {
+    return query.filter(listTopics(groupName)).map(Topic::getQualifiedName).collect(toList());
+  }
+
+  public List<Topic> queryTopic(Query<Topic> query) {
+    return query.filter(getAllTopics()).collect(toList());
+  }
+
+  public List<Topic> getAllTopics() {
+    return topicRepository.listAllTopics();
+  }
+
+  public Optional<byte[]> preview(TopicName topicName, int idx) {
+    List<byte[]> result =
+        loadMessagePreviewsFromAllDc(topicName).stream()
+            .map(MessagePreview::getContent)
+            .collect(toList());
+
+    if (idx >= 0 && idx < result.size()) {
+      return Optional.of(result.get(idx));
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  public List<MessageTextPreview> previewText(TopicName topicName) {
+    return loadMessagePreviewsFromAllDc(topicName).stream()
+        .map(
+            p ->
+                new MessageTextPreview(
+                    new String(p.getContent(), StandardCharsets.UTF_8), p.isTruncated()))
+        .collect(toList());
+  }
+
+  public List<TopicNameWithMetrics> queryTopicsMetrics(Query<TopicNameWithMetrics> query) {
+    List<Topic> filteredNames = query.filterNames(getAllTopics()).collect(toList());
+    return query.filter(getTopicsMetrics(filteredNames)).collect(toList());
+  }
+
+  public TopicStats getStats() {
+    List<Topic> topics = getAllTopics();
+    long ackAllTopicCount = topics.stream().filter(t -> t.getAck() == Topic.Ack.ALL).count();
+    long trackingEnabledTopicCount = topics.stream().filter(Topic::isTrackingEnabled).count();
+    long avroTopicCount = topics.stream().filter(t -> t.getContentType() == AVRO).count();
+    return new TopicStats(
+        topics.size(), ackAllTopicCount, trackingEnabledTopicCount, avroTopicCount);
+  }
+
+  private void ensureTopicDoesNotExist(Topic topic) {
+    if (topicRepository.topicExists(topic.getName())) {
+      throw new TopicAlreadyExistsException(topic.getName());
+    }
+  }
+
+  private void validateSchema(
+      boolean shouldValidate, TopicWithSchema topicWithSchema, Topic topic) {
+    if (shouldValidate) {
+      schemaService.validateSchema(topic, topicWithSchema.getSchema());
+      boolean schemaAlreadyRegistered =
+          schemaService.getSchema(topic.getQualifiedName()).isPresent();
+      if (schemaAlreadyRegistered) {
+        throw new TopicSchemaExistsException(topic.getQualifiedName());
+      }
+    }
+  }
+
+  private void registerAvroSchema(
+      boolean shouldRegister, TopicWithSchema topicWithSchema, RequestUser createdBy) {
+    if (shouldRegister) {
+      try {
+        schemaService.registerSchema(topicWithSchema.getTopic(), topicWithSchema.getSchema());
+      } catch (Exception e) {
+        logger.error(
+            "Rolling back topic {} creation due to schema registration error",
+            topicWithSchema.getQualifiedName(),
+            e);
+        removeTopic(topicWithSchema.getTopic(), createdBy);
+        throw e;
+      }
+    }
+  }
+
+  private void createTopic(Topic topic, RequestUser createdBy, CreatorRights creatorRights) {
+    topicValidator.ensureCreatedTopicIsValid(topic, createdBy, creatorRights);
+
+    if (!multiDCAwareService.topicExists(topic)) {
+      createTopicInBrokers(topic, createdBy);
+      auditor.objectCreated(createdBy.getUsername(), topic);
+      topicOwnerCache.onCreatedTopic(topic);
+    } else {
+      logger.info(
+          "Skipping creation of topic {} on brokers, topic already exists",
+          topic.getQualifiedName());
+    }
+
+    multiDcExecutor.executeByUser(new CreateTopicRepositoryCommand(topic), createdBy);
+  }
+
+  private void createTopicInBrokers(Topic topic, RequestUser createdBy) {
+    try {
+      multiDCAwareService.manageTopic(
+          brokerTopicManagement -> brokerTopicManagement.createTopic(topic));
+    } catch (Exception exception) {
+      logger.error(
+          String.format(
+              "Could not create topic %s, rollback topic creation.", topic.getQualifiedName()),
+          exception);
+      multiDcExecutor.executeByUser(new RemoveTopicRepositoryCommand(topic.getName()), createdBy);
+    }
+  }
+
+  private void removeSchema(Topic topic) {
+    if (AVRO.equals(topic.getContentType()) && topicProperties.isRemoveSchema()) {
+      schemaService
+          .getSchema(topic.getQualifiedName())
+          .ifPresent(s -> schemaService.deleteAllSchemaVersions(topic.getQualifiedName()));
+    }
+  }
+
+  private void removeTopic(Topic topic, RequestUser removedBy) {
+    logger.info("Removing topic: {} from ZK clusters", topic.getQualifiedName());
+    long start = System.currentTimeMillis();
+    multiDcExecutor.executeByUser(new RemoveTopicRepositoryCommand(topic.getName()), removedBy);
+    logger.info(
+        "Removed topic: {} from ZK clusters in: {} ms",
+        topic.getQualifiedName(),
+        System.currentTimeMillis() - start);
+    logger.info("Removing topic: {} from Kafka clusters", topic.getQualifiedName());
+    start = System.currentTimeMillis();
+    multiDCAwareService.manageTopic(
+        brokerTopicManagement -> brokerTopicManagement.removeTopic(topic));
+    logger.info(
+        "Removed topic: {} from Kafka clusters in: {} ms",
+        topic.getQualifiedName(),
+        System.currentTimeMillis() - start);
+    auditor.objectRemoved(removedBy.getUsername(), topic);
+    topicOwnerCache.onRemovedTopic(topic);
+  }
+
+  private Optional<String> extractSchema(PatchData patch) {
+    return Optional.ofNullable(patch.getPatch().get("schema")).map(o -> (String) o);
+  }
+
+  private List<MessagePreview> loadMessagePreviewsFromAllDc(TopicName topicName) {
+    List<DatacenterBoundRepositoryHolder<MessagePreviewRepository>> repositories =
+        repositoryManager.getRepositories(MessagePreviewRepository.class);
+    List<MessagePreview> previews = new ArrayList<>();
+    for (DatacenterBoundRepositoryHolder<MessagePreviewRepository> holder : repositories) {
+      try {
+        previews.addAll(holder.getRepository().loadPreview(topicName));
+      } catch (Exception e) {
+        logger.warn("Could not load message preview for DC: {}", holder.getDatacenterName());
+      }
+    }
+    return previews;
+  }
+
+  private List<TopicNameWithMetrics> getTopicsMetrics(List<Topic> topics) {
+    return topics.stream()
+        .map(
+            t -> {
+              TopicMetrics metrics = metricRepository.loadMetrics(t.getName());
+              return TopicNameWithMetrics.from(metrics, t.getQualifiedName());
+            })
+        .collect(toList());
+  }
+
+  public List<Topic> listForOwnerId(OwnerId ownerId) {
+    Collection<TopicName> topicNames = topicOwnerCache.get(ownerId);
+    return topicRepository.getTopicsDetails(topicNames);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/UnableToMoveOffsetsException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/UnableToMoveOffsetsException.java
index f7112861a2..ad75546904 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/UnableToMoveOffsetsException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/UnableToMoveOffsetsException.java
@@ -6,12 +6,17 @@
 
 public class UnableToMoveOffsetsException extends ManagementException {
 
-    public UnableToMoveOffsetsException(Topic topic, String subscriptionName) {
-        super("Not all offsets related to hermes subscription" + topic.getQualifiedName() + "$" + subscriptionName + " were moved.");
-    }
+  public UnableToMoveOffsetsException(Topic topic, String subscriptionName) {
+    super(
+        "Not all offsets related to hermes subscription"
+            + topic.getQualifiedName()
+            + "$"
+            + subscriptionName
+            + " were moved.");
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.UNABLE_TO_MOVE_OFFSETS_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.UNABLE_TO_MOVE_OFFSETS_EXCEPTION;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/CreateTopicRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/CreateTopicRepositoryCommand.java
index 1666c50bf8..0ad8397046 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/CreateTopicRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/CreateTopicRepositoryCommand.java
@@ -7,36 +7,37 @@
 
 public class CreateTopicRepositoryCommand extends RepositoryCommand<TopicRepository> {
 
-    private final Topic topic;
-
-    public CreateTopicRepositoryCommand(Topic topic) {
-        this.topic = topic;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<TopicRepository> holder) {}
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
-        holder.getRepository().createTopic(topic);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
-        /*
-        We don't want to do a rollback due to possible race conditions with creating a topic on Kafka.
-        It increases the probability of discrepancies between Kafka and Zookeeper: topic exists in Kafka,
-        but not in the Zookeeper and vice versa.
-         */
-    }
-
-    @Override
-    public Class<TopicRepository> getRepositoryType() {
-        return TopicRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "CreateTopic(" + topic.getQualifiedName() + ")";
-    }
+  private final Topic topic;
+
+  public CreateTopicRepositoryCommand(Topic topic) {
+    this.topic = topic;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<TopicRepository> holder) {}
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
+    holder.getRepository().createTopic(topic);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<TopicRepository> holder, Exception exception) {
+    /*
+    We don't want to do a rollback due to possible race conditions with creating a topic on Kafka.
+    It increases the probability of discrepancies between Kafka and Zookeeper: topic exists in Kafka,
+    but not in the Zookeeper and vice versa.
+     */
+  }
+
+  @Override
+  public Class<TopicRepository> getRepositoryType() {
+    return TopicRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "CreateTopic(" + topic.getQualifiedName() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/RemoveTopicRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/RemoveTopicRepositoryCommand.java
index d378548603..cc182285ac 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/RemoveTopicRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/RemoveTopicRepositoryCommand.java
@@ -7,36 +7,37 @@
 
 public class RemoveTopicRepositoryCommand extends RepositoryCommand<TopicRepository> {
 
-    private final TopicName topicName;
-
-    public RemoveTopicRepositoryCommand(TopicName topicName) {
-        this.topicName = topicName;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<TopicRepository> holder) {}
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
-        holder.getRepository().removeTopic(topicName);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
-        /*
-        We don't want to do a rollback due to possible race conditions with creating a topic on Kafka.
-        It increases the probability of discrepancies between Kafka and Zookeeper: topic exists in Kafka,
-        but not in the Zookeeper and vice versa.
-         */
-    }
-
-    @Override
-    public Class<TopicRepository> getRepositoryType() {
-        return TopicRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "RemoveTopic(" + topicName + ")";
-    }
+  private final TopicName topicName;
+
+  public RemoveTopicRepositoryCommand(TopicName topicName) {
+    this.topicName = topicName;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<TopicRepository> holder) {}
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
+    holder.getRepository().removeTopic(topicName);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<TopicRepository> holder, Exception exception) {
+    /*
+    We don't want to do a rollback due to possible race conditions with creating a topic on Kafka.
+    It increases the probability of discrepancies between Kafka and Zookeeper: topic exists in Kafka,
+    but not in the Zookeeper and vice versa.
+     */
+  }
+
+  @Override
+  public Class<TopicRepository> getRepositoryType() {
+    return TopicRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "RemoveTopic(" + topicName + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/TouchTopicRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/TouchTopicRepositoryCommand.java
index b210658ca7..f40e7e1c0d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/TouchTopicRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/TouchTopicRepositoryCommand.java
@@ -7,30 +7,31 @@
 
 public class TouchTopicRepositoryCommand extends RepositoryCommand<TopicRepository> {
 
-    private final TopicName topicName;
+  private final TopicName topicName;
 
-    public TouchTopicRepositoryCommand(TopicName topicName) {
-        this.topicName = topicName;
-    }
+  public TouchTopicRepositoryCommand(TopicName topicName) {
+    this.topicName = topicName;
+  }
 
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<TopicRepository> holder) {}
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<TopicRepository> holder) {}
 
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
-        holder.getRepository().touchTopic(topicName);
-    }
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
+    holder.getRepository().touchTopic(topicName);
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<TopicRepository> holder) {}
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<TopicRepository> holder, Exception exception) {}
 
-    @Override
-    public Class<TopicRepository> getRepositoryType() {
-        return TopicRepository.class;
-    }
+  @Override
+  public Class<TopicRepository> getRepositoryType() {
+    return TopicRepository.class;
+  }
 
-    @Override
-    public String toString() {
-        return "TouchTopic(" + topicName + ")";
-    }
+  @Override
+  public String toString() {
+    return "TouchTopic(" + topicName + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/UpdateTopicRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/UpdateTopicRepositoryCommand.java
index 85fdea7c6d..5ec65be6e5 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/UpdateTopicRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/commands/UpdateTopicRepositoryCommand.java
@@ -7,36 +7,37 @@
 
 public class UpdateTopicRepositoryCommand extends RepositoryCommand<TopicRepository> {
 
-    private final Topic topic;
-
-    private Topic backup;
-
-    public UpdateTopicRepositoryCommand(Topic topic) {
-        this.topic = topic;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
-        backup = holder.getRepository().getTopicDetails(topic.getName());
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
-        holder.getRepository().updateTopic(topic);
-    }
-
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
-        holder.getRepository().updateTopic(backup);
-    }
-
-    @Override
-    public Class<TopicRepository> getRepositoryType() {
-        return TopicRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return "UpdateTopic(" + topic.getQualifiedName() + ")";
-    }
+  private final Topic topic;
+
+  private Topic backup;
+
+  public UpdateTopicRepositoryCommand(Topic topic) {
+    this.topic = topic;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
+    backup = holder.getRepository().getTopicDetails(topic.getName());
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<TopicRepository> holder) {
+    holder.getRepository().updateTopic(topic);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<TopicRepository> holder, Exception exception) {
+    holder.getRepository().updateTopic(backup);
+  }
+
+  @Override
+  public Class<TopicRepository> getRepositoryType() {
+    return TopicRepository.class;
+  }
+
+  @Override
+  public String toString() {
+    return "UpdateTopic(" + topic.getQualifiedName() + ")";
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/schema/SchemaRemovalDisabledException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/schema/SchemaRemovalDisabledException.java
index e6f1b8aaff..95b9b1c22d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/schema/SchemaRemovalDisabledException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/schema/SchemaRemovalDisabledException.java
@@ -5,12 +5,12 @@
 
 public class SchemaRemovalDisabledException extends HermesException {
 
-    public SchemaRemovalDisabledException() {
-        super("Removing schema is disabled.");
-    }
+  public SchemaRemovalDisabledException() {
+    super("Removing schema is disabled.");
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OPERATION_DISABLED;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OPERATION_DISABLED;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/schema/SchemaService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/schema/SchemaService.java
index 315cdd4cb1..4d17a8ef20 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/schema/SchemaService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/schema/SchemaService.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.management.domain.topic.schema;
 
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
+
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.RawSchema;
@@ -12,70 +18,74 @@
 import pl.allegro.tech.hermes.schema.SchemaId;
 import pl.allegro.tech.hermes.schema.SchemaVersion;
 
-import java.util.Optional;
-
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName;
-
 @Component
 public class SchemaService {
 
-    private final RawSchemaClient rawSchemaClient;
-    private final SchemaValidatorProvider validatorProvider;
-    private final TopicProperties topicProperties;
+  private final RawSchemaClient rawSchemaClient;
+  private final SchemaValidatorProvider validatorProvider;
+  private final TopicProperties topicProperties;
 
-    @Autowired
-    public SchemaService(RawSchemaClient rawSchemaClient,
-                         SchemaValidatorProvider validatorProvider,
-                         TopicProperties topicProperties) {
-        this.rawSchemaClient = rawSchemaClient;
-        this.validatorProvider = validatorProvider;
-        this.topicProperties = topicProperties;
-    }
+  private static final Logger logger = LoggerFactory.getLogger(SchemaService.class);
 
-    public Optional<RawSchema> getSchema(String qualifiedTopicName) {
-        return rawSchemaClient
-            .getLatestRawSchemaWithMetadata(fromQualifiedName(qualifiedTopicName))
-            .map(RawSchemaWithMetadata::getSchema);
-    }
+  @Autowired
+  public SchemaService(
+      RawSchemaClient rawSchemaClient,
+      SchemaValidatorProvider validatorProvider,
+      TopicProperties topicProperties) {
+    this.rawSchemaClient = rawSchemaClient;
+    this.validatorProvider = validatorProvider;
+    this.topicProperties = topicProperties;
+  }
 
-    public Optional<RawSchema> getSchema(String qualifiedTopicName, SchemaVersion version) {
-        return rawSchemaClient
-                .getRawSchemaWithMetadata(fromQualifiedName(qualifiedTopicName), version)
-                .map(RawSchemaWithMetadata::getSchema);
-    }
+  public Optional<RawSchema> getSchema(String qualifiedTopicName) {
+    return rawSchemaClient
+        .getLatestRawSchemaWithMetadata(fromQualifiedName(qualifiedTopicName))
+        .map(RawSchemaWithMetadata::getSchema);
+  }
 
-    public Optional<RawSchema> getSchema(String qualifiedTopicName, SchemaId id) {
-        return rawSchemaClient
-                .getRawSchemaWithMetadata(fromQualifiedName(qualifiedTopicName), id)
-                .map(RawSchemaWithMetadata::getSchema);
-    }
+  public Optional<RawSchema> getSchema(String qualifiedTopicName, SchemaVersion version) {
+    return rawSchemaClient
+        .getRawSchemaWithMetadata(fromQualifiedName(qualifiedTopicName), version)
+        .map(RawSchemaWithMetadata::getSchema);
+  }
 
-    public void registerSchema(Topic topic, String schema) {
-        boolean validate = AVRO.equals(topic.getContentType());
-        registerSchema(topic, schema, validate);
-    }
+  public Optional<RawSchema> getSchema(String qualifiedTopicName, SchemaId id) {
+    return rawSchemaClient
+        .getRawSchemaWithMetadata(fromQualifiedName(qualifiedTopicName), id)
+        .map(RawSchemaWithMetadata::getSchema);
+  }
+
+  public void registerSchema(Topic topic, String schema) {
+    boolean validate = AVRO.equals(topic.getContentType());
+    registerSchema(topic, schema, validate);
+  }
 
-    public void registerSchema(Topic topic, String schema, boolean validate) {
-        if (validate) {
-            SchemaValidator validator = validatorProvider.provide(topic.getContentType());
-            validator.check(schema);
-        }
-        rawSchemaClient.registerSchema(topic.getName(), RawSchema.valueOf(schema));
+  public void registerSchema(Topic topic, String schema, boolean validate) {
+    if (validate) {
+      SchemaValidator validator = validatorProvider.provide(topic.getContentType());
+      validator.check(schema);
     }
+    rawSchemaClient.registerSchema(topic.getName(), RawSchema.valueOf(schema));
+  }
 
-    public void deleteAllSchemaVersions(String qualifiedTopicName) {
-        if (!topicProperties.isRemoveSchema()) {
-            throw new SchemaRemovalDisabledException();
-        }
-        rawSchemaClient.deleteAllSchemaVersions(fromQualifiedName(qualifiedTopicName));
+  public void deleteAllSchemaVersions(String qualifiedTopicName) {
+    if (!topicProperties.isRemoveSchema()) {
+      throw new SchemaRemovalDisabledException();
     }
+    logger.info("Removing all schema versions for topic: {}", qualifiedTopicName);
+    long start = System.currentTimeMillis();
+    rawSchemaClient.deleteAllSchemaVersions(fromQualifiedName(qualifiedTopicName));
+    logger.info(
+        "Removed all schema versions for topic: {} in {} ms",
+        qualifiedTopicName,
+        System.currentTimeMillis() - start);
+  }
 
-    public void validateSchema(Topic topic, String schema) {
-        if (AVRO.equals(topic.getContentType())) {
-            SchemaValidator validator = validatorProvider.provide(AVRO);
-            validator.check(schema);
-        }
-        rawSchemaClient.validateSchema(topic.getName(), RawSchema.valueOf(schema));
+  public void validateSchema(Topic topic, String schema) {
+    if (AVRO.equals(topic.getContentType())) {
+      SchemaValidator validator = validatorProvider.provide(AVRO);
+      validator.check(schema);
     }
+    rawSchemaClient.validateSchema(topic.getName(), RawSchema.valueOf(schema));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/ContentTypeValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/ContentTypeValidator.java
index 5471281a0a..1f64b8a7f6 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/ContentTypeValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/ContentTypeValidator.java
@@ -1,26 +1,27 @@
 package pl.allegro.tech.hermes.management.domain.topic.validator;
 
+import java.util.EnumSet;
+import java.util.Set;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.management.config.TopicProperties;
 
-import java.util.EnumSet;
-import java.util.Set;
-
 @Component
 public class ContentTypeValidator {
 
-    private static final String ERROR_MESSAGE = "Content type %s is not within allowed content types %s";
+  private static final String ERROR_MESSAGE =
+      "Content type %s is not within allowed content types %s";
 
-    private final Set<ContentType> allowedContentTypes;
+  private final Set<ContentType> allowedContentTypes;
 
-    public ContentTypeValidator(TopicProperties topicProperties) {
-        this.allowedContentTypes = EnumSet.copyOf(topicProperties.getAllowedContentTypes());
-    }
+  public ContentTypeValidator(TopicProperties topicProperties) {
+    this.allowedContentTypes = EnumSet.copyOf(topicProperties.getAllowedContentTypes());
+  }
 
-    public void check(ContentType contentType) {
-        if (!allowedContentTypes.contains(contentType)) {
-            throw new TopicValidationException(String.format(ERROR_MESSAGE, contentType, allowedContentTypes));
-        }
+  public void check(ContentType contentType) {
+    if (!allowedContentTypes.contains(contentType)) {
+      throw new TopicValidationException(
+          String.format(ERROR_MESSAGE, contentType, allowedContentTypes));
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicLabelsValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicLabelsValidator.java
index 57a13604f4..664ba9cdd6 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicLabelsValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicLabelsValidator.java
@@ -1,25 +1,25 @@
 package pl.allegro.tech.hermes.management.domain.topic.validator;
 
+import java.util.Set;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.TopicLabel;
 import pl.allegro.tech.hermes.management.config.TopicProperties;
 
-import java.util.Set;
-
 @Component
 public class TopicLabelsValidator {
 
-    private static final String ERROR_MESSAGE = "One of topic labels %s is not within allowed topic labels %s";
+  private static final String ERROR_MESSAGE =
+      "One of topic labels %s is not within allowed topic labels %s";
 
-    private final Set<TopicLabel> allowedTopicLabels;
+  private final Set<TopicLabel> allowedTopicLabels;
 
-    public TopicLabelsValidator(TopicProperties topicProperties) {
-        this.allowedTopicLabels = topicProperties.getAllowedTopicLabels();
-    }
+  public TopicLabelsValidator(TopicProperties topicProperties) {
+    this.allowedTopicLabels = topicProperties.getAllowedTopicLabels();
+  }
 
-    public void check(Set<TopicLabel> labels) {
-        if (!allowedTopicLabels.containsAll(labels)) {
-            throw new TopicValidationException(String.format(ERROR_MESSAGE, labels, allowedTopicLabels));
-        }
+  public void check(Set<TopicLabel> labels) {
+    if (!allowedTopicLabels.containsAll(labels)) {
+      throw new TopicValidationException(String.format(ERROR_MESSAGE, labels, allowedTopicLabels));
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidationException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidationException.java
index 4ab80fad3d..41a6b20ae1 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidationException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidationException.java
@@ -5,16 +5,16 @@
 
 public class TopicValidationException extends ManagementException {
 
-    public TopicValidationException(String message) {
-        super(message);
-    }
+  public TopicValidationException(String message) {
+    super(message);
+  }
 
-    public TopicValidationException(String message, Exception cause) {
-        super(message, cause);
-    }
+  public TopicValidationException(String message, Exception cause) {
+    super(message, cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.VALIDATION_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.VALIDATION_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidator.java
index 38d86d54bc..1c320c4b0f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidator.java
@@ -1,10 +1,17 @@
 package pl.allegro.tech.hermes.management.domain.topic.validator;
 
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.ContentType;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy.ChaosMode;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy.ChaosPolicy;
+import pl.allegro.tech.hermes.api.RetentionTime;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.management.api.validator.ApiPreconditions;
+import pl.allegro.tech.hermes.management.config.TopicProperties;
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
 import pl.allegro.tech.hermes.management.domain.owner.validator.OwnerIdValidator;
 import pl.allegro.tech.hermes.management.domain.topic.CreatorRights;
@@ -15,84 +22,202 @@
 @Component
 public class TopicValidator {
 
-    private final OwnerIdValidator ownerIdValidator;
-    private final ContentTypeValidator contentTypeValidator;
-    private final TopicLabelsValidator topicLabelsValidator;
-    private final SchemaRepository schemaRepository;
-    private final ApiPreconditions apiPreconditions;
+  private final OwnerIdValidator ownerIdValidator;
+  private final ContentTypeValidator contentTypeValidator;
+  private final TopicLabelsValidator topicLabelsValidator;
+  private final SchemaRepository schemaRepository;
+  private final ApiPreconditions apiPreconditions;
+  private final TopicProperties topicProperties;
+
+  @Autowired
+  public TopicValidator(
+      OwnerIdValidator ownerIdValidator,
+      ContentTypeValidator contentTypeValidator,
+      TopicLabelsValidator topicLabelsValidator,
+      SchemaRepository schemaRepository,
+      ApiPreconditions apiPreconditions,
+      TopicProperties topicProperties) {
+    this.ownerIdValidator = ownerIdValidator;
+    this.contentTypeValidator = contentTypeValidator;
+    this.topicLabelsValidator = topicLabelsValidator;
+    this.schemaRepository = schemaRepository;
+    this.apiPreconditions = apiPreconditions;
+    this.topicProperties = topicProperties;
+  }
+
+  public void ensureCreatedTopicIsValid(
+      Topic created, RequestUser createdBy, CreatorRights creatorRights) {
+    apiPreconditions.checkConstraints(created, createdBy.isAdmin());
+    checkOwner(created);
+    checkContentType(created);
+    checkTopicLabels(created);
+
+    if ((created.isFallbackToRemoteDatacenterEnabled()
+            != topicProperties.isDefaultFallbackToRemoteDatacenterEnabled())
+        && !createdBy.isAdmin()) {
+      throw new TopicValidationException(
+          "User is not allowed to set non-default fallback to remote datacenter for this topic");
+    }
+
+    if (created.getChaos().mode() != ChaosMode.DISABLED && !createdBy.isAdmin()) {
+      throw new TopicValidationException("User is not allowed to set chaos policy for this topic");
+    }
+    validateChaosPolicy(created.getChaos());
+
+    if (created.wasMigratedFromJsonType()) {
+      throw new TopicValidationException(
+          "Newly created topic cannot have migratedFromJsonType flag set to true");
+    }
 
-    @Autowired
-    public TopicValidator(OwnerIdValidator ownerIdValidator,
-                          ContentTypeValidator contentTypeValidator,
-                          TopicLabelsValidator topicLabelsValidator,
-                          SchemaRepository schemaRepository,
-                          ApiPreconditions apiPreconditions) {
-        this.ownerIdValidator = ownerIdValidator;
-        this.contentTypeValidator = contentTypeValidator;
-        this.topicLabelsValidator = topicLabelsValidator;
-        this.schemaRepository = schemaRepository;
-        this.apiPreconditions = apiPreconditions;
+    if (!creatorRights.allowedToManage(created)) {
+      throw new TopicValidationException(
+          "Provide an owner that includes you, you would not be able to manage this topic later");
     }
 
-    public void ensureCreatedTopicIsValid(Topic created, RequestUser createdBy, CreatorRights creatorRights) {
-        apiPreconditions.checkConstraints(created, createdBy.isAdmin());
-        checkOwner(created);
-        checkContentType(created);
-        checkTopicLabels(created);
+    ensureCreatedTopicRetentionTimeValid(created, createdBy);
+  }
 
-        if (created.wasMigratedFromJsonType()) {
-            throw new TopicValidationException("Newly created topic cannot have migratedFromJsonType flag set to true");
-        }
+  public void ensureUpdatedTopicIsValid(Topic updated, Topic previous, RequestUser modifiedBy) {
+    apiPreconditions.checkConstraints(updated, modifiedBy.isAdmin());
+    checkOwner(updated);
+    checkTopicLabels(updated);
 
-        if (!creatorRights.allowedToManage(created)) {
-            throw new TopicValidationException("Provide an owner that includes you, you would not be able to manage this topic later");
-        }
+    if ((previous.isFallbackToRemoteDatacenterEnabled()
+            != updated.isFallbackToRemoteDatacenterEnabled())
+        && !modifiedBy.isAdmin()) {
+      throw new TopicValidationException(
+          "User is not allowed to update fallback to remote datacenter for this topic");
     }
 
-    public void ensureUpdatedTopicIsValid(Topic updated, Topic previous, RequestUser modifiedBy) {
-        apiPreconditions.checkConstraints(updated, modifiedBy.isAdmin());
-        checkOwner(updated);
-        checkTopicLabels(updated);
+    if (!previous.getChaos().equals(updated.getChaos()) && !modifiedBy.isAdmin()) {
+      throw new TopicValidationException(
+          "User is not allowed to update chaos policy for this topic");
+    }
+    validateChaosPolicy(updated.getChaos());
+
+    if (migrationFromJsonTypeFlagChangedToTrue(updated, previous)) {
+      if (updated.getContentType() != ContentType.AVRO) {
+        throw new TopicValidationException(
+            "Change content type to AVRO together with setting migratedFromJsonType flag");
+      }
+
+      try {
+        schemaRepository.getLatestAvroSchema(updated);
+      } catch (CouldNotLoadSchemaException | SchemaNotFoundException e) {
+        throw new TopicValidationException("Avro schema not available, migration not permitted", e);
+      }
+    } else if (contentTypeChanged(updated, previous)) {
+      throw new TopicValidationException(
+          "Cannot change content type, except for migration to Avro with setting migratedFromJsonType flag.");
+    } else if (migrationFromJsonTypeFlagChangedToFalse(updated, previous)) {
+      throw new TopicValidationException("Cannot migrate back to JSON!");
+    }
 
-        if (migrationFromJsonTypeFlagChangedToTrue(updated, previous)) {
-            if (updated.getContentType() != ContentType.AVRO) {
-                throw new TopicValidationException("Change content type to AVRO together with setting migratedFromJsonType flag");
-            }
+    ensureUpdatedTopicRetentionTimeValid(updated, previous, modifiedBy);
+  }
 
-            try {
-                schemaRepository.getLatestAvroSchema(updated);
-            } catch (CouldNotLoadSchemaException | SchemaNotFoundException e) {
-                throw new TopicValidationException("Avro schema not available, migration not permitted", e);
-            }
-        } else if (contentTypeChanged(updated, previous)) {
-            throw new TopicValidationException(
-                    "Cannot change content type, except for migration to Avro with setting migratedFromJsonType flag.");
-        } else if (migrationFromJsonTypeFlagChangedToFalse(updated, previous)) {
-            throw new TopicValidationException("Cannot migrate back to JSON!");
-        }
+  private void ensureCreatedTopicRetentionTimeValid(Topic created, RequestUser modifiedBy) {
+    if (modifiedBy.isAdmin()) {
+      return;
     }
 
-    private boolean contentTypeChanged(Topic updated, Topic previous) {
-        return previous.getContentType() != updated.getContentType();
+    checkTopicRetentionTimeUnit(created.getRetentionTime().getRetentionUnit());
+
+    long seconds =
+        created
+            .getRetentionTime()
+            .getRetentionUnit()
+            .toSeconds(created.getRetentionTime().getDuration());
+
+    checkTopicRetentionLimit(seconds);
+  }
+
+  private void ensureUpdatedTopicRetentionTimeValid(
+      Topic updated, Topic previous, RequestUser modifiedBy) {
+    if (modifiedBy.isAdmin()) {
+      return;
     }
 
-    private boolean migrationFromJsonTypeFlagChangedToTrue(Topic updated, Topic previous) {
-        return !previous.wasMigratedFromJsonType() && updated.wasMigratedFromJsonType();
+    checkTopicRetentionTimeUnit(updated.getRetentionTime().getRetentionUnit());
+
+    long updatedSeconds =
+        updated
+            .getRetentionTime()
+            .getRetentionUnit()
+            .toSeconds(updated.getRetentionTime().getDuration());
+    long previousSeconds =
+        previous
+            .getRetentionTime()
+            .getRetentionUnit()
+            .toSeconds(previous.getRetentionTime().getDuration());
+
+    if (updatedSeconds == previousSeconds) {
+      return;
     }
 
-    private boolean migrationFromJsonTypeFlagChangedToFalse(Topic updated, Topic previous) {
-        return previous.wasMigratedFromJsonType() && !updated.wasMigratedFromJsonType();
+    checkTopicRetentionLimit(updatedSeconds);
+  }
+
+  private void checkTopicRetentionTimeUnit(TimeUnit toCheck) {
+    if (!RetentionTime.allowedUnits.contains(toCheck)) {
+      throw new TopicValidationException(
+          "Retention time unit must be one of: "
+              + Arrays.toString(RetentionTime.allowedUnits.toArray()));
     }
+  }
 
-    private void checkOwner(Topic checked) {
-        ownerIdValidator.check(checked.getOwner());
+  private void checkTopicRetentionLimit(long retentionSeconds) {
+    if (retentionSeconds
+        > RetentionTime.MAX.getRetentionUnit().toSeconds(RetentionTime.MAX.getDuration())) {
+      throw new TopicValidationException(
+          "Retention time larger than 7 days can't be configured by non admin users");
     }
+  }
+
+  private boolean contentTypeChanged(Topic updated, Topic previous) {
+    return previous.getContentType() != updated.getContentType();
+  }
+
+  private boolean migrationFromJsonTypeFlagChangedToTrue(Topic updated, Topic previous) {
+    return !previous.wasMigratedFromJsonType() && updated.wasMigratedFromJsonType();
+  }
+
+  private boolean migrationFromJsonTypeFlagChangedToFalse(Topic updated, Topic previous) {
+    return previous.wasMigratedFromJsonType() && !updated.wasMigratedFromJsonType();
+  }
+
+  private void checkOwner(Topic checked) {
+    ownerIdValidator.check(checked.getOwner());
+  }
 
-    private void checkContentType(Topic checked) {
-        contentTypeValidator.check(checked.getContentType());
+  private void checkContentType(Topic checked) {
+    contentTypeValidator.check(checked.getContentType());
+  }
+
+  private void checkTopicLabels(Topic checked) {
+    topicLabelsValidator.check(checked.getLabels());
+  }
+
+  private void validateChaosPolicy(PublishingChaosPolicy chaosPolicy) {
+    for (ChaosPolicy policy : chaosPolicy.datacenterPolicies().values()) {
+      validate(policy);
     }
+    validate(chaosPolicy.globalPolicy());
+  }
 
-    private void checkTopicLabels(Topic checked) {
-        topicLabelsValidator.check(checked.getLabels());
+  private void validate(ChaosPolicy chaosPolicy) {
+    if (chaosPolicy == null) {
+      return;
+    }
+    if (chaosPolicy.delayFrom() < 0
+        || chaosPolicy.delayTo() < 0
+        || chaosPolicy.delayFrom() > chaosPolicy.delayTo()) {
+      throw new TopicValidationException(
+          "Invalid chaos policy: 'delayFrom' and 'delayTo' must be >= 0, and 'delayFrom' <= 'delayTo'.");
+    }
+    if (chaosPolicy.probability() < 0 || chaosPolicy.probability() > 100) {
+      throw new TopicValidationException(
+          "Invalid chaos policy: 'probability' must be within the range 0 to 100");
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/WorkloadConstraintsService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/WorkloadConstraintsService.java
index aeafeb0aac..0356af3b3b 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/WorkloadConstraintsService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/WorkloadConstraintsService.java
@@ -18,48 +18,61 @@
 @Service
 public class WorkloadConstraintsService {
 
-    private final WorkloadConstraintsRepository workloadConstraintsRepository;
-    private final MultiDatacenterRepositoryCommandExecutor commandExecutor;
+  private final WorkloadConstraintsRepository workloadConstraintsRepository;
+  private final MultiDatacenterRepositoryCommandExecutor commandExecutor;
 
-    public WorkloadConstraintsService(WorkloadConstraintsRepository workloadConstraintsRepository,
-                                      MultiDatacenterRepositoryCommandExecutor commandExecutor) {
-        this.workloadConstraintsRepository = workloadConstraintsRepository;
-        this.commandExecutor = commandExecutor;
-    }
+  public WorkloadConstraintsService(
+      WorkloadConstraintsRepository workloadConstraintsRepository,
+      MultiDatacenterRepositoryCommandExecutor commandExecutor) {
+    this.workloadConstraintsRepository = workloadConstraintsRepository;
+    this.commandExecutor = commandExecutor;
+  }
 
-    public ConsumersWorkloadConstraints getConsumersWorkloadConstraints() {
-        return workloadConstraintsRepository.getConsumersWorkloadConstraints();
-    }
+  public ConsumersWorkloadConstraints getConsumersWorkloadConstraints() {
+    return workloadConstraintsRepository.getConsumersWorkloadConstraints();
+  }
 
-    public void createConstraints(TopicName topicName, Constraints constraints, RequestUser requester) {
-        commandExecutor.executeByUser(new CreateTopicConstraintsRepositoryCommand(topicName, constraints), requester);
-    }
+  public void createConstraints(
+      TopicName topicName, Constraints constraints, RequestUser requester) {
+    commandExecutor.executeByUser(
+        new CreateTopicConstraintsRepositoryCommand(topicName, constraints), requester);
+  }
 
-    public void createConstraints(SubscriptionName subscriptionName, Constraints constraints, RequestUser requester) {
-        commandExecutor.executeByUser(new CreateSubscriptionConstraintsRepositoryCommand(subscriptionName, constraints), requester);
-    }
+  public void createConstraints(
+      SubscriptionName subscriptionName, Constraints constraints, RequestUser requester) {
+    commandExecutor.executeByUser(
+        new CreateSubscriptionConstraintsRepositoryCommand(subscriptionName, constraints),
+        requester);
+  }
 
-    public void updateConstraints(TopicName topicName, Constraints constraints, RequestUser requester) {
-        commandExecutor.executeByUser(new UpdateTopicConstraintsRepositoryCommand(topicName, constraints), requester);
-    }
+  public void updateConstraints(
+      TopicName topicName, Constraints constraints, RequestUser requester) {
+    commandExecutor.executeByUser(
+        new UpdateTopicConstraintsRepositoryCommand(topicName, constraints), requester);
+  }
 
-    public void updateConstraints(SubscriptionName subscriptionName, Constraints constraints, RequestUser requester) {
-        commandExecutor.executeByUser(new UpdateSubscriptionConstraintsRepositoryCommand(subscriptionName, constraints), requester);
-    }
+  public void updateConstraints(
+      SubscriptionName subscriptionName, Constraints constraints, RequestUser requester) {
+    commandExecutor.executeByUser(
+        new UpdateSubscriptionConstraintsRepositoryCommand(subscriptionName, constraints),
+        requester);
+  }
 
-    public void deleteConstraints(TopicName topicName, RequestUser requester) {
-        commandExecutor.executeByUser(new DeleteTopicConstraintsRepositoryCommand(topicName), requester);
-    }
+  public void deleteConstraints(TopicName topicName, RequestUser requester) {
+    commandExecutor.executeByUser(
+        new DeleteTopicConstraintsRepositoryCommand(topicName), requester);
+  }
 
-    public void deleteConstraints(SubscriptionName subscriptionName, RequestUser requester) {
-        commandExecutor.executeByUser(new DeleteSubscriptionConstraintsRepositoryCommand(subscriptionName), requester);
-    }
+  public void deleteConstraints(SubscriptionName subscriptionName, RequestUser requester) {
+    commandExecutor.executeByUser(
+        new DeleteSubscriptionConstraintsRepositoryCommand(subscriptionName), requester);
+  }
 
-    public boolean constraintsExist(TopicName topicName) {
-        return workloadConstraintsRepository.constraintsExist(topicName);
-    }
+  public boolean constraintsExist(TopicName topicName) {
+    return workloadConstraintsRepository.constraintsExist(topicName);
+  }
 
-    public boolean constraintsExist(SubscriptionName subscriptionName) {
-        return workloadConstraintsRepository.constraintsExist(subscriptionName);
-    }
+  public boolean constraintsExist(SubscriptionName subscriptionName) {
+    return workloadConstraintsRepository.constraintsExist(subscriptionName);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/CreateSubscriptionConstraintsRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/CreateSubscriptionConstraintsRepositoryCommand.java
index 9f064531a2..979daf340f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/CreateSubscriptionConstraintsRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/CreateSubscriptionConstraintsRepositoryCommand.java
@@ -6,41 +6,44 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class CreateSubscriptionConstraintsRepositoryCommand extends RepositoryCommand<WorkloadConstraintsRepository> {
-
-    private final SubscriptionName subscriptionName;
-    private final Constraints constraints;
-    private boolean exists;
-
-    public CreateSubscriptionConstraintsRepositoryCommand(SubscriptionName subscriptionName, Constraints constraints) {
-        this.subscriptionName = subscriptionName;
-        this.constraints = constraints;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        exists = holder.getRepository().constraintsExist(subscriptionName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        holder.getRepository().createConstraints(subscriptionName, constraints);
+public class CreateSubscriptionConstraintsRepositoryCommand
+    extends RepositoryCommand<WorkloadConstraintsRepository> {
+
+  private final SubscriptionName subscriptionName;
+  private final Constraints constraints;
+  private boolean exists;
+
+  public CreateSubscriptionConstraintsRepositoryCommand(
+      SubscriptionName subscriptionName, Constraints constraints) {
+    this.subscriptionName = subscriptionName;
+    this.constraints = constraints;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    exists = holder.getRepository().constraintsExist(subscriptionName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    holder.getRepository().createConstraints(subscriptionName, constraints);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder, Exception exception) {
+    if (!exists) {
+      holder.getRepository().deleteConstraints(subscriptionName);
     }
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        if (!exists) {
-            holder.getRepository().deleteConstraints(subscriptionName);
-        }
-    }
+  @Override
+  public Class<WorkloadConstraintsRepository> getRepositoryType() {
+    return WorkloadConstraintsRepository.class;
+  }
 
-    @Override
-    public Class<WorkloadConstraintsRepository> getRepositoryType() {
-        return WorkloadConstraintsRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("CreateSubscriptionConstraints(%s)", subscriptionName.getQualifiedName());
-    }
+  @Override
+  public String toString() {
+    return String.format("CreateSubscriptionConstraints(%s)", subscriptionName.getQualifiedName());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/CreateTopicConstraintsRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/CreateTopicConstraintsRepositoryCommand.java
index 33e924e63e..0f83d13fce 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/CreateTopicConstraintsRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/CreateTopicConstraintsRepositoryCommand.java
@@ -6,41 +6,43 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class CreateTopicConstraintsRepositoryCommand extends RepositoryCommand<WorkloadConstraintsRepository> {
-
-    private final TopicName topicName;
-    private final Constraints constraints;
-    private boolean exist;
-
-    public CreateTopicConstraintsRepositoryCommand(TopicName topicName, Constraints constraints) {
-        this.topicName = topicName;
-        this.constraints = constraints;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        exist = holder.getRepository().constraintsExist(topicName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        holder.getRepository().createConstraints(topicName, constraints);
+public class CreateTopicConstraintsRepositoryCommand
+    extends RepositoryCommand<WorkloadConstraintsRepository> {
+
+  private final TopicName topicName;
+  private final Constraints constraints;
+  private boolean exist;
+
+  public CreateTopicConstraintsRepositoryCommand(TopicName topicName, Constraints constraints) {
+    this.topicName = topicName;
+    this.constraints = constraints;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    exist = holder.getRepository().constraintsExist(topicName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    holder.getRepository().createConstraints(topicName, constraints);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder, Exception exception) {
+    if (!exist) {
+      holder.getRepository().deleteConstraints(topicName);
     }
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        if (!exist) {
-            holder.getRepository().deleteConstraints(topicName);
-        }
-    }
+  @Override
+  public Class<WorkloadConstraintsRepository> getRepositoryType() {
+    return WorkloadConstraintsRepository.class;
+  }
 
-    @Override
-    public Class<WorkloadConstraintsRepository> getRepositoryType() {
-        return WorkloadConstraintsRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("CreateTopicConstraints(%s)", topicName.qualifiedName());
-    }
+  @Override
+  public String toString() {
+    return String.format("CreateTopicConstraints(%s)", topicName.qualifiedName());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/DeleteSubscriptionConstraintsRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/DeleteSubscriptionConstraintsRepositoryCommand.java
index 7f04122339..e087ada847 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/DeleteSubscriptionConstraintsRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/DeleteSubscriptionConstraintsRepositoryCommand.java
@@ -6,39 +6,46 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class DeleteSubscriptionConstraintsRepositoryCommand extends RepositoryCommand<WorkloadConstraintsRepository> {
-
-    private final SubscriptionName subscriptionName;
-    private Constraints backup;
-
-    public DeleteSubscriptionConstraintsRepositoryCommand(SubscriptionName subscriptionName) {
-        this.subscriptionName = subscriptionName;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        backup = holder.getRepository().getConsumersWorkloadConstraints().getSubscriptionConstraints().get(subscriptionName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        holder.getRepository().deleteConstraints(subscriptionName);
+public class DeleteSubscriptionConstraintsRepositoryCommand
+    extends RepositoryCommand<WorkloadConstraintsRepository> {
+
+  private final SubscriptionName subscriptionName;
+  private Constraints backup;
+
+  public DeleteSubscriptionConstraintsRepositoryCommand(SubscriptionName subscriptionName) {
+    this.subscriptionName = subscriptionName;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    backup =
+        holder
+            .getRepository()
+            .getConsumersWorkloadConstraints()
+            .getSubscriptionConstraints()
+            .get(subscriptionName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    holder.getRepository().deleteConstraints(subscriptionName);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder, Exception exception) {
+    if (backup != null) {
+      holder.getRepository().createConstraints(subscriptionName, backup);
     }
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        if (backup != null) {
-            holder.getRepository().createConstraints(subscriptionName, backup);
-        }
-    }
+  @Override
+  public Class<WorkloadConstraintsRepository> getRepositoryType() {
+    return WorkloadConstraintsRepository.class;
+  }
 
-    @Override
-    public Class<WorkloadConstraintsRepository> getRepositoryType() {
-        return WorkloadConstraintsRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("DeleteSubscriptionConstraints(%s)", subscriptionName.getQualifiedName());
-    }
+  @Override
+  public String toString() {
+    return String.format("DeleteSubscriptionConstraints(%s)", subscriptionName.getQualifiedName());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/DeleteTopicConstraintsRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/DeleteTopicConstraintsRepositoryCommand.java
index 4f19ea376e..609b8c4974 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/DeleteTopicConstraintsRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/DeleteTopicConstraintsRepositoryCommand.java
@@ -6,39 +6,46 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class DeleteTopicConstraintsRepositoryCommand extends RepositoryCommand<WorkloadConstraintsRepository> {
-
-    private final TopicName topicName;
-    private Constraints backup;
-
-    public DeleteTopicConstraintsRepositoryCommand(TopicName topicName) {
-        this.topicName = topicName;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        backup = holder.getRepository().getConsumersWorkloadConstraints().getTopicConstraints().get(topicName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        holder.getRepository().deleteConstraints(topicName);
+public class DeleteTopicConstraintsRepositoryCommand
+    extends RepositoryCommand<WorkloadConstraintsRepository> {
+
+  private final TopicName topicName;
+  private Constraints backup;
+
+  public DeleteTopicConstraintsRepositoryCommand(TopicName topicName) {
+    this.topicName = topicName;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    backup =
+        holder
+            .getRepository()
+            .getConsumersWorkloadConstraints()
+            .getTopicConstraints()
+            .get(topicName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    holder.getRepository().deleteConstraints(topicName);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder, Exception exception) {
+    if (backup != null) {
+      holder.getRepository().createConstraints(topicName, backup);
     }
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        if (backup != null) {
-            holder.getRepository().createConstraints(topicName, backup);
-        }
-    }
+  @Override
+  public Class<WorkloadConstraintsRepository> getRepositoryType() {
+    return WorkloadConstraintsRepository.class;
+  }
 
-    @Override
-    public Class<WorkloadConstraintsRepository> getRepositoryType() {
-        return WorkloadConstraintsRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("DeleteTopicConstraints(%s)", topicName.qualifiedName());
-    }
+  @Override
+  public String toString() {
+    return String.format("DeleteTopicConstraints(%s)", topicName.qualifiedName());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/UpdateSubscriptionConstraintsRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/UpdateSubscriptionConstraintsRepositoryCommand.java
index bb237f9e2f..fc7900f050 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/UpdateSubscriptionConstraintsRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/UpdateSubscriptionConstraintsRepositoryCommand.java
@@ -6,41 +6,49 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class UpdateSubscriptionConstraintsRepositoryCommand extends RepositoryCommand<WorkloadConstraintsRepository> {
-
-    private final SubscriptionName subscriptionName;
-    private final Constraints constraints;
-    private Constraints backup;
-
-    public UpdateSubscriptionConstraintsRepositoryCommand(SubscriptionName subscriptionName, Constraints constraints) {
-        this.subscriptionName = subscriptionName;
-        this.constraints = constraints;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        backup = holder.getRepository().getConsumersWorkloadConstraints().getSubscriptionConstraints().get(subscriptionName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        holder.getRepository().updateConstraints(subscriptionName, constraints);
+public class UpdateSubscriptionConstraintsRepositoryCommand
+    extends RepositoryCommand<WorkloadConstraintsRepository> {
+
+  private final SubscriptionName subscriptionName;
+  private final Constraints constraints;
+  private Constraints backup;
+
+  public UpdateSubscriptionConstraintsRepositoryCommand(
+      SubscriptionName subscriptionName, Constraints constraints) {
+    this.subscriptionName = subscriptionName;
+    this.constraints = constraints;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    backup =
+        holder
+            .getRepository()
+            .getConsumersWorkloadConstraints()
+            .getSubscriptionConstraints()
+            .get(subscriptionName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    holder.getRepository().updateConstraints(subscriptionName, constraints);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder, Exception exception) {
+    if (backup != null) {
+      holder.getRepository().updateConstraints(subscriptionName, backup);
     }
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        if (backup != null) {
-            holder.getRepository().updateConstraints(subscriptionName, backup);
-        }
-    }
+  @Override
+  public Class<WorkloadConstraintsRepository> getRepositoryType() {
+    return WorkloadConstraintsRepository.class;
+  }
 
-    @Override
-    public Class<WorkloadConstraintsRepository> getRepositoryType() {
-        return WorkloadConstraintsRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("UpdateSubscriptionConstraints(%s)", subscriptionName.getQualifiedName());
-    }
+  @Override
+  public String toString() {
+    return String.format("UpdateSubscriptionConstraints(%s)", subscriptionName.getQualifiedName());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/UpdateTopicConstraintsRepositoryCommand.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/UpdateTopicConstraintsRepositoryCommand.java
index 6bf4f8ac8c..9a09e8fd7a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/UpdateTopicConstraintsRepositoryCommand.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/workload/constraints/command/UpdateTopicConstraintsRepositoryCommand.java
@@ -6,41 +6,48 @@
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryCommand;
 
-public class UpdateTopicConstraintsRepositoryCommand extends RepositoryCommand<WorkloadConstraintsRepository> {
-
-    private final TopicName topicName;
-    private final Constraints constraints;
-    private Constraints backup;
-
-    public UpdateTopicConstraintsRepositoryCommand(TopicName topicName, Constraints constraints) {
-        this.topicName = topicName;
-        this.constraints = constraints;
-    }
-
-    @Override
-    public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        backup = holder.getRepository().getConsumersWorkloadConstraints().getTopicConstraints().get(topicName);
-    }
-
-    @Override
-    public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        holder.getRepository().updateConstraints(topicName, constraints);
+public class UpdateTopicConstraintsRepositoryCommand
+    extends RepositoryCommand<WorkloadConstraintsRepository> {
+
+  private final TopicName topicName;
+  private final Constraints constraints;
+  private Constraints backup;
+
+  public UpdateTopicConstraintsRepositoryCommand(TopicName topicName, Constraints constraints) {
+    this.topicName = topicName;
+    this.constraints = constraints;
+  }
+
+  @Override
+  public void backup(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    backup =
+        holder
+            .getRepository()
+            .getConsumersWorkloadConstraints()
+            .getTopicConstraints()
+            .get(topicName);
+  }
+
+  @Override
+  public void execute(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
+    holder.getRepository().updateConstraints(topicName, constraints);
+  }
+
+  @Override
+  public void rollback(
+      DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder, Exception exception) {
+    if (backup != null) {
+      holder.getRepository().updateConstraints(topicName, backup);
     }
+  }
 
-    @Override
-    public void rollback(DatacenterBoundRepositoryHolder<WorkloadConstraintsRepository> holder) {
-        if (backup != null) {
-            holder.getRepository().updateConstraints(topicName, backup);
-        }
-    }
+  @Override
+  public Class<WorkloadConstraintsRepository> getRepositoryType() {
+    return WorkloadConstraintsRepository.class;
+  }
 
-    @Override
-    public Class<WorkloadConstraintsRepository> getRepositoryType() {
-        return WorkloadConstraintsRepository.class;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("UpdateTopicConstraints(%s)", topicName.qualifiedName());
-    }
+  @Override
+  public String toString() {
+    return String.format("UpdateTopicConstraints(%s)", topicName.qualifiedName());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/AuditEvent.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/AuditEvent.java
index 9461f38131..070329c07b 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/AuditEvent.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/AuditEvent.java
@@ -1,37 +1,42 @@
 package pl.allegro.tech.hermes.management.infrastructure.audit;
 
 public class AuditEvent {
-    private final AuditEventType eventType;
-    private final String resourceName;
-    private final String payloadClass;
-    private final String payload;
-    private final String username;
+  private final AuditEventType eventType;
+  private final String resourceName;
+  private final String payloadClass;
+  private final String payload;
+  private final String username;
 
-    public AuditEvent(AuditEventType eventType, String payload, String payloadClass, String resourceName, String username) {
-        this.eventType = eventType;
-        this.payload = payload;
-        this.payloadClass = payloadClass;
-        this.resourceName = resourceName;
-        this.username = username;
-    }
+  public AuditEvent(
+      AuditEventType eventType,
+      String payload,
+      String payloadClass,
+      String resourceName,
+      String username) {
+    this.eventType = eventType;
+    this.payload = payload;
+    this.payloadClass = payloadClass;
+    this.resourceName = resourceName;
+    this.username = username;
+  }
 
-    public AuditEventType getEventType() {
-        return eventType;
-    }
+  public AuditEventType getEventType() {
+    return eventType;
+  }
 
-    public String getPayloadClass() {
-        return payloadClass;
-    }
+  public String getPayloadClass() {
+    return payloadClass;
+  }
 
-    public String getPayload() {
-        return payload;
-    }
+  public String getPayload() {
+    return payload;
+  }
 
-    public String getUsername() {
-        return username;
-    }
+  public String getUsername() {
+    return username;
+  }
 
-    public String getResourceName() {
-        return resourceName;
-    }
+  public String getResourceName() {
+    return resourceName;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/AuditEventType.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/AuditEventType.java
index dc5796e9b6..689d4da0d9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/AuditEventType.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/AuditEventType.java
@@ -1,7 +1,10 @@
 package pl.allegro.tech.hermes.management.infrastructure.audit;
 
 public enum AuditEventType {
-    BEFORE_CREATION, CREATED,
-    BEFORE_UPDATE, UPDATED,
-    BEFORE_REMOVAL, REMOVED
+  BEFORE_CREATION,
+  CREATED,
+  BEFORE_UPDATE,
+  UPDATED,
+  BEFORE_REMOVAL,
+  REMOVED
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/CompositeAuditor.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/CompositeAuditor.java
index 4750b68dc6..4309ba5a43 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/CompositeAuditor.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/CompositeAuditor.java
@@ -1,47 +1,50 @@
 package pl.allegro.tech.hermes.management.infrastructure.audit;
 
-import pl.allegro.tech.hermes.api.PatchData;
-import pl.allegro.tech.hermes.management.domain.Auditor;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Collection;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import pl.allegro.tech.hermes.api.PatchData;
+import pl.allegro.tech.hermes.management.domain.Auditor;
 
 public class CompositeAuditor implements Auditor {
 
-    private final Collection<Auditor> auditors;
-
-    public CompositeAuditor(Collection<Auditor> auditors) {
-        this.auditors = checkNotNull(auditors);
-    }
-
-    @Override
-    public void beforeObjectCreation(String username, Object createdObject) {
-        auditors.forEach(auditor -> auditor.beforeObjectCreation(username, createdObject));
-    }
-
-    @Override
-    public void beforeObjectRemoval(String username, String removedObjectType, String removedObjectName) {
-        auditors.forEach(auditor -> auditor.beforeObjectRemoval(username, removedObjectType, removedObjectName));
-    }
-
-    @Override
-    public void beforeObjectUpdate(String username, String objectClassName, Object objectName, PatchData patchData) {
-        auditors.forEach(auditor -> auditor.beforeObjectUpdate(username, objectClassName, objectName, patchData));
-    }
-
-    @Override
-    public void objectCreated(String username, Object createdObject) {
-        auditors.forEach(auditor -> auditor.objectCreated(username, createdObject));
-    }
-
-    @Override
-    public void objectRemoved(String username, Object removedObject) {
-        auditors.forEach(auditor -> auditor.objectRemoved(username, removedObject));
-    }
-
-    @Override
-    public void objectUpdated(String username, Object oldObject, Object newObject) {
-        auditors.forEach(auditor -> auditor.objectUpdated(username, oldObject, newObject));
-    }
+  private final Collection<Auditor> auditors;
+
+  public CompositeAuditor(Collection<Auditor> auditors) {
+    this.auditors = checkNotNull(auditors);
+  }
+
+  @Override
+  public void beforeObjectCreation(String username, Object createdObject) {
+    auditors.forEach(auditor -> auditor.beforeObjectCreation(username, createdObject));
+  }
+
+  @Override
+  public void beforeObjectRemoval(
+      String username, String removedObjectType, String removedObjectName) {
+    auditors.forEach(
+        auditor -> auditor.beforeObjectRemoval(username, removedObjectType, removedObjectName));
+  }
+
+  @Override
+  public void beforeObjectUpdate(
+      String username, String objectClassName, Object objectName, PatchData patchData) {
+    auditors.forEach(
+        auditor -> auditor.beforeObjectUpdate(username, objectClassName, objectName, patchData));
+  }
+
+  @Override
+  public void objectCreated(String username, Object createdObject) {
+    auditors.forEach(auditor -> auditor.objectCreated(username, createdObject));
+  }
+
+  @Override
+  public void objectRemoved(String username, Object removedObject) {
+    auditors.forEach(auditor -> auditor.objectRemoved(username, removedObject));
+  }
+
+  @Override
+  public void objectUpdated(String username, Object oldObject, Object newObject) {
+    auditors.forEach(auditor -> auditor.objectUpdated(username, oldObject, newObject));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/EventAuditor.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/EventAuditor.java
index 5562b69a17..a07a9a2440 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/EventAuditor.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/EventAuditor.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.infrastructure.audit;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.javers.core.Javers;
 import org.javers.core.diff.Diff;
@@ -9,115 +11,136 @@
 import pl.allegro.tech.hermes.api.PatchData;
 import pl.allegro.tech.hermes.management.domain.Auditor;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class EventAuditor implements Auditor {
 
-    private static final Logger logger = LoggerFactory.getLogger(EventAuditor.class);
-
-    private final Javers javers;
-
-    private final RestTemplate restTemplate;
-
-    private final String eventDestination;
-
-    private final ObjectMapper objectMapper;
-
-    public EventAuditor(Javers javers, RestTemplate restTemplate, String eventDestination, ObjectMapper objectMapper) {
-        this.javers = checkNotNull(javers);
-        this.restTemplate = checkNotNull(restTemplate);
-        this.eventDestination = eventDestination;
-        this.objectMapper = objectMapper;
-    }
-
-    @Override
-    public void beforeObjectCreation(String username, Object createdObject) {
-        ignoringExceptions(() -> {
-            String createdObjectToString = objectMapper.writeValueAsString(createdObject);
-            AuditEvent event = new AuditEvent(AuditEventType.BEFORE_CREATION,
-                    createdObjectToString,
-                    createdObject.getClass().getSimpleName(),
-                    createdObject.toString(),
-                    username);
-            restTemplate.postForObject(eventDestination, event, Void.class);
+  private static final Logger logger = LoggerFactory.getLogger(EventAuditor.class);
+
+  private final Javers javers;
+
+  private final RestTemplate restTemplate;
+
+  private final String eventDestination;
+
+  private final ObjectMapper objectMapper;
+
+  public EventAuditor(
+      Javers javers,
+      RestTemplate restTemplate,
+      String eventDestination,
+      ObjectMapper objectMapper) {
+    this.javers = checkNotNull(javers);
+    this.restTemplate = checkNotNull(restTemplate);
+    this.eventDestination = eventDestination;
+    this.objectMapper = objectMapper;
+  }
+
+  @Override
+  public void beforeObjectCreation(String username, Object createdObject) {
+    ignoringExceptions(
+        () -> {
+          String createdObjectToString = objectMapper.writeValueAsString(createdObject);
+          AuditEvent event =
+              new AuditEvent(
+                  AuditEventType.BEFORE_CREATION,
+                  createdObjectToString,
+                  createdObject.getClass().getSimpleName(),
+                  createdObject.toString(),
+                  username);
+          restTemplate.postForObject(eventDestination, event, Void.class);
         });
-    }
-
-    @Override
-    public void beforeObjectRemoval(String username, String removedObjectType, String removedObjectName) {
-        ignoringExceptions(() -> {
-            AuditEvent event = new AuditEvent(AuditEventType.BEFORE_REMOVAL,
-                    removedObjectName,
-                    removedObjectType,
-                    removedObjectName,
-                    username);
-            restTemplate.postForObject(eventDestination, event, Void.class);
+  }
+
+  @Override
+  public void beforeObjectRemoval(
+      String username, String removedObjectType, String removedObjectName) {
+    ignoringExceptions(
+        () -> {
+          AuditEvent event =
+              new AuditEvent(
+                  AuditEventType.BEFORE_REMOVAL,
+                  removedObjectName,
+                  removedObjectType,
+                  removedObjectName,
+                  username);
+          restTemplate.postForObject(eventDestination, event, Void.class);
         });
-    }
-
-    @Override
-    public void beforeObjectUpdate(String username, String objectClassName, Object objectName, PatchData patchData) {
-        ignoringExceptions(() -> {
-            String patchDataToString = objectMapper.writeValueAsString(patchData);
-            AuditEvent event = new AuditEvent(AuditEventType.BEFORE_UPDATE,
-                    patchDataToString,
-                    patchData.getClass().getSimpleName(),
-                    objectName.toString(),
-                    username);
-            restTemplate.postForObject(eventDestination, event, Void.class);
+  }
+
+  @Override
+  public void beforeObjectUpdate(
+      String username, String objectClassName, Object objectName, PatchData patchData) {
+    ignoringExceptions(
+        () -> {
+          String patchDataToString = objectMapper.writeValueAsString(patchData);
+          AuditEvent event =
+              new AuditEvent(
+                  AuditEventType.BEFORE_UPDATE,
+                  patchDataToString,
+                  patchData.getClass().getSimpleName(),
+                  objectName.toString(),
+                  username);
+          restTemplate.postForObject(eventDestination, event, Void.class);
         });
-    }
-
-    @Override
-    public void objectCreated(String username, Object createdObject) {
-        ignoringExceptions(() -> {
-            String createdObjectToString = objectMapper.writeValueAsString(createdObject);
-            AuditEvent event = new AuditEvent(AuditEventType.CREATED,
-                    createdObjectToString,
-                    createdObject.getClass().getSimpleName(),
-                    createdObject.toString(),
-                    username);
-            restTemplate.postForObject(eventDestination, event, Void.class);
+  }
+
+  @Override
+  public void objectCreated(String username, Object createdObject) {
+    ignoringExceptions(
+        () -> {
+          String createdObjectToString = objectMapper.writeValueAsString(createdObject);
+          AuditEvent event =
+              new AuditEvent(
+                  AuditEventType.CREATED,
+                  createdObjectToString,
+                  createdObject.getClass().getSimpleName(),
+                  createdObject.toString(),
+                  username);
+          restTemplate.postForObject(eventDestination, event, Void.class);
         });
-    }
-
-    @Override
-    public void objectRemoved(String username, Object removedObject) {
-        ignoringExceptions(() -> {
-            String removedObjectToString = objectMapper.writeValueAsString(removedObject);
-            AuditEvent event = new AuditEvent(AuditEventType.REMOVED,
-                    removedObjectToString,
-                    removedObject.getClass().getSimpleName(),
-                    removedObject.toString(),
-                    username);
-            restTemplate.postForObject(eventDestination, event, Void.class);
+  }
+
+  @Override
+  public void objectRemoved(String username, Object removedObject) {
+    ignoringExceptions(
+        () -> {
+          String removedObjectToString = objectMapper.writeValueAsString(removedObject);
+          AuditEvent event =
+              new AuditEvent(
+                  AuditEventType.REMOVED,
+                  removedObjectToString,
+                  removedObject.getClass().getSimpleName(),
+                  removedObject.toString(),
+                  username);
+          restTemplate.postForObject(eventDestination, event, Void.class);
         });
-    }
-
-    @Override
-    public void objectUpdated(String username, Object oldObject, Object newObject) {
-        ignoringExceptions(() -> {
-            Diff diff = javers.compare(oldObject, newObject);
-            AuditEvent event = new AuditEvent(AuditEventType.UPDATED,
-                    diff.toString(),
-                    oldObject.getClass().getSimpleName(),
-                    oldObject.toString(),
-                    username);
-            restTemplate.postForObject(eventDestination, event, Void.class);
+  }
+
+  @Override
+  public void objectUpdated(String username, Object oldObject, Object newObject) {
+    ignoringExceptions(
+        () -> {
+          Diff diff = javers.compare(oldObject, newObject);
+          AuditEvent event =
+              new AuditEvent(
+                  AuditEventType.UPDATED,
+                  diff.toString(),
+                  oldObject.getClass().getSimpleName(),
+                  oldObject.toString(),
+                  username);
+          restTemplate.postForObject(eventDestination, event, Void.class);
         });
-    }
-
-    private void ignoringExceptions(Wrapped wrapped) {
-        try {
-            wrapped.execute();
-        } catch (Exception e) {
-            logger.info("Audit event emission failed.", e);
-        }
-    }
+  }
 
-    @FunctionalInterface
-    private interface Wrapped {
-        void execute() throws Exception;
+  private void ignoringExceptions(Wrapped wrapped) {
+    try {
+      wrapped.execute();
+    } catch (Exception e) {
+      logger.info("Audit event emission failed.", e);
     }
+  }
 
+  @FunctionalInterface
+  private interface Wrapped {
+    void execute() throws Exception;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/LoggingAuditor.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/LoggingAuditor.java
index 9c50655d68..f544b5b27e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/LoggingAuditor.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/LoggingAuditor.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.management.infrastructure.audit;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.javers.core.Javers;
 import org.javers.core.diff.Diff;
@@ -8,73 +10,91 @@
 import pl.allegro.tech.hermes.api.PatchData;
 import pl.allegro.tech.hermes.management.domain.Auditor;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class LoggingAuditor implements Auditor {
 
-    private static final Logger logger = LoggerFactory.getLogger(LoggingAuditor.class);
+  private static final Logger logger = LoggerFactory.getLogger(LoggingAuditor.class);
 
-    private final Javers javers;
-    private final ObjectMapper objectMapper;
+  private final Javers javers;
+  private final ObjectMapper objectMapper;
 
-    public LoggingAuditor(Javers javers, ObjectMapper objectMapper) {
-        this.javers = checkNotNull(javers);
-        this.objectMapper = checkNotNull(objectMapper);
-    }
+  public LoggingAuditor(Javers javers, ObjectMapper objectMapper) {
+    this.javers = checkNotNull(javers);
+    this.objectMapper = checkNotNull(objectMapper);
+  }
 
-    @Override
-    public void beforeObjectCreation(String username, Object createdObject) {
-        ignoringExceptions(() ->
-                logger.info("User {} tries creating new {} {}.", username, createdObject.getClass().getSimpleName(),
-                        objectMapper.writeValueAsString(createdObject)));
-    }
+  @Override
+  public void beforeObjectCreation(String username, Object createdObject) {
+    ignoringExceptions(
+        () ->
+            logger.info(
+                "User {} tries creating new {} {}.",
+                username,
+                createdObject.getClass().getSimpleName(),
+                objectMapper.writeValueAsString(createdObject)));
+  }
 
-    @Override
-    public void beforeObjectRemoval(String username, String removedObjectType, String removedObjectName) {
-        logger.info("User {} tries removing {} {}.", username, removedObjectType, removedObjectName);
-    }
+  @Override
+  public void beforeObjectRemoval(
+      String username, String removedObjectType, String removedObjectName) {
+    logger.info("User {} tries removing {} {}.", username, removedObjectType, removedObjectName);
+  }
 
-    @Override
-    public void beforeObjectUpdate(String username, String objectClassName, Object objectName, PatchData patchData) {
-        ignoringExceptions(() -> {
-            logger.info("User {} tries updating {} {}. {}", username, objectClassName,
-                    objectName, patchData);
+  @Override
+  public void beforeObjectUpdate(
+      String username, String objectClassName, Object objectName, PatchData patchData) {
+    ignoringExceptions(
+        () -> {
+          logger.info(
+              "User {} tries updating {} {}. {}", username, objectClassName, objectName, patchData);
         });
-    }
+  }
 
-    @Override
-    public void objectCreated(String username, Object createdObject) {
-        ignoringExceptions(() ->
-            logger.info("User {} has created new {} {}.", username, createdObject.getClass().getSimpleName(),
-                    objectMapper.writeValueAsString(createdObject)));
-    }
+  @Override
+  public void objectCreated(String username, Object createdObject) {
+    ignoringExceptions(
+        () ->
+            logger.info(
+                "User {} has created new {} {}.",
+                username,
+                createdObject.getClass().getSimpleName(),
+                objectMapper.writeValueAsString(createdObject)));
+  }
 
-    @Override
-    public void objectRemoved(String username, Object removedObject) {
-        ignoringExceptions(() ->
-        logger.info("User {} has removed {} {}.", username, removedObject.getClass().getSimpleName(),
+  @Override
+  public void objectRemoved(String username, Object removedObject) {
+    ignoringExceptions(
+        () ->
+            logger.info(
+                "User {} has removed {} {}.",
+                username,
+                removedObject.getClass().getSimpleName(),
                 objectMapper.writeValueAsString(removedObject)));
-    }
+  }
 
-    @Override
-    public void objectUpdated(String username, Object oldObject, Object newObject) {
-        ignoringExceptions(() -> {
-            Diff diff = javers.compare(oldObject, newObject);
-            logger.info("User {} has updated {} {}. {}", username, oldObject.getClass().getSimpleName(),
-                    objectMapper.writeValueAsString(oldObject), diff);
+  @Override
+  public void objectUpdated(String username, Object oldObject, Object newObject) {
+    ignoringExceptions(
+        () -> {
+          Diff diff = javers.compare(oldObject, newObject);
+          logger.info(
+              "User {} has updated {} {}. {}",
+              username,
+              oldObject.getClass().getSimpleName(),
+              objectMapper.writeValueAsString(oldObject),
+              diff);
         });
-    }
+  }
 
-    private void ignoringExceptions(Wrapped wrapped) {
-        try {
-            wrapped.execute();
-        } catch (Exception e) {
-            logger.info("Audit log failed {}.", e);
-        }
+  private void ignoringExceptions(Wrapped wrapped) {
+    try {
+      wrapped.execute();
+    } catch (Exception e) {
+      logger.info("Audit log failed {}.", e);
     }
+  }
 
-    @FunctionalInterface
-    private interface Wrapped {
-        void execute() throws Exception;
-    }
+  @FunctionalInterface
+  private interface Wrapped {
+    void execute() throws Exception;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/blacklist/ZookeeperTopicBlacklistRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/blacklist/ZookeeperTopicBlacklistRepository.java
index 1ba3da65bd..87b99e09c9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/blacklist/ZookeeperTopicBlacklistRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/blacklist/ZookeeperTopicBlacklistRepository.java
@@ -1,6 +1,7 @@
 package pl.allegro.tech.hermes.management.infrastructure.blacklist;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,40 +10,41 @@
 import pl.allegro.tech.hermes.management.domain.blacklist.NotUnblacklistedException;
 import pl.allegro.tech.hermes.management.domain.blacklist.TopicBlacklistRepository;
 
-import java.util.List;
-
-public class ZookeeperTopicBlacklistRepository extends ZookeeperBasedRepository implements TopicBlacklistRepository {
-
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperTopicBlacklistRepository.class);
-
-    public ZookeeperTopicBlacklistRepository(CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
-        super(zookeeper, mapper, paths);
+public class ZookeeperTopicBlacklistRepository extends ZookeeperBasedRepository
+    implements TopicBlacklistRepository {
+
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperTopicBlacklistRepository.class);
+
+  public ZookeeperTopicBlacklistRepository(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    super(zookeeper, mapper, paths);
+  }
+
+  @Override
+  public void add(String qualifiedTopicName) {
+    logger.info("Adding topic {} to Blacklist", qualifiedTopicName);
+    ensurePathExists(paths.blacklistedTopicPath(qualifiedTopicName));
+  }
+
+  @Override
+  public void remove(String qualifiedTopicName) {
+    logger.info("Removing topic {} from Blacklist", qualifiedTopicName);
+    try {
+      super.remove(paths.blacklistedTopicPath(qualifiedTopicName));
+    } catch (Exception e) {
+      logger.warn("Removing topic {} from Blacklist caused an exception", qualifiedTopicName, e);
+      throw new NotUnblacklistedException(qualifiedTopicName, e);
     }
+  }
 
-    @Override
-    public void add(String qualifiedTopicName) {
-        logger.info("Adding topic {} to Blacklist", qualifiedTopicName);
-        ensurePathExists(paths.blacklistedTopicPath(qualifiedTopicName));
-    }
+  @Override
+  public boolean isBlacklisted(String qualifiedTopicName) {
+    return pathExists(paths.blacklistedTopicPath(qualifiedTopicName));
+  }
 
-    @Override
-    public void remove(String qualifiedTopicName) {
-        logger.info("Removing topic {} from Blacklist", qualifiedTopicName);
-        try {
-            super.remove(paths.blacklistedTopicPath(qualifiedTopicName));
-        } catch (Exception e) {
-            logger.warn("Removing topic {} from Blacklist caused an exception", qualifiedTopicName, e);
-            throw new NotUnblacklistedException(qualifiedTopicName, e);
-        }
-    }
-
-    @Override
-    public boolean isBlacklisted(String qualifiedTopicName) {
-        return pathExists(paths.blacklistedTopicPath(qualifiedTopicName));
-    }
-
-    @Override
-    public List<String> list() {
-        return childrenOf(paths.topicsBlacklistPath());
-    }
+  @Override
+  public List<String> list() {
+    return childrenOf(paths.topicsBlacklistPath());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/ClasspathFileConsoleConfigurationRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/ClasspathFileConsoleConfigurationRepository.java
index 9bfb0f4f11..c24075cd0e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/ClasspathFileConsoleConfigurationRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/ClasspathFileConsoleConfigurationRepository.java
@@ -1,32 +1,32 @@
 package pl.allegro.tech.hermes.management.infrastructure.console;
 
+import java.nio.charset.StandardCharsets;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.FileCopyUtils;
 import pl.allegro.tech.hermes.management.config.console.ConsoleConfigProperties;
 import pl.allegro.tech.hermes.management.domain.console.ConsoleConfigurationRepository;
 
-import java.nio.charset.StandardCharsets;
-
 public class ClasspathFileConsoleConfigurationRepository implements ConsoleConfigurationRepository {
 
-    private String configuration;
+  private String configuration;
 
-    public ClasspathFileConsoleConfigurationRepository(ConsoleConfigProperties properties) {
-        configuration = loadConfiguration(properties.getLocation());
-    }
+  public ClasspathFileConsoleConfigurationRepository(ConsoleConfigProperties properties) {
+    configuration = loadConfiguration(properties.getLocation());
+  }
 
-    @Override
-    public String getConfiguration() {
-        return configuration;
-    }
+  @Override
+  public String getConfiguration() {
+    return configuration;
+  }
 
-    private String loadConfiguration(String location) {
-        try {
-            ClassPathResource resource = new ClassPathResource(location);
-            byte[] bytes = FileCopyUtils.copyToByteArray(resource.getInputStream());
-            return new String(bytes, StandardCharsets.UTF_8);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Error reading Hermes Console configuration from " + location, e);
-        }
+  private String loadConfiguration(String location) {
+    try {
+      ClassPathResource resource = new ClassPathResource(location);
+      byte[] bytes = FileCopyUtils.copyToByteArray(resource.getInputStream());
+      return new String(bytes, StandardCharsets.UTF_8);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          "Error reading Hermes Console configuration from " + location, e);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/FrontendRoutesFilter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/FrontendRoutesFilter.java
index 66bf4f622a..6bee83e894 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/FrontendRoutesFilter.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/FrontendRoutesFilter.java
@@ -5,23 +5,21 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.filter.OncePerRequestFilter;
-
 import java.io.IOException;
+import org.springframework.web.filter.OncePerRequestFilter;
 
 public class FrontendRoutesFilter extends OncePerRequestFilter {
-    private final String frontendEndpoint = "/";
+  private final String frontendEndpoint = "/";
 
-    @Override
-    protected void doFilterInternal(
-            HttpServletRequest request,
-            HttpServletResponse response,
-            FilterChain filterChain) throws ServletException, IOException {
-        if (request.getRequestURI().startsWith("/ui")) {
-            RequestDispatcher rd = request.getRequestDispatcher(frontendEndpoint);
-            rd.forward(request, response);
-        } else {
-            filterChain.doFilter(request, response);
-        }
+  @Override
+  protected void doFilterInternal(
+      HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+      throws ServletException, IOException {
+    if (request.getRequestURI().startsWith("/ui")) {
+      RequestDispatcher rd = request.getRequestDispatcher(frontendEndpoint);
+      rd.forward(request, response);
+    } else {
+      filterChain.doFilter(request, response);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/HttpConsoleConfigurationRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/HttpConsoleConfigurationRepository.java
index 8e44e0bfb4..b83b46adf7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/HttpConsoleConfigurationRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/HttpConsoleConfigurationRepository.java
@@ -6,22 +6,24 @@
 
 public class HttpConsoleConfigurationRepository implements ConsoleConfigurationRepository {
 
-    private String configuration;
+  private String configuration;
 
-    public HttpConsoleConfigurationRepository(ConsoleConfigProperties properties, RestTemplate restTemplate) {
-        configuration = loadConfiguration(properties.getLocation(), restTemplate);
-    }
+  public HttpConsoleConfigurationRepository(
+      ConsoleConfigProperties properties, RestTemplate restTemplate) {
+    configuration = loadConfiguration(properties.getLocation(), restTemplate);
+  }
 
-    @Override
-    public String getConfiguration() {
-        return configuration;
-    }
+  @Override
+  public String getConfiguration() {
+    return configuration;
+  }
 
-    private String loadConfiguration(String location, RestTemplate restTemplate) {
-        try {
-            return restTemplate.getForObject(location, String.class);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Error reading Hermes Console configuration from " + location, e);
-        }
+  private String loadConfiguration(String location, RestTemplate restTemplate) {
+    try {
+      return restTemplate.getForObject(location, String.class);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          "Error reading Hermes Console configuration from " + location, e);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/SpringConfigConsoleConfigurationRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/SpringConfigConsoleConfigurationRepository.java
index 4dd1e33ba2..65daa14469 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/SpringConfigConsoleConfigurationRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/console/SpringConfigConsoleConfigurationRepository.java
@@ -7,19 +7,20 @@
 
 public class SpringConfigConsoleConfigurationRepository implements ConsoleConfigurationRepository {
 
-    private final String jsonConfig;
+  private final String jsonConfig;
 
-    public SpringConfigConsoleConfigurationRepository(ObjectMapper objectMapper, ConsoleProperties consoleProperties) {
-        try {
-            jsonConfig = objectMapper.writeValueAsString(consoleProperties);
-        } catch (JsonProcessingException e) {
-            throw new IllegalArgumentException("Error during spring console config conversion to JSON", e);
-        }
-    }
-
-    @Override
-    public String getConfiguration() {
-        return jsonConfig;
+  public SpringConfigConsoleConfigurationRepository(
+      ObjectMapper objectMapper, ConsoleProperties consoleProperties) {
+    try {
+      jsonConfig = objectMapper.writeValueAsString(consoleProperties);
+    } catch (JsonProcessingException e) {
+      throw new IllegalArgumentException(
+          "Error during spring console config conversion to JSON", e);
     }
+  }
 
+  @Override
+  public String getConfiguration() {
+    return jsonConfig;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/CachedCrowdClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/CachedCrowdClient.java
deleted file mode 100644
index 9a518abd97..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/CachedCrowdClient.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.crowd;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import pl.allegro.tech.hermes.management.config.CrowdProperties;
-
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-public class CachedCrowdClient implements CrowdClient {
-
-    private final LoadingCache<String, List<String>> cache;
-
-    public CachedCrowdClient(CrowdClient crowdClient, CrowdProperties crowdProperties) {
-        this.cache = CacheBuilder.newBuilder()
-                .expireAfterWrite(crowdProperties.getCacheDurationSeconds(), TimeUnit.SECONDS)
-                .maximumSize(crowdProperties.getCacheSize())
-                .build(new CacheLoader<String, List<String>>() {
-                    @Override
-                    public List<String> load(String searchString) throws Exception {
-                        return crowdClient.getGroups(searchString);
-                    }
-                });
-    }
-
-    @Override
-    public List<String> getGroups(String searchString) {
-        try {
-            return cache.get(searchString);
-        } catch (ExecutionException | UncheckedExecutionException e) {
-            throw new CouldNotLoadCrowdGroupsException(e);
-        }
-    }
-}
-
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/CrowdClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/CrowdClient.java
deleted file mode 100644
index 762bbfcba1..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/CrowdClient.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.crowd;
-
-import pl.allegro.tech.hermes.api.ErrorCode;
-import pl.allegro.tech.hermes.common.exception.HermesException;
-
-import java.util.List;
-
-public interface CrowdClient {
-
-    List<String> getGroups(String searchString) throws CouldNotLoadCrowdGroupsException;
-
-    class CouldNotLoadCrowdGroupsException extends HermesException {
-
-        CouldNotLoadCrowdGroupsException(Throwable t) {
-            super(t);
-        }
-
-        @Override
-        public ErrorCode getCode() {
-            return ErrorCode.CROWD_GROUPS_COULD_NOT_BE_LOADED;
-        }
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/RestCrowdClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/RestCrowdClient.java
deleted file mode 100644
index 4f84f575cb..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/crowd/RestCrowdClient.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.crowd;
-
-import com.google.common.io.BaseEncoding;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.web.client.RestTemplate;
-import pl.allegro.tech.hermes.api.CrowdGroupDescription;
-import pl.allegro.tech.hermes.api.CrowdGroups;
-import pl.allegro.tech.hermes.management.config.CrowdProperties;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class RestCrowdClient implements CrowdClient {
-
-    private static final String CROWD_API_SUFFIX = "/rest/usermanagement/1";
-
-    private static final String GROUP_SEARCH_SUFFIX = "/search?entity-type=group&restriction=name=\"*{groupName}*\"";
-
-    private final RestTemplate restTemplate;
-
-    private final CrowdProperties crowdProperties;
-
-    private final HttpEntity<Void> entity;
-
-    private final String groupSearchUrl;
-
-    public RestCrowdClient(RestTemplate restTemplate, CrowdProperties crowdProperties) {
-        this.restTemplate = restTemplate;
-        this.crowdProperties = crowdProperties;
-        this.groupSearchUrl = this.crowdProperties.getPath() + CROWD_API_SUFFIX + GROUP_SEARCH_SUFFIX;
-        this.entity = configureEntity();
-    }
-
-    private HttpEntity<Void> configureEntity() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
-        headers.set(HttpHeaders.AUTHORIZATION, buildBasicAuthorizationValue());
-        return new HttpEntity<>(headers);
-    }
-
-    private String buildBasicAuthorizationValue() {
-        String encodedValue = String.join(":", crowdProperties.getUserName(), crowdProperties.getPassword());
-        return "Basic " + BaseEncoding.base64().encode(encodedValue.getBytes(StandardCharsets.UTF_8));
-    }
-
-    @Override
-    public List<String> getGroups(String searchString) {
-        CrowdGroups crowdGroups = restTemplate.exchange(this.groupSearchUrl, HttpMethod.GET, this.entity, CrowdGroups.class, searchString)
-                .getBody();
-        return crowdGroups.getCrowdGroupDescriptions().stream()
-                .map(CrowdGroupDescription::getName)
-                .collect(Collectors.toList());
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/CachingGraphiteClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/CachingGraphiteClient.java
deleted file mode 100644
index aeae87869d..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/CachingGraphiteClient.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.graphite;
-
-import com.google.common.base.Ticker;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import pl.allegro.tech.hermes.api.MetricDecimalValue;
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
-
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import static com.google.common.collect.Iterables.toArray;
-import static java.util.Arrays.asList;
-import static java.util.Arrays.stream;
-import static java.util.Collections.singleton;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-
-public class CachingGraphiteClient implements GraphiteClient {
-
-    private final GraphiteClient underlyingGraphiteClient;
-    private final LoadingCache<String, MetricDecimalValue> graphiteMetricsCache;
-
-    public CachingGraphiteClient(GraphiteClient underlyingGraphiteClient, Ticker ticker, long cacheTtlInSeconds, long cacheSize) {
-        this.underlyingGraphiteClient = underlyingGraphiteClient;
-        this.graphiteMetricsCache = CacheBuilder.newBuilder()
-                .ticker(ticker)
-                .expireAfterWrite(cacheTtlInSeconds, SECONDS)
-                .maximumSize(cacheSize)
-                .build(new GraphiteMetricsCacheLoader());
-    }
-
-    @Override
-    public MonitoringMetricsContainer readMetrics(String... metricPaths) {
-        try {
-            Map<String, MetricDecimalValue> graphiteMetrics = graphiteMetricsCache.getAll(asList(metricPaths));
-            return MonitoringMetricsContainer.initialized(graphiteMetrics);
-        } catch (ExecutionException e) {
-            // should never happen because the loader does not throw any checked exceptions
-            throw new RuntimeException(e);
-        }
-    }
-
-    private class GraphiteMetricsCacheLoader extends CacheLoader<String, MetricDecimalValue> {
-        @Override
-        public MetricDecimalValue load(String metricPath) {
-            return loadAll(singleton(metricPath)).get(metricPath);
-        }
-
-        @Override
-        public Map<String, MetricDecimalValue> loadAll(Iterable<? extends String> metricPaths) {
-            String[] metricPathsArray = toArray(metricPaths, String.class);
-            MonitoringMetricsContainer metricsContainer = underlyingGraphiteClient.readMetrics(metricPathsArray);
-            return stream(metricPathsArray).collect(toMap(
-                    identity(),
-                    metricsContainer::metricValue
-            ));
-        }
-    }
-}
\ No newline at end of file
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteClient.java
deleted file mode 100644
index 489991f76f..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteClient.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.graphite;
-
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
-
-public interface GraphiteClient {
-
-    MonitoringMetricsContainer readMetrics(String... metricPaths);
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteMetricsProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteMetricsProvider.java
deleted file mode 100644
index 3e355607ec..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteMetricsProvider.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.graphite;
-
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringSubscriptionMetricsProvider;
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringTopicMetricsProvider;
-
-import static pl.allegro.tech.hermes.common.metric.HermesMetrics.escapeDots;
-
-public class GraphiteMetricsProvider implements MonitoringSubscriptionMetricsProvider, MonitoringTopicMetricsProvider {
-
-    private static final String SUBSCRIPTION_PATH = "%s.%s.%s";
-
-    private static final String SUBSCRIPTION_RATE_PATTERN = "sumSeries(%s.consumer.*.meter.%s.m1_rate)";
-    private static final String SUBSCRIPTION_THROUGHPUT_PATTERN = "sumSeries(%s.consumer.*.throughput.%s.m1_rate)";
-    private static final String SUBSCRIPTION_HTTP_STATUSES_PATTERN = "sumSeries(%s.consumer.*.status.%s.%s.m1_rate)";
-    private static final String SUBSCRIPTION_ERROR_TIMEOUT_PATTERN = "sumSeries(%s.consumer.*.status.%s.errors.timeout.m1_rate)";
-    private static final String SUBSCRIPTION_ERROR_OTHER_PATTERN = "sumSeries(%s.consumer.*.status.%s.errors.other.m1_rate)";
-    private static final String SUBSCRIPTION_BATCH_RATE_PATTERN = "sumSeries(%s.consumer.*.meter.%s.batch.m1_rate)";
-
-    private static final String TOPIC_RATE_PATTERN = "sumSeries(%s.producer.*.meter.%s.%s.m1_rate)";
-    private static final String TOPIC_DELIVERY_RATE_PATTERN = "sumSeries(%s.consumer.*.meter.%s.%s.m1_rate)";
-    private static final String TOPIC_THROUGHPUT_PATTERN = "sumSeries(%s.producer.*.throughput.%s.%s.m1_rate)";
-
-    private final GraphiteClient graphiteClient;
-    private final String prefix;
-
-    public GraphiteMetricsProvider(GraphiteClient graphiteClient, String prefix) {
-        this.graphiteClient = graphiteClient;
-        this.prefix = prefix;
-    }
-
-    @Override
-    public MonitoringSubscriptionMetrics subscriptionMetrics(SubscriptionName name) {
-        String rateMetric = metricPath(name);
-        String timeouts = metricPathTimeouts(name);
-        String throughput = metricPathThroughput(name);
-        String otherErrors = metricPathOtherErrors(name);
-        String codes2xxPath = metricPathHttpStatuses(name, "2xx");
-        String codes4xxPath = metricPathHttpStatuses(name, "4xx");
-        String codes5xxPath = metricPathHttpStatuses(name, "5xx");
-        String batchPath = metricPathBatchRate(name);
-
-        MonitoringMetricsContainer metricsContainer = graphiteClient.readMetrics(codes2xxPath, codes4xxPath, codes5xxPath,
-                rateMetric, throughput, timeouts, otherErrors, batchPath);
-
-        return MonitoringSubscriptionMetricsProvider.metricsBuilder()
-                .withRate(metricsContainer.metricValue(rateMetric))
-                .withTimeouts(metricsContainer.metricValue(timeouts))
-                .withThroughput(metricsContainer.metricValue(throughput))
-                .withOtherErrors(metricsContainer.metricValue(otherErrors))
-                .withCodes2xx(metricsContainer.metricValue(codes2xxPath))
-                .withCode4xx(metricsContainer.metricValue(codes4xxPath))
-                .withCode5xx(metricsContainer.metricValue(codes5xxPath))
-                .withMetricPathBatchRate(metricsContainer.metricValue(batchPath))
-                .build();
-    }
-
-    @Override
-    public MonitoringTopicMetrics topicMetrics(TopicName topicName) {
-        String rateMetric = metricPath(TOPIC_RATE_PATTERN, topicName);
-        String deliveryRateMetric = metricPath(TOPIC_DELIVERY_RATE_PATTERN, topicName);
-        String throughputMetric = metricPath(TOPIC_THROUGHPUT_PATTERN, topicName);
-
-        MonitoringMetricsContainer metrics = graphiteClient.readMetrics(rateMetric, deliveryRateMetric, throughputMetric);
-        return MonitoringTopicMetricsProvider.metricsBuilder()
-                .withRate(metrics.metricValue(rateMetric))
-                .withDeliveryRate(metrics.metricValue(deliveryRateMetric))
-                .withThroughput(metrics.metricValue(throughputMetric))
-                .build();
-    }
-
-    private String metricPath(SubscriptionName name) {
-        return String.format(SUBSCRIPTION_RATE_PATTERN, prefix, subscriptionNameToPath(name)
-        );
-    }
-
-    private String metricPath(String pattern, TopicName topicName) {
-        return String.format(pattern, prefix, escapeDots(topicName.getGroupName()),
-                escapeDots(topicName.getName()));
-    }
-
-    private String metricPathThroughput(SubscriptionName name) {
-        return String.format(SUBSCRIPTION_THROUGHPUT_PATTERN, prefix, subscriptionNameToPath(name));
-    }
-
-    private String metricPathHttpStatuses(SubscriptionName name, String statusCodeClass) {
-        return String.format(SUBSCRIPTION_HTTP_STATUSES_PATTERN, prefix, subscriptionNameToPath(name), statusCodeClass);
-    }
-
-    private String metricPathTimeouts(SubscriptionName name) {
-        return String.format(SUBSCRIPTION_ERROR_TIMEOUT_PATTERN, prefix, subscriptionNameToPath(name)
-        );
-    }
-
-    private String metricPathOtherErrors(SubscriptionName name) {
-        return String.format(SUBSCRIPTION_ERROR_OTHER_PATTERN, prefix, subscriptionNameToPath(name));
-    }
-
-    private String metricPathBatchRate(SubscriptionName name) {
-        return String.format(SUBSCRIPTION_BATCH_RATE_PATTERN, prefix, subscriptionNameToPath(name));
-    }
-
-    private String subscriptionNameToPath(SubscriptionName name) {
-        return String.format(SUBSCRIPTION_PATH,
-                escapeDots(name.getTopicName().getGroupName()), name.getTopicName().getName(), escapeDots(name.getName())
-        );
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteResponse.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteResponse.java
deleted file mode 100644
index 4b5fedfbe5..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/GraphiteResponse.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.graphite;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-public class GraphiteResponse {
-
-    private final String target;
-    private final List<List<String>> datapoints;
-
-    @JsonCreator
-    public GraphiteResponse(
-            @JsonProperty("target") String target,
-            @JsonProperty("datapoints") List<List<String>> datapoints
-    ) {
-        this.target = target;
-        this.datapoints = datapoints;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-
-    public List<List<String>> getDatapoints() {
-        return datapoints;
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClient.java
index baad2da445..8b13789179 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClient.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClient.java
@@ -1,95 +1 @@
-package pl.allegro.tech.hermes.management.infrastructure.graphite;
 
-import com.google.common.base.Strings;
-import jakarta.ws.rs.core.UriBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-import pl.allegro.tech.hermes.api.MetricDecimalValue;
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.commons.lang.exception.ExceptionUtils.getRootCauseMessage;
-
-public class RestTemplateGraphiteClient implements GraphiteClient {
-
-    private static final Logger logger = LoggerFactory.getLogger(RestTemplateGraphiteClient.class);
-
-    private static final ParameterizedTypeReference<List<GraphiteResponse>> GRAPHITE_RESPONSE_TYPE =
-            new ParameterizedTypeReference<>() {
-            };
-
-    private static final String DEFAULT_VALUE = "0.0";
-
-    private static final String TARGET_PARAM = "target";
-
-    private final URI graphiteUri;
-
-    private final RestTemplate restTemplate;
-
-    public RestTemplateGraphiteClient(RestTemplate restTemplate, URI graphiteUri) {
-        this.restTemplate = restTemplate;
-        this.graphiteUri = graphiteUri;
-    }
-
-    @Override
-    public MonitoringMetricsContainer readMetrics(String... metricPaths) {
-        try {
-            MonitoringMetricsContainer response = MonitoringMetricsContainer.createEmpty();
-            queryGraphite(metricPaths).forEach(metric -> response.addMetricValue(metric.getTarget(), getFirstValue(metric)));
-            return response;
-        } catch (Exception exception) {
-            logger.warn("Unable to read from Graphite: {}", getRootCauseMessage(exception));
-            return MonitoringMetricsContainer.unavailable();
-        }
-    }
-
-    private MetricDecimalValue getFirstValue(GraphiteResponse graphiteResponse) {
-        checkArgument(hasDatapoints(graphiteResponse), "Graphite format changed. Reexamine implementation.");
-
-        String firstNotNullValue = DEFAULT_VALUE;
-        for (List<String> datapoint : graphiteResponse.getDatapoints()) {
-            if (datapointValid(datapoint)) {
-                firstNotNullValue = datapoint.get(0);
-                break;
-            }
-        }
-        return MetricDecimalValue.of(firstNotNullValue);
-    }
-
-    private boolean datapointValid(List<String> value) {
-        return !value.isEmpty() && !Strings.isNullOrEmpty(value.get(0)) && !"null".equals(value.get(0));
-    }
-
-    private boolean hasDatapoints(GraphiteResponse graphiteResponse) {
-        return !graphiteResponse.getDatapoints().isEmpty() && !graphiteResponse.getDatapoints().get(0).isEmpty();
-    }
-
-    private List<GraphiteResponse> queryGraphite(String... queries) throws UnsupportedEncodingException {
-        UriBuilder builder = UriBuilder.fromUri(graphiteUri)
-                .path("render")
-                .queryParam("from", "-5minutes")
-                .queryParam("until", "-1minutes")
-                .queryParam("format", "json");
-
-        for (String query : queries) {
-            builder.queryParam(TARGET_PARAM, query);
-        }
-
-        ResponseEntity<List<GraphiteResponse>> response = restTemplate.exchange(
-                builder.build(),
-                HttpMethod.GET,
-                HttpEntity.EMPTY,
-                GRAPHITE_RESPONSE_TYPE
-        );
-        return response.getBody();
-    }
-}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/BrokersClusterCommunicationException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/BrokersClusterCommunicationException.java
index a7d48dd5c8..3e06ef8f7a 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/BrokersClusterCommunicationException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/BrokersClusterCommunicationException.java
@@ -5,12 +5,12 @@
 
 public class BrokersClusterCommunicationException extends ManagementException {
 
-    public BrokersClusterCommunicationException(Throwable t) {
-        super(t);
-    }
+  public BrokersClusterCommunicationException(Throwable t) {
+    super(t);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.BROKERS_CLUSTER_COMMUNICATION_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.BROKERS_CLUSTER_COMMUNICATION_EXCEPTION;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/BrokersClusterNotFoundException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/BrokersClusterNotFoundException.java
index 4e0dad4465..62a9a7f3fa 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/BrokersClusterNotFoundException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/BrokersClusterNotFoundException.java
@@ -1,19 +1,19 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka;
 
-import pl.allegro.tech.hermes.api.ErrorCode;
-import pl.allegro.tech.hermes.management.domain.ManagementException;
-
 import static java.lang.String.format;
 import static pl.allegro.tech.hermes.api.ErrorCode.BROKERS_CLUSTER_NOT_FOUND_EXCEPTION;
 
+import pl.allegro.tech.hermes.api.ErrorCode;
+import pl.allegro.tech.hermes.management.domain.ManagementException;
+
 public class BrokersClusterNotFoundException extends ManagementException {
 
-    public BrokersClusterNotFoundException(String clusterName) {
-        super(format("Brokers cluster with name %s not found", clusterName));
-    }
+  public BrokersClusterNotFoundException(String clusterName) {
+    super(format("Brokers cluster with name %s not found", clusterName));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return BROKERS_CLUSTER_NOT_FOUND_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return BROKERS_CLUSTER_NOT_FOUND_EXCEPTION;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MovingSubscriptionOffsetsValidationException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MovingSubscriptionOffsetsValidationException.java
index b338424e7d..d7afa018c4 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MovingSubscriptionOffsetsValidationException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MovingSubscriptionOffsetsValidationException.java
@@ -4,12 +4,12 @@
 import pl.allegro.tech.hermes.management.domain.ManagementException;
 
 public class MovingSubscriptionOffsetsValidationException extends ManagementException {
-    public MovingSubscriptionOffsetsValidationException(String msg) {
-        super(msg);
-    }
+  public MovingSubscriptionOffsetsValidationException(String msg) {
+    super(msg);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.MOVING_SUBSCRIPTION_OFFSETS_VALIDATION_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.MOVING_SUBSCRIPTION_OFFSETS_VALIDATION_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MultiDCAwareService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MultiDCAwareService.java
index 10b314ca2a..17729e6d21 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MultiDCAwareService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MultiDCAwareService.java
@@ -1,5 +1,17 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka;
 
+import static java.util.stream.Collectors.toList;
+
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.ConsumerGroup;
@@ -14,139 +26,147 @@
 import pl.allegro.tech.hermes.management.domain.topic.UnableToMoveOffsetsException;
 import pl.allegro.tech.hermes.management.infrastructure.kafka.service.BrokersClusterService;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import static java.util.stream.Collectors.toList;
-
 public class MultiDCAwareService {
 
-    private static final Logger logger = LoggerFactory.getLogger(MultiDCAwareService.class);
-
-    private final List<BrokersClusterService> clusters;
-    private final Clock clock;
-    private final Duration intervalBetweenCheckingIfOffsetsMoved;
-    private final Duration offsetsMovedTimeout;
-    private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
-
-    public MultiDCAwareService(List<BrokersClusterService> clusters, Clock clock,
-                               Duration intervalBetweenCheckingIfOffsetsMoved, Duration offsetsMovedTimeout,
-                               MultiDatacenterRepositoryCommandExecutor multiDcExecutor) {
-        this.clusters = clusters;
-        this.clock = clock;
-        this.intervalBetweenCheckingIfOffsetsMoved = intervalBetweenCheckingIfOffsetsMoved;
-        this.offsetsMovedTimeout = offsetsMovedTimeout;
-        this.multiDcExecutor = multiDcExecutor;
-    }
-
-    public void manageTopic(Consumer<BrokerTopicManagement> manageFunction) {
-        clusters.forEach(kafkaService -> kafkaService.manageTopic(manageFunction));
-    }
-
-    public String readMessageFromPrimary(String clusterName, Topic topic, Integer partition, Long offset) {
-        return clusters.stream()
-                .filter(cluster -> clusterName.equals(cluster.getClusterName()))
-                .findFirst()
-                .orElseThrow(() -> new BrokersClusterNotFoundException(clusterName))
-                .readMessageFromPrimary(topic, partition, offset);
-    }
-
-    public MultiDCOffsetChangeSummary retransmit(Topic topic,
-                                                 String subscriptionName,
-                                                 Long timestamp,
-                                                 boolean dryRun,
-                                                 RequestUser requester) {
-        MultiDCOffsetChangeSummary multiDCOffsetChangeSummary = new MultiDCOffsetChangeSummary();
-
-        clusters.forEach(cluster -> multiDCOffsetChangeSummary.addPartitionOffsetList(
+  private static final Logger logger = LoggerFactory.getLogger(MultiDCAwareService.class);
+
+  private final List<BrokersClusterService> clusters;
+  private final Clock clock;
+  private final Duration intervalBetweenCheckingIfOffsetsMoved;
+  private final Duration offsetsMovedTimeout;
+  private final MultiDatacenterRepositoryCommandExecutor multiDcExecutor;
+
+  public MultiDCAwareService(
+      List<BrokersClusterService> clusters,
+      Clock clock,
+      Duration intervalBetweenCheckingIfOffsetsMoved,
+      Duration offsetsMovedTimeout,
+      MultiDatacenterRepositoryCommandExecutor multiDcExecutor) {
+    this.clusters = clusters;
+    this.clock = clock;
+    this.intervalBetweenCheckingIfOffsetsMoved = intervalBetweenCheckingIfOffsetsMoved;
+    this.offsetsMovedTimeout = offsetsMovedTimeout;
+    this.multiDcExecutor = multiDcExecutor;
+  }
+
+  public void manageTopic(Consumer<BrokerTopicManagement> manageFunction) {
+    clusters.forEach(kafkaService -> kafkaService.manageTopic(manageFunction));
+  }
+
+  public String readMessageFromPrimary(
+      String clusterName, Topic topic, Integer partition, Long offset) {
+    return clusters.stream()
+        .filter(cluster -> clusterName.equals(cluster.getClusterName()))
+        .findFirst()
+        .orElseThrow(() -> new BrokersClusterNotFoundException(clusterName))
+        .readMessageFromPrimary(topic, partition, offset);
+  }
+
+  public MultiDCOffsetChangeSummary retransmit(
+      Topic topic, String subscriptionName, Long timestamp, boolean dryRun, RequestUser requester) {
+    MultiDCOffsetChangeSummary multiDCOffsetChangeSummary = new MultiDCOffsetChangeSummary();
+
+    clusters.forEach(
+        cluster ->
+            multiDCOffsetChangeSummary.addPartitionOffsetList(
                 cluster.getClusterName(),
                 cluster.indicateOffsetChange(topic, subscriptionName, timestamp, dryRun)));
 
-        if (!dryRun) {
-            logger.info("Starting retransmission for subscription {}. Requested by {}. Retransmission timestamp: {}",
-                    topic.getQualifiedName() + "$" + subscriptionName, requester.getUsername(), timestamp);
-            multiDcExecutor.executeByUser(new RetransmitCommand(new SubscriptionName(subscriptionName, topic.getName())), requester);
-            clusters.forEach(clusters -> waitUntilOffsetsAreMoved(topic, subscriptionName));
-            logger.info(
-                    "Successfully moved offsets for retransmission of subscription {}. Requested by user: {}. Retransmission timestamp: {}",
-                    topic.getQualifiedName() + "$" + subscriptionName, requester.getUsername(), timestamp);
-        }
-
-        return multiDCOffsetChangeSummary;
+    if (!dryRun) {
+      logger.info(
+          "Starting retransmission for subscription {}. Requested by {}. Retransmission timestamp: {}",
+          topic.getQualifiedName() + "$" + subscriptionName,
+          requester.getUsername(),
+          timestamp);
+      multiDcExecutor.executeByUser(
+          new RetransmitCommand(new SubscriptionName(subscriptionName, topic.getName())),
+          requester);
+      clusters.forEach(clusters -> waitUntilOffsetsAreMoved(topic, subscriptionName));
+      logger.info(
+          "Successfully moved offsets for retransmission of subscription {}. Requested by user: {}. Retransmission timestamp: {}",
+          topic.getQualifiedName() + "$" + subscriptionName,
+          requester.getUsername(),
+          timestamp);
     }
 
-    public boolean areOffsetsAvailableOnAllKafkaTopics(Topic topic) {
-        return clusters.stream().allMatch(cluster -> cluster.areOffsetsAvailableOnAllKafkaTopics(topic));
+    return multiDCOffsetChangeSummary;
+  }
+
+  public boolean areOffsetsAvailableOnAllKafkaTopics(Topic topic) {
+    return clusters.stream()
+        .allMatch(cluster -> cluster.areOffsetsAvailableOnAllKafkaTopics(topic));
+  }
+
+  public boolean topicExists(Topic topic) {
+    return clusters.stream()
+        .allMatch(brokersClusterService -> brokersClusterService.topicExists(topic));
+  }
+
+  public Set<String> listTopicFromAllDC() {
+    return clusters.stream()
+        .map(BrokersClusterService::listTopicsFromCluster)
+        .flatMap(Collection::stream)
+        .collect(Collectors.toCollection(HashSet::new));
+  }
+
+  public void removeTopicByName(String topicName) {
+    clusters.forEach(brokersClusterService -> brokersClusterService.removeTopicByName(topicName));
+  }
+
+  public void createConsumerGroups(Topic topic, Subscription subscription) {
+    clusters.forEach(clusterService -> clusterService.createConsumerGroup(topic, subscription));
+  }
+
+  private void waitUntilOffsetsAreMoved(Topic topic, String subscriptionName) {
+    Instant abortAttemptsInstant = clock.instant().plus(offsetsMovedTimeout);
+
+    while (!areOffsetsMoved(topic, subscriptionName)) {
+      if (clock.instant().isAfter(abortAttemptsInstant)) {
+        logger.error(
+            "Not all offsets related to hermes subscription {}${} were moved.",
+            topic.getQualifiedName(),
+            subscriptionName);
+        throw new UnableToMoveOffsetsException(topic, subscriptionName);
+      }
+      logger.debug(
+          "Not all offsets related to hermes subscription {} were moved, will retry",
+          topic.getQualifiedName());
+
+      sleep(intervalBetweenCheckingIfOffsetsMoved);
     }
+  }
 
-    public boolean topicExists(Topic topic) {
-        return clusters.stream().allMatch(brokersClusterService -> brokersClusterService.topicExists(topic));
-    }
-
-    public Set<String> listTopicFromAllDC() {
-        return clusters.stream()
-                .map(BrokersClusterService::listTopicsFromCluster)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toCollection(HashSet::new));
-    }
+  private boolean areOffsetsMoved(Topic topic, String subscriptionName) {
+    return clusters.stream().allMatch(cluster -> cluster.areOffsetsMoved(topic, subscriptionName));
+  }
 
-    public void removeTopicByName(String topicName) {
-        clusters.forEach(brokersClusterService -> brokersClusterService.removeTopicByName(topicName));
+  private void sleep(Duration sleepDuration) {
+    try {
+      Thread.sleep(sleepDuration.toMillis());
+    } catch (InterruptedException e) {
+      throw new InternalProcessingException(e);
     }
+  }
 
-    public void createConsumerGroups(Topic topic, Subscription subscription) {
-        clusters.forEach(clusterService -> clusterService.createConsumerGroup(topic, subscription));
-    }
-
-    private void waitUntilOffsetsAreMoved(Topic topic, String subscriptionName) {
-        Instant abortAttemptsInstant = clock.instant().plus(offsetsMovedTimeout);
-
-        while (!areOffsetsMoved(topic, subscriptionName)) {
-            if (clock.instant().isAfter(abortAttemptsInstant)) {
-                logger.error("Not all offsets related to hermes subscription {}${} were moved.", topic.getQualifiedName(),
-                        subscriptionName);
-                throw new UnableToMoveOffsetsException(topic, subscriptionName);
-            }
-            logger.debug("Not all offsets related to hermes subscription {} were moved, will retry", topic.getQualifiedName());
-
-            sleep(intervalBetweenCheckingIfOffsetsMoved);
-        }
-    }
-
-    private boolean areOffsetsMoved(Topic topic, String subscriptionName) {
-        return clusters.stream()
-                .allMatch(cluster -> cluster.areOffsetsMoved(topic, subscriptionName));
-    }
-
-    private void sleep(Duration sleepDuration) {
-        try {
-            Thread.sleep(sleepDuration.toMillis());
-        } catch (InterruptedException e) {
-            throw new InternalProcessingException(e);
-        }
-    }
-
-    public boolean allSubscriptionsHaveConsumersAssigned(Topic topic, List<Subscription> subscriptions) {
-        return clusters.stream().allMatch(brokersClusterService ->
+  public boolean allSubscriptionsHaveConsumersAssigned(
+      Topic topic, List<Subscription> subscriptions) {
+    return clusters.stream()
+        .allMatch(
+            brokersClusterService ->
                 brokersClusterService.allSubscriptionsHaveConsumersAssigned(topic, subscriptions));
-    }
-
-    public List<ConsumerGroup> describeConsumerGroups(Topic topic, String subscriptionName) {
-        return clusters.stream().map(brokersClusterService -> brokersClusterService.describeConsumerGroup(topic, subscriptionName))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(toList());
-    }
-
-    public void moveOffsetsToTheEnd(Topic topic, SubscriptionName subscription) {
-        clusters.forEach(c -> c.moveOffsetsToTheEnd(topic, subscription));
-    }
+  }
+
+  public List<ConsumerGroup> describeConsumerGroups(Topic topic, String subscriptionName) {
+    return clusters.stream()
+        .map(
+            brokersClusterService ->
+                brokersClusterService.describeConsumerGroup(topic, subscriptionName))
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(toList());
+  }
+
+  public void moveOffsetsToTheEnd(Topic topic, SubscriptionName subscription) {
+    clusters.forEach(c -> c.moveOffsetsToTheEnd(topic, subscription));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MultiDCOffsetChangeSummary.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MultiDCOffsetChangeSummary.java
index c35449ddb1..202dd817d7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MultiDCOffsetChangeSummary.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/MultiDCOffsetChangeSummary.java
@@ -3,27 +3,25 @@
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.google.common.collect.ImmutableMap;
-import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
 
 public class MultiDCOffsetChangeSummary {
 
-    private Map<String, List<PartitionOffset>> partitionOffsetListPerBrokerName = new HashMap<>();
-
-    public MultiDCOffsetChangeSummary() {
-    }
+  private Map<String, List<PartitionOffset>> partitionOffsetListPerBrokerName = new HashMap<>();
 
-    @JsonAnySetter
-    public void addPartitionOffsetList(String clusterName, List<PartitionOffset> partitionOffsetChange) {
-        partitionOffsetListPerBrokerName.put(clusterName, partitionOffsetChange);
-    }
+  public MultiDCOffsetChangeSummary() {}
 
-    @JsonAnyGetter
-    public Map<String, List<PartitionOffset>> getPartitionOffsetListPerBrokerName() {
-        return ImmutableMap.copyOf(partitionOffsetListPerBrokerName);
-    }
+  @JsonAnySetter
+  public void addPartitionOffsetList(
+      String clusterName, List<PartitionOffset> partitionOffsetChange) {
+    partitionOffsetListPerBrokerName.put(clusterName, partitionOffsetChange);
+  }
 
+  @JsonAnyGetter
+  public Map<String, List<PartitionOffset>> getPartitionOffsetListPerBrokerName() {
+    return ImmutableMap.copyOf(partitionOffsetListPerBrokerName);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/BrokersClusterService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/BrokersClusterService.java
index d9ceed57be..2dcf3103f2 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/BrokersClusterService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/BrokersClusterService.java
@@ -1,5 +1,20 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
+import static java.lang.String.format;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.kafka.clients.admin.AdminClient;
@@ -22,182 +37,195 @@
 import pl.allegro.tech.hermes.management.domain.topic.SingleMessageReader;
 import pl.allegro.tech.hermes.management.infrastructure.kafka.MovingSubscriptionOffsetsValidationException;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.lang.String.format;
-import static java.util.stream.Collectors.toMap;
-import static java.util.stream.Collectors.toSet;
-
 public class BrokersClusterService {
 
-    private static final Logger logger = LoggerFactory.getLogger(BrokersClusterService.class);
-
-    private final String clusterName;
-    private final SingleMessageReader singleMessageReader;
-    private final RetransmissionService retransmissionService;
-    private final BrokerTopicManagement brokerTopicManagement;
-    private final KafkaNamesMapper kafkaNamesMapper;
-    private final OffsetsAvailableChecker offsetsAvailableChecker;
-    private final ConsumerGroupsDescriber consumerGroupsDescriber;
-    private final AdminClient adminClient;
-    private final ConsumerGroupManager consumerGroupManager;
-    private final KafkaConsumerManager kafkaConsumerManager;
-
-    public BrokersClusterService(String clusterName, SingleMessageReader singleMessageReader,
-                                 RetransmissionService retransmissionService, BrokerTopicManagement brokerTopicManagement,
-                                 KafkaNamesMapper kafkaNamesMapper, OffsetsAvailableChecker offsetsAvailableChecker,
-                                 LogEndOffsetChecker logEndOffsetChecker, AdminClient adminClient,
-                                 ConsumerGroupManager consumerGroupManager,
-                                 KafkaConsumerManager kafkaConsumerManager) {
-        this.clusterName = clusterName;
-        this.singleMessageReader = singleMessageReader;
-        this.retransmissionService = retransmissionService;
-        this.brokerTopicManagement = brokerTopicManagement;
-        this.kafkaNamesMapper = kafkaNamesMapper;
-        this.offsetsAvailableChecker = offsetsAvailableChecker;
-        this.consumerGroupsDescriber = new ConsumerGroupsDescriber(
-                kafkaNamesMapper,
-                adminClient,
-                logEndOffsetChecker,
-                clusterName
-        );
-        this.adminClient = adminClient;
-        this.consumerGroupManager = consumerGroupManager;
-        this.kafkaConsumerManager = kafkaConsumerManager;
-    }
-
-    public String getClusterName() {
-        return clusterName;
-    }
-
-    public void manageTopic(Consumer<BrokerTopicManagement> manageFunction) {
-        manageFunction.accept(brokerTopicManagement);
-    }
-
-    public String readMessageFromPrimary(Topic topic, Integer partition, Long offset) {
-        return singleMessageReader.readMessageAsJson(topic, kafkaNamesMapper.toKafkaTopics(topic).getPrimary(), partition, offset);
-    }
-
-    public List<PartitionOffset> indicateOffsetChange(Topic topic, String subscriptionName, Long timestamp, boolean dryRun) {
-        return retransmissionService.indicateOffsetChange(topic, subscriptionName, clusterName, timestamp, dryRun);
-    }
-
-    public boolean areOffsetsAvailableOnAllKafkaTopics(Topic topic) {
-        return kafkaNamesMapper.toKafkaTopics(topic).allMatch(offsetsAvailableChecker::areOffsetsAvailable);
-    }
-
-    public boolean topicExists(Topic topic) {
-        return brokerTopicManagement.topicExists(topic);
-    }
-
-    public List<String> listTopicsFromCluster() {
-        try {
-            return new ArrayList<>(adminClient.listTopics().names().get());
-        } catch (ExecutionException | InterruptedException e) {
-            logger.error("Failed to list topics names", e);
-            return Collections.emptyList();
-        }
-    }
-
-    public void removeTopicByName(String topicName) {
-        adminClient.deleteTopics(Collections.singletonList(topicName));
-    }
-
-    public boolean areOffsetsMoved(Topic topic, String subscriptionName) {
-        return retransmissionService.areOffsetsMoved(topic, subscriptionName, clusterName);
-    }
-
-    public boolean allSubscriptionsHaveConsumersAssigned(Topic topic, List<Subscription> subscriptions) {
-        List<String> consumerGroupsForSubscriptions = subscriptions.stream()
-                .map(sub -> kafkaNamesMapper.toConsumerGroupId(sub.getQualifiedName()).asString())
-                .collect(Collectors.toList());
-
-        try {
-            int requiredTotalNumberOfAssignments = numberOfPartitionsForTopic(topic) * subscriptions.size();
-            return numberOfAssignmentsForConsumersGroups(consumerGroupsForSubscriptions) == requiredTotalNumberOfAssignments;
-        } catch (Exception e) {
-            logger.error("Failed to check assignments for topic " + topic.getQualifiedName() + " subscriptions", e);
-            return false;
-        }
-    }
-
-    public void createConsumerGroup(Topic topic, Subscription subscription) {
-        consumerGroupManager.createConsumerGroup(topic, subscription);
-    }
-
-    public Optional<ConsumerGroup> describeConsumerGroup(Topic topic, String subscriptionName) {
-        return consumerGroupsDescriber.describeConsumerGroup(topic, subscriptionName);
-    }
-
-    public void moveOffsetsToTheEnd(Topic topic, SubscriptionName subscription) {
-        validateIfOffsetsCanBeMoved(topic, subscription);
-
-        KafkaConsumer<byte[], byte[]> consumer = kafkaConsumerManager.createConsumer(subscription);
-        String kafkaTopicName = kafkaNamesMapper.toKafkaTopics(topic).getPrimary().name().asString();
-        Set<TopicPartition> topicPartitions = getTopicPartitions(consumer, kafkaTopicName);
-        consumer.assign(topicPartitions);
-
-        Map<TopicPartition, Long> endOffsets = consumer.endOffsets(topicPartitions);
-        Map<TopicPartition, OffsetAndMetadata> endOffsetsMetadata = buildOffsetsMetadata(endOffsets);
-        consumer.commitSync(endOffsetsMetadata);
-        consumer.close();
-
-        logger.info("Successfully moved offset to the end position for subscription {} and consumer group {}",
-                subscription.getQualifiedName(), kafkaNamesMapper.toConsumerGroupId(subscription));
-    }
-
-    private int numberOfAssignmentsForConsumersGroups(List<String> consumerGroupsIds) throws ExecutionException, InterruptedException {
-        Collection<ConsumerGroupDescription> consumerGroupsDescriptions =
-                adminClient.describeConsumerGroups(consumerGroupsIds).all().get().values();
-        Stream<MemberDescription> memberDescriptions = consumerGroupsDescriptions.stream().flatMap(desc -> desc.members().stream());
-        return memberDescriptions.flatMap(memberDescription -> memberDescription.assignment().topicPartitions().stream())
-                .collect(Collectors.toList()).size();
-    }
-
-    private void validateIfOffsetsCanBeMoved(Topic topic, SubscriptionName subscription) {
-        describeConsumerGroup(topic, subscription.getName())
-                .ifPresentOrElse(
-                        group -> {
-                            if (!group.getMembers().isEmpty()) {
-                                String s = format("Consumer group %s for subscription %s has still active members.",
-                                        group.getGroupId(), subscription.getQualifiedName());
-                                throw new MovingSubscriptionOffsetsValidationException(s);
-                            }
-                        }, () -> {
-                            String s = format("No consumer group for subscription %s exists.", subscription.getQualifiedName());
-                            throw new MovingSubscriptionOffsetsValidationException(s);
-                        });
-    }
-
-    private int numberOfPartitionsForTopic(Topic topic) throws ExecutionException, InterruptedException {
-        List<String> kafkaTopicsNames = kafkaNamesMapper.toKafkaTopics(topic).stream()
-                .map(kafkaTopic -> kafkaTopic.name().asString())
-                .collect(Collectors.toList());
-
-        return adminClient.describeTopics(kafkaTopicsNames).all().get().values().stream()
-                .map(v -> v.partitions().size())
-                .reduce(0, Integer::sum);
-    }
-
-    private Set<TopicPartition> getTopicPartitions(KafkaConsumer<byte[], byte[]> consumer, String kafkaTopicName) {
-        return consumer.partitionsFor(kafkaTopicName).stream()
-                .map(info -> new TopicPartition(info.topic(), info.partition()))
-                .collect(toSet());
-    }
-
-    private Map<TopicPartition, OffsetAndMetadata> buildOffsetsMetadata(Map<TopicPartition, Long> offsets) {
-        return offsets.entrySet().stream()
-                .map(entry -> ImmutablePair.of(entry.getKey(), new OffsetAndMetadata(entry.getValue())))
-                .collect(toMap(Pair::getKey, Pair::getValue));
-    }
+  private static final Logger logger = LoggerFactory.getLogger(BrokersClusterService.class);
+
+  private final String clusterName;
+  private final SingleMessageReader singleMessageReader;
+  private final RetransmissionService retransmissionService;
+  private final BrokerTopicManagement brokerTopicManagement;
+  private final KafkaNamesMapper kafkaNamesMapper;
+  private final OffsetsAvailableChecker offsetsAvailableChecker;
+  private final ConsumerGroupsDescriber consumerGroupsDescriber;
+  private final AdminClient adminClient;
+  private final ConsumerGroupManager consumerGroupManager;
+  private final KafkaConsumerManager kafkaConsumerManager;
+
+  public BrokersClusterService(
+      String clusterName,
+      SingleMessageReader singleMessageReader,
+      RetransmissionService retransmissionService,
+      BrokerTopicManagement brokerTopicManagement,
+      KafkaNamesMapper kafkaNamesMapper,
+      OffsetsAvailableChecker offsetsAvailableChecker,
+      LogEndOffsetChecker logEndOffsetChecker,
+      AdminClient adminClient,
+      ConsumerGroupManager consumerGroupManager,
+      KafkaConsumerManager kafkaConsumerManager) {
+    this.clusterName = clusterName;
+    this.singleMessageReader = singleMessageReader;
+    this.retransmissionService = retransmissionService;
+    this.brokerTopicManagement = brokerTopicManagement;
+    this.kafkaNamesMapper = kafkaNamesMapper;
+    this.offsetsAvailableChecker = offsetsAvailableChecker;
+    this.consumerGroupsDescriber =
+        new ConsumerGroupsDescriber(
+            kafkaNamesMapper, adminClient, logEndOffsetChecker, clusterName);
+    this.adminClient = adminClient;
+    this.consumerGroupManager = consumerGroupManager;
+    this.kafkaConsumerManager = kafkaConsumerManager;
+  }
+
+  public String getClusterName() {
+    return clusterName;
+  }
+
+  public void manageTopic(Consumer<BrokerTopicManagement> manageFunction) {
+    manageFunction.accept(brokerTopicManagement);
+  }
+
+  public String readMessageFromPrimary(Topic topic, Integer partition, Long offset) {
+    return singleMessageReader.readMessageAsJson(
+        topic, kafkaNamesMapper.toKafkaTopics(topic).getPrimary(), partition, offset);
+  }
+
+  public List<PartitionOffset> indicateOffsetChange(
+      Topic topic, String subscriptionName, Long timestamp, boolean dryRun) {
+    return retransmissionService.indicateOffsetChange(
+        topic, subscriptionName, clusterName, timestamp, dryRun);
+  }
+
+  public boolean areOffsetsAvailableOnAllKafkaTopics(Topic topic) {
+    return kafkaNamesMapper
+        .toKafkaTopics(topic)
+        .allMatch(offsetsAvailableChecker::areOffsetsAvailable);
+  }
+
+  public boolean topicExists(Topic topic) {
+    return brokerTopicManagement.topicExists(topic);
+  }
+
+  public List<String> listTopicsFromCluster() {
+    try {
+      return new ArrayList<>(adminClient.listTopics().names().get());
+    } catch (ExecutionException | InterruptedException e) {
+      logger.error("Failed to list topics names", e);
+      return Collections.emptyList();
+    }
+  }
+
+  public void removeTopicByName(String topicName) {
+    adminClient.deleteTopics(Collections.singletonList(topicName));
+  }
+
+  public boolean areOffsetsMoved(Topic topic, String subscriptionName) {
+    return retransmissionService.areOffsetsMoved(topic, subscriptionName, clusterName);
+  }
+
+  public boolean allSubscriptionsHaveConsumersAssigned(
+      Topic topic, List<Subscription> subscriptions) {
+    List<String> consumerGroupsForSubscriptions =
+        subscriptions.stream()
+            .map(sub -> kafkaNamesMapper.toConsumerGroupId(sub.getQualifiedName()).asString())
+            .collect(Collectors.toList());
+
+    try {
+      int requiredTotalNumberOfAssignments =
+          numberOfPartitionsForTopic(topic) * subscriptions.size();
+      return numberOfAssignmentsForConsumersGroups(consumerGroupsForSubscriptions)
+          == requiredTotalNumberOfAssignments;
+    } catch (Exception e) {
+      logger.error(
+          "Failed to check assignments for topic " + topic.getQualifiedName() + " subscriptions",
+          e);
+      return false;
+    }
+  }
+
+  public void createConsumerGroup(Topic topic, Subscription subscription) {
+    consumerGroupManager.createConsumerGroup(topic, subscription);
+  }
+
+  public Optional<ConsumerGroup> describeConsumerGroup(Topic topic, String subscriptionName) {
+    return consumerGroupsDescriber.describeConsumerGroup(topic, subscriptionName);
+  }
+
+  public void moveOffsetsToTheEnd(Topic topic, SubscriptionName subscription) {
+    validateIfOffsetsCanBeMoved(topic, subscription);
+
+    KafkaConsumer<byte[], byte[]> consumer = kafkaConsumerManager.createConsumer(subscription);
+    String kafkaTopicName = kafkaNamesMapper.toKafkaTopics(topic).getPrimary().name().asString();
+    Set<TopicPartition> topicPartitions = getTopicPartitions(consumer, kafkaTopicName);
+    consumer.assign(topicPartitions);
+
+    Map<TopicPartition, Long> endOffsets = consumer.endOffsets(topicPartitions);
+    Map<TopicPartition, OffsetAndMetadata> endOffsetsMetadata = buildOffsetsMetadata(endOffsets);
+    consumer.commitSync(endOffsetsMetadata);
+    consumer.close();
+
+    logger.info(
+        "Successfully moved offset to the end position for subscription {} and consumer group {}",
+        subscription.getQualifiedName(),
+        kafkaNamesMapper.toConsumerGroupId(subscription));
+  }
+
+  private int numberOfAssignmentsForConsumersGroups(List<String> consumerGroupsIds)
+      throws ExecutionException, InterruptedException {
+    Collection<ConsumerGroupDescription> consumerGroupsDescriptions =
+        adminClient.describeConsumerGroups(consumerGroupsIds).all().get().values();
+    Stream<MemberDescription> memberDescriptions =
+        consumerGroupsDescriptions.stream().flatMap(desc -> desc.members().stream());
+    return memberDescriptions
+        .flatMap(memberDescription -> memberDescription.assignment().topicPartitions().stream())
+        .collect(Collectors.toList())
+        .size();
+  }
+
+  private void validateIfOffsetsCanBeMoved(Topic topic, SubscriptionName subscription) {
+    describeConsumerGroup(topic, subscription.getName())
+        .ifPresentOrElse(
+            group -> {
+              if (!group.getMembers().isEmpty()) {
+                String s =
+                    format(
+                        "Consumer group %s for subscription %s has still active members.",
+                        group.getGroupId(), subscription.getQualifiedName());
+                throw new MovingSubscriptionOffsetsValidationException(s);
+              }
+            },
+            () -> {
+              String s =
+                  format(
+                      "No consumer group for subscription %s exists.",
+                      subscription.getQualifiedName());
+              throw new MovingSubscriptionOffsetsValidationException(s);
+            });
+  }
+
+  private int numberOfPartitionsForTopic(Topic topic)
+      throws ExecutionException, InterruptedException {
+    List<String> kafkaTopicsNames =
+        kafkaNamesMapper.toKafkaTopics(topic).stream()
+            .map(kafkaTopic -> kafkaTopic.name().asString())
+            .collect(Collectors.toList());
+
+    return adminClient.describeTopics(kafkaTopicsNames).all().get().values().stream()
+        .map(v -> v.partitions().size())
+        .reduce(0, Integer::sum);
+  }
+
+  private Set<TopicPartition> getTopicPartitions(
+      KafkaConsumer<byte[], byte[]> consumer, String kafkaTopicName) {
+    return consumer.partitionsFor(kafkaTopicName).stream()
+        .map(info -> new TopicPartition(info.topic(), info.partition()))
+        .collect(toSet());
+  }
+
+  private Map<TopicPartition, OffsetAndMetadata> buildOffsetsMetadata(
+      Map<TopicPartition, Long> offsets) {
+    return offsets.entrySet().stream()
+        .map(entry -> ImmutablePair.of(entry.getKey(), new OffsetAndMetadata(entry.getValue())))
+        .collect(toMap(Pair::getKey, Pair::getValue));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/ConsumerGroupsDescriber.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/ConsumerGroupsDescriber.java
index 46d87599f5..36aef4bbe8 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/ConsumerGroupsDescriber.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/ConsumerGroupsDescriber.java
@@ -1,5 +1,15 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.ConsumerGroupDescription;
 import org.apache.kafka.clients.admin.MemberDescription;
@@ -20,103 +30,109 @@
 import pl.allegro.tech.hermes.common.kafka.KafkaTopics;
 import pl.allegro.tech.hermes.management.infrastructure.kafka.BrokersClusterCommunicationException;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-
-import static java.util.stream.Collectors.toMap;
-import static java.util.stream.Collectors.toSet;
-
 class ConsumerGroupsDescriber {
 
-    private static final Logger logger = LoggerFactory.getLogger(ConsumerGroupsDescriber.class);
+  private static final Logger logger = LoggerFactory.getLogger(ConsumerGroupsDescriber.class);
 
-    private final KafkaNamesMapper kafkaNamesMapper;
-    private final AdminClient adminClient;
-    private final LogEndOffsetChecker logEndOffsetChecker;
-    private final String clusterName;
+  private final KafkaNamesMapper kafkaNamesMapper;
+  private final AdminClient adminClient;
+  private final LogEndOffsetChecker logEndOffsetChecker;
+  private final String clusterName;
 
-    ConsumerGroupsDescriber(KafkaNamesMapper kafkaNamesMapper, AdminClient adminClient,
-                            LogEndOffsetChecker logEndOffsetChecker, String clusterName) {
-        this.kafkaNamesMapper = kafkaNamesMapper;
-        this.adminClient = adminClient;
-        this.logEndOffsetChecker = logEndOffsetChecker;
-        this.clusterName = clusterName;
-    }
+  ConsumerGroupsDescriber(
+      KafkaNamesMapper kafkaNamesMapper,
+      AdminClient adminClient,
+      LogEndOffsetChecker logEndOffsetChecker,
+      String clusterName) {
+    this.kafkaNamesMapper = kafkaNamesMapper;
+    this.adminClient = adminClient;
+    this.logEndOffsetChecker = logEndOffsetChecker;
+    this.clusterName = clusterName;
+  }
 
-    Optional<ConsumerGroup> describeConsumerGroup(Topic topic, String subscriptionName) {
-        ConsumerGroupId consumerGroupId = kafkaNamesMapper.toConsumerGroupId(new SubscriptionName(subscriptionName, topic.getName()));
-        KafkaTopics kafkaTopics = kafkaNamesMapper.toKafkaTopics(topic);
-        try {
-            return describeConsumerGroup(consumerGroupId, kafkaTopics);
-        } catch (Exception e) {
-            logger.error("Failed to describe group with id: {}", consumerGroupId.asString(), e);
-            throw new BrokersClusterCommunicationException(e);
-        }
+  Optional<ConsumerGroup> describeConsumerGroup(Topic topic, String subscriptionName) {
+    ConsumerGroupId consumerGroupId =
+        kafkaNamesMapper.toConsumerGroupId(new SubscriptionName(subscriptionName, topic.getName()));
+    KafkaTopics kafkaTopics = kafkaNamesMapper.toKafkaTopics(topic);
+    try {
+      return describeConsumerGroup(consumerGroupId, kafkaTopics);
+    } catch (Exception e) {
+      logger.error("Failed to describe group with id: {}", consumerGroupId.asString(), e);
+      throw new BrokersClusterCommunicationException(e);
     }
+  }
 
-    private Optional<ConsumerGroup> describeConsumerGroup(ConsumerGroupId consumerGroupId,
-                                                          KafkaTopics kafkaTopics) throws ExecutionException, InterruptedException {
-        Map<KafkaTopicName, ContentType> kafkaTopicContentTypes = kafkaTopics.stream()
-                .collect(toMap(KafkaTopic::name, KafkaTopic::contentType));
-        Map<TopicPartition, OffsetAndMetadata> topicPartitionOffsets = adminClient
-                .listConsumerGroupOffsets(consumerGroupId.asString())
-                .partitionsToOffsetAndMetadata()
-                .get();
-        Optional<ConsumerGroupDescription> description = adminClient
-                .describeConsumerGroups(Collections.singletonList(consumerGroupId.asString()))
-                .all()
-                .get()
-                .values()
-                .stream()
-                .findFirst();
+  private Optional<ConsumerGroup> describeConsumerGroup(
+      ConsumerGroupId consumerGroupId, KafkaTopics kafkaTopics)
+      throws ExecutionException, InterruptedException {
+    Map<KafkaTopicName, ContentType> kafkaTopicContentTypes =
+        kafkaTopics.stream().collect(toMap(KafkaTopic::name, KafkaTopic::contentType));
+    Map<TopicPartition, OffsetAndMetadata> topicPartitionOffsets =
+        adminClient
+            .listConsumerGroupOffsets(consumerGroupId.asString())
+            .partitionsToOffsetAndMetadata()
+            .get();
+    Optional<ConsumerGroupDescription> description =
+        adminClient
+            .describeConsumerGroups(Collections.singletonList(consumerGroupId.asString()))
+            .all()
+            .get()
+            .values()
+            .stream()
+            .findFirst();
 
-        return description
-                .map(d -> d.state() != ConsumerGroupState.DEAD ? d : null)
-                .map(d -> getKafkaConsumerGroup(topicPartitionOffsets, kafkaTopicContentTypes, d));
-    }
+    return description
+        .map(d -> d.state() != ConsumerGroupState.DEAD ? d : null)
+        .map(d -> getKafkaConsumerGroup(topicPartitionOffsets, kafkaTopicContentTypes, d));
+  }
 
-    private ConsumerGroup getKafkaConsumerGroup(Map<TopicPartition, OffsetAndMetadata> topicPartitionOffsets,
-                                                Map<KafkaTopicName, ContentType> kafkaTopicContentTypes,
-                                                ConsumerGroupDescription description) {
-        Set<ConsumerGroupMember> groupMembers = description.members().stream()
-                .map(member -> getKafkaConsumerGroupMember(topicPartitionOffsets, kafkaTopicContentTypes, member))
-                .collect(toSet());
+  private ConsumerGroup getKafkaConsumerGroup(
+      Map<TopicPartition, OffsetAndMetadata> topicPartitionOffsets,
+      Map<KafkaTopicName, ContentType> kafkaTopicContentTypes,
+      ConsumerGroupDescription description) {
+    Set<ConsumerGroupMember> groupMembers =
+        description.members().stream()
+            .map(
+                member ->
+                    getKafkaConsumerGroupMember(
+                        topicPartitionOffsets, kafkaTopicContentTypes, member))
+            .collect(toSet());
 
-        return new ConsumerGroup(clusterName, description.groupId(), description.state().toString(), groupMembers);
-    }
+    return new ConsumerGroup(
+        clusterName, description.groupId(), description.state().toString(), groupMembers);
+  }
 
-    private ConsumerGroupMember getKafkaConsumerGroupMember(Map<TopicPartition, OffsetAndMetadata> topicPartitionOffsets,
-                                                            Map<KafkaTopicName, ContentType> kafkaTopicContentTypes,
-                                                            MemberDescription member) {
-        Set<pl.allegro.tech.hermes.api.TopicPartition> kafkaTopicPartitions = member.assignment().topicPartitions().stream().map(
+  private ConsumerGroupMember getKafkaConsumerGroupMember(
+      Map<TopicPartition, OffsetAndMetadata> topicPartitionOffsets,
+      Map<KafkaTopicName, ContentType> kafkaTopicContentTypes,
+      MemberDescription member) {
+    Set<pl.allegro.tech.hermes.api.TopicPartition> kafkaTopicPartitions =
+        member.assignment().topicPartitions().stream()
+            .map(
                 topicPartition -> {
-                    Optional<OffsetAndMetadata> offset = Optional.ofNullable(topicPartitionOffsets.get(topicPartition));
-                    return new pl.allegro.tech.hermes.api.TopicPartition(
-                            topicPartition.partition(),
-                            topicPartition.topic(),
-                            offset.map(OffsetAndMetadata::offset).orElse(0L),
-                            logEndOffsetChecker.check(topicPartition),
-                            offset.map(OffsetAndMetadata::metadata).orElse(""),
-                            kafkaTopicContentTypes.get(KafkaTopicName.valueOf(topicPartition.topic()))
-                    );
-                }
-        ).collect(toSet());
-        return new ConsumerGroupMember(member.consumerId(), member.clientId(), toHostName(member.host()), kafkaTopicPartitions);
-    }
+                  Optional<OffsetAndMetadata> offset =
+                      Optional.ofNullable(topicPartitionOffsets.get(topicPartition));
+                  return new pl.allegro.tech.hermes.api.TopicPartition(
+                      topicPartition.partition(),
+                      topicPartition.topic(),
+                      offset.map(OffsetAndMetadata::offset).orElse(0L),
+                      logEndOffsetChecker.check(topicPartition),
+                      offset.map(OffsetAndMetadata::metadata).orElse(""),
+                      kafkaTopicContentTypes.get(KafkaTopicName.valueOf(topicPartition.topic())));
+                })
+            .collect(toSet());
+    return new ConsumerGroupMember(
+        member.consumerId(), member.clientId(), toHostName(member.host()), kafkaTopicPartitions);
+  }
 
-    private static String toHostName(String inetAddressStringRepresentation) {
-        String[] parts = inetAddressStringRepresentation.split("/");
-        String ip = parts[parts.length - 1];
-        try {
-            InetAddress addr = InetAddress.getByName(ip);
-            return addr.getHostName();
-        } catch (UnknownHostException e) {
-            return inetAddressStringRepresentation;
-        }
+  private static String toHostName(String inetAddressStringRepresentation) {
+    String[] parts = inetAddressStringRepresentation.split("/");
+    String ip = parts[parts.length - 1];
+    try {
+      InetAddress addr = InetAddress.getByName(ip);
+      return addr.getHostName();
+    } catch (UnknownHostException e) {
+      return inetAddressStringRepresentation;
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaBrokerTopicManagement.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaBrokerTopicManagement.java
index 325d362f46..537821f91f 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaBrokerTopicManagement.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaBrokerTopicManagement.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.Config;
 import org.apache.kafka.clients.admin.ConfigEntry;
@@ -9,6 +15,8 @@
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.config.ConfigResource;
 import org.apache.kafka.common.config.TopicConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
@@ -17,122 +25,143 @@
 import pl.allegro.tech.hermes.management.domain.topic.BrokerTopicManagement;
 import pl.allegro.tech.hermes.management.infrastructure.kafka.BrokersClusterCommunicationException;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-
 public class KafkaBrokerTopicManagement implements BrokerTopicManagement {
 
-    private final TopicProperties topicProperties;
-
-    private final AdminClient kafkaAdminClient;
-
-    private final KafkaNamesMapper kafkaNamesMapper;
-
-    public KafkaBrokerTopicManagement(TopicProperties topicProperties, AdminClient kafkaAdminClient, KafkaNamesMapper kafkaNamesMapper) {
-        this.topicProperties = topicProperties;
-        this.kafkaAdminClient = kafkaAdminClient;
-        this.kafkaNamesMapper = kafkaNamesMapper;
-    }
-
-    @Override
-    public void createTopic(Topic topic) {
-        Map<String, String> config = createTopicConfig(topic.getRetentionTime().getDurationInMillis(), topicProperties);
-
-        kafkaNamesMapper.toKafkaTopics(topic).stream().map(k ->
-                        kafkaAdminClient.createTopics(Collections.singletonList(
-                                new NewTopic(
-                                        k.name().asString(),
-                                        topicProperties.getPartitions(),
-                                        (short) topicProperties.getReplicationFactor()
-                                ).configs(config)
-                        ))
-                ).map(CreateTopicsResult::all)
-                .forEach(this::waitForKafkaFuture);
-    }
-
-    @Override
-    public void removeTopic(Topic topic) {
-        kafkaNamesMapper.toKafkaTopics(topic).stream()
-                .map(k -> kafkaAdminClient.deleteTopics(Collections.singletonList(k.name().asString())))
-                .map(DeleteTopicsResult::all)
-                .forEach(this::waitForKafkaFuture);
-    }
-
-    @Override
-    public void updateTopic(Topic topic) {
-        Map<String, String> config = createTopicConfig(topic.getRetentionTime().getDurationInMillis(), topicProperties);
-        KafkaTopics kafkaTopics = kafkaNamesMapper.toKafkaTopics(topic);
-
-        if (isMigrationToNewKafkaTopic(kafkaTopics)) {
-            KafkaFuture<Void> createTopicsFuture = kafkaAdminClient.createTopics(Collections.singletonList(
-                    new NewTopic(
-                            kafkaTopics.getPrimary().name().asString(),
-                            topicProperties.getPartitions(),
-                            (short) topicProperties.getReplicationFactor()
-                    ).configs(config)
-            )).all();
-            waitForKafkaFuture(createTopicsFuture);
-        } else {
-            doUpdateTopic(kafkaTopics.getPrimary(), config);
-        }
-
-        kafkaTopics.getSecondary().ifPresent(secondary ->
-                doUpdateTopic(secondary, config)
-        );
-    }
-
-    @Override
-    public boolean topicExists(Topic topic) {
-        return kafkaNamesMapper.toKafkaTopics(topic)
-                .allMatch(this::doesTopicExist);
-    }
-
-    private boolean isMigrationToNewKafkaTopic(KafkaTopics kafkaTopics) {
-        return kafkaTopics.getSecondary().isPresent()
-                && !doesTopicExist(kafkaTopics.getPrimary());
-    }
-
-    private boolean doesTopicExist(KafkaTopic topic) {
-        KafkaFuture<Boolean> topicExistsFuture =
-                kafkaAdminClient.listTopics().names().thenApply(names -> names.contains(topic.name().asString()));
-        return waitForKafkaFuture(topicExistsFuture);
-    }
-
-    private void doUpdateTopic(KafkaTopic topic, Map<String, String> configMap) {
-        ConfigResource topicConfigResource = new ConfigResource(
-                ConfigResource.Type.TOPIC,
-                topic.name().asString()
-        );
-
-        Collection<ConfigEntry> configEntries = configMap.entrySet().stream().map(entry ->
-                new ConfigEntry(entry.getKey(), entry.getValue())
-        ).collect(Collectors.toList());
-
-        Map<ConfigResource, Config> configUpdates = new HashMap<>();
-        configUpdates.put(topicConfigResource, new Config(configEntries));
-
-        KafkaFuture<Void> updateTopicFuture = kafkaAdminClient.alterConfigs(configUpdates).all();
-        waitForKafkaFuture(updateTopicFuture);
-    }
-
-    private Map<String, String> createTopicConfig(long retentionPolicy, TopicProperties topicProperties) {
-        Map<String, String> props = new HashMap<>();
-        props.put(TopicConfig.RETENTION_MS_CONFIG, String.valueOf(retentionPolicy));
-        props.put(TopicConfig.UNCLEAN_LEADER_ELECTION_ENABLE_CONFIG, Boolean.toString(topicProperties.isUncleanLeaderElectionEnabled()));
-        props.put(TopicConfig.MAX_MESSAGE_BYTES_CONFIG, String.valueOf(topicProperties.getMaxMessageSize()));
-
-        return props;
+  private final TopicProperties topicProperties;
+
+  private final AdminClient kafkaAdminClient;
+
+  private final KafkaNamesMapper kafkaNamesMapper;
+
+  private final String datacenterName;
+
+  private static final Logger logger = LoggerFactory.getLogger(KafkaBrokerTopicManagement.class);
+
+  public KafkaBrokerTopicManagement(
+      TopicProperties topicProperties,
+      AdminClient kafkaAdminClient,
+      KafkaNamesMapper kafkaNamesMapper,
+      String datacenterName) {
+    this.topicProperties = topicProperties;
+    this.kafkaAdminClient = kafkaAdminClient;
+    this.kafkaNamesMapper = kafkaNamesMapper;
+    this.datacenterName = datacenterName;
+  }
+
+  @Override
+  public void createTopic(Topic topic) {
+    Map<String, String> config =
+        createTopicConfig(topic.getRetentionTime().getDurationInMillis(), topicProperties);
+
+    kafkaNamesMapper.toKafkaTopics(topic).stream()
+        .map(
+            k ->
+                kafkaAdminClient.createTopics(
+                    Collections.singletonList(
+                        new NewTopic(
+                                k.name().asString(),
+                                topicProperties.getPartitions(),
+                                (short) topicProperties.getReplicationFactor())
+                            .configs(config))))
+        .map(CreateTopicsResult::all)
+        .forEach(this::waitForKafkaFuture);
+  }
+
+  @Override
+  public void removeTopic(Topic topic) {
+    kafkaNamesMapper.toKafkaTopics(topic).stream()
+        .map(k -> kafkaAdminClient.deleteTopics(Collections.singletonList(k.name().asString())))
+        .map(DeleteTopicsResult::all)
+        .forEach(
+            future -> {
+              logger.info("Removing topic: {} from Kafka dc: {}", topic, datacenterName);
+              long start = System.currentTimeMillis();
+              waitForKafkaFuture(future);
+              logger.info(
+                  "Removed topic: {} from Kafka dc: {} in {} ms",
+                  topic,
+                  datacenterName,
+                  System.currentTimeMillis() - start);
+            });
+  }
+
+  @Override
+  public void updateTopic(Topic topic) {
+    Map<String, String> config =
+        createTopicConfig(topic.getRetentionTime().getDurationInMillis(), topicProperties);
+    KafkaTopics kafkaTopics = kafkaNamesMapper.toKafkaTopics(topic);
+
+    if (isMigrationToNewKafkaTopic(kafkaTopics)) {
+      KafkaFuture<Void> createTopicsFuture =
+          kafkaAdminClient
+              .createTopics(
+                  Collections.singletonList(
+                      new NewTopic(
+                              kafkaTopics.getPrimary().name().asString(),
+                              topicProperties.getPartitions(),
+                              (short) topicProperties.getReplicationFactor())
+                          .configs(config)))
+              .all();
+      waitForKafkaFuture(createTopicsFuture);
+    } else {
+      doUpdateTopic(kafkaTopics.getPrimary(), config);
     }
 
-    private <T> T waitForKafkaFuture(KafkaFuture<T> future) {
-        try {
-            return future.get();
-        } catch (InterruptedException | ExecutionException e) {
-            throw new BrokersClusterCommunicationException(e);
-        }
+    kafkaTopics.getSecondary().ifPresent(secondary -> doUpdateTopic(secondary, config));
+  }
+
+  @Override
+  public boolean topicExists(Topic topic) {
+    return kafkaNamesMapper.toKafkaTopics(topic).allMatch(this::doesTopicExist);
+  }
+
+  private boolean isMigrationToNewKafkaTopic(KafkaTopics kafkaTopics) {
+    return kafkaTopics.getSecondary().isPresent() && !doesTopicExist(kafkaTopics.getPrimary());
+  }
+
+  private boolean doesTopicExist(KafkaTopic topic) {
+    KafkaFuture<Boolean> topicExistsFuture =
+        kafkaAdminClient
+            .listTopics()
+            .names()
+            .thenApply(names -> names.contains(topic.name().asString()));
+    return waitForKafkaFuture(topicExistsFuture);
+  }
+
+  private void doUpdateTopic(KafkaTopic topic, Map<String, String> configMap) {
+    ConfigResource topicConfigResource =
+        new ConfigResource(ConfigResource.Type.TOPIC, topic.name().asString());
+
+    Collection<ConfigEntry> configEntries =
+        configMap.entrySet().stream()
+            .map(entry -> new ConfigEntry(entry.getKey(), entry.getValue()))
+            .collect(Collectors.toList());
+
+    Map<ConfigResource, Config> configUpdates = new HashMap<>();
+    configUpdates.put(topicConfigResource, new Config(configEntries));
+
+    KafkaFuture<Void> updateTopicFuture = kafkaAdminClient.alterConfigs(configUpdates).all();
+    waitForKafkaFuture(updateTopicFuture);
+  }
+
+  private Map<String, String> createTopicConfig(
+      long retentionPolicy, TopicProperties topicProperties) {
+    Map<String, String> props = new HashMap<>();
+    props.put(TopicConfig.RETENTION_MS_CONFIG, String.valueOf(retentionPolicy));
+    props.put(
+        TopicConfig.UNCLEAN_LEADER_ELECTION_ENABLE_CONFIG,
+        Boolean.toString(topicProperties.isUncleanLeaderElectionEnabled()));
+    props.put(
+        TopicConfig.MAX_MESSAGE_BYTES_CONFIG, String.valueOf(topicProperties.getMaxMessageSize()));
+
+    return props;
+  }
+
+  private <T> T waitForKafkaFuture(KafkaFuture<T> future) {
+    try {
+      return future.get();
+    } catch (InterruptedException | ExecutionException e) {
+      throw new BrokersClusterCommunicationException(e);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerGroupManager.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerGroupManager.java
index f806b8d7ef..8957d84e08 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerGroupManager.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerGroupManager.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+
+import java.util.Map;
+import java.util.Set;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -13,59 +18,66 @@
 import pl.allegro.tech.hermes.management.config.kafka.KafkaProperties;
 import pl.allegro.tech.hermes.management.domain.subscription.ConsumerGroupManager;
 
-import java.util.Map;
-import java.util.Set;
-
-import static java.util.stream.Collectors.toMap;
-import static java.util.stream.Collectors.toSet;
-
 public class KafkaConsumerGroupManager implements ConsumerGroupManager {
 
-    private final Logger logger = LoggerFactory.getLogger(KafkaConsumerGroupManager.class);
+  private final Logger logger = LoggerFactory.getLogger(KafkaConsumerGroupManager.class);
 
-    private final KafkaNamesMapper kafkaNamesMapper;
-    private final String clusterName;
-    private final KafkaConsumerManager consumerManager;
+  private final KafkaNamesMapper kafkaNamesMapper;
+  private final String clusterName;
+  private final KafkaConsumerManager consumerManager;
 
-    public KafkaConsumerGroupManager(KafkaNamesMapper kafkaNamesMapper,
-                                     String clusterName,
-                                     String bootstrapKafkaServer,
-                                     KafkaProperties kafkaProperties) {
-        this.kafkaNamesMapper = kafkaNamesMapper;
-        this.clusterName = clusterName;
-        this.consumerManager = new KafkaConsumerManager(kafkaProperties, kafkaNamesMapper, bootstrapKafkaServer);
-    }
+  public KafkaConsumerGroupManager(
+      KafkaNamesMapper kafkaNamesMapper,
+      String clusterName,
+      String brokerList,
+      KafkaProperties kafkaProperties) {
+    this.kafkaNamesMapper = kafkaNamesMapper;
+    this.clusterName = clusterName;
+    this.consumerManager = new KafkaConsumerManager(kafkaProperties, kafkaNamesMapper, brokerList);
+  }
 
-    @Override
-    public void createConsumerGroup(Topic topic, Subscription subscription) {
-        logger.info("Creating consumer group for subscription {}, cluster: {}", subscription.getQualifiedName(), clusterName);
+  @Override
+  public void createConsumerGroup(Topic topic, Subscription subscription) {
+    logger.info(
+        "Creating consumer group for subscription {}, cluster: {}",
+        subscription.getQualifiedName(),
+        clusterName);
 
-        KafkaConsumer<byte[], byte[]> kafkaConsumer = consumerManager.createConsumer(subscription.getQualifiedName());
-        try {
-            String kafkaTopicName = kafkaNamesMapper.toKafkaTopics(topic).getPrimary().name().asString();
-            Set<TopicPartition> topicPartitions = kafkaConsumer.partitionsFor(kafkaTopicName).stream()
-                    .map(info -> new TopicPartition(info.topic(), info.partition()))
-                    .collect(toSet());
+    KafkaConsumer<byte[], byte[]> kafkaConsumer =
+        consumerManager.createConsumer(subscription.getQualifiedName());
+    try {
+      String kafkaTopicName = kafkaNamesMapper.toKafkaTopics(topic).getPrimary().name().asString();
+      Set<TopicPartition> topicPartitions =
+          kafkaConsumer.partitionsFor(kafkaTopicName).stream()
+              .map(info -> new TopicPartition(info.topic(), info.partition()))
+              .collect(toSet());
 
-            logger.info("Received partitions: {}, cluster: {}", topicPartitions, clusterName);
+      logger.info("Received partitions: {}, cluster: {}", topicPartitions, clusterName);
 
-            kafkaConsumer.assign(topicPartitions);
+      kafkaConsumer.assign(topicPartitions);
 
-            Map<TopicPartition, OffsetAndMetadata> topicPartitionByOffset = topicPartitions.stream()
-                    .map(topicPartition -> {
-                        long offset = kafkaConsumer.position(topicPartition);
-                        return ImmutablePair.of(topicPartition, new OffsetAndMetadata(offset));
-                    })
-                    .collect(toMap(Pair::getKey, Pair::getValue));
+      Map<TopicPartition, OffsetAndMetadata> topicPartitionByOffset =
+          topicPartitions.stream()
+              .map(
+                  topicPartition -> {
+                    long offset = kafkaConsumer.position(topicPartition);
+                    return ImmutablePair.of(topicPartition, new OffsetAndMetadata(offset));
+                  })
+              .collect(toMap(Pair::getKey, Pair::getValue));
 
-            kafkaConsumer.commitSync(topicPartitionByOffset);
-            kafkaConsumer.close();
+      kafkaConsumer.commitSync(topicPartitionByOffset);
+      kafkaConsumer.close();
 
-            logger.info("Successfully created consumer group for subscription {}, cluster: {}",
-                    subscription.getQualifiedName(), clusterName);
-        } catch (Exception e) {
-            logger.error("Failed to create consumer group for subscription {}, cluster: {}",
-                    subscription.getQualifiedName(), clusterName, e);
-        }
+      logger.info(
+          "Successfully created consumer group for subscription {}, cluster: {}",
+          subscription.getQualifiedName(),
+          clusterName);
+    } catch (Exception e) {
+      logger.error(
+          "Failed to create consumer group for subscription {}, cluster: {}",
+          subscription.getQualifiedName(),
+          clusterName,
+          e);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerManager.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerManager.java
index a7374a7663..061fecf4b0 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerManager.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerManager.java
@@ -1,13 +1,5 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.common.kafka.ConsumerGroupId;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-import pl.allegro.tech.hermes.management.config.kafka.KafkaProperties;
-
-import java.util.Properties;
-
 import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
 import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG;
 import static org.apache.kafka.clients.consumer.ConsumerConfig.DEFAULT_API_TIMEOUT_MS_CONFIG;
@@ -19,37 +11,49 @@
 import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
 import static org.apache.kafka.common.config.SaslConfigs.SASL_MECHANISM;
 
-public class KafkaConsumerManager {
-
-    private final KafkaNamesMapper kafkaNamesMapper;
-    private final String bootstrapKafkaServer;
-    private final KafkaProperties kafkaProperties;
-
-    public KafkaConsumerManager(KafkaProperties kafkaProperties, KafkaNamesMapper kafkaNamesMapper, String bootstrapKafkaServer) {
-        this.kafkaNamesMapper = kafkaNamesMapper;
-        this.bootstrapKafkaServer = bootstrapKafkaServer;
-        this.kafkaProperties = kafkaProperties;
-    }
+import java.util.Properties;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.common.kafka.ConsumerGroupId;
+import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
+import pl.allegro.tech.hermes.management.config.kafka.KafkaProperties;
 
-    public KafkaConsumer<byte[], byte[]> createConsumer(SubscriptionName subscription) {
-        ConsumerGroupId groupId = kafkaNamesMapper.toConsumerGroupId(subscription);
-        return new KafkaConsumer<>(properties(groupId));
-    }
+public class KafkaConsumerManager {
 
-    private Properties properties(ConsumerGroupId groupId) {
-        Properties props = new Properties();
-        props.put(BOOTSTRAP_SERVERS_CONFIG, bootstrapKafkaServer);
-        props.put(GROUP_ID_CONFIG, groupId.asString());
-        props.put(ENABLE_AUTO_COMMIT_CONFIG, false);
-        props.put(REQUEST_TIMEOUT_MS_CONFIG, 5000);
-        props.put(DEFAULT_API_TIMEOUT_MS_CONFIG, 5000);
-        props.put(KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArrayDeserializer");
-        props.put(VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArrayDeserializer");
-        if (kafkaProperties.getSasl().isEnabled()) {
-            props.put(SASL_MECHANISM, kafkaProperties.getSasl().getMechanism());
-            props.put(SECURITY_PROTOCOL_CONFIG, kafkaProperties.getSasl().getProtocol());
-            props.put(SASL_JAAS_CONFIG, kafkaProperties.getSasl().getJaasConfig());
-        }
-        return props;
+  private final KafkaNamesMapper kafkaNamesMapper;
+  private final String brokerList;
+  private final KafkaProperties kafkaProperties;
+
+  public KafkaConsumerManager(
+      KafkaProperties kafkaProperties, KafkaNamesMapper kafkaNamesMapper, String brokerList) {
+    this.kafkaNamesMapper = kafkaNamesMapper;
+    this.brokerList = brokerList;
+    this.kafkaProperties = kafkaProperties;
+  }
+
+  public KafkaConsumer<byte[], byte[]> createConsumer(SubscriptionName subscription) {
+    ConsumerGroupId groupId = kafkaNamesMapper.toConsumerGroupId(subscription);
+    return new KafkaConsumer<>(properties(groupId));
+  }
+
+  private Properties properties(ConsumerGroupId groupId) {
+    Properties props = new Properties();
+    props.put(BOOTSTRAP_SERVERS_CONFIG, brokerList);
+    props.put(GROUP_ID_CONFIG, groupId.asString());
+    props.put(ENABLE_AUTO_COMMIT_CONFIG, false);
+    props.put(REQUEST_TIMEOUT_MS_CONFIG, 5000);
+    props.put(DEFAULT_API_TIMEOUT_MS_CONFIG, 5000);
+    props.put(
+        KEY_DESERIALIZER_CLASS_CONFIG,
+        "org.apache.kafka.common.serialization.ByteArrayDeserializer");
+    props.put(
+        VALUE_DESERIALIZER_CLASS_CONFIG,
+        "org.apache.kafka.common.serialization.ByteArrayDeserializer");
+    if (kafkaProperties.getAuthentication().isEnabled()) {
+      props.put(SASL_MECHANISM, kafkaProperties.getAuthentication().getMechanism());
+      props.put(SECURITY_PROTOCOL_CONFIG, kafkaProperties.getAuthentication().getProtocol());
+      props.put(SASL_JAAS_CONFIG, kafkaProperties.getAuthentication().getJaasConfig());
     }
+    return props;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaRawMessageReader.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaRawMessageReader.java
index 199b540693..936a5ddf3c 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaRawMessageReader.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaRawMessageReader.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
+import static java.lang.String.format;
+
+import java.time.Duration;
+import java.util.Collections;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -10,59 +14,59 @@
 import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
 import pl.allegro.tech.hermes.management.domain.topic.SingleMessageReaderException;
 
-import java.time.Duration;
-import java.util.Collections;
-
-import static java.lang.String.format;
-
 public class KafkaRawMessageReader {
 
-    private static final Logger logger = LoggerFactory.getLogger(KafkaRawMessageReader.class);
+  private static final Logger logger = LoggerFactory.getLogger(KafkaRawMessageReader.class);
 
-    private final KafkaConsumerPool consumerPool;
-    private final int pollTimeoutMillis;
+  private final KafkaConsumerPool consumerPool;
+  private final int pollTimeoutMillis;
 
-    public KafkaRawMessageReader(KafkaConsumerPool consumerPool,
-                                 int pollTimeoutMillis) {
-        this.consumerPool = consumerPool;
-        this.pollTimeoutMillis = pollTimeoutMillis;
-    }
+  public KafkaRawMessageReader(KafkaConsumerPool consumerPool, int pollTimeoutMillis) {
+    this.consumerPool = consumerPool;
+    this.pollTimeoutMillis = pollTimeoutMillis;
+  }
 
-    private static SingleMessageReaderException messageNotFoundException(KafkaTopic topic, int partition, long offset) {
-        String cause = buildErrorMessage(topic, partition, offset, "Cannot find message");
-        logger.error(cause);
-        return new SingleMessageReaderException(cause);
-    }
+  private static SingleMessageReaderException messageNotFoundException(
+      KafkaTopic topic, int partition, long offset) {
+    String cause = buildErrorMessage(topic, partition, offset, "Cannot find message");
+    logger.error(cause);
+    return new SingleMessageReaderException(cause);
+  }
 
-    private static SingleMessageReaderException pollingException(KafkaTopic topic, int partition, long offset, Throwable throwable) {
-        String cause = buildErrorMessage(topic, partition, offset, "Error during polling kafka message");
-        logger.error(cause, throwable);
-        return new SingleMessageReaderException(cause, throwable);
-    }
+  private static SingleMessageReaderException pollingException(
+      KafkaTopic topic, int partition, long offset, Throwable throwable) {
+    String cause =
+        buildErrorMessage(topic, partition, offset, "Error during polling kafka message");
+    logger.error(cause, throwable);
+    return new SingleMessageReaderException(cause, throwable);
+  }
 
-    private static String buildErrorMessage(KafkaTopic topic, int partition, long offset, String message) {
-        return format("%s [offset %d, kafka_topic %s, partition %d]", message, offset,
-                topic.name().asString(), partition);
-    }
+  private static String buildErrorMessage(
+      KafkaTopic topic, int partition, long offset, String message) {
+    return format(
+        "%s [offset %d, kafka_topic %s, partition %d]",
+        message, offset, topic.name().asString(), partition);
+  }
 
-    byte[] readMessage(KafkaTopic topic, int partition, long offset) {
-        KafkaConsumer<byte[], byte[]> kafkaConsumer = consumerPool.get(topic, partition);
-        TopicPartition topicPartition = new TopicPartition(topic.name().asString(), partition);
+  byte[] readMessage(KafkaTopic topic, int partition, long offset) {
+    KafkaConsumer<byte[], byte[]> kafkaConsumer = consumerPool.get(topic, partition);
+    TopicPartition topicPartition = new TopicPartition(topic.name().asString(), partition);
 
-        try {
-            kafkaConsumer.assign(Collections.singleton(topicPartition));
-            kafkaConsumer.poll(Duration.ZERO);
-            kafkaConsumer.seek(topicPartition, offset);
-            ConsumerRecords<byte[], byte[]> records = kafkaConsumer.poll(Duration.ofMillis(pollTimeoutMillis));
-            for (ConsumerRecord<byte[], byte[]> record : records.records(topicPartition)) {
-                if (record.offset() == offset) {
-                    return record.value();
-                }
-                logger.info("Found an old offset: {} Expecting: {}", record.offset(), offset);
-            }
-            throw messageNotFoundException(topic, partition, offset);
-        } catch (Exception e) {
-            throw pollingException(topic, partition, offset, e);
+    try {
+      kafkaConsumer.assign(Collections.singleton(topicPartition));
+      kafkaConsumer.poll(Duration.ZERO);
+      kafkaConsumer.seek(topicPartition, offset);
+      ConsumerRecords<byte[], byte[]> records =
+          kafkaConsumer.poll(Duration.ofMillis(pollTimeoutMillis));
+      for (ConsumerRecord<byte[], byte[]> record : records.records(topicPartition)) {
+        if (record.offset() == offset) {
+          return record.value();
         }
+        logger.info("Found an old offset: {} Expecting: {}", record.offset(), offset);
+      }
+      throw messageNotFoundException(topic, partition, offset);
+    } catch (Exception e) {
+      throw pollingException(topic, partition, offset, e);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaSingleMessageReader.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaSingleMessageReader.java
index 34abac0c5b..508c3b16c9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaSingleMessageReader.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaSingleMessageReader.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
+import java.nio.charset.Charset;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
@@ -9,37 +10,37 @@
 import pl.allegro.tech.hermes.schema.SchemaRepository;
 import tech.allegro.schema.json2avro.converter.JsonAvroConverter;
 
-import java.nio.charset.Charset;
-
 public class KafkaSingleMessageReader implements SingleMessageReader {
-    private final KafkaRawMessageReader kafkaRawMessageReader;
-    private final SchemaRepository schemaRepository;
-    private final JsonAvroConverter converter;
-
-    public KafkaSingleMessageReader(KafkaRawMessageReader kafkaRawMessageReader,
-                                    SchemaRepository schemaRepository,
-                                    JsonAvroConverter converter) {
-        this.kafkaRawMessageReader = kafkaRawMessageReader;
-        this.schemaRepository = schemaRepository;
-        this.converter = converter;
+  private final KafkaRawMessageReader kafkaRawMessageReader;
+  private final SchemaRepository schemaRepository;
+  private final JsonAvroConverter converter;
+
+  public KafkaSingleMessageReader(
+      KafkaRawMessageReader kafkaRawMessageReader,
+      SchemaRepository schemaRepository,
+      JsonAvroConverter converter) {
+    this.kafkaRawMessageReader = kafkaRawMessageReader;
+    this.schemaRepository = schemaRepository;
+    this.converter = converter;
+  }
+
+  @Override
+  public String readMessageAsJson(Topic topic, KafkaTopic kafkaTopic, int partition, long offset) {
+    byte[] bytes = kafkaRawMessageReader.readMessage(kafkaTopic, partition, offset);
+    if (topic.getContentType() == ContentType.AVRO) {
+      bytes = convertAvroToJson(topic, bytes);
     }
-
-    @Override
-    public String readMessageAsJson(Topic topic, KafkaTopic kafkaTopic, int partition, long offset) {
-        byte[] bytes = kafkaRawMessageReader.readMessage(kafkaTopic, partition, offset);
-        if (topic.getContentType() == ContentType.AVRO) {
-            bytes = convertAvroToJson(topic, bytes);
-        }
-        return new String(bytes, Charset.forName("UTF-8"));
-    }
-
-    private byte[] convertAvroToJson(Topic topic, byte[] bytes) {
-        if (topic.isSchemaIdAwareSerializationEnabled()) {
-            SchemaAwarePayload payload = SchemaAwareSerDe.deserialize(bytes);
-            return converter.convertToJson(payload.getPayload(), schemaRepository.getAvroSchema(topic, payload.getSchemaId()).getSchema());
-        }
-
-        return converter.convertToJson(bytes, schemaRepository.getLatestAvroSchema(topic).getSchema());
+    return new String(bytes, Charset.forName("UTF-8"));
+  }
+
+  private byte[] convertAvroToJson(Topic topic, byte[] bytes) {
+    if (topic.isSchemaIdAwareSerializationEnabled()) {
+      SchemaAwarePayload payload = SchemaAwareSerDe.deserialize(bytes);
+      return converter.convertToJson(
+          payload.getPayload(),
+          schemaRepository.getAvroSchema(topic, payload.getSchemaId()).getSchema());
     }
 
+    return converter.convertToJson(bytes, schemaRepository.getLatestAvroSchema(topic).getSchema());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/LogEndOffsetChecker.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/LogEndOffsetChecker.java
index 5eefcdd181..dd91f3aea5 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/LogEndOffsetChecker.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/LogEndOffsetChecker.java
@@ -1,22 +1,21 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
+import java.util.Collections;
 import org.apache.kafka.common.TopicPartition;
 import pl.allegro.tech.hermes.common.kafka.KafkaConsumerPool;
 
-import java.util.Collections;
-
 public class LogEndOffsetChecker {
 
-    private final KafkaConsumerPool kafkaConsumerPool;
+  private final KafkaConsumerPool kafkaConsumerPool;
 
-    public LogEndOffsetChecker(KafkaConsumerPool kafkaConsumerPool) {
-        this.kafkaConsumerPool = kafkaConsumerPool;
-    }
+  public LogEndOffsetChecker(KafkaConsumerPool kafkaConsumerPool) {
+    this.kafkaConsumerPool = kafkaConsumerPool;
+  }
 
-    public long check(TopicPartition topicPartition) {
-        return kafkaConsumerPool
-                .get(topicPartition.topic(), topicPartition.partition())
-                .endOffsets(Collections.singletonList(topicPartition))
-                .get(topicPartition);
-    }
+  public long check(TopicPartition topicPartition) {
+    return kafkaConsumerPool
+        .get(topicPartition.topic(), topicPartition.partition())
+        .endOffsets(Collections.singletonList(topicPartition))
+        .get(topicPartition);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/NoOpConsumerGroupManager.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/NoOpConsumerGroupManager.java
index f89f37e91f..9de89e9c81 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/NoOpConsumerGroupManager.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/NoOpConsumerGroupManager.java
@@ -5,8 +5,8 @@
 import pl.allegro.tech.hermes.management.domain.subscription.ConsumerGroupManager;
 
 public class NoOpConsumerGroupManager implements ConsumerGroupManager {
-    @Override
-    public void createConsumerGroup(Topic topic, Subscription subscription) {
-        // no operation
-    }
+  @Override
+  public void createConsumerGroup(Topic topic, Subscription subscription) {
+    // no operation
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/OffsetsAvailableChecker.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/OffsetsAvailableChecker.java
index 9e21f200f3..4c40f16483 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/OffsetsAvailableChecker.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/OffsetsAvailableChecker.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service;
 
+import java.util.Collections;
 import org.apache.kafka.common.TopicPartition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,31 +10,35 @@
 import pl.allegro.tech.hermes.common.kafka.KafkaConsumerPool;
 import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
 
-import java.util.Collections;
-
 public class OffsetsAvailableChecker {
 
-    private static final Logger logger = LoggerFactory.getLogger(OffsetsAvailableChecker.class);
+  private static final Logger logger = LoggerFactory.getLogger(OffsetsAvailableChecker.class);
 
-    private final KafkaConsumerPool consumerPool;
-    private final BrokerStorage storage;
+  private final KafkaConsumerPool consumerPool;
+  private final BrokerStorage storage;
 
-    public OffsetsAvailableChecker(KafkaConsumerPool consumerPool, BrokerStorage storage) {
-        this.consumerPool = consumerPool;
-        this.storage = storage;
-    }
+  public OffsetsAvailableChecker(KafkaConsumerPool consumerPool, BrokerStorage storage) {
+    this.consumerPool = consumerPool;
+    this.storage = storage;
+  }
 
-    boolean areOffsetsAvailable(KafkaTopic topic) {
-        try {
-            return storage.readPartitionsIds(topic.name().asString()).stream().allMatch(partition -> {
-                TopicPartition topicPartition = new TopicPartition(topic.name().asString(), partition);
-                consumerPool.get(topic, partition).beginningOffsets(Collections.singleton(topicPartition));
+  boolean areOffsetsAvailable(KafkaTopic topic) {
+    try {
+      return storage.readPartitionsIds(topic.name().asString()).stream()
+          .allMatch(
+              partition -> {
+                TopicPartition topicPartition =
+                    new TopicPartition(topic.name().asString(), partition);
+                consumerPool
+                    .get(topic, partition)
+                    .beginningOffsets(Collections.singleton(topicPartition));
                 return true;
-            });
-        } catch (PartitionsNotFoundForGivenTopicException | BrokerNotFoundForPartitionException
-                 | org.apache.kafka.common.errors.TimeoutException e) {
-            logger.debug("Offsets reported as not available due to failure", e);
-            return false;
-        }
+              });
+    } catch (PartitionsNotFoundForGivenTopicException
+        | BrokerNotFoundForPartitionException
+        | org.apache.kafka.common.errors.TimeoutException e) {
+      logger.debug("Offsets reported as not available due to failure", e);
+      return false;
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/retransmit/KafkaRetransmissionService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/retransmit/KafkaRetransmissionService.java
index 6b640d4753..d805d639c7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/retransmit/KafkaRetransmissionService.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/retransmit/KafkaRetransmissionService.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service.retransmit;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.consumer.OffsetAndTimestamp;
 import org.apache.kafka.common.TopicPartition;
@@ -12,80 +17,94 @@
 import pl.allegro.tech.hermes.common.kafka.offset.SubscriptionOffsetChangeIndicator;
 import pl.allegro.tech.hermes.management.domain.message.RetransmissionService;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 public class KafkaRetransmissionService implements RetransmissionService {
 
-    private final BrokerStorage brokerStorage;
-    private final SubscriptionOffsetChangeIndicator subscriptionOffsetChange;
-    private final KafkaConsumerPool consumerPool;
-    private final KafkaNamesMapper kafkaNamesMapper;
+  private final BrokerStorage brokerStorage;
+  private final SubscriptionOffsetChangeIndicator subscriptionOffsetChange;
+  private final KafkaConsumerPool consumerPool;
+  private final KafkaNamesMapper kafkaNamesMapper;
 
-    public KafkaRetransmissionService(
-            BrokerStorage brokerStorage,
-            SubscriptionOffsetChangeIndicator subscriptionOffsetChange,
-            KafkaConsumerPool consumerPool,
-            KafkaNamesMapper kafkaNamesMapper) {
+  public KafkaRetransmissionService(
+      BrokerStorage brokerStorage,
+      SubscriptionOffsetChangeIndicator subscriptionOffsetChange,
+      KafkaConsumerPool consumerPool,
+      KafkaNamesMapper kafkaNamesMapper) {
 
-        this.brokerStorage = brokerStorage;
-        this.subscriptionOffsetChange = subscriptionOffsetChange;
-        this.consumerPool = consumerPool;
-        this.kafkaNamesMapper = kafkaNamesMapper;
-    }
+    this.brokerStorage = brokerStorage;
+    this.subscriptionOffsetChange = subscriptionOffsetChange;
+    this.consumerPool = consumerPool;
+    this.kafkaNamesMapper = kafkaNamesMapper;
+  }
 
-    @Override
-    public List<PartitionOffset> indicateOffsetChange(Topic topic, String subscription, String brokersClusterName,
-                                                      long timestamp, boolean dryRun) {
+  @Override
+  public List<PartitionOffset> indicateOffsetChange(
+      Topic topic, String subscription, String brokersClusterName, long timestamp, boolean dryRun) {
 
-        List<PartitionOffset> partitionOffsetList = new ArrayList<>();
-        kafkaNamesMapper.toKafkaTopics(topic).forEach(k -> {
-            List<Integer> partitionsIds = brokerStorage.readPartitionsIds(k.name().asString());
+    List<PartitionOffset> partitionOffsetList = new ArrayList<>();
+    kafkaNamesMapper
+        .toKafkaTopics(topic)
+        .forEach(
+            k -> {
+              List<Integer> partitionsIds = brokerStorage.readPartitionsIds(k.name().asString());
 
-            for (Integer partitionId : partitionsIds) {
+              for (Integer partitionId : partitionsIds) {
                 KafkaConsumer<byte[], byte[]> consumer = createKafkaConsumer(k, partitionId);
-                long offset = findClosestOffsetJustBeforeTimestamp(consumer, k, partitionId, timestamp);
-                PartitionOffset partitionOffset = new PartitionOffset(k.name(), offset, partitionId);
+                long offset =
+                    findClosestOffsetJustBeforeTimestamp(consumer, k, partitionId, timestamp);
+                PartitionOffset partitionOffset =
+                    new PartitionOffset(k.name(), offset, partitionId);
                 partitionOffsetList.add(partitionOffset);
                 if (!dryRun) {
-                    subscriptionOffsetChange.setSubscriptionOffset(topic.getName(), subscription, brokersClusterName, partitionOffset);
+                  subscriptionOffsetChange.setSubscriptionOffset(
+                      topic.getName(), subscription, brokersClusterName, partitionOffset);
                 }
-            }
-        });
+              }
+            });
 
-        return partitionOffsetList;
-    }
+    return partitionOffsetList;
+  }
 
-    @Override
-    public boolean areOffsetsMoved(Topic topic, String subscriptionName, String brokersClusterName) {
-        return kafkaNamesMapper.toKafkaTopics(topic).allMatch(kafkaTopic -> {
-            List<Integer> partitionIds = brokerStorage.readPartitionsIds(kafkaTopic.name().asString());
-            return subscriptionOffsetChange.areOffsetsMoved(
-                    topic.getName(), subscriptionName, brokersClusterName, kafkaTopic, partitionIds);
-        });
-    }
+  @Override
+  public boolean areOffsetsMoved(Topic topic, String subscriptionName, String brokersClusterName) {
+    return kafkaNamesMapper
+        .toKafkaTopics(topic)
+        .allMatch(
+            kafkaTopic -> {
+              List<Integer> partitionIds =
+                  brokerStorage.readPartitionsIds(kafkaTopic.name().asString());
+              return subscriptionOffsetChange.areOffsetsMoved(
+                  topic.getName(), subscriptionName, brokersClusterName, kafkaTopic, partitionIds);
+            });
+  }
 
-    private KafkaConsumer<byte[], byte[]> createKafkaConsumer(KafkaTopic kafkaTopic, int partition) {
-        return consumerPool.get(kafkaTopic, partition);
-    }
+  private KafkaConsumer<byte[], byte[]> createKafkaConsumer(KafkaTopic kafkaTopic, int partition) {
+    return consumerPool.get(kafkaTopic, partition);
+  }
 
-    private long findClosestOffsetJustBeforeTimestamp(KafkaConsumer<byte[], byte[]> consumer,
-                                                      KafkaTopic kafkaTopic,
-                                                      int partition,
-                                                      long timestamp) {
-        long endOffset = getEndingOffset(consumer, kafkaTopic, partition);
-        TopicPartition topicPartition = new TopicPartition(kafkaTopic.name().asString(), partition);
-        return Optional.ofNullable(consumer.offsetsForTimes(Collections.singletonMap(topicPartition, timestamp)).get(topicPartition))
-                .orElse(new OffsetAndTimestamp(endOffset, timestamp)).offset();
-    }
+  private long findClosestOffsetJustBeforeTimestamp(
+      KafkaConsumer<byte[], byte[]> consumer,
+      KafkaTopic kafkaTopic,
+      int partition,
+      long timestamp) {
+    long endOffset = getEndingOffset(consumer, kafkaTopic, partition);
+    TopicPartition topicPartition = new TopicPartition(kafkaTopic.name().asString(), partition);
+    return Optional.ofNullable(
+            consumer
+                .offsetsForTimes(Collections.singletonMap(topicPartition, timestamp))
+                .get(topicPartition))
+        .orElse(new OffsetAndTimestamp(endOffset, timestamp))
+        .offset();
+  }
 
-    private long getEndingOffset(KafkaConsumer<byte[], byte[]> kafkaConsumer, KafkaTopic topicName, int partition) {
-        TopicPartition topicPartition = new TopicPartition(topicName.name().asString(), partition);
-        Map<TopicPartition, Long> offsets = kafkaConsumer.endOffsets(Collections.singleton(topicPartition));
-        return Optional.ofNullable(offsets.get(topicPartition))
-                .orElseThrow(() -> new OffsetNotFoundException(String.format("Ending offset for partition %s not found", topicPartition)));
-    }
+  private long getEndingOffset(
+      KafkaConsumer<byte[], byte[]> kafkaConsumer, KafkaTopic topicName, int partition) {
+    TopicPartition topicPartition = new TopicPartition(topicName.name().asString(), partition);
+    Map<TopicPartition, Long> offsets =
+        kafkaConsumer.endOffsets(Collections.singleton(topicPartition));
+    return Optional.ofNullable(offsets.get(topicPartition))
+        .orElseThrow(
+            () ->
+                new OffsetNotFoundException(
+                    String.format("Ending offset for partition %s not found", topicPartition)));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/retransmit/OffsetNotFoundException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/retransmit/OffsetNotFoundException.java
index 6c43c00ee1..6220c31f3b 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/retransmit/OffsetNotFoundException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/kafka/service/retransmit/OffsetNotFoundException.java
@@ -1,18 +1,18 @@
 package pl.allegro.tech.hermes.management.infrastructure.kafka.service.retransmit;
 
+import static pl.allegro.tech.hermes.api.ErrorCode.OFFSET_NOT_FOUND_EXCEPTION;
+
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.management.domain.ManagementException;
 
-import static pl.allegro.tech.hermes.api.ErrorCode.OFFSET_NOT_FOUND_EXCEPTION;
-
 class OffsetNotFoundException extends ManagementException {
 
-    OffsetNotFoundException(String message) {
-        super(message);
-    }
+  OffsetNotFoundException(String message) {
+    super(message);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return OFFSET_NOT_FOUND_EXCEPTION;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return OFFSET_NOT_FOUND_EXCEPTION;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridSubscriptionMetricsRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridSubscriptionMetricsRepository.java
index ac14b42657..e343a54c55 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridSubscriptionMetricsRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridSubscriptionMetricsRepository.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.management.infrastructure.metrics;
 
+import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
+
+import java.util.function.Supplier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -12,79 +15,92 @@
 import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionMetricsRepository;
 import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringSubscriptionMetricsProvider.MonitoringSubscriptionMetrics;
 
-import java.util.function.Supplier;
-
-import static org.apache.commons.lang.exception.ExceptionUtils.getRootCauseMessage;
-
 @Component
 public class HybridSubscriptionMetricsRepository implements SubscriptionMetricsRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(HybridSubscriptionMetricsRepository.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(HybridSubscriptionMetricsRepository.class);
 
-    private final MonitoringSubscriptionMetricsProvider monitoringSubscriptionMetricsProvider;
-    private final SummedSharedCounter summedSharedCounter;
-    private final ZookeeperPaths zookeeperPaths;
-    private final SubscriptionLagSource lagSource;
+  private final MonitoringSubscriptionMetricsProvider monitoringSubscriptionMetricsProvider;
+  private final SummedSharedCounter summedSharedCounter;
+  private final ZookeeperPaths zookeeperPaths;
+  private final SubscriptionLagSource lagSource;
 
-    public HybridSubscriptionMetricsRepository(MonitoringSubscriptionMetricsProvider monitoringSubscriptionMetricsProvider,
-                                               SummedSharedCounter summedSharedCounter,
-                                               ZookeeperPaths zookeeperPaths, SubscriptionLagSource lagSource) {
-        this.monitoringSubscriptionMetricsProvider = monitoringSubscriptionMetricsProvider;
-        this.summedSharedCounter = summedSharedCounter;
-        this.zookeeperPaths = zookeeperPaths;
-        this.lagSource = lagSource;
-    }
+  public HybridSubscriptionMetricsRepository(
+      MonitoringSubscriptionMetricsProvider monitoringSubscriptionMetricsProvider,
+      SummedSharedCounter summedSharedCounter,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionLagSource lagSource) {
+    this.monitoringSubscriptionMetricsProvider = monitoringSubscriptionMetricsProvider;
+    this.summedSharedCounter = summedSharedCounter;
+    this.zookeeperPaths = zookeeperPaths;
+    this.lagSource = lagSource;
+  }
 
-    @Override
-    public SubscriptionMetrics loadMetrics(TopicName topicName, String subscriptionName) {
-        SubscriptionName name = new SubscriptionName(subscriptionName, topicName);
+  @Override
+  public SubscriptionMetrics loadMetrics(TopicName topicName, String subscriptionName) {
+    SubscriptionName name = new SubscriptionName(subscriptionName, topicName);
 
-        MonitoringSubscriptionMetrics monitoringMetrics = monitoringSubscriptionMetricsProvider.subscriptionMetrics(name);
-        ZookeeperMetrics zookeeperMetrics = readZookeeperMetrics(name);
+    MonitoringSubscriptionMetrics monitoringMetrics =
+        monitoringSubscriptionMetricsProvider.subscriptionMetrics(name);
+    ZookeeperMetrics zookeeperMetrics = readZookeeperMetrics(name);
 
-        return SubscriptionMetrics.Builder.subscriptionMetrics()
-                .withRate(monitoringMetrics.rate())
-                .withCodes2xx(monitoringMetrics.codes2xx())
-                .withCodes4xx(monitoringMetrics.code4xx())
-                .withCodes5xx(monitoringMetrics.code5xx())
-                .withTimeouts(monitoringMetrics.timeouts())
-                .withOtherErrors(monitoringMetrics.otherErrors())
-                .withThroughput(monitoringMetrics.throughput())
-                .withBatchRate(monitoringMetrics.metricPathBatchRate())
-                .withDiscarded(zookeeperMetrics.discarded)
-                .withDelivered(zookeeperMetrics.delivered)
-                .withVolume(zookeeperMetrics.volume)
-                .withLag(lagSource.getLag(topicName, subscriptionName))
-                .build();
-    }
+    return SubscriptionMetrics.Builder.subscriptionMetrics()
+        .withRate(monitoringMetrics.rate())
+        .withCodes2xx(monitoringMetrics.codes2xx())
+        .withCodes4xx(monitoringMetrics.code4xx())
+        .withCodes5xx(monitoringMetrics.code5xx())
+        .withRetries(monitoringMetrics.retries())
+        .withTimeouts(monitoringMetrics.timeouts())
+        .withOtherErrors(monitoringMetrics.otherErrors())
+        .withThroughput(monitoringMetrics.throughput())
+        .withBatchRate(monitoringMetrics.metricPathBatchRate())
+        .withDiscarded(zookeeperMetrics.discarded)
+        .withDelivered(zookeeperMetrics.delivered)
+        .withVolume(zookeeperMetrics.volume)
+        .withLag(lagSource.getLag(topicName, subscriptionName))
+        .build();
+  }
 
-    @Override
-    public PersistentSubscriptionMetrics loadZookeeperMetrics(TopicName topicName, String subscriptionName) {
-        SubscriptionName name = new SubscriptionName(subscriptionName, topicName);
-        ZookeeperMetrics zookeeperMetrics = readZookeeperMetrics(name);
+  @Override
+  public PersistentSubscriptionMetrics loadZookeeperMetrics(
+      TopicName topicName, String subscriptionName) {
+    SubscriptionName name = new SubscriptionName(subscriptionName, topicName);
+    ZookeeperMetrics zookeeperMetrics = readZookeeperMetrics(name);
 
-        return new PersistentSubscriptionMetrics(zookeeperMetrics.delivered, zookeeperMetrics.discarded, zookeeperMetrics.volume);
-    }
+    return new PersistentSubscriptionMetrics(
+        zookeeperMetrics.delivered, zookeeperMetrics.discarded, zookeeperMetrics.volume);
+  }
 
-    private ZookeeperMetrics readZookeeperMetrics(SubscriptionName name) {
-        return new ZookeeperMetrics(
-                readZookeeperMetric(() -> summedSharedCounter.getValue(zookeeperPaths.subscriptionMetricPath(name, "delivered")), name),
-                readZookeeperMetric(() -> summedSharedCounter.getValue(zookeeperPaths.subscriptionMetricPath(name, "discarded")), name),
-                readZookeeperMetric(() -> summedSharedCounter.getValue(zookeeperPaths.subscriptionMetricPath(name, "volume")), name)
-        );
-    }
+  private ZookeeperMetrics readZookeeperMetrics(SubscriptionName name) {
+    return new ZookeeperMetrics(
+        readZookeeperMetric(
+            () ->
+                summedSharedCounter.getValue(
+                    zookeeperPaths.subscriptionMetricPath(name, "delivered")),
+            name),
+        readZookeeperMetric(
+            () ->
+                summedSharedCounter.getValue(
+                    zookeeperPaths.subscriptionMetricPath(name, "discarded")),
+            name),
+        readZookeeperMetric(
+            () ->
+                summedSharedCounter.getValue(zookeeperPaths.subscriptionMetricPath(name, "volume")),
+            name));
+  }
 
-    private long readZookeeperMetric(Supplier<Long> supplier, SubscriptionName name) {
-        try {
-            return supplier.get();
-        } catch (Exception exception) {
-            logger.warn(
-                    "Failed to read Zookeeper metrics for subscription: {}; root cause: {}",
-                    name.getQualifiedName(), getRootCauseMessage(exception)
-            );
-            return -1;
-        }
+  private long readZookeeperMetric(Supplier<Long> supplier, SubscriptionName name) {
+    try {
+      return supplier.get();
+    } catch (Exception exception) {
+      logger.warn(
+          "Failed to read Zookeeper metrics for subscription: {}; root cause: {}",
+          name.getQualifiedName(),
+          getRootCauseMessage(exception));
+      return -1;
     }
+  }
 
-    private record ZookeeperMetrics(long delivered, long discarded, long volume) { }
+  private record ZookeeperMetrics(long delivered, long discarded, long volume) {}
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridTopicMetricsRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridTopicMetricsRepository.java
index 90d6255994..a63a6260b8 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridTopicMetricsRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridTopicMetricsRepository.java
@@ -10,34 +10,39 @@
 @Component
 public class HybridTopicMetricsRepository implements TopicMetricsRepository {
 
-    private final MonitoringTopicMetricsProvider monitoringTopicMetricsProvider;
-
-    private final SummedSharedCounter summedSharedCounter;
-
-    private final ZookeeperPaths zookeeperPaths;
-
-    private final SubscriptionRepository subscriptionRepository;
-
-    public HybridTopicMetricsRepository(MonitoringTopicMetricsProvider monitoringTopicMetricsProvider,
-                                        SummedSharedCounter summedSharedCounter, ZookeeperPaths zookeeperPaths,
-                                        SubscriptionRepository subscriptionRepository) {
-        this.monitoringTopicMetricsProvider = monitoringTopicMetricsProvider;
-        this.summedSharedCounter = summedSharedCounter;
-        this.zookeeperPaths = zookeeperPaths;
-        this.subscriptionRepository = subscriptionRepository;
-    }
-
-    @Override
-    public TopicMetrics loadMetrics(TopicName topicName) {
-        MonitoringTopicMetricsProvider.MonitoringTopicMetrics metrics = monitoringTopicMetricsProvider.topicMetrics(topicName);
-
-        return TopicMetrics.Builder.topicMetrics()
-                .withRate(metrics.rate())
-                .withDeliveryRate(metrics.deliveryRate())
-                .withThroughput(metrics.throughput())
-                .withPublished(summedSharedCounter.getValue(zookeeperPaths.topicMetricPath(topicName, "published")))
-                .withVolume(summedSharedCounter.getValue(zookeeperPaths.topicMetricPath(topicName, "volume")))
-                .withSubscriptions(subscriptionRepository.listSubscriptionNames(topicName).size())
-                .build();
-    }
+  private final MonitoringTopicMetricsProvider monitoringTopicMetricsProvider;
+
+  private final SummedSharedCounter summedSharedCounter;
+
+  private final ZookeeperPaths zookeeperPaths;
+
+  private final SubscriptionRepository subscriptionRepository;
+
+  public HybridTopicMetricsRepository(
+      MonitoringTopicMetricsProvider monitoringTopicMetricsProvider,
+      SummedSharedCounter summedSharedCounter,
+      ZookeeperPaths zookeeperPaths,
+      SubscriptionRepository subscriptionRepository) {
+    this.monitoringTopicMetricsProvider = monitoringTopicMetricsProvider;
+    this.summedSharedCounter = summedSharedCounter;
+    this.zookeeperPaths = zookeeperPaths;
+    this.subscriptionRepository = subscriptionRepository;
+  }
+
+  @Override
+  public TopicMetrics loadMetrics(TopicName topicName) {
+    MonitoringTopicMetricsProvider.MonitoringTopicMetrics metrics =
+        monitoringTopicMetricsProvider.topicMetrics(topicName);
+
+    return TopicMetrics.Builder.topicMetrics()
+        .withRate(metrics.rate())
+        .withDeliveryRate(metrics.deliveryRate())
+        .withThroughput(metrics.throughput())
+        .withPublished(
+            summedSharedCounter.getValue(zookeeperPaths.topicMetricPath(topicName, "published")))
+        .withVolume(
+            summedSharedCounter.getValue(zookeeperPaths.topicMetricPath(topicName, "volume")))
+        .withSubscriptions(subscriptionRepository.listSubscriptionNames(topicName).size())
+        .build();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringMetricsContainer.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringMetricsContainer.java
index 3ab5a29256..ba6958369d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringMetricsContainer.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringMetricsContainer.java
@@ -1,46 +1,49 @@
 package pl.allegro.tech.hermes.management.infrastructure.metrics;
 
-import pl.allegro.tech.hermes.api.MetricDecimalValue;
-
 import java.util.HashMap;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.MetricDecimalValue;
 
 public class MonitoringMetricsContainer {
 
-    private static final MetricDecimalValue DEFAULT_VALUE = MetricDecimalValue.of("0.0");
+  private static final MetricDecimalValue DEFAULT_VALUE = MetricDecimalValue.of("0.0");
 
-    private final Map<String, MetricDecimalValue> metrics;
-    private final boolean isAvailable;
+  private final Map<String, MetricDecimalValue> metrics;
+  private final boolean isAvailable;
 
-    private MonitoringMetricsContainer(boolean isAvailable, Map<String, MetricDecimalValue> metrics) {
-        this.metrics = metrics;
-        this.isAvailable = isAvailable;
-    }
+  private MonitoringMetricsContainer(boolean isAvailable, Map<String, MetricDecimalValue> metrics) {
+    this.metrics = metrics;
+    this.isAvailable = isAvailable;
+  }
 
-    public static MonitoringMetricsContainer createEmpty() {
-        return new MonitoringMetricsContainer(true, new HashMap<>());
-    }
+  public static MonitoringMetricsContainer createEmpty() {
+    return new MonitoringMetricsContainer(true, new HashMap<>());
+  }
 
-    public static MonitoringMetricsContainer initialized(Map<String, MetricDecimalValue> metrics) {
-        return new MonitoringMetricsContainer(true, metrics);
-    }
+  public static MonitoringMetricsContainer initialized(Map<String, MetricDecimalValue> metrics) {
+    return new MonitoringMetricsContainer(true, metrics);
+  }
 
-    public static MonitoringMetricsContainer unavailable() {
-        return new MonitoringMetricsContainer(false, new HashMap<>());
-    }
+  public static MonitoringMetricsContainer unavailable() {
+    return new MonitoringMetricsContainer(false, new HashMap<>());
+  }
 
-    public MonitoringMetricsContainer addMetricValue(String metricPath, MetricDecimalValue value) {
-        if (!isAvailable) {
-            throw new IllegalStateException("Adding value to unavailable metrics container");
-        }
-        this.metrics.put(metricPath, value);
-        return this;
+  public MonitoringMetricsContainer addMetricValue(String query, MetricDecimalValue value) {
+    if (!isAvailable) {
+      throw new IllegalStateException("Adding value to unavailable metrics container");
     }
+    this.metrics.put(query, value);
+    return this;
+  }
 
-    public MetricDecimalValue metricValue(String metricPath) {
-        if (!isAvailable) {
-            return MetricDecimalValue.unavailable();
-        }
-        return metrics.getOrDefault(metricPath, DEFAULT_VALUE);
+  public MetricDecimalValue metricValue(String query) {
+    if (!isAvailable) {
+      return MetricDecimalValue.unavailable();
     }
+    return metrics.getOrDefault(query, DEFAULT_VALUE);
+  }
+
+  public boolean hasUnavailableMetrics() {
+    return !isAvailable || metrics.entrySet().stream().anyMatch(e -> !e.getValue().isAvailable());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringSubscriptionMetricsProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringSubscriptionMetricsProvider.java
index d98cccdb19..67dd4fb16e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringSubscriptionMetricsProvider.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringSubscriptionMetricsProvider.java
@@ -4,75 +4,90 @@
 import pl.allegro.tech.hermes.api.SubscriptionName;
 
 public interface MonitoringSubscriptionMetricsProvider {
-    MonitoringSubscriptionMetrics subscriptionMetrics(SubscriptionName subscriptionName);
+  MonitoringSubscriptionMetrics subscriptionMetrics(SubscriptionName subscriptionName);
 
-    record MonitoringSubscriptionMetrics(MetricDecimalValue rate,
-                                                MetricDecimalValue timeouts,
-                                                MetricDecimalValue throughput,
-                                                MetricDecimalValue otherErrors,
-                                                MetricDecimalValue codes2xx,
-                                                MetricDecimalValue code4xx,
-                                                MetricDecimalValue code5xx,
-                                                MetricDecimalValue metricPathBatchRate) {
-    }
+  record MonitoringSubscriptionMetrics(
+      MetricDecimalValue rate,
+      MetricDecimalValue timeouts,
+      MetricDecimalValue throughput,
+      MetricDecimalValue otherErrors,
+      MetricDecimalValue codes2xx,
+      MetricDecimalValue code4xx,
+      MetricDecimalValue code5xx,
+      MetricDecimalValue retries,
+      MetricDecimalValue metricPathBatchRate) {}
 
-    static MetricsBuilder metricsBuilder() {
-        return new MetricsBuilder();
-    }
+  static MetricsBuilder metricsBuilder() {
+    return new MetricsBuilder();
+  }
+
+  class MetricsBuilder {
+    private MetricDecimalValue rate;
+    private MetricDecimalValue timeouts;
+    private MetricDecimalValue throughput;
+    private MetricDecimalValue otherErrors;
+    private MetricDecimalValue codes2xx;
+    private MetricDecimalValue code4xx;
+    private MetricDecimalValue code5xx;
+    private MetricDecimalValue retries;
+    private MetricDecimalValue metricPathBatchRate;
 
-    class MetricsBuilder {
-        private MetricDecimalValue rate;
-        private MetricDecimalValue timeouts;
-        private MetricDecimalValue throughput;
-        private MetricDecimalValue otherErrors;
-        private MetricDecimalValue codes2xx;
-        private MetricDecimalValue code4xx;
-        private MetricDecimalValue code5xx;
-        private MetricDecimalValue metricPathBatchRate;
+    public MetricsBuilder withRate(MetricDecimalValue rate) {
+      this.rate = rate;
+      return this;
+    }
 
-        public MetricsBuilder withRate(MetricDecimalValue rate) {
-            this.rate = rate;
-            return this;
-        }
+    public MetricsBuilder withTimeouts(MetricDecimalValue timeouts) {
+      this.timeouts = timeouts;
+      return this;
+    }
 
-        public MetricsBuilder withTimeouts(MetricDecimalValue timeouts) {
-            this.timeouts = timeouts;
-            return this;
-        }
+    public MetricsBuilder withThroughput(MetricDecimalValue throughput) {
+      this.throughput = throughput;
+      return this;
+    }
 
-        public MetricsBuilder withThroughput(MetricDecimalValue throughput) {
-            this.throughput = throughput;
-            return this;
-        }
+    public MetricsBuilder withOtherErrors(MetricDecimalValue otherErrors) {
+      this.otherErrors = otherErrors;
+      return this;
+    }
 
-        public MetricsBuilder withOtherErrors(MetricDecimalValue otherErrors) {
-            this.otherErrors = otherErrors;
-            return this;
-        }
+    public MetricsBuilder withCodes2xx(MetricDecimalValue codes2xx) {
+      this.codes2xx = codes2xx;
+      return this;
+    }
 
-        public MetricsBuilder withCodes2xx(MetricDecimalValue codes2xx) {
-            this.codes2xx = codes2xx;
-            return this;
-        }
+    public MetricsBuilder withCode4xx(MetricDecimalValue code4xx) {
+      this.code4xx = code4xx;
+      return this;
+    }
 
-        public MetricsBuilder withCode4xx(MetricDecimalValue code4xx) {
-            this.code4xx = code4xx;
-            return this;
-        }
+    public MetricsBuilder withCode5xx(MetricDecimalValue code5xx) {
+      this.code5xx = code5xx;
+      return this;
+    }
 
-        public MetricsBuilder withCode5xx(MetricDecimalValue code5xx) {
-            this.code5xx = code5xx;
-            return this;
-        }
+    public MetricsBuilder withRetries(MetricDecimalValue retries) {
+      this.retries = retries;
+      return this;
+    }
 
-        public MetricsBuilder withMetricPathBatchRate(MetricDecimalValue metricPathBatchRate) {
-            this.metricPathBatchRate = metricPathBatchRate;
-            return this;
-        }
+    public MetricsBuilder withMetricPathBatchRate(MetricDecimalValue metricPathBatchRate) {
+      this.metricPathBatchRate = metricPathBatchRate;
+      return this;
+    }
 
-        public MonitoringSubscriptionMetrics build() {
-            return new MonitoringSubscriptionMetrics(rate, timeouts, throughput, otherErrors, codes2xx,
-                    code4xx, code5xx, metricPathBatchRate);
-        }
+    public MonitoringSubscriptionMetrics build() {
+      return new MonitoringSubscriptionMetrics(
+          rate,
+          timeouts,
+          throughput,
+          otherErrors,
+          codes2xx,
+          code4xx,
+          code5xx,
+          retries,
+          metricPathBatchRate);
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringTopicMetricsProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringTopicMetricsProvider.java
index 176f61f358..916666de71 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringTopicMetricsProvider.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/MonitoringTopicMetricsProvider.java
@@ -4,39 +4,37 @@
 import pl.allegro.tech.hermes.api.TopicName;
 
 public interface MonitoringTopicMetricsProvider {
-    MonitoringTopicMetrics topicMetrics(TopicName topicName);
+  MonitoringTopicMetrics topicMetrics(TopicName topicName);
 
-    record MonitoringTopicMetrics(MetricDecimalValue rate,
-                                  MetricDecimalValue deliveryRate,
-                                  MetricDecimalValue throughput) {
+  record MonitoringTopicMetrics(
+      MetricDecimalValue rate, MetricDecimalValue deliveryRate, MetricDecimalValue throughput) {}
+
+  static MetricsBuilder metricsBuilder() {
+    return new MetricsBuilder();
+  }
+
+  class MetricsBuilder {
+    private MetricDecimalValue rate;
+    private MetricDecimalValue deliveryRate;
+    private MetricDecimalValue throughput;
+
+    public MetricsBuilder withRate(MetricDecimalValue rate) {
+      this.rate = rate;
+      return this;
+    }
+
+    public MetricsBuilder withDeliveryRate(MetricDecimalValue deliveryRate) {
+      this.deliveryRate = deliveryRate;
+      return this;
     }
 
-    static MetricsBuilder metricsBuilder() {
-        return new MetricsBuilder();
+    public MetricsBuilder withThroughput(MetricDecimalValue throughput) {
+      this.throughput = throughput;
+      return this;
     }
 
-    class MetricsBuilder {
-        private MetricDecimalValue rate;
-        private MetricDecimalValue deliveryRate;
-        private MetricDecimalValue throughput;
-
-        public MetricsBuilder withRate(MetricDecimalValue rate) {
-            this.rate = rate;
-            return this;
-        }
-
-        public MetricsBuilder withDeliveryRate(MetricDecimalValue deliveryRate) {
-            this.deliveryRate = deliveryRate;
-            return this;
-        }
-
-        public MetricsBuilder withThroughput(MetricDecimalValue throughput) {
-            this.throughput = throughput;
-            return this;
-        }
-
-        public MonitoringTopicMetrics build() {
-            return new MonitoringTopicMetrics(rate, deliveryRate, throughput);
-        }
+    public MonitoringTopicMetrics build() {
+      return new MonitoringTopicMetrics(rate, deliveryRate, throughput);
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/NoOpSubscriptionLagSource.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/NoOpSubscriptionLagSource.java
index 60da162174..ec185b5bf9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/NoOpSubscriptionLagSource.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/NoOpSubscriptionLagSource.java
@@ -5,8 +5,8 @@
 import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionLagSource;
 
 public class NoOpSubscriptionLagSource implements SubscriptionLagSource {
-    @Override
-    public MetricLongValue getLag(TopicName topicName, String subscriptionName) {
-        return MetricLongValue.of(-1);
-    }
+  @Override
+  public MetricLongValue getLag(TopicName topicName, String subscriptionName) {
+    return MetricLongValue.of(-1);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/SummedSharedCounter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/SummedSharedCounter.java
index a5395f9786..cbd8f4a317 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/SummedSharedCounter.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/metrics/SummedSharedCounter.java
@@ -3,99 +3,99 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.atomic.DistributedAtomicLong;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.counter.ZookeeperCounterException;
 import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClient;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 public class SummedSharedCounter {
 
-    private final LoadingCache<String, CounterAggregator> counterAggregators;
+  private final LoadingCache<String, CounterAggregator> counterAggregators;
 
-    public SummedSharedCounter(List<ZookeeperClient> zookeeperClients,
-                               int expireAfter,
-                               int distributedLoaderBackoff,
-                               int distributedLoaderRetries) {
-        this.counterAggregators = buildLoadingCache(zookeeperClients, expireAfter, distributedLoaderBackoff, distributedLoaderRetries);
-    }
+  public SummedSharedCounter(
+      List<ZookeeperClient> zookeeperClients,
+      int expireAfter,
+      int distributedLoaderBackoff,
+      int distributedLoaderRetries) {
+    this.counterAggregators =
+        buildLoadingCache(
+            zookeeperClients, expireAfter, distributedLoaderBackoff, distributedLoaderRetries);
+  }
 
-    public long getValue(String path) {
-        try {
-            return counterAggregators.get(path).aggregate();
-        } catch (ZookeeperCounterException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new ZookeeperCounterException(path, e);
-        }
+  public long getValue(String path) {
+    try {
+      return counterAggregators.get(path).aggregate();
+    } catch (ZookeeperCounterException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new ZookeeperCounterException(path, e);
     }
+  }
 
-    private LoadingCache<String, CounterAggregator> buildLoadingCache(List<ZookeeperClient> zookeeperClients,
-                                                                      int expireAfter,
-                                                                      int distributedLoaderBackoff,
-                                                                      int distributedLoaderRetries) {
-        return CacheBuilder.newBuilder()
-                .expireAfterAccess(expireAfter, TimeUnit.HOURS)
-                .build(new CacheLoader<>() {
-                           @Override
-                           public CounterAggregator load(String key) {
-                               return new CounterAggregator(
-                                       key,
-                                       zookeeperClients,
-                                       distributedLoaderBackoff,
-                                       distributedLoaderRetries
-                               );
-                           }
-                       }
-                );
-    }
+  private LoadingCache<String, CounterAggregator> buildLoadingCache(
+      List<ZookeeperClient> zookeeperClients,
+      int expireAfter,
+      int distributedLoaderBackoff,
+      int distributedLoaderRetries) {
+    return CacheBuilder.newBuilder()
+        .expireAfterAccess(expireAfter, TimeUnit.HOURS)
+        .build(
+            new CacheLoader<>() {
+              @Override
+              public CounterAggregator load(String key) {
+                return new CounterAggregator(
+                    key, zookeeperClients, distributedLoaderBackoff, distributedLoaderRetries);
+              }
+            });
+  }
 
-    private static class CounterAggregator {
+  private static class CounterAggregator {
 
-        private final String counterName;
-        private final Map<String, CuratorFramework> curatorPerDatacenter = new HashMap<>();
-        private final Map<String, DistributedAtomicLong> counterPerDatacenter = new HashMap<>();
+    private final String counterName;
+    private final Map<String, CuratorFramework> curatorPerDatacenter = new HashMap<>();
+    private final Map<String, DistributedAtomicLong> counterPerDatacenter = new HashMap<>();
 
-        CounterAggregator(String counterName,
-                          List<ZookeeperClient> zookeeperClients,
-                          int distributedLoaderBackoff,
-                          int distributedLoaderRetries) {
-            this.counterName = counterName;
-            for (ZookeeperClient zookeeperClient : zookeeperClients) {
-                CuratorFramework curatorFramework = zookeeperClient.getCuratorFramework();
-                curatorPerDatacenter.put(zookeeperClient.getDatacenterName(), curatorFramework);
-                DistributedAtomicLong distributedAtomicLong = new DistributedAtomicLong(
-                        curatorFramework,
-                        counterName,
-                        new ExponentialBackoffRetry(distributedLoaderBackoff, distributedLoaderRetries)
-                );
-                counterPerDatacenter.put(zookeeperClient.getDatacenterName(), distributedAtomicLong);
-            }
-        }
+    CounterAggregator(
+        String counterName,
+        List<ZookeeperClient> zookeeperClients,
+        int distributedLoaderBackoff,
+        int distributedLoaderRetries) {
+      this.counterName = counterName;
+      for (ZookeeperClient zookeeperClient : zookeeperClients) {
+        CuratorFramework curatorFramework = zookeeperClient.getCuratorFramework();
+        curatorPerDatacenter.put(zookeeperClient.getDatacenterName(), curatorFramework);
+        DistributedAtomicLong distributedAtomicLong =
+            new DistributedAtomicLong(
+                curatorFramework,
+                counterName,
+                new ExponentialBackoffRetry(distributedLoaderBackoff, distributedLoaderRetries));
+        counterPerDatacenter.put(zookeeperClient.getDatacenterName(), distributedAtomicLong);
+      }
+    }
 
-        long aggregate() throws Exception {
-            long sum = 0;
-            for (Map.Entry<String, DistributedAtomicLong> counterEntry : counterPerDatacenter.entrySet()) {
-                ensureConnected(counterEntry.getKey());
-                DistributedAtomicLong counter = counterEntry.getValue();
-                sum += counter.get().preValue();
-            }
-            return sum;
-        }
+    long aggregate() throws Exception {
+      long sum = 0;
+      for (Map.Entry<String, DistributedAtomicLong> counterEntry :
+          counterPerDatacenter.entrySet()) {
+        ensureConnected(counterEntry.getKey());
+        DistributedAtomicLong counter = counterEntry.getValue();
+        sum += counter.get().preValue();
+      }
+      return sum;
+    }
 
-        private void ensureConnected(String datacenter) {
-            CuratorFramework curator = curatorPerDatacenter.get(datacenter);
-            if (!curator.getZookeeperClient().isConnected()) {
-                throw new ZookeeperCounterException(
-                        counterName,
-                        "Could not establish connection to a Zookeeper instance in " + datacenter + "."
-                );
-            }
-        }
+    private void ensureConnected(String datacenter) {
+      CuratorFramework curator = curatorPerDatacenter.get(datacenter);
+      if (!curator.getZookeeperClient().isConnected()) {
+        throw new ZookeeperCounterException(
+            counterName,
+            "Could not establish connection to a Zookeeper instance in " + datacenter + ".");
+      }
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/CachingPrometheusClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/CachingPrometheusClient.java
index 942beb67a7..25c37519ee 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/CachingPrometheusClient.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/CachingPrometheusClient.java
@@ -1,44 +1,64 @@
 package pl.allegro.tech.hermes.management.infrastructure.prometheus;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import com.google.common.base.Ticker;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
 import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
 
-import java.util.concurrent.ExecutionException;
+public class CachingPrometheusClient implements PrometheusClient {
 
-import static java.util.concurrent.TimeUnit.SECONDS;
+  private final PrometheusClient underlyingPrometheusClient;
+  /*
+   Metrics will always be requested in the context of a single subscription/topic. The single sub/topic will
+   always result in the same list of metrics queries. There is no overlapping between metrics used in the context of
+   topic or subscriptions. That's why it is safe to use a list of queries as a caching key.
 
-public class CachingPrometheusClient implements PrometheusClient {
+   Maybe it will be worth to cache it per query except of queries when there will be too much overhead
+   of refreshing all sub/topic metrics if the single fetch fails (currently we invalidate whole metrics container
+   when one of the sub metric is unavailable)
+  */
+  private final LoadingCache<List<String>, MonitoringMetricsContainer> prometheusMetricsCache;
 
-    private final PrometheusClient underlyingPrometheusClient;
-    private final LoadingCache<String, MonitoringMetricsContainer> prometheusMetricsCache;
-
-    public CachingPrometheusClient(PrometheusClient underlyingPrometheusClient, Ticker ticker,
-                                   long cacheTtlInSeconds, long cacheSize) {
-        this.underlyingPrometheusClient = underlyingPrometheusClient;
-        this.prometheusMetricsCache = CacheBuilder.newBuilder()
-                .ticker(ticker)
-                .expireAfterWrite(cacheTtlInSeconds, SECONDS)
-                .maximumSize(cacheSize)
-                .build(new PrometheusMetricsCacheLoader());
-    }
+  public CachingPrometheusClient(
+      PrometheusClient underlyingPrometheusClient,
+      Ticker ticker,
+      long cacheTtlInSeconds,
+      long cacheSize) {
+    this.underlyingPrometheusClient = underlyingPrometheusClient;
+    this.prometheusMetricsCache =
+        CacheBuilder.newBuilder()
+            .ticker(ticker)
+            .expireAfterWrite(cacheTtlInSeconds, SECONDS)
+            .maximumSize(cacheSize)
+            .build(new PrometheusMetricsCacheLoader());
+  }
 
-    @Override
-    public MonitoringMetricsContainer readMetrics(String query) {
-        try {
-            return prometheusMetricsCache.get(query);
-        } catch (ExecutionException e) {
-            // should never happen because the loader does not throw any checked exceptions
-            throw new RuntimeException(e);
-        }
+  @Override
+  public MonitoringMetricsContainer readMetrics(List<String> queries) {
+    try {
+      MonitoringMetricsContainer monitoringMetricsContainer =
+          prometheusMetricsCache.get(List.copyOf(queries));
+      if (monitoringMetricsContainer.hasUnavailableMetrics()) {
+        // try to reload the on the next fetch
+        prometheusMetricsCache.invalidate(queries);
+      }
+      return monitoringMetricsContainer;
+    } catch (ExecutionException e) {
+      // should never happen because the loader does not throw any exceptions
+      throw new RuntimeException(e);
     }
+  }
 
-    private class PrometheusMetricsCacheLoader extends CacheLoader<String, MonitoringMetricsContainer> {
-        @Override
-        public MonitoringMetricsContainer load(String query) {
-            return underlyingPrometheusClient.readMetrics(query);
-        }
+  private class PrometheusMetricsCacheLoader
+      extends CacheLoader<List<String>, MonitoringMetricsContainer> {
+    @Override
+    public MonitoringMetricsContainer load(List<String> queries) {
+      return underlyingPrometheusClient.readMetrics(queries);
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusClient.java
index 6c5c4a5493..fe0142483d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusClient.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusClient.java
@@ -1,7 +1,53 @@
 package pl.allegro.tech.hermes.management.infrastructure.prometheus;
 
+import java.util.List;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
 
 public interface PrometheusClient {
-    MonitoringMetricsContainer readMetrics(String query);
+  String SUBSCRIPTION_QUERY_FORMAT =
+      "sum by (group, topic, subscription)"
+          + " (irate({__name__='%s', group='%s', topic='%s', subscription='%s', %s}[1m]))";
+
+  String SUBSCRIPTION_QUERY_FORMAT_STATUS_CODE =
+      "sum by (group, topic, subscription)"
+          + " (irate({__name__='%s', group='%s', topic='%s', subscription='%s', status_code=~'%s', %s}[1m]))";
+
+  String TOPIC_QUERY_FORMAT =
+      "sum by (group, topic) (irate({__name__='%s', group='%s', " + "topic='%s', %s}[1m]))";
+
+  default MonitoringMetricsContainer readMetrics(String... query) {
+    return readMetrics(List.of(query));
+  }
+
+  MonitoringMetricsContainer readMetrics(List<String> queries);
+
+  static String forSubscription(
+      String name, SubscriptionName subscriptionName, String additionalFilters) {
+    return String.format(
+        SUBSCRIPTION_QUERY_FORMAT,
+        name,
+        subscriptionName.getTopicName().getGroupName(),
+        subscriptionName.getTopicName().getName(),
+        subscriptionName.getName(),
+        additionalFilters);
+  }
+
+  static String forSubscriptionStatusCode(
+      String name, SubscriptionName subscriptionName, String regex, String additionalFilters) {
+    return String.format(
+        SUBSCRIPTION_QUERY_FORMAT_STATUS_CODE,
+        name,
+        subscriptionName.getTopicName().getGroupName(),
+        subscriptionName.getTopicName().getName(),
+        subscriptionName.getName(),
+        regex,
+        additionalFilters);
+  }
+
+  static String forTopic(String name, TopicName topicName, String additionalFilters) {
+    return String.format(
+        TOPIC_QUERY_FORMAT, name, topicName.getGroupName(), topicName.getName(), additionalFilters);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusMetricsProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusMetricsProvider.java
new file mode 100644
index 0000000000..ab404e6c30
--- /dev/null
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusMetricsProvider.java
@@ -0,0 +1,132 @@
+package pl.allegro.tech.hermes.management.infrastructure.prometheus;
+
+import static pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient.forSubscription;
+import static pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient.forSubscriptionStatusCode;
+import static pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient.forTopic;
+
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
+import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringSubscriptionMetricsProvider;
+import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringTopicMetricsProvider;
+
+public class PrometheusMetricsProvider
+    implements MonitoringSubscriptionMetricsProvider, MonitoringTopicMetricsProvider {
+
+  private static final String SUBSCRIPTION_DELIVERED = "subscription_delivered_total";
+  private static final String SUBSCRIPTION_TIMEOUTS = "subscription_timeouts_total";
+  private static final String SUBSCRIPTION_THROUGHPUT = "subscription_throughput_bytes_total";
+  private static final String SUBSCRIPTION_OTHER_ERRORS = "subscription_other_errors_total";
+  private static final String SUBSCRIPTION_BATCHES = "subscription_batches_total";
+  private static final String SUBSCRIPTION_STATUS_CODES = "subscription_http_status_codes_total";
+  private static final String SUBSCRIPTION_RETRIES = "subscription_retries_total";
+
+  private static final String TOPIC_RATE = "topic_requests_total";
+  private static final String TOPIC_DELIVERY_RATE = "subscription_delivered_total";
+  private static final String TOPIC_THROUGHPUT_RATE = "topic_throughput_bytes_total";
+
+  private final String consumersMetricsPrefix;
+  private final String frontendMetricsPrefix;
+  private final String additionalFilters;
+  private final PrometheusClient prometheusClient;
+
+  public PrometheusMetricsProvider(
+      PrometheusClient prometheusClient,
+      String consumersMetricsPrefix,
+      String frontendMetricsPrefix,
+      String additionalFilters) {
+    this.prometheusClient = prometheusClient;
+    this.consumersMetricsPrefix =
+        consumersMetricsPrefix.isEmpty() ? "" : consumersMetricsPrefix + "_";
+    this.frontendMetricsPrefix = frontendMetricsPrefix.isEmpty() ? "" : frontendMetricsPrefix + "_";
+    this.additionalFilters = additionalFilters;
+  }
+
+  @Override
+  public MonitoringSubscriptionMetrics subscriptionMetrics(SubscriptionName subscriptionName) {
+    String subscriptionDeliveredQuery =
+        forSubscription(
+            consumerMetricName(SUBSCRIPTION_DELIVERED), subscriptionName, additionalFilters);
+    String subscriptionTimeoutsQuery =
+        forSubscription(
+            consumerMetricName(SUBSCRIPTION_TIMEOUTS), subscriptionName, additionalFilters);
+    String subscriptionThroughputQuery =
+        forSubscription(
+            consumerMetricName(SUBSCRIPTION_THROUGHPUT), subscriptionName, additionalFilters);
+    String subscriptionOtherErrorsQuery =
+        forSubscription(
+            consumerMetricName(SUBSCRIPTION_OTHER_ERRORS), subscriptionName, additionalFilters);
+    String subscriptionBatchesQuery =
+        forSubscription(
+            consumerMetricName(SUBSCRIPTION_BATCHES), subscriptionName, additionalFilters);
+    String subscriptionRetriesQuery =
+        forSubscription(
+            consumerMetricName(SUBSCRIPTION_RETRIES), subscriptionName, additionalFilters);
+    String subscription2xx =
+        forSubscriptionStatusCode(
+            consumerMetricName(SUBSCRIPTION_STATUS_CODES),
+            subscriptionName,
+            "2.*",
+            additionalFilters);
+    String subscription4xx =
+        forSubscriptionStatusCode(
+            consumerMetricName(SUBSCRIPTION_STATUS_CODES),
+            subscriptionName,
+            "4.*",
+            additionalFilters);
+    String subscription5xx =
+        forSubscriptionStatusCode(
+            consumerMetricName(SUBSCRIPTION_STATUS_CODES),
+            subscriptionName,
+            "5.*",
+            additionalFilters);
+
+    MonitoringMetricsContainer prometheusMetricsContainer =
+        prometheusClient.readMetrics(
+            subscriptionDeliveredQuery,
+            subscriptionTimeoutsQuery,
+            subscriptionRetriesQuery,
+            subscriptionThroughputQuery,
+            subscriptionOtherErrorsQuery,
+            subscriptionBatchesQuery,
+            subscription2xx,
+            subscription4xx,
+            subscription5xx);
+    return MonitoringSubscriptionMetricsProvider.metricsBuilder()
+        .withRate(prometheusMetricsContainer.metricValue(subscriptionDeliveredQuery))
+        .withTimeouts(prometheusMetricsContainer.metricValue(subscriptionTimeoutsQuery))
+        .withThroughput(prometheusMetricsContainer.metricValue(subscriptionThroughputQuery))
+        .withOtherErrors(prometheusMetricsContainer.metricValue(subscriptionOtherErrorsQuery))
+        .withMetricPathBatchRate(prometheusMetricsContainer.metricValue(subscriptionBatchesQuery))
+        .withCodes2xx(prometheusMetricsContainer.metricValue(subscription2xx))
+        .withCode4xx(prometheusMetricsContainer.metricValue(subscription4xx))
+        .withCode5xx(prometheusMetricsContainer.metricValue(subscription5xx))
+        .withRetries(prometheusMetricsContainer.metricValue(subscriptionRetriesQuery))
+        .build();
+  }
+
+  @Override
+  public MonitoringTopicMetrics topicMetrics(TopicName topicName) {
+    String topicRateQuery = forTopic(frontendMetricName(TOPIC_RATE), topicName, additionalFilters);
+    String topicDeliveryRateQuery =
+        forTopic(consumerMetricName(TOPIC_DELIVERY_RATE), topicName, additionalFilters);
+    String topicThroughputQuery =
+        forTopic(frontendMetricName(TOPIC_THROUGHPUT_RATE), topicName, additionalFilters);
+
+    MonitoringMetricsContainer prometheusMetricsContainer =
+        prometheusClient.readMetrics(topicRateQuery, topicDeliveryRateQuery, topicThroughputQuery);
+    return MonitoringTopicMetricsProvider.metricsBuilder()
+        .withRate(prometheusMetricsContainer.metricValue(topicRateQuery))
+        .withDeliveryRate(prometheusMetricsContainer.metricValue(topicDeliveryRateQuery))
+        .withThroughput(prometheusMetricsContainer.metricValue(topicThroughputQuery))
+        .build();
+  }
+
+  private String consumerMetricName(String name) {
+    return consumersMetricsPrefix + name;
+  }
+
+  private String frontendMetricName(String name) {
+    return frontendMetricsPrefix + name;
+  }
+}
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusResponse.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusResponse.java
index bcb3156dc7..69d005148d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusResponse.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/PrometheusResponse.java
@@ -2,63 +2,34 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.List;
 import java.util.Optional;
 
-record PrometheusResponse(@JsonProperty("status") String status,
-                          @JsonProperty("data") Data data) {
+record PrometheusResponse(@JsonProperty("status") String status, @JsonProperty("data") Data data) {
 
-    boolean isSuccess() {
-        return status.equals("success") && data.isVector();
-    }
+  boolean isSuccess() {
+    return status.equals("success") && data.isVector();
+  }
 
-    record Data(@JsonProperty("resultType") String resultType,
-                @JsonProperty("result") List<VectorResult> results) {
-        boolean isVector() {
-            return resultType.equals("vector");
-        }
+  record Data(
+      @JsonProperty("resultType") String resultType,
+      @JsonProperty("result") List<VectorResult> results) {
+    boolean isVector() {
+      return resultType.equals("vector");
     }
+  }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    record VectorResult(
-            @JsonProperty("metric") MetricName metricName,
-            @JsonProperty("value") List<String> vector) {
-
-        private static final int VALID_VECTOR_LENGTH = 2;
-        private static final int SCALAR_INDEX_VALUE = 1;
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record VectorResult(@JsonProperty("value") List<String> vector) {
 
-        Optional<Double> getValue() {
-            if (vector.size() != VALID_VECTOR_LENGTH) {
-                return Optional.empty();
-            }
-            return Optional.of(Double.parseDouble(vector.get(SCALAR_INDEX_VALUE)));
-        }
+    private static final int VALID_VECTOR_LENGTH = 2;
+    private static final int SCALAR_INDEX_VALUE = 1;
 
-        VectorResult renameMetric(String newMetricName) {
-            return new VectorResult(new MetricName(newMetricName, metricName.statusCode), vector);
-        }
+    Optional<Double> getValue() {
+      if (vector.size() != VALID_VECTOR_LENGTH) {
+        return Optional.empty();
+      }
+      return Optional.of(Double.parseDouble(vector.get(SCALAR_INDEX_VALUE)));
     }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    record MetricName(
-            @JsonProperty(value = "__name__") String name,
-            @JsonProperty(value = "status_code") Optional<String> statusCode) {
-        boolean is2xxStatusCode() {
-            return hasStatusCode() && statusCode.get().startsWith("2");
-        }
-
-        boolean is4xxStatusCode() {
-            return hasStatusCode() && statusCode.get().startsWith("4");
-        }
-
-        boolean is5xxStatusCode() {
-            return hasStatusCode() && statusCode.get().startsWith("5");
-        }
-
-        private boolean hasStatusCode() {
-            return statusCode.isPresent();
-        }
-    }
-
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/RestTemplatePrometheusClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/RestTemplatePrometheusClient.java
index 3d5139e17a..6b7d2e62ee 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/RestTemplatePrometheusClient.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/RestTemplatePrometheusClient.java
@@ -1,121 +1,129 @@
 package pl.allegro.tech.hermes.management.infrastructure.prometheus;
 
+import static java.net.URLEncoder.encode;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.google.common.base.Preconditions;
+import io.micrometer.core.instrument.MeterRegistry;
+import java.net.URI;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 import pl.allegro.tech.hermes.api.MetricDecimalValue;
 import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
 
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.net.URLEncoder.encode;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-
 public class RestTemplatePrometheusClient implements PrometheusClient {
 
-    private static final Logger logger = LoggerFactory.getLogger(RestTemplatePrometheusClient.class);
-
-    private final URI prometheusUri;
-    private final RestTemplate restTemplate;
-
-    public RestTemplatePrometheusClient(RestTemplate restTemplate, URI prometheusUri) {
-        this.restTemplate = restTemplate;
-        this.prometheusUri = prometheusUri;
-    }
-
-    @Override
-    public MonitoringMetricsContainer readMetrics(String query) {
-        try {
-            PrometheusResponse response = queryPrometheus(query);
-            Preconditions.checkNotNull(response, "Prometheus response is null");
-            Preconditions.checkState(response.isSuccess(), "Prometheus response does not contain valid data");
-
-            Map<String, List<PrometheusResponse.VectorResult>> metricsGroupedByName = groupMetricsByName(response);
-            return produceMetricsContainer(metricsGroupedByName);
-        } catch (Exception exception) {
-            logger.warn("Unable to read from Prometheus...", exception);
-            return MonitoringMetricsContainer.unavailable();
-        }
-    }
-
-    private PrometheusResponse queryPrometheus(String query) {
-        URI queryUri = URI.create(prometheusUri.toString() + "/api/v1/query?query=" + encode(query, UTF_8));
-
-        ResponseEntity<PrometheusResponse> response = restTemplate.exchange(queryUri,
-                HttpMethod.GET, HttpEntity.EMPTY, PrometheusResponse.class);
-        return response.getBody();
-    }
-
-    private static Map<String, List<PrometheusResponse.VectorResult>> groupMetricsByName(PrometheusResponse response) {
-        return response.data().results().stream()
-                .map(RestTemplatePrometheusClient::renameStatusCodesMetricsNames)
-                .collect(Collectors.groupingBy(r -> r.metricName().name()));
-    }
-
-    private static MonitoringMetricsContainer produceMetricsContainer(
-            Map<String, List<PrometheusResponse.VectorResult>> metricsGroupedByName) {
-        MonitoringMetricsContainer metricsContainer = MonitoringMetricsContainer.createEmpty();
-
-        Stream<Pair<String, Double>> metricsSummedByStatusCodeFamily = metricsGroupedByName.entrySet().stream()
-                .map(RestTemplatePrometheusClient::sumMetricsWithTheSameName);
-
-        metricsSummedByStatusCodeFamily.forEach(pair -> metricsContainer.addMetricValue(
-                pair.getKey(),
-                MetricDecimalValue.of(pair.getValue().toString())));
-        return metricsContainer;
-    }
-
-    private static PrometheusResponse.VectorResult renameStatusCodesMetricsNames(PrometheusResponse.VectorResult r) {
-        /*
-       Renames any metric containing status_code tag to the <metric_name>_2xx/3xx/4xx/5xx> metric name. For example:
-       VectorResult(
-           metricName=MetricName(
-               name=hermes_consumers_subscription_http_status_codes_total,
-               statusCode=Optional[200]),
-           vector=[...]
-        )
-        ---->
-        VectorResult(
-           metricName=MetricName(
-               name=hermes_consumers_subscription_http_status_codes_total_2xx,
-               statusCode=Optional[200]),
-           vector=[...]
-        )
-        It allows then to sum metrics accordingly to the status code family.
-         */
-        String suffix = "";
-        if (r.metricName().is2xxStatusCode()) {
-            suffix = "_2xx";
-        } else if (r.metricName().is4xxStatusCode()) {
-            suffix = "_4xx";
-        } else if (r.metricName().is5xxStatusCode()) {
-            suffix = "_5xx";
-        }
-        return r.renameMetric(r.metricName().name() + suffix);
+  private static final Logger logger = LoggerFactory.getLogger(RestTemplatePrometheusClient.class);
+
+  private final URI prometheusUri;
+  private final RestTemplate restTemplate;
+  private final ExecutorService executorService;
+  private final Duration fetchingTimeout;
+  private final MeterRegistry meterRegistry;
+
+  public RestTemplatePrometheusClient(
+      RestTemplate restTemplate,
+      URI prometheusUri,
+      ExecutorService executorService,
+      Duration fetchingTimeoutMillis,
+      MeterRegistry meterRegistry) {
+    this.restTemplate = restTemplate;
+    this.prometheusUri = prometheusUri;
+    this.executorService = executorService;
+    this.fetchingTimeout = fetchingTimeoutMillis;
+    this.meterRegistry = meterRegistry;
+  }
+
+  @Override
+  public MonitoringMetricsContainer readMetrics(List<String> queries) {
+    return fetchInParallelFromPrometheus(queries);
+  }
+
+  private MonitoringMetricsContainer fetchInParallelFromPrometheus(List<String> queries) {
+    CompletableFuture<Map<String, MetricDecimalValue>> aggregatedFuture =
+        getAggregatedCompletableFuture(queries);
+
+    try {
+      Map<String, MetricDecimalValue> metrics =
+          aggregatedFuture.get(fetchingTimeout.toMillis(), TimeUnit.MILLISECONDS);
+      return MonitoringMetricsContainer.initialized(metrics);
+    } catch (InterruptedException e) {
+      // possibly let know the caller that the thread was interrupted
+      Thread.currentThread().interrupt();
+      logger.warn("Prometheus fetching thread was interrupted...", e);
+      return MonitoringMetricsContainer.unavailable();
+    } catch (Exception ex) {
+      logger.warn("Unexpected exception during fetching metrics from prometheus...", ex);
+      return MonitoringMetricsContainer.unavailable();
     }
-
-    /*
-    We have to sum some metrics on the client side because Prometheus does not support this kind of aggregation when using
-    query for multiple __name__ metrics.
-     */
-    private static Pair<String, Double> sumMetricsWithTheSameName(Map.Entry<String, List<PrometheusResponse.VectorResult>> e) {
-        return Pair.of(
-                e.getKey(),
-                e.getValue().stream()
-                        .map(PrometheusResponse.VectorResult::getValue)
-                        .filter(Optional::isPresent)
-                        .map(Optional::get)
-                        .mapToDouble(d -> d).sum());
+  }
+
+  private CompletableFuture<Map<String, MetricDecimalValue>> getAggregatedCompletableFuture(
+      List<String> queries) {
+    // has to be collected to run in parallel
+    List<CompletableFuture<Pair<String, MetricDecimalValue>>> futures =
+        queries.stream().map(this::readSingleMetric).toList();
+
+    return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
+        .thenApply(
+            v ->
+                futures.stream()
+                    .map(CompletableFuture::join)
+                    .collect(Collectors.toMap(Pair::getKey, Pair::getValue)));
+  }
+
+  private CompletableFuture<Pair<String, MetricDecimalValue>> readSingleMetric(String query) {
+    return CompletableFuture.supplyAsync(() -> queryPrometheus(query), executorService);
+  }
+
+  private Pair<String, MetricDecimalValue> queryPrometheus(String query) {
+    try {
+      URI queryUri =
+          URI.create(prometheusUri.toString() + "/api/v1/query?query=" + encode(query, UTF_8));
+      PrometheusResponse response =
+          restTemplate
+              .exchange(queryUri, HttpMethod.GET, HttpEntity.EMPTY, PrometheusResponse.class)
+              .getBody();
+
+      Preconditions.checkNotNull(response, "Prometheus response is null");
+      Preconditions.checkState(
+          response.isSuccess(), "Prometheus response does not contain valid data");
+
+      MetricDecimalValue result = parseResponse(response);
+      meterRegistry.counter("read-metric-from-prometheus.success").increment();
+      return Pair.of(query, result);
+    } catch (HttpStatusCodeException ex) {
+      logger.warn(
+          "Unable to read from Prometheus. Query: {}, Status code: {}. Response body: {}",
+          query,
+          ex.getStatusCode(),
+          ex.getResponseBodyAsString(),
+          ex);
+      return Pair.of(query, MetricDecimalValue.unavailable());
+    } catch (Exception ex) {
+      logger.warn("Unable to read from Prometheus. Query: {}", query, ex);
+      meterRegistry.counter("read-metric-from-prometheus.error").increment();
+      return Pair.of(query, MetricDecimalValue.unavailable());
     }
+  }
+
+  private MetricDecimalValue parseResponse(PrometheusResponse response) {
+    return response.data().results().stream()
+        .findFirst()
+        .flatMap(PrometheusResponse.VectorResult::getValue)
+        .map(value -> MetricDecimalValue.of(value.toString()))
+        .orElse(MetricDecimalValue.defaultValue());
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/VictoriaMetricsMetricsProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/VictoriaMetricsMetricsProvider.java
deleted file mode 100644
index b2c1e3d008..0000000000
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/prometheus/VictoriaMetricsMetricsProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.prometheus;
-
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer;
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringSubscriptionMetricsProvider;
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringTopicMetricsProvider;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class VictoriaMetricsMetricsProvider implements MonitoringSubscriptionMetricsProvider, MonitoringTopicMetricsProvider {
-
-    private static final String SUBSCRIPTION_DELIVERED = "subscription_delivered_total";
-    private static final String SUBSCRIPTION_TIMEOUTS = "subscription_timeouts_total";
-    private static final String SUBSCRIPTION_THROUGHPUT = "subscription_throughput_bytes_total";
-    private static final String SUBSCRIPTION_OTHER_ERRORS = "subscription_other_errors_total";
-    private static final String SUBSCRIPTION_BATCHES = "subscription_batches_total";
-    private static final String SUBSCRIPTION_STATUS_CODES = "subscription_http_status_codes_total";
-    private static final String SUBSCRIPTION_STATUS_CODES_2XX = SUBSCRIPTION_STATUS_CODES + "_2xx";
-    private static final String SUBSCRIPTION_STATUS_CODES_4XX = SUBSCRIPTION_STATUS_CODES + "_4xx";
-    private static final String SUBSCRIPTION_STATUS_CODES_5XX = SUBSCRIPTION_STATUS_CODES + "_5xx";
-
-    private static final String TOPIC_RATE = "topic_requests_total";
-    private static final String TOPIC_DELIVERY_RATE = "subscription_delivered_total";
-    private static final String TOPIC_THROUGHPUT_RATE = "topic_throughput_bytes_total";
-
-    private final String consumersMetricsPrefix;
-    private final String frontendMetricsPrefix;
-    private final String additionalFilters;
-    private final String subscriptionMetricsToQuery;
-    private final String topicMetricsToQuery;
-    private final PrometheusClient prometheusClient;
-
-    public VictoriaMetricsMetricsProvider(PrometheusClient prometheusClient, String consumersMetricsPrefix,
-                                          String frontendMetricsPrefix, String additionalFilters) {
-        this.prometheusClient = prometheusClient;
-        this.consumersMetricsPrefix = consumersMetricsPrefix.isEmpty() ? "" : consumersMetricsPrefix + "_";
-        this.frontendMetricsPrefix = frontendMetricsPrefix.isEmpty() ? "" : frontendMetricsPrefix + "_";
-        this.additionalFilters = additionalFilters;
-        this.subscriptionMetricsToQuery = Stream.of(SUBSCRIPTION_DELIVERED, SUBSCRIPTION_TIMEOUTS,
-                        SUBSCRIPTION_THROUGHPUT, SUBSCRIPTION_OTHER_ERRORS, SUBSCRIPTION_BATCHES,
-                        SUBSCRIPTION_STATUS_CODES)
-                .map(this::consumerMetricName)
-                .collect(Collectors.joining("|"));
-        this.topicMetricsToQuery = String.join("|", List.of(
-                frontendMetricName(TOPIC_RATE),
-                consumerMetricName(TOPIC_DELIVERY_RATE),
-                frontendMetricName(TOPIC_THROUGHPUT_RATE)
-        ));
-    }
-
-    @Override
-    public MonitoringSubscriptionMetrics subscriptionMetrics(SubscriptionName subscriptionName) {
-        /*
-        The query is based on MetricsQL, available only in VictoriaMetrics
-        https://docs.victoriametrics.com/MetricsQL.html. Basic PromQL does not support `keep_metric_names` param.
-         */
-        String queryFormat = "sum by (__name__, group, topic, subscription, status_code)"
-                + " (irate({__name__=~'%s', group='%s', topic='%s', subscription='%s', %s}[1m]) keep_metric_names)";
-        String query = String.format(queryFormat, subscriptionMetricsToQuery, subscriptionName.getTopicName().getGroupName(),
-                subscriptionName.getTopicName().getName(), subscriptionName.getName(), additionalFilters);
-        MonitoringMetricsContainer prometheusMetricsContainer = prometheusClient.readMetrics(query);
-        return MonitoringSubscriptionMetricsProvider
-                .metricsBuilder()
-                .withRate(prometheusMetricsContainer.metricValue(consumerMetricName(SUBSCRIPTION_DELIVERED)))
-                .withTimeouts(prometheusMetricsContainer.metricValue(consumerMetricName(SUBSCRIPTION_TIMEOUTS)))
-                .withThroughput(prometheusMetricsContainer.metricValue(consumerMetricName(SUBSCRIPTION_THROUGHPUT)))
-                .withOtherErrors(prometheusMetricsContainer.metricValue(consumerMetricName(SUBSCRIPTION_OTHER_ERRORS)))
-                .withMetricPathBatchRate(prometheusMetricsContainer.metricValue(consumerMetricName(SUBSCRIPTION_BATCHES)))
-                .withCodes2xx(prometheusMetricsContainer.metricValue(consumerMetricName(SUBSCRIPTION_STATUS_CODES_2XX)))
-                .withCode4xx(prometheusMetricsContainer.metricValue(consumerMetricName(SUBSCRIPTION_STATUS_CODES_4XX)))
-                .withCode5xx(prometheusMetricsContainer.metricValue(consumerMetricName(SUBSCRIPTION_STATUS_CODES_5XX)))
-                .build();
-    }
-
-    @Override
-    public MonitoringTopicMetrics topicMetrics(TopicName topicName) {
-        /*
-        The query is based on MetricsQL, available only in VictoriaMetrics
-        https://docs.victoriametrics.com/MetricsQL.html. Basic PromQL does not support `keep_metric_names` param.
-         */
-        String queryFormat = "sum by (__name__, group, topic) (irate({__name__=~'%s', group='%s', "
-                + "topic='%s', %s}[1m]) keep_metric_names)";
-        String query = String.format(queryFormat, topicMetricsToQuery, topicName.getGroupName(), topicName.getName(),
-                additionalFilters);
-        MonitoringMetricsContainer prometheusMetricsContainer = prometheusClient.readMetrics(query);
-        return MonitoringTopicMetricsProvider
-                .metricsBuilder()
-                .withRate(prometheusMetricsContainer.metricValue(frontendMetricName(TOPIC_RATE)))
-                .withDeliveryRate(prometheusMetricsContainer.metricValue(consumerMetricName(TOPIC_DELIVERY_RATE)))
-                .withThroughput(prometheusMetricsContainer.metricValue(frontendMetricName(TOPIC_THROUGHPUT_RATE)))
-                .build();
-    }
-
-
-    private String consumerMetricName(String name) {
-        return consumersMetricsPrefix + name;
-    }
-
-    private String frontendMetricName(String name) {
-        return frontendMetricsPrefix + name;
-    }
-}
\ No newline at end of file
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/MatcherQuery.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/MatcherQuery.java
index 2363343342..75a3f62756 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/MatcherQuery.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/MatcherQuery.java
@@ -1,6 +1,9 @@
 package pl.allegro.tech.hermes.management.infrastructure.query;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Query;
@@ -8,67 +11,63 @@
 import pl.allegro.tech.hermes.management.infrastructure.query.matcher.MatcherException;
 import pl.allegro.tech.hermes.management.infrastructure.query.matcher.MatcherInputException;
 
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
 public class MatcherQuery<T> implements Query<T> {
 
-    private static final Logger logger = LoggerFactory.getLogger(MatcherQuery.class);
+  private static final Logger logger = LoggerFactory.getLogger(MatcherQuery.class);
 
-    private final Matcher matcher;
-    private final ObjectMapper objectMapper;
+  private final Matcher matcher;
+  private final ObjectMapper objectMapper;
 
-    private MatcherQuery(Matcher matcher, ObjectMapper objectMapper) {
-        this.matcher = matcher;
-        this.objectMapper = objectMapper;
-    }
+  private MatcherQuery(Matcher matcher, ObjectMapper objectMapper) {
+    this.matcher = matcher;
+    this.objectMapper = objectMapper;
+  }
 
-    @Override
-    public Stream<T> filter(Stream<T> input) {
-        return input.filter(getPredicate());
-    }
+  @Override
+  public Stream<T> filter(Stream<T> input) {
+    return input.filter(getPredicate());
+  }
 
-    @Override
-    public <K> Stream<K> filterNames(Stream<K> input) {
-        return input.filter(getSoftPredicate());
-    }
+  @Override
+  public <K> Stream<K> filterNames(Stream<K> input) {
+    return input.filter(getSoftPredicate());
+  }
 
-    public Predicate<T> getPredicate() {
-        return (value) -> {
-            try {
-                return matcher.match(convertToMap(value));
-            } catch (MatcherException e) {
-                logger.info("Failed to match {}, skipping", value, e);
-                return false;
-            } catch (MatcherInputException e) {
-                logger.error("Not existing query property", e);
-                throw new IllegalArgumentException(e);
-            }
-        };
-    }
+  public Predicate<T> getPredicate() {
+    return (value) -> {
+      try {
+        return matcher.match(convertToMap(value));
+      } catch (MatcherException e) {
+        logger.info("Failed to match {}, skipping", value, e);
+        return false;
+      } catch (MatcherInputException e) {
+        logger.error("Not existing query property", e);
+        throw new IllegalArgumentException(e);
+      }
+    };
+  }
 
-    public <K> Predicate<K> getSoftPredicate() {
-        return (value) -> {
-            try {
-                return matcher.match(convertToMap(value));
-            } catch (MatcherException e) {
-                logger.info("Failed to match {}, skipping", value, e);
-                return false;
-            } catch (MatcherInputException e) {
-                //Non-existing property is normal when querying objects with non-default class
-                return true;
-            }
-        };
-    }
+  public <K> Predicate<K> getSoftPredicate() {
+    return (value) -> {
+      try {
+        return matcher.match(convertToMap(value));
+      } catch (MatcherException e) {
+        logger.info("Failed to match {}, skipping", value, e);
+        return false;
+      } catch (MatcherInputException e) {
+        // Non-existing property is normal when querying objects with non-default class
+        return true;
+      }
+    };
+  }
 
-    @SuppressWarnings("unchecked")
-    //workaround for type which is not java bean
-    private <K> Map convertToMap(K value) {
-        return objectMapper.convertValue(value, Map.class);
-    }
+  @SuppressWarnings("unchecked")
+  // workaround for type which is not java bean
+  private <K> Map convertToMap(K value) {
+    return objectMapper.convertValue(value, Map.class);
+  }
 
-    public static <T> Query<T> fromMatcher(Matcher matcher, ObjectMapper objectMapper) {
-        return new MatcherQuery<>(matcher, objectMapper);
-    }
+  public static <T> Query<T> fromMatcher(Matcher matcher, ObjectMapper objectMapper) {
+    return new MatcherQuery<>(matcher, objectMapper);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/JXPathAttribute.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/JXPathAttribute.java
index a584a94dcb..832d364c9c 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/JXPathAttribute.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/JXPathAttribute.java
@@ -5,19 +5,19 @@
 
 public class JXPathAttribute implements ObjectAttribute {
 
-    private final Object target;
+  private final Object target;
 
-    private final String path;
+  private final String path;
 
-    public JXPathAttribute(Object target, String path) {
-        this.target = target;
-        this.path = path.replace('.', '/');
-    }
+  public JXPathAttribute(Object target, String path) {
+    this.target = target;
+    this.path = path.replace('.', '/');
+  }
 
-    @Override
-    public Object value() {
-        JXPathContext context = JXPathContext.newContext(target);
-        context.setFunctions(new FunctionLibrary());
-        return context.getValue(path);
-    }
+  @Override
+  public Object value() {
+    JXPathContext context = JXPathContext.newContext(target);
+    context.setFunctions(new FunctionLibrary());
+    return context.getValue(path);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/ObjectAttribute.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/ObjectAttribute.java
index 7536e1f8e7..0585ab4690 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/ObjectAttribute.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/ObjectAttribute.java
@@ -2,5 +2,5 @@
 
 public interface ObjectAttribute {
 
-    Object value();
+  Object value();
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/ObjectGraph.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/ObjectGraph.java
index c0cf2ed01d..68a5b8e6b9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/ObjectGraph.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/graph/ObjectGraph.java
@@ -2,17 +2,17 @@
 
 public class ObjectGraph {
 
-    private final Object target;
+  private final Object target;
 
-    private ObjectGraph(Object target) {
-        this.target = target;
-    }
+  private ObjectGraph(Object target) {
+    this.target = target;
+  }
 
-    public ObjectAttribute navigate(String path) {
-        return new JXPathAttribute(target, path);
-    }
+  public ObjectAttribute navigate(String path) {
+    return new JXPathAttribute(target, path);
+  }
 
-    public static ObjectGraph from(Object target) {
-        return new ObjectGraph(target);
-    }
+  public static ObjectGraph from(Object target) {
+    return new ObjectGraph(target);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/AndMatcher.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/AndMatcher.java
index 18057af836..79e8b42f98 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/AndMatcher.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/AndMatcher.java
@@ -4,18 +4,18 @@
 
 public class AndMatcher implements Matcher {
 
-    private Collection<Matcher> matchers;
+  private Collection<Matcher> matchers;
 
-    public AndMatcher(Collection<Matcher> matchers) {
-        this.matchers = matchers;
-    }
+  public AndMatcher(Collection<Matcher> matchers) {
+    this.matchers = matchers;
+  }
 
-    @Override
-    public boolean match(Object value) {
-        return matchers.stream().reduce(
-                true,
-                (match, matcher) -> match && matcher.match(value),
-                (first, second) -> first && second
-        );
-    }
+  @Override
+  public boolean match(Object value) {
+    return matchers.stream()
+        .reduce(
+            true,
+            (match, matcher) -> match && matcher.match(value),
+            (first, second) -> first && second);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/ComparisonMatcher.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/ComparisonMatcher.java
index 244043e9bc..bcaae73d31 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/ComparisonMatcher.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/ComparisonMatcher.java
@@ -1,68 +1,69 @@
 package pl.allegro.tech.hermes.management.infrastructure.query.matcher;
 
-import org.apache.commons.jxpath.JXPathException;
-import pl.allegro.tech.hermes.management.infrastructure.query.graph.ObjectGraph;
+import static java.lang.Double.parseDouble;
 
 import java.util.Optional;
-
-import static java.lang.Double.parseDouble;
+import org.apache.commons.jxpath.JXPathException;
+import pl.allegro.tech.hermes.management.infrastructure.query.graph.ObjectGraph;
 
 public class ComparisonMatcher implements Matcher {
 
-    private final String attribute;
+  private final String attribute;
 
-    private final Object rightSideValue;
+  private final Object rightSideValue;
 
-    private final ComparisonOperator operator;
+  private final ComparisonOperator operator;
 
-    public ComparisonMatcher(String attribute, Object rightSideValue, ComparisonOperator operator) {
-        this.attribute = attribute;
-        this.rightSideValue = rightSideValue;
-        this.operator = operator;
-    }
+  public ComparisonMatcher(String attribute, Object rightSideValue, ComparisonOperator operator) {
+    this.attribute = attribute;
+    this.rightSideValue = rightSideValue;
+    this.operator = operator;
+  }
 
-    @Override
-    public boolean match(Object object) {
-        Object leftSideValue = extractAttributeValue(object);
+  @Override
+  public boolean match(Object object) {
+    Object leftSideValue = extractAttributeValue(object);
 
-        Optional<Double> leftSideValueAsNumber = tryParseNumber(leftSideValue);
-        Optional<Double> rightSideValueAsNumber = tryParseNumber(rightSideValue);
+    Optional<Double> leftSideValueAsNumber = tryParseNumber(leftSideValue);
+    Optional<Double> rightSideValueAsNumber = tryParseNumber(rightSideValue);
 
-        if (!leftSideValueAsNumber.isPresent()) {
-            return true;
-        }
-        if (!rightSideValueAsNumber.isPresent()) {
-            throw new MatcherInputException("Comparison operator requires numerical data");
-        }
-        return makeComparison(leftSideValueAsNumber.get(), rightSideValueAsNumber.get());
+    if (!leftSideValueAsNumber.isPresent()) {
+      return true;
     }
-
-    private Object extractAttributeValue(Object object) {
-        try {
-            Object value = ObjectGraph.from(object).navigate(attribute).value();
-
-            if (value == null) {
-                throw new MatcherInputException(String.format("Cannot find '%s' attribute", this.attribute));
-            }
-            return value;
-        } catch (JXPathException e) {
-            throw new MatcherException(String.format("Could not navigate to specific path: '%s'", attribute), e);
-        }
+    if (!rightSideValueAsNumber.isPresent()) {
+      throw new MatcherInputException("Comparison operator requires numerical data");
     }
-
-    private Optional<Double> tryParseNumber(Object value) {
-        try {
-            return Optional.of(parseDouble(asString(value)));
-        } catch (NumberFormatException e) {
-            return Optional.empty();
-        }
+    return makeComparison(leftSideValueAsNumber.get(), rightSideValueAsNumber.get());
+  }
+
+  private Object extractAttributeValue(Object object) {
+    try {
+      Object value = ObjectGraph.from(object).navigate(attribute).value();
+
+      if (value == null) {
+        throw new MatcherInputException(
+            String.format("Cannot find '%s' attribute", this.attribute));
+      }
+      return value;
+    } catch (JXPathException e) {
+      throw new MatcherException(
+          String.format("Could not navigate to specific path: '%s'", attribute), e);
     }
+  }
 
-    private boolean makeComparison(Double leftSideNumber, Double rightSideNumber) {
-        return operator.compare(leftSideNumber, rightSideNumber);
+  private Optional<Double> tryParseNumber(Object value) {
+    try {
+      return Optional.of(parseDouble(asString(value)));
+    } catch (NumberFormatException e) {
+      return Optional.empty();
     }
+  }
 
-    private String asString(Object value) {
-        return String.valueOf(value);
-    }
+  private boolean makeComparison(Double leftSideNumber, Double rightSideNumber) {
+    return operator.compare(leftSideNumber, rightSideNumber);
+  }
+
+  private String asString(Object value) {
+    return String.valueOf(value);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/ComparisonOperator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/ComparisonOperator.java
index 5d7709f607..d111e3de38 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/ComparisonOperator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/ComparisonOperator.java
@@ -1,6 +1,5 @@
 package pl.allegro.tech.hermes.management.infrastructure.query.matcher;
 
-
 public interface ComparisonOperator {
-    boolean compare(double a, double b);
+  boolean compare(double a, double b);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/EqualityMatcher.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/EqualityMatcher.java
index 0b264bc7f5..555dfac31d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/EqualityMatcher.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/EqualityMatcher.java
@@ -5,30 +5,30 @@
 
 public class EqualityMatcher implements Matcher {
 
-    private final String attribute;
+  private final String attribute;
 
-    private final Object expected;
+  private final Object expected;
 
-    public EqualityMatcher(String attribute, Object expected) {
-        this.attribute = attribute;
-        this.expected = expected;
-    }
+  public EqualityMatcher(String attribute, Object expected) {
+    this.attribute = attribute;
+    this.expected = expected;
+  }
 
-    @Override
-    public boolean match(Object value) {
-        try {
-            if (expected == null) {
-                return false;
-            }
-            Object actual = ObjectGraph.from(value).navigate(attribute).value();
-            return expected.equals(actual)
-                    || asString(expected).equals(asString(actual));
-        } catch (JXPathException e) {
-            throw new MatcherException(String.format("Could not navigate to specific path: '%s'", attribute), e);
-        }
+  @Override
+  public boolean match(Object value) {
+    try {
+      if (expected == null) {
+        return false;
+      }
+      Object actual = ObjectGraph.from(value).navigate(attribute).value();
+      return expected.equals(actual) || asString(expected).equals(asString(actual));
+    } catch (JXPathException e) {
+      throw new MatcherException(
+          String.format("Could not navigate to specific path: '%s'", attribute), e);
     }
+  }
 
-    private static String asString(Object value) {
-        return String.valueOf(value);
-    }
+  private static String asString(Object value) {
+    return String.valueOf(value);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/InMatcher.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/InMatcher.java
index 296bb76e8f..836f827312 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/InMatcher.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/InMatcher.java
@@ -1,41 +1,40 @@
 package pl.allegro.tech.hermes.management.infrastructure.query.matcher;
 
+import java.util.Arrays;
 import org.apache.commons.jxpath.JXPathException;
 import pl.allegro.tech.hermes.management.infrastructure.query.graph.ObjectGraph;
 
-import java.util.Arrays;
-
 public class InMatcher implements Matcher {
 
-    private final String attribute;
+  private final String attribute;
 
-    private final Object[] values;
+  private final Object[] values;
 
-    public InMatcher(String attribute, Object[] values) {
-        this.attribute = attribute;
-        this.values = values;
-    }
+  public InMatcher(String attribute, Object[] values) {
+    this.attribute = attribute;
+    this.values = values;
+  }
 
-    @Override
-    public boolean match(Object value) {
-
-        try {
-            if (values == null || values.length == 0) {
-                return false;
-            }
-            Object actual = ObjectGraph.from(value).navigate(attribute).value();
-            return actual != null && (contains(actual) || contains(asString(actual)));
-        } catch (JXPathException e) {
-            throw new MatcherException(String.format("Could not navigate to specific path: '%s'", attribute), e);
-        }
-    }
+  @Override
+  public boolean match(Object value) {
 
-    private boolean contains(Object actual) {
-        return Arrays.stream(values)
-                .anyMatch(actual::equals);
+    try {
+      if (values == null || values.length == 0) {
+        return false;
+      }
+      Object actual = ObjectGraph.from(value).navigate(attribute).value();
+      return actual != null && (contains(actual) || contains(asString(actual)));
+    } catch (JXPathException e) {
+      throw new MatcherException(
+          String.format("Could not navigate to specific path: '%s'", attribute), e);
     }
+  }
 
-    private String asString(Object actual) {
-        return String.valueOf(actual);
-    }
+  private boolean contains(Object actual) {
+    return Arrays.stream(values).anyMatch(actual::equals);
+  }
+
+  private String asString(Object actual) {
+    return String.valueOf(actual);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/LikeMatcher.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/LikeMatcher.java
index 4662ab6140..20cdd22d23 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/LikeMatcher.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/LikeMatcher.java
@@ -1,37 +1,38 @@
 package pl.allegro.tech.hermes.management.infrastructure.query.matcher;
 
-import org.apache.commons.jxpath.JXPathException;
-import pl.allegro.tech.hermes.management.infrastructure.query.graph.ObjectGraph;
-
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
+import org.apache.commons.jxpath.JXPathException;
+import pl.allegro.tech.hermes.management.infrastructure.query.graph.ObjectGraph;
 
 public class LikeMatcher implements Matcher {
 
-    private final String attribute;
+  private final String attribute;
 
-    private final Pattern expected;
+  private final Pattern expected;
 
-    public LikeMatcher(String attribute, Object expected) {
-        this.attribute = attribute;
-        try {
-            this.expected = Pattern.compile(asString(expected));
-        } catch (PatternSyntaxException e) {
-            throw new MatcherException(String.format("Could not parse regexp pattern: '%s'", expected), e);
-        }
+  public LikeMatcher(String attribute, Object expected) {
+    this.attribute = attribute;
+    try {
+      this.expected = Pattern.compile(asString(expected));
+    } catch (PatternSyntaxException e) {
+      throw new MatcherException(
+          String.format("Could not parse regexp pattern: '%s'", expected), e);
     }
-
-    @Override
-    public boolean match(Object value) {
-        try {
-            Object actual = ObjectGraph.from(value).navigate(attribute).value();
-            return expected.matcher(asString(actual)).matches();
-        } catch (JXPathException e) {
-            throw new MatcherException(String.format("Could not navigate to specific path: '%s'", attribute), e);
-        }
+  }
+
+  @Override
+  public boolean match(Object value) {
+    try {
+      Object actual = ObjectGraph.from(value).navigate(attribute).value();
+      return expected.matcher(asString(actual)).matches();
+    } catch (JXPathException e) {
+      throw new MatcherException(
+          String.format("Could not navigate to specific path: '%s'", attribute), e);
     }
+  }
 
-    private static String asString(Object value) {
-        return String.valueOf(value);
-    }
+  private static String asString(Object value) {
+    return String.valueOf(value);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/Matcher.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/Matcher.java
index 987bba8065..734554f95e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/Matcher.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/Matcher.java
@@ -2,5 +2,5 @@
 
 public interface Matcher {
 
-    boolean match(Object value);
+  boolean match(Object value);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherException.java
index 05b49d4f75..60e3f05ada 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherException.java
@@ -2,11 +2,11 @@
 
 public class MatcherException extends RuntimeException {
 
-    public MatcherException(String message) {
-        super(message);
-    }
+  public MatcherException(String message) {
+    super(message);
+  }
 
-    public MatcherException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public MatcherException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherFactories.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherFactories.java
index 4c21696b30..f26c043153 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherFactories.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherFactories.java
@@ -1,10 +1,5 @@
 package pl.allegro.tech.hermes.management.infrastructure.query.matcher;
 
-import pl.allegro.tech.hermes.management.infrastructure.query.parser.Operator;
-
-import java.util.EnumMap;
-import java.util.Map;
-
 import static pl.allegro.tech.hermes.management.infrastructure.query.parser.Operator.AND;
 import static pl.allegro.tech.hermes.management.infrastructure.query.parser.Operator.EQ;
 import static pl.allegro.tech.hermes.management.infrastructure.query.parser.Operator.GREATER_THAN;
@@ -15,41 +10,51 @@
 import static pl.allegro.tech.hermes.management.infrastructure.query.parser.Operator.NOT;
 import static pl.allegro.tech.hermes.management.infrastructure.query.parser.Operator.OR;
 
-public class MatcherFactories {
-
-    private static final Map<Operator, MatcherFactory> FACTORIES = new EnumMap<>(Operator.class);
-
-    static {
-        registerFactories();
-    }
+import java.util.EnumMap;
+import java.util.Map;
+import pl.allegro.tech.hermes.management.infrastructure.query.parser.Operator;
 
-    public static MatcherFactory getMatcherFactory(String operator) {
-        try {
-            return getMatcherFactory(Operator.from(operator));
-        } catch (IllegalArgumentException e) {
-            throw new MatcherNotFoundException(
-                    String.format("Unrecognized operator: '%s'", operator)
-            );
-        }
-    }
+public class MatcherFactories {
 
-    private static MatcherFactory getMatcherFactory(Operator operator) {
-        return FACTORIES.get(operator);
-    }
+  private static final Map<Operator, MatcherFactory> FACTORIES = new EnumMap<>(Operator.class);
 
-    public static MatcherFactory defaultMatcher() {
-        return getMatcherFactory(EQ);
-    }
+  static {
+    registerFactories();
+  }
 
-    private static void registerFactories() {
-        FACTORIES.put(EQ, (path, node, parser) -> new EqualityMatcher(path, parser.parseValue(node)));
-        FACTORIES.put(NE, (path, node, parser) -> new NotMatcher(new EqualityMatcher(path, parser.parseValue(node))));
-        FACTORIES.put(LIKE, (path, node, parser) -> new LikeMatcher(path, parser.parseValue(node)));
-        FACTORIES.put(IN, (path, node, parser) -> new InMatcher(path, parser.parseArrayValue(node)));
-        FACTORIES.put(NOT, (path, node, parser) -> new NotMatcher(parser.parseNode(node)));
-        FACTORIES.put(AND, (path, node, parser) -> new AndMatcher(parser.parseArrayNodes(node)));
-        FACTORIES.put(OR, (path, node, parser) -> new OrMatcher(parser.parseArrayNodes(node)));
-        FACTORIES.put(GREATER_THAN, (path, node, parser) -> new ComparisonMatcher(path, parser.parseValue(node), (a, b) -> a > b));
-        FACTORIES.put(LOWER_THAN, (path, node, parser) -> new ComparisonMatcher(path, parser.parseValue(node), (a, b) -> a < b));
+  public static MatcherFactory getMatcherFactory(String operator) {
+    try {
+      return getMatcherFactory(Operator.from(operator));
+    } catch (IllegalArgumentException e) {
+      throw new MatcherNotFoundException(String.format("Unrecognized operator: '%s'", operator));
     }
+  }
+
+  private static MatcherFactory getMatcherFactory(Operator operator) {
+    return FACTORIES.get(operator);
+  }
+
+  public static MatcherFactory defaultMatcher() {
+    return getMatcherFactory(EQ);
+  }
+
+  private static void registerFactories() {
+    FACTORIES.put(EQ, (path, node, parser) -> new EqualityMatcher(path, parser.parseValue(node)));
+    FACTORIES.put(
+        NE,
+        (path, node, parser) -> new NotMatcher(new EqualityMatcher(path, parser.parseValue(node))));
+    FACTORIES.put(LIKE, (path, node, parser) -> new LikeMatcher(path, parser.parseValue(node)));
+    FACTORIES.put(IN, (path, node, parser) -> new InMatcher(path, parser.parseArrayValue(node)));
+    FACTORIES.put(NOT, (path, node, parser) -> new NotMatcher(parser.parseNode(node)));
+    FACTORIES.put(AND, (path, node, parser) -> new AndMatcher(parser.parseArrayNodes(node)));
+    FACTORIES.put(OR, (path, node, parser) -> new OrMatcher(parser.parseArrayNodes(node)));
+    FACTORIES.put(
+        GREATER_THAN,
+        (path, node, parser) ->
+            new ComparisonMatcher(path, parser.parseValue(node), (a, b) -> a > b));
+    FACTORIES.put(
+        LOWER_THAN,
+        (path, node, parser) ->
+            new ComparisonMatcher(path, parser.parseValue(node), (a, b) -> a < b));
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherFactory.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherFactory.java
index 7916c38307..ba50732293 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherFactory.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherFactory.java
@@ -5,5 +5,5 @@
 
 public interface MatcherFactory {
 
-    Matcher createMatcher(String path, JsonNode value, QueryParserContext context);
+  Matcher createMatcher(String path, JsonNode value, QueryParserContext context);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherInputException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherInputException.java
index 2805dbdf62..62f32a29a9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherInputException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherInputException.java
@@ -5,12 +5,12 @@
 
 public class MatcherInputException extends ManagementException {
 
-    public MatcherInputException(String message) {
-        super(message);
-    }
+  public MatcherInputException(String message) {
+    super(message);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.INVALID_QUERY;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.INVALID_QUERY;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherNotFoundException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherNotFoundException.java
index e356892b46..5941c00480 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherNotFoundException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/MatcherNotFoundException.java
@@ -2,11 +2,11 @@
 
 public class MatcherNotFoundException extends RuntimeException {
 
-    public MatcherNotFoundException(String message) {
-        super(message);
-    }
+  public MatcherNotFoundException(String message) {
+    super(message);
+  }
 
-    public MatcherNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public MatcherNotFoundException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/NotMatcher.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/NotMatcher.java
index 118a942284..1915f8ef54 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/NotMatcher.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/NotMatcher.java
@@ -2,14 +2,14 @@
 
 public class NotMatcher implements Matcher {
 
-    private final Matcher matcher;
+  private final Matcher matcher;
 
-    public NotMatcher(Matcher matcher) {
-        this.matcher = matcher;
-    }
+  public NotMatcher(Matcher matcher) {
+    this.matcher = matcher;
+  }
 
-    @Override
-    public boolean match(Object value) {
-        return !matcher.match(value);
-    }
+  @Override
+  public boolean match(Object value) {
+    return !matcher.match(value);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/OrMatcher.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/OrMatcher.java
index 95c7485a6c..9fab841bac 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/OrMatcher.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/matcher/OrMatcher.java
@@ -4,18 +4,18 @@
 
 public class OrMatcher implements Matcher {
 
-    private final Collection<Matcher> matchers;
+  private final Collection<Matcher> matchers;
 
-    public OrMatcher(Collection<Matcher> matchers) {
-        this.matchers = matchers;
-    }
+  public OrMatcher(Collection<Matcher> matchers) {
+    this.matchers = matchers;
+  }
 
-    @Override
-    public boolean match(Object value) {
-        return matchers.stream().reduce(
-                false,
-                (match, matcher) -> match || matcher.match(value),
-                (first, second) -> first || second
-        );
-    }
+  @Override
+  public boolean match(Object value) {
+    return matchers.stream()
+        .reduce(
+            false,
+            (match, matcher) -> match || matcher.match(value),
+            (first, second) -> first || second);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/Operator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/Operator.java
index 189cedc1be..126f8f4f00 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/Operator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/Operator.java
@@ -4,38 +4,35 @@
 import java.util.Optional;
 
 public enum Operator {
-
-    EQ("eq"),
-    NE("ne"),
-    LIKE("like"),
-    IN("in"),
-    NOT("not"),
-    AND("and"),
-    OR("or"),
-    GREATER_THAN("gt"),
-    LOWER_THAN("lt");
-
-
-    private String name;
-
-    Operator(String name) {
-        this.name = name;
-    }
-
-    public static Operator from(String name) {
-        return fromOptional(name)
-                .orElseThrow(
-                        () -> new IllegalArgumentException(String.format("No operator matching '%s' could be found", name))
-                );
-    }
-
-    public static boolean isValid(String name) {
-        return fromOptional(name).isPresent();
-    }
-
-    private static Optional<Operator> fromOptional(String name) {
-        return Arrays.stream(values())
-                .filter(value -> value.name.equalsIgnoreCase(name))
-                .findFirst();
-    }
+  EQ("eq"),
+  NE("ne"),
+  LIKE("like"),
+  IN("in"),
+  NOT("not"),
+  AND("and"),
+  OR("or"),
+  GREATER_THAN("gt"),
+  LOWER_THAN("lt");
+
+  private String name;
+
+  Operator(String name) {
+    this.name = name;
+  }
+
+  public static Operator from(String name) {
+    return fromOptional(name)
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    String.format("No operator matching '%s' could be found", name)));
+  }
+
+  public static boolean isValid(String name) {
+    return fromOptional(name).isPresent();
+  }
+
+  private static Optional<Operator> fromOptional(String name) {
+    return Arrays.stream(values()).filter(value -> value.name.equalsIgnoreCase(name)).findFirst();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/ParseException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/ParseException.java
index 7449f40976..81daefb32d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/ParseException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/ParseException.java
@@ -2,11 +2,11 @@
 
 public class ParseException extends RuntimeException {
 
-    public ParseException(String message) {
-        super(message);
-    }
+  public ParseException(String message) {
+    super(message);
+  }
 
-    public ParseException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public ParseException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/QueryParser.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/QueryParser.java
index ac3a27de87..49153983dd 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/QueryParser.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/QueryParser.java
@@ -1,12 +1,11 @@
 package pl.allegro.tech.hermes.management.infrastructure.query.parser;
 
-import pl.allegro.tech.hermes.api.Query;
-
 import java.io.InputStream;
+import pl.allegro.tech.hermes.api.Query;
 
 public interface QueryParser {
 
-    <T> Query<T> parse(InputStream input, Class<T> type);
+  <T> Query<T> parse(InputStream input, Class<T> type);
 
-    <T> Query<T> parse(String query, Class<T> type);
+  <T> Query<T> parse(String query, Class<T> type);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/QueryParserContext.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/QueryParserContext.java
index 257e2fe8e7..b34143598e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/QueryParserContext.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/QueryParserContext.java
@@ -1,17 +1,16 @@
 package pl.allegro.tech.hermes.management.infrastructure.query.parser;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import pl.allegro.tech.hermes.management.infrastructure.query.matcher.Matcher;
-
 import java.util.List;
+import pl.allegro.tech.hermes.management.infrastructure.query.matcher.Matcher;
 
 public interface QueryParserContext {
 
-    Matcher parseNode(JsonNode node);
+  Matcher parseNode(JsonNode node);
 
-    List<Matcher> parseArrayNodes(JsonNode node);
+  List<Matcher> parseArrayNodes(JsonNode node);
 
-    Object parseValue(JsonNode node);
+  Object parseValue(JsonNode node);
 
-    Object[] parseArrayValue(JsonNode node);
+  Object[] parseArrayValue(JsonNode node);
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/json/JsonQueryParser.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/json/JsonQueryParser.java
index 009e345b5f..303158975d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/json/JsonQueryParser.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/query/parser/json/JsonQueryParser.java
@@ -1,8 +1,18 @@
 package pl.allegro.tech.hermes.management.infrastructure.query.parser.json;
 
+import static java.util.stream.StreamSupport.stream;
+import static pl.allegro.tech.hermes.management.infrastructure.query.MatcherQuery.fromMatcher;
+import static pl.allegro.tech.hermes.management.infrastructure.utils.Iterators.stream;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import pl.allegro.tech.hermes.api.Query;
 import pl.allegro.tech.hermes.management.infrastructure.query.matcher.AndMatcher;
 import pl.allegro.tech.hermes.management.infrastructure.query.matcher.Matcher;
@@ -13,152 +23,134 @@
 import pl.allegro.tech.hermes.management.infrastructure.query.parser.QueryParser;
 import pl.allegro.tech.hermes.management.infrastructure.query.parser.QueryParserContext;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.util.stream.StreamSupport.stream;
-import static pl.allegro.tech.hermes.management.infrastructure.query.MatcherQuery.fromMatcher;
-import static pl.allegro.tech.hermes.management.infrastructure.utils.Iterators.stream;
-
 public class JsonQueryParser implements QueryParser, QueryParserContext {
 
-    private static final String QUERY = "query";
-
-    private final ObjectMapper objectMapper;
-
-    public JsonQueryParser(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-    }
-
-    @Override
-    public <T> Query<T> parse(InputStream input, Class<T> type) {
-        try {
-            return parseDocument(
-                    objectMapper.readTree(input)
-            );
-        } catch (IOException | MatcherNotFoundException e) {
-            throw new ParseException("Query could not be parsed", e);
-        }
-    }
-
-    @Override
-    public <T> Query<T> parse(String query, Class<T> type) {
-        return parse(new ByteArrayInputStream(query.getBytes()), type);
-    }
-
-    @Override
-    public Matcher parseNode(JsonNode node) {
-        Map.Entry<String, JsonNode> entry = singleNode(node);
-        return parseSingleAttribute(entry.getKey(), entry.getValue());
-    }
-
-    @Override
-    public List<Matcher> parseArrayNodes(JsonNode node) {
-        if (!node.isArray()) {
-            throw new ParseException("Element value was expected to be an array");
-        }
-        return parseObjectArray(node);
-    }
-
-    @Override
-    public Object parseValue(JsonNode node) {
-        if (!node.isValueNode()) {
-            throw new ParseException("The node value wasn't present");
-        }
-        if (node.isTextual()) {
-            return node.asText();
-        } else if (node.isBoolean()) {
-            return node.asBoolean();
-        } else if (node.isInt()) {
-            return node.asInt();
-        } else if (node.isDouble()) {
-            return node.asDouble();
-        }
-        return null;
-    }
-
-    @Override
-    public Object[] parseArrayValue(JsonNode node) {
-        if (!node.isArray()) {
-            throw new ParseException("Element value was expected to be an array");
-        }
-        return stream(node.spliterator(), false)
-                .map(this::parseValue)
-                .toArray();
-    }
-
-    private <T> Query<T> parseDocument(JsonNode document) {
-        validateDocument(document);
-        return parseQuery(document.get(QUERY));
-    }
-
-    private <T> Query<T> parseQuery(JsonNode node) {
-        return fromMatcher(parseCompoundObject(node), objectMapper);
-    }
-
-    private Matcher parseCompoundObject(JsonNode node) {
-        return new AndMatcher(parseAllAttributes(node));
-    }
-
-    private <T> Matcher parseSingleAttribute(String key, JsonNode node) {
-        if (isOperator(key)) {
-            return parseOperator(key, node);
-        } else if (node.isObject()) {
-            return parseObject(key, node);
-        } else {
-            return parseAttribute(key, node);
-        }
-    }
-
-    private <T> List<Matcher> parseAllAttributes(JsonNode node) {
-        return stream(node.fields())
-                .map(entry -> parseSingleAttribute(entry.getKey(), entry.getValue()))
-                .collect(Collectors.toList());
-    }
-
-    private <T> Matcher parseOperator(String key, JsonNode node) {
-        return MatcherFactories.getMatcherFactory(key).createMatcher(key, node, this);
-    }
-
-    private <T> Matcher parseObject(String key, JsonNode node) {
-        Map.Entry<String, JsonNode> entry = singleNode(node);
-        return MatcherFactories.getMatcherFactory(entry.getKey()).createMatcher(key, entry.getValue(), this);
-    }
-
-    private <T> List<Matcher> parseObjectArray(JsonNode node) {
-        return stream(node.iterator())
-                .map(this::parseCompoundObject)
-                .collect(Collectors.toList());
-    }
-
-    private <T> Matcher parseAttribute(String key, JsonNode node) {
-        return MatcherFactories.defaultMatcher().createMatcher(key, node, this);
-    }
-
-    private boolean isOperator(String key) {
-        return Operator.isValid(key);
-    }
-
-    private Map.Entry<String, JsonNode> singleNode(JsonNode node) {
-        List<Map.Entry<String, JsonNode>> attributes = Lists.newArrayList(node.fields());
-        if (attributes.size() != 1) {
-            throw new MatcherNotFoundException(
-                    String.format(
-                            "The object must define exactly one member, but defines %s",
-                            Lists.newArrayList(node.fieldNames()).toString()
-                    )
-            );
-        }
-        return attributes.get(0);
-    }
-
-    private void validateDocument(JsonNode document) {
-        if (!document.isObject() || !document.has(QUERY)) {
-            throw new ParseException("JSON object must contain 'query' attribute");
-        }
-    }
+  private static final String QUERY = "query";
+
+  private final ObjectMapper objectMapper;
+
+  public JsonQueryParser(ObjectMapper objectMapper) {
+    this.objectMapper = objectMapper;
+  }
+
+  @Override
+  public <T> Query<T> parse(InputStream input, Class<T> type) {
+    try {
+      return parseDocument(objectMapper.readTree(input));
+    } catch (IOException | MatcherNotFoundException e) {
+      throw new ParseException("Query could not be parsed", e);
+    }
+  }
+
+  @Override
+  public <T> Query<T> parse(String query, Class<T> type) {
+    return parse(new ByteArrayInputStream(query.getBytes()), type);
+  }
+
+  @Override
+  public Matcher parseNode(JsonNode node) {
+    Map.Entry<String, JsonNode> entry = singleNode(node);
+    return parseSingleAttribute(entry.getKey(), entry.getValue());
+  }
+
+  @Override
+  public List<Matcher> parseArrayNodes(JsonNode node) {
+    if (!node.isArray()) {
+      throw new ParseException("Element value was expected to be an array");
+    }
+    return parseObjectArray(node);
+  }
+
+  @Override
+  public Object parseValue(JsonNode node) {
+    if (!node.isValueNode()) {
+      throw new ParseException("The node value wasn't present");
+    }
+    if (node.isTextual()) {
+      return node.asText();
+    } else if (node.isBoolean()) {
+      return node.asBoolean();
+    } else if (node.isInt()) {
+      return node.asInt();
+    } else if (node.isDouble()) {
+      return node.asDouble();
+    }
+    return null;
+  }
+
+  @Override
+  public Object[] parseArrayValue(JsonNode node) {
+    if (!node.isArray()) {
+      throw new ParseException("Element value was expected to be an array");
+    }
+    return stream(node.spliterator(), false).map(this::parseValue).toArray();
+  }
+
+  private <T> Query<T> parseDocument(JsonNode document) {
+    validateDocument(document);
+    return parseQuery(document.get(QUERY));
+  }
+
+  private <T> Query<T> parseQuery(JsonNode node) {
+    return fromMatcher(parseCompoundObject(node), objectMapper);
+  }
+
+  private Matcher parseCompoundObject(JsonNode node) {
+    return new AndMatcher(parseAllAttributes(node));
+  }
+
+  private <T> Matcher parseSingleAttribute(String key, JsonNode node) {
+    if (isOperator(key)) {
+      return parseOperator(key, node);
+    } else if (node.isObject()) {
+      return parseObject(key, node);
+    } else {
+      return parseAttribute(key, node);
+    }
+  }
+
+  private <T> List<Matcher> parseAllAttributes(JsonNode node) {
+    return stream(node.fields())
+        .map(entry -> parseSingleAttribute(entry.getKey(), entry.getValue()))
+        .collect(Collectors.toList());
+  }
+
+  private <T> Matcher parseOperator(String key, JsonNode node) {
+    return MatcherFactories.getMatcherFactory(key).createMatcher(key, node, this);
+  }
+
+  private <T> Matcher parseObject(String key, JsonNode node) {
+    Map.Entry<String, JsonNode> entry = singleNode(node);
+    return MatcherFactories.getMatcherFactory(entry.getKey())
+        .createMatcher(key, entry.getValue(), this);
+  }
+
+  private <T> List<Matcher> parseObjectArray(JsonNode node) {
+    return stream(node.iterator()).map(this::parseCompoundObject).collect(Collectors.toList());
+  }
+
+  private <T> Matcher parseAttribute(String key, JsonNode node) {
+    return MatcherFactories.defaultMatcher().createMatcher(key, node, this);
+  }
+
+  private boolean isOperator(String key) {
+    return Operator.isValid(key);
+  }
+
+  private Map.Entry<String, JsonNode> singleNode(JsonNode node) {
+    List<Map.Entry<String, JsonNode>> attributes = Lists.newArrayList(node.fields());
+    if (attributes.size() != 1) {
+      throw new MatcherNotFoundException(
+          String.format(
+              "The object must define exactly one member, but defines %s",
+              Lists.newArrayList(node.fieldNames()).toString()));
+    }
+    return attributes.get(0);
+  }
+
+  private void validateDocument(JsonNode document) {
+    if (!document.isObject() || !document.has(QUERY)) {
+      throw new ParseException("JSON object must contain 'query' attribute");
+    }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/readiness/ZookeeperDatacenterReadinessRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/readiness/ZookeeperDatacenterReadinessRepository.java
index ec1d0fe0f3..70ae608271 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/readiness/ZookeeperDatacenterReadinessRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/readiness/ZookeeperDatacenterReadinessRepository.java
@@ -1,45 +1,52 @@
 package pl.allegro.tech.hermes.management.infrastructure.readiness;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collections;
+import java.util.List;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.KeeperException;
-import pl.allegro.tech.hermes.api.Readiness;
+import pl.allegro.tech.hermes.api.DatacenterReadiness;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
+import pl.allegro.tech.hermes.domain.readiness.DatacenterReadinessList;
+import pl.allegro.tech.hermes.infrastructure.MalformedDataException;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperBasedRepository;
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
-import pl.allegro.tech.hermes.management.domain.readiness.ReadinessRepository;
+import pl.allegro.tech.hermes.management.domain.readiness.DatacenterReadinessRepository;
 
-public class ZookeeperDatacenterReadinessRepository extends ZookeeperBasedRepository implements ReadinessRepository {
+public class ZookeeperDatacenterReadinessRepository extends ZookeeperBasedRepository
+    implements DatacenterReadinessRepository {
 
-    public ZookeeperDatacenterReadinessRepository(CuratorFramework curator, ObjectMapper mapper, ZookeeperPaths paths) {
-        super(curator, mapper, paths);
-    }
+  public ZookeeperDatacenterReadinessRepository(
+      CuratorFramework curator, ObjectMapper mapper, ZookeeperPaths paths) {
+    super(curator, mapper, paths);
+  }
 
-    @Override
-    public boolean isReady() {
-        try {
-            String path = paths.frontendReadinessPath();
-            Readiness readiness = readFrom(path, Readiness.class);
-            return readiness.isReady();
-        } catch (InternalProcessingException e) {
-            if (e.getCause() instanceof KeeperException.NoNodeException) {
-                return true;
-            }
-            throw e;
-        }
+  @Override
+  public List<DatacenterReadiness> getReadiness() {
+    try {
+      String path = paths.datacenterReadinessPath();
+      return readFrom(path, DatacenterReadinessList.class).datacenters();
+    } catch (InternalProcessingException e) {
+      if (e.getCause() instanceof KeeperException.NoNodeException) {
+        return Collections.emptyList();
+      }
+      throw e;
+    } catch (MalformedDataException e) {
+      return Collections.emptyList();
     }
+  }
 
-    @Override
-    public void setReadiness(boolean isReady) {
-        try {
-            String path = paths.frontendReadinessPath();
-            if (!pathExists(path)) {
-                createRecursively(path, new Readiness(isReady));
-            } else {
-                overwrite(path, new Readiness(isReady));
-            }
-        } catch (Exception ex) {
-            throw new InternalProcessingException(ex);
-        }
+  @Override
+  public void setReadiness(List<DatacenterReadiness> datacenterReadiness) {
+    try {
+      String path = paths.datacenterReadinessPath();
+      if (!pathExists(path)) {
+        createRecursively(path, new DatacenterReadinessList(datacenterReadiness));
+      } else {
+        overwrite(path, new DatacenterReadinessList(datacenterReadiness));
+      }
+    } catch (Exception ex) {
+      throw new InternalProcessingException(ex);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/retransmit/ZookeeperOfflineRetransmissionRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/retransmit/ZookeeperOfflineRetransmissionRepository.java
index 715f9db2af..3b1d4ee66e 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/retransmit/ZookeeperOfflineRetransmissionRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/retransmit/ZookeeperOfflineRetransmissionRepository.java
@@ -1,6 +1,11 @@
 package pl.allegro.tech.hermes.management.infrastructure.retransmit;
 
+import static java.lang.String.format;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.apache.curator.framework.CuratorFramework;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,67 +16,65 @@
 import pl.allegro.tech.hermes.management.domain.retransmit.OfflineRetransmissionRepository;
 import pl.allegro.tech.hermes.management.domain.retransmit.OfflineRetransmissionValidationException;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static java.lang.String.format;
-
-public class ZookeeperOfflineRetransmissionRepository extends ZookeeperBasedRepository implements OfflineRetransmissionRepository {
+public class ZookeeperOfflineRetransmissionRepository extends ZookeeperBasedRepository
+    implements OfflineRetransmissionRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperOfflineRetransmissionRepository.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(ZookeeperOfflineRetransmissionRepository.class);
 
-    public ZookeeperOfflineRetransmissionRepository(CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
-        super(zookeeper, mapper, paths);
-    }
+  public ZookeeperOfflineRetransmissionRepository(
+      CuratorFramework zookeeper, ObjectMapper mapper, ZookeeperPaths paths) {
+    super(zookeeper, mapper, paths);
+  }
 
-    @Override
-    public void saveTask(OfflineRetransmissionTask task) {
-        logger.info("Saving retransmission task {}", task);
-        try {
-            createRecursively(paths.offlineRetransmissionPath(task.getTaskId()), task);
-            logger.info("Successfully saved retransmission task {}", task);
-        } catch (Exception ex) {
-            String msg = format("Error while saving retransmission task %s", task.toString());
-            throw new InternalProcessingException(msg, ex);
-        }
+  @Override
+  public void saveTask(OfflineRetransmissionTask task) {
+    logger.info("Saving retransmission task {}", task);
+    try {
+      createRecursively(paths.offlineRetransmissionPath(task.getTaskId()), task);
+      logger.info("Successfully saved retransmission task {}", task);
+    } catch (Exception ex) {
+      String msg = format("Error while saving retransmission task %s", task.toString());
+      throw new InternalProcessingException(msg, ex);
     }
+  }
 
-    @Override
-    public List<OfflineRetransmissionTask> getAllTasks() {
-        try {
-            if (pathExists(paths.offlineRetransmissionPath())) {
-                return childrenOf(paths.offlineRetransmissionPath())
-                        .stream()
-                        .map(id -> readFrom(paths.offlineRetransmissionPath(id), OfflineRetransmissionTask.class))
-                        .collect(Collectors.toList());
-            }
-            return Collections.emptyList();
-        } catch (Exception ex) {
-            String msg = "Error while fetching offline retransmission tasks";
-            throw new InternalProcessingException(msg, ex);
-        }
+  @Override
+  public List<OfflineRetransmissionTask> getAllTasks() {
+    try {
+      if (pathExists(paths.offlineRetransmissionPath())) {
+        return childrenOf(paths.offlineRetransmissionPath()).stream()
+            .map(
+                id ->
+                    readFrom(paths.offlineRetransmissionPath(id), OfflineRetransmissionTask.class))
+            .collect(Collectors.toList());
+      }
+      return Collections.emptyList();
+    } catch (Exception ex) {
+      String msg = "Error while fetching offline retransmission tasks";
+      throw new InternalProcessingException(msg, ex);
     }
+  }
 
-    @Override
-    public void deleteTask(String taskId) {
-        logger.info("Trying to delete retransmission task with id={}", taskId);
-        try {
-            ensureTaskExists(taskId);
-            remove(paths.offlineRetransmissionPath(taskId));
-            logger.info("Successfully deleted retransmission task with id={}", taskId);
-        } catch (OfflineRetransmissionValidationException ex) {
-            throw ex;
-        } catch (Exception ex) {
-            String msg = format("Error while deleting retransmission task with id=%s", taskId);
-            throw new InternalProcessingException(msg, ex);
-        }
+  @Override
+  public void deleteTask(String taskId) {
+    logger.info("Trying to delete retransmission task with id={}", taskId);
+    try {
+      ensureTaskExists(taskId);
+      remove(paths.offlineRetransmissionPath(taskId));
+      logger.info("Successfully deleted retransmission task with id={}", taskId);
+    } catch (OfflineRetransmissionValidationException ex) {
+      throw ex;
+    } catch (Exception ex) {
+      String msg = format("Error while deleting retransmission task with id=%s", taskId);
+      throw new InternalProcessingException(msg, ex);
     }
+  }
 
-    private void ensureTaskExists(String taskId) {
-        if (!pathExists(paths.offlineRetransmissionPath(taskId))) {
-            String msg = String.format("Retransmission task with id %s does not exist.", taskId);
-            throw new OfflineRetransmissionValidationException(msg);
-        }
+  private void ensureTaskExists(String taskId) {
+    if (!pathExists(paths.offlineRetransmissionPath(taskId))) {
+      String msg = String.format("Retransmission task with id %s does not exist.", taskId);
+      throw new OfflineRetransmissionValidationException(msg);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/AvroSchemaValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/AvroSchemaValidator.java
index 950ce07116..48ab6256d7 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/AvroSchemaValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/AvroSchemaValidator.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.management.infrastructure.schema.validator;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Strings.isNullOrEmpty;
+
+import java.io.IOException;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;
 import org.apache.commons.io.IOUtils;
@@ -7,70 +11,68 @@
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.management.config.TopicProperties;
 
-import java.io.IOException;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 @Component
 public class AvroSchemaValidator implements SchemaValidator {
 
-    private static final Schema HERMES_METADATA_SCHEMA =
-            metadataFieldSchema(readAndParseResourceSchema("/avro-schema-metadata-field.avsc"));
-    private final boolean metadataFieldIsRequired;
+  private static final Schema HERMES_METADATA_SCHEMA =
+      metadataFieldSchema(readAndParseResourceSchema("/avro-schema-metadata-field.avsc"));
+  private final boolean metadataFieldIsRequired;
 
-    public AvroSchemaValidator(boolean metadataFieldIsRequired) {
-        this.metadataFieldIsRequired = metadataFieldIsRequired;
-    }
+  public AvroSchemaValidator(boolean metadataFieldIsRequired) {
+    this.metadataFieldIsRequired = metadataFieldIsRequired;
+  }
 
-    @Autowired
-    public AvroSchemaValidator(TopicProperties topicProperties) {
-        this(topicProperties.isAvroContentTypeMetadataRequired());
-    }
+  @Autowired
+  public AvroSchemaValidator(TopicProperties topicProperties) {
+    this(topicProperties.isAvroContentTypeMetadataRequired());
+  }
 
-    private static Schema metadataFieldSchema(Schema schema) {
-        Schema.Field metadata = schema.getField("__metadata");
-        if (metadata == null) {
-            throw new InvalidSchemaException("Missing Hermes __metadata field");
-        }
-        return metadata.schema();
+  private static Schema metadataFieldSchema(Schema schema) {
+    Schema.Field metadata = schema.getField("__metadata");
+    if (metadata == null) {
+      throw new InvalidSchemaException("Missing Hermes __metadata field");
     }
+    return metadata.schema();
+  }
 
-    private static Schema readAndParseResourceSchema(String resourceFilePath) {
-        try {
-            String schema = IOUtils.toString(AvroSchemaValidator.class.getResourceAsStream(resourceFilePath), "UTF-8");
-            return parseSchema(schema);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not load schema with metadata");
-        }
+  private static Schema readAndParseResourceSchema(String resourceFilePath) {
+    try {
+      String schema =
+          IOUtils.toString(
+              AvroSchemaValidator.class.getResourceAsStream(resourceFilePath), "UTF-8");
+      return parseSchema(schema);
+    } catch (IOException e) {
+      throw new RuntimeException("Could not load schema with metadata");
     }
+  }
 
-    private static Schema parseSchema(String schema) {
-        try {
-            return new Schema.Parser().parse(schema);
-        } catch (SchemaParseException e) {
-            throw new InvalidSchemaException(e);
-        }
+  private static Schema parseSchema(String schema) {
+    try {
+      return new Schema.Parser().parse(schema);
+    } catch (SchemaParseException e) {
+      throw new InvalidSchemaException(e);
     }
+  }
 
-    @Override
-    public void check(String schema) throws InvalidSchemaException {
-        checkArgument(!isNullOrEmpty(schema), "Message schema cannot be empty");
-        Schema parsedSchema = parseSchema(schema);
-        if (metadataFieldIsRequired) {
-            checkHermesMetadataField(parsedSchema);
-        }
+  @Override
+  public void check(String schema) throws InvalidSchemaException {
+    checkArgument(!isNullOrEmpty(schema), "Message schema cannot be empty");
+    Schema parsedSchema = parseSchema(schema);
+    if (metadataFieldIsRequired) {
+      checkHermesMetadataField(parsedSchema);
     }
+  }
 
-    private void checkHermesMetadataField(Schema parsedSchema) {
-        Schema metadata = metadataFieldSchema(parsedSchema);
+  private void checkHermesMetadataField(Schema parsedSchema) {
+    Schema metadata = metadataFieldSchema(parsedSchema);
 
-        boolean metadataTypeMatches = HERMES_METADATA_SCHEMA.getType().equals(metadata.getType());
-        boolean metadataNestedTypesMatch = HERMES_METADATA_SCHEMA.getTypes().equals(metadata.getTypes());
-        boolean valid = metadataTypeMatches && metadataNestedTypesMatch;
+    boolean metadataTypeMatches = HERMES_METADATA_SCHEMA.getType().equals(metadata.getType());
+    boolean metadataNestedTypesMatch =
+        HERMES_METADATA_SCHEMA.getTypes().equals(metadata.getTypes());
+    boolean valid = metadataTypeMatches && metadataNestedTypesMatch;
 
-        if (!valid) {
-            throw new InvalidSchemaException("Invalid types used in field __metadata");
-        }
+    if (!valid) {
+      throw new InvalidSchemaException("Invalid types used in field __metadata");
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/InvalidSchemaException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/InvalidSchemaException.java
index 1425acf169..aae90a8818 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/InvalidSchemaException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/InvalidSchemaException.java
@@ -1,23 +1,23 @@
 package pl.allegro.tech.hermes.management.infrastructure.schema.validator;
 
+import static java.lang.String.format;
+
 import org.apache.avro.SchemaParseException;
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.common.exception.HermesException;
 
-import static java.lang.String.format;
-
 public class InvalidSchemaException extends HermesException {
 
-    InvalidSchemaException(String cause) {
-        super(format("Error while trying to validate schema: %s", cause));
-    }
+  InvalidSchemaException(String cause) {
+    super(format("Error while trying to validate schema: %s", cause));
+  }
 
-    InvalidSchemaException(SchemaParseException cause) {
-        super(format("Error while trying to validate schema: %s", cause.getMessage()), cause);
-    }
+  InvalidSchemaException(SchemaParseException cause) {
+    super(format("Error while trying to validate schema: %s", cause.getMessage()), cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.FORMAT_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.FORMAT_ERROR;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/SchemaValidator.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/SchemaValidator.java
index 0bec062cb1..71914129c8 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/SchemaValidator.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/SchemaValidator.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.management.infrastructure.schema.validator;
 
 public interface SchemaValidator {
-    void check(String schema) throws InvalidSchemaException;
+  void check(String schema) throws InvalidSchemaException;
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/SchemaValidatorProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/SchemaValidatorProvider.java
index 026dccb792..10e387d968 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/SchemaValidatorProvider.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/schema/validator/SchemaValidatorProvider.java
@@ -1,41 +1,40 @@
 package pl.allegro.tech.hermes.management.infrastructure.schema.validator;
 
+import java.util.EnumMap;
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.management.domain.ManagementException;
 
-import java.util.EnumMap;
-import java.util.Map;
-
 @Component
 public class SchemaValidatorProvider {
 
-    private final Map<ContentType, SchemaValidator> validators = new EnumMap<>(ContentType.class);
-
-    @Autowired
-    public SchemaValidatorProvider(AvroSchemaValidator avroSchemaValidator) {
-        validators.put(ContentType.AVRO, avroSchemaValidator);
-    }
+  private final Map<ContentType, SchemaValidator> validators = new EnumMap<>(ContentType.class);
 
-    public SchemaValidator provide(ContentType contentType) {
-        if (!validators.containsKey(contentType)) {
-            throw new SchemaValidatorNotAvailable("No schema validator for content-type: " + contentType.name());
-        }
+  @Autowired
+  public SchemaValidatorProvider(AvroSchemaValidator avroSchemaValidator) {
+    validators.put(ContentType.AVRO, avroSchemaValidator);
+  }
 
-        return validators.get(contentType);
+  public SchemaValidator provide(ContentType contentType) {
+    if (!validators.containsKey(contentType)) {
+      throw new SchemaValidatorNotAvailable(
+          "No schema validator for content-type: " + contentType.name());
     }
 
-    class SchemaValidatorNotAvailable extends ManagementException {
-        public SchemaValidatorNotAvailable(String message) {
-            super(message);
-        }
+    return validators.get(contentType);
+  }
 
-        @Override
-        public ErrorCode getCode() {
-            return ErrorCode.VALIDATION_ERROR;
-        }
+  class SchemaValidatorNotAvailable extends ManagementException {
+    public SchemaValidatorNotAvailable(String message) {
+      super(message);
     }
 
+    @Override
+    public ErrorCode getCode() {
+      return ErrorCode.VALIDATION_ERROR;
+    }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/tracker/NoOperationLogRepository.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/tracker/NoOperationLogRepository.java
index a4caa9c204..c12ed3aafe 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/tracker/NoOperationLogRepository.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/tracker/NoOperationLogRepository.java
@@ -1,28 +1,30 @@
 package pl.allegro.tech.hermes.management.infrastructure.tracker;
 
+import java.util.Collections;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.MessageTrace;
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 import pl.allegro.tech.hermes.tracker.management.LogRepository;
 
-import java.util.Collections;
-import java.util.List;
-
 public class NoOperationLogRepository implements LogRepository {
 
-    private static final String NO_LOG_MESSAGE = "No LogRepository implementation found, using default no-operation implementation";
-    private static final Logger logger = LoggerFactory.getLogger(NoOperationLogRepository.class);
+  private static final String NO_LOG_MESSAGE =
+      "No LogRepository implementation found, using default no-operation implementation";
+  private static final Logger logger = LoggerFactory.getLogger(NoOperationLogRepository.class);
 
-    @Override
-    public List<SentMessageTrace> getLastUndeliveredMessages(String topicName, String subscriptionName, int limit) {
-        logger.info(NO_LOG_MESSAGE);
-        return Collections.emptyList();
-    }
+  @Override
+  public List<SentMessageTrace> getLastUndeliveredMessages(
+      String topicName, String subscriptionName, int limit) {
+    logger.info(NO_LOG_MESSAGE);
+    return Collections.emptyList();
+  }
 
-    @Override
-    public List<MessageTrace> getMessageStatus(String qualifiedTopicName, String subscriptionName, String messageId) {
-        logger.info(NO_LOG_MESSAGE);
-        return Collections.emptyList();
-    }
+  @Override
+  public List<MessageTrace> getMessageStatus(
+      String qualifiedTopicName, String subscriptionName, String messageId) {
+    logger.info(NO_LOG_MESSAGE);
+    return Collections.emptyList();
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/utils/Iterators.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/utils/Iterators.java
index 53ae478def..ddebdb35ab 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/utils/Iterators.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/utils/Iterators.java
@@ -8,10 +8,10 @@
 
 public final class Iterators {
 
-    private Iterators() {
-    }
+  private Iterators() {}
 
-    public static <T> Stream<T> stream(Iterator<? extends T> iterator) {
-        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL), false);
-    }
+  public static <T> Stream<T> stream(Iterator<? extends T> iterator) {
+    return StreamSupport.stream(
+        Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL), false);
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClient.java
index 7487d72eb6..5e740a737d 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClient.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClient.java
@@ -1,41 +1,42 @@
 package pl.allegro.tech.hermes.management.infrastructure.zookeeper;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.CreateMode;
 import org.slf4j.Logger;
 import pl.allegro.tech.hermes.common.exception.InternalProcessingException;
 
-import static org.slf4j.LoggerFactory.getLogger;
-
 public class ZookeeperClient {
 
-    private static final Logger logger = getLogger(ZookeeperClient.class);
-    private final CuratorFramework curatorFramework;
-    private final String datacenterName;
-
-    ZookeeperClient(CuratorFramework curatorFramework, String datacenterName) {
-        this.curatorFramework = curatorFramework;
-        this.datacenterName = datacenterName;
-    }
-
-    public CuratorFramework getCuratorFramework() {
-        return curatorFramework;
-    }
-
-    public String getDatacenterName() {
-        return datacenterName;
-    }
-
-    public void ensureEphemeralNodeExists(String path) {
-        try {
-            if (curatorFramework.checkExists().forPath(path) == null) {
-                curatorFramework.create()
-                        .creatingParentsIfNeeded()
-                        .withMode(CreateMode.EPHEMERAL)
-                        .forPath(path);
-            }
-        } catch (Exception e) {
-            throw new InternalProcessingException("Could not ensure existence of path: " + path);
-        }
+  private static final Logger logger = getLogger(ZookeeperClient.class);
+  private final CuratorFramework curatorFramework;
+  private final String datacenterName;
+
+  ZookeeperClient(CuratorFramework curatorFramework, String datacenterName) {
+    this.curatorFramework = curatorFramework;
+    this.datacenterName = datacenterName;
+  }
+
+  public CuratorFramework getCuratorFramework() {
+    return curatorFramework;
+  }
+
+  public String getDatacenterName() {
+    return datacenterName;
+  }
+
+  public void ensureEphemeralNodeExists(String path) {
+    try {
+      if (curatorFramework.checkExists().forPath(path) == null) {
+        curatorFramework
+            .create()
+            .creatingParentsIfNeeded()
+            .withMode(CreateMode.EPHEMERAL)
+            .forPath(path);
+      }
+    } catch (Exception e) {
+      throw new InternalProcessingException("Could not ensure existence of path: " + path);
     }
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientManager.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientManager.java
index 022b629dda..932b2b0b68 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientManager.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientManager.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.management.infrastructure.zookeeper;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.api.ACLProvider;
@@ -14,137 +18,136 @@
 import pl.allegro.tech.hermes.management.config.storage.StorageClustersProperties;
 import pl.allegro.tech.hermes.management.config.storage.StorageProperties;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 public class ZookeeperClientManager {
 
-    private static final Logger logger = LoggerFactory.getLogger(ZookeeperClientManager.class);
-
-    private final StorageClustersProperties properties;
-    private final DatacenterNameProvider datacenterNameProvider;
-    private List<ZookeeperClient> clients;
-    private ZookeeperClient localClient;
-
-    public ZookeeperClientManager(StorageClustersProperties properties, DatacenterNameProvider datacenterNameProvider) {
-        this.properties = properties;
-        this.datacenterNameProvider = datacenterNameProvider;
-    }
-
-    public void start() {
-        createClients();
-        selectLocalClient();
-        waitForConnection(localClient.getCuratorFramework());
-    }
-
-    private void createClients() {
-        clients = getClusterProperties()
-                .stream()
-                .map(clusterProperties -> buildZookeeperClient(clusterProperties, properties))
-                .collect(Collectors.toList());
-    }
-
-    private List<StorageProperties> getClusterProperties() {
-        if (properties.getClusters().isEmpty()) {
-            return Collections.singletonList(createPropertiesForSingleCluster());
-        } else {
-            return properties.getClusters();
-        }
-    }
-
-    private StorageProperties createPropertiesForSingleCluster() {
-        StorageProperties clusterProperties = new StorageProperties();
-        clusterProperties.setConnectionString(properties.getConnectionString());
-        clusterProperties.setConnectTimeout(properties.getConnectTimeout());
-        clusterProperties.setSessionTimeout(properties.getSessionTimeout());
-        clusterProperties.setDatacenter(DefaultDatacenterNameProvider.DEFAULT_DC_NAME);
-        return clusterProperties;
-    }
-
-    private void selectLocalClient() {
-        if (clients.size() == 1) {
-            localClient = clients.get(0);
-        } else {
-            String localDcName = datacenterNameProvider.getDatacenterName();
-            localClient = clients
-                    .stream()
-                    .filter(client -> client.getDatacenterName().equals(localDcName))
-                    .findFirst()
-                    .orElseThrow(() -> new ZookeeperClientNotFoundException(localDcName));
-        }
+  private static final Logger logger = LoggerFactory.getLogger(ZookeeperClientManager.class);
+
+  private final StorageClustersProperties properties;
+  private final DatacenterNameProvider datacenterNameProvider;
+  private List<ZookeeperClient> clients;
+  private ZookeeperClient localClient;
+
+  public ZookeeperClientManager(
+      StorageClustersProperties properties, DatacenterNameProvider datacenterNameProvider) {
+    this.properties = properties;
+    this.datacenterNameProvider = datacenterNameProvider;
+  }
+
+  public void start() {
+    createClients();
+    selectLocalClient();
+    waitForConnection(localClient.getCuratorFramework());
+  }
+
+  private void createClients() {
+    clients =
+        getClusterProperties().stream()
+            .map(clusterProperties -> buildZookeeperClient(clusterProperties, properties))
+            .collect(Collectors.toList());
+  }
+
+  private List<StorageProperties> getClusterProperties() {
+    if (properties.getClusters().isEmpty()) {
+      return Collections.singletonList(createPropertiesForSingleCluster());
+    } else {
+      return properties.getClusters();
     }
-
-    private ZookeeperClient buildZookeeperClient(StorageProperties clusterProperties,
-                                                 StorageClustersProperties commonProperties) {
-        return new ZookeeperClient(
-                buildCuratorFramework(clusterProperties, commonProperties),
-                clusterProperties.getDatacenter()
-        );
+  }
+
+  private StorageProperties createPropertiesForSingleCluster() {
+    StorageProperties clusterProperties = new StorageProperties();
+    clusterProperties.setConnectionString(properties.getConnectionString());
+    clusterProperties.setConnectTimeout(properties.getConnectTimeout());
+    clusterProperties.setSessionTimeout(properties.getSessionTimeout());
+    clusterProperties.setDatacenter(DefaultDatacenterNameProvider.DEFAULT_DC_NAME);
+    return clusterProperties;
+  }
+
+  private void selectLocalClient() {
+    if (clients.size() == 1) {
+      localClient = clients.get(0);
+    } else {
+      String localDcName = datacenterNameProvider.getDatacenterName();
+      localClient =
+          clients.stream()
+              .filter(client -> client.getDatacenterName().equals(localDcName))
+              .findFirst()
+              .orElseThrow(() -> new ZookeeperClientNotFoundException(localDcName));
     }
-
-    private CuratorFramework buildCuratorFramework(StorageProperties clusterProperties,
-                                                   StorageClustersProperties commonProperties) {
-        ExponentialBackoffRetry retryPolicy = new ExponentialBackoffRetry(commonProperties.getRetrySleep(),
-                commonProperties.getRetryTimes());
-
-        CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
-                .connectString(clusterProperties.getConnectionString())
-                .sessionTimeoutMs(clusterProperties.getSessionTimeout())
-                .connectionTimeoutMs(clusterProperties.getConnectTimeout())
-                .retryPolicy(retryPolicy);
-
-        Optional.ofNullable(commonProperties.getAuthorization()).ifPresent(it -> {
-                    builder.authorization(it.getScheme(), (it.getUser() + ":" + it.getPassword()).getBytes());
-                    builder.aclProvider(
-                            new ACLProvider() {
-                                @Override
-                                public List<ACL> getDefaultAcl() {
-                                    return ZooDefs.Ids.CREATOR_ALL_ACL;
-                                }
-
-                                @Override
-                                public List<ACL> getAclForPath(String path) {
-                                    return ZooDefs.Ids.CREATOR_ALL_ACL;
-                                }
-                            }
-                    );
-                }
-        );
-
-        CuratorFramework curator = builder.build();
-        curator.start();
-
-        return curator;
+  }
+
+  private ZookeeperClient buildZookeeperClient(
+      StorageProperties clusterProperties, StorageClustersProperties commonProperties) {
+    return new ZookeeperClient(
+        buildCuratorFramework(clusterProperties, commonProperties),
+        clusterProperties.getDatacenter());
+  }
+
+  private CuratorFramework buildCuratorFramework(
+      StorageProperties clusterProperties, StorageClustersProperties commonProperties) {
+    ExponentialBackoffRetry retryPolicy =
+        new ExponentialBackoffRetry(
+            commonProperties.getRetrySleep(), commonProperties.getRetryTimes());
+
+    CuratorFrameworkFactory.Builder builder =
+        CuratorFrameworkFactory.builder()
+            .connectString(clusterProperties.getConnectionString())
+            .sessionTimeoutMs(clusterProperties.getSessionTimeout())
+            .connectionTimeoutMs(clusterProperties.getConnectTimeout())
+            .retryPolicy(retryPolicy);
+
+    Optional.ofNullable(commonProperties.getAuthorization())
+        .ifPresent(
+            it -> {
+              builder.authorization(
+                  it.getScheme(), (it.getUser() + ":" + it.getPassword()).getBytes());
+              builder.aclProvider(
+                  new ACLProvider() {
+                    @Override
+                    public List<ACL> getDefaultAcl() {
+                      return ZooDefs.Ids.CREATOR_ALL_ACL;
+                    }
+
+                    @Override
+                    public List<ACL> getAclForPath(String path) {
+                      return ZooDefs.Ids.CREATOR_ALL_ACL;
+                    }
+                  });
+            });
+
+    CuratorFramework curator = builder.build();
+    curator.start();
+
+    return curator;
+  }
+
+  private void waitForConnection(CuratorFramework curator) {
+    try {
+      curator.blockUntilConnected();
+    } catch (InterruptedException interruptedException) {
+      RuntimeException exception =
+          new InternalProcessingException(
+              "Could not start curator for storage", interruptedException);
+      logger.error(exception.getMessage(), interruptedException);
+      throw exception;
     }
-
-    private void waitForConnection(CuratorFramework curator) {
-        try {
-            curator.blockUntilConnected();
-        } catch (InterruptedException interruptedException) {
-            RuntimeException exception = new InternalProcessingException("Could not start curator for storage",
-                    interruptedException);
-            logger.error(exception.getMessage(), interruptedException);
-            throw exception;
-        }
+  }
+
+  public void stop() {
+    for (ZookeeperClient client : clients) {
+      try {
+        client.getCuratorFramework().close();
+      } catch (Exception e) {
+        logger.warn("Failed to close Zookeeper client on DC: " + client.getDatacenterName());
+      }
     }
+  }
 
-    public void stop() {
-        for (ZookeeperClient client : clients) {
-            try {
-                client.getCuratorFramework().close();
-            } catch (Exception e) {
-                logger.warn("Failed to close Zookeeper client on DC: " + client.getDatacenterName());
-            }
-        }
-    }
+  public ZookeeperClient getLocalClient() {
+    return localClient;
+  }
 
-    public ZookeeperClient getLocalClient() {
-        return localClient;
-    }
-
-    public List<ZookeeperClient> getClients() {
-        return clients;
-    }
+  public List<ZookeeperClient> getClients() {
+    return clients;
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientNotFoundException.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientNotFoundException.java
index 6f0cfe6f28..830c0605b2 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientNotFoundException.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientNotFoundException.java
@@ -1,7 +1,10 @@
 package pl.allegro.tech.hermes.management.infrastructure.zookeeper;
 
 public class ZookeeperClientNotFoundException extends RuntimeException {
-    public ZookeeperClientNotFoundException(String localDcName) {
-        super("No Zookeeper client is configured to connect to cluster on DC (name: " + localDcName + ").");
-    }
+  public ZookeeperClientNotFoundException(String localDcName) {
+    super(
+        "No Zookeeper client is configured to connect to cluster on DC (name: "
+            + localDcName
+            + ").");
+  }
 }
diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperRepositoryManager.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperRepositoryManager.java
index 56724b7a24..3082d76bb9 100644
--- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperRepositoryManager.java
+++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperRepositoryManager.java
@@ -1,6 +1,11 @@
 package pl.allegro.tech.hermes.management.infrastructure.zookeeper;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.apache.curator.framework.CuratorFramework;
 import pl.allegro.tech.hermes.common.admin.AdminTool;
 import pl.allegro.tech.hermes.common.admin.zookeeper.ZookeeperAdminTool;
@@ -28,145 +33,161 @@
 import pl.allegro.tech.hermes.management.domain.blacklist.TopicBlacklistRepository;
 import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder;
 import pl.allegro.tech.hermes.management.domain.dc.RepositoryManager;
-import pl.allegro.tech.hermes.management.domain.readiness.ReadinessRepository;
+import pl.allegro.tech.hermes.management.domain.readiness.DatacenterReadinessRepository;
 import pl.allegro.tech.hermes.management.domain.retransmit.OfflineRetransmissionRepository;
 import pl.allegro.tech.hermes.management.infrastructure.blacklist.ZookeeperTopicBlacklistRepository;
 import pl.allegro.tech.hermes.management.infrastructure.readiness.ZookeeperDatacenterReadinessRepository;
 import pl.allegro.tech.hermes.management.infrastructure.retransmit.ZookeeperOfflineRetransmissionRepository;
 
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 public class ZookeeperRepositoryManager implements RepositoryManager {
 
-    private final DatacenterNameProvider datacenterNameProvider;
-    private final ObjectMapper mapper;
-    private final ZookeeperPaths paths;
-    private final ZookeeperClientManager clientManager;
-    private final Map<Class<?>, Object> repositoryByType = new HashMap<>();
-    private final Map<String, GroupRepository> groupRepositoriesByDc = new HashMap<>();
-    private final Map<String, CredentialsRepository> credentialsRepositoriesByDc = new HashMap<>();
-    private final Map<String, TopicRepository> topicRepositoriesByDc = new HashMap<>();
-    private final Map<String, SubscriptionRepository> subscriptionRepositoriesByDc = new HashMap<>();
-    private final Map<String, OAuthProviderRepository> oAuthProviderRepositoriesByDc = new HashMap<>();
-    private final Map<String, SubscriptionOffsetChangeIndicator> offsetChangeIndicatorsByDc = new HashMap<>();
-    private final Map<String, MessagePreviewRepository> messagePreviewRepositoriesByDc = new HashMap<>();
-    private final Map<String, TopicBlacklistRepository> topicBlacklistRepositoriesByDc = new HashMap<>();
-    private final Map<String, WorkloadConstraintsRepository> workloadConstraintsRepositoriesByDc = new HashMap<>();
-    private final Map<String, LastUndeliveredMessageReader> lastUndeliveredMessageReaderByDc = new HashMap<>();
-    private final Map<String, AdminTool> adminToolByDc = new HashMap<>();
-    private final Map<String, ReadinessRepository> readinessRepositoriesByDc = new HashMap<>();
-    private final Map<String, OfflineRetransmissionRepository> offlineRetransmissionRepositoriesByDc = new HashMap<>();
-    private final ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory;
-
-    public ZookeeperRepositoryManager(ZookeeperClientManager clientManager,
-                                      DatacenterNameProvider datacenterNameProvider,
-                                      ObjectMapper mapper,
-                                      ZookeeperPaths paths,
-                                      ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory) {
-        this.datacenterNameProvider = datacenterNameProvider;
-        this.mapper = mapper;
-        this.paths = paths;
-        this.clientManager = clientManager;
-        this.zookeeperGroupRepositoryFactory = zookeeperGroupRepositoryFactory;
-        initRepositoryTypeMap();
+  private final DatacenterNameProvider datacenterNameProvider;
+  private final ObjectMapper mapper;
+  private final ZookeeperPaths paths;
+  private final ZookeeperClientManager clientManager;
+  private final Map<Class<?>, Object> repositoryByType = new HashMap<>();
+  private final Map<String, GroupRepository> groupRepositoriesByDc = new HashMap<>();
+  private final Map<String, CredentialsRepository> credentialsRepositoriesByDc = new HashMap<>();
+  private final Map<String, TopicRepository> topicRepositoriesByDc = new HashMap<>();
+  private final Map<String, SubscriptionRepository> subscriptionRepositoriesByDc = new HashMap<>();
+  private final Map<String, OAuthProviderRepository> oAuthProviderRepositoriesByDc =
+      new HashMap<>();
+  private final Map<String, SubscriptionOffsetChangeIndicator> offsetChangeIndicatorsByDc =
+      new HashMap<>();
+  private final Map<String, MessagePreviewRepository> messagePreviewRepositoriesByDc =
+      new HashMap<>();
+  private final Map<String, TopicBlacklistRepository> topicBlacklistRepositoriesByDc =
+      new HashMap<>();
+  private final Map<String, WorkloadConstraintsRepository> workloadConstraintsRepositoriesByDc =
+      new HashMap<>();
+  private final Map<String, LastUndeliveredMessageReader> lastUndeliveredMessageReaderByDc =
+      new HashMap<>();
+  private final Map<String, AdminTool> adminToolByDc = new HashMap<>();
+  private final Map<String, DatacenterReadinessRepository> readinessRepositoriesByDc =
+      new HashMap<>();
+  private final Map<String, OfflineRetransmissionRepository> offlineRetransmissionRepositoriesByDc =
+      new HashMap<>();
+  private final ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory;
+
+  public ZookeeperRepositoryManager(
+      ZookeeperClientManager clientManager,
+      DatacenterNameProvider datacenterNameProvider,
+      ObjectMapper mapper,
+      ZookeeperPaths paths,
+      ZookeeperGroupRepositoryFactory zookeeperGroupRepositoryFactory) {
+    this.datacenterNameProvider = datacenterNameProvider;
+    this.mapper = mapper;
+    this.paths = paths;
+    this.clientManager = clientManager;
+    this.zookeeperGroupRepositoryFactory = zookeeperGroupRepositoryFactory;
+    initRepositoryTypeMap();
+  }
+
+  public void start() {
+    for (ZookeeperClient client : clientManager.getClients()) {
+      String dcName = client.getDatacenterName();
+      CuratorFramework zookeeper = client.getCuratorFramework();
+
+      GroupRepository groupRepository =
+          zookeeperGroupRepositoryFactory.create(zookeeper, mapper, paths);
+      groupRepositoriesByDc.put(dcName, groupRepository);
+
+      CredentialsRepository credentialsRepository =
+          new ZookeeperCredentialsRepository(zookeeper, mapper, paths);
+      credentialsRepositoriesByDc.put(dcName, credentialsRepository);
+
+      TopicRepository topicRepository =
+          new ZookeeperTopicRepository(zookeeper, mapper, paths, groupRepository);
+      topicRepositoriesByDc.put(dcName, topicRepository);
+
+      SubscriptionRepository subscriptionRepository =
+          new ZookeeperSubscriptionRepository(zookeeper, mapper, paths, topicRepository);
+      subscriptionRepositoriesByDc.put(dcName, subscriptionRepository);
+
+      OAuthProviderRepository oAuthProviderRepository =
+          new ZookeeperOAuthProviderRepository(zookeeper, mapper, paths);
+      oAuthProviderRepositoriesByDc.put(dcName, oAuthProviderRepository);
+
+      SubscriptionOffsetChangeIndicator offsetChangeIndicator =
+          new ZookeeperSubscriptionOffsetChangeIndicator(zookeeper, paths, subscriptionRepository);
+      offsetChangeIndicatorsByDc.put(dcName, offsetChangeIndicator);
+
+      MessagePreviewRepository messagePreviewRepository =
+          new ZookeeperMessagePreviewRepository(zookeeper, mapper, paths);
+      messagePreviewRepositoriesByDc.put(dcName, messagePreviewRepository);
+
+      TopicBlacklistRepository topicBlacklistRepository =
+          new ZookeeperTopicBlacklistRepository(zookeeper, mapper, paths);
+      topicBlacklistRepositoriesByDc.put(dcName, topicBlacklistRepository);
+
+      WorkloadConstraintsRepository workloadConstraintsRepository =
+          new ZookeeperWorkloadConstraintsRepository(zookeeper, mapper, paths);
+      workloadConstraintsRepositoriesByDc.put(dcName, workloadConstraintsRepository);
+
+      LastUndeliveredMessageReader lastUndeliveredMessageReader =
+          new ZookeeperLastUndeliveredMessageReader(zookeeper, paths, mapper);
+      lastUndeliveredMessageReaderByDc.put(dcName, lastUndeliveredMessageReader);
+
+      AdminTool adminTool = new ZookeeperAdminTool(paths, client.getCuratorFramework(), mapper);
+      adminToolByDc.put(dcName, adminTool);
+
+      DatacenterReadinessRepository readinessRepository =
+          new ZookeeperDatacenterReadinessRepository(zookeeper, mapper, paths);
+      readinessRepositoriesByDc.put(dcName, readinessRepository);
+
+      ZookeeperOfflineRetransmissionRepository offlineRetransmissionRepository =
+          new ZookeeperOfflineRetransmissionRepository(zookeeper, mapper, paths);
+      offlineRetransmissionRepositoriesByDc.put(dcName, offlineRetransmissionRepository);
     }
-
-    public void start() {
-        for (ZookeeperClient client : clientManager.getClients()) {
-            String dcName = client.getDatacenterName();
-            CuratorFramework zookeeper = client.getCuratorFramework();
-
-            GroupRepository groupRepository = zookeeperGroupRepositoryFactory.create(zookeeper, mapper, paths);
-            groupRepositoriesByDc.put(dcName, groupRepository);
-
-            CredentialsRepository credentialsRepository = new ZookeeperCredentialsRepository(zookeeper, mapper, paths);
-            credentialsRepositoriesByDc.put(dcName, credentialsRepository);
-
-            TopicRepository topicRepository = new ZookeeperTopicRepository(zookeeper, mapper, paths, groupRepository);
-            topicRepositoriesByDc.put(dcName, topicRepository);
-
-            SubscriptionRepository subscriptionRepository = new ZookeeperSubscriptionRepository(zookeeper, mapper, paths, topicRepository);
-            subscriptionRepositoriesByDc.put(dcName, subscriptionRepository);
-
-            OAuthProviderRepository oAuthProviderRepository = new ZookeeperOAuthProviderRepository(zookeeper, mapper, paths);
-            oAuthProviderRepositoriesByDc.put(dcName, oAuthProviderRepository);
-
-            SubscriptionOffsetChangeIndicator offsetChangeIndicator =
-                    new ZookeeperSubscriptionOffsetChangeIndicator(zookeeper, paths, subscriptionRepository);
-            offsetChangeIndicatorsByDc.put(dcName, offsetChangeIndicator);
-
-            MessagePreviewRepository messagePreviewRepository = new ZookeeperMessagePreviewRepository(zookeeper, mapper, paths);
-            messagePreviewRepositoriesByDc.put(dcName, messagePreviewRepository);
-
-            TopicBlacklistRepository topicBlacklistRepository = new ZookeeperTopicBlacklistRepository(zookeeper, mapper, paths);
-            topicBlacklistRepositoriesByDc.put(dcName, topicBlacklistRepository);
-
-            WorkloadConstraintsRepository workloadConstraintsRepository =
-                    new ZookeeperWorkloadConstraintsRepository(zookeeper, mapper, paths);
-            workloadConstraintsRepositoriesByDc.put(dcName, workloadConstraintsRepository);
-
-            LastUndeliveredMessageReader lastUndeliveredMessageReader = new ZookeeperLastUndeliveredMessageReader(zookeeper, paths, mapper);
-            lastUndeliveredMessageReaderByDc.put(dcName, lastUndeliveredMessageReader);
-
-            AdminTool adminTool = new ZookeeperAdminTool(paths, client.getCuratorFramework(), mapper);
-            adminToolByDc.put(dcName, adminTool);
-
-            ReadinessRepository readinessRepository = new ZookeeperDatacenterReadinessRepository(zookeeper, mapper, paths);
-            readinessRepositoriesByDc.put(dcName, readinessRepository);
-
-            ZookeeperOfflineRetransmissionRepository offlineRetransmissionRepository =
-                    new ZookeeperOfflineRetransmissionRepository(zookeeper, mapper, paths);
-            offlineRetransmissionRepositoriesByDc.put(dcName, offlineRetransmissionRepository);
-        }
-    }
-
-    public <T> DatacenterBoundRepositoryHolder<T> getLocalRepository(Class<T> repositoryType) {
-        String dcName = datacenterNameProvider.getDatacenterName();
-        T repository = getRepositoriesByType(repositoryType).get(dcName);
-
-        if (repository == null) {
-            throw new InternalProcessingException("Failed to find '" + repositoryType.getSimpleName()
-                    + "' bound with DC '" + dcName + "'.");
-        }
-
-        return new DatacenterBoundRepositoryHolder<>(repository, dcName);
-    }
-
-    public <T> List<DatacenterBoundRepositoryHolder<T>> getRepositories(Class<T> repositoryType) {
-        return getRepositoriesByType(repositoryType)
-                .entrySet()
-                .stream()
-                .sorted(Comparator.comparing(Map.Entry::getKey))
-                .map(entry -> new DatacenterBoundRepositoryHolder<>(entry.getValue(), entry.getKey()))
-                .collect(Collectors.toList());
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> Map<String, T> getRepositoriesByType(Class<T> type) {
-        Object repository = repositoryByType.get(type);
-        if (repository == null) {
-            throw new InternalProcessingException("Could not provide repository of type: " + type.getName());
-        }
-        return (Map<String, T>) repository;
+  }
+
+  public <T> DatacenterBoundRepositoryHolder<T> getLocalRepository(Class<T> repositoryType) {
+    String dcName = datacenterNameProvider.getDatacenterName();
+    T repository = getRepositoriesByType(repositoryType).get(dcName);
+
+    if (repository == null) {
+      throw new InternalProcessingException(
+          "Failed to find '"
+              + repositoryType.getSimpleName()
+              + "' bound with DC '"
+              + dcName
+              + "'.");
     }
 
-    private void initRepositoryTypeMap() {
-        repositoryByType.put(GroupRepository.class, groupRepositoriesByDc);
-        repositoryByType.put(CredentialsRepository.class, credentialsRepositoriesByDc);
-        repositoryByType.put(TopicRepository.class, topicRepositoriesByDc);
-        repositoryByType.put(SubscriptionRepository.class, subscriptionRepositoriesByDc);
-        repositoryByType.put(OAuthProviderRepository.class, oAuthProviderRepositoriesByDc);
-        repositoryByType.put(SubscriptionOffsetChangeIndicator.class, offsetChangeIndicatorsByDc);
-        repositoryByType.put(MessagePreviewRepository.class, messagePreviewRepositoriesByDc);
-        repositoryByType.put(TopicBlacklistRepository.class, topicBlacklistRepositoriesByDc);
-        repositoryByType.put(WorkloadConstraintsRepository.class, workloadConstraintsRepositoriesByDc);
-        repositoryByType.put(LastUndeliveredMessageReader.class, lastUndeliveredMessageReaderByDc);
-        repositoryByType.put(AdminTool.class, adminToolByDc);
-        repositoryByType.put(ReadinessRepository.class, readinessRepositoriesByDc);
-        repositoryByType.put(OfflineRetransmissionRepository.class, offlineRetransmissionRepositoriesByDc);
+    return new DatacenterBoundRepositoryHolder<>(repository, dcName);
+  }
+
+  public <T> List<DatacenterBoundRepositoryHolder<T>> getRepositories(Class<T> repositoryType) {
+    return getRepositoriesByType(repositoryType).entrySet().stream()
+        .sorted(Comparator.comparing(Map.Entry::getKey))
+        .map(entry -> new DatacenterBoundRepositoryHolder<>(entry.getValue(), entry.getKey()))
+        .collect(Collectors.toList());
+  }
+
+  @SuppressWarnings("unchecked")
+  private <T> Map<String, T> getRepositoriesByType(Class<T> type) {
+    Object repository = repositoryByType.get(type);
+    if (repository == null) {
+      throw new InternalProcessingException(
+          "Could not provide repository of type: " + type.getName());
     }
+    return (Map<String, T>) repository;
+  }
+
+  private void initRepositoryTypeMap() {
+    repositoryByType.put(GroupRepository.class, groupRepositoriesByDc);
+    repositoryByType.put(CredentialsRepository.class, credentialsRepositoriesByDc);
+    repositoryByType.put(TopicRepository.class, topicRepositoriesByDc);
+    repositoryByType.put(SubscriptionRepository.class, subscriptionRepositoriesByDc);
+    repositoryByType.put(OAuthProviderRepository.class, oAuthProviderRepositoriesByDc);
+    repositoryByType.put(SubscriptionOffsetChangeIndicator.class, offsetChangeIndicatorsByDc);
+    repositoryByType.put(MessagePreviewRepository.class, messagePreviewRepositoriesByDc);
+    repositoryByType.put(TopicBlacklistRepository.class, topicBlacklistRepositoriesByDc);
+    repositoryByType.put(WorkloadConstraintsRepository.class, workloadConstraintsRepositoriesByDc);
+    repositoryByType.put(LastUndeliveredMessageReader.class, lastUndeliveredMessageReaderByDc);
+    repositoryByType.put(AdminTool.class, adminToolByDc);
+    repositoryByType.put(DatacenterReadinessRepository.class, readinessRepositoriesByDc);
+    repositoryByType.put(
+        OfflineRetransmissionRepository.class, offlineRetransmissionRepositoriesByDc);
+  }
 }
diff --git a/hermes-management/src/main/resources/application-local.yaml b/hermes-management/src/main/resources/application-local.yaml
index 67e4a58cc2..845e296a4a 100644
--- a/hermes-management/src/main/resources/application-local.yaml
+++ b/hermes-management/src/main/resources/application-local.yaml
@@ -33,3 +33,22 @@ console:
         label: SERIAL
       - value: BATCH
         label: BATCH
+prometheus:
+  client:
+    enabled: true
+
+management:
+  server:
+    servlet:
+      context-path: /
+
+spring:
+  main:
+    allow-bean-definition-overriding: true
+  jersey:
+    type: filter
+    filter:
+      order: 2147483647
+  mvc:
+    servlet:
+      path: /
\ No newline at end of file
diff --git a/hermes-management/src/main/resources/application.yaml b/hermes-management/src/main/resources/application.yaml
index e67a54a627..585938789c 100644
--- a/hermes-management/src/main/resources/application.yaml
+++ b/hermes-management/src/main/resources/application.yaml
@@ -3,7 +3,7 @@ zookeeper:
 
 
 storage:
-  pathPrefix: /hermes
+  pathPrefix: /run/hermes
   clusters:
     -
       datacenter: dc
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyServiceSpec.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyServiceSpec.groovy
index 9fb2d7adad..f451d8c92f 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyServiceSpec.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyServiceSpec.groovy
@@ -2,11 +2,16 @@ package pl.allegro.tech.hermes.management.domain.consistency
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import pl.allegro.tech.hermes.api.Group
 import pl.allegro.tech.hermes.api.Subscription
 import pl.allegro.tech.hermes.api.Topic
+import pl.allegro.tech.hermes.common.metric.MetricsFacade
 import pl.allegro.tech.hermes.management.config.ConsistencyCheckerProperties
 import spock.lang.Specification
+import spock.util.concurrent.PollingConditions
+
+import java.time.Duration
 
 import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.group
 import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription
@@ -15,6 +20,8 @@ import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic
 class DcConsistencyServiceSpec extends Specification {
 
     def objectMapper = new ObjectMapper().registerModule(new JavaTimeModule())
+    def meterRegistry = new SimpleMeterRegistry()
+    def metricsFacade = new MetricsFacade(meterRegistry)
 
     def "should return empty list when given groups are consistent"() {
         given:
@@ -30,8 +37,8 @@ class DcConsistencyServiceSpec extends Specification {
                 .addGroup(group)
                 .addTopic(topic)
                 .addSubscription(subscription)
-        DcConsistencyService dcConsistencyService = new DcConsistencyService(repositoryManager, objectMapper,
-                new ConsistencyCheckerProperties())
+        DcConsistencyService dcConsistencyService = new DcConsistencyService(repositoryManager,
+                objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
 
         when:
         def inconsistentGroups = dcConsistencyService.listInconsistentGroups([group.groupName] as Set)
@@ -48,8 +55,8 @@ class DcConsistencyServiceSpec extends Specification {
         repositoryManager.datacenter("dc2")
                 .addGroup(group("testGroup").build())
                 .addGroup(group("testGroup-dc2").build())
-        DcConsistencyService consistencyService = new DcConsistencyService(repositoryManager, objectMapper,
-                new ConsistencyCheckerProperties())
+        DcConsistencyService consistencyService = new DcConsistencyService(repositoryManager,
+                objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
 
         when:
         def groups = consistencyService.listInconsistentGroups(["testGroup", "testGroup-dc1", "testGroup-dc2"] as Set)
@@ -68,7 +75,7 @@ class DcConsistencyServiceSpec extends Specification {
                 .addGroup(group)
                 .addTopic(topic(group.groupName, "testTopic").withDescription("dc2").build())
         DcConsistencyService consistencyService = new DcConsistencyService(repositoryManager, objectMapper,
-                new ConsistencyCheckerProperties())
+                new ConsistencyCheckerProperties(), metricsFacade)
 
         when:
         def groups = consistencyService.listInconsistentGroups(["testGroup"] as Set)
@@ -90,7 +97,7 @@ class DcConsistencyServiceSpec extends Specification {
                 .addTopic(topic)
                 .addSubscription(subscription(topic, "testSubscription").withDescription("dc2").build())
         DcConsistencyService consistencyService = new DcConsistencyService(repositoryManager, objectMapper,
-                new ConsistencyCheckerProperties())
+                new ConsistencyCheckerProperties(), metricsFacade)
 
         when:
         def groups = consistencyService.listInconsistentGroups(["testGroup"] as Set)
@@ -108,7 +115,7 @@ class DcConsistencyServiceSpec extends Specification {
                 .addGroup(group("testGroup").build())
                 .addGroup(group("testGroup-dc2").build())
         DcConsistencyService consistencyService = new DcConsistencyService(repositoryManager, objectMapper,
-                new ConsistencyCheckerProperties())
+                new ConsistencyCheckerProperties(), metricsFacade)
 
         when:
         def groups = consistencyService.listAllGroupNames()
@@ -116,4 +123,56 @@ class DcConsistencyServiceSpec extends Specification {
         then:
         groups == ["testGroup", "testGroup-dc1", "testGroup-dc2"] as Set
     }
+
+    def "should report storage as not consistent with periodic check"() {
+        given: "inconsistent storage state"
+        MockRepositoryManager repositoryManager = new MockRepositoryManager()
+        repositoryManager.datacenter("dc1")
+                .addGroup(group("testGroup").build())
+                .addGroup(group("testGroup-dc1").build())
+        repositoryManager.datacenter("dc2")
+                .addGroup(group("testGroup").build())
+                .addGroup(group("testGroup-dc2").build())
+
+        and: "enabled periodic consistency checks"
+        def properties = new ConsistencyCheckerProperties()
+        properties.setPeriodicCheckEnabled(true)
+        properties.setInitialRefreshDelay(Duration.ofMillis(0))
+
+        when: "consistency service is created"
+        DcConsistencyService consistencyService = new DcConsistencyService(repositoryManager,
+                objectMapper,
+                properties,
+                metricsFacade)
+
+        then: "storage is reported as not consistent"
+        new PollingConditions(timeout: 10).eventually {
+            meterRegistry.get("storage.consistency").gauge().value() == 0.0d
+        }
+    }
+
+    def "should report storage as consistent with periodic check"() {
+        given: "consistent storage state"
+        MockRepositoryManager repositoryManager = new MockRepositoryManager()
+        repositoryManager.datacenter("dc1")
+                .addGroup(group("testGroup").build())
+        repositoryManager.datacenter("dc2")
+                .addGroup(group("testGroup").build())
+
+        and: "enabled periodic consistency checks"
+        def properties = new ConsistencyCheckerProperties()
+        properties.setPeriodicCheckEnabled(true)
+        properties.setInitialRefreshDelay(Duration.ofMillis(0))
+
+        when: "consistency service is created"
+        DcConsistencyService consistencyService = new DcConsistencyService(repositoryManager,
+                objectMapper,
+                properties,
+                metricsFacade)
+
+        then: "storage is reported as consistent"
+        new PollingConditions(timeout: 10).eventually {
+            meterRegistry.get("storage.consistency").gauge().value() == 1.0d
+        }
+    }
 }
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/consistency/StorageSyncSpec.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/consistency/StorageSyncSpec.groovy
new file mode 100644
index 0000000000..fb80782c19
--- /dev/null
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/consistency/StorageSyncSpec.groovy
@@ -0,0 +1,369 @@
+package pl.allegro.tech.hermes.management.domain.consistency
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry
+import pl.allegro.tech.hermes.api.Group
+import pl.allegro.tech.hermes.api.Subscription
+import pl.allegro.tech.hermes.api.Topic
+import pl.allegro.tech.hermes.common.metric.MetricsFacade
+import pl.allegro.tech.hermes.domain.group.GroupNotExistsException
+import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository
+import pl.allegro.tech.hermes.domain.topic.TopicNotExistsException
+import pl.allegro.tech.hermes.domain.topic.TopicRepository
+import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths
+import pl.allegro.tech.hermes.management.config.ConsistencyCheckerProperties
+import pl.allegro.tech.hermes.management.config.storage.DefaultZookeeperGroupRepositoryFactory
+import pl.allegro.tech.hermes.management.domain.dc.MultiDatacenterRepositoryCommandExecutor
+import pl.allegro.tech.hermes.management.domain.group.commands.CreateGroupRepositoryCommand
+import pl.allegro.tech.hermes.management.domain.mode.ModeService
+import pl.allegro.tech.hermes.management.domain.subscription.commands.CreateSubscriptionRepositoryCommand
+import pl.allegro.tech.hermes.management.domain.topic.commands.CreateTopicRepositoryCommand
+import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClient
+import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClientManager
+import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperRepositoryManager
+import pl.allegro.tech.hermes.management.utils.MultiZookeeperIntegrationTest
+import pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder
+import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder
+
+import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.groupWithRandomName
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic
+
+class StorageSyncSpec extends MultiZookeeperIntegrationTest {
+
+    static GROUPS_PATH = '/hermes/groups'
+    ZookeeperClientManager manager
+    ZookeeperRepositoryManager repositoryManager
+
+    ModeService modeService
+    MultiDatacenterRepositoryCommandExecutor executor
+    MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry())
+
+    def objectMapper = new ObjectMapper().registerModule(new JavaTimeModule())
+    def paths = new ZookeeperPaths('/hermes')
+
+    def setup() {
+        manager = buildZookeeperClientManager()
+        manager.start()
+        assertZookeeperClientsConnected(manager.clients)
+        manager.clients.each { client -> setupZookeeperPath(client, GROUPS_PATH) }
+        repositoryManager = new ZookeeperRepositoryManager(
+                manager, new TestDatacenterNameProvider(DC_1_NAME), objectMapper,
+                paths, new DefaultZookeeperGroupRepositoryFactory())
+        repositoryManager.start()
+
+        modeService = new ModeService()
+        executor = new MultiDatacenterRepositoryCommandExecutor(repositoryManager, true, modeService)
+    }
+
+    def cleanup() {
+        manager.stop()
+    }
+
+    def "should create group in all DCs if primary datacenter contains group"() {
+        given:
+        def (Group group, String groupPath) = setupGroup()
+
+        and:
+        removeNode(DC_1_NAME, groupPath)
+
+        and:
+        assertNodeDoesNotExist(DC_1_NAME, groupPath)
+        assertNodeContains(DC_2_NAME, groupPath, group)
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncGroup(group.groupName, DC_2_NAME)
+
+        then:
+        assertNodesContains(groupPath, group)
+    }
+
+    def "should delete group in all DCs if primary datacenter does not contain group"() {
+        given:
+        def (Group group, String groupPath) = setupGroup()
+
+        and:
+        removeNode(DC_1_NAME, groupPath)
+
+        and:
+        assertNodeDoesNotExist(DC_1_NAME, groupPath)
+        assertNodeContains(DC_2_NAME, groupPath, group)
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncGroup(group.groupName, DC_1_NAME)
+
+        then:
+        assertNodesDoNotExist(groupPath)
+    }
+
+    def "should create topic in all DCs if primary datacenter contains topic"() {
+        given:
+        def (Group _, Topic topic, String topicPath) = setupTopic()
+
+        and:
+        removeNode(DC_1_NAME, topicPath)
+
+        and:
+        assertNodeDoesNotExist(DC_1_NAME, topicPath)
+        assertNodeContains(DC_2_NAME, topicPath, topic)
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncTopic(topic.getName(), DC_2_NAME)
+
+        then:
+        assertNodesContains(topicPath, topic)
+    }
+
+    def "should delete topic in all DCs if primary datacenter contains topic"() {
+        given:
+        def (Group _, Topic topic, String topicPath) = setupTopic()
+
+        and:
+        removeNode(DC_1_NAME, topicPath)
+
+        and:
+        assertNodeDoesNotExist(DC_1_NAME, topicPath)
+        assertNodeContains(DC_2_NAME, topicPath, topic)
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncTopic(topic.getName(), DC_1_NAME)
+
+        then:
+        assertNodesDoNotExist(topicPath)
+    }
+
+    def "should sync topic in all DCs to primary datacenter value"() {
+        given:
+        def (Group _, Topic topic, String topicPath) = setupTopic()
+
+        and:
+        TopicRepository topicRepository = repositoryManager.getLocalRepository(TopicRepository.class).getRepository()
+        Topic updatedTopic = TopicBuilder.topic(topic.name.getGroupName(), topic.name.getName())
+                .withDescription("foo bar").build()
+        topicRepository.updateTopic(updatedTopic)
+
+        and:
+        assertNodesAreDifferent(topicPath, Topic.class)
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncTopic(topic.getName(), DC_1_NAME)
+
+        then:
+        assertNodesContains(topicPath, updatedTopic)
+    }
+
+    def "should create subscription in all DCs if primary datacenter contains subscription"() {
+        given:
+        def (Group _, Topic __, Subscription subscription, String subscriptionPath) = setupSubscription()
+
+        and:
+        removeNode(DC_1_NAME, subscriptionPath)
+
+        and:
+        assertNodeDoesNotExist(DC_1_NAME, subscriptionPath)
+        assertNodeContains(DC_2_NAME, subscriptionPath, subscription)
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncSubscription(subscription.getQualifiedName(), DC_2_NAME)
+
+        then:
+        assertNodesContains(subscriptionPath, subscription)
+    }
+
+    def "should delete subscription in all DCs if primary datacenter does not contain subscription"() {
+        given:
+        def (Group _, Topic __, Subscription subscription, String subscriptionPath) = setupSubscription()
+
+        and:
+        SubscriptionRepository subscriptionRepository = repositoryManager.getLocalRepository(SubscriptionRepository.class).getRepository()
+        Subscription updatedSubscription = SubscriptionBuilder.subscription(subscription.getQualifiedName())
+                .withDescription("foo bar").build()
+        subscriptionRepository.updateSubscription(updatedSubscription)
+
+        and:
+        assertNodesAreDifferent(subscriptionPath, Subscription.class)
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncSubscription(subscription.getQualifiedName(), DC_1_NAME)
+
+        then:
+        assertNodesContains(subscriptionPath, updatedSubscription)
+    }
+
+    def "should sync subscription in all DCs to primary datacenter value"() {
+        given:
+        def (Group _, Topic __, Subscription subscription, String subscriptionPath) = setupSubscription()
+
+        and:
+        removeNode(DC_1_NAME, subscriptionPath)
+
+        and:
+        assertNodeDoesNotExist(DC_1_NAME, subscriptionPath)
+        assertNodeContains(DC_2_NAME, subscriptionPath, subscription)
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncSubscription(subscription.getQualifiedName(), DC_1_NAME)
+
+        then:
+        assertNodesDoNotExist(subscriptionPath)
+    }
+
+    def "topic sync should fail if group does not exist in replica datacenter"() {
+        given:
+        def (Group group, Topic topic, String _) = setupTopic()
+
+        and:
+        removeNode(DC_1_NAME, paths.groupPath(group.getGroupName()))
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncTopic(topic.getName(), DC_2_NAME)
+
+        then:
+        thrown GroupNotExistsException
+    }
+
+    def "subscription sync should fail if group does not exist in replica datacenter"() {
+        given:
+        def (Group group, Topic _, Subscription subscription, String __) = setupSubscription()
+
+        and:
+        removeNode(DC_1_NAME, paths.groupPath(group.getGroupName()))
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncSubscription(subscription.getQualifiedName(), DC_2_NAME)
+
+        then:
+        thrown TopicNotExistsException
+    }
+
+    def "subscription sync should fail if topic does not exist in replica datacenter"() {
+        given:
+        def (Group _, Topic topic, Subscription subscription, String __) = setupSubscription()
+
+        and:
+        removeNode(DC_1_NAME, paths.topicPath(topic.getName()))
+
+        and:
+        def consistencyService = new DcConsistencyService(repositoryManager, objectMapper, new ConsistencyCheckerProperties(), metricsFacade)
+
+        when:
+        consistencyService.syncSubscription(subscription.getQualifiedName(), DC_2_NAME)
+
+        then:
+        thrown TopicNotExistsException
+    }
+
+    private def setupGroup() {
+        Group group = groupWithRandomName().build()
+        executor.execute(new CreateGroupRepositoryCommand(group))
+        String groupPath = paths.groupPath(group.groupName)
+        return [group, groupPath]
+    }
+
+    private def setupTopic() {
+        Group group = groupWithRandomName().build()
+        Topic topic = randomTopic(group.getGroupName(), "").build()
+        executor.execute(new CreateGroupRepositoryCommand(group))
+        executor.execute(new CreateTopicRepositoryCommand(topic))
+        String topicPath = paths.topicPath(topic.getName())
+        return [group, topic, topicPath]
+    }
+
+    private def setupSubscription() {
+        Group group = groupWithRandomName().build()
+        Topic topic = randomTopic(group.getGroupName(), "").build()
+        Subscription subscription = subscriptionWithRandomName(topic.getName()).build()
+        executor.execute(new CreateGroupRepositoryCommand(group))
+        executor.execute(new CreateTopicRepositoryCommand(topic))
+        executor.execute(new CreateSubscriptionRepositoryCommand(subscription))
+        String subscriptionPath = paths.subscriptionPath(subscription)
+        return [group, topic, subscription, subscriptionPath]
+    }
+
+
+    private <T> void assertNodeContains(String dc, String path, T expected) {
+        def zkClient = findClientByDc(manager.clients, dc)
+        def data = zkClient.curatorFramework.getData().forPath(path)
+        def actual = objectMapper.readValue(data, expected.class)
+        assert actual == expected
+    }
+
+    private <T> void assertNodesContains(String path, T expected) {
+        manager.clients.each {
+            def data = it.curatorFramework.getData().forPath(path)
+            def actual = objectMapper.readValue(data, expected.class)
+            assert actual == expected
+        }
+    }
+
+    private def assertNodeDoesNotExist(String dc, String path) {
+        def zkClient = findClientByDc(manager.clients, dc)
+        zkClient.curatorFramework.checkExists().forPath(path) == null
+    }
+
+    private def assertNodesDoNotExist(String path) {
+        manager.clients.each {
+            assert it.curatorFramework.checkExists().forPath(path) == null
+        }
+    }
+
+    private <T> void assertNodesAreDifferent(String path, Class<T> clazz) {
+        Set<T> values = new HashSet<>()
+        manager.clients.each {
+            def data = it.curatorFramework.getData().forPath(path)
+            def value = objectMapper.readValue(data, clazz)
+            values.add(value)
+        }
+        assert values.size() > 1
+    }
+
+    private def removeNode(String dc, String path) {
+        def zkClient = findClientByDc(manager.clients, dc)
+        zkClient.curatorFramework.delete()
+                .deletingChildrenIfNeeded()
+                .forPath(path)
+    }
+
+    private static setupZookeeperPath(ZookeeperClient zookeeperClient, String path) {
+        def healthCheckPathExists = zookeeperClient.curatorFramework
+                .checkExists()
+                .forPath(path) != null
+        if (!healthCheckPathExists) {
+            zookeeperClient.curatorFramework
+                    .create()
+                    .creatingParentContainersIfNeeded()
+                    .forPath(path)
+        }
+    }
+}
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryCommandExecutorTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryCommandExecutorTest.groovy
index b6f8ec4807..d6e621932f 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryCommandExecutorTest.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/dc/MultiDatacenterRepositoryCommandExecutorTest.groovy
@@ -66,7 +66,7 @@ class MultiDatacenterRepositoryCommandExecutorTest extends Specification {
         executor.execute(command)
 
         then:
-        1 * command.rollback(holder1)
+        1 * command.rollback(holder1, _)
 
         thrown InternalProcessingException
     }
@@ -104,7 +104,7 @@ class MultiDatacenterRepositoryCommandExecutorTest extends Specification {
         executor.executeByUser(command, ADMIN)
 
         then:
-        1 * command.rollback(holder1)
+        1 * command.rollback(holder1, _)
 
         thrown InternalProcessingException
     }
@@ -160,7 +160,7 @@ class MultiDatacenterRepositoryCommandExecutorTest extends Specification {
         executor.executeByUser(command, NON_ADMIN)
 
         then:
-        1 * command.rollback(holder1)
+        1 * command.rollback(holder1, _)
 
         thrown InternalProcessingException
     }
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/owner/CrowdOwnerSourceSpec.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/owner/CrowdOwnerSourceSpec.groovy
deleted file mode 100644
index 63c299b107..0000000000
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/owner/CrowdOwnerSourceSpec.groovy
+++ /dev/null
@@ -1,41 +0,0 @@
-package pl.allegro.tech.hermes.management.domain.owner
-
-import pl.allegro.tech.hermes.api.Owner
-import pl.allegro.tech.hermes.management.infrastructure.crowd.CrowdClient
-import spock.lang.Specification
-
-class CrowdOwnerSourceSpec extends Specification {
-
-    def client = Stub(CrowdClient) {
-        getGroups("Tea") >> ["Team A", "Team B"]
-        getGroups("None") >> []
-    }
-
-    def source = new CrowdOwnerSource(client)
-
-    def "should search matching owners"() {
-        expect:
-        source.ownersMatching("Tea") == [new Owner("Team A", "Team A"), new Owner("Team B", "Team B")]
-    }
-
-    def "should search matching owners with already matched groups"() {
-        expect:
-        source.ownersMatching(searchString) == [
-                new Owner("Team A, Team A", "Team A, Team A"),
-                new Owner("Team A, Team B", "Team A, Team B")
-        ]
-        where:
-        searchString << ["Team A, Tea", "Team A,Tea", " Team A, Tea "]
-    }
-
-    def "should return empty matches for empty search string"() {
-        expect:
-        source.ownersMatching("") == []
-    }
-
-    def "should return empty matches for null search string"() {
-        expect:
-        source.ownersMatching(null) == []
-    }
-
-}
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/commands/CreateSubscriptionRepositoryCommandTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/commands/CreateSubscriptionRepositoryCommandTest.groovy
new file mode 100644
index 0000000000..47d59dfddb
--- /dev/null
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/commands/CreateSubscriptionRepositoryCommandTest.groovy
@@ -0,0 +1,53 @@
+package pl.allegro.tech.hermes.management.domain.subscription.commands
+
+import pl.allegro.tech.hermes.api.Subscription
+import pl.allegro.tech.hermes.api.TopicName
+import pl.allegro.tech.hermes.domain.subscription.SubscriptionAlreadyExistsException
+import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository
+import pl.allegro.tech.hermes.management.domain.dc.DatacenterBoundRepositoryHolder
+import spock.lang.Shared
+import spock.lang.Specification
+
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription
+
+class CreateSubscriptionRepositoryCommandTest extends Specification {
+
+    @Shared
+    def topicName = new TopicName("group", "topic")
+
+    @Shared
+    def subscriptionName = "subscription"
+
+    @Shared
+    Subscription subscription = subscription(topicName, subscriptionName).build()
+
+    def "should not remove subscription if subscription already exists during rollback"() {
+        given:
+        SubscriptionRepository subscriptionRepository = Mock(SubscriptionRepository)
+        DatacenterBoundRepositoryHolder<SubscriptionRepository> repository = Mock(DatacenterBoundRepositoryHolder) {
+            getRepository() >> subscriptionRepository
+        }
+        def command = new CreateSubscriptionRepositoryCommand(subscription)
+
+        when:
+        command.rollback(repository, new SubscriptionAlreadyExistsException(subscription))
+
+        then:
+        0 * subscriptionRepository.removeSubscription(topicName, subscriptionName)
+    }
+
+    def "should remove subscription during rollback"() {
+        given:
+        SubscriptionRepository subscriptionRepository = Mock(SubscriptionRepository)
+        DatacenterBoundRepositoryHolder<SubscriptionRepository> repository = Mock(DatacenterBoundRepositoryHolder) {
+            getRepository() >> subscriptionRepository
+        }
+        def command = new CreateSubscriptionRepositoryCommand(subscription)
+
+        when:
+        command.rollback(repository, new RuntimeException())
+
+        then:
+        1 * subscriptionRepository.removeSubscription(topicName, subscriptionName)
+    }
+}
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/InflightSizeValidatorTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/InflightSizeValidatorTest.groovy
index 811447481f..74c534654e 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/InflightSizeValidatorTest.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/InflightSizeValidatorTest.groovy
@@ -49,8 +49,8 @@ class InflightSizeValidatorTest extends Specification {
         subscriptionValidator.checkCreation(subscription, regularUser)
 
         then:
-        def exception = thrown(ConstraintViolationException)
-        exception.message == "serialSubscriptionPolicy.inflightSize: must be null"
+        def exception = thrown(SubscriptionValidationException)
+        exception.message == "Inflight size can't be set by non admin users"
     }
 
     def "creating subscription with inflight size should be allowed for admin users"() {
@@ -91,8 +91,101 @@ class InflightSizeValidatorTest extends Specification {
         user << [regularUser, admin]
     }
 
-    private static Subscription subscriptionWithInflight(Integer inflightSize) {
+    def "changing inflight should not be allowed for users"() {
+        given:
+        def previous = subscriptionWithInflight(previousInflight)
+        def updated = subscriptionWithInflight(updatedInflight)
+        when:
+        subscriptionValidator.checkModification(updated, regularUser, previous)
+
+        then:
+        def exception = thrown(SubscriptionValidationException)
+        exception.message == message
+
+        where:
+        previousInflight | updatedInflight || message
+        null             | 60              || "Inflight size can't be changed by non admin users. Changed from: null, to: 60"
+        60               | null            || "Inflight size can't be changed by non admin users. Changed from: 60, to: null"
+        60               | 120             || "Inflight size can't be changed by non admin users. Changed from: 60, to: 120"
+    }
+
+    def "changing inflight should be allowed for admins"() {
+        given:
+        def previous = subscriptionWithInflight(previousInflight)
+        def updated = subscriptionWithInflight(updatedInflight)
+        when:
+        subscriptionValidator.checkModification(updated, admin, previous)
+
+        then:
+        noExceptionThrown()
+
+        where:
+        previousInflight | updatedInflight
+        null             | 60
+        60               | null
+        60               | 120
+    }
+
+    def "updating subscription with non default inflight should be allowed for all users"() {
+        given:
+        def previous = subscriptionWithInflight(120, "lorem ipsum")
+        def updated = subscriptionWithInflight(120, "dolor sit amet")
+
+        when:
+        subscriptionValidator.checkModification(updated, user, previous)
+
+        then:
+        noExceptionThrown()
+
+        where:
+        user << [regularUser, admin]
+    }
+
+    def "resetting subscription policy should be allowed for all users"() {
+        def previous = subscriptionWithInflight(120)
+        def updated = subscriptionWithInflight(null)
+        updated.serialSubscriptionPolicy = null
+
+        when:
+        subscriptionValidator.checkModification(updated, user, previous)
+
+        then:
+        noExceptionThrown()
+
+        where:
+        user << [regularUser, admin]
+    }
+
+    def "changing subscription policy from null to policy with not null inflight should not be allowed for regular user"() {
+        def previous = subscriptionWithInflight(null)
+        previous.serialSubscriptionPolicy = null
+
+        def updated = subscriptionWithInflight(120)
+
+        when:
+        subscriptionValidator.checkModification(updated, regularUser, previous)
+
+        then:
+        def exception = thrown(SubscriptionValidationException)
+        exception.message == "Inflight size can't be changed by non admin users. Changed from: null, to: 120"
+    }
+
+    def "changing subscription policy from null to policy with not null inflight should  be allowed for admin"() {
+        def previous = subscriptionWithInflight(null)
+        previous.serialSubscriptionPolicy = null
+
+        def updated = subscriptionWithInflight(120)
+
+        when:
+        subscriptionValidator.checkModification(updated, admin, previous)
+
+        then:
+        noExceptionThrown()
+    }
+
+    private static Subscription subscriptionWithInflight(Integer inflightSize, String description = "lorem ipsum") {
         return subscription("group.topic", "subscription")
+                .withDescription(description)
                 .withSubscriptionPolicy(
                         SubscriptionPolicy.Builder.subscriptionPolicy()
                                 .withInflightSize(inflightSize)
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorTest.groovy
index 42a18fbc38..f92a84181a 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorTest.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorTest.groovy
@@ -32,6 +32,7 @@ class TopicValidatorTest extends Specification {
     def contentTypeWhitelistValidator = Stub(ContentTypeValidator)
     def apiPreconditions = Stub(ApiPreconditions)
     def topicLabelsValidator
+    def topicProperties = new TopicProperties()
 
     @Subject
     TopicValidator topicValidator
@@ -42,7 +43,7 @@ class TopicValidatorTest extends Specification {
         topicProperties.setAllowedTopicLabels(allowedLabels)
         topicLabelsValidator = new TopicLabelsValidator(topicProperties)
 
-        topicValidator = new TopicValidator(ownerDescriptorValidator, contentTypeWhitelistValidator, topicLabelsValidator, schemaRepository, apiPreconditions)
+        topicValidator = new TopicValidator(ownerDescriptorValidator, contentTypeWhitelistValidator, topicLabelsValidator, schemaRepository, apiPreconditions, topicProperties)
     }
 
     def "topic with basic properties when creating should be valid"() {
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorWithRealApiPreconditionsTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorWithRealApiPreconditionsTest.groovy
index bca9772132..132be2c38a 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorWithRealApiPreconditionsTest.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorWithRealApiPreconditionsTest.groovy
@@ -1,8 +1,8 @@
 package pl.allegro.tech.hermes.management.domain.topic.validator
 
-import jakarta.validation.ConstraintViolationException
 import pl.allegro.tech.hermes.api.RetentionTime
 import pl.allegro.tech.hermes.management.api.validator.ApiPreconditions
+import pl.allegro.tech.hermes.management.config.TopicProperties
 import pl.allegro.tech.hermes.management.domain.auth.TestRequestUser
 import pl.allegro.tech.hermes.management.domain.owner.validator.OwnerIdValidator
 import pl.allegro.tech.hermes.schema.SchemaRepository
@@ -10,14 +10,17 @@ import spock.lang.Specification
 import spock.lang.Subject
 import spock.lang.Unroll
 
+import java.util.concurrent.TimeUnit
+
 import static java.util.concurrent.TimeUnit.DAYS
+import static java.util.concurrent.TimeUnit.HOURS
+import static java.util.concurrent.TimeUnit.MINUTES
+import static java.util.concurrent.TimeUnit.SECONDS
 import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic
 
 class TopicValidatorWithRealApiPreconditionsTest extends Specification {
 
     private static MANAGEABLE = { true }
-    private static retentionTime7Days = new RetentionTime(7, DAYS)
-    private static retentionTime8Days = new RetentionTime(8, DAYS)
     private static regularUser = new TestRequestUser("regularUser", false)
     private static admin = new TestRequestUser("admin", true)
 
@@ -25,15 +28,16 @@ class TopicValidatorWithRealApiPreconditionsTest extends Specification {
     def ownerDescriptorValidator = Stub(OwnerIdValidator)
     def contentTypeWhitelistValidator = Stub(ContentTypeValidator)
     def topicLabelsValidator = Stub(TopicLabelsValidator)
+    def topicProperties = new TopicProperties()
 
     @Subject
-    def topicValidator = new TopicValidator(ownerDescriptorValidator, contentTypeWhitelistValidator, topicLabelsValidator, schemaRepository, new ApiPreconditions())
+    def topicValidator = new TopicValidator(ownerDescriptorValidator, contentTypeWhitelistValidator, topicLabelsValidator, schemaRepository, new ApiPreconditions(), topicProperties)
 
     @Unroll
-    def "creating topic with 7 days retention time should be valid"() {
+    def "creating and updating topic with up to 7 days retention time should be valid"() {
         given:
         def topic = topic('group.topic')
-                .withRetentionTime(retentionTime7Days)
+                .withRetentionTime(retentionTime)
                 .build()
 
         when:
@@ -43,26 +47,47 @@ class TopicValidatorWithRealApiPreconditionsTest extends Specification {
         noExceptionThrown()
 
         where:
-        user << [regularUser, admin]
+        retentionTime                    | user
+        new RetentionTime(1, MINUTES)    | admin
+        new RetentionTime(1, MINUTES)    | regularUser
+        new RetentionTime(1337, MINUTES) | admin
+        new RetentionTime(1337, MINUTES) | regularUser
+        new RetentionTime(24, HOURS)     | admin
+        new RetentionTime(24, HOURS)     | regularUser
+        new RetentionTime(72, HOURS)     | admin
+        new RetentionTime(72, HOURS)     | regularUser
+        new RetentionTime(1, DAYS)       | admin
+        new RetentionTime(1, DAYS)       | regularUser
+        new RetentionTime(7, DAYS)       | admin
+        new RetentionTime(7, DAYS)       | regularUser
     }
 
-    def "creating topic with 8 days retention time should be invalid for regular user"() {
+    def "creating topic with over 7 days of retention time should be invalid for regular user"() {
         given:
         def topic = topic('group.topic')
-                .withRetentionTime(retentionTime8Days)
+                .withRetentionTime(retentionTime)
                 .build()
 
         when:
         topicValidator.ensureCreatedTopicIsValid(topic, regularUser, MANAGEABLE)
 
         then:
-        thrown ConstraintViolationException
+        def exception = thrown(TopicValidationException)
+        exception.message == "Retention time larger than 7 days can't be configured by non admin users"
+
+        where:
+        retentionTime << [
+                new RetentionTime(8, DAYS),
+                new RetentionTime(7 * 24 + 1, HOURS),
+                new RetentionTime(7 * 24 * 60 + 1, MINUTES),
+                new RetentionTime(7 * 24 * 60 * 60 + 1, SECONDS)
+        ]
     }
 
-    def "creating topic with 8 days retention time should be valid for admin"() {
+    def "creating topic with over 7 days retention time should be valid for admin"() {
         given:
         def topic = topic('group.topic')
-                .withRetentionTime(retentionTime8Days)
+                .withRetentionTime(retentionTime)
                 .build()
 
         when:
@@ -70,14 +95,22 @@ class TopicValidatorWithRealApiPreconditionsTest extends Specification {
 
         then:
         noExceptionThrown()
+
+        where:
+        retentionTime << [
+                new RetentionTime(8, DAYS),
+                new RetentionTime(7 * 24 + 1, HOURS),
+                new RetentionTime(7 * 24 * 60 + 1, MINUTES),
+                new RetentionTime(7 * 24 * 60 * 60 + 1, SECONDS)
+        ]
     }
 
     @Unroll
-    def "updating topic with 7 days retention time should be valid"() {
+    def "updating topic with up to 7 days of retention time should be valid"() {
         given:
         def existingTopic = topic('group.topic').build()
         def updatedTopic = topic('group.topic')
-                .withRetentionTime(retentionTime7Days)
+                .withRetentionTime(retentionTime)
                 .build()
 
         when:
@@ -87,28 +120,112 @@ class TopicValidatorWithRealApiPreconditionsTest extends Specification {
         noExceptionThrown()
 
         where:
-        user << [regularUser, admin]
+        retentionTime                    | user
+        new RetentionTime(1, MINUTES)    | admin
+        new RetentionTime(1, MINUTES)    | regularUser
+        new RetentionTime(1337, MINUTES) | admin
+        new RetentionTime(1337, MINUTES) | regularUser
+        new RetentionTime(24, HOURS)     | admin
+        new RetentionTime(24, HOURS)     | regularUser
+        new RetentionTime(72, HOURS)     | admin
+        new RetentionTime(72, HOURS)     | regularUser
+        new RetentionTime(1, DAYS)       | admin
+        new RetentionTime(1, DAYS)       | regularUser
+        new RetentionTime(7, DAYS)       | admin
+        new RetentionTime(7, DAYS)       | regularUser
     }
 
-    def "updating topic with 8 days retention time should be invalid for regular user"() {
+    def "updating topic with over 7 days of retention time should be invalid for regular user"() {
         given:
         def existingTopic = topic('group.topic').build()
         def updatedTopic = topic('group.topic')
-                .withRetentionTime(retentionTime8Days)
+                .withRetentionTime(retentionTime)
                 .build()
 
         when:
         topicValidator.ensureUpdatedTopicIsValid(updatedTopic, existingTopic, regularUser)
 
         then:
-        thrown ConstraintViolationException
+        def exception = thrown(TopicValidationException)
+        exception.message == "Retention time larger than 7 days can't be configured by non admin users"
+
+        where:
+        retentionTime << [
+                new RetentionTime(8, DAYS),
+                new RetentionTime(7 * 24 + 1, HOURS),
+                new RetentionTime(7 * 24 * 60 + 1, MINUTES),
+                new RetentionTime(7 * 24 * 60 * 60 + 1, SECONDS)
+        ]
     }
 
     def "updating topic with 8 days retention time should be valid for admin"() {
         given:
         def existingTopic = topic('group.topic').build()
         def updatedTopic = topic('group.topic')
-                .withRetentionTime(retentionTime8Days)
+                .withRetentionTime(retentionTime)
+                .build()
+
+        when:
+        topicValidator.ensureUpdatedTopicIsValid(updatedTopic, existingTopic, admin)
+
+        then:
+        noExceptionThrown()
+
+        where:
+        retentionTime << [
+                new RetentionTime(8, DAYS),
+                new RetentionTime(7 * 24 + 1, HOURS),
+                new RetentionTime(7 * 24 * 60 + 1, MINUTES),
+                new RetentionTime(7 * 24 * 60 * 60 + 1, SECONDS)
+        ]
+    }
+
+    def "updating topic without modifying retention time already exceeding maximum should be valid"() {
+        given:
+        def existingTopic = topic('group.topic')
+                .withRetentionTime(new RetentionTime(8, DAYS))
+                .build()
+        def updatedTopic = topic('group.topic')
+                .withRetentionTime(new RetentionTime(8, DAYS))
+                .withDescription("lorem ipsum")
+                .build()
+
+        when:
+        topicValidator.ensureUpdatedTopicIsValid(updatedTopic, existingTopic, user)
+
+        then:
+        noExceptionThrown()
+
+        where:
+        user << [regularUser, admin]
+    }
+
+    def "updating topic with modifying retention time already exceeding maximum should be invalid for regular user"() {
+        given:
+        def existingTopic = topic('group.topic')
+                .withRetentionTime(new RetentionTime(8, DAYS))
+                .build()
+        def updatedTopic = topic('group.topic')
+                .withRetentionTime(new RetentionTime(12, DAYS))
+                .withDescription("lorem ipsum")
+                .build()
+
+        when:
+        topicValidator.ensureUpdatedTopicIsValid(updatedTopic, existingTopic, regularUser)
+
+        then:
+        def exception = thrown(TopicValidationException)
+        exception.message == "Retention time larger than 7 days can't be configured by non admin users"
+    }
+
+    def "updating topic with modifying retention time already exceeding maximum should be valid for admin"() {
+        given:
+        def existingTopic = topic('group.topic')
+                .withRetentionTime(new RetentionTime(8, DAYS))
+                .build()
+        def updatedTopic = topic('group.topic')
+                .withRetentionTime(new RetentionTime(12, DAYS))
+                .withDescription("lorem ipsum")
                 .build()
 
         when:
@@ -117,4 +234,26 @@ class TopicValidatorWithRealApiPreconditionsTest extends Specification {
         then:
         noExceptionThrown()
     }
+
+    @Unroll
+    def "creating a topic with timeUnit smaller than seconds should be invalid"() {
+        given:
+        def topic = topic('group.topic')
+                .withRetentionTime(retentionTime)
+                .build()
+
+        when:
+        topicValidator.ensureCreatedTopicIsValid(topic, regularUser, MANAGEABLE)
+
+        then:
+        def exception = thrown(TopicValidationException)
+        exception.message == "Retention time unit must be one of: [SECONDS, MINUTES, HOURS, DAYS]"
+
+        where:
+        retentionTime << [
+                new RetentionTime(1, TimeUnit.MICROSECONDS),
+                new RetentionTime(1, TimeUnit.MILLISECONDS),
+                new RetentionTime(1, TimeUnit.NANOSECONDS)
+        ]
+    }
 }
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/CachingGraphiteClientTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/CachingGraphiteClientTest.groovy
deleted file mode 100644
index cde1f26f27..0000000000
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/CachingGraphiteClientTest.groovy
+++ /dev/null
@@ -1,54 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.graphite
-
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer
-import pl.allegro.tech.hermes.test.helper.cache.FakeTicker
-import spock.lang.Specification
-import spock.lang.Subject
-
-import java.time.Duration
-
-import static pl.allegro.tech.hermes.api.MetricDecimalValue.of
-
-class CachingGraphiteClientTest extends Specification {
-    static final CACHE_TTL_IN_SECONDS = 30
-    static final CACHE_SIZE = 100_000
-    static final CACHE_TTL = Duration.ofSeconds(CACHE_TTL_IN_SECONDS)
-
-    def underlyingClient = Mock(GraphiteClient)
-    def ticker = new FakeTicker()
-
-    @Subject
-    def cachingClient = new CachingGraphiteClient(underlyingClient, ticker, CACHE_TTL_IN_SECONDS, CACHE_SIZE)
-
-    def "should return metrics from the underlying client"() {
-        given:
-        underlyingClient.readMetrics("metric_1", "metric_2") >> MonitoringMetricsContainer.initialized([metric_1: of("1"), metric_2: of("2")])
-
-        when:
-        def metrics = cachingClient.readMetrics("metric_1", "metric_2")
-
-        then:
-        metrics.metricValue("metric_1") == of("1")
-        metrics.metricValue("metric_2") == of("2")
-    }
-
-    def "should return metrics from cache while TTL has not expired"() {
-        when:
-        cachingClient.readMetrics("metric_1", "metric_2")
-        ticker.advance(CACHE_TTL.minusSeconds(1))
-        cachingClient.readMetrics("metric_1", "metric_2")
-
-        then:
-        1 * underlyingClient.readMetrics("metric_1", "metric_2") >> MonitoringMetricsContainer.initialized([metric_1: of("1"), metric_2: of("2")])
-    }
-
-    def "should get metrics from the underlying client after TTL expires"() {
-        when:
-        cachingClient.readMetrics("metric_1", "metric_2")
-        ticker.advance(CACHE_TTL.plusSeconds(1))
-        cachingClient.readMetrics("metric_1", "metric_2")
-
-        then:
-        2 * underlyingClient.readMetrics("metric_1", "metric_2") >> MonitoringMetricsContainer.initialized([metric_1: of("1"), metric_2: of("2")])
-    }
-}
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClientTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClientTest.groovy
deleted file mode 100644
index e73c9be9ef..0000000000
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClientTest.groovy
+++ /dev/null
@@ -1,101 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.graphite
-
-import com.github.tomakehurst.wiremock.client.WireMock
-import com.github.tomakehurst.wiremock.junit.WireMockRule
-import jakarta.ws.rs.core.MediaType
-import org.junit.Rule
-import org.springframework.web.client.RestTemplate
-import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer
-import pl.allegro.tech.hermes.test.helper.util.Ports
-import spock.lang.Specification
-
-import static pl.allegro.tech.hermes.api.MetricDecimalValue.of
-
-class RestTemplateGraphiteClientTest extends Specification {
-
-    private static final int GRAPHITE_HTTP_PORT = Ports.nextAvailable()
-
-    @Rule
-    WireMockRule wireMockRule = new WireMockRule(GRAPHITE_HTTP_PORT)
-
-    private RestTemplateGraphiteClient client
-
-    void setup() {
-        RestTemplate restTemplate = new RestTemplate();
-        client = new RestTemplateGraphiteClient(restTemplate, URI.create("http://localhost:$GRAPHITE_HTTP_PORT"));
-    }
-
-    def "should get metrics for path"() {
-        given:
-        mockGraphite([
-                [ metric: 'metric1', data: ['10'] ],
-                [ metric: 'metric2', data: ['20'] ]
-        ])
-
-        when:
-        MonitoringMetricsContainer metrics = client.readMetrics("metric1", "metric2")
-
-        then:
-        metrics.metricValue("metric1") == of("10")
-        metrics.metricValue("metric2") == of("20")
-    }
-
-    def "should return default value when metric has no value"() {
-        given:
-        mockGraphite([[ metric: 'metric', data: [null] ]])
-
-        when:
-        MonitoringMetricsContainer metrics = client.readMetrics("metric");
-
-        then:
-        metrics.metricValue("metric1") == of("0.0")
-    }
-
-    def "should return first notnull value"() {
-        given:
-        mockGraphite([
-                [ metric: 'metric', data: [null, null, '13'] ],
-        ])
-
-        when:
-        MonitoringMetricsContainer metrics = client.readMetrics("metric");
-
-        then:
-        metrics.metricValue("metric") == of("13")
-    }
-
-    def "should properly encode metric query strings"() {
-        given:
-        mockGraphite([
-                [ metric: 'sumSeries%28stats.tech.hermes.%2A.m1_rate%29', data: ['13'] ],
-        ])
-
-        when:
-        MonitoringMetricsContainer metrics = client.readMetrics('sumSeries(stats.tech.hermes.*.m1_rate)');
-
-        then:
-        metrics.metricValue('sumSeries%28stats.tech.hermes.%2A.m1_rate%29') == of("13")
-    }
-
-    private void mockGraphite(List queries) {
-        String targetParams = queries.collect({ "target=$it.metric" }).join('&')
-        String response = '[' + queries.collect({ jsonResponse(it.metric, it.data) }).join(',') + ']'
-
-        mockGraphite(targetParams, response)
-    }
-
-    private void mockGraphite(String targetParams, String jsonResponse) {
-        WireMock.stubFor(WireMock.get(WireMock.urlEqualTo(String.format("/render?from=-5minutes&until=-1minutes&format=json&%s", targetParams)))
-                .willReturn(WireMock.aResponse()
-                .withStatus(200)
-                .withHeader("Content-Type", MediaType.APPLICATION_JSON)
-                .withBody(jsonResponse)));
-    }
-
-    private String jsonResponse(String query, List datapoints) {
-        long timestamp = System.currentTimeSeconds()
-        String datapointsString = datapoints.collect({ "[$it, $timestamp]" }).join(',')
-        return '{"target": "' + query + '", "datapoints": [' + datapointsString + '], "tags": []}'
-    }
-
-}
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerGroupManagerSpec.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerGroupManagerSpec.groovy
index 4a0283d5a5..b43834d8ad 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerGroupManagerSpec.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/kafka/service/KafkaConsumerGroupManagerSpec.groovy
@@ -22,6 +22,7 @@ import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper
 import pl.allegro.tech.hermes.management.config.kafka.KafkaProperties
 import pl.allegro.tech.hermes.management.domain.subscription.ConsumerGroupManager
 import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder
+import pl.allegro.tech.hermes.test.helper.containers.ImageTags
 import spock.lang.Shared
 import spock.lang.Specification
 
@@ -38,7 +39,7 @@ class KafkaConsumerGroupManagerSpec extends Specification {
     OutputCaptureRule output = new OutputCaptureRule()
 
     @Shared
-    KafkaContainer kafkaContainer = new KafkaContainer()
+    KafkaContainer kafkaContainer = new KafkaContainer(ImageTags.confluentImagesTag())
 
     @Shared
     String containerId
@@ -167,7 +168,7 @@ class KafkaConsumerGroupManagerSpec extends Specification {
 
     private static def createTestSubscription(Topic topic, String subscriptionName) {
         Subscription.create(topic.getQualifiedName(), subscriptionName, null, Subscription.State.PENDING, "test", [:], false, null, null,
-                null, ContentType.JSON, DeliveryType.SERIAL, [], SubscriptionMode.ANYCAST, [], null, null, false, false, false
+                null, ContentType.JSON, DeliveryType.SERIAL, [], SubscriptionMode.ANYCAST, [], null, null, false, false, 0, false, false
         )
     }
 
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridGraphiteBasedSubscriptionMetricsRepositoryTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridGraphiteBasedSubscriptionMetricsRepositoryTest.groovy
deleted file mode 100644
index 0e94f343ac..0000000000
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridGraphiteBasedSubscriptionMetricsRepositoryTest.groovy
+++ /dev/null
@@ -1,92 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.metrics
-
-import pl.allegro.tech.hermes.api.MetricLongValue
-import pl.allegro.tech.hermes.api.PersistentSubscriptionMetrics
-import pl.allegro.tech.hermes.api.SubscriptionMetrics
-import pl.allegro.tech.hermes.api.TopicName
-import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths
-import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionLagSource
-import pl.allegro.tech.hermes.management.infrastructure.graphite.GraphiteClient
-import pl.allegro.tech.hermes.management.infrastructure.graphite.GraphiteMetricsProvider
-import spock.lang.Specification
-
-import static pl.allegro.tech.hermes.api.MetricDecimalValue.of
-
-class HybridGraphiteBasedSubscriptionMetricsRepositoryTest extends Specification {
-
-    private GraphiteClient client = Stub(GraphiteClient)
-
-    private SummedSharedCounter summedSharedCounter = Stub(SummedSharedCounter)
-
-    private ZookeeperPaths zookeeperPaths = new ZookeeperPaths("/hermes")
-
-    private SubscriptionLagSource lagSource = new NoOpSubscriptionLagSource()
-
-    private GraphiteMetricsProvider graphiteMetricsProvider = new GraphiteMetricsProvider(client, "stats");
-
-    private HybridSubscriptionMetricsRepository repository = new HybridSubscriptionMetricsRepository(graphiteMetricsProvider,
-            summedSharedCounter, zookeeperPaths, lagSource)
-
-    def "should read subscription metrics from multiple places"() {
-        given:
-        String rate = 'sumSeries(stats.consumer.*.meter.group.topic.subscription.m1_rate)'
-        String timeouts = 'sumSeries(stats.consumer.*.status.group.topic.subscription.errors.timeout.m1_rate)'
-        String otherErrors = 'sumSeries(stats.consumer.*.status.group.topic.subscription.errors.other.m1_rate)'
-
-        client.readMetrics(_ as String, _ as String, _ as String, rate, _ as String, timeouts, otherErrors, _ as String) >> MonitoringMetricsContainer.createEmpty()
-                .addMetricValue(rate, of('10'))
-                .addMetricValue(timeouts, of('100'))
-                .addMetricValue(otherErrors, of('1000'))
-        summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/delivered') >> 100
-        summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/discarded') >> 1
-        summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/volume') >> 16
-
-        when:
-        SubscriptionMetrics metrics = repository.loadMetrics(new TopicName('group', 'topic'), 'subscription')
-
-        then:
-        metrics.rate == of('10')
-        metrics.delivered == 100
-        metrics.discarded == 1
-        metrics.volume == 16
-        metrics.timeouts == of("100")
-        metrics.otherErrors == of("1000")
-        metrics.lag == MetricLongValue.of(-1)
-    }
-
-    def "should read subscription metrics for all http status codes"() {
-        given:
-        client.readMetrics(getHttpStatusCodeForFamily(2), getHttpStatusCodeForFamily(4), getHttpStatusCodeForFamily(5),
-                _ as String, _ as String, _ as String, _ as String, _ as String) >> MonitoringMetricsContainer.createEmpty()
-                .addMetricValue(getHttpStatusCodeForFamily(2), of('2'))
-                .addMetricValue(getHttpStatusCodeForFamily(4), of('4'))
-                .addMetricValue(getHttpStatusCodeForFamily(5), of('5'))
-
-        when:
-        SubscriptionMetrics metrics = repository.loadMetrics(new TopicName('group', 'topic'), 'subscription')
-
-        then:
-        metrics.codes2xx == of('2')
-        metrics.codes4xx == of('4')
-        metrics.codes5xx == of('5')
-    }
-
-    def "should read subscription zookeeper metrics"() {
-        given:
-        summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/delivered') >> 1000
-        summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/discarded') >> 10
-        summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/volume') >> 16
-
-        when:
-        PersistentSubscriptionMetrics zookeeperMetrics = repository.loadZookeeperMetrics(new TopicName('group', 'topic'), 'subscription')
-
-        then:
-        zookeeperMetrics.delivered == 1000
-        zookeeperMetrics.discarded == 10
-        zookeeperMetrics.volume == 16
-    }
-
-    private static String getHttpStatusCodeForFamily(int family) {
-        "sumSeries(stats.consumer.*.status.group.topic.subscription.${family}xx.m1_rate)"
-    }
-}
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridGraphiteBasedTopicMetricsRepositoryTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridGraphiteBasedTopicMetricsRepositoryTest.groovy
deleted file mode 100644
index 4c792c7e36..0000000000
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridGraphiteBasedTopicMetricsRepositoryTest.groovy
+++ /dev/null
@@ -1,53 +0,0 @@
-package pl.allegro.tech.hermes.management.infrastructure.metrics
-
-import pl.allegro.tech.hermes.api.TopicMetrics
-import pl.allegro.tech.hermes.api.TopicName
-import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository
-import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths
-import pl.allegro.tech.hermes.management.infrastructure.graphite.GraphiteClient
-import pl.allegro.tech.hermes.management.infrastructure.graphite.GraphiteMetricsProvider
-import spock.lang.Specification
-
-import static pl.allegro.tech.hermes.api.MetricDecimalValue.of
-
-class HybridGraphiteBasedTopicMetricsRepositoryTest extends Specification {
-
-    private GraphiteClient client = Stub(GraphiteClient)
-
-    private SummedSharedCounter summedSharedCounter = Stub(SummedSharedCounter)
-
-    private ZookeeperPaths zookeeperPaths = new ZookeeperPaths("/hermes")
-
-    private SubscriptionRepository subscriptionRepository = Mock(SubscriptionRepository)
-
-    private GraphiteMetricsProvider graphiteMetricsProvider = new GraphiteMetricsProvider(client, "stats")
-
-    private HybridTopicMetricsRepository repository = new HybridTopicMetricsRepository(graphiteMetricsProvider,
-            summedSharedCounter, zookeeperPaths, subscriptionRepository)
-
-    def "should load metrics from graphite and zookeeper"() {
-        given:
-        String rate = 'sumSeries(stats.producer.*.meter.group.topic.m1_rate)'
-        String deliveryRate = 'sumSeries(stats.consumer.*.meter.group.topic.m1_rate)'
-        String throughput = 'sumSeries(stats.producer.*.throughput.group.topic.m1_rate)'
-        TopicName topic = new TopicName('group', 'topic')
-
-        client.readMetrics(rate, deliveryRate, throughput) >> MonitoringMetricsContainer.createEmpty()
-            .addMetricValue(rate, of('10'))
-            .addMetricValue(deliveryRate, of('20'))
-        summedSharedCounter.getValue('/hermes/groups/group/topics/topic/metrics/published') >> 100
-        summedSharedCounter.getValue('/hermes/groups/group/topics/topic/metrics/volume') >> 1024
-        subscriptionRepository.listSubscriptionNames(topic) >> ["subscription1", "subscription2"]
-
-        when:
-        TopicMetrics metrics = repository.loadMetrics(topic)
-
-        then:
-        metrics.rate == of('10')
-        metrics.deliveryRate == of('20')
-        metrics.published == 100
-        metrics.subscriptions == 2
-        metrics.volume == 1024
-    }
-
-}
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridPrometheusBasedSubscriptionMetricsRepositoryTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridPrometheusBasedSubscriptionMetricsRepositoryTest.groovy
index 7c7ef12876..8ed2088bf3 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridPrometheusBasedSubscriptionMetricsRepositoryTest.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridPrometheusBasedSubscriptionMetricsRepositoryTest.groovy
@@ -7,7 +7,7 @@ import pl.allegro.tech.hermes.api.TopicName
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths
 import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionLagSource
 import pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient
-import pl.allegro.tech.hermes.management.infrastructure.prometheus.VictoriaMetricsMetricsProvider
+import pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusMetricsProvider
 import spock.lang.Specification
 
 import static pl.allegro.tech.hermes.api.MetricDecimalValue.of
@@ -22,27 +22,36 @@ class HybridPrometheusBasedSubscriptionMetricsRepositoryTest extends Specificati
 
     private SubscriptionLagSource lagSource = new NoOpSubscriptionLagSource()
 
-    private VictoriaMetricsMetricsProvider prometheusMetricsProvider = new VictoriaMetricsMetricsProvider(
-            client, "hermes_consumers", "hermes_frontend", "service=~'hermes'");
+    private PrometheusMetricsProvider prometheusMetricsProvider = new PrometheusMetricsProvider(
+            client, "hermes_consumers", "hermes_frontend", "service=~'hermes'")
 
     private HybridSubscriptionMetricsRepository repository = new HybridSubscriptionMetricsRepository(prometheusMetricsProvider,
             summedSharedCounter, zookeeperPaths, lagSource)
 
-    private static final String query = "sum by (__name__,group,topic,subscription,status_code)" +
-            "(irate({__name__=~'hermes_consumers_subscription_delivered_total" +
-            "|hermes_consumers_subscription_timeouts_total" +
-            "|hermes_consumers_subscription_throughput_bytes_total" +
-            "|hermes_consumers_subscription_other_errors_total" +
-            "|hermes_consumers_subscription_batches_total" +
-            "|hermes_consumers_subscription_http_status_codes_total'," +
-            "group='group',topic='topic',subscription='subscription', service=~'hermes'}[1m]) keep_metric_names)"
+    private final static String subscriptionQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_%s_total', group='group', topic='topic', subscription='subscription', service=~'hermes'}[1m]))";
+    private final static String deliveredQuery = String.format(subscriptionQuery, "delivered")
+    private final static String timeoutsQuery = String.format(subscriptionQuery, "timeouts")
+    private final static String retriesQuery = String.format(subscriptionQuery, "retries")
+    private final static String throughputQuery = String.format(subscriptionQuery, "throughput_bytes")
+    private final static String otherErrorsQuery = String.format(subscriptionQuery, "other_errors")
+    private final static String batchesQuery = String.format(subscriptionQuery, "batches")
+    // these queries are different as they contains additional status code filters
+    private final static String status2xxQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_http_status_codes_total', group='group', topic='topic', subscription='subscription', status_code=~'2.*', service=~'hermes'}[1m]))"
+    private final static String status4xxQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_http_status_codes_total', group='group', topic='topic', subscription='subscription', status_code=~'4.*', service=~'hermes'}[1m]))"
+    private final static String status5xxQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_http_status_codes_total', group='group', topic='topic', subscription='subscription', status_code=~'5.*', service=~'hermes'}[1m]))"
+
+    private static final List<String> queries = List.of(
+            deliveredQuery, timeoutsQuery, retriesQuery, throughputQuery, otherErrorsQuery, batchesQuery,
+            status2xxQuery, status4xxQuery, status5xxQuery
+    )
 
     def "should read subscription metrics from multiple places"() {
         given:
-        client.readMetrics(query) >> MonitoringMetricsContainer.createEmpty()
-                .addMetricValue("hermes_consumers_subscription_delivered_total", of('10'))
-                .addMetricValue("hermes_consumers_subscription_timeouts_total", of('100'))
-                .addMetricValue("hermes_consumers_subscription_other_errors_total", of('1000'))
+        client.readMetrics(queries) >> MonitoringMetricsContainer.createEmpty()
+                .addMetricValue(deliveredQuery, of('10'))
+                .addMetricValue(timeoutsQuery, of('100'))
+                .addMetricValue(retriesQuery, of('20'))
+                .addMetricValue(otherErrorsQuery, of('1000'))
         summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/delivered') >> 100
         summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/discarded') >> 1
         summedSharedCounter.getValue('/hermes/groups/group/topics/topic/subscriptions/subscription/metrics/volume') >> 16
@@ -57,16 +66,17 @@ class HybridPrometheusBasedSubscriptionMetricsRepositoryTest extends Specificati
         metrics.discarded == 1
         metrics.volume == 16
         metrics.timeouts == of("100")
+        metrics.retries == of("20")
         metrics.otherErrors == of("1000")
         metrics.lag == MetricLongValue.of(-1)
     }
 
     def "should read subscription metrics for all http status codes"() {
         given:
-        client.readMetrics(query) >> MonitoringMetricsContainer.createEmpty()
-                .addMetricValue("hermes_consumers_subscription_http_status_codes_total_2xx", of('2'))
-                .addMetricValue("hermes_consumers_subscription_http_status_codes_total_4xx", of('4'))
-                .addMetricValue("hermes_consumers_subscription_http_status_codes_total_5xx", of('5'))
+        client.readMetrics(queries) >> MonitoringMetricsContainer.createEmpty()
+                .addMetricValue(status2xxQuery, of('2'))
+                .addMetricValue(status4xxQuery, of('4'))
+                .addMetricValue(status5xxQuery, of('5'))
 
         when:
         SubscriptionMetrics metrics = repository.loadMetrics(new TopicName('group', 'topic'), 'subscription')
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridPrometheusBasedTopicMetricsRepositoryTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridPrometheusBasedTopicMetricsRepositoryTest.groovy
index c3dcad72ad..c1dcd3cc38 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridPrometheusBasedTopicMetricsRepositoryTest.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridPrometheusBasedTopicMetricsRepositoryTest.groovy
@@ -5,7 +5,7 @@ import pl.allegro.tech.hermes.api.TopicName
 import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository
 import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths
 import pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient
-import pl.allegro.tech.hermes.management.infrastructure.prometheus.VictoriaMetricsMetricsProvider
+import pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusMetricsProvider
 import spock.lang.Specification
 
 import static pl.allegro.tech.hermes.api.MetricDecimalValue.of
@@ -20,23 +20,24 @@ class HybridPrometheusBasedTopicMetricsRepositoryTest extends Specification {
 
     private SubscriptionRepository subscriptionRepository = Mock(SubscriptionRepository)
 
-    private VictoriaMetricsMetricsProvider prometheusMetricsProvider = new VictoriaMetricsMetricsProvider(client,
+    private PrometheusMetricsProvider prometheusMetricsProvider = new PrometheusMetricsProvider(client,
             "hermes_consumers", "hermes_frontend", "service='hermes'")
 
     private HybridTopicMetricsRepository repository = new HybridTopicMetricsRepository(prometheusMetricsProvider,
             summedSharedCounter, zookeeperPaths, subscriptionRepository)
 
+    private String topicRequestsQuery = "sum by (group, topic) (irate({__name__='hermes_frontend_topic_requests_total', group='group', topic='topic', service='hermes'}[1m]))"
+    private String topicDeliveredQuery = "sum by (group, topic) (irate({__name__='hermes_consumers_subscription_delivered_total', group='group', topic='topic', service='hermes'}[1m]))"
+    private String topicThroughputQuery = "sum by (group, topic) (irate({__name__='hermes_frontend_topic_throughput_bytes_total', group='group', topic='topic', service='hermes'}[1m]))"
+
     def "should load metrics from graphite and zookeeper"() {
         given:
-        String query = "sum by (__name__, group, topic) (irate({__name__=~'hermes_frontend_topic_requests_total" +
-                "|hermes_consumers_subscription_delivered_total" +
-                "|hermes_frontend_topic_throughput_bytes_total', group='group', " +
-                "topic='topic', service='hermes'}[1m]) keep_metric_names)"
+        List<String> queries = List.of(topicRequestsQuery, topicDeliveredQuery, topicThroughputQuery)
         TopicName topic = new TopicName('group', 'topic')
 
-        client.readMetrics(query) >> MonitoringMetricsContainer.createEmpty()
-            .addMetricValue("hermes_frontend_topic_requests_total", of('10'))
-            .addMetricValue("hermes_consumers_subscription_delivered_total", of('20'))
+        client.readMetrics(queries) >> MonitoringMetricsContainer.createEmpty()
+            .addMetricValue(topicRequestsQuery, of('10'))
+            .addMetricValue(topicDeliveredQuery, of('20'))
         summedSharedCounter.getValue('/hermes/groups/group/topics/topic/metrics/published') >> 100
         summedSharedCounter.getValue('/hermes/groups/group/topics/topic/metrics/volume') >> 1024
         subscriptionRepository.listSubscriptionNames(topic) >> ["subscription1", "subscription2"]
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/prometheus/CachingPrometheusClientTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/prometheus/CachingPrometheusClientTest.groovy
index 1345607d0f..07d52f64a5 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/prometheus/CachingPrometheusClientTest.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/prometheus/CachingPrometheusClientTest.groovy
@@ -8,6 +8,7 @@ import spock.lang.Subject
 import java.time.Duration
 
 import static pl.allegro.tech.hermes.api.MetricDecimalValue.of
+import static pl.allegro.tech.hermes.api.MetricDecimalValue.unavailable
 
 class CachingPrometheusClientTest extends Specification {
     static final CACHE_TTL_IN_SECONDS = 30
@@ -16,16 +17,18 @@ class CachingPrometheusClientTest extends Specification {
 
     def underlyingClient = Mock(PrometheusClient)
     def ticker = new FakeTicker()
+    def queries = List.of("query")
 
     @Subject
     def cachingClient = new CachingPrometheusClient(underlyingClient, ticker, CACHE_TTL_IN_SECONDS, CACHE_SIZE)
 
     def "should return metrics from the underlying client"() {
         given:
-        underlyingClient.readMetrics("someQuery") >> MonitoringMetricsContainer.initialized([metric_1: of("1"), metric_2: of("2")])
+        underlyingClient.readMetrics(queries) >> MonitoringMetricsContainer.initialized(
+                ["metric_1": of("1"), "metric_2": of("2")])
 
         when:
-        def metrics = cachingClient.readMetrics("someQuery")
+        def metrics = cachingClient.readMetrics(queries)
 
         then:
         metrics.metricValue("metric_1") == of("1")
@@ -34,21 +37,42 @@ class CachingPrometheusClientTest extends Specification {
 
     def "should return metrics from cache while TTL has not expired"() {
         when:
-        cachingClient.readMetrics("someQuery")
+        cachingClient.readMetrics(queries)
         ticker.advance(CACHE_TTL.minusSeconds(1))
-        cachingClient.readMetrics("someQuery")
+        cachingClient.readMetrics(queries)
 
         then:
-        1 * underlyingClient.readMetrics("someQuery") >> MonitoringMetricsContainer.initialized([metric_1: of("1"), metric_2: of("2")])
+        1 * underlyingClient.readMetrics(queries) >> MonitoringMetricsContainer.initialized(
+                ["metric_1": of("1"), "metric_2": of("2")])
     }
 
     def "should get metrics from the underlying client after TTL expires"() {
         when:
-        cachingClient.readMetrics("someQuery")
+        cachingClient.readMetrics(queries)
         ticker.advance(CACHE_TTL.plusSeconds(1))
-        cachingClient.readMetrics("someQuery")
+        cachingClient.readMetrics(queries)
 
         then:
-        2 * underlyingClient.readMetrics("someQuery") >> MonitoringMetricsContainer.initialized([metric_1: of("1"), metric_2: of("2")])
+        2 * underlyingClient.readMetrics(queries) >> MonitoringMetricsContainer.initialized(
+                ["metric_1": of("1"), "metric_2": of("2")])
+    }
+
+    def "should invalidate partially unavailable data and retry fetch on the next client metrics read"() {
+        when:
+        cachingClient.readMetrics(queries)
+        cachingClient.readMetrics(queries)
+
+        then:
+        2 * underlyingClient.readMetrics(queries) >> MonitoringMetricsContainer.initialized(
+                ["metric_1": unavailable(), "metric_2": of("2")])
+    }
+
+    def "should invalidate completely unavailable data and retry fetch on the next client metrics read"() {
+        when:
+        cachingClient.readMetrics(queries)
+        cachingClient.readMetrics(queries)
+
+        then:
+        2 * underlyingClient.readMetrics(queries) >> MonitoringMetricsContainer.unavailable()
     }
 }
diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/prometheus/RestTemplatePrometheusClientTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/prometheus/RestTemplatePrometheusClientTest.groovy
index c44a9c8fa7..5d8c8024dd 100644
--- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/prometheus/RestTemplatePrometheusClientTest.groovy
+++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/prometheus/RestTemplatePrometheusClientTest.groovy
@@ -1,85 +1,204 @@
 package pl.allegro.tech.hermes.management.infrastructure.prometheus
 
+
 import com.github.tomakehurst.wiremock.client.WireMock
 import com.github.tomakehurst.wiremock.junit.WireMockRule
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import jakarta.ws.rs.core.MediaType
+import org.apache.hc.client5.http.classic.HttpClient
+import org.apache.hc.client5.http.config.RequestConfig
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder
+import org.apache.hc.core5.util.Timeout
 import org.junit.Rule
+import org.springframework.http.client.ClientHttpRequestFactory
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory
 import org.springframework.web.client.RestTemplate
 import pl.allegro.tech.hermes.management.infrastructure.metrics.MonitoringMetricsContainer
 import pl.allegro.tech.hermes.test.helper.util.Ports
 import spock.lang.Specification
 
 import java.nio.charset.StandardCharsets
+import java.time.Duration
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
 
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig
+import static pl.allegro.tech.hermes.api.MetricDecimalValue.defaultValue
 import static pl.allegro.tech.hermes.api.MetricDecimalValue.of
+import static pl.allegro.tech.hermes.api.MetricDecimalValue.unavailable
 
 class RestTemplatePrometheusClientTest extends Specification {
 
     private static final int PROMETHEUS_HTTP_PORT = Ports.nextAvailable()
-    private static final String query = "sum by (__name__,group,topic,subscription,status_code)" +
-            "(irate({__name__=~'hermes_consumers_subscription_delivered_total" +
-            "|hermes_consumers_subscription_timeouts_total" +
-            "|hermes_consumers_subscription_throughput_bytes_total" +
-            "|hermes_consumers_subscription_other_errors_total" +
-            "|hermes_consumers_subscription_batches_total" +
-            "|hermes_consumers_subscription_http_status_codes_total'," +
-            "group='pl.allegro.tech.hermes',topic='Monitor',subscription='consumer1'}[1m]) keep_metric_names)"
+    def subscriptionDeliveredQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_delivered_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1' service=~'hermes'}[1m]))"
+    def subscriptionTimeoutsQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_timeouts_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1', service=~'hermes'}[1m]))"
+    def subscriptionRetriesQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_retries_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1', service=~'hermes'}[1m]))"
+    def subscriptionThroughputQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_throughput_bytes_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1', service=~'hermes'}[1m]))"
+    def subscriptionErrorsQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_other_errors_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1', service=~'hermes'}[1m]))"
+    def subscriptionBatchesQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_batches_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1', service=~'hermes'}[1m]))"
+    def subscription2xxStatusCodesQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_http_status_codes_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1', status_code=~'2.*', service=~'hermes'}[1m]))"
+    def subscription4xxStatusCodesQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_http_status_codes_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1', status_code=~'4.*', service=~'hermes'}[1m]))"
+    def subscription5xxStatusCodesQuery = "sum by (group, topic, subscription) (irate({__name__='hermes_consumers_subscription_http_status_codes_total', group='pl.allegro.tech.hermes', topic='Monitor', subscription='consumer1', status_code=~'5.*', service=~'hermes'}[1m]))"
+
+    def queries = List.of(subscriptionDeliveredQuery, subscriptionTimeoutsQuery, subscriptionRetriesQuery, subscriptionThroughputQuery,
+            subscriptionErrorsQuery, subscriptionBatchesQuery, subscription2xxStatusCodesQuery, subscription4xxStatusCodesQuery,
+            subscription5xxStatusCodesQuery
+    )
 
     @Rule
-    WireMockRule wireMockRule = new WireMockRule(
-            wireMockConfig().port(PROMETHEUS_HTTP_PORT).usingFilesUnderClasspath("prometheus-stubs"))
+    WireMockRule wireMockServer = new WireMockRule(
+            wireMockConfig()
+                    .port(PROMETHEUS_HTTP_PORT).usingFilesUnderClasspath("prometheus-stubs"))
 
     private RestTemplatePrometheusClient client
 
     void setup() {
-        RestTemplate restTemplate = new RestTemplate();
-        client = new RestTemplatePrometheusClient(restTemplate, URI.create("http://localhost:$PROMETHEUS_HTTP_PORT"),);
+        ExecutorService executorService = Executors.newFixedThreadPool(10)
+        RestTemplate restTemplate = createRestTemplateWithTimeout(Duration.ofSeconds(1))
+        client = new RestTemplatePrometheusClient(restTemplate, URI.create("http://localhost:$PROMETHEUS_HTTP_PORT"),
+                executorService, Duration.ofSeconds(5), new SimpleMeterRegistry())
+        wireMockServer.resetAll()
     }
 
     def "should get metrics for path"() {
         given:
-        mockPrometheus(query, "full_response.json");
+        def queriesStubs = List.of(
+                new FileStub(subscriptionDeliveredQuery, "subscription_delivered_total.json"),
+                new FileStub(subscriptionTimeoutsQuery, "subscription_timeouts_total.json"),
+                new FileStub(subscriptionRetriesQuery, "subscription_retries_total.json"),
+                new FileStub(subscriptionThroughputQuery, "subscription_throughput_bytes_total.json"),
+                new FileStub(subscriptionErrorsQuery, "subscription_other_errors_total.json"),
+                new FileStub(subscriptionBatchesQuery, "subscription_batches_total.json"),
+                new FileStub(subscription2xxStatusCodesQuery, "subscription_2xx_http_status_codes_total.json"),
+                new FileStub(subscription4xxStatusCodesQuery, "subscription_4xx_http_status_codes_total.json"),
+                new FileStub(subscription5xxStatusCodesQuery, "subscription_5xx_http_status_codes_total.json"),
+        )
+        mockPrometheus(queriesStubs)
 
         when:
-        MonitoringMetricsContainer metrics = client.readMetrics(query)
+        MonitoringMetricsContainer metrics = client.readMetrics(queries)
 
         then:
-        metrics.metricValue("hermes_consumers_subscription_delivered_total") == of("1.0")
-        metrics.metricValue("hermes_consumers_subscription_timeouts_total") == of("2.0")
-        metrics.metricValue("hermes_consumers_subscription_throughput_bytes_total") == of("3.0")
-        metrics.metricValue("hermes_consumers_subscription_other_errors_total") == of("4.0")
-        metrics.metricValue("hermes_consumers_subscription_batches_total") == of("5.0")
-        metrics.metricValue("hermes_consumers_subscription_http_status_codes_total_2xx") == of("2.0")
-        metrics.metricValue("hermes_consumers_subscription_http_status_codes_total_4xx") == of("1.0")
-        metrics.metricValue("hermes_consumers_subscription_http_status_codes_total_5xx") == of("2.0")
+        metrics.metricValue(subscriptionDeliveredQuery) == of("1.0")
+        metrics.metricValue(subscriptionTimeoutsQuery) == of("2.0")
+        metrics.metricValue(subscriptionRetriesQuery) == of("1.0")
+        metrics.metricValue(subscriptionThroughputQuery) == of("3.0")
+        metrics.metricValue(subscriptionErrorsQuery) == of("4.0")
+        metrics.metricValue(subscriptionBatchesQuery) == of("5.0")
+        metrics.metricValue(subscription2xxStatusCodesQuery) == of("2.0")
+        metrics.metricValue(subscription4xxStatusCodesQuery) == of("1.0")
+        metrics.metricValue(subscription5xxStatusCodesQuery) == of("2.0")
     }
 
     def "should return default value when metric has no value"() {
         given:
-        mockPrometheus(query, "partial_response.json")
+        def queriesStubs = List.of(
+                emptyStub(subscriptionDeliveredQuery),
+                new FileStub(subscriptionTimeoutsQuery, "subscription_timeouts_total.json"),
+                new FileStub(subscriptionRetriesQuery, "subscription_retries_total.json"),
+                emptyStub(subscriptionThroughputQuery),
+                emptyStub(subscriptionErrorsQuery),
+                emptyStub(subscriptionBatchesQuery),
+                emptyStub(subscription2xxStatusCodesQuery),
+                emptyStub(subscription4xxStatusCodesQuery),
+                emptyStub(subscription5xxStatusCodesQuery)
+        )
+        mockPrometheus(queriesStubs)
+
+        when:
+        MonitoringMetricsContainer metrics = client.readMetrics(queries)
+
+        then:
+        metrics.metricValue(subscriptionDeliveredQuery) == defaultValue()
+        metrics.metricValue(subscriptionTimeoutsQuery) == of("2.0")
+        metrics.metricValue(subscriptionRetriesQuery) == of("1.0")
+        metrics.metricValue(subscriptionThroughputQuery) == defaultValue()
+        metrics.metricValue(subscriptionErrorsQuery) == defaultValue()
+        metrics.metricValue(subscriptionBatchesQuery) == defaultValue()
+        metrics.metricValue(subscription2xxStatusCodesQuery) == defaultValue()
+        metrics.metricValue(subscription4xxStatusCodesQuery) == defaultValue()
+        metrics.metricValue(subscription5xxStatusCodesQuery) == defaultValue()
+    }
+
+    def "should return partial results when some of the requests fails"() {
+        given:
+        def queriesToFail = List.of(
+                subscriptionDeliveredQuery,
+                subscriptionThroughputQuery,
+                subscriptionErrorsQuery,
+                subscriptionBatchesQuery,
+                subscription2xxStatusCodesQuery,
+                subscription4xxStatusCodesQuery,
+                subscription5xxStatusCodesQuery,
+        )
+        def queriesToSuccess = List.of(
+                new FileStub(subscriptionTimeoutsQuery, "subscription_timeouts_total.json"),
+                new FileStub(subscriptionRetriesQuery, "subscription_retries_total.json"),
+        )
+        mockPrometheus(queriesToSuccess)
+        mockPrometheusTimeout(queriesToFail, Duration.ofSeconds(5))
 
         when:
-        MonitoringMetricsContainer metrics = client.readMetrics(query)
+        MonitoringMetricsContainer metrics = client.readMetrics(queries)
 
         then:
-        metrics.metricValue("hermes_consumers_subscription_delivered_total") == of("0.0")
-        metrics.metricValue("hermes_consumers_subscription_timeouts_total") == of("2.0")
-        metrics.metricValue("hermes_consumers_subscription_throughput_bytes_total") == of("3.0")
-        metrics.metricValue("hermes_consumers_subscription_other_errors_total") == of("4.0")
-        metrics.metricValue("hermes_consumers_subscription_batches_total") == of("5.0")
-        metrics.metricValue("hermes_consumers_subscription_http_status_codes_total_2xx") == of("2.0")
-        metrics.metricValue("hermes_consumers_subscription_http_status_codes_total_4xx") == of("1.0")
-        metrics.metricValue("hermes_consumers_subscription_http_status_codes_total_5xx") == of("0.0")
+        metrics.metricValue(subscriptionDeliveredQuery) == unavailable()
+        metrics.metricValue(subscriptionTimeoutsQuery) == of("2.0")
+        metrics.metricValue(subscriptionRetriesQuery) == of("1.0")
+        metrics.metricValue(subscriptionThroughputQuery) == unavailable()
+        metrics.metricValue(subscriptionErrorsQuery) == unavailable()
+        metrics.metricValue(subscriptionBatchesQuery) == unavailable()
+        metrics.metricValue(subscription2xxStatusCodesQuery) == unavailable()
+        metrics.metricValue(subscription4xxStatusCodesQuery) == unavailable()
+        metrics.metricValue(subscription5xxStatusCodesQuery) == unavailable()
+    }
+
+    private void mockPrometheus(List<FileStub> stubs) {
+        stubs.forEach { s ->
+            String encodedQuery = URLEncoder.encode(s.query, StandardCharsets.UTF_8)
+            wireMockServer.stubFor(WireMock.get(urlEqualTo(String.format("/api/v1/query?query=%s", encodedQuery)))
+                    .willReturn(WireMock.aResponse()
+                            .withStatus(200)
+                            .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                            .withBodyFile(s.fileName)))
+        }
+    }
+
+    private void mockPrometheusTimeout(List<String> queries, Duration delay) {
+        queries.forEach { q ->
+            String encodedQuery = URLEncoder.encode(q, StandardCharsets.UTF_8)
+            wireMockServer.stubFor(WireMock.get(urlEqualTo(String.format("/api/v1/query?query=%s", encodedQuery)))
+                    .willReturn(WireMock.aResponse()
+                            .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                            .withFixedDelay(delay.toMillis() as Integer)));
+        }
+    }
+
+    private RestTemplate createRestTemplateWithTimeout(Duration timeout) {
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setConnectTimeout(Timeout.ofMilliseconds(timeout.toMillis()))
+                .setResponseTimeout(Timeout.ofMilliseconds(timeout.toMillis()))
+                .build();
+
+        HttpClient client = HttpClientBuilder.create()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        ClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(client);
+        return new RestTemplate(clientHttpRequestFactory);
+    }
+
+    static class FileStub {
+        FileStub(String query, String fileName) {
+            this.query = query
+            this.fileName = fileName
+        }
+        String query;
+        String fileName
     }
 
-    private void mockPrometheus(String query, String responseFile) {
-        String encodedQuery = URLEncoder.encode(query, StandardCharsets.UTF_8)
-        WireMock.stubFor(WireMock.get(urlEqualTo(String.format("/api/v1/query?query=%s", encodedQuery)))
-                .willReturn(WireMock.aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", MediaType.APPLICATION_JSON)
-                        .withBodyFile(responseFile)))
+    FileStub emptyStub(String query) {
+        return new FileStub(query, "prometheus_empty_response.json")
     }
 }
diff --git a/hermes-management/src/test/resources/allure.properties b/hermes-management/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-management/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/full_response.json b/hermes-management/src/test/resources/prometheus-stubs/__files/full_response.json
deleted file mode 100644
index 9a9f457be7..0000000000
--- a/hermes-management/src/test/resources/prometheus-stubs/__files/full_response.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-  "status": "success",
-  "data": {
-    "resultType": "vector",
-    "result": [
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_delivered_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_timeouts_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "2"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_throughput_bytes_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "3"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_other_errors_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "4"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_batches_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "5"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_http_status_codes_total",
-          "status_code": "200",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_http_status_codes_total",
-          "status_code": "201",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_http_status_codes_total",
-          "status_code": "401",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_http_status_codes_total",
-          "status_code": "503",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_http_status_codes_total",
-          "status_code": "500",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/partial_response.json b/hermes-management/src/test/resources/prometheus-stubs/__files/partial_response.json
deleted file mode 100644
index a0f61afb2a..0000000000
--- a/hermes-management/src/test/resources/prometheus-stubs/__files/partial_response.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "status": "success",
-  "data": {
-    "resultType": "vector",
-    "result": [
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_timeouts_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "2"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_throughput_bytes_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "3"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_other_errors_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "4"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_batches_total",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "5"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_http_status_codes_total",
-          "status_code": "200",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_http_status_codes_total",
-          "status_code": "201",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      },
-      {
-        "metric": {
-          "__name__": "hermes_consumers_subscription_http_status_codes_total",
-          "status_code": "401",
-          "group": "pl.allegro.tech.hermes",
-          "subscription": "hermesSubscription",
-          "topic": "hermesTopic"
-        },
-        "value": [
-          1692281425.609,
-          "1"
-        ],
-        "group": 1
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/prometheus_empty_response.json b/hermes-management/src/test/resources/prometheus-stubs/__files/prometheus_empty_response.json
new file mode 100644
index 0000000000..ef28156d55
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/prometheus_empty_response.json
@@ -0,0 +1,7 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": []
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_2xx_http_status_codes_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_2xx_http_status_codes_total.json
new file mode 100644
index 0000000000..7a0da2287c
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_2xx_http_status_codes_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "2"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_4xx_http_status_codes_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_4xx_http_status_codes_total.json
new file mode 100644
index 0000000000..b4ae98b299
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_4xx_http_status_codes_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "1"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_5xx_http_status_codes_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_5xx_http_status_codes_total.json
new file mode 100644
index 0000000000..7a0da2287c
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_5xx_http_status_codes_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "2"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_batches_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_batches_total.json
new file mode 100644
index 0000000000..5a460603df
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_batches_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "5"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_delivered_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_delivered_total.json
new file mode 100644
index 0000000000..b4ae98b299
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_delivered_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "1"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_other_errors_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_other_errors_total.json
new file mode 100644
index 0000000000..ac0dc498bb
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_other_errors_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "4"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_retries_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_retries_total.json
new file mode 100644
index 0000000000..b4ae98b299
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_retries_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "1"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_throughput_bytes_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_throughput_bytes_total.json
new file mode 100644
index 0000000000..1b944f3d6b
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_throughput_bytes_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "3"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_timeouts_total.json b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_timeouts_total.json
new file mode 100644
index 0000000000..7a0da2287c
--- /dev/null
+++ b/hermes-management/src/test/resources/prometheus-stubs/__files/subscription_timeouts_total.json
@@ -0,0 +1,19 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "vector",
+    "result": [
+      {
+        "metric": {
+          "group": "pl.allegro.tech.hermes",
+          "subscription": "hermesSubscription",
+          "topic": "hermesTopic"
+        },
+        "value": [
+          1692281425.609,
+          "2"
+        ]
+      }
+    ]
+  }
+}
diff --git a/hermes-metrics/build.gradle b/hermes-metrics/build.gradle
index 867742ae82..f06e7f39ad 100644
--- a/hermes-metrics/build.gradle
+++ b/hermes-metrics/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-    api group: 'io.dropwizard.metrics', name: 'metrics-graphite', version: versions.dropwizard_metrics
-    api group: 'commons-lang', name: 'commons-lang', version: '2.6'
+    api group: 'io.dropwizard.metrics', name: 'metrics-core', version: versions.dropwizard_metrics
+    api group: 'org.apache.commons', name: 'commons-text', version: '1.12.0'
     api group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/DefaultHermesHistogram.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/DefaultHermesHistogram.java
index 33e8d9b14e..1140b439c6 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/DefaultHermesHistogram.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/DefaultHermesHistogram.java
@@ -1,23 +1,22 @@
 package pl.allegro.tech.hermes.metrics;
 
+import io.micrometer.core.instrument.DistributionSummary;
+
 public class DefaultHermesHistogram implements HermesHistogram {
-    private final io.micrometer.core.instrument.DistributionSummary micrometerHistogram;
-    private final com.codahale.metrics.Histogram graphiteHistogram;
+  private final DistributionSummary micrometerHistogram;
 
-    private DefaultHermesHistogram(io.micrometer.core.instrument.DistributionSummary micrometerHistogram,
-                                   com.codahale.metrics.Histogram graphiteHistogram) {
-        this.micrometerHistogram = micrometerHistogram;
-        this.graphiteHistogram = graphiteHistogram;
-    }
+  private DefaultHermesHistogram(
+      io.micrometer.core.instrument.DistributionSummary micrometerHistogram) {
+    this.micrometerHistogram = micrometerHistogram;
+  }
 
-    public static DefaultHermesHistogram of(io.micrometer.core.instrument.DistributionSummary micrometerHistogram,
-                                            com.codahale.metrics.Histogram graphiteHistogram) {
-        return new DefaultHermesHistogram(micrometerHistogram, graphiteHistogram);
-    }
+  public static DefaultHermesHistogram of(
+      io.micrometer.core.instrument.DistributionSummary micrometerHistogram) {
+    return new DefaultHermesHistogram(micrometerHistogram);
+  }
 
-    @Override
-    public void record(long value) {
-        micrometerHistogram.record(value);
-        graphiteHistogram.update(value);
-    }
+  @Override
+  public void record(long value) {
+    micrometerHistogram.record(value);
+  }
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesCounter.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesCounter.java
index 641cd72a5f..db786f2f3b 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesCounter.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesCounter.java
@@ -1,10 +1,9 @@
 package pl.allegro.tech.hermes.metrics;
 
-
 public interface HermesCounter {
-    void increment(long size);
+  void increment(long size);
 
-    default void increment() {
-        increment(1L);
-    }
+  default void increment() {
+    increment(1L);
+  }
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesHistogram.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesHistogram.java
index 2410154e13..21ca2a1bef 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesHistogram.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesHistogram.java
@@ -2,5 +2,5 @@
 
 public interface HermesHistogram {
 
-    void record(long value);
+  void record(long value);
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesRateMeter.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesRateMeter.java
index c31ae5fa46..b4d3189f19 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesRateMeter.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesRateMeter.java
@@ -1,5 +1,5 @@
 package pl.allegro.tech.hermes.metrics;
 
 public interface HermesRateMeter {
-    double getOneMinuteRate();
+  double getOneMinuteRate();
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesTimer.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesTimer.java
index 9b518afd6e..a994b56594 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesTimer.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesTimer.java
@@ -1,21 +1,19 @@
 package pl.allegro.tech.hermes.metrics;
 
+import io.micrometer.core.instrument.Timer;
+
 public class HermesTimer {
-    private final io.micrometer.core.instrument.Timer micrometerTimer;
-    private final com.codahale.metrics.Timer graphiteTimer;
+  private final Timer micrometerTimer;
 
-    private HermesTimer(io.micrometer.core.instrument.Timer micrometerTimer,
-                        com.codahale.metrics.Timer graphiteTimer) {
-        this.micrometerTimer = micrometerTimer;
-        this.graphiteTimer = graphiteTimer;
-    }
+  private HermesTimer(Timer micrometerTimer) {
+    this.micrometerTimer = micrometerTimer;
+  }
 
-    public static HermesTimer from(io.micrometer.core.instrument.Timer micrometerTimer,
-                                   com.codahale.metrics.Timer graphiteTimer) {
-        return new HermesTimer(micrometerTimer, graphiteTimer);
-    }
+  public static HermesTimer from(io.micrometer.core.instrument.Timer micrometerTimer) {
+    return new HermesTimer(micrometerTimer);
+  }
 
-    public HermesTimerContext time() {
-        return HermesTimerContext.from(micrometerTimer, graphiteTimer);
-    }
-}
\ No newline at end of file
+  public HermesTimerContext time() {
+    return HermesTimerContext.from(micrometerTimer);
+  }
+}
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesTimerContext.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesTimerContext.java
index 451cd2aec6..867ca43a3f 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesTimerContext.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/HermesTimerContext.java
@@ -2,32 +2,38 @@
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.Timer;
-
 import java.io.Closeable;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 public class HermesTimerContext implements Closeable {
 
-    private final Timer micrometerTimer;
-    private final com.codahale.metrics.Timer graphiteTimer;
-    private final Clock clock;
-    private final long startNanos;
-
-    private HermesTimerContext(Timer micrometerTimer, com.codahale.metrics.Timer graphiteTimer, Clock clock) {
-        this.micrometerTimer = micrometerTimer;
-        this.graphiteTimer = graphiteTimer;
-        this.clock = clock;
-        this.startNanos = clock.monotonicTime();
-    }
-
-    public static HermesTimerContext from(Timer micrometerTimer, com.codahale.metrics.Timer graphiteTimer) {
-        return new HermesTimerContext(micrometerTimer, graphiteTimer, Clock.SYSTEM);
-    }
-
-    @Override
-    public void close() {
-        long amount = clock.monotonicTime() - startNanos;
-        graphiteTimer.update(amount, TimeUnit.NANOSECONDS);
-        micrometerTimer.record(amount, TimeUnit.NANOSECONDS);
-    }
+  private final Timer micrometerTimer;
+  private final Clock clock;
+  private final long startNanos;
+
+  private HermesTimerContext(Timer micrometerTimer, Clock clock) {
+    this.micrometerTimer = micrometerTimer;
+    this.clock = clock;
+    this.startNanos = clock.monotonicTime();
+  }
+
+  public static HermesTimerContext from(Timer micrometerTimer) {
+    return new HermesTimerContext(micrometerTimer, Clock.SYSTEM);
+  }
+
+  @Override
+  public void close() {
+    reportTimer();
+  }
+
+  public Duration closeAndGet() {
+    return Duration.ofNanos(reportTimer());
+  }
+
+  private long reportTimer() {
+    long amount = clock.monotonicTime() - startNanos;
+    micrometerTimer.record(amount, TimeUnit.NANOSECONDS);
+    return amount;
+  }
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/PathContext.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/PathContext.java
index 642b4edb3e..667cd44930 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/PathContext.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/PathContext.java
@@ -4,162 +4,56 @@
 
 public class PathContext {
 
-    private final Optional<String> group;
-    private final Optional<String> topic;
-    private final Optional<String> subscription;
-    private final Optional<String> kafkaTopic;
-    private final Optional<Integer> partition;
-    private final Optional<String> kafkaCluster;
-    private final Optional<Integer> httpCode;
-    private final Optional<String> httpCodeFamily;
-    private final Optional<String> executorName;
-    private final Optional<String> oAuthProviderName;
-    private final Optional<String> schemaRepoType;
+  private final Optional<String> group;
+  private final Optional<String> topic;
+  private final Optional<String> subscription;
 
-    private PathContext(Optional<String> group,
-                        Optional<String> topic,
-                        Optional<String> subscription,
-                        Optional<String> kafkaTopic,
-                        Optional<Integer> partition,
-                        Optional<String> kafkaCluster,
-                        Optional<Integer> httpCode,
-                        Optional<String> httpCodeFamily,
-                        Optional<String> executorName,
-                        Optional<String> oAuthProviderName,
-                        Optional<String> schemaRepoType)  {
-        this.group = group;
-        this.topic = topic;
-        this.subscription = subscription;
-        this.kafkaTopic = kafkaTopic;
-        this.partition = partition;
-        this.kafkaCluster = kafkaCluster;
-        this.httpCode = httpCode;
-        this.httpCodeFamily = httpCodeFamily;
-        this.executorName = executorName;
-        this.oAuthProviderName = oAuthProviderName;
-        this.schemaRepoType = schemaRepoType;
-    }
+  private PathContext(
+      Optional<String> group, Optional<String> topic, Optional<String> subscription) {
+    this.group = group;
+    this.topic = topic;
+    this.subscription = subscription;
+  }
 
-    public Optional<String> getGroup() {
-        return group;
-    }
+  public Optional<String> getGroup() {
+    return group;
+  }
 
-    public Optional<String> getTopic() {
-        return topic;
-    }
+  public Optional<String> getTopic() {
+    return topic;
+  }
 
-    public Optional<String> getSubscription() {
-        return subscription;
-    }
+  public Optional<String> getSubscription() {
+    return subscription;
+  }
 
-    public Optional<String> getKafkaTopic() {
-        return kafkaTopic;
-    }
+  public static Builder pathContext() {
+    return new Builder();
+  }
 
-    public Optional<Integer> getPartition() {
-        return partition;
-    }
+  public static class Builder {
 
-    public Optional<String> getKafkaCluster() {
-        return kafkaCluster;
-    }
-
-    public Optional<Integer> getHttpCode() {
-        return httpCode;
-    }
-
-    public Optional<String> getHttpCodeFamily() {
-        return httpCodeFamily;
-    }
-
-    public Optional<String> getExecutorName() {
-        return executorName;
-    }
+    private Optional<String> group = Optional.empty();
+    private Optional<String> topic = Optional.empty();
+    private Optional<String> subscription = Optional.empty();
 
-    public Optional<String> getoAuthProviderName() {
-        return oAuthProviderName;
+    public Builder withGroup(String group) {
+      this.group = Optional.of(group);
+      return this;
     }
 
-    public Optional<String> getSchemaRepoType() {
-        return schemaRepoType;
+    public Builder withTopic(String topic) {
+      this.topic = Optional.of(topic);
+      return this;
     }
 
-    public static Builder pathContext() {
-        return new Builder();
+    public Builder withSubscription(String subscription) {
+      this.subscription = Optional.of(subscription);
+      return this;
     }
 
-    public static class Builder {
-
-        private Optional<String> group = Optional.empty();
-        private Optional<String> topic = Optional.empty();
-        private Optional<String> subscription = Optional.empty();
-        private Optional<String> kafkaTopic = Optional.empty();
-        private Optional<Integer> partition = Optional.empty();
-        private Optional<String> kafkaCluster = Optional.empty();
-        private Optional<Integer> httpCode = Optional.empty();
-        private Optional<String> httpCodeFamily = Optional.empty();
-        private Optional<String> executorName = Optional.empty();
-        private Optional<String> oAuthProviderName = Optional.empty();
-        private Optional<String> schemaRepoType = Optional.empty();
-
-        public Builder withGroup(String group) {
-            this.group = Optional.of(group);
-            return this;
-        }
-
-        public Builder withTopic(String topic) {
-            this.topic = Optional.of(topic);
-            return this;
-        }
-
-        public Builder withSubscription(String subscription) {
-            this.subscription = Optional.of(subscription);
-            return this;
-        }
-
-        public Builder withKafkaTopic(String kafkaTopic) {
-            this.kafkaTopic = Optional.of(kafkaTopic);
-            return this;
-        }
-
-        public Builder withPartition(int partition) {
-            this.partition = Optional.of(partition);
-            return this;
-        }
-
-        public Builder withKafkaCluster(String kafkaCluster) {
-            this.kafkaCluster = Optional.of(kafkaCluster);
-            return this;
-        }
-
-        public Builder withHttpCode(int httpCode) {
-            this.httpCode = Optional.of(httpCode);
-            return this;
-        }
-
-        public Builder withHttpCodeFamily(String httpCodeFamily) {
-            this.httpCodeFamily = Optional.of(httpCodeFamily);
-            return this;
-        }
-
-        public Builder withExecutorName(String executorName) {
-            this.executorName = Optional.of(executorName);
-            return this;
-        }
-
-        public Builder withOAuthProvider(String oAuthProviderName) {
-            this.oAuthProviderName = Optional.of(oAuthProviderName);
-            return this;
-        }
-
-        public Builder withSchemaRepoType(String schemaRepoType) {
-            this.schemaRepoType = Optional.of(schemaRepoType);
-            return this;
-        }
-
-        public PathContext build() {
-            return new PathContext(group, topic, subscription, kafkaTopic, partition, kafkaCluster,
-                    httpCode, httpCodeFamily, executorName, oAuthProviderName, schemaRepoType);
-        }
+    public PathContext build() {
+      return new PathContext(group, topic, subscription);
     }
+  }
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/PathsCompiler.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/PathsCompiler.java
index b517f4dbeb..7ac7fca8b3 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/PathsCompiler.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/PathsCompiler.java
@@ -1,55 +1,39 @@
 package pl.allegro.tech.hermes.metrics;
 
-import org.apache.commons.lang.text.StrBuilder;
+import org.apache.commons.text.TextStringBuilder;
 
 public class PathsCompiler {
 
-    public static final String REPLACEMENT_CHAR = "_";
-
-    public static final String HOSTNAME = "$hostname";
-    public static final String GROUP = "$group";
-    public static final String TOPIC = "$topic";
-    public static final String SUBSCRIPTION = "$subscription";
-    public static final String KAFKA_TOPIC = "$kafka_topic";
-    public static final String PARTITION = "$partition";
-    public static final String KAFKA_CLUSTER = "$kafka_cluster";
-    public static final String HTTP_CODE = "$http_code";
-    public static final String HTTP_CODE_FAMILY = "$http_family_of_code";
-    public static final String EXECUTOR_NAME = "$executor_name";
-    public static final String OAUTH_PROVIDER_NAME = "$oauth_provider_name";
-    public static final String SCHEMA_REPO_TYPE = "$schema_repo_type";
-
-    private final String hostname;
-
-    public PathsCompiler(String hostname) {
-        this.hostname = escapeDots(hostname);
-    }
-
-    public String compile(String path) {
-        return path.replace(HOSTNAME, hostname);
-    }
-
-    public String compile(String path, PathContext context) {
-        StrBuilder pathBuilder = new StrBuilder(path);
-
-        context.getGroup().ifPresent(g -> pathBuilder.replaceAll(GROUP, g));
-        context.getTopic().ifPresent(t -> pathBuilder.replaceAll(TOPIC, t));
-        context.getSubscription().ifPresent(s -> pathBuilder.replaceAll(SUBSCRIPTION, s));
-        context.getKafkaTopic().ifPresent(k -> pathBuilder.replaceAll(KAFKA_TOPIC, k));
-        context.getPartition().ifPresent(p -> pathBuilder.replaceAll(PARTITION, p.toString()));
-        context.getKafkaCluster().ifPresent(c -> pathBuilder.replaceAll(KAFKA_CLUSTER, c));
-        context.getHttpCode().ifPresent(c -> pathBuilder.replaceAll(HTTP_CODE, c.toString()));
-        context.getHttpCodeFamily().ifPresent(cf -> pathBuilder.replaceAll(HTTP_CODE_FAMILY, cf));
-        context.getExecutorName().ifPresent(c -> pathBuilder.replaceAll(EXECUTOR_NAME, c));
-        context.getoAuthProviderName().ifPresent(c -> pathBuilder.replaceAll(OAUTH_PROVIDER_NAME, c));
-        context.getSchemaRepoType().ifPresent(c -> pathBuilder.replaceAll(SCHEMA_REPO_TYPE, c));
-
-        pathBuilder.replaceAll(HOSTNAME, hostname);
-
-        return pathBuilder.toString();
-    }
-
-    private String escapeDots(String value) {
-        return value.replaceAll("\\.", REPLACEMENT_CHAR);
-    }
+  public static final String REPLACEMENT_CHAR = "_";
+
+  public static final String HOSTNAME = "$hostname";
+  public static final String GROUP = "$group";
+  public static final String TOPIC = "$topic";
+  public static final String SUBSCRIPTION = "$subscription";
+
+  private final String hostname;
+
+  public PathsCompiler(String hostname) {
+    this.hostname = escapeDots(hostname);
+  }
+
+  public String compile(String path) {
+    return path.replace(HOSTNAME, hostname);
+  }
+
+  public String compile(String path, PathContext context) {
+    TextStringBuilder pathBuilder = new TextStringBuilder(path);
+
+    context.getGroup().ifPresent(g -> pathBuilder.replaceAll(GROUP, g));
+    context.getTopic().ifPresent(t -> pathBuilder.replaceAll(TOPIC, t));
+    context.getSubscription().ifPresent(s -> pathBuilder.replaceAll(SUBSCRIPTION, s));
+
+    pathBuilder.replaceAll(HOSTNAME, hostname);
+
+    return pathBuilder.toString();
+  }
+
+  private String escapeDots(String value) {
+    return value.replaceAll("\\.", REPLACEMENT_CHAR);
+  }
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/DefaultHermesCounter.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/DefaultHermesCounter.java
index cc9a4f69c5..609c4cce9d 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/DefaultHermesCounter.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/DefaultHermesCounter.java
@@ -1,20 +1,15 @@
 package pl.allegro.tech.hermes.metrics.counters;
 
-
 import pl.allegro.tech.hermes.metrics.HermesCounter;
 
 public class DefaultHermesCounter implements HermesCounter {
-    protected final io.micrometer.core.instrument.Counter micrometerCounter;
-    protected final com.codahale.metrics.Counter graphiteCounter;
+  protected final io.micrometer.core.instrument.Counter micrometerCounter;
 
-    protected DefaultHermesCounter(io.micrometer.core.instrument.Counter micrometerCounter,
-                                   com.codahale.metrics.Counter graphiteCounter) {
-        this.micrometerCounter = micrometerCounter;
-        this.graphiteCounter = graphiteCounter;
-    }
+  protected DefaultHermesCounter(io.micrometer.core.instrument.Counter micrometerCounter) {
+    this.micrometerCounter = micrometerCounter;
+  }
 
-    public void increment(long size) {
-        this.micrometerCounter.increment((double) size);
-        this.graphiteCounter.inc(size);
-    }
+  public void increment(long size) {
+    this.micrometerCounter.increment((double) size);
+  }
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/HermesCounters.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/HermesCounters.java
index c9329ca431..098b87f9ae 100644
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/HermesCounters.java
+++ b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/HermesCounters.java
@@ -1,14 +1,7 @@
 package pl.allegro.tech.hermes.metrics.counters;
 
-
 public class HermesCounters {
-    public static DefaultHermesCounter from(io.micrometer.core.instrument.Counter micrometerCounter,
-                                     com.codahale.metrics.Counter graphiteCounter) {
-        return new DefaultHermesCounter(micrometerCounter, graphiteCounter);
-    }
-
-    public static MeterBackedHermesCounter from(io.micrometer.core.instrument.Counter micrometerCounter,
-                                             com.codahale.metrics.Meter graphiteMeter) {
-        return new MeterBackedHermesCounter(micrometerCounter, graphiteMeter);
-    }
+  public static DefaultHermesCounter from(io.micrometer.core.instrument.Counter micrometerCounter) {
+    return new DefaultHermesCounter(micrometerCounter);
+  }
 }
diff --git a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/MeterBackedHermesCounter.java b/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/MeterBackedHermesCounter.java
deleted file mode 100644
index be226355eb..0000000000
--- a/hermes-metrics/src/main/java/pl/allegro/tech/hermes/metrics/counters/MeterBackedHermesCounter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pl.allegro.tech.hermes.metrics.counters;
-
-
-import pl.allegro.tech.hermes.metrics.HermesCounter;
-import pl.allegro.tech.hermes.metrics.HermesRateMeter;
-
-public class MeterBackedHermesCounter implements HermesCounter, HermesRateMeter {
-    protected final io.micrometer.core.instrument.Counter micrometerCounter;
-    protected final com.codahale.metrics.Meter graphiteMeter;
-
-    protected MeterBackedHermesCounter(io.micrometer.core.instrument.Counter micrometerCounter,
-                                       com.codahale.metrics.Meter graphiteMeter) {
-        this.micrometerCounter = micrometerCounter;
-        this.graphiteMeter = graphiteMeter;
-    }
-
-    public void increment(long size) {
-        this.micrometerCounter.increment((double) size);
-        this.graphiteMeter.mark(size);
-    }
-
-    @Override
-    public double getOneMinuteRate() {
-        return graphiteMeter.getOneMinuteRate();
-    }
-}
diff --git a/hermes-metrics/src/test/groovy/pl.allegro.tech.hermes.metrics/PathsCompilerTest.groovy b/hermes-metrics/src/test/groovy/pl.allegro.tech.hermes.metrics/PathsCompilerTest.groovy
index 5319ec8b4c..f37d9425cc 100644
--- a/hermes-metrics/src/test/groovy/pl.allegro.tech.hermes.metrics/PathsCompilerTest.groovy
+++ b/hermes-metrics/src/test/groovy/pl.allegro.tech.hermes.metrics/PathsCompilerTest.groovy
@@ -21,14 +21,12 @@ class PathsCompilerTest extends Specification {
         def pathContext = pathContext().withGroup("group")
                 .withTopic("topic")
                 .withSubscription("subscription")
-                .withPartition(0)
-                .withHttpCode(201)
                 .build()
 
         when:
-        def compiled = pathsCompiler.compile("hermes.$GROUP.$TOPIC.$SUBSCRIPTION.$PARTITION.$HTTP_CODE", pathContext)
+        def compiled = pathsCompiler.compile("hermes.$GROUP.$TOPIC.$SUBSCRIPTION", pathContext)
 
         then:
-        compiled == "hermes.group.topic.subscription.0.201"
+        compiled == "hermes.group.topic.subscription"
     }
 }
diff --git a/hermes-metrics/src/test/resources/allure.properties b/hermes-metrics/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-metrics/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-mock/build.gradle b/hermes-mock/build.gradle
index 1bb8e4c147..f0cd9e2906 100644
--- a/hermes-mock/build.gradle
+++ b/hermes-mock/build.gradle
@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-    implementation group: 'junit', name: 'junit', version: '4.11'
-    api group: 'org.wiremock', name: 'wiremock', version: versions.wiremock
-    implementation group: 'com.jayway.awaitility', name: 'awaitility', version: '1.6.1'
+    implementation group: 'junit', name: 'junit', version: '4.13.2'
+    api group: 'org.wiremock', name: 'wiremock-standalone', version: versions.wiremock
+    implementation group: 'org.awaitility', name: 'awaitility', version: '4.2.1'
     api group: 'org.apache.avro', name: 'avro', version: versions.avro
     implementation group: 'tech.allegro.schema.json2avro', name: 'converter', version: versions.json2avro
     implementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter
@@ -18,8 +18,9 @@ dependencies {
     testImplementation group: 'org.apache.groovy', name: 'groovy-json', version: versions.groovy
     testImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: versions.jersey
     testImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: versions.jersey
-    testImplementation group: 'org.junit.jupiter', name :'junit-jupiter', version: versions.junit_jupiter
-    testRuntimeOnly group: 'org.junit.vintage', name : 'junit-vintage-engine', version: versions.junit_jupiter
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: versions.junit_jupiter
+    testImplementation group: 'org.springframework', name: 'spring-test', version: versions.spring_web
+    testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: versions.junit_jupiter
 }
 
 test {
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMock.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMock.java
index 52e690365e..ffcb675d21 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMock.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMock.java
@@ -1,122 +1,126 @@
 package pl.allegro.tech.hermes.mock;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static com.github.tomakehurst.wiremock.http.RequestMethod.POST;
+import static pl.allegro.tech.hermes.mock.HermesMockHelper.startsWith;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.matching.RequestPattern;
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
 import com.github.tomakehurst.wiremock.matching.ValueMatcher;
+import java.util.function.Predicate;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.mock.matching.ContentMatchers;
 
-import java.util.function.Predicate;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static com.github.tomakehurst.wiremock.http.RequestMethod.POST;
-import static pl.allegro.tech.hermes.mock.HermesMockHelper.startsWith;
-
 public class HermesMock {
 
-    private static final String APPLICATION_JSON = "application/json";
-    private static final String AVRO_BINARY = "avro/binary";
-
-    private final WireMockServer wireMockServer;
-
-    private final HermesMockDefine hermesMockDefine;
-    private final HermesMockExpect hermesMockExpect;
-    private final HermesMockQuery hermesMockQuery;
-    private final HermesMockHelper hermesMockHelper;
-
-    private HermesMock(int port, int awaitSeconds, ObjectMapper objectMapper) {
-        wireMockServer = new WireMockServer(port);
-
-        hermesMockHelper = new HermesMockHelper(wireMockServer, objectMapper);
-        hermesMockDefine = new HermesMockDefine(hermesMockHelper);
-        hermesMockExpect = new HermesMockExpect(hermesMockHelper, awaitSeconds);
-        hermesMockQuery = new HermesMockQuery(hermesMockHelper);
-    }
-
-    public HermesMockDefine define() {
-        return hermesMockDefine;
-    }
-
-    public HermesMockExpect expect() {
-        return hermesMockExpect;
-    }
-
-    public HermesMockQuery query() {
-        return hermesMockQuery;
-    }
-
-    public void resetReceivedRequest() {
-        wireMockServer.resetRequests();
-    }
-
-    public <T> void resetReceivedAvroRequests(String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
-        ValueMatcher<Request> valueMatcher = ContentMatchers.matchAvro(hermesMockHelper, predicate, schema, clazz);
-        resetReceivedRequests(topicName, AVRO_BINARY, valueMatcher);
-    }
-
-    public <T> void resetReceivedJsonRequests(String topicName, Class<T> clazz, Predicate<T> predicate) {
-        ValueMatcher<com.github.tomakehurst.wiremock.http.Request> valueMatcher =
-                ContentMatchers.matchJson(hermesMockHelper, predicate, clazz);
-        resetReceivedRequests(topicName, APPLICATION_JSON, valueMatcher);
-    }
-
-    private void resetReceivedRequests(String topicName, String contentType,
-                                       ValueMatcher<com.github.tomakehurst.wiremock.http.Request> valueMatcher) {
-        RequestPattern requestPattern = RequestPatternBuilder
-                .newRequestPattern(POST, urlEqualTo("/topics/" + topicName))
-                .withHeader("Content-Type", startsWith(contentType))
-                .andMatching(valueMatcher)
-                .build();
-        wireMockServer.removeServeEventsMatching(requestPattern);
+  private static final String APPLICATION_JSON = "application/json";
+  private static final String AVRO_BINARY = "avro/binary";
+
+  private final WireMockServer wireMockServer;
+
+  private final HermesMockDefine hermesMockDefine;
+  private final HermesMockExpect hermesMockExpect;
+  private final HermesMockQuery hermesMockQuery;
+  private final HermesMockHelper hermesMockHelper;
+
+  private HermesMock(int port, int awaitSeconds, ObjectMapper objectMapper) {
+    wireMockServer = new WireMockServer(port);
+
+    hermesMockHelper = new HermesMockHelper(wireMockServer, objectMapper);
+    hermesMockDefine = new HermesMockDefine(hermesMockHelper);
+    hermesMockExpect = new HermesMockExpect(hermesMockHelper, awaitSeconds);
+    hermesMockQuery = new HermesMockQuery(hermesMockHelper);
+  }
+
+  public HermesMockDefine define() {
+    return hermesMockDefine;
+  }
+
+  public HermesMockExpect expect() {
+    return hermesMockExpect;
+  }
+
+  public HermesMockQuery query() {
+    return hermesMockQuery;
+  }
+
+  public void resetReceivedRequest() {
+    wireMockServer.resetRequests();
+  }
+
+  public <T> void resetReceivedAvroRequests(
+      String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
+    ValueMatcher<Request> valueMatcher =
+        ContentMatchers.matchAvro(hermesMockHelper, predicate, schema, clazz);
+    resetReceivedRequests(topicName, AVRO_BINARY, valueMatcher);
+  }
+
+  public <T> void resetReceivedJsonRequests(
+      String topicName, Class<T> clazz, Predicate<T> predicate) {
+    ValueMatcher<com.github.tomakehurst.wiremock.http.Request> valueMatcher =
+        ContentMatchers.matchJson(hermesMockHelper, predicate, clazz);
+    resetReceivedRequests(topicName, APPLICATION_JSON, valueMatcher);
+  }
+
+  private void resetReceivedRequests(
+      String topicName,
+      String contentType,
+      ValueMatcher<com.github.tomakehurst.wiremock.http.Request> valueMatcher) {
+    RequestPattern requestPattern =
+        RequestPatternBuilder.newRequestPattern(POST, urlEqualTo("/topics/" + topicName))
+            .withHeader("Content-Type", startsWith(contentType))
+            .andMatching(valueMatcher)
+            .build();
+    wireMockServer.removeServeEventsMatching(requestPattern);
+  }
+
+  public void resetMappings() {
+    wireMockServer.resetMappings();
+  }
+
+  public void start() {
+    wireMockServer.start();
+  }
+
+  public void stop() {
+    wireMockServer.stop();
+  }
+
+  public static class Builder {
+    private int port;
+    private int awaitSeconds;
+    private ObjectMapper objectMapper;
+
+    public Builder() {
+      port = wireMockConfig().portNumber();
+      awaitSeconds = 5;
+      objectMapper = new ObjectMapper().findAndRegisterModules();
     }
 
-    public void resetMappings() {
-        wireMockServer.resetMappings();
+    public HermesMock.Builder withPort(int port) {
+      this.port = port;
+      return this;
     }
 
-    public void start() {
-        wireMockServer.start();
+    public HermesMock.Builder withObjectMapper(ObjectMapper objectMapper) {
+      this.objectMapper = objectMapper;
+      return this;
     }
 
-    public void stop() {
-        wireMockServer.stop();
+    public HermesMock.Builder withAwaitSeconds(int awaitSeconds) {
+      this.awaitSeconds = awaitSeconds;
+      return this;
     }
 
-    public static class Builder {
-        private int port;
-        private int awaitSeconds;
-        private ObjectMapper objectMapper;
-
-        public Builder() {
-            port = wireMockConfig().portNumber();
-            awaitSeconds = 5;
-            objectMapper = new ObjectMapper().findAndRegisterModules();
-        }
-
-        public HermesMock.Builder withPort(int port) {
-            this.port = port;
-            return this;
-        }
-
-        public HermesMock.Builder withObjectMapper(ObjectMapper objectMapper) {
-            this.objectMapper = objectMapper;
-            return this;
-        }
-
-        public HermesMock.Builder withAwaitSeconds(int awaitSeconds) {
-            this.awaitSeconds = awaitSeconds;
-            return this;
-        }
-
-        public HermesMock build() {
-            if (port == 0) {
-                port = wireMockConfig().dynamicPort().portNumber();
-            }
-            return new HermesMock(port, awaitSeconds, objectMapper);
-        }
+    public HermesMock build() {
+      if (port == 0) {
+        port = wireMockConfig().dynamicPort().portNumber();
+      }
+      return new HermesMock(port, awaitSeconds, objectMapper);
     }
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockDefine.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockDefine.java
index 6d522b1f79..3a62a48d1c 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockDefine.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockDefine.java
@@ -1,69 +1,73 @@
 package pl.allegro.tech.hermes.mock;
 
+import static pl.allegro.tech.hermes.mock.exchange.Response.Builder.aResponse;
+
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.matching.ValueMatcher;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
+import java.util.function.Predicate;
 import org.apache.avro.Schema;
-import org.apache.hc.core5.http.HttpStatus;
 import pl.allegro.tech.hermes.mock.exchange.Response;
 import pl.allegro.tech.hermes.mock.matching.ContentMatchers;
-
-import java.util.function.Predicate;
-
-import static pl.allegro.tech.hermes.mock.exchange.Response.Builder.aResponse;
+import wiremock.org.apache.hc.core5.http.HttpStatus;
 
 public class HermesMockDefine {
-    private static final String APPLICATION_JSON = "application/json";
-    private static final String AVRO_BINARY = "avro/binary";
-    private final HermesMockHelper hermesMockHelper;
-
-    public HermesMockDefine(HermesMockHelper hermesMockHelper) {
-        this.hermesMockHelper = hermesMockHelper;
-    }
-
-    public StubMapping jsonTopic(String topicName) {
-        return jsonTopic(topicName, HttpStatus.SC_CREATED);
-    }
-
-    public StubMapping jsonTopic(String topicName, int statusCode) {
-        return addTopic(topicName, aResponse().withStatusCode(statusCode).build(), APPLICATION_JSON);
-    }
-
-    public StubMapping jsonTopic(String topicName, Response response) {
-        return addTopic(topicName, response, APPLICATION_JSON);
-    }
-
-    public <T> StubMapping jsonTopic(String topicName, Response response, Class<T> clazz, Predicate<T> predicate) {
-        ValueMatcher<Request> jsonMatchesPattern = ContentMatchers.matchJson(hermesMockHelper, predicate, clazz);
-        return addTopic(topicName, response, APPLICATION_JSON, jsonMatchesPattern);
-    }
-
-    public StubMapping avroTopic(String topicName) {
-        return avroTopic(topicName, HttpStatus.SC_CREATED);
-    }
-
-    public StubMapping avroTopic(String topicName, int statusCode) {
-        return addTopic(topicName, aResponse().withStatusCode(statusCode).build(), AVRO_BINARY);
-    }
-
-    public StubMapping avroTopic(String topicName, Response response) {
-        return addTopic(topicName, response, AVRO_BINARY);
-    }
-
-    public <T> StubMapping avroTopic(String topicName, Response response, Schema schema, Class<T> clazz, Predicate<T> predicate) {
-        ValueMatcher<Request> avroMatchesPattern = ContentMatchers.matchAvro(hermesMockHelper, predicate, schema, clazz);
-        return addTopic(topicName, response, AVRO_BINARY, avroMatchesPattern);
-    }
-
-    public void removeStubMapping(StubMapping stubMapping) {
-        hermesMockHelper.removeStubMapping(stubMapping);
-    }
-
-    private StubMapping addTopic(String topicName, Response response, String contentType) {
-        return hermesMockHelper.addStub(topicName, response, contentType);
-    }
-
-    private StubMapping addTopic(String topicName, Response response, String contentType, ValueMatcher<Request> valueMatcher) {
-        return hermesMockHelper.addStub(topicName, response, contentType, valueMatcher);
-    }
+  private static final String APPLICATION_JSON = "application/json";
+  private static final String AVRO_BINARY = "avro/binary";
+  private final HermesMockHelper hermesMockHelper;
+
+  public HermesMockDefine(HermesMockHelper hermesMockHelper) {
+    this.hermesMockHelper = hermesMockHelper;
+  }
+
+  public StubMapping jsonTopic(String topicName) {
+    return jsonTopic(topicName, HttpStatus.SC_CREATED);
+  }
+
+  public StubMapping jsonTopic(String topicName, int statusCode) {
+    return addTopic(topicName, aResponse().withStatusCode(statusCode).build(), APPLICATION_JSON);
+  }
+
+  public StubMapping jsonTopic(String topicName, Response response) {
+    return addTopic(topicName, response, APPLICATION_JSON);
+  }
+
+  public <T> StubMapping jsonTopic(
+      String topicName, Response response, Class<T> clazz, Predicate<T> predicate) {
+    ValueMatcher<Request> jsonMatchesPattern =
+        ContentMatchers.matchJson(hermesMockHelper, predicate, clazz);
+    return addTopic(topicName, response, APPLICATION_JSON, jsonMatchesPattern);
+  }
+
+  public StubMapping avroTopic(String topicName) {
+    return avroTopic(topicName, HttpStatus.SC_CREATED);
+  }
+
+  public StubMapping avroTopic(String topicName, int statusCode) {
+    return addTopic(topicName, aResponse().withStatusCode(statusCode).build(), AVRO_BINARY);
+  }
+
+  public StubMapping avroTopic(String topicName, Response response) {
+    return addTopic(topicName, response, AVRO_BINARY);
+  }
+
+  public <T> StubMapping avroTopic(
+      String topicName, Response response, Schema schema, Class<T> clazz, Predicate<T> predicate) {
+    ValueMatcher<Request> avroMatchesPattern =
+        ContentMatchers.matchAvro(hermesMockHelper, predicate, schema, clazz);
+    return addTopic(topicName, response, AVRO_BINARY, avroMatchesPattern);
+  }
+
+  public void removeStubMapping(StubMapping stubMapping) {
+    hermesMockHelper.removeStubMapping(stubMapping);
+  }
+
+  private StubMapping addTopic(String topicName, Response response, String contentType) {
+    return hermesMockHelper.addStub(topicName, response, contentType);
+  }
+
+  private StubMapping addTopic(
+      String topicName, Response response, String contentType, ValueMatcher<Request> valueMatcher) {
+    return hermesMockHelper.addStub(topicName, response, contentType, valueMatcher);
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockException.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockException.java
index 539b17dd2e..f0214b0be8 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockException.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockException.java
@@ -1,11 +1,11 @@
 package pl.allegro.tech.hermes.mock;
 
 public class HermesMockException extends RuntimeException {
-    public HermesMockException(String message) {
-        super(message);
-    }
+  public HermesMockException(String message) {
+    super(message);
+  }
 
-    public HermesMockException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  public HermesMockException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockExpect.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockExpect.java
index 1872ad4364..180e4d0202 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockExpect.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockExpect.java
@@ -1,85 +1,93 @@
 package pl.allegro.tech.hermes.mock;
 
-import com.jayway.awaitility.core.ConditionTimeoutException;
-import org.apache.avro.Schema;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.stream.Collectors.toList;
+import static org.awaitility.Awaitility.await;
 
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static java.util.stream.Collectors.toList;
+import org.apache.avro.Schema;
+import org.awaitility.core.ConditionTimeoutException;
 
 public class HermesMockExpect {
-    private final HermesMockHelper hermesMockHelper;
-    private final HermesMockQuery hermesMockQuery;
-    private final int awaitSeconds;
-
-    public HermesMockExpect(HermesMockHelper hermesMockHelper, int awaitSeconds) {
-        this.hermesMockHelper = hermesMockHelper;
-        this.hermesMockQuery = new HermesMockQuery(hermesMockHelper);
-        this.awaitSeconds = awaitSeconds;
-    }
-
-    public void singleMessageOnTopic(String topicName) {
-        messagesOnTopic(topicName, 1);
-    }
-
-    public <T> void singleJsonMessageOnTopicAs(String topicName, Class<T> clazz) {
-        jsonMessagesOnTopicAs(topicName, 1, clazz);
-    }
-
-    public void singleAvroMessageOnTopic(String topicName, Schema schema) {
-        avroMessagesOnTopic(topicName, 1, schema);
-    }
-
-    public void messagesOnTopic(String topicName, int count) {
-        expectMessages(topicName, count);
+  private final HermesMockHelper hermesMockHelper;
+  private final HermesMockQuery hermesMockQuery;
+  private final int awaitSeconds;
+
+  public HermesMockExpect(HermesMockHelper hermesMockHelper, int awaitSeconds) {
+    this.hermesMockHelper = hermesMockHelper;
+    this.hermesMockQuery = new HermesMockQuery(hermesMockHelper);
+    this.awaitSeconds = awaitSeconds;
+  }
+
+  public void singleMessageOnTopic(String topicName) {
+    messagesOnTopic(topicName, 1);
+  }
+
+  public <T> void singleJsonMessageOnTopicAs(String topicName, Class<T> clazz) {
+    jsonMessagesOnTopicAs(topicName, 1, clazz);
+  }
+
+  public void singleAvroMessageOnTopic(String topicName, Schema schema) {
+    avroMessagesOnTopic(topicName, 1, schema);
+  }
+
+  public void messagesOnTopic(String topicName, int count) {
+    expectMessages(topicName, count);
+  }
+
+  public <T> void jsonMessagesOnTopicAs(String topicName, int count, Class<T> clazz) {
+    assertMessages(count, () -> hermesMockQuery.allJsonMessagesAs(topicName, clazz));
+  }
+
+  public <T> void jsonMessagesOnTopicAs(
+      String topicName, int count, Class<T> clazz, Predicate<T> predicate) {
+    assertMessages(
+        count, () -> hermesMockQuery.matchingJsonMessagesAs(topicName, clazz, predicate));
+  }
+
+  public void avroMessagesOnTopic(String topicName, int count, Schema schema) {
+    assertMessages(count, () -> validateAvroMessages(topicName, schema));
+  }
+
+  public <T> void avroMessagesOnTopic(
+      String topicName, int count, Schema schema, Class<T> clazz, Predicate<T> predicate) {
+    assertMessages(count, () -> validateAvroMessages(topicName, schema, clazz, predicate));
+  }
+
+  private <T> void assertMessages(int count, Supplier<List<T>> messages) {
+    try {
+      await()
+          .atMost(awaitSeconds, SECONDS)
+          .until(() -> (messages != null && messages.get().size() == count));
+    } catch (ConditionTimeoutException ex) {
+      throw new HermesMockException(
+          "Hermes mock did not receive " + count + " messages, got " + messages.get().size());
     }
-
-    public <T> void jsonMessagesOnTopicAs(String topicName, int count, Class<T> clazz) {
-        assertMessages(count, () -> hermesMockQuery.allJsonMessagesAs(topicName, clazz));
-    }
-
-    public <T> void jsonMessagesOnTopicAs(String topicName, int count, Class<T> clazz, Predicate<T> predicate) {
-        assertMessages(count, () -> hermesMockQuery.matchingJsonMessagesAs(topicName, clazz, predicate));
-    }
-
-    public void avroMessagesOnTopic(String topicName, int count, Schema schema) {
-        assertMessages(count, () -> validateAvroMessages(topicName, schema));
-    }
-
-    public <T> void avroMessagesOnTopic(String topicName, int count, Schema schema, Class<T> clazz, Predicate<T> predicate) {
-        assertMessages(count, () -> validateAvroMessages(topicName, schema, clazz, predicate));
-    }
-
-    private <T> void assertMessages(int count, Supplier<List<T>> messages) {
-        try {
-            await().atMost(awaitSeconds, SECONDS).until(() -> (messages != null && messages.get().size() == count));
-        } catch (ConditionTimeoutException ex) {
-            throw new HermesMockException("Hermes mock did not receive " + count + " messages, got " + messages.get().size());
-        }
-    }
-
-    private void expectMessages(String topicName, int count) {
-        try {
-            await().atMost(awaitSeconds, SECONDS).until(() -> hermesMockHelper.verifyRequest(count, topicName));
-        } catch (ConditionTimeoutException ex) {
-            throw new HermesMockException("Hermes mock did not receive " + count + " messages.", ex);
-        }
-    }
-
-    private List<byte[]> validateAvroMessages(String topicName, Schema schema) {
-        return hermesMockQuery.allAvroRawMessages(topicName).stream()
-                .peek(raw -> hermesMockHelper.validateAvroSchema(raw, schema))
-                .collect(toList());
-    }
-
-    private <T> List<T> validateAvroMessages(String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
-        return hermesMockQuery.allAvroRawMessages(topicName).stream()
-                .map(raw -> hermesMockHelper.deserializeAvro(raw, schema, clazz))
-                .filter(predicate)
-                .collect(toList());
+  }
+
+  private void expectMessages(String topicName, int count) {
+    try {
+      await()
+          .atMost(awaitSeconds, SECONDS)
+          .untilAsserted(() -> hermesMockHelper.verifyRequest(count, topicName));
+    } catch (ConditionTimeoutException ex) {
+      throw new HermesMockException("Hermes mock did not receive " + count + " messages.", ex);
     }
+  }
+
+  private List<byte[]> validateAvroMessages(String topicName, Schema schema) {
+    return hermesMockQuery.allAvroRawMessages(topicName).stream()
+        .peek(raw -> hermesMockHelper.validateAvroSchema(raw, schema))
+        .collect(toList());
+  }
+
+  private <T> List<T> validateAvroMessages(
+      String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
+    return hermesMockQuery.allAvroRawMessages(topicName).stream()
+        .map(raw -> hermesMockHelper.deserializeAvro(raw, schema, clazz))
+        .filter(predicate)
+        .collect(toList());
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockExtension.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockExtension.java
index abcf916fda..48c77ed955 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockExtension.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockExtension.java
@@ -7,54 +7,57 @@
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 
-public class HermesMockExtension implements ParameterResolver, BeforeEachCallback, AfterEachCallback {
-
-    private final HermesMock hermesMock;
-
-    public HermesMockExtension(int port) {
-        this(new HermesMock.Builder().withPort(port).build());
-    }
-
-    public HermesMockExtension(HermesMock hermesMock) {
-        this.hermesMock = hermesMock;
-    }
-
-    public HermesMockDefine define() {
-        return hermesMock.define();
-    }
-
-    public HermesMockExpect expect() {
-        return hermesMock.expect();
-    }
-
-    public HermesMockQuery query() {
-        return hermesMock.query();
-    }
-
-    public void resetReceivedRequest() {
-        hermesMock.resetReceivedRequest();
-    }
-
-    @Override
-    public void beforeEach(ExtensionContext extensionContext) throws Exception {
-        hermesMock.start();
-    }
-
-    @Override
-    public void afterEach(ExtensionContext extensionContext) throws Exception {
-        hermesMock.resetReceivedRequest();
-        hermesMock.stop();
-    }
-
-    @Override
-    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-            throws ParameterResolutionException {
-        return parameterContext.getParameter().getType().isAssignableFrom(HermesMock.class);
-    }
-
-    @Override
-    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
-            throws ParameterResolutionException {
-        return hermesMock;
-    }
+public class HermesMockExtension
+    implements ParameterResolver, BeforeEachCallback, AfterEachCallback {
+
+  private final HermesMock hermesMock;
+
+  public HermesMockExtension(int port) {
+    this(new HermesMock.Builder().withPort(port).build());
+  }
+
+  public HermesMockExtension(HermesMock hermesMock) {
+    this.hermesMock = hermesMock;
+  }
+
+  public HermesMockDefine define() {
+    return hermesMock.define();
+  }
+
+  public HermesMockExpect expect() {
+    return hermesMock.expect();
+  }
+
+  public HermesMockQuery query() {
+    return hermesMock.query();
+  }
+
+  public void resetReceivedRequest() {
+    hermesMock.resetReceivedRequest();
+  }
+
+  @Override
+  public void beforeEach(ExtensionContext extensionContext) throws Exception {
+    hermesMock.start();
+  }
+
+  @Override
+  public void afterEach(ExtensionContext extensionContext) throws Exception {
+    hermesMock.resetReceivedRequest();
+    hermesMock.stop();
+  }
+
+  @Override
+  public boolean supportsParameter(
+      ParameterContext parameterContext, ExtensionContext extensionContext)
+      throws ParameterResolutionException {
+    return parameterContext.getParameter().getType().isAssignableFrom(HermesMock.class);
+  }
+
+  @Override
+  public Object resolveParameter(
+      ParameterContext parameterContext, ExtensionContext extensionContext)
+      throws ParameterResolutionException {
+    return hermesMock;
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockHelper.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockHelper.java
index 1b94d35a6f..fd962ba103 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockHelper.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockHelper.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.mock;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
@@ -7,6 +12,11 @@
 import com.github.tomakehurst.wiremock.matching.ValueMatcher;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.io.BinaryDecoder;
@@ -16,100 +26,91 @@
 import pl.allegro.tech.hermes.mock.matching.StartsWithPattern;
 import tech.allegro.schema.json2avro.converter.JsonAvroConverter;
 
-import java.io.IOException;
-import java.time.Duration;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-
 public class HermesMockHelper {
-    private final WireMockServer wireMockServer;
-    private final ObjectMapper objectMapper;
-
-    public HermesMockHelper(WireMockServer wireMockServer, ObjectMapper objectMapper) {
-        this.wireMockServer = wireMockServer;
-        this.objectMapper = objectMapper;
+  private final WireMockServer wireMockServer;
+  private final ObjectMapper objectMapper;
+
+  public HermesMockHelper(WireMockServer wireMockServer, ObjectMapper objectMapper) {
+    this.wireMockServer = wireMockServer;
+    this.objectMapper = objectMapper;
+  }
+
+  private static Integer toIntMilliseconds(Duration duration) {
+    return Optional.ofNullable(duration).map(Duration::toMillis).map(Math::toIntExact).orElse(null);
+  }
+
+  public static StringValuePattern startsWith(String value) {
+    return new StartsWithPattern(value);
+  }
+
+  public <T> T deserializeJson(byte[] content, Class<T> clazz) {
+    try {
+      return objectMapper.readValue(content, clazz);
+    } catch (IOException ex) {
+      throw new HermesMockException(
+          "Cannot read body " + content.toString() + " as " + clazz.getSimpleName(), ex);
     }
-
-    private static Integer toIntMilliseconds(Duration duration) {
-        return Optional.ofNullable(duration)
-                .map(Duration::toMillis)
-                .map(Math::toIntExact)
-                .orElse(null);
-    }
-
-    public static StringValuePattern startsWith(String value) {
-        return new StartsWithPattern(value);
+  }
+
+  public <T> T deserializeAvro(Request request, Schema schema, Class<T> clazz) {
+    return deserializeAvro(request.getBody(), schema, clazz);
+  }
+
+  public <T> T deserializeAvro(byte[] raw, Schema schema, Class<T> clazz) {
+    try {
+      byte[] json = new JsonAvroConverter().convertToJson(raw, schema);
+      return deserializeJson(json, clazz);
+    } catch (RuntimeException ex) {
+      throw new HermesMockException(
+          "Cannot decode body " + raw + " to " + clazz.getSimpleName(), ex);
     }
-
-    public <T> T deserializeJson(byte[] content, Class<T> clazz) {
-        try {
-            return objectMapper.readValue(content, clazz);
-        } catch (IOException ex) {
-            throw new HermesMockException("Cannot read body " + content.toString() + " as " + clazz.getSimpleName(), ex);
-        }
-    }
-
-    public <T> T deserializeAvro(Request request, Schema schema, Class<T> clazz) {
-        return deserializeAvro(request.getBody(), schema, clazz);
+  }
+
+  public void validateAvroSchema(byte[] raw, Schema schema) {
+    try {
+      BinaryDecoder binaryDecoder = DecoderFactory.get().binaryDecoder(raw, null);
+      new GenericDatumReader<>(schema).read(null, binaryDecoder);
+    } catch (IOException e) {
+      throw new HermesMockException("Cannot convert bytes as " + schema.getName());
     }
-
-    public <T> T deserializeAvro(byte[] raw, Schema schema, Class<T> clazz) {
-        try {
-            byte[] json = new JsonAvroConverter().convertToJson(raw, schema);
-            return deserializeJson(json, clazz);
-        } catch (RuntimeException ex) {
-            throw new HermesMockException("Cannot decode body " + raw + " to " + clazz.getSimpleName(), ex);
-        }
-    }
-
-    public void validateAvroSchema(byte[] raw, Schema schema) {
-        try {
-            BinaryDecoder binaryDecoder = DecoderFactory.get().binaryDecoder(raw, null);
-            new GenericDatumReader<>(schema).read(null, binaryDecoder);
-        } catch (IOException e) {
-            throw new HermesMockException("Cannot convert bytes as " + schema.getName());
-        }
-    }
-
-    public List<LoggedRequest> findAll(RequestPatternBuilder requestPatternBuilder) {
-        return wireMockServer.findAll(requestPatternBuilder);
-    }
-
-    public void verifyRequest(int count, String topicName) {
-        wireMockServer.verify(count, postRequestedFor(urlEqualTo("/topics/" + topicName)));
-    }
-
-    public StubMapping addStub(String topicName, Response response, String contentType) {
-        return wireMockServer.stubFor(post(urlEqualTo("/topics/" + topicName))
-                .withHeader("Content-Type", startsWith(contentType))
-                .willReturn(aResponse()
-                        .withStatus(response.getStatusCode())
-                        .withHeader("Hermes-Message-Id", UUID.randomUUID().toString())
-                        .withFixedDelay(toIntMilliseconds(response.getFixedDelay())))
-        );
-    }
-
-    public StubMapping addStub(String topicName, Response response, String contentType,
-                        ValueMatcher<com.github.tomakehurst.wiremock.http.Request> valueMatcher) {
-        return wireMockServer.stubFor(post(urlEqualTo("/topics/" + topicName))
-                .andMatching(valueMatcher)
-                .withHeader("Content-Type", startsWith(contentType))
-                .willReturn(aResponse()
-                        .withStatus(response.getStatusCode())
-                        .withHeader("Hermes-Message-Id", UUID.randomUUID().toString())
-                        .withFixedDelay(toIntMilliseconds(response.getFixedDelay()))
-                )
-        );
-    }
-
-    public void removeStubMapping(StubMapping stubMapping) {
-        wireMockServer.removeStubMapping(stubMapping);
-    }
-
+  }
+
+  public List<LoggedRequest> findAll(RequestPatternBuilder requestPatternBuilder) {
+    return wireMockServer.findAll(requestPatternBuilder);
+  }
+
+  public void verifyRequest(int count, String topicName) {
+    wireMockServer.verify(count, postRequestedFor(urlEqualTo("/topics/" + topicName)));
+  }
+
+  public StubMapping addStub(String topicName, Response response, String contentType) {
+    return wireMockServer.stubFor(
+        post(urlEqualTo("/topics/" + topicName))
+            .withHeader("Content-Type", startsWith(contentType))
+            .willReturn(
+                aResponse()
+                    .withStatus(response.getStatusCode())
+                    .withHeader("Hermes-Message-Id", UUID.randomUUID().toString())
+                    .withFixedDelay(toIntMilliseconds(response.getFixedDelay()))));
+  }
+
+  public StubMapping addStub(
+      String topicName,
+      Response response,
+      String contentType,
+      ValueMatcher<com.github.tomakehurst.wiremock.http.Request> valueMatcher) {
+    return wireMockServer.stubFor(
+        post(urlEqualTo("/topics/" + topicName))
+            .andMatching(valueMatcher)
+            .withHeader("Content-Type", startsWith(contentType))
+            .willReturn(
+                aResponse()
+                    .withStatus(response.getStatusCode())
+                    .withHeader("Hermes-Message-Id", UUID.randomUUID().toString())
+                    .withFixedDelay(toIntMilliseconds(response.getFixedDelay()))));
+  }
+
+  public void removeStubMapping(StubMapping stubMapping) {
+    wireMockServer.removeStubMapping(stubMapping);
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockQuery.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockQuery.java
index f8afb82789..51a1d49646 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockQuery.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockQuery.java
@@ -1,126 +1,120 @@
 package pl.allegro.tech.hermes.mock;
 
-import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
-import com.google.common.collect.Lists;
-import org.apache.avro.Schema;
-import pl.allegro.tech.hermes.mock.exchange.Request;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static java.util.stream.Collectors.toList;
 
-public class HermesMockQuery {
+import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import org.apache.avro.Schema;
+import pl.allegro.tech.hermes.mock.exchange.Request;
+import wiremock.com.google.common.collect.Lists;
 
-    private final HermesMockHelper hermesMockHelper;
-
-    public HermesMockQuery(HermesMockHelper hermesMockHelper) {
-        this.hermesMockHelper = hermesMockHelper;
-    }
-
-    public List<Request> allRequests() {
-        return hermesMockHelper.findAll(postRequestedFor(urlPathMatching(("/topics/.*")))).stream()
-                .map(Request::new)
-                .collect(toList());
-    }
-
-    public List<Request> allRequestsOnTopic(String topicName) {
-        RequestPatternBuilder matcher = postRequestedFor(urlEqualTo("/topics/" + topicName));
-        return hermesMockHelper.findAll(matcher).stream()
-                .map(Request::new)
-                .collect(toList());
-    }
-
-    public <T> List<T> matchingJsonMessagesAs(String topicName, Class<T> clazz, Predicate<T> predicate) {
-        return allRequestsOnTopic(topicName).stream()
-                .map(req -> hermesMockHelper.deserializeJson(req.getBody(), clazz))
-                .filter(predicate)
-                .collect(toList());
-    }
-
-    public <T> List<T> allJsonMessagesAs(String topicName, Class<T> clazz) {
-        return matchingJsonMessagesAs(topicName, clazz, t -> true);
-    }
-
-    public <T> long countMatchingJsonMessages(String topicName, Class<T> clazz, Predicate<T> predicate) {
-        return allRequestsOnTopic(topicName).stream()
-                .map(req -> hermesMockHelper.deserializeJson(req.getBody(), clazz))
-                .filter(predicate)
-                .count();
-    }
-
-    public <T> long countJsonMessages(String topicName, Class<T> clazz) {
-        return countMatchingJsonMessages(topicName, clazz, t -> true);
-    }
-
-    public List<byte[]> allAvroRawMessages(String topicName) {
-        return allRequestsOnTopic(topicName).stream()
-                .map(Request::getBody)
-                .collect(toList());
-    }
-
-    public <T> List<T> matchingAvroMessagesAs(String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
-        return allRequestsOnTopic(topicName).stream()
-                .map(req -> hermesMockHelper.deserializeAvro(req, schema, clazz))
-                .filter(predicate)
-                .collect(toList());
-    }
-
-    public <T> List<T> allAvroMessagesAs(String topicName, Schema schema, Class<T> clazz) {
-        return matchingAvroMessagesAs(topicName, schema, clazz, t -> true);
-    }
-
-    public <T> long countMatchingAvroMessages(String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
-        return allRequestsOnTopic(topicName).stream()
-                .map(req -> hermesMockHelper.deserializeAvro(req, schema, clazz))
-                .filter(predicate)
-                .count();
-    }
-
-    public long countAvroMessages(String topicName) {
-        return allRequestsOnTopic(topicName).stream()
-                .map(Request::getBody)
-                .count();
-    }
-
-    public Optional<Request> lastRequest(String topicName) {
-        List<Request> matchingRequests = allRequestsOnTopic(topicName);
-        return matchingRequests.isEmpty()
-                ? Optional.empty()
-                : Optional.of(matchingRequests.get(matchingRequests.size() - 1));
-    }
-
-    public <T> Optional<T> lastMatchingJsonMessageAs(String topicName, Class<T> clazz, Predicate<T> predicate) {
-        return Lists.reverse(allJsonMessagesAs(topicName, clazz))
-                .stream()
-                .filter(predicate)
-                .findFirst();
-    }
-
-    public <T> Optional<T> lastJsonMessageAs(String topicName, Class<T> clazz) {
-        return lastRequest(topicName)
-                .map(req -> hermesMockHelper.deserializeJson(req.getBody(), clazz));
-    }
-
-    public <T> Optional<T> lastMatchingAvroMessageAs(String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
-        return Lists.reverse(allAvroMessagesAs(topicName, schema, clazz))
-                .stream()
-                .filter(predicate)
-                .findFirst();
-    }
-
-    public Optional<byte[]> lastAvroRawMessage(String topicName) {
-        return lastRequest(topicName)
-                .map(Request::getBody);
-    }
-
-    public <T> Optional<T> lastAvroMessageAs(String topicName, Schema schema, Class<T> clazz) {
-        return lastRequest(topicName)
-                .map(req -> hermesMockHelper.deserializeAvro(req, schema, clazz));
-    }
+public class HermesMockQuery {
 
+  private final HermesMockHelper hermesMockHelper;
+
+  public HermesMockQuery(HermesMockHelper hermesMockHelper) {
+    this.hermesMockHelper = hermesMockHelper;
+  }
+
+  public List<Request> allRequests() {
+    return hermesMockHelper.findAll(postRequestedFor(urlPathMatching(("/topics/.*")))).stream()
+        .map(Request::new)
+        .collect(toList());
+  }
+
+  public List<Request> allRequestsOnTopic(String topicName) {
+    RequestPatternBuilder matcher = postRequestedFor(urlEqualTo("/topics/" + topicName));
+    return hermesMockHelper.findAll(matcher).stream().map(Request::new).collect(toList());
+  }
+
+  public <T> List<T> matchingJsonMessagesAs(
+      String topicName, Class<T> clazz, Predicate<T> predicate) {
+    return allRequestsOnTopic(topicName).stream()
+        .map(req -> hermesMockHelper.deserializeJson(req.getBody(), clazz))
+        .filter(predicate)
+        .collect(toList());
+  }
+
+  public <T> List<T> allJsonMessagesAs(String topicName, Class<T> clazz) {
+    return matchingJsonMessagesAs(topicName, clazz, t -> true);
+  }
+
+  public <T> long countMatchingJsonMessages(
+      String topicName, Class<T> clazz, Predicate<T> predicate) {
+    return allRequestsOnTopic(topicName).stream()
+        .map(req -> hermesMockHelper.deserializeJson(req.getBody(), clazz))
+        .filter(predicate)
+        .count();
+  }
+
+  public <T> long countJsonMessages(String topicName, Class<T> clazz) {
+    return countMatchingJsonMessages(topicName, clazz, t -> true);
+  }
+
+  public List<byte[]> allAvroRawMessages(String topicName) {
+    return allRequestsOnTopic(topicName).stream().map(Request::getBody).collect(toList());
+  }
+
+  public <T> List<T> matchingAvroMessagesAs(
+      String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
+    return allRequestsOnTopic(topicName).stream()
+        .map(req -> hermesMockHelper.deserializeAvro(req, schema, clazz))
+        .filter(predicate)
+        .collect(toList());
+  }
+
+  public <T> List<T> allAvroMessagesAs(String topicName, Schema schema, Class<T> clazz) {
+    return matchingAvroMessagesAs(topicName, schema, clazz, t -> true);
+  }
+
+  public <T> long countMatchingAvroMessages(
+      String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
+    return allRequestsOnTopic(topicName).stream()
+        .map(req -> hermesMockHelper.deserializeAvro(req, schema, clazz))
+        .filter(predicate)
+        .count();
+  }
+
+  public long countAvroMessages(String topicName) {
+    return allRequestsOnTopic(topicName).stream().map(Request::getBody).count();
+  }
+
+  public Optional<Request> lastRequest(String topicName) {
+    List<Request> matchingRequests = allRequestsOnTopic(topicName);
+    return matchingRequests.isEmpty()
+        ? Optional.empty()
+        : Optional.of(matchingRequests.get(matchingRequests.size() - 1));
+  }
+
+  public <T> Optional<T> lastMatchingJsonMessageAs(
+      String topicName, Class<T> clazz, Predicate<T> predicate) {
+    return Lists.reverse(allJsonMessagesAs(topicName, clazz)).stream()
+        .filter(predicate)
+        .findFirst();
+  }
+
+  public <T> Optional<T> lastJsonMessageAs(String topicName, Class<T> clazz) {
+    return lastRequest(topicName)
+        .map(req -> hermesMockHelper.deserializeJson(req.getBody(), clazz));
+  }
+
+  public <T> Optional<T> lastMatchingAvroMessageAs(
+      String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
+    return Lists.reverse(allAvroMessagesAs(topicName, schema, clazz)).stream()
+        .filter(predicate)
+        .findFirst();
+  }
+
+  public Optional<byte[]> lastAvroRawMessage(String topicName) {
+    return lastRequest(topicName).map(Request::getBody);
+  }
+
+  public <T> Optional<T> lastAvroMessageAs(String topicName, Schema schema, Class<T> clazz) {
+    return lastRequest(topicName).map(req -> hermesMockHelper.deserializeAvro(req, schema, clazz));
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockRule.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockRule.java
index c3e090ab01..e557a399a8 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockRule.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockRule.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.mock;
 
+import java.util.function.Predicate;
 import org.apache.avro.Schema;
 import org.junit.rules.MethodRule;
 import org.junit.rules.TestRule;
@@ -7,78 +8,78 @@
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
 
-import java.util.function.Predicate;
-
 public class HermesMockRule implements MethodRule, TestRule {
 
-    private final HermesMock hermesMock;
-
-    public HermesMockRule(int port) {
-        this.hermesMock = new HermesMock.Builder().withPort(port).build();
-    }
-
-    public HermesMockRule(HermesMock hermesMock) {
-        this.hermesMock = hermesMock;
-    }
-
-    public HermesMockDefine define() {
-        return hermesMock.define();
-    }
-
-    public HermesMockExpect expect() {
-        return hermesMock.expect();
-    }
-
-    public HermesMockQuery query() {
-        return hermesMock.query();
-    }
-
-    public void resetReceivedRequest() {
-        hermesMock.resetReceivedRequest();
-    }
-
-    public <T> void resetReceivedAvroRequests(String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
-        hermesMock.resetReceivedAvroRequests(topicName, schema, clazz, predicate);
-    }
-
-    public <T> void resetReceivedJsonRequests(String topicName, Class<T> clazz, Predicate<T> predicate) {
-        hermesMock.resetReceivedJsonRequests(topicName, clazz, predicate);
-    }
-
-    public void resetMappings() {
-        hermesMock.resetMappings();
-    }
-
-    @Override
-    public Statement apply(Statement base, FrameworkMethod method, Object target) {
-        return runHermesMock(base);
-    }
-
-    @Override
-    public Statement apply(Statement base, Description description) {
-        return runHermesMock(base);
-    }
-
-    private Statement runHermesMock(Statement base) {
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-                try {
-                    createInitialContext();
-                    base.evaluate();
-                } finally {
-                    destroyInitialContext();
-                }
-            }
-        };
-    }
-
-    private void createInitialContext() {
-        hermesMock.start();
-        hermesMock.resetReceivedRequest();
-    }
-
-    private void destroyInitialContext() {
-        hermesMock.stop();
-    }
+  private final HermesMock hermesMock;
+
+  public HermesMockRule(int port) {
+    this.hermesMock = new HermesMock.Builder().withPort(port).build();
+  }
+
+  public HermesMockRule(HermesMock hermesMock) {
+    this.hermesMock = hermesMock;
+  }
+
+  public HermesMockDefine define() {
+    return hermesMock.define();
+  }
+
+  public HermesMockExpect expect() {
+    return hermesMock.expect();
+  }
+
+  public HermesMockQuery query() {
+    return hermesMock.query();
+  }
+
+  public void resetReceivedRequest() {
+    hermesMock.resetReceivedRequest();
+  }
+
+  public <T> void resetReceivedAvroRequests(
+      String topicName, Schema schema, Class<T> clazz, Predicate<T> predicate) {
+    hermesMock.resetReceivedAvroRequests(topicName, schema, clazz, predicate);
+  }
+
+  public <T> void resetReceivedJsonRequests(
+      String topicName, Class<T> clazz, Predicate<T> predicate) {
+    hermesMock.resetReceivedJsonRequests(topicName, clazz, predicate);
+  }
+
+  public void resetMappings() {
+    hermesMock.resetMappings();
+  }
+
+  @Override
+  public Statement apply(Statement base, FrameworkMethod method, Object target) {
+    return runHermesMock(base);
+  }
+
+  @Override
+  public Statement apply(Statement base, Description description) {
+    return runHermesMock(base);
+  }
+
+  private Statement runHermesMock(Statement base) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        try {
+          createInitialContext();
+          base.evaluate();
+        } finally {
+          destroyInitialContext();
+        }
+      }
+    };
+  }
+
+  private void createInitialContext() {
+    hermesMock.start();
+    hermesMock.resetReceivedRequest();
+  }
+
+  private void destroyInitialContext() {
+    hermesMock.stop();
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Request.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Request.java
index 9eea0f3b65..70723a086a 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Request.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Request.java
@@ -1,64 +1,64 @@
 package pl.allegro.tech.hermes.mock.exchange;
 
+import static java.util.stream.Collectors.toMap;
+
 import com.github.tomakehurst.wiremock.http.RequestMethod;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-
 import java.util.HashMap;
 import java.util.Map;
 
-import static java.util.stream.Collectors.toMap;
-
 public class Request {
-    private final String url;
-    private final Method method;
-    private final byte[] body;
-    private final Map<String, String> headers;
+  private final String url;
+  private final Method method;
+  private final byte[] body;
+  private final Map<String, String> headers;
 
-    public Request(LoggedRequest loggedRequest) {
-        this.url = loggedRequest.getUrl();
-        this.method = getRequestMethod(loggedRequest.getMethod());
-        this.body = loggedRequest.getBody();
-        this.headers = loggedRequest.getAllHeaderKeys().stream()
-                .collect(toMap(key -> key, loggedRequest::getHeader));
-    }
+  public Request(LoggedRequest loggedRequest) {
+    this.url = loggedRequest.getUrl();
+    this.method = getRequestMethod(loggedRequest.getMethod());
+    this.body = loggedRequest.getBody();
+    this.headers =
+        loggedRequest.getAllHeaderKeys().stream()
+            .collect(toMap(key -> key, loggedRequest::getHeader));
+  }
 
-    public String getUrl() {
-        return url;
-    }
+  public String getUrl() {
+    return url;
+  }
 
-    public Method getMethod() {
-        return method;
-    }
+  public Method getMethod() {
+    return method;
+  }
 
-    public byte[] getBody() {
-        return body;
-    }
+  public byte[] getBody() {
+    return body;
+  }
 
-    public Map<String, String> getHeaders() {
-        return headers;
-    }
+  public Map<String, String> getHeaders() {
+    return headers;
+  }
 
-    private Method getRequestMethod(RequestMethod req) {
-        Map<RequestMethod, Method> map = new HashMap<>();
-        map.put(RequestMethod.GET, Method.GET);
-        map.put(RequestMethod.POST, Method.POST);
-        map.put(RequestMethod.PUT, Method.PUT);
-        map.put(RequestMethod.DELETE, Method.DELETE);
-        map.put(RequestMethod.PATCH, Method.PATCH);
-        map.put(RequestMethod.OPTIONS, Method.OPTIONS);
-        map.put(RequestMethod.HEAD, Method.HEAD);
-        map.put(RequestMethod.TRACE, Method.TRACE);
-        return map.get(req);
-    }
+  private Method getRequestMethod(RequestMethod req) {
+    Map<RequestMethod, Method> map = new HashMap<>();
+    map.put(RequestMethod.GET, Method.GET);
+    map.put(RequestMethod.POST, Method.POST);
+    map.put(RequestMethod.PUT, Method.PUT);
+    map.put(RequestMethod.DELETE, Method.DELETE);
+    map.put(RequestMethod.PATCH, Method.PATCH);
+    map.put(RequestMethod.OPTIONS, Method.OPTIONS);
+    map.put(RequestMethod.HEAD, Method.HEAD);
+    map.put(RequestMethod.TRACE, Method.TRACE);
+    return map.get(req);
+  }
 
-    enum Method {
-        GET,
-        POST,
-        PUT,
-        DELETE,
-        PATCH,
-        OPTIONS,
-        HEAD,
-        TRACE
-    }
+  enum Method {
+    GET,
+    POST,
+    PUT,
+    DELETE,
+    PATCH,
+    OPTIONS,
+    HEAD,
+    TRACE
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Response.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Response.java
index 9703618549..8d13f32cef 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Response.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Response.java
@@ -1,51 +1,47 @@
 package pl.allegro.tech.hermes.mock.exchange;
 
-
-
-import org.apache.hc.core5.http.HttpStatus;
-
 import java.time.Duration;
+import wiremock.org.apache.hc.core5.http.HttpStatus;
 
 public class Response {
-    private final int statusCode;
-    private final Duration fixedDelay;
+  private final int statusCode;
+  private final Duration fixedDelay;
 
-    public Response(int statusCode, Duration fixedDelay) {
-        this.statusCode = statusCode;
-        this.fixedDelay = fixedDelay;
-    }
+  public Response(int statusCode, Duration fixedDelay) {
+    this.statusCode = statusCode;
+    this.fixedDelay = fixedDelay;
+  }
 
-    public int getStatusCode() {
-        return statusCode;
-    }
+  public int getStatusCode() {
+    return statusCode;
+  }
 
-    public Duration getFixedDelay() {
-        return fixedDelay;
-    }
+  public Duration getFixedDelay() {
+    return fixedDelay;
+  }
 
-    public static final class Builder {
-        private int statusCode = HttpStatus.SC_CREATED;
-        private Duration fixedDelay;
+  public static final class Builder {
+    private int statusCode = HttpStatus.SC_CREATED;
+    private Duration fixedDelay;
 
-        private Builder() {
-        }
+    private Builder() {}
 
-        public static Builder aResponse() {
-            return new Builder();
-        }
+    public static Builder aResponse() {
+      return new Builder();
+    }
 
-        public Builder withStatusCode(int statusCode) {
-            this.statusCode = statusCode;
-            return this;
-        }
+    public Builder withStatusCode(int statusCode) {
+      this.statusCode = statusCode;
+      return this;
+    }
 
-        public Builder withFixedDelay(Duration fixedDelay) {
-            this.fixedDelay = fixedDelay;
-            return this;
-        }
+    public Builder withFixedDelay(Duration fixedDelay) {
+      this.fixedDelay = fixedDelay;
+      return this;
+    }
 
-        public Response build() {
-            return new Response(statusCode, fixedDelay);
-        }
+    public Response build() {
+      return new Response(statusCode, fixedDelay);
     }
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/AvroContentMatcher.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/AvroContentMatcher.java
index 88d2b5acc6..7024ddfd48 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/AvroContentMatcher.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/AvroContentMatcher.java
@@ -3,33 +3,33 @@
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.matching.MatchResult;
 import com.github.tomakehurst.wiremock.matching.ValueMatcher;
+import java.util.function.Predicate;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.mock.HermesMockException;
 import pl.allegro.tech.hermes.mock.HermesMockHelper;
 
-import java.util.function.Predicate;
-
 class AvroContentMatcher<T> implements ValueMatcher<Request> {
 
-    private final Predicate<T> predicate;
-    private final Schema schema;
-    private final Class<T> clazz;
-    private final HermesMockHelper hermesMockHelper;
+  private final Predicate<T> predicate;
+  private final Schema schema;
+  private final Class<T> clazz;
+  private final HermesMockHelper hermesMockHelper;
 
-    AvroContentMatcher(HermesMockHelper hermesMockHelper, Predicate<T> predicate, Schema schema, Class<T> clazz) {
-        this.hermesMockHelper = hermesMockHelper;
-        this.predicate = predicate;
-        this.schema = schema;
-        this.clazz = clazz;
-    }
+  AvroContentMatcher(
+      HermesMockHelper hermesMockHelper, Predicate<T> predicate, Schema schema, Class<T> clazz) {
+    this.hermesMockHelper = hermesMockHelper;
+    this.predicate = predicate;
+    this.schema = schema;
+    this.clazz = clazz;
+  }
 
-    @Override
-    public MatchResult match(Request actual) {
-        try {
-            T body = this.hermesMockHelper.deserializeAvro(actual.getBody(), schema, clazz);
-            return MatchResult.of(predicate.test(body));
-        } catch (HermesMockException exception) {
-            return MatchResult.noMatch();
-        }
+  @Override
+  public MatchResult match(Request actual) {
+    try {
+      T body = this.hermesMockHelper.deserializeAvro(actual.getBody(), schema, clazz);
+      return MatchResult.of(predicate.test(body));
+    } catch (HermesMockException exception) {
+      return MatchResult.noMatch();
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/ContentMatchers.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/ContentMatchers.java
index 9999f49dac..afb4b04c37 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/ContentMatchers.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/ContentMatchers.java
@@ -1,23 +1,18 @@
 package pl.allegro.tech.hermes.mock.matching;
 
+import java.util.function.Predicate;
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.mock.HermesMockHelper;
 
-import java.util.function.Predicate;
-
 public class ContentMatchers {
 
-    public static <T> AvroContentMatcher<T> matchAvro(HermesMockHelper hermesMockHelper,
-                                                      Predicate<T> predicate,
-                                                      Schema schema,
-                                                      Class<T> clazz) {
-        return new AvroContentMatcher<T>(hermesMockHelper, predicate, schema, clazz);
-    }
-
-    public static <T> JsonContentMatcher<T> matchJson(HermesMockHelper hermesMockHelper,
-                                                      Predicate<T> predicate,
-                                                      Class<T> clazz) {
-        return new JsonContentMatcher<T>(hermesMockHelper, predicate, clazz);
-    }
+  public static <T> AvroContentMatcher<T> matchAvro(
+      HermesMockHelper hermesMockHelper, Predicate<T> predicate, Schema schema, Class<T> clazz) {
+    return new AvroContentMatcher<T>(hermesMockHelper, predicate, schema, clazz);
+  }
 
+  public static <T> JsonContentMatcher<T> matchJson(
+      HermesMockHelper hermesMockHelper, Predicate<T> predicate, Class<T> clazz) {
+    return new JsonContentMatcher<T>(hermesMockHelper, predicate, clazz);
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/JsonContentMatcher.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/JsonContentMatcher.java
index c77b953e76..2deb80111d 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/JsonContentMatcher.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/JsonContentMatcher.java
@@ -3,26 +3,25 @@
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.matching.MatchResult;
 import com.github.tomakehurst.wiremock.matching.ValueMatcher;
-import pl.allegro.tech.hermes.mock.HermesMockHelper;
-
 import java.util.function.Predicate;
+import pl.allegro.tech.hermes.mock.HermesMockHelper;
 
 class JsonContentMatcher<T> implements ValueMatcher<Request> {
 
-    private final Predicate<T> predicate;
-    private final Class<T> clazz;
-    private final HermesMockHelper hermesMockHelper;
+  private final Predicate<T> predicate;
+  private final Class<T> clazz;
+  private final HermesMockHelper hermesMockHelper;
 
-    JsonContentMatcher(HermesMockHelper hermesMockHelper, Predicate<T> predicate, Class<T> clazz) {
-        this.hermesMockHelper = hermesMockHelper;
-        this.predicate = predicate;
-        this.clazz = clazz;
-    }
+  JsonContentMatcher(HermesMockHelper hermesMockHelper, Predicate<T> predicate, Class<T> clazz) {
+    this.hermesMockHelper = hermesMockHelper;
+    this.predicate = predicate;
+    this.clazz = clazz;
+  }
 
-    @Override
-    public MatchResult match(Request actual) {
-        T body = this.hermesMockHelper.deserializeJson(actual.getBody(), clazz);
+  @Override
+  public MatchResult match(Request actual) {
+    T body = this.hermesMockHelper.deserializeJson(actual.getBody(), clazz);
 
-        return MatchResult.of(predicate.test(body));
-    }
+    return MatchResult.of(predicate.test(body));
+  }
 }
diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/StartsWithPattern.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/StartsWithPattern.java
index 64f31af075..5c8af93bef 100644
--- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/StartsWithPattern.java
+++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/matching/StartsWithPattern.java
@@ -1,21 +1,21 @@
 package pl.allegro.tech.hermes.mock.matching;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.tomakehurst.wiremock.matching.MatchResult;
 import com.github.tomakehurst.wiremock.matching.StringValuePattern;
+import wiremock.com.fasterxml.jackson.annotation.JsonProperty;
 
 public class StartsWithPattern extends StringValuePattern {
 
-        public StartsWithPattern(@JsonProperty("startsWith") String expectedValue) {
-            super(expectedValue);
-        }
+  public StartsWithPattern(@JsonProperty("startsWith") String expectedValue) {
+    super(expectedValue);
+  }
 
-        public String getStartsWith() {
-            return expectedValue;
-        }
+  public String getStartsWith() {
+    return expectedValue;
+  }
 
-        @Override
-        public MatchResult match(String value) {
-            return MatchResult.of(value != null && value.startsWith(expectedValue));
-        }
+  @Override
+  public MatchResult match(String value) {
+    return MatchResult.of(value != null && value.startsWith(expectedValue));
+  }
 }
diff --git a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockAvroTest.groovy b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockAvroTest.groovy
index 81f27e59d8..715115c00d 100644
--- a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockAvroTest.groovy
+++ b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockAvroTest.groovy
@@ -3,10 +3,12 @@ package pl.allegro.tech.hermes.mock
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.apache.avro.Schema
 import org.apache.avro.reflect.ReflectData
-import wiremock.org.apache.hc.core5.http.HttpStatus;
+import org.springframework.util.MultiValueMap
+import org.springframework.util.MultiValueMapAdapter
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient
+import wiremock.org.apache.hc.core5.http.HttpStatus
 import org.junit.ClassRule
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher
 import pl.allegro.tech.hermes.test.helper.util.Ports
 import spock.lang.Shared
 import spock.lang.Specification
@@ -33,7 +35,7 @@ class HermesMockAvroTest extends Specification {
 
     JsonAvroConverter jsonAvroConverter = new JsonAvroConverter()
 
-    HermesPublisher publisher = new HermesPublisher("http://localhost:$port")
+    FrontendTestClient publisher = new FrontendTestClient(port)
 
     def setup() {
         hermes.resetReceivedRequest()
@@ -68,8 +70,8 @@ class HermesMockAvroTest extends Specification {
             hermes.expect().singleMessageOnTopic(topicName)
             hermes.expect().singleMessageOnTopic(topicName2)
 
-            response.status == HttpStatus.SC_CREATED
-            response2.status == HttpStatus.SC_CREATED
+            response.expectStatus().isCreated()
+            response2.expectStatus().isCreated()
     }
 
     def "should receive an Avro message matched by pattern different nullable schema"() {
@@ -99,8 +101,8 @@ class HermesMockAvroTest extends Specification {
             hermes.expect().singleMessageOnTopic(topicName)
             hermes.expect().singleMessageOnTopic(topicName2)
 
-            response.status == HttpStatus.SC_CREATED
-            response2.status == HttpStatus.SC_CREATED
+            response.expectStatus().isCreated()
+            response2.expectStatus().isCreated()
     }
 
     def "should receive an Avro message matched by pattern"() {
@@ -118,7 +120,7 @@ class HermesMockAvroTest extends Specification {
 
         then: "check for any single message on the topic and check for correct response"
             hermes.expect().singleMessageOnTopic(topicName)
-            response.status == HttpStatus.SC_CREATED
+            response.expectStatus().isCreated()
     }
 
     def "should not match avro pattern"() {
@@ -135,7 +137,7 @@ class HermesMockAvroTest extends Specification {
             def response = publish(topicName, message)
 
         then: "check for correct response status"
-            response.status == HttpStatus.SC_NOT_FOUND
+            response.expectStatus().isNotFound()
     }
 
     def "should receive an Avro message"() {
@@ -149,7 +151,7 @@ class HermesMockAvroTest extends Specification {
         then: "check for any single message on the topic and check for single specific avro message"
             hermes.expect().singleMessageOnTopic(topicName)
             hermes.expect().singleAvroMessageOnTopic(topicName, schema)
-            response.status == HttpStatus.SC_CREATED
+            response.expectStatus().isCreated()
     }
 
     def "should respond with a delay"() {
@@ -377,8 +379,8 @@ class HermesMockAvroTest extends Specification {
         def response2 = publish(topicName, new TestMessage(pattern2, value))
 
         then: "check for any single message on the topic and check for correct response"
-        response1.status == HttpStatus.SC_CREATED
-        response2.status == HttpStatus.SC_CREATED
+        response1.expectStatus().isCreated()
+        response2.expectStatus().isCreated()
 
         when: "first stub mapping is removed and two messages are sent again"
         hermes.define().removeStubMapping(avroTopicStub1)
@@ -386,8 +388,8 @@ class HermesMockAvroTest extends Specification {
         response2 = publish(topicName, new TestMessage(pattern2, value))
 
         then: "removed stub mapping should response with not found, second stub on same topic should return 201 status"
-        response1.status == HttpStatus.SC_NOT_FOUND
-        response2.status == HttpStatus.SC_CREATED
+        response1.expectStatus().isNotFound()
+        response2.expectStatus().isCreated()
     }
 
     def asAvro(TestMessage message) {
@@ -419,6 +421,7 @@ class HermesMockAvroTest extends Specification {
     }
 
     def publish(String topic, byte[] avro) {
-        publisher.publish(topic, avro)
+        MultiValueMap headers = new MultiValueMapAdapter<>(Map.of("Content-Type", List.of("avro/binary")))
+        publisher.publish(topic, avro, headers)
     }
 }
diff --git a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockJsonTest.groovy b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockJsonTest.groovy
index 70dd5c5ac8..44992ca926 100644
--- a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockJsonTest.groovy
+++ b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockJsonTest.groovy
@@ -1,8 +1,10 @@
 package pl.allegro.tech.hermes.mock
 
-import wiremock.org.apache.hc.core5.http.HttpStatus;
+import org.springframework.util.MultiValueMap
+import org.springframework.util.MultiValueMapAdapter
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient
+import wiremock.org.apache.hc.core5.http.HttpStatus
 import org.junit.ClassRule
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher
 import pl.allegro.tech.hermes.test.helper.util.Ports
 import spock.lang.Shared
 import spock.lang.Specification
@@ -22,7 +24,9 @@ class HermesMockJsonTest extends Specification {
     @Shared
     HermesMockRule hermes = new HermesMockRule(port)
 
-    HermesPublisher publisher = new HermesPublisher("http://localhost:$port")
+    MultiValueMap headers = new MultiValueMapAdapter<>(Map.of("Content-Type", List.of("application/json")))
+
+    FrontendTestClient publisher = new FrontendTestClient(port)
 
     def setup() {
         hermes.resetReceivedRequest()
@@ -43,7 +47,7 @@ class HermesMockJsonTest extends Specification {
 
         then: "check for any single message on the topic and check for correct response"
             hermes.expect().singleMessageOnTopic(topicName)
-            response.status == HttpStatus.SC_CREATED
+            response.expectStatus().isCreated()
     }
 
     def "should not match json pattern"() {
@@ -59,7 +63,7 @@ class HermesMockJsonTest extends Specification {
             def response = publishJson(topicName, message.asJson())
 
         then: "check for correct response status"
-            response.status == HttpStatus.SC_NOT_FOUND
+            response.expectStatus().isNotFound()
     }
 
     def "should receive an json message"() {
@@ -68,11 +72,11 @@ class HermesMockJsonTest extends Specification {
         hermes.define().jsonTopic(topicName, HttpStatus.SC_OK)
 
         when:
-        def response = publisher.publish(topicName, "Basic Request")
+        def response = publisher.publish(topicName, "Basic Request", headers)
 
         then:
         hermes.expect().singleMessageOnTopic(topicName)
-        response.status == HttpStatus.SC_OK
+        response.expectStatus().isOk()
     }
 
     def "should respond with a delay"() {
@@ -83,7 +87,7 @@ class HermesMockJsonTest extends Specification {
         Instant start = now()
 
         when:
-        publisher.publish(topicName, "Basic Request")
+        publisher.publish(topicName, "Basic Request", headers)
 
         then:
         hermes.expect().singleMessageOnTopic(topicName)
@@ -127,8 +131,8 @@ class HermesMockJsonTest extends Specification {
         def response2 = publishJson(topicName, value, keyPattern2)
 
         then: "check for any single message on the topic and check for correct response"
-        response1.status == HttpStatus.SC_CREATED
-        response2.status == HttpStatus.SC_CREATED
+        response1.expectStatus().isCreated()
+        response2.expectStatus().isCreated()
 
         when: "first stub mapping is removed and two messages are sent again"
         hermes.define().removeStubMapping(jsonTopicStubMapping1)
@@ -136,12 +140,12 @@ class HermesMockJsonTest extends Specification {
         response2 = publishJson(topicName, value, keyPattern2)
 
         then: "removed stub mapping should response with not found, second stub on same topic should return 201 status"
-        response1.status == HttpStatus.SC_NOT_FOUND
-        response2.status == HttpStatus.SC_CREATED
+        response1.expectStatus().isNotFound()
+        response2.expectStatus().isCreated()
     }
 
     private def publishJson(String topic, String message) {
-        publisher.publish(topic, message)
+        publisher.publish(topic, message, headers)
     }
 
     private def publishJson(String topicName, String value, String keyPattern) {
diff --git a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockRuleTest.groovy b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockRuleTest.groovy
index 83e3688eab..a075b18fbf 100644
--- a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockRuleTest.groovy
+++ b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockRuleTest.groovy
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.mock
 
 import org.junit.Rule
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient
 import pl.allegro.tech.hermes.test.helper.util.Ports
 import spock.lang.Shared
 import spock.lang.Specification
@@ -14,7 +14,7 @@ class HermesMockRuleTest extends Specification {
     @Rule
     HermesMockRule hermes = new HermesMockRule(port)
 
-    HermesPublisher publisher = new HermesPublisher("http://localhost:$port")
+    FrontendTestClient publisher = new FrontendTestClient(port)
 
     def 'simple publish-expect test'() {
         given:
diff --git a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockTest.groovy b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockTest.groovy
index 35f4400ba3..30e6391b99 100644
--- a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockTest.groovy
+++ b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockTest.groovy
@@ -2,9 +2,10 @@ package pl.allegro.tech.hermes.mock
 
 import org.apache.avro.Schema
 import org.apache.avro.reflect.ReflectData
-import wiremock.org.apache.hc.core5.http.HttpStatus;
+import org.springframework.util.MultiValueMap
+import org.springframework.util.MultiValueMapAdapter
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient
 import org.junit.ClassRule
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher
 import pl.allegro.tech.hermes.test.helper.util.Ports
 import spock.lang.Shared
 import spock.lang.Specification
@@ -19,7 +20,7 @@ class HermesMockTest extends Specification {
     @Shared
     HermesMockRule hermes = new HermesMockRule(port)
 
-    HermesPublisher publisher = new HermesPublisher("http://localhost:$port")
+    FrontendTestClient publisher = new FrontendTestClient(port)
 
     Schema schema = ReflectData.get().getSchema(TestMessage)
 
@@ -39,7 +40,7 @@ class HermesMockTest extends Specification {
 
         then:
             hermes.expect().singleMessageOnTopic(topicName)
-            response.status == HttpStatus.SC_CREATED
+            response.expectStatus().isCreated()
     }
 
     def "should receive 3 messages"() {
@@ -342,11 +343,12 @@ class HermesMockTest extends Specification {
     }
 
     def publish(String topic, String body) {
-        publisher.publish(topic, body)
+        MultiValueMap headers = new MultiValueMapAdapter<>(Map.of("Content-Type", List.of("application/json")))
+        publisher.publish(topic, body, headers)
     }
 
     def publishAvro(String topic, TestMessage message) {
-        publisher.publish(topic, asAvro(message))
+        publisher.publishAvroUntilSuccess(topic, asAvro(message))
     }
 
     def asAvro(TestMessage message) {
diff --git a/hermes-mock/src/test/java/pl/allegro/tech/hermes/mock/HermesMockExtensionTest.java b/hermes-mock/src/test/java/pl/allegro/tech/hermes/mock/HermesMockExtensionTest.java
index 2735943b03..ef1ff22f3f 100644
--- a/hermes-mock/src/test/java/pl/allegro/tech/hermes/mock/HermesMockExtensionTest.java
+++ b/hermes-mock/src/test/java/pl/allegro/tech/hermes/mock/HermesMockExtensionTest.java
@@ -1,58 +1,57 @@
 package pl.allegro.tech.hermes.mock;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import groovy.json.JsonOutput;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher;
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 import pl.allegro.tech.hermes.test.helper.util.Ports;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 class HermesMockExtensionTest {
 
-    private static final int port = Ports.nextAvailable();
+  private static final int port = Ports.nextAvailable();
 
-    @RegisterExtension
-    static final HermesMockExtension hermes = new HermesMockExtension(port);
+  @RegisterExtension static final HermesMockExtension hermes = new HermesMockExtension(port);
 
-    private HermesPublisher publisher;
+  private FrontendTestClient publisher;
 
-    @BeforeEach
-    void setup() {
-        publisher = new HermesPublisher(String.format("http://localhost:%d", port));
-    }
+  @BeforeEach
+  void setup() {
+    publisher = new FrontendTestClient(port);
+  }
 
-    @Test
-    void shouldPublishMessage() {
-        // given
-        String topic = "first-sample-topic";
-        hermes.define().jsonTopic(topic);
+  @Test
+  void shouldPublishMessage() {
+    // given
+    String topic = "first-sample-topic";
+    hermes.define().jsonTopic(topic);
 
-        // when
-        publishMessage(topic);
+    // when
+    publishMessage(topic);
 
-        // then
-        hermes.expect().singleMessageOnTopic(topic);
-    }
+    // then
+    hermes.expect().singleMessageOnTopic(topic);
+  }
 
-    @Test
-    void shouldInjectHermesMock(HermesMock hermesMock) {
-        // given
-        String topic = "second-sample-topic";
-        hermes.define().jsonTopic(topic);
+  @Test
+  void shouldInjectHermesMock(HermesMock hermesMock) {
+    // given
+    String topic = "second-sample-topic";
+    hermes.define().jsonTopic(topic);
 
-        // when
-        publishMessage(topic);
+    // when
+    publishMessage(topic);
 
-        // then
-        assertThat(hermesMock.query().allRequests()).hasSize(1);
-        assertThat(hermesMock.query().allRequestsOnTopic(topic)).hasSize(1);
-    }
+    // then
+    assertThat(hermesMock.query().allRequests()).hasSize(1);
+    assertThat(hermesMock.query().allRequestsOnTopic(topic)).hasSize(1);
+  }
 
-    private void publishMessage(String topic) {
-        String body = JsonOutput.toJson(TestMessage.random());
-        publisher.publish(topic, body);
-    }
+  private void publishMessage(String topic) {
+    String body = JsonOutput.toJson(TestMessage.random());
+    publisher.publish(topic, body);
+  }
 }
diff --git a/hermes-mock/src/test/resources/allure.properties b/hermes-mock/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-mock/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/BadSchemaRequestException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/BadSchemaRequestException.java
index c95e331b6c..ce3d29fda1 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/BadSchemaRequestException.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/BadSchemaRequestException.java
@@ -5,17 +5,19 @@
 
 public class BadSchemaRequestException extends SchemaException {
 
-    public BadSchemaRequestException(String subject, Response response) {
-        this(subject, response.getStatus(), response.readEntity(String.class));
-    }
+  public BadSchemaRequestException(String subject, Response response) {
+    this(subject, response.getStatus(), response.readEntity(String.class));
+  }
 
-    public BadSchemaRequestException(String subject, int statusCode, String responseBody) {
-        super(String.format("Bad schema request for subject %s, server response: %d %s",
-                subject, statusCode, responseBody));
-    }
+  public BadSchemaRequestException(String subject, int statusCode, String responseBody) {
+    super(
+        String.format(
+            "Bad schema request for subject %s, server response: %d %s",
+            subject, statusCode, responseBody));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SCHEMA_BAD_REQUEST;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SCHEMA_BAD_REQUEST;
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CachedCompiledSchemaRepository.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CachedCompiledSchemaRepository.java
index ad134628ce..9491103b75 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CachedCompiledSchemaRepository.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CachedCompiledSchemaRepository.java
@@ -3,156 +3,158 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import pl.allegro.tech.hermes.api.Topic;
-
 import java.time.Duration;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import pl.allegro.tech.hermes.api.Topic;
 
 public class CachedCompiledSchemaRepository<T> implements CompiledSchemaRepository<T> {
 
-    private final LoadingCache<TopicAndSchemaVersion, CompiledSchema<T>> topicVersionCache;
-    private final LoadingCache<TopicAndSchemaId, CompiledSchema<T>> topicIdCache;
-    private final CompiledSchemaRepository<T> compiledSchemaRepository;
+  private final LoadingCache<TopicAndSchemaVersion, CompiledSchema<T>> topicVersionCache;
+  private final LoadingCache<TopicAndSchemaId, CompiledSchema<T>> topicIdCache;
+  private final CompiledSchemaRepository<T> compiledSchemaRepository;
 
-    public CachedCompiledSchemaRepository(CompiledSchemaRepository<T> delegate, long maximumCacheSize, Duration expireAfterAccess) {
-        this.topicVersionCache = CacheBuilder
-                .newBuilder()
-                .maximumSize(maximumCacheSize)
-                .expireAfterAccess(expireAfterAccess.toMinutes(), TimeUnit.MINUTES)
-                .build(new CompiledSchemaByVersionLoader<>(delegate));
+  public CachedCompiledSchemaRepository(
+      CompiledSchemaRepository<T> delegate, long maximumCacheSize, Duration expireAfterAccess) {
+    this.topicVersionCache =
+        CacheBuilder.newBuilder()
+            .maximumSize(maximumCacheSize)
+            .expireAfterAccess(expireAfterAccess.toMinutes(), TimeUnit.MINUTES)
+            .build(new CompiledSchemaByVersionLoader<>(delegate));
 
-        this.topicIdCache = CacheBuilder
-            .newBuilder()
+    this.topicIdCache =
+        CacheBuilder.newBuilder()
             .maximumSize(maximumCacheSize)
             .expireAfterAccess(expireAfterAccess.toMinutes(), TimeUnit.MINUTES)
             .build(new CompiledSchemaByIdLoader<>(delegate));
 
-        this.compiledSchemaRepository = delegate;
+    this.compiledSchemaRepository = delegate;
+  }
+
+  @Override
+  public CompiledSchema<T> getSchema(Topic topic, SchemaVersion version, boolean online) {
+    try {
+      if (online) {
+        CompiledSchema<T> compiledSchema = compiledSchemaRepository.getSchema(topic, version);
+        topicVersionCache.put(new TopicAndSchemaVersion(topic, version), compiledSchema);
+        topicIdCache.put(new TopicAndSchemaId(topic, compiledSchema.getId()), compiledSchema);
+        return compiledSchema;
+      }
+      return topicVersionCache.get(new TopicAndSchemaVersion(topic, version));
+    } catch (Exception e) {
+      throw new CouldNotLoadSchemaException(e);
+    }
+  }
+
+  @Override
+  public CompiledSchema<T> getSchema(Topic topic, SchemaId id) {
+    try {
+      return topicIdCache.get(new TopicAndSchemaId(topic, id));
+    } catch (Exception e) {
+      throw new CouldNotLoadSchemaException(e);
     }
+  }
 
-    @Override
-    public CompiledSchema<T> getSchema(Topic topic, SchemaVersion version, boolean online) {
-        try {
-            if (online) {
-                CompiledSchema<T> compiledSchema = compiledSchemaRepository.getSchema(topic, version);
-                topicVersionCache.put(new TopicAndSchemaVersion(topic, version), compiledSchema);
-                topicIdCache.put(new TopicAndSchemaId(topic, compiledSchema.getId()), compiledSchema);
-                return compiledSchema;
-            }
-            return topicVersionCache.get(new TopicAndSchemaVersion(topic, version));
-        } catch (Exception e) {
-            throw new CouldNotLoadSchemaException(e);
-        }
+  public void removeFromCache(Topic topic) {
+    Set<TopicAndSchemaVersion> topicWithSchemas =
+        topicVersionCache.asMap().keySet().stream()
+            .filter(topicWithSchema -> topicWithSchema.topic.equals(topic))
+            .collect(Collectors.toSet());
+
+    Set<TopicAndSchemaId> topicAndSchemaIds =
+        topicIdCache.asMap().keySet().stream()
+            .filter(topicAndSchemaId -> topicAndSchemaId.topic.equals(topic))
+            .collect(Collectors.toSet());
+
+    topicVersionCache.invalidateAll(topicWithSchemas);
+    topicIdCache.invalidateAll(topicAndSchemaIds);
+  }
+
+  private static class CompiledSchemaByVersionLoader<T>
+      extends CacheLoader<TopicAndSchemaVersion, CompiledSchema<T>> {
+
+    private final CompiledSchemaRepository<T> delegate;
+
+    public CompiledSchemaByVersionLoader(CompiledSchemaRepository<T> delegate) {
+      this.delegate = delegate;
     }
 
     @Override
-    public CompiledSchema<T> getSchema(Topic topic, SchemaId id) {
-        try {
-            return topicIdCache.get(new TopicAndSchemaId(topic, id));
-        } catch (Exception e) {
-            throw new CouldNotLoadSchemaException(e);
-        }
+    public CompiledSchema<T> load(TopicAndSchemaVersion key) {
+      return delegate.getSchema(key.topic, key.schemaVersion);
     }
+  }
 
-    public void removeFromCache(Topic topic) {
-        Set<TopicAndSchemaVersion> topicWithSchemas = topicVersionCache.asMap().keySet().stream()
-                .filter(topicWithSchema -> topicWithSchema.topic.equals(topic))
-                .collect(Collectors.toSet());
+  private static class CompiledSchemaByIdLoader<T>
+      extends CacheLoader<TopicAndSchemaId, CompiledSchema<T>> {
 
-        Set<TopicAndSchemaId> topicAndSchemaIds = topicIdCache.asMap().keySet().stream()
-            .filter(topicAndSchemaId -> topicAndSchemaId.topic.equals(topic))
-            .collect(Collectors.toSet());
+    private final CompiledSchemaRepository<T> delegate;
 
-        topicVersionCache.invalidateAll(topicWithSchemas);
-        topicIdCache.invalidateAll(topicAndSchemaIds);
+    public CompiledSchemaByIdLoader(CompiledSchemaRepository<T> delegate) {
+      this.delegate = delegate;
     }
 
-    private static class CompiledSchemaByVersionLoader<T> extends CacheLoader<TopicAndSchemaVersion, CompiledSchema<T>> {
+    @Override
+    public CompiledSchema<T> load(TopicAndSchemaId key) {
+      return delegate.getSchema(key.topic, key.schemaId);
+    }
+  }
 
-        private final CompiledSchemaRepository<T> delegate;
+  private static class TopicAndSchemaVersion {
 
-        public CompiledSchemaByVersionLoader(CompiledSchemaRepository<T> delegate) {
-            this.delegate = delegate;
-        }
+    private final Topic topic;
+    private final SchemaVersion schemaVersion;
 
-        @Override
-        public CompiledSchema<T> load(TopicAndSchemaVersion key) {
-            return delegate.getSchema(key.topic, key.schemaVersion);
-        }
+    TopicAndSchemaVersion(Topic topic, SchemaVersion schemaVersion) {
+      this.topic = topic;
+      this.schemaVersion = schemaVersion;
     }
 
-    private static class CompiledSchemaByIdLoader<T> extends CacheLoader<TopicAndSchemaId, CompiledSchema<T>> {
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      TopicAndSchemaVersion that = (TopicAndSchemaVersion) o;
+      return Objects.equals(schemaVersion, that.schemaVersion) && Objects.equals(topic, that.topic);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(topic, schemaVersion);
+    }
+  }
 
-        private final CompiledSchemaRepository<T>  delegate;
+  private static class TopicAndSchemaId {
 
-        public CompiledSchemaByIdLoader(CompiledSchemaRepository<T> delegate) {
-            this.delegate = delegate;
-        }
+    private final Topic topic;
+    private final SchemaId schemaId;
 
-        @Override
-        public CompiledSchema<T> load(TopicAndSchemaId key) {
-            return delegate.getSchema(key.topic, key.schemaId);
-        }
+    TopicAndSchemaId(Topic topic, SchemaId schemaId) {
+      this.topic = topic;
+      this.schemaId = schemaId;
     }
 
-    private static class TopicAndSchemaVersion {
-
-        private final Topic topic;
-        private final SchemaVersion schemaVersion;
-
-        TopicAndSchemaVersion(Topic topic, SchemaVersion schemaVersion) {
-            this.topic = topic;
-            this.schemaVersion = schemaVersion;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            TopicAndSchemaVersion that = (TopicAndSchemaVersion) o;
-            return Objects.equals(schemaVersion, that.schemaVersion)
-                    && Objects.equals(topic, that.topic);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(topic, schemaVersion);
-        }
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      TopicAndSchemaId that = (TopicAndSchemaId) o;
+      return Objects.equals(schemaId, that.schemaId) && Objects.equals(topic, that.topic);
     }
 
-    private static class TopicAndSchemaId {
-
-        private final Topic topic;
-        private final SchemaId schemaId;
-
-        TopicAndSchemaId(Topic topic, SchemaId schemaId) {
-            this.topic = topic;
-            this.schemaId = schemaId;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            TopicAndSchemaId that = (TopicAndSchemaId) o;
-            return Objects.equals(schemaId, that.schemaId)
-                    && Objects.equals(topic, that.topic);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(topic, schemaId);
-        }
+    @Override
+    public int hashCode() {
+      return Objects.hash(topic, schemaId);
     }
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CachedSchemaVersionsRepository.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CachedSchemaVersionsRepository.java
index 444698a915..7c3b0ed8c8 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CachedSchemaVersionsRepository.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CachedSchemaVersionsRepository.java
@@ -6,105 +6,125 @@
 import com.google.common.cache.LoadingCache;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFutureTask;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.api.Topic;
-
 import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.Topic;
 
 public class CachedSchemaVersionsRepository implements SchemaVersionsRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(CachedSchemaVersionsRepository.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(CachedSchemaVersionsRepository.class);
+
+  private final RawSchemaClient rawSchemaClient;
+  private final ExecutorService versionsReloader;
+  private final LoadingCache<Topic, List<SchemaVersion>> versionsCache;
+
+  public CachedSchemaVersionsRepository(
+      RawSchemaClient rawSchemaClient,
+      ExecutorService versionsReloader,
+      Duration refreshAfterWrite,
+      Duration expireAfterWrite) {
+    this(
+        rawSchemaClient,
+        versionsReloader,
+        refreshAfterWrite,
+        expireAfterWrite,
+        Ticker.systemTicker());
+  }
+
+  CachedSchemaVersionsRepository(
+      RawSchemaClient rawSchemaClient,
+      ExecutorService versionsReloader,
+      Duration refreshAfterWrite,
+      Duration expireAfterWrite,
+      Ticker ticker) {
+    this.rawSchemaClient = rawSchemaClient;
+    this.versionsReloader = versionsReloader;
+    this.versionsCache =
+        CacheBuilder.newBuilder()
+            .ticker(ticker)
+            .refreshAfterWrite(refreshAfterWrite.toMinutes(), TimeUnit.MINUTES)
+            .expireAfterWrite(expireAfterWrite.toMinutes(), TimeUnit.MINUTES)
+            .build(new SchemaVersionsLoader(rawSchemaClient, versionsReloader));
+  }
+
+  @Override
+  public SchemaVersionsResult versions(Topic topic, boolean online) {
+    try {
+      if (online) {
+        List<SchemaVersion> versions = rawSchemaClient.getVersions(topic.getName());
+        versionsCache.put(topic, versions);
+        return SchemaVersionsResult.succeeded(versions);
+      } else {
+        List<SchemaVersion> versions = versionsCache.get(topic);
+        return SchemaVersionsResult.succeeded(versions);
+      }
+    } catch (Exception e) {
+      logger.error("Error while loading schema versions for topic {}", topic.getQualifiedName(), e);
+      return SchemaVersionsResult.failed();
+    }
+  }
+
+  @Override
+  public void close() {
+    if (!versionsReloader.isShutdown()) {
+      logger.info("Shutdown of schema-source-reloader executor");
+      versionsReloader.shutdownNow();
+    }
+  }
+
+  public void removeFromCache(Topic topic) {
+    versionsCache.invalidate(topic);
+  }
+
+  private static class SchemaVersionsLoader extends CacheLoader<Topic, List<SchemaVersion>> {
 
     private final RawSchemaClient rawSchemaClient;
     private final ExecutorService versionsReloader;
-    private final LoadingCache<Topic, List<SchemaVersion>> versionsCache;
 
-    public CachedSchemaVersionsRepository(RawSchemaClient rawSchemaClient, ExecutorService versionsReloader,
-                                          Duration refreshAfterWrite, Duration expireAfterWrite) {
-        this(rawSchemaClient, versionsReloader, refreshAfterWrite, expireAfterWrite, Ticker.systemTicker());
-    }
-
-    CachedSchemaVersionsRepository(RawSchemaClient rawSchemaClient, ExecutorService versionsReloader,
-                                   Duration refreshAfterWrite, Duration expireAfterWrite, Ticker ticker) {
-        this.rawSchemaClient = rawSchemaClient;
-        this.versionsReloader = versionsReloader;
-        this.versionsCache = CacheBuilder
-                .newBuilder()
-                .ticker(ticker)
-                .refreshAfterWrite(refreshAfterWrite.toMinutes(), TimeUnit.MINUTES)
-                .expireAfterWrite(expireAfterWrite.toMinutes(), TimeUnit.MINUTES)
-                .build(new SchemaVersionsLoader(rawSchemaClient, versionsReloader));
+    public SchemaVersionsLoader(RawSchemaClient rawSchemaClient, ExecutorService versionsReloader) {
+      this.rawSchemaClient = rawSchemaClient;
+      this.versionsReloader = versionsReloader;
     }
 
     @Override
-    public SchemaVersionsResult versions(Topic topic, boolean online) {
-        try {
-            if (online) {
-                List<SchemaVersion> versions = rawSchemaClient.getVersions(topic.getName());
-                versionsCache.put(topic, versions);
-                return SchemaVersionsResult.succeeded(versions);
-            } else {
-                List<SchemaVersion> versions = versionsCache.get(topic);
-                return SchemaVersionsResult.succeeded(versions);
-            }
-        } catch (Exception e) {
-            logger.error("Error while loading schema versions for topic {}", topic.getQualifiedName(), e);
-            return SchemaVersionsResult.failed();
-        }
+    public List<SchemaVersion> load(Topic topic) throws Exception {
+      logger.debug("Loading schema versions for topic {}", topic.getQualifiedName());
+      return rawSchemaClient.getVersions(topic.getName());
     }
 
     @Override
-    public void close() {
-        if (!versionsReloader.isShutdown()) {
-            logger.info("Shutdown of schema-source-reloader executor");
-            versionsReloader.shutdownNow();
-        }
-    }
-
-    public void removeFromCache(Topic topic) {
-        versionsCache.invalidate(topic);
-    }
-
-    private static class SchemaVersionsLoader extends CacheLoader<Topic, List<SchemaVersion>> {
-
-        private final RawSchemaClient rawSchemaClient;
-        private final ExecutorService versionsReloader;
-
-        public SchemaVersionsLoader(RawSchemaClient rawSchemaClient, ExecutorService versionsReloader) {
-            this.rawSchemaClient = rawSchemaClient;
-            this.versionsReloader = versionsReloader;
-        }
-
-        @Override
-        public List<SchemaVersion> load(Topic topic) throws Exception {
-            logger.debug("Loading schema versions for topic {}", topic.getQualifiedName());
-            return rawSchemaClient.getVersions(topic.getName());
-        }
-
-        @Override
-        public ListenableFuture<List<SchemaVersion>> reload(Topic topic, List<SchemaVersion> oldVersions) {
-            ListenableFutureTask<List<SchemaVersion>> task = ListenableFutureTask.create(() -> {
+    public ListenableFuture<List<SchemaVersion>> reload(
+        Topic topic, List<SchemaVersion> oldVersions) {
+      ListenableFutureTask<List<SchemaVersion>> task =
+          ListenableFutureTask.create(
+              () -> {
                 logger.debug("Reloading schema versions for topic {}", topic.getQualifiedName());
                 try {
-                    return checkSchemaVersionsAreAvailable(topic, rawSchemaClient.getVersions(topic.getName()));
+                  return checkSchemaVersionsAreAvailable(
+                      topic, rawSchemaClient.getVersions(topic.getName()));
                 } catch (Exception e) {
-                    logger.error("Could not reload schema versions for topic {}, will use stale data", topic.getQualifiedName(), e);
-                    return oldVersions;
+                  logger.error(
+                      "Could not reload schema versions for topic {}, will use stale data",
+                      topic.getQualifiedName(),
+                      e);
+                  return oldVersions;
                 }
-            });
-            versionsReloader.execute(task);
-            return task;
-        }
+              });
+      versionsReloader.execute(task);
+      return task;
+    }
 
-        private List<SchemaVersion> checkSchemaVersionsAreAvailable(Topic topic, List<SchemaVersion> versions) {
-            if (versions.isEmpty()) {
-                throw new NoSchemaVersionsFoundException(topic);
-            }
-            return versions;
-        }
+    private List<SchemaVersion> checkSchemaVersionsAreAvailable(
+        Topic topic, List<SchemaVersion> versions) {
+      if (versions.isEmpty()) {
+        throw new NoSchemaVersionsFoundException(topic);
+      }
+      return versions;
     }
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CompiledSchema.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CompiledSchema.java
index ffe38436d4..7e658e25fe 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CompiledSchema.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CompiledSchema.java
@@ -1,72 +1,71 @@
 package pl.allegro.tech.hermes.schema;
 
 import com.google.common.base.MoreObjects;
-import pl.allegro.tech.hermes.api.RawSchemaWithMetadata;
-
 import java.util.Objects;
+import pl.allegro.tech.hermes.api.RawSchemaWithMetadata;
 
 public class CompiledSchema<T> {
 
-    private final T schema;
-    private final SchemaId id;
-    private final SchemaVersion version;
+  private final T schema;
+  private final SchemaId id;
+  private final SchemaVersion version;
 
-    public CompiledSchema(T schema, SchemaId id, SchemaVersion version) {
-        this.schema = schema;
-        this.id = id;
-        this.version = version;
-    }
+  public CompiledSchema(T schema, SchemaId id, SchemaVersion version) {
+    this.schema = schema;
+    this.id = id;
+    this.version = version;
+  }
 
-    public static <T> CompiledSchema<T> of(T schema, int id, int version) {
-        return new CompiledSchema<>(schema, SchemaId.valueOf(id), SchemaVersion.valueOf(version));
-    }
-
-    public static <T> CompiledSchema<T> of(SchemaCompiler<T> schemaCompiler, RawSchemaWithMetadata rawSchemaWithMetadata) {
-        return CompiledSchema.of(
-                schemaCompiler.compile(rawSchemaWithMetadata.getSchema()),
-                rawSchemaWithMetadata.getId(),
-                rawSchemaWithMetadata.getVersion()
-        );
-    }
+  public static <T> CompiledSchema<T> of(T schema, int id, int version) {
+    return new CompiledSchema<>(schema, SchemaId.valueOf(id), SchemaVersion.valueOf(version));
+  }
 
-    public T getSchema() {
-        return schema;
-    }
+  public static <T> CompiledSchema<T> of(
+      SchemaCompiler<T> schemaCompiler, RawSchemaWithMetadata rawSchemaWithMetadata) {
+    return CompiledSchema.of(
+        schemaCompiler.compile(rawSchemaWithMetadata.getSchema()),
+        rawSchemaWithMetadata.getId(),
+        rawSchemaWithMetadata.getVersion());
+  }
 
-    public SchemaVersion getVersion() {
-        return version;
-    }
+  public T getSchema() {
+    return schema;
+  }
 
-    public SchemaId getId() {
-        return id;
-    }
+  public SchemaVersion getVersion() {
+    return version;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(schema, id, version);
-    }
+  public SchemaId getId() {
+    return id;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
+  @Override
+  public int hashCode() {
+    return Objects.hash(schema, id, version);
+  }
 
-        CompiledSchema<?> that = (CompiledSchema<?>) o;
-        return Objects.equals(id, that.id)
-                && Objects.equals(version, that.version)
-                && Objects.equals(schema, that.schema);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("schema", schema)
-                .add("id", id)
-                .add("version", version)
-                .toString();
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+
+    CompiledSchema<?> that = (CompiledSchema<?>) o;
+    return Objects.equals(id, that.id)
+        && Objects.equals(version, that.version)
+        && Objects.equals(schema, that.schema);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("schema", schema)
+        .add("id", id)
+        .add("version", version)
+        .toString();
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CompiledSchemaRepository.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CompiledSchemaRepository.java
index 04fd962e87..ce3ea35f20 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CompiledSchemaRepository.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CompiledSchemaRepository.java
@@ -4,11 +4,11 @@
 
 public interface CompiledSchemaRepository<T> {
 
-    default CompiledSchema<T> getSchema(Topic topic, SchemaVersion version) {
-        return getSchema(topic, version, false);
-    }
+  default CompiledSchema<T> getSchema(Topic topic, SchemaVersion version) {
+    return getSchema(topic, version, false);
+  }
 
-    CompiledSchema<T> getSchema(Topic topic, SchemaVersion version, boolean online);
+  CompiledSchema<T> getSchema(Topic topic, SchemaVersion version, boolean online);
 
-    CompiledSchema<T> getSchema(Topic topic, SchemaId id);
+  CompiledSchema<T> getSchema(Topic topic, SchemaId id);
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CouldNotLoadSchemaException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CouldNotLoadSchemaException.java
index 644ad1bc4f..7978919713 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CouldNotLoadSchemaException.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/CouldNotLoadSchemaException.java
@@ -5,16 +5,20 @@
 
 public class CouldNotLoadSchemaException extends SchemaException {
 
-    CouldNotLoadSchemaException(Throwable cause) {
-        super(cause);
-    }
+  CouldNotLoadSchemaException(Throwable cause) {
+    super(cause);
+  }
 
-    CouldNotLoadSchemaException(Topic topic, SchemaVersion version, Throwable cause) {
-        super(String.format("Schema for topic %s at version %d could not be loaded", topic.getQualifiedName(), version.value()), cause);
-    }
+  CouldNotLoadSchemaException(Topic topic, SchemaVersion version, Throwable cause) {
+    super(
+        String.format(
+            "Schema for topic %s at version %d could not be loaded",
+            topic.getQualifiedName(), version.value()),
+        cause);
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/DirectCompiledSchemaRepository.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/DirectCompiledSchemaRepository.java
index abd9b0833d..a6f6ccf599 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/DirectCompiledSchemaRepository.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/DirectCompiledSchemaRepository.java
@@ -4,26 +4,28 @@
 
 public class DirectCompiledSchemaRepository<T> implements CompiledSchemaRepository<T> {
 
-    private final RawSchemaClient rawSchemaClient;
-    private final SchemaCompiler<T> schemaCompiler;
+  private final RawSchemaClient rawSchemaClient;
+  private final SchemaCompiler<T> schemaCompiler;
 
-    public DirectCompiledSchemaRepository(RawSchemaClient rawSchemaClient,
-                                          SchemaCompiler<T> schemaCompiler) {
-        this.rawSchemaClient = rawSchemaClient;
-        this.schemaCompiler = schemaCompiler;
-    }
+  public DirectCompiledSchemaRepository(
+      RawSchemaClient rawSchemaClient, SchemaCompiler<T> schemaCompiler) {
+    this.rawSchemaClient = rawSchemaClient;
+    this.schemaCompiler = schemaCompiler;
+  }
 
-    @Override
-    public CompiledSchema<T> getSchema(Topic topic, SchemaVersion version, boolean online) {
-        return rawSchemaClient.getRawSchemaWithMetadata(topic.getName(), version)
-                .map(rawSchemaWithMetadata -> CompiledSchema.of(schemaCompiler, rawSchemaWithMetadata))
-                .orElseThrow(() -> new SchemaNotFoundException(topic, version));
-    }
+  @Override
+  public CompiledSchema<T> getSchema(Topic topic, SchemaVersion version, boolean online) {
+    return rawSchemaClient
+        .getRawSchemaWithMetadata(topic.getName(), version)
+        .map(rawSchemaWithMetadata -> CompiledSchema.of(schemaCompiler, rawSchemaWithMetadata))
+        .orElseThrow(() -> new SchemaNotFoundException(topic, version));
+  }
 
-    @Override
-    public CompiledSchema<T> getSchema(Topic topic, SchemaId id) {
-        return rawSchemaClient.getRawSchemaWithMetadata(topic.getName(), id)
-            .map(rawSchemaWithMetadata -> CompiledSchema.of(schemaCompiler, rawSchemaWithMetadata))
-            .orElseThrow(() -> new SchemaNotFoundException(id));
-    }
+  @Override
+  public CompiledSchema<T> getSchema(Topic topic, SchemaId id) {
+    return rawSchemaClient
+        .getRawSchemaWithMetadata(topic.getName(), id)
+        .map(rawSchemaWithMetadata -> CompiledSchema.of(schemaCompiler, rawSchemaWithMetadata))
+        .orElseThrow(() -> new SchemaNotFoundException(id));
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/DirectSchemaVersionsRepository.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/DirectSchemaVersionsRepository.java
index 19cfe21309..3cf3fff76f 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/DirectSchemaVersionsRepository.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/DirectSchemaVersionsRepository.java
@@ -1,34 +1,34 @@
 package pl.allegro.tech.hermes.schema;
 
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Topic;
 
-import java.util.List;
-
 public class DirectSchemaVersionsRepository implements SchemaVersionsRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(DirectSchemaVersionsRepository.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(DirectSchemaVersionsRepository.class);
 
-    private final RawSchemaClient rawSchemaClient;
+  private final RawSchemaClient rawSchemaClient;
 
-    public DirectSchemaVersionsRepository(RawSchemaClient rawSchemaClient) {
-        this.rawSchemaClient = rawSchemaClient;
-    }
+  public DirectSchemaVersionsRepository(RawSchemaClient rawSchemaClient) {
+    this.rawSchemaClient = rawSchemaClient;
+  }
 
-    @Override
-    public SchemaVersionsResult versions(Topic topic, boolean online) {
-        try {
-            List<SchemaVersion> versions = rawSchemaClient.getVersions(topic.getName());
-            return SchemaVersionsResult.succeeded(versions);
-        } catch (Exception e) {
-            logger.error("Error while loading schema versions for topic {}", topic.getQualifiedName(), e);
-            return SchemaVersionsResult.failed();
-        }
+  @Override
+  public SchemaVersionsResult versions(Topic topic, boolean online) {
+    try {
+      List<SchemaVersion> versions = rawSchemaClient.getVersions(topic.getName());
+      return SchemaVersionsResult.succeeded(versions);
+    } catch (Exception e) {
+      logger.error("Error while loading schema versions for topic {}", topic.getQualifiedName(), e);
+      return SchemaVersionsResult.failed();
     }
+  }
 
-    @Override
-    public void close() {
-        // nothing to close
-    }
+  @Override
+  public void close() {
+    // nothing to close
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/InternalSchemaRepositoryException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/InternalSchemaRepositoryException.java
index c7f2e399d7..30108600eb 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/InternalSchemaRepositoryException.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/InternalSchemaRepositoryException.java
@@ -5,22 +5,26 @@
 
 public class InternalSchemaRepositoryException extends SchemaException {
 
-    public InternalSchemaRepositoryException(String subject, Response response) {
-        this(subject, response.getStatus(), response.readEntity(String.class));
-    }
+  public InternalSchemaRepositoryException(String subject, Response response) {
+    this(subject, response.getStatus(), response.readEntity(String.class));
+  }
 
-    public InternalSchemaRepositoryException(String subject, int statusCode, String responseBody) {
-        super(String.format("Internal schema repository error for subject %s request, server response: %d %s",
-                subject, statusCode, responseBody));
-    }
+  public InternalSchemaRepositoryException(String subject, int statusCode, String responseBody) {
+    super(
+        String.format(
+            "Internal schema repository error for subject %s request, server response: %d %s",
+            subject, statusCode, responseBody));
+  }
 
-    public InternalSchemaRepositoryException(SchemaId schemaId, Response response) {
-        super(String.format("Internal schema repository error for id %s request, server response: %d %s",
+  public InternalSchemaRepositoryException(SchemaId schemaId, Response response) {
+    super(
+        String.format(
+            "Internal schema repository error for id %s request, server response: %d %s",
             schemaId.value(), response.getStatus(), response.readEntity(String.class)));
-    }
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SCHEMA_REPOSITORY_INTERNAL_ERROR;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SCHEMA_REPOSITORY_INTERNAL_ERROR;
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/NoSchemaVersionsFoundException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/NoSchemaVersionsFoundException.java
index cf652ddafd..01e6bffd89 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/NoSchemaVersionsFoundException.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/NoSchemaVersionsFoundException.java
@@ -1,22 +1,20 @@
 package pl.allegro.tech.hermes.schema;
 
-
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.api.Topic;
 
 public class NoSchemaVersionsFoundException extends SchemaException {
 
-    NoSchemaVersionsFoundException(String message) {
-        super(message);
-    }
-
-    NoSchemaVersionsFoundException(Topic topic) {
-        this(String.format("No schema version found for topic %s", topic.getQualifiedName()));
-    }
+  NoSchemaVersionsFoundException(String message) {
+    super(message);
+  }
 
+  NoSchemaVersionsFoundException(Topic topic) {
+    this(String.format("No schema version found for topic %s", topic.getQualifiedName()));
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/RawSchemaClient.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/RawSchemaClient.java
index 4d012e0c1f..1b5d9da36e 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/RawSchemaClient.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/RawSchemaClient.java
@@ -1,25 +1,24 @@
 package pl.allegro.tech.hermes.schema;
 
+import java.util.List;
+import java.util.Optional;
 import pl.allegro.tech.hermes.api.RawSchema;
 import pl.allegro.tech.hermes.api.RawSchemaWithMetadata;
 import pl.allegro.tech.hermes.api.TopicName;
 
-import java.util.List;
-import java.util.Optional;
-
 public interface RawSchemaClient {
 
-    Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaVersion version);
+  Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaVersion version);
 
-    Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaId schemaId);
+  Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaId schemaId);
 
-    Optional<RawSchemaWithMetadata> getLatestRawSchemaWithMetadata(TopicName topic);
+  Optional<RawSchemaWithMetadata> getLatestRawSchemaWithMetadata(TopicName topic);
 
-    List<SchemaVersion> getVersions(TopicName topic);
+  List<SchemaVersion> getVersions(TopicName topic);
 
-    void registerSchema(TopicName topic, RawSchema rawSchema);
+  void registerSchema(TopicName topic, RawSchema rawSchema);
 
-    void deleteAllSchemaVersions(TopicName topic);
+  void deleteAllSchemaVersions(TopicName topic);
 
-    void validateSchema(TopicName topic, RawSchema rawSchema);
+  void validateSchema(TopicName topic, RawSchema rawSchema);
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaCompiler.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaCompiler.java
index 18ef082650..0abe72611a 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaCompiler.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaCompiler.java
@@ -5,6 +5,5 @@
 @FunctionalInterface
 public interface SchemaCompiler<T> {
 
-    T compile(RawSchema rawSchema);
-
+  T compile(RawSchema rawSchema);
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaCompilersFactory.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaCompilersFactory.java
index 888ce6d423..5a91b59985 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaCompilersFactory.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaCompilersFactory.java
@@ -4,7 +4,7 @@
 
 public interface SchemaCompilersFactory {
 
-    static SchemaCompiler<Schema> avroSchemaCompiler() {
-        return source -> new Schema.Parser().parse(source.value());
-    }
+  static SchemaCompiler<Schema> avroSchemaCompiler() {
+    return source -> new Schema.Parser().parse(source.value());
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaException.java
index 1ef1f117aa..57c5eb687d 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaException.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaException.java
@@ -4,17 +4,17 @@
 
 public abstract class SchemaException extends RuntimeException {
 
-    SchemaException(String message) {
-        super(message);
-    }
+  SchemaException(String message) {
+    super(message);
+  }
 
-    SchemaException(Throwable cause) {
-        super(cause);
-    }
+  SchemaException(Throwable cause) {
+    super(cause);
+  }
 
-    SchemaException(String message, Throwable cause) {
-        super(message, cause);
-    }
+  SchemaException(String message, Throwable cause) {
+    super(message, cause);
+  }
 
-    public abstract ErrorCode getCode();
-}
\ No newline at end of file
+  public abstract ErrorCode getCode();
+}
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaExistenceEnsurer.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaExistenceEnsurer.java
index 23a3500ced..c882876e42 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaExistenceEnsurer.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaExistenceEnsurer.java
@@ -1,55 +1,62 @@
 package pl.allegro.tech.hermes.schema;
 
-import pl.allegro.tech.hermes.api.Topic;
-
 import static java.lang.String.format;
 
+import pl.allegro.tech.hermes.api.Topic;
 
 public class SchemaExistenceEnsurer {
-    private final SchemaRepository schemaRepository;
-
-    public SchemaExistenceEnsurer(SchemaRepository schemaRepository) {
-        this.schemaRepository = schemaRepository;
+  private final SchemaRepository schemaRepository;
+
+  public SchemaExistenceEnsurer(SchemaRepository schemaRepository) {
+    this.schemaRepository = schemaRepository;
+  }
+
+  public void ensureSchemaExists(Topic topic, SchemaVersion version) {
+    pullSchemaIfNeeded(topic, version);
+  }
+
+  public void ensureSchemaExists(Topic topic, SchemaId id) {
+    pullSchemaIfNeeded(topic, id);
+  }
+
+  private void pullSchemaIfNeeded(Topic topic, SchemaVersion version) {
+    try {
+      schemaRepository.getAvroSchema(topic, version);
+    } catch (SchemaException ex) {
+      pullVersionsOnline(topic);
+      throw new SchemaNotLoaded(
+          format(
+              "Could not find schema version [%s] provided in header for topic [%s]."
+                  + " Trying pulling online...",
+              version, topic),
+          ex);
     }
-
-    public void ensureSchemaExists(Topic topic, SchemaVersion version) {
-        pullSchemaIfNeeded(topic, version);
+  }
+
+  private void pullSchemaIfNeeded(Topic topic, SchemaId id) {
+    try {
+      schemaRepository.getAvroSchema(topic, id);
+    } catch (SchemaException ex) {
+      throw new SchemaNotLoaded(
+          format(
+              "Could not find schema id [%s] provided in header for topic [%s]."
+                  + " Trying pulling online...",
+              id, topic),
+          ex);
     }
+  }
 
-    public void ensureSchemaExists(Topic topic, SchemaId id) {
-        pullSchemaIfNeeded(topic, id);
-    }
+  private void pullVersionsOnline(Topic topic) {
+    schemaRepository.refreshVersions(topic);
+  }
 
-    private void pullSchemaIfNeeded(Topic topic, SchemaVersion version) {
-        try {
-            schemaRepository.getAvroSchema(topic, version);
-        } catch (SchemaException ex) {
-            pullVersionsOnline(topic);
-            throw new SchemaNotLoaded(format("Could not find schema version [%s] provided in header for topic [%s]."
-                    + " Trying pulling online...", version, topic), ex);
-        }
+  public static class SchemaNotLoaded extends RuntimeException {
+    SchemaNotLoaded(String msg, Throwable th) {
+      super(msg, th);
     }
 
-    private void pullSchemaIfNeeded(Topic topic, SchemaId id) {
-        try {
-            schemaRepository.getAvroSchema(topic, id);
-        } catch (SchemaException ex) {
-            throw new SchemaNotLoaded(format("Could not find schema id [%s] provided in header for topic [%s]."
-                    + " Trying pulling online...", id, topic), ex);
-        }
-    }
-
-    private void pullVersionsOnline(Topic topic) {
-        schemaRepository.refreshVersions(topic);
-    }
-
-    public static class SchemaNotLoaded extends RuntimeException {
-        SchemaNotLoaded(String msg, Throwable th) {
-            super(msg, th);
-        }
-
-        SchemaNotLoaded(String msg) {
-            super(msg);
-        }
+    SchemaNotLoaded(String msg) {
+      super(msg);
     }
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaId.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaId.java
index b355a0c891..1eeb9fa20e 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaId.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaId.java
@@ -4,39 +4,39 @@
 
 public final class SchemaId {
 
-    private final int value;
+  private final int value;
 
-    private SchemaId(int value) {
-        this.value = value;
-    }
-
-    public static SchemaId valueOf(int id) {
-        return new SchemaId(id);
-    }
+  private SchemaId(int value) {
+    this.value = value;
+  }
 
-    public int value() {
-        return value;
-    }
+  public static SchemaId valueOf(int id) {
+    return new SchemaId(id);
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SchemaId that = (SchemaId) o;
-        return value == that.value;
-    }
+  public int value() {
+    return value;
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(value);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public String toString() {
-        return "SchemaId(" + value + ")";
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SchemaId that = (SchemaId) o;
+    return value == that.value;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
+
+  @Override
+  public String toString() {
+    return "SchemaId(" + value + ")";
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaNotFoundException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaNotFoundException.java
index b285cd2d21..e273c1e275 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaNotFoundException.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaNotFoundException.java
@@ -5,20 +5,24 @@
 
 public class SchemaNotFoundException extends SchemaException {
 
-    SchemaNotFoundException(Topic topic, SchemaVersion schemaVersion) {
-        super("No schema source for topic " + topic.getQualifiedName() + " at version " + schemaVersion.value());
-    }
+  SchemaNotFoundException(Topic topic, SchemaVersion schemaVersion) {
+    super(
+        "No schema source for topic "
+            + topic.getQualifiedName()
+            + " at version "
+            + schemaVersion.value());
+  }
 
-    SchemaNotFoundException(Topic topic) {
-        super("No schema source for topic " + topic.getQualifiedName());
-    }
+  SchemaNotFoundException(Topic topic) {
+    super("No schema source for topic " + topic.getQualifiedName());
+  }
 
-    SchemaNotFoundException(SchemaId id) {
-        super("No schema source for id " + id.value());
-    }
+  SchemaNotFoundException(SchemaId id) {
+    super("No schema source for id " + id.value());
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OTHER;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OTHER;
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaRepository.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaRepository.java
index 03acf7b644..9c06a8b22b 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaRepository.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaRepository.java
@@ -3,71 +3,74 @@
 import org.apache.avro.Schema;
 import pl.allegro.tech.hermes.api.Topic;
 
-
 public class SchemaRepository {
 
-    private static final boolean ONLINE = true;
+  private static final boolean ONLINE = true;
 
-    private final SchemaVersionsRepository schemaVersionsRepository;
-    private final CompiledSchemaRepository<Schema> compiledAvroSchemaRepository;
+  private final SchemaVersionsRepository schemaVersionsRepository;
+  private final CompiledSchemaRepository<Schema> compiledAvroSchemaRepository;
 
-    public SchemaRepository(SchemaVersionsRepository schemaVersionsRepository,
-                            CompiledSchemaRepository<Schema> compiledAvroSchemaRepository) {
-        this.schemaVersionsRepository = schemaVersionsRepository;
-        this.compiledAvroSchemaRepository = compiledAvroSchemaRepository;
-    }
+  public SchemaRepository(
+      SchemaVersionsRepository schemaVersionsRepository,
+      CompiledSchemaRepository<Schema> compiledAvroSchemaRepository) {
+    this.schemaVersionsRepository = schemaVersionsRepository;
+    this.compiledAvroSchemaRepository = compiledAvroSchemaRepository;
+  }
 
-    public CompiledSchema<Schema> getLatestAvroSchema(Topic topic) {
-        SchemaVersion latestVersion = schemaVersionsRepository.latestSchemaVersion(topic)
-                .orElseThrow(() -> new SchemaNotFoundException(topic));
-        if (!schemaVersionsRepository.schemaVersionExists(topic, latestVersion)) {
-            throw new SchemaNotFoundException(topic, latestVersion);
-        }
-        return getCompiledSchemaAtVersion(topic, latestVersion);
+  public CompiledSchema<Schema> getLatestAvroSchema(Topic topic) {
+    SchemaVersion latestVersion =
+        schemaVersionsRepository
+            .latestSchemaVersion(topic)
+            .orElseThrow(() -> new SchemaNotFoundException(topic));
+    if (!schemaVersionsRepository.schemaVersionExists(topic, latestVersion)) {
+      throw new SchemaNotFoundException(topic, latestVersion);
     }
+    return getCompiledSchemaAtVersion(topic, latestVersion);
+  }
 
-    public CompiledSchema<Schema> getAvroSchema(Topic topic, SchemaVersion version) {
-        SchemaVersionsResult result = schemaVersionsRepository.versions(topic);
-        if (result.isFailure()) {
-            throw new SchemaNotFoundException(topic, version);
-        }
-        if (!result.versionExists(version)) {
-            throw new SchemaVersionDoesNotExistException(topic, version);
-        }
-        return getCompiledSchemaAtVersion(topic, version);
+  public CompiledSchema<Schema> getAvroSchema(Topic topic, SchemaVersion version) {
+    SchemaVersionsResult result = schemaVersionsRepository.versions(topic);
+    if (result.isFailure()) {
+      throw new SchemaNotFoundException(topic, version);
     }
+    if (!result.versionExists(version)) {
+      throw new SchemaVersionDoesNotExistException(topic, version);
+    }
+    return getCompiledSchemaAtVersion(topic, version);
+  }
 
-    public CompiledSchema<Schema> getAvroSchema(Topic topic, SchemaId id) {
-        CompiledSchema<Schema> schema = compiledAvroSchemaRepository.getSchema(topic, id);
-
-        if (schema == null) {
-            throw new SchemaNotFoundException(id);
-        }
+  public CompiledSchema<Schema> getAvroSchema(Topic topic, SchemaId id) {
+    CompiledSchema<Schema> schema = compiledAvroSchemaRepository.getSchema(topic, id);
 
-        return schema;
+    if (schema == null) {
+      throw new SchemaNotFoundException(id);
     }
 
-    /**
-     * This method should be used only for cache-backed repository implementations
-     * where we have possibly stale versions-cache and are 100% sure the requested version exists.
-     * If it does not exist, each method call will try to load the requested version
-     * from underlying schema repository.
-     */
-    public CompiledSchema<Schema> getKnownAvroSchemaVersion(Topic topic, SchemaVersion version) {
-        return getCompiledSchemaAtVersion(topic, version);
-    }
+    return schema;
+  }
 
-    public void refreshVersions(Topic topic) {
-        schemaVersionsRepository.versions(topic, ONLINE);
-    }
+  /**
+   * This method should be used only for cache-backed repository implementations where we have
+   * possibly stale versions-cache and are 100% sure the requested version exists. If it does not
+   * exist, each method call will try to load the requested version from underlying schema
+   * repository.
+   */
+  public CompiledSchema<Schema> getKnownAvroSchemaVersion(Topic topic, SchemaVersion version) {
+    return getCompiledSchemaAtVersion(topic, version);
+  }
+
+  public void refreshVersions(Topic topic) {
+    schemaVersionsRepository.versions(topic, ONLINE);
+  }
 
-    private CompiledSchema<Schema> getCompiledSchemaAtVersion(Topic topic, SchemaVersion latestVersion) {
-        try {
-            return compiledAvroSchemaRepository.getSchema(topic, latestVersion);
-        } catch (CouldNotLoadSchemaException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new CouldNotLoadSchemaException(topic, latestVersion, e);
-        }
+  private CompiledSchema<Schema> getCompiledSchemaAtVersion(
+      Topic topic, SchemaVersion latestVersion) {
+    try {
+      return compiledAvroSchemaRepository.getSchema(topic, latestVersion);
+    } catch (CouldNotLoadSchemaException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new CouldNotLoadSchemaException(topic, latestVersion, e);
     }
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersion.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersion.java
index 80ccb485c2..12b498f00f 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersion.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersion.java
@@ -1,51 +1,52 @@
 package pl.allegro.tech.hermes.schema;
 
 import com.google.common.base.Joiner;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 public final class SchemaVersion {
 
-    private final int value;
-
-    private SchemaVersion(int value) {
-        this.value = value;
-    }
-
-    public static SchemaVersion valueOf(int version) {
-        return new SchemaVersion(version);
-    }
+  private final int value;
 
-    public int value() {
-        return value;
-    }
+  private SchemaVersion(int value) {
+    this.value = value;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SchemaVersion that = (SchemaVersion) o;
-        return value == that.value;
-    }
+  public static SchemaVersion valueOf(int version) {
+    return new SchemaVersion(version);
+  }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(value);
-    }
+  public int value() {
+    return value;
+  }
 
-    @Override
-    public String toString() {
-        return "SchemaVersion(" + value + ")";
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    public static String toString(List<SchemaVersion> versions) {
-        return "[" + Joiner.on(',').join(versions.stream().map(SchemaVersion::value).collect(Collectors.toList())) + "]";
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
-
+    SchemaVersion that = (SchemaVersion) o;
+    return value == that.value;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
+
+  @Override
+  public String toString() {
+    return "SchemaVersion(" + value + ")";
+  }
+
+  public static String toString(List<SchemaVersion> versions) {
+    return "["
+        + Joiner.on(',')
+            .join(versions.stream().map(SchemaVersion::value).collect(Collectors.toList()))
+        + "]";
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionDoesNotExistException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionDoesNotExistException.java
index c0c3f06c75..8f58174652 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionDoesNotExistException.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionDoesNotExistException.java
@@ -1,25 +1,28 @@
 package pl.allegro.tech.hermes.schema;
 
+import static java.lang.String.format;
+
 import pl.allegro.tech.hermes.api.ErrorCode;
 import pl.allegro.tech.hermes.api.Topic;
 
-import static java.lang.String.format;
-
 public class SchemaVersionDoesNotExistException extends SchemaException {
 
-    private final SchemaVersion schemaVersion;
+  private final SchemaVersion schemaVersion;
 
-    SchemaVersionDoesNotExistException(Topic topic, SchemaVersion schemaVersion) {
-        super(format("Schema version %s for topic %s does not exist", schemaVersion.value(), topic.getQualifiedName()));
-        this.schemaVersion = schemaVersion;
-    }
+  SchemaVersionDoesNotExistException(Topic topic, SchemaVersion schemaVersion) {
+    super(
+        format(
+            "Schema version %s for topic %s does not exist",
+            schemaVersion.value(), topic.getQualifiedName()));
+    this.schemaVersion = schemaVersion;
+  }
 
-    public SchemaVersion getSchemaVersion() {
-        return schemaVersion;
-    }
+  public SchemaVersion getSchemaVersion() {
+    return schemaVersion;
+  }
 
-    @Override
-    public ErrorCode getCode() {
-        return ErrorCode.OTHER;
-    }
+  @Override
+  public ErrorCode getCode() {
+    return ErrorCode.OTHER;
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionsRepository.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionsRepository.java
index d4ca2d98f2..0a27f89858 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionsRepository.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionsRepository.java
@@ -1,29 +1,28 @@
 package pl.allegro.tech.hermes.schema;
 
-import pl.allegro.tech.hermes.api.Topic;
-
 import java.util.Comparator;
 import java.util.Optional;
+import pl.allegro.tech.hermes.api.Topic;
 
 public interface SchemaVersionsRepository {
 
-    default boolean schemaVersionExists(Topic topic, SchemaVersion version) {
-        return versions(topic).get().contains(version);
-    }
+  default boolean schemaVersionExists(Topic topic, SchemaVersion version) {
+    return versions(topic).get().contains(version);
+  }
 
-    default Optional<SchemaVersion> latestSchemaVersion(Topic topic) {
-        return versions(topic).get().stream().max(Comparator.comparingInt(SchemaVersion::value));
-    }
+  default Optional<SchemaVersion> latestSchemaVersion(Topic topic) {
+    return versions(topic).get().stream().max(Comparator.comparingInt(SchemaVersion::value));
+  }
 
-    default Optional<SchemaVersion> onlineLatestSchemaVersion(Topic topic) {
-        return versions(topic, true).get().stream().max(Comparator.comparingInt(SchemaVersion::value));
-    }
+  default Optional<SchemaVersion> onlineLatestSchemaVersion(Topic topic) {
+    return versions(topic, true).get().stream().max(Comparator.comparingInt(SchemaVersion::value));
+  }
 
-    default SchemaVersionsResult versions(Topic topic) {
-        return versions(topic, false);
-    }
+  default SchemaVersionsResult versions(Topic topic) {
+    return versions(topic, false);
+  }
 
-    SchemaVersionsResult versions(Topic topic, boolean online);
+  SchemaVersionsResult versions(Topic topic, boolean online);
 
-    void close();
+  void close();
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionsResult.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionsResult.java
index 20632c328d..4302732e3a 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionsResult.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SchemaVersionsResult.java
@@ -1,44 +1,44 @@
 package pl.allegro.tech.hermes.schema;
 
-import java.util.List;
-
 import static java.util.Collections.emptyList;
 
+import java.util.List;
+
 public class SchemaVersionsResult {
-    private final Status status;
-    private final List<SchemaVersion> versions;
-
-    public static SchemaVersionsResult succeeded(List<SchemaVersion> versions) {
-        return new SchemaVersionsResult(Status.SUCCESS, versions);
-    }
-
-    public static SchemaVersionsResult failed() {
-        return new SchemaVersionsResult(Status.FAILURE, emptyList());
-    }
-
-    private SchemaVersionsResult(Status status, List<SchemaVersion> versions) {
-        this.status = status;
-        this.versions = versions;
-    }
-
-    public List<SchemaVersion> get() {
-        return versions;
-    }
-
-    public boolean isSuccess() {
-        return status == Status.SUCCESS;
-    }
-
-    public boolean isFailure() {
-        return status == Status.FAILURE;
-    }
-
-    public boolean versionExists(SchemaVersion version) {
-        return versions.contains(version);
-    }
-
-    enum Status {
-        SUCCESS,
-        FAILURE
-    }
+  private final Status status;
+  private final List<SchemaVersion> versions;
+
+  public static SchemaVersionsResult succeeded(List<SchemaVersion> versions) {
+    return new SchemaVersionsResult(Status.SUCCESS, versions);
+  }
+
+  public static SchemaVersionsResult failed() {
+    return new SchemaVersionsResult(Status.FAILURE, emptyList());
+  }
+
+  private SchemaVersionsResult(Status status, List<SchemaVersion> versions) {
+    this.status = status;
+    this.versions = versions;
+  }
+
+  public List<SchemaVersion> get() {
+    return versions;
+  }
+
+  public boolean isSuccess() {
+    return status == Status.SUCCESS;
+  }
+
+  public boolean isFailure() {
+    return status == Status.FAILURE;
+  }
+
+  public boolean versionExists(SchemaVersion version) {
+    return versions.contains(version);
+  }
+
+  enum Status {
+    SUCCESS,
+    FAILURE
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SubjectNamingStrategy.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SubjectNamingStrategy.java
index b1c37fea78..c8261a57cd 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SubjectNamingStrategy.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/SubjectNamingStrategy.java
@@ -4,33 +4,33 @@
 
 public interface SubjectNamingStrategy {
 
-    class Namespace {
-        private final String value;
-        private final String separator;
-
-        public Namespace(String value, String separator) {
-            this.value = value;
-            this.separator = separator;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String apply(String name) {
-            return value.isEmpty() ? name : value + separator + name;
-        }
-    }
-
-    String apply(TopicName topic);
+  class Namespace {
+    private final String value;
+    private final String separator;
 
-    SubjectNamingStrategy qualifiedName = TopicName::qualifiedName;
+    public Namespace(String value, String separator) {
+      this.value = value;
+      this.separator = separator;
+    }
 
-    default SubjectNamingStrategy withNamespacePrefixIf(boolean enabled, Namespace namespace) {
-        return enabled ? topicName -> namespace.apply(this.apply(topicName)) : this;
+    public String getValue() {
+      return value;
     }
 
-    default SubjectNamingStrategy withValueSuffixIf(boolean valueSuffixEnabled) {
-        return valueSuffixEnabled ? topicName -> this.apply(topicName) + "-value" : this;
+    public String apply(String name) {
+      return value.isEmpty() ? name : value + separator + name;
     }
+  }
+
+  String apply(TopicName topic);
+
+  SubjectNamingStrategy qualifiedName = TopicName::qualifiedName;
+
+  default SubjectNamingStrategy withNamespacePrefixIf(boolean enabled, Namespace namespace) {
+    return enabled ? topicName -> namespace.apply(this.apply(topicName)) : this;
+  }
+
+  default SubjectNamingStrategy withValueSuffixIf(boolean valueSuffixEnabled) {
+    return valueSuffixEnabled ? topicName -> this.apply(topicName) + "-value" : this;
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryCompatibilityResponse.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryCompatibilityResponse.java
index 4f1a4d7605..471046b77d 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryCompatibilityResponse.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryCompatibilityResponse.java
@@ -2,36 +2,35 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 class SchemaRegistryCompatibilityResponse {
 
-    private final boolean compatible;
+  private final boolean compatible;
 
-    @JsonCreator
-    SchemaRegistryCompatibilityResponse(@JsonProperty("is_compatible") boolean compatible) {
-        this.compatible = compatible;
-    }
+  @JsonCreator
+  SchemaRegistryCompatibilityResponse(@JsonProperty("is_compatible") boolean compatible) {
+    this.compatible = compatible;
+  }
 
-    public boolean isCompatible() {
-        return compatible;
-    }
+  public boolean isCompatible() {
+    return compatible;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SchemaRegistryCompatibilityResponse that = (SchemaRegistryCompatibilityResponse) o;
-        return compatible == that.compatible;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(compatible);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SchemaRegistryCompatibilityResponse that = (SchemaRegistryCompatibilityResponse) o;
+    return compatible == that.compatible;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(compatible);
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java
index ced558137c..9330243078 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java
@@ -1,9 +1,19 @@
 package pl.allegro.tech.hermes.schema.confluent;
 
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.RawSchema;
@@ -17,339 +27,392 @@
 import pl.allegro.tech.hermes.schema.SubjectNamingStrategy;
 import pl.allegro.tech.hermes.schema.resolver.SchemaRepositoryInstanceResolver;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
-import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
-
 /**
- * This implementation of RawSchemaClient is compatible with Confluent Schema Registry API
- * except for the deleteAllSchemaVersions and validation endpoint which are not fully supported by the Confluent project.
+ * This implementation of RawSchemaClient is compatible with Confluent Schema Registry API except
+ * for the deleteAllSchemaVersions and validation endpoint which are not fully supported by the
+ * Confluent project.
  */
 public class SchemaRegistryRawSchemaClient implements RawSchemaClient {
 
-    private static final Logger logger = LoggerFactory.getLogger(SchemaRegistryRawSchemaClient.class);
-
-    private static final String SCHEMA_REPO_CONTENT_TYPE = "application/vnd.schemaregistry.v1+json";
-
-    private final SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver;
-
-    private final ObjectMapper objectMapper;
-    private final boolean validationEndpointEnabled;
-    private final String deleteSchemaPathSuffix;
-    private final SubjectNamingStrategy subjectNamingStrategy;
-
-    public SchemaRegistryRawSchemaClient(SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver,
-                                         ObjectMapper objectMapper,
-                                         SubjectNamingStrategy subjectNamingStrategy) {
-        this(schemaRepositoryInstanceResolver, objectMapper, false, "versions", subjectNamingStrategy);
-    }
-
-    public SchemaRegistryRawSchemaClient(SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver,
-                                         ObjectMapper objectMapper,
-                                         boolean validationEndpointEnabled,
-                                         String deleteSchemaPathSuffix,
-                                         SubjectNamingStrategy subjectNamingStrategy) {
-        this.schemaRepositoryInstanceResolver = schemaRepositoryInstanceResolver;
-        this.validationEndpointEnabled = validationEndpointEnabled;
-        this.deleteSchemaPathSuffix = deleteSchemaPathSuffix;
-        this.objectMapper = objectMapper;
-        this.subjectNamingStrategy = subjectNamingStrategy;
-    }
-
-    @Override
-    public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaVersion schemaVersion) {
-        String version = Integer.toString(schemaVersion.value());
-        String subject = subjectNamingStrategy.apply(topic);
-        Response response = getRawSchemaWithMetadataResponse(subject, version);
-        return extractRawSchemaWithMetadata(subject, version, response);
-    }
-
-    @Override
-    public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(TopicName topic, SchemaId schemaId) {
-        String subject = subjectNamingStrategy.apply(topic);
-        Optional<RawSchema> schema = getRawSchema(subject, schemaId);
-
-        return schema
-                .map(sc -> getRawSchemaWithMetadataResponse(subject, sc))
-                .map(response -> extractRawSchemaWithMetadata(subject, schemaId, response))
-                .map(Optional::get);
-    }
-
-    @Override
-    public Optional<RawSchemaWithMetadata> getLatestRawSchemaWithMetadata(TopicName topic) {
-        final String version = "latest";
-        String subject = subjectNamingStrategy.apply(topic);
-        Response response = getRawSchemaWithMetadataResponse(subject, version);
-        return extractRawSchemaWithMetadata(subject, version, response);
-    }
-
-    private Response getRawSchemaWithMetadataResponse(String subject, String version) {
-        return schemaRepositoryInstanceResolver.resolve(subject)
-                .path("subjects")
-                .path(subject)
-                .path("versions")
-                .path(version)
-                .request()
-                .get();
-    }
-
-    private Response getRawSchemaWithMetadataResponse(String subject, RawSchema schema) {
-        return schemaRepositoryInstanceResolver.resolve(subject)
-                .path("subjects")
-                .path(subject)
-                .request()
-                .accept(MediaType.APPLICATION_JSON_TYPE)
-                .post(Entity.entity(SchemaRegistryRequestResponse.fromRawSchema(schema), SCHEMA_REPO_CONTENT_TYPE));
+  private static final Logger logger = LoggerFactory.getLogger(SchemaRegistryRawSchemaClient.class);
+
+  private static final String SCHEMA_REPO_CONTENT_TYPE = "application/vnd.schemaregistry.v1+json";
+
+  private final SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver;
+
+  private final ObjectMapper objectMapper;
+  private final boolean validationEndpointEnabled;
+  private final String deleteSchemaPathSuffix;
+  private final SubjectNamingStrategy subjectNamingStrategy;
+
+  public SchemaRegistryRawSchemaClient(
+      SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver,
+      ObjectMapper objectMapper,
+      SubjectNamingStrategy subjectNamingStrategy) {
+    this(schemaRepositoryInstanceResolver, objectMapper, false, "versions", subjectNamingStrategy);
+  }
+
+  public SchemaRegistryRawSchemaClient(
+      SchemaRepositoryInstanceResolver schemaRepositoryInstanceResolver,
+      ObjectMapper objectMapper,
+      boolean validationEndpointEnabled,
+      String deleteSchemaPathSuffix,
+      SubjectNamingStrategy subjectNamingStrategy) {
+    this.schemaRepositoryInstanceResolver = schemaRepositoryInstanceResolver;
+    this.validationEndpointEnabled = validationEndpointEnabled;
+    this.deleteSchemaPathSuffix = deleteSchemaPathSuffix;
+    this.objectMapper = objectMapper;
+    this.subjectNamingStrategy = subjectNamingStrategy;
+  }
+
+  @Override
+  public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(
+      TopicName topic, SchemaVersion schemaVersion) {
+    String version = Integer.toString(schemaVersion.value());
+    String subject = subjectNamingStrategy.apply(topic);
+    Response response = getRawSchemaWithMetadataResponse(subject, version);
+    return extractRawSchemaWithMetadata(subject, version, response);
+  }
+
+  @Override
+  public Optional<RawSchemaWithMetadata> getRawSchemaWithMetadata(
+      TopicName topic, SchemaId schemaId) {
+    String subject = subjectNamingStrategy.apply(topic);
+    Optional<RawSchema> schema = getRawSchema(subject, schemaId);
+
+    return schema
+        .map(sc -> getRawSchemaWithMetadataResponse(subject, sc))
+        .map(response -> extractRawSchemaWithMetadata(subject, schemaId, response))
+        .map(Optional::get);
+  }
+
+  @Override
+  public Optional<RawSchemaWithMetadata> getLatestRawSchemaWithMetadata(TopicName topic) {
+    final String version = "latest";
+    String subject = subjectNamingStrategy.apply(topic);
+    Response response = getRawSchemaWithMetadataResponse(subject, version);
+    return extractRawSchemaWithMetadata(subject, version, response);
+  }
+
+  private Response getRawSchemaWithMetadataResponse(String subject, String version) {
+    return schemaRepositoryInstanceResolver
+        .resolve(subject)
+        .path("subjects")
+        .path(subject)
+        .path("versions")
+        .path(version)
+        .request()
+        .get();
+  }
+
+  private Response getRawSchemaWithMetadataResponse(String subject, RawSchema schema) {
+    return schemaRepositoryInstanceResolver
+        .resolve(subject)
+        .path("subjects")
+        .path(subject)
+        .request()
+        .accept(MediaType.APPLICATION_JSON_TYPE)
+        .post(
+            Entity.entity(
+                SchemaRegistryRequestResponse.fromRawSchema(schema), SCHEMA_REPO_CONTENT_TYPE));
+  }
+
+  public Optional<RawSchema> getRawSchema(String subject, SchemaId schemaId) {
+    String idString = Integer.toString(schemaId.value());
+
+    Response response =
+        schemaRepositoryInstanceResolver
+            .resolve(subject)
+            .path("schemas")
+            .path("ids")
+            .path(idString)
+            .request()
+            .get();
+
+    return extractSchema(response, subject, schemaId);
+  }
+
+  private Optional<RawSchema> extractSchema(Response response, String subject, SchemaId schemaId) {
+    switch (response.getStatusInfo().getFamily()) {
+      case SUCCESSFUL:
+        logger.info("Found schema for subject {} and id {}", subject, schemaId.value());
+        SchemaRegistryRequestResponse schemaRegistryResponse =
+            response.readEntity(SchemaRegistryRequestResponse.class);
+        return Optional.of(RawSchema.valueOf(schemaRegistryResponse.getSchema()));
+      case CLIENT_ERROR:
+        logger.error(
+            "Could not find schema for subject {} and id {}, reason: {}",
+            subject,
+            schemaId.value(),
+            response.getStatus());
+        return Optional.empty();
+      case SERVER_ERROR:
+      default:
+        logger.error(
+            "Could not find schema for subject {} and id {}, reason: {}",
+            subject,
+            schemaId.value(),
+            response.getStatus());
+        throw new InternalSchemaRepositoryException(subject, response);
     }
-
-    public Optional<RawSchema> getRawSchema(String subject, SchemaId schemaId) {
-        String idString = Integer.toString(schemaId.value());
-
-        Response response = schemaRepositoryInstanceResolver.resolve(subject)
-                .path("schemas")
-                .path("ids")
-                .path(idString)
-                .request()
-                .get();
-
-        return extractSchema(response, subject, schemaId);
-    }
-
-    private Optional<RawSchema> extractSchema(Response response, String subject, SchemaId schemaId) {
-        switch (response.getStatusInfo().getFamily()) {
-            case SUCCESSFUL:
-                logger.info("Found schema for subject {} and id {}", subject, schemaId.value());
-                SchemaRegistryRequestResponse schemaRegistryResponse = response.readEntity(SchemaRegistryRequestResponse.class);
-                return Optional.of(RawSchema.valueOf(schemaRegistryResponse.getSchema()));
-            case CLIENT_ERROR:
-                logger.error("Could not find schema for subject {} and id {}, reason: {}", subject, schemaId.value(), response.getStatus());
-                return Optional.empty();
-            case SERVER_ERROR:
-            default:
-                logger.error("Could not find schema for subject {} and id {}, reason: {}", subject, schemaId.value(), response.getStatus());
-                throw new InternalSchemaRepositoryException(subject, response);
-        }
-    }
-
-    private Optional<RawSchemaWithMetadata> extractRawSchemaWithMetadata(String subject, String version, Response response) {
-        switch (response.getStatusInfo().getFamily()) {
-            case SUCCESSFUL:
-                logger.info("Found schema metadata for subject {} at version {}", subject, version);
-                SchemaRegistryResponse schemaRegistryResponse = response.readEntity(SchemaRegistryResponse.class);
-                return Optional.of(schemaRegistryResponse.toRawSchemaWithMetadata());
-            case CLIENT_ERROR:
-                logger.error("Could not find schema metadata for subject {} at version {}, reason: {}",
-                        subject,
-                        version,
-                        response.getStatus());
-                return Optional.empty();
-            case SERVER_ERROR:
-            default:
-                logger.error("Could not find schema metadata for subject {} at version {}, reason: {}",
-                        subject,
-                        version,
-                        response.getStatus());
-                throw new InternalSchemaRepositoryException(subject, response);
-        }
-    }
-
-    private Optional<RawSchemaWithMetadata> extractRawSchemaWithMetadata(String subject, SchemaId schemaId, Response response) {
-        Integer id = schemaId.value();
-        switch (response.getStatusInfo().getFamily()) {
-            case SUCCESSFUL:
-                logger.info("Found schema metadata for subject {} and id {}", subject, id);
-                SchemaRegistryResponse schemaRegistryResponse = response.readEntity(SchemaRegistryResponse.class);
-                return Optional.of(schemaRegistryResponse.toRawSchemaWithMetadata());
-            case CLIENT_ERROR:
-                logger.error("Could not find schema metadata for subject {} and id {}, reason: {}", subject, id, response.getStatus());
-                return Optional.empty();
-            case SERVER_ERROR:
-            default:
-                logger.error("Could not find schema metadata for subject {} and id {}, reason: {}", subject, id, response.getStatus());
-                throw new InternalSchemaRepositoryException(subject, response);
-        }
-    }
-
-    @Override
-    public List<SchemaVersion> getVersions(TopicName topic) {
-        String subject = subjectNamingStrategy.apply(topic);
-        Response response = schemaRepositoryInstanceResolver.resolve(subject)
-                .path("subjects")
-                .path(subject)
-                .path("versions")
-                .request()
-                .get();
-        return extractSchemaVersions(subject, response);
-    }
-
-    private List<SchemaVersion> extractSchemaVersions(String subject, Response response) {
-        switch (response.getStatusInfo().getFamily()) {
-            case SUCCESSFUL:
-                return Arrays.stream(response.readEntity(Integer[].class))
-                        .sorted(Comparator.reverseOrder())
-                        .map(SchemaVersion::valueOf)
-                        .collect(Collectors.toList());
-            case CLIENT_ERROR:
-                logger.error("Could not find schema versions for subject {}, reason: {} {}", subject, response.getStatus(),
-                        response.readEntity(String.class));
-                return Collections.emptyList();
-            case SERVER_ERROR:
-            default:
-                throw new InternalSchemaRepositoryException(subject, response);
-        }
-    }
-
-    @Override
-    public void registerSchema(TopicName topic, RawSchema rawSchema) {
-        String subject = subjectNamingStrategy.apply(topic);
-        Response response = schemaRepositoryInstanceResolver.resolve(subject)
-                .path("subjects")
-                .path(subject)
-                .path("versions")
-                .request()
-                .accept(MediaType.APPLICATION_JSON_TYPE)
-                .post(Entity.entity(SchemaRegistryRequestResponse.fromRawSchema(rawSchema), SCHEMA_REPO_CONTENT_TYPE));
-        checkSchemaRegistration(subject, response);
+  }
+
+  private Optional<RawSchemaWithMetadata> extractRawSchemaWithMetadata(
+      String subject, String version, Response response) {
+    switch (response.getStatusInfo().getFamily()) {
+      case SUCCESSFUL:
+        logger.info("Found schema metadata for subject {} at version {}", subject, version);
+        SchemaRegistryResponse schemaRegistryResponse =
+            response.readEntity(SchemaRegistryResponse.class);
+        return Optional.of(schemaRegistryResponse.toRawSchemaWithMetadata());
+      case CLIENT_ERROR:
+        logger.error(
+            "Could not find schema metadata for subject {} at version {}, reason: {}",
+            subject,
+            version,
+            response.getStatus());
+        return Optional.empty();
+      case SERVER_ERROR:
+      default:
+        logger.error(
+            "Could not find schema metadata for subject {} at version {}, reason: {}",
+            subject,
+            version,
+            response.getStatus());
+        throw new InternalSchemaRepositoryException(subject, response);
     }
-
-    private void checkSchemaRegistration(String subject, Response response) {
-        switch (response.getStatusInfo().getFamily()) {
-            case SUCCESSFUL:
-                logger.info("Successful write to schema registry for subject {}", subject);
-                break;
-            case CLIENT_ERROR:
-                throw new BadSchemaRequestException(subject, response);
-            case SERVER_ERROR:
-            default:
-                throw new InternalSchemaRepositoryException(subject, response);
-        }
+  }
+
+  private Optional<RawSchemaWithMetadata> extractRawSchemaWithMetadata(
+      String subject, SchemaId schemaId, Response response) {
+    Integer id = schemaId.value();
+    switch (response.getStatusInfo().getFamily()) {
+      case SUCCESSFUL:
+        logger.info("Found schema metadata for subject {} and id {}", subject, id);
+        SchemaRegistryResponse schemaRegistryResponse =
+            response.readEntity(SchemaRegistryResponse.class);
+        return Optional.of(schemaRegistryResponse.toRawSchemaWithMetadata());
+      case CLIENT_ERROR:
+        logger.error(
+            "Could not find schema metadata for subject {} and id {}, reason: {}",
+            subject,
+            id,
+            response.getStatus());
+        return Optional.empty();
+      case SERVER_ERROR:
+      default:
+        logger.error(
+            "Could not find schema metadata for subject {} and id {}, reason: {}",
+            subject,
+            id,
+            response.getStatus());
+        throw new InternalSchemaRepositoryException(subject, response);
     }
-
-    @Override
-    public void deleteAllSchemaVersions(TopicName topic) {
-        String subject = subjectNamingStrategy.apply(topic);
-        Response response = schemaRepositoryInstanceResolver.resolve(subject)
-                .path("subjects")
-                .path(subject)
-                .path(deleteSchemaPathSuffix)
-                .request()
-                .delete();
-        checkSchemaRemoval(subject, response);
+  }
+
+  @Override
+  public List<SchemaVersion> getVersions(TopicName topic) {
+    String subject = subjectNamingStrategy.apply(topic);
+    Response response =
+        schemaRepositoryInstanceResolver
+            .resolve(subject)
+            .path("subjects")
+            .path(subject)
+            .path("versions")
+            .request()
+            .get();
+    return extractSchemaVersions(subject, response);
+  }
+
+  private List<SchemaVersion> extractSchemaVersions(String subject, Response response) {
+    switch (response.getStatusInfo().getFamily()) {
+      case SUCCESSFUL:
+        return Arrays.stream(response.readEntity(Integer[].class))
+            .sorted(Comparator.reverseOrder())
+            .map(SchemaVersion::valueOf)
+            .collect(Collectors.toList());
+      case CLIENT_ERROR:
+        logger.error(
+            "Could not find schema versions for subject {}, reason: {} {}",
+            subject,
+            response.getStatus(),
+            response.readEntity(String.class));
+        return Collections.emptyList();
+      case SERVER_ERROR:
+      default:
+        throw new InternalSchemaRepositoryException(subject, response);
     }
-
-    private void checkSchemaRemoval(String subject, Response response) {
-        switch (response.getStatusInfo().getFamily()) {
-            case SUCCESSFUL:
-                logger.info("Successful removed schema subject {}", subject);
-                break;
-            case CLIENT_ERROR:
-                throw new BadSchemaRequestException(subject, response);
-            case SERVER_ERROR:
-            default:
-                int statusCode = response.getStatus();
-                String responseBody = response.readEntity(String.class);
-                logger.warn("Could not remove schema of subject {}. Reason: {} {}", subject, statusCode, responseBody);
-                throw new InternalSchemaRepositoryException(subject, statusCode, responseBody);
-        }
+  }
+
+  @Override
+  public void registerSchema(TopicName topic, RawSchema rawSchema) {
+    String subject = subjectNamingStrategy.apply(topic);
+    Response response =
+        schemaRepositoryInstanceResolver
+            .resolve(subject)
+            .path("subjects")
+            .path(subject)
+            .path("versions")
+            .request()
+            .accept(MediaType.APPLICATION_JSON_TYPE)
+            .post(
+                Entity.entity(
+                    SchemaRegistryRequestResponse.fromRawSchema(rawSchema),
+                    SCHEMA_REPO_CONTENT_TYPE));
+    checkSchemaRegistration(subject, response);
+  }
+
+  private void checkSchemaRegistration(String subject, Response response) {
+    switch (response.getStatusInfo().getFamily()) {
+      case SUCCESSFUL:
+        logger.info("Successful write to schema registry for subject {}", subject);
+        break;
+      case CLIENT_ERROR:
+        throw new BadSchemaRequestException(subject, response);
+      case SERVER_ERROR:
+      default:
+        throw new InternalSchemaRepositoryException(subject, response);
     }
-
-    @Override
-    public void validateSchema(TopicName topic, RawSchema schema) {
-        String subject = subjectNamingStrategy.apply(topic);
-        checkCompatibility(subject, schema);
-        if (validationEndpointEnabled) {
-            checkValidation(subject, schema);
-        }
+  }
+
+  @Override
+  public void deleteAllSchemaVersions(TopicName topic) {
+    String subject = subjectNamingStrategy.apply(topic);
+    Response response =
+        schemaRepositoryInstanceResolver
+            .resolve(subject)
+            .path("subjects")
+            .path(subject)
+            .path(deleteSchemaPathSuffix)
+            .request()
+            .delete();
+    checkSchemaRemoval(subject, response);
+  }
+
+  private void checkSchemaRemoval(String subject, Response response) {
+    switch (response.getStatusInfo().getFamily()) {
+      case SUCCESSFUL:
+        logger.info("Successful removed schema subject {}", subject);
+        break;
+      case CLIENT_ERROR:
+        throw new BadSchemaRequestException(subject, response);
+      case SERVER_ERROR:
+      default:
+        int statusCode = response.getStatus();
+        String responseBody = response.readEntity(String.class);
+        logger.warn(
+            "Could not remove schema of subject {}. Reason: {} {}",
+            subject,
+            statusCode,
+            responseBody);
+        throw new InternalSchemaRepositoryException(subject, statusCode, responseBody);
     }
-
-    private void checkCompatibility(String subject, RawSchema schema) {
-        Response response = schemaRepositoryInstanceResolver.resolve(subject)
-                .path("compatibility")
-                .path("subjects")
-                .path(subject)
-                .path("versions")
-                .path("latest")
-                .request()
-                .accept(MediaType.APPLICATION_JSON_TYPE)
-                .post(Entity.entity(SchemaRegistryRequestResponse.fromRawSchema(schema), SCHEMA_REPO_CONTENT_TYPE));
-        checkSchemaCompatibilityResponse(subject, response);
+  }
+
+  @Override
+  public void validateSchema(TopicName topic, RawSchema schema) {
+    String subject = subjectNamingStrategy.apply(topic);
+    checkCompatibility(subject, schema);
+    if (validationEndpointEnabled) {
+      checkValidation(subject, schema);
     }
-
-    private void checkValidation(String subject, RawSchema schema) {
-        Response response = schemaRepositoryInstanceResolver.resolve(subject)
-                .path("subjects")
-                .path(subject)
-                .path("validation")
-                .request()
-                .accept(MediaType.APPLICATION_JSON_TYPE)
-                .post(Entity.entity(SchemaRegistryRequestResponse.fromRawSchema(schema), SCHEMA_REPO_CONTENT_TYPE));
-
-        checkValidationResponse(subject, response);
+  }
+
+  private void checkCompatibility(String subject, RawSchema schema) {
+    Response response =
+        schemaRepositoryInstanceResolver
+            .resolve(subject)
+            .path("compatibility")
+            .path("subjects")
+            .path(subject)
+            .path("versions")
+            .path("latest")
+            .request()
+            .accept(MediaType.APPLICATION_JSON_TYPE)
+            .post(
+                Entity.entity(
+                    SchemaRegistryRequestResponse.fromRawSchema(schema), SCHEMA_REPO_CONTENT_TYPE));
+    checkSchemaCompatibilityResponse(subject, response);
+  }
+
+  private void checkValidation(String subject, RawSchema schema) {
+    Response response =
+        schemaRepositoryInstanceResolver
+            .resolve(subject)
+            .path("subjects")
+            .path(subject)
+            .path("validation")
+            .request()
+            .accept(MediaType.APPLICATION_JSON_TYPE)
+            .post(
+                Entity.entity(
+                    SchemaRegistryRequestResponse.fromRawSchema(schema), SCHEMA_REPO_CONTENT_TYPE));
+
+    checkValidationResponse(subject, response);
+  }
+
+  private void checkValidationResponse(String subject, Response response) {
+    if (response.getStatusInfo().getFamily() == SUCCESSFUL) {
+      validateSuccessfulValidationResult(subject, response);
+    } else {
+      handleErrorResponse(subject, response);
     }
+  }
 
-    private void checkValidationResponse(String subject, Response response) {
-        if (response.getStatusInfo().getFamily() == SUCCESSFUL) {
-            validateSuccessfulValidationResult(subject, response);
-        } else {
-            handleErrorResponse(subject, response);
-        }
-    }
-
-    private void validateSuccessfulValidationResult(String subject, Response response) {
-        SchemaRegistryValidationResponse validationResponse = response.readEntity(SchemaRegistryValidationResponse.class);
+  private void validateSuccessfulValidationResult(String subject, Response response) {
+    SchemaRegistryValidationResponse validationResponse =
+        response.readEntity(SchemaRegistryValidationResponse.class);
 
-        if (!validationResponse.isValid()) {
-            throw new BadSchemaRequestException(subject, BAD_REQUEST.getStatusCode(),
-                    validationResponse.getErrorsMessage());
-        }
+    if (!validationResponse.isValid()) {
+      throw new BadSchemaRequestException(
+          subject, BAD_REQUEST.getStatusCode(), validationResponse.getErrorsMessage());
     }
+  }
 
-    private void checkSchemaCompatibilityResponse(String subject, Response response) {
-        if (response.getStatusInfo().getFamily() == SUCCESSFUL) {
-            validateSuccessfulCompatibilityResult(subject, response);
-        } else {
-            handleErrorResponse(subject, response);
-        }
+  private void checkSchemaCompatibilityResponse(String subject, Response response) {
+    if (response.getStatusInfo().getFamily() == SUCCESSFUL) {
+      validateSuccessfulCompatibilityResult(subject, response);
+    } else {
+      handleErrorResponse(subject, response);
     }
+  }
 
-    private void handleErrorResponse(String subject, Response response) {
-        switch (response.getStatusInfo().getFamily()) {
-            case CLIENT_ERROR:
-                if (response.getStatus() == 422) { // for other cases we assume the schema is valid
-                    throw new BadSchemaRequestException(subject, response);
-                }
-                break;
-            case SERVER_ERROR:
-            default:
-                int statusCode = response.getStatus();
-                String responseBody = response.readEntity(String.class);
-                logger.warn("Could not validate schema of subject {}. Reason: {} {}", subject, statusCode, responseBody);
-                throw new InternalSchemaRepositoryException(subject, statusCode, responseBody);
+  private void handleErrorResponse(String subject, Response response) {
+    switch (response.getStatusInfo().getFamily()) {
+      case CLIENT_ERROR:
+        if (response.getStatus() == 422) { // for other cases we assume the schema is valid
+          throw new BadSchemaRequestException(subject, response);
         }
+        break;
+      case SERVER_ERROR:
+      default:
+        int statusCode = response.getStatus();
+        String responseBody = response.readEntity(String.class);
+        logger.warn(
+            "Could not validate schema of subject {}. Reason: {} {}",
+            subject,
+            statusCode,
+            responseBody);
+        throw new InternalSchemaRepositoryException(subject, statusCode, responseBody);
     }
-
-    private void validateSuccessfulCompatibilityResult(String subject, Response response) {
-        String validationResultStr = response.readEntity(String.class);
-        SchemaRegistryCompatibilityResponse validationResponse =
-                toSchemaRegistryValidationResponse(subject, validationResultStr, response.getStatus());
-        if (!validationResponse.isCompatible()) {
-            throw new BadSchemaRequestException(subject, response.getStatus(), validationResultStr);
-        }
+  }
+
+  private void validateSuccessfulCompatibilityResult(String subject, Response response) {
+    String validationResultStr = response.readEntity(String.class);
+    SchemaRegistryCompatibilityResponse validationResponse =
+        toSchemaRegistryValidationResponse(subject, validationResultStr, response.getStatus());
+    if (!validationResponse.isCompatible()) {
+      throw new BadSchemaRequestException(subject, response.getStatus(), validationResultStr);
     }
-
-    private SchemaRegistryCompatibilityResponse toSchemaRegistryValidationResponse(String subject, String validationResultStr, int status) {
-        try {
-            return objectMapper.readValue(validationResultStr, SchemaRegistryCompatibilityResponse.class);
-        } catch (IOException e) {
-            logger.error("Could not parse schema validation response from schema registry", e);
-            throw new InternalSchemaRepositoryException(subject, status, validationResultStr);
-        }
+  }
+
+  private SchemaRegistryCompatibilityResponse toSchemaRegistryValidationResponse(
+      String subject, String validationResultStr, int status) {
+    try {
+      return objectMapper.readValue(validationResultStr, SchemaRegistryCompatibilityResponse.class);
+    } catch (IOException e) {
+      logger.error("Could not parse schema validation response from schema registry", e);
+      throw new InternalSchemaRepositoryException(subject, status, validationResultStr);
     }
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRequestResponse.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRequestResponse.java
index f7319ee17f..46422d808f 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRequestResponse.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRequestResponse.java
@@ -2,41 +2,40 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import pl.allegro.tech.hermes.api.RawSchema;
-
 import java.util.Objects;
+import pl.allegro.tech.hermes.api.RawSchema;
 
 class SchemaRegistryRequestResponse {
 
-    private final String schema;
+  private final String schema;
 
-    @JsonCreator
-    SchemaRegistryRequestResponse(@JsonProperty("schema") String schema) {
-        this.schema = schema;
-    }
+  @JsonCreator
+  SchemaRegistryRequestResponse(@JsonProperty("schema") String schema) {
+    this.schema = schema;
+  }
 
-    static SchemaRegistryRequestResponse fromRawSchema(RawSchema rawSchema) {
-        return new SchemaRegistryRequestResponse(rawSchema.value());
-    }
+  static SchemaRegistryRequestResponse fromRawSchema(RawSchema rawSchema) {
+    return new SchemaRegistryRequestResponse(rawSchema.value());
+  }
 
-    public String getSchema() {
-        return schema;
-    }
+  public String getSchema() {
+    return schema;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SchemaRegistryRequestResponse that = (SchemaRegistryRequestResponse) o;
-        return Objects.equals(schema, that.schema);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(schema);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SchemaRegistryRequestResponse that = (SchemaRegistryRequestResponse) o;
+    return Objects.equals(schema, that.schema);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(schema);
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryResponse.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryResponse.java
index bfc4133e1e..60f30535e3 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryResponse.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryResponse.java
@@ -3,72 +3,68 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
-import pl.allegro.tech.hermes.api.RawSchemaWithMetadata;
-
 import java.util.Objects;
+import pl.allegro.tech.hermes.api.RawSchemaWithMetadata;
 
 class SchemaRegistryResponse {
 
-    @NotNull
-    private final String subject;
+  @NotNull private final String subject;
 
-    @NotNull
-    private final Integer id;
+  @NotNull private final Integer id;
 
-    @NotNull
-    private final Integer version;
+  @NotNull private final Integer version;
 
-    @NotNull
-    private final String schema;
+  @NotNull private final String schema;
 
-    @JsonCreator
-    SchemaRegistryResponse(@JsonProperty("subject") String subject,
-                           @JsonProperty("id") Integer id,
-                           @JsonProperty("version") Integer version,
-                           @JsonProperty("schema") String schema) {
-        this.subject = subject;
-        this.version = version;
-        this.id = id;
-        this.schema = schema;
-    }
+  @JsonCreator
+  SchemaRegistryResponse(
+      @JsonProperty("subject") String subject,
+      @JsonProperty("id") Integer id,
+      @JsonProperty("version") Integer version,
+      @JsonProperty("schema") String schema) {
+    this.subject = subject;
+    this.version = version;
+    this.id = id;
+    this.schema = schema;
+  }
 
-    public String getSubject() {
-        return subject;
-    }
+  public String getSubject() {
+    return subject;
+  }
 
-    public Integer getVersion() {
-        return version;
-    }
+  public Integer getVersion() {
+    return version;
+  }
 
-    public Integer getId() {
-        return id;
-    }
+  public Integer getId() {
+    return id;
+  }
 
-    public String getSchema() {
-        return schema;
-    }
+  public String getSchema() {
+    return schema;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SchemaRegistryResponse that = (SchemaRegistryResponse) o;
-        return Objects.equals(subject, that.subject)
-                && Objects.equals(version, that.version)
-                && Objects.equals(id, that.id)
-                && Objects.equals(schema, that.schema);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(subject, version, id, schema);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    SchemaRegistryResponse that = (SchemaRegistryResponse) o;
+    return Objects.equals(subject, that.subject)
+        && Objects.equals(version, that.version)
+        && Objects.equals(id, that.id)
+        && Objects.equals(schema, that.schema);
+  }
 
-    RawSchemaWithMetadata toRawSchemaWithMetadata() {
-        return RawSchemaWithMetadata.of(schema, id, version);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(subject, version, id, schema);
+  }
+
+  RawSchemaWithMetadata toRawSchemaWithMetadata() {
+    return RawSchemaWithMetadata.of(schema, id, version);
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryValidationError.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryValidationError.java
index 946ca40a16..765f000f82 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryValidationError.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryValidationError.java
@@ -3,36 +3,35 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 class SchemaRegistryValidationError {
-    private final String message;
+  private final String message;
 
-    @JsonCreator
-    SchemaRegistryValidationError(@JsonProperty("message") String message) {
-        this.message = message;
-    }
+  @JsonCreator
+  SchemaRegistryValidationError(@JsonProperty("message") String message) {
+    this.message = message;
+  }
 
-    public String getMessage() {
-        return message;
-    }
+  public String getMessage() {
+    return message;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof SchemaRegistryValidationError)) {
-            return false;
-        }
-        SchemaRegistryValidationError that = (SchemaRegistryValidationError) o;
-        return Objects.equals(message, that.message);
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(message);
+    if (!(o instanceof SchemaRegistryValidationError)) {
+      return false;
     }
+    SchemaRegistryValidationError that = (SchemaRegistryValidationError) o;
+    return Objects.equals(message, that.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(message);
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryValidationResponse.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryValidationResponse.java
index 1fb6832a78..36a32d3b3d 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryValidationResponse.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryValidationResponse.java
@@ -3,30 +3,30 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
 class SchemaRegistryValidationResponse {
 
-    private final boolean valid;
-    private final List<SchemaRegistryValidationError> errors;
+  private final boolean valid;
+  private final List<SchemaRegistryValidationError> errors;
 
-    @JsonCreator
-    SchemaRegistryValidationResponse(@JsonProperty("is_valid") boolean valid,
-                                     @JsonProperty("errors") List<SchemaRegistryValidationError> errors) {
-        this.valid = valid;
-        this.errors = errors;
-    }
+  @JsonCreator
+  SchemaRegistryValidationResponse(
+      @JsonProperty("is_valid") boolean valid,
+      @JsonProperty("errors") List<SchemaRegistryValidationError> errors) {
+    this.valid = valid;
+    this.errors = errors;
+  }
 
-    public boolean isValid() {
-        return valid;
-    }
+  public boolean isValid() {
+    return valid;
+  }
 
-    @JsonIgnore
-    public String getErrorsMessage() {
-        return errors.stream()
-                .map(SchemaRegistryValidationError::getMessage)
-                .collect(Collectors.joining(". "));
-    }
+  @JsonIgnore
+  public String getErrorsMessage() {
+    return errors.stream()
+        .map(SchemaRegistryValidationError::getMessage)
+        .collect(Collectors.joining(". "));
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/DefaultSchemaRepositoryInstanceResolver.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/DefaultSchemaRepositoryInstanceResolver.java
index a3f9c31f9a..f823eaa055 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/DefaultSchemaRepositoryInstanceResolver.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/DefaultSchemaRepositoryInstanceResolver.java
@@ -2,19 +2,18 @@
 
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.WebTarget;
-
 import java.net.URI;
 
 public class DefaultSchemaRepositoryInstanceResolver implements SchemaRepositoryInstanceResolver {
 
-    private final WebTarget target;
+  private final WebTarget target;
 
-    public DefaultSchemaRepositoryInstanceResolver(Client client, URI schemaRegistryServerUri) {
-        this.target = client.target(schemaRegistryServerUri);
-    }
+  public DefaultSchemaRepositoryInstanceResolver(Client client, URI schemaRegistryServerUri) {
+    this.target = client.target(schemaRegistryServerUri);
+  }
 
-    @Override
-    public WebTarget resolve(String subject) {
-        return target;
-    }
+  @Override
+  public WebTarget resolve(String subject) {
+    return target;
+  }
 }
diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/SchemaRepositoryInstanceResolver.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/SchemaRepositoryInstanceResolver.java
index 10c00b13c9..56bd2e6d83 100644
--- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/SchemaRepositoryInstanceResolver.java
+++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/SchemaRepositoryInstanceResolver.java
@@ -4,5 +4,5 @@
 
 public interface SchemaRepositoryInstanceResolver {
 
-    WebTarget resolve(String subject);
+  WebTarget resolve(String subject);
 }
diff --git a/hermes-schema/src/test/resources/allure.properties b/hermes-schema/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-schema/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-test-helper/build.gradle b/hermes-test-helper/build.gradle
index 07354597c1..b24683e815 100644
--- a/hermes-test-helper/build.gradle
+++ b/hermes-test-helper/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: versions.jersey
     implementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: versions.jersey
     implementation group: 'org.glassfish.jersey.ext', name: 'jersey-proxy-client', version: versions.jersey
-    api group: 'commons-io', name: 'commons-io', version: '2.4'
+    api group: 'commons-io', name: 'commons-io', version: '2.16.1'
     api group: 'org.wiremock', name: 'wiremock-standalone', version: versions.wiremock
     api (group: 'org.apache.curator', name: 'curator-test', version: versions.curator) {
         exclude module: 'slf4j-log4j12'
@@ -24,16 +24,17 @@ dependencies {
         exclude module: 'slf4j-log4j12'
         exclude module: 'log4j'
     }
-    implementation group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.0'
-    implementation group: 'com.jayway.awaitility', name: 'awaitility', version: '1.6.1'
+    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.8.4'
+    implementation group: 'org.awaitility', name: 'awaitility-groovy', version: '4.2.1'
     implementation group: 'org.assertj', name: 'assertj-core', version: versions.assertj
-    api group: 'net.javacrumbs.json-unit', name: 'json-unit-fluent', version: '1.5.5'
-    implementation group: 'junit', name: 'junit', version: '4.11'
-    api group: 'org.testng', name: 'testng', version: '7.4.0'
-    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
-    implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.5.0'
+    api group: 'net.javacrumbs.json-unit', name: 'json-unit-fluent', version: '3.2.7'
+    implementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.2'
+    implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1'
+    implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.9.0'
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: versions.jackson
-
+    implementation group: 'org.springframework', name: 'spring-test', version: versions.spring_web
+    implementation group: 'org.springframework', name: 'spring-webflux', version: versions.spring_web
+    implementation group: 'org.awaitility', name: 'awaitility', version: '4.2.0'
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock
 
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/AvroUser.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/AvroUser.java
index 1d550f69e7..a2a9e45303 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/AvroUser.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/AvroUser.java
@@ -1,119 +1,121 @@
 package pl.allegro.tech.hermes.test.helper.avro;
 
+import static pl.allegro.tech.hermes.test.helper.avro.RecordToBytesConverter.recordToBytes;
+
 import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Optional;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
 import pl.allegro.tech.hermes.schema.CompiledSchema;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.Optional;
-
-import static pl.allegro.tech.hermes.test.helper.avro.RecordToBytesConverter.recordToBytes;
-
 public class AvroUser {
 
-    private static final String METADATA_FIELD = "__metadata";
-    private static final String NAME_FIELD = "name";
-    private static final String AGE_FIELD = "age";
-    private static final String FAVORITE_COLOR_FIELD = "favoriteColor";
-
-    private final CompiledSchema<Schema> schema;
-
-    private final GenericRecord record;
-
-    public AvroUser() {
-        this("defaultName", 0, "defaultColor");
-    }
-
-    public AvroUser(CompiledSchema<Schema> schema) {
-        this(schema, "defaultName", 0, "defaultColor");
-    }
-
-    public AvroUser(String name, int age, String favouriteColour) {
-        this(CompiledSchema.of(AvroUserSchemaLoader.load(), 1, 1), name, age, favouriteColour);
-    }
-
-    public AvroUser(CompiledSchema<Schema> schema, String name, int age, String favouriteColour) {
-        this.schema = schema;
-        this.record = create(name, age, favouriteColour);
-    }
-
-    public AvroUser(CompiledSchema<Schema> schema, byte[] bytes) throws IOException {
-        this.schema = schema;
-        this.record = RecordToBytesConverter.bytesToRecord(bytes, schema.getSchema());
-    }
-
-    public Schema getSchema() {
-        return schema.getSchema();
-    }
-
-    public String getSchemaAsString() {
-        return schema.getSchema().toString();
-    }
-
-    public String getName() {
-        return record.get(NAME_FIELD).toString();
-    }
-
-    public int getAge() {
-        return Integer.valueOf(record.get(AGE_FIELD).toString());
-    }
-
-    public String getFavoriteColor() {
-        return record.get(FAVORITE_COLOR_FIELD).toString();
-    }
-
-    public byte[] asBytes() {
-        try {
-            return recordToBytes(record, schema.getSchema());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public String asJson() {
-        return asTestMessage().toString();
-    }
-
-    public String asAvroEncodedJson() {
-        return asAvroEncodedTestMessage().toString();
-    }
-
-    public TestMessage asTestMessage() {
-        return TestMessage.of(NAME_FIELD, getName()).append(AGE_FIELD, getAge()).append(FAVORITE_COLOR_FIELD, getFavoriteColor());
-    }
-
-    public TestMessage asAvroEncodedTestMessage() {
-        Object favoriteColorType = Optional.ofNullable(getFavoriteColor())
-                .map(color -> (Object) ImmutableMap.of("string", color))
-                .orElse("null");
-        return TestMessage.of(METADATA_FIELD, null)
-                .append(NAME_FIELD, getName())
-                .append(AGE_FIELD, getAge())
-                .append(FAVORITE_COLOR_FIELD, favoriteColorType);
-    }
-
-    public static AvroUser create(CompiledSchema<Schema> schema, byte[] bytes) {
-        try {
-            return new AvroUser(schema, bytes);
-        } catch (IOException ex) {
-            throw new UncheckedIOException(ex);
-        }
-    }
-
-    private GenericRecord create(String name, int age, String favoriteColor) {
-        GenericRecord user = new GenericData.Record(schema.getSchema());
-        user.put(NAME_FIELD, name);
-        user.put(AGE_FIELD, age);
-        user.put(FAVORITE_COLOR_FIELD, favoriteColor);
-
-        return user;
-    }
-
-    public CompiledSchema<Schema> getCompiledSchema() {
-        return schema;
-    }
+  private static final String METADATA_FIELD = "__metadata";
+  private static final String NAME_FIELD = "name";
+  private static final String AGE_FIELD = "age";
+  private static final String FAVORITE_COLOR_FIELD = "favoriteColor";
+
+  private final CompiledSchema<Schema> schema;
+
+  private final GenericRecord record;
+
+  public AvroUser() {
+    this("defaultName", 0, "defaultColor");
+  }
+
+  public AvroUser(CompiledSchema<Schema> schema) {
+    this(schema, "defaultName", 0, "defaultColor");
+  }
+
+  public AvroUser(String name, int age, String favouriteColour) {
+    this(CompiledSchema.of(AvroUserSchemaLoader.load(), 1, 1), name, age, favouriteColour);
+  }
+
+  public AvroUser(CompiledSchema<Schema> schema, String name, int age, String favouriteColour) {
+    this.schema = schema;
+    this.record = create(name, age, favouriteColour);
+  }
+
+  public AvroUser(CompiledSchema<Schema> schema, byte[] bytes) throws IOException {
+    this.schema = schema;
+    this.record = RecordToBytesConverter.bytesToRecord(bytes, schema.getSchema());
+  }
+
+  public Schema getSchema() {
+    return schema.getSchema();
+  }
+
+  public String getSchemaAsString() {
+    return schema.getSchema().toString();
+  }
+
+  public String getName() {
+    return record.get(NAME_FIELD).toString();
+  }
+
+  public int getAge() {
+    return Integer.parseInt(record.get(AGE_FIELD).toString());
+  }
+
+  public String getFavoriteColor() {
+    return record.get(FAVORITE_COLOR_FIELD).toString();
+  }
+
+  public byte[] asBytes() {
+    try {
+      return recordToBytes(record, schema.getSchema());
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public String asJson() {
+    return asTestMessage().toString();
+  }
+
+  public String asAvroEncodedJson() {
+    return asAvroEncodedTestMessage().toString();
+  }
+
+  public TestMessage asTestMessage() {
+    return TestMessage.of(NAME_FIELD, getName())
+        .append(AGE_FIELD, getAge())
+        .append(FAVORITE_COLOR_FIELD, getFavoriteColor());
+  }
+
+  public TestMessage asAvroEncodedTestMessage() {
+    Object favoriteColorType =
+        Optional.ofNullable(getFavoriteColor())
+            .map(color -> (Object) ImmutableMap.of("string", color))
+            .orElse("null");
+    return TestMessage.of(METADATA_FIELD, null)
+        .append(NAME_FIELD, getName())
+        .append(AGE_FIELD, getAge())
+        .append(FAVORITE_COLOR_FIELD, favoriteColorType);
+  }
+
+  public static AvroUser create(CompiledSchema<Schema> schema, byte[] bytes) {
+    try {
+      return new AvroUser(schema, bytes);
+    } catch (IOException ex) {
+      throw new UncheckedIOException(ex);
+    }
+  }
+
+  private GenericRecord create(String name, int age, String favoriteColor) {
+    GenericRecord user = new GenericData.Record(schema.getSchema());
+    user.put(NAME_FIELD, name);
+    user.put(AGE_FIELD, age);
+    user.put(FAVORITE_COLOR_FIELD, favoriteColor);
+
+    return user;
+  }
+
+  public CompiledSchema<Schema> getCompiledSchema() {
+    return schema;
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/AvroUserSchemaLoader.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/AvroUserSchemaLoader.java
index d6b43891c3..bef52bd5bb 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/AvroUserSchemaLoader.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/AvroUserSchemaLoader.java
@@ -1,22 +1,21 @@
 package pl.allegro.tech.hermes.test.helper.avro;
 
-import org.apache.avro.Schema;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import org.apache.avro.Schema;
 
 public class AvroUserSchemaLoader {
 
-    public static Schema load() {
-        return load("/schema/user.avsc");
-    }
+  public static Schema load() {
+    return load("/schema/user.avsc");
+  }
 
-    public static Schema load(String schemaResourceName) {
-        try {
-            return new Schema.Parser().parse(AvroUserSchemaLoader.class.getResourceAsStream(schemaResourceName));
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
+  public static Schema load(String schemaResourceName) {
+    try {
+      return new Schema.Parser()
+          .parse(AvroUserSchemaLoader.class.getResourceAsStream(schemaResourceName));
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
     }
-
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/RecordToBytesConverter.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/RecordToBytesConverter.java
index 6b346759d3..3e9e221f51 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/RecordToBytesConverter.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/avro/RecordToBytesConverter.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.test.helper.avro;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericDatumWriter;
@@ -10,26 +12,22 @@
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.EncoderFactory;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
 public interface RecordToBytesConverter {
 
-    static byte[] recordToBytes(GenericRecord record, Schema schema) throws IOException {
-        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(out, null);
-            DatumWriter<GenericRecord> writer = new GenericDatumWriter<>(schema);
+  static byte[] recordToBytes(GenericRecord record, Schema schema) throws IOException {
+    try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+      BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(out, null);
+      DatumWriter<GenericRecord> writer = new GenericDatumWriter<>(schema);
 
-            writer.write(record, encoder);
-            encoder.flush();
-            return out.toByteArray();
-        }
+      writer.write(record, encoder);
+      encoder.flush();
+      return out.toByteArray();
     }
+  }
 
-    static GenericRecord bytesToRecord(byte [] data, Schema schema) throws IOException {
-        GenericDatumReader<GenericRecord> reader = new GenericDatumReader<>(schema);
-        BinaryDecoder binaryDecoder = DecoderFactory.get().binaryDecoder(data, null);
-        GenericRecord record = reader.read(null, binaryDecoder);
-        return record;
-    }
+  static GenericRecord bytesToRecord(byte[] data, Schema schema) throws IOException {
+    GenericDatumReader<GenericRecord> reader = new GenericDatumReader<>(schema);
+    BinaryDecoder binaryDecoder = DecoderFactory.get().binaryDecoder(data, null);
+    return reader.read(null, binaryDecoder);
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/GroupBuilder.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/GroupBuilder.java
index 7f7fc24a99..39228970fa 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/GroupBuilder.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/GroupBuilder.java
@@ -1,28 +1,37 @@
 package pl.allegro.tech.hermes.test.helper.builder;
 
-import pl.allegro.tech.hermes.api.Group;
-
 import java.util.concurrent.atomic.AtomicLong;
+import pl.allegro.tech.hermes.api.Group;
 
 public class GroupBuilder {
 
-    private static final AtomicLong sequence = new AtomicLong();
+  private static final AtomicLong sequence = new AtomicLong();
+
+  private final String groupName;
+
+  private GroupBuilder(String name) {
+    this.groupName = name;
+  }
 
-    private final String groupName;
+  public static GroupBuilder group(String name) {
+    return new GroupBuilder(name);
+  }
 
-    private GroupBuilder(String name) {
-        this.groupName = name;
-    }
+  public Group build() {
+    return new Group(groupName);
+  }
 
-    public static GroupBuilder group(String name) {
-        return new GroupBuilder(name);
-    }
+  public static GroupBuilder groupWithRandomName() {
+    return groupWithRandomNameEndedWith("");
+  }
 
-    public Group build() {
-        return new Group(groupName);
-    }
+  public static GroupBuilder groupWithRandomNameEndedWith(String suffix) {
+    return group(
+        GroupBuilder.class.getSimpleName() + "Group" + sequence.incrementAndGet() + suffix);
+  }
 
-    public static GroupBuilder groupWithRandomName() {
-        return group(GroupBuilder.class.getSimpleName() + "Group" + sequence.incrementAndGet());
-    }
+  public static GroupBuilder groupWithRandomNameContaining(String string) {
+    return group(
+        GroupBuilder.class.getSimpleName() + "Group" + string + sequence.incrementAndGet());
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/OAuthProviderBuilder.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/OAuthProviderBuilder.java
index 279889c3e2..7e51a805a6 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/OAuthProviderBuilder.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/OAuthProviderBuilder.java
@@ -4,67 +4,74 @@
 
 public class OAuthProviderBuilder {
 
-    private String name;
+  private final String name;
 
-    private String tokenEndpoint = "http://example.com/token";
+  private String tokenEndpoint = "http://example.com/token";
 
-    private String clientId = "testClient123";
+  private String clientId = "testClient123";
 
-    private String clientSecret = "testPassword123";
+  private String clientSecret = "testPassword123";
 
-    private int tokenRequestInitialDelay = 1;
+  private int tokenRequestInitialDelay = 1;
 
-    private int tokenRequestMaxDelay = 8;
+  private int tokenRequestMaxDelay = 8;
 
-    private int requestTimeout = 500;
+  private int requestTimeout = 500;
 
-    private int socketTimeout = 0;
+  private int socketTimeout = 0;
 
-    public OAuthProviderBuilder(String name) {
-        this.name = name;
-    }
+  public OAuthProviderBuilder(String name) {
+    this.name = name;
+  }
 
-    public static OAuthProviderBuilder oAuthProvider(String name) {
-        return new OAuthProviderBuilder(name);
-    }
+  public static OAuthProviderBuilder oAuthProvider(String name) {
+    return new OAuthProviderBuilder(name);
+  }
 
-    public OAuthProvider build() {
-        return new OAuthProvider(name, tokenEndpoint, clientId, clientSecret, tokenRequestInitialDelay,
-                tokenRequestMaxDelay, requestTimeout, socketTimeout);
-    }
+  public OAuthProvider build() {
+    return new OAuthProvider(
+        name,
+        tokenEndpoint,
+        clientId,
+        clientSecret,
+        tokenRequestInitialDelay,
+        tokenRequestMaxDelay,
+        requestTimeout,
+        socketTimeout);
+  }
 
-    public OAuthProviderBuilder withTokenEndpoint(String tokenEndpoint) {
-        this.tokenEndpoint = tokenEndpoint;
-        return this;
-    }
+  public OAuthProviderBuilder withTokenEndpoint(String tokenEndpoint) {
+    this.tokenEndpoint = tokenEndpoint;
+    return this;
+  }
 
-    public OAuthProviderBuilder withClientId(String clientId) {
-        this.clientId = clientId;
-        return this;
-    }
+  public OAuthProviderBuilder withClientId(String clientId) {
+    this.clientId = clientId;
+    return this;
+  }
 
-    public OAuthProviderBuilder withClientSecret(String clientSecret) {
-        this.clientSecret = clientSecret;
-        return this;
-    }
+  public OAuthProviderBuilder withClientSecret(String clientSecret) {
+    this.clientSecret = clientSecret;
+    return this;
+  }
 
-    public OAuthProviderBuilder withTokenRequestInitialDelay(int tokenRequestInitialDelay) {
-        this.tokenRequestInitialDelay = tokenRequestInitialDelay;
-        return this;
-    }
+  public OAuthProviderBuilder withTokenRequestInitialDelay(int tokenRequestInitialDelay) {
+    this.tokenRequestInitialDelay = tokenRequestInitialDelay;
+    return this;
+  }
 
-    public OAuthProviderBuilder withTokenRequestMaxDelay(int tokenRequestMaxDelay) {
-        this.tokenRequestMaxDelay = tokenRequestMaxDelay;
-        return this;
-    }
+  public OAuthProviderBuilder withTokenRequestMaxDelay(int tokenRequestMaxDelay) {
+    this.tokenRequestMaxDelay = tokenRequestMaxDelay;
+    return this;
+  }
 
-    public OAuthProviderBuilder withRequestTimeout(int requestTimeout) {
-        this.requestTimeout = requestTimeout;
-        return this;
-    }
+  public OAuthProviderBuilder withRequestTimeout(int requestTimeout) {
+    this.requestTimeout = requestTimeout;
+    return this;
+  }
 
-    public OAuthProviderBuilder withSocketTimeout(int socketTimeout) {
-        this.socketTimeout = socketTimeout;
-        return this;
-    }
+  public OAuthProviderBuilder withSocketTimeout(int socketTimeout) {
+    this.socketTimeout = socketTimeout;
+    return this;
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/SubscriptionBuilder.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/SubscriptionBuilder.java
index 8a8536982d..0408f25601 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/SubscriptionBuilder.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/SubscriptionBuilder.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.test.helper.builder;
 
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 import pl.allegro.tech.hermes.api.BatchSubscriptionPolicy;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.DeliveryType;
@@ -18,236 +23,294 @@
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.api.TrackingMode;
 
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-
 public class SubscriptionBuilder {
 
-    private static final AtomicLong sequence = new AtomicLong();
-
-    private final TopicName topicName;
-
-    private final String name;
-
-    private Subscription.State state = Subscription.State.PENDING;
-
-    private EndpointAddress endpoint = EndpointAddress.of("http://localhost:12345");
+  private static final AtomicLong sequence = new AtomicLong();
 
-    private ContentType contentType = ContentType.JSON;
+  private final TopicName topicName;
 
-    private String description = "description";
+  private final String name;
 
-    private SubscriptionPolicy serialSubscriptionPolicy = new SubscriptionPolicy(100, 10, 1000, 1000, false, 100, null, 0, 1, 600);
+  private Subscription.State state = Subscription.State.PENDING;
 
-    private BatchSubscriptionPolicy batchSubscriptionPolicy;
+  private EndpointAddress endpoint = EndpointAddress.of("http://localhost:12345");
 
-    private boolean trackingEnabled = false;
+  private ContentType contentType = ContentType.JSON;
 
-    private TrackingMode trackingMode = TrackingMode.TRACKING_OFF;
+  private String description = "description";
 
-    private boolean http2Enabled = false;
+  private SubscriptionPolicy serialSubscriptionPolicy =
+      new SubscriptionPolicy(100, 10, 1000, 1000, false, 100, null, 0, 1, 600);
 
-    private OwnerId owner = new OwnerId("Plaintext", "some team");
+  private BatchSubscriptionPolicy batchSubscriptionPolicy;
 
-    private MonitoringDetails monitoringDetails = MonitoringDetails.EMPTY;
+  private boolean trackingEnabled = false;
 
-    private DeliveryType deliveryType = DeliveryType.SERIAL;
+  private TrackingMode trackingMode = TrackingMode.TRACKING_OFF;
 
-    private List<MessageFilterSpecification> filters = new ArrayList<>();
+  private boolean http2Enabled = false;
 
-    private SubscriptionMode mode = SubscriptionMode.ANYCAST;
+  private boolean profilingEnabled = false;
 
-    private List<Header> headers = new ArrayList<>();
+  private long profilingThresholdMs = 0;
 
-    private EndpointAddressResolverMetadata metadata = EndpointAddressResolverMetadata.empty();
-    private SubscriptionOAuthPolicy oAuthPolicy;
+  private OwnerId owner = new OwnerId("Plaintext", "some team");
 
-    private boolean attachingIdentityHeadersEnabled = false;
+  private MonitoringDetails monitoringDetails = MonitoringDetails.EMPTY;
 
-    private boolean autoDeleteWithTopicEnabled = false;
+  private DeliveryType deliveryType = DeliveryType.SERIAL;
 
-    private SubscriptionBuilder(TopicName topicName, String subscriptionName, EndpointAddress endpoint) {
-        this.topicName = topicName;
-        this.name = subscriptionName;
-        this.endpoint = endpoint;
-    }
+  private final List<MessageFilterSpecification> filters = new ArrayList<>();
 
-    private SubscriptionBuilder(TopicName topicName, String subscriptionName) {
-        this.topicName = topicName;
-        this.name = subscriptionName;
-    }
+  private SubscriptionMode mode = SubscriptionMode.ANYCAST;
 
-    public static SubscriptionBuilder subscriptionWithRandomName(TopicName topicName, String endpoint) {
-        return new SubscriptionBuilder(topicName, "subscription" + sequence.incrementAndGet(), EndpointAddress.of(endpoint));
-    }
+  private final List<Header> headers = new ArrayList<>();
 
-    public static SubscriptionBuilder subscriptionWithRandomName(TopicName topicName) {
-        return new SubscriptionBuilder(topicName, UUID.randomUUID().toString());
-    }
+  private EndpointAddressResolverMetadata metadata = EndpointAddressResolverMetadata.empty();
+  private SubscriptionOAuthPolicy oAuthPolicy;
 
-    public static SubscriptionBuilder subscription(SubscriptionName subscriptionName) {
-        return new SubscriptionBuilder(subscriptionName.getTopicName(), subscriptionName.getName());
-    }
+  private boolean attachingIdentityHeadersEnabled = false;
 
-    public static SubscriptionBuilder subscription(TopicName topicName, String subscriptionName) {
-        return new SubscriptionBuilder(topicName, subscriptionName);
-    }
-
-    public static SubscriptionBuilder subscription(Topic topic, String subscriptionName) {
-        return new SubscriptionBuilder(topic.getName(), subscriptionName);
-    }
-
-    public static SubscriptionBuilder subscription(TopicName topicName, String subscriptionName, EndpointAddress endpoint) {
-        return new SubscriptionBuilder(topicName, subscriptionName, endpoint);
-    }
-
-    public static SubscriptionBuilder subscription(String topicQualifiedName, String subscriptionName) {
-        return new SubscriptionBuilder(TopicName.fromQualifiedName(topicQualifiedName), subscriptionName);
-    }
-
-    public static SubscriptionBuilder subscription(String topicQualifiedName, String subscriptionName, String endpoint) {
-        return subscription(TopicName.fromQualifiedName(topicQualifiedName), subscriptionName, EndpointAddress.of(endpoint));
-    }
-
-    public static SubscriptionBuilder subscription(String topicQualifiedName, String subscriptionName, URI endpoint) {
-        return subscription(TopicName.fromQualifiedName(topicQualifiedName), subscriptionName, EndpointAddress.of(endpoint));
-    }
-
-    public static SubscriptionBuilder subscription(String topicQualifiedName, String subscriptionName, EndpointAddress endpoint) {
-        return subscription(TopicName.fromQualifiedName(topicQualifiedName), subscriptionName, endpoint);
-    }
-
-    public Subscription build() {
-        if (deliveryType == DeliveryType.SERIAL) {
-            return Subscription.createSerialSubscription(
-                    topicName, name, endpoint, state, description,
-                    serialSubscriptionPolicy, trackingEnabled,
-                    trackingMode, owner, monitoringDetails, contentType,
-                    filters, mode, headers, metadata, oAuthPolicy, http2Enabled,
-                    attachingIdentityHeadersEnabled, autoDeleteWithTopicEnabled
-            );
-        } else {
-            return Subscription.createBatchSubscription(
-                    topicName, name, endpoint, state, description,
-                    batchSubscriptionPolicy, trackingEnabled,
-                    trackingMode, owner, monitoringDetails, contentType,
-                    filters, headers, metadata, oAuthPolicy, http2Enabled,
-                    attachingIdentityHeadersEnabled, autoDeleteWithTopicEnabled
-            );
-        }
-    }
-
-    public SubscriptionBuilder withEndpoint(EndpointAddress endpoint) {
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    public SubscriptionBuilder withEndpoint(String endpoint) {
-        this.endpoint = EndpointAddress.of(endpoint);
-        return this;
-    }
-
-    public SubscriptionBuilder withEndpoint(URI endpoint) {
-        this.endpoint = EndpointAddress.of(endpoint.toString());
-        return this;
-    }
-
-    public SubscriptionBuilder withState(Subscription.State state) {
-        this.state = state;
-        return this;
-    }
-
-    public SubscriptionBuilder withDescription(String description) {
-        this.description = description;
-        return this;
-    }
-
-    public SubscriptionBuilder withSubscriptionPolicy(BatchSubscriptionPolicy subscriptionPolicy) {
-        this.batchSubscriptionPolicy = subscriptionPolicy;
-        this.deliveryType = DeliveryType.BATCH;
-        return this;
-    }
-
-    public SubscriptionBuilder withSubscriptionPolicy(SubscriptionPolicy subscriptionPolicy) {
-        this.serialSubscriptionPolicy = subscriptionPolicy;
-        this.deliveryType = DeliveryType.SERIAL;
-        return this;
-    }
-
-    public SubscriptionBuilder withRequestTimeout(int timeout) {
-        SubscriptionPolicy policy = this.serialSubscriptionPolicy;
-        this.serialSubscriptionPolicy = SubscriptionPolicy.Builder.subscriptionPolicy().withRate(policy.getRate())
-                .withMessageTtl(policy.getMessageTtl()).withMessageBackoff(policy.getMessageBackoff())
-                .withRequestTimeout(timeout).build();
-        return this;
-    }
-
-    public SubscriptionBuilder withTrackingMode(TrackingMode trackingMode) {
-        this.trackingMode = trackingMode;
-        this.trackingEnabled = trackingMode != TrackingMode.TRACKING_OFF;
-        return this;
-    }
-
-    public SubscriptionBuilder withHttp2Enabled(boolean http2Enabled) {
-        this.http2Enabled = http2Enabled;
-        return this;
-    }
-
-    public SubscriptionBuilder withOwner(OwnerId owner) {
-        this.owner = owner;
-        return this;
-    }
-
-    public SubscriptionBuilder withMonitoringDetails(MonitoringDetails monitoringDetails) {
-        this.monitoringDetails = monitoringDetails;
-        return this;
-    }
-
-    public SubscriptionBuilder withDeliveryType(DeliveryType deliveryType) {
-        this.deliveryType = deliveryType;
-        return this;
-    }
-
-    public SubscriptionBuilder withContentType(ContentType contentType) {
-        this.contentType = contentType;
-        return this;
-    }
-
-    public SubscriptionBuilder withFilter(MessageFilterSpecification filter) {
-        this.filters.add(filter);
-        return this;
-    }
-
-    public SubscriptionBuilder withMode(SubscriptionMode mode) {
-        this.mode = mode;
-        return this;
-    }
-
-    public SubscriptionBuilder withHeader(String name, String value) {
-        this.headers.add(new Header(name, value));
-        return this;
-    }
-
-    public SubscriptionBuilder withEndpointAddressResolverMetadata(EndpointAddressResolverMetadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    public SubscriptionBuilder withOAuthPolicy(SubscriptionOAuthPolicy oAuthPolicy) {
-        this.oAuthPolicy = oAuthPolicy;
-        return this;
-    }
-
-    public SubscriptionBuilder withAttachingIdentityHeadersEnabled(boolean attachingIdentityHeadersEnabled) {
-        this.attachingIdentityHeadersEnabled = attachingIdentityHeadersEnabled;
-        return this;
-    }
-
-    public SubscriptionBuilder withAutoDeleteWithTopicEnabled(boolean autoDeleteWithTopicEnabled) {
-        this.autoDeleteWithTopicEnabled = autoDeleteWithTopicEnabled;
-        return this;
-    }
+  private boolean autoDeleteWithTopicEnabled = false;
+
+  private SubscriptionBuilder(
+      TopicName topicName, String subscriptionName, EndpointAddress endpoint) {
+    this.topicName = topicName;
+    this.name = subscriptionName;
+    this.endpoint = endpoint;
+  }
+
+  private SubscriptionBuilder(TopicName topicName, String subscriptionName) {
+    this.topicName = topicName;
+    this.name = subscriptionName;
+  }
+
+  public static SubscriptionBuilder subscriptionWithRandomName(
+      TopicName topicName, String endpoint) {
+    return new SubscriptionBuilder(
+        topicName, "subscription" + sequence.incrementAndGet(), EndpointAddress.of(endpoint));
+  }
+
+  public static SubscriptionBuilder subscriptionWithRandomName(TopicName topicName) {
+    return new SubscriptionBuilder(topicName, UUID.randomUUID().toString());
+  }
+
+  public static SubscriptionBuilder subscription(SubscriptionName subscriptionName) {
+    return new SubscriptionBuilder(subscriptionName.getTopicName(), subscriptionName.getName());
+  }
+
+  public static SubscriptionBuilder subscription(TopicName topicName, String subscriptionName) {
+    return new SubscriptionBuilder(topicName, subscriptionName);
+  }
+
+  public static SubscriptionBuilder subscription(Topic topic, String subscriptionName) {
+    return new SubscriptionBuilder(topic.getName(), subscriptionName);
+  }
+
+  public static SubscriptionBuilder subscription(
+      TopicName topicName, String subscriptionName, EndpointAddress endpoint) {
+    return new SubscriptionBuilder(topicName, subscriptionName, endpoint);
+  }
+
+  public static SubscriptionBuilder subscription(
+      String topicQualifiedName, String subscriptionName) {
+    return new SubscriptionBuilder(
+        TopicName.fromQualifiedName(topicQualifiedName), subscriptionName);
+  }
+
+  public static SubscriptionBuilder subscription(
+      String topicQualifiedName, String subscriptionName, String endpoint) {
+    return subscription(
+        TopicName.fromQualifiedName(topicQualifiedName),
+        subscriptionName,
+        EndpointAddress.of(endpoint));
+  }
+
+  public static SubscriptionBuilder subscription(
+      String topicQualifiedName, String subscriptionName, URI endpoint) {
+    return subscription(
+        TopicName.fromQualifiedName(topicQualifiedName),
+        subscriptionName,
+        EndpointAddress.of(endpoint));
+  }
+
+  public static SubscriptionBuilder subscription(
+      String topicQualifiedName, String subscriptionName, EndpointAddress endpoint) {
+    return subscription(
+        TopicName.fromQualifiedName(topicQualifiedName), subscriptionName, endpoint);
+  }
+
+  public Subscription build() {
+    if (deliveryType == DeliveryType.SERIAL) {
+      return Subscription.createSerialSubscription(
+          topicName,
+          name,
+          endpoint,
+          state,
+          description,
+          serialSubscriptionPolicy,
+          trackingEnabled,
+          trackingMode,
+          owner,
+          monitoringDetails,
+          contentType,
+          filters,
+          mode,
+          headers,
+          metadata,
+          oAuthPolicy,
+          http2Enabled,
+          profilingEnabled,
+          profilingThresholdMs,
+          attachingIdentityHeadersEnabled,
+          autoDeleteWithTopicEnabled);
+    } else {
+      return Subscription.createBatchSubscription(
+          topicName,
+          name,
+          endpoint,
+          state,
+          description,
+          batchSubscriptionPolicy,
+          trackingEnabled,
+          trackingMode,
+          owner,
+          monitoringDetails,
+          contentType,
+          filters,
+          headers,
+          metadata,
+          oAuthPolicy,
+          http2Enabled,
+          attachingIdentityHeadersEnabled,
+          autoDeleteWithTopicEnabled);
+    }
+  }
+
+  public SubscriptionBuilder withEndpoint(EndpointAddress endpoint) {
+    this.endpoint = endpoint;
+    return this;
+  }
+
+  public SubscriptionBuilder withEndpoint(String endpoint) {
+    this.endpoint = EndpointAddress.of(endpoint);
+    return this;
+  }
+
+  public SubscriptionBuilder withEndpoint(URI endpoint) {
+    this.endpoint = EndpointAddress.of(endpoint.toString());
+    return this;
+  }
+
+  public SubscriptionBuilder withState(Subscription.State state) {
+    this.state = state;
+    return this;
+  }
+
+  public SubscriptionBuilder withDescription(String description) {
+    this.description = description;
+    return this;
+  }
+
+  public SubscriptionBuilder withSubscriptionPolicy(BatchSubscriptionPolicy subscriptionPolicy) {
+    this.batchSubscriptionPolicy = subscriptionPolicy;
+    this.deliveryType = DeliveryType.BATCH;
+    return this;
+  }
+
+  public SubscriptionBuilder withSubscriptionPolicy(SubscriptionPolicy subscriptionPolicy) {
+    this.serialSubscriptionPolicy = subscriptionPolicy;
+    this.deliveryType = DeliveryType.SERIAL;
+    return this;
+  }
+
+  public SubscriptionBuilder withRequestTimeout(int timeout) {
+    SubscriptionPolicy policy = this.serialSubscriptionPolicy;
+    this.serialSubscriptionPolicy =
+        SubscriptionPolicy.Builder.subscriptionPolicy()
+            .withRate(policy.getRate())
+            .withMessageTtl(policy.getMessageTtl())
+            .withMessageBackoff(policy.getMessageBackoff())
+            .withRequestTimeout(timeout)
+            .build();
+    return this;
+  }
+
+  public SubscriptionBuilder withTrackingMode(TrackingMode trackingMode) {
+    this.trackingMode = trackingMode;
+    this.trackingEnabled = trackingMode != TrackingMode.TRACKING_OFF;
+    return this;
+  }
+
+  public SubscriptionBuilder withHttp2Enabled(boolean http2Enabled) {
+    this.http2Enabled = http2Enabled;
+    return this;
+  }
+
+  public SubscriptionBuilder withProfilingEnabled(boolean profilingEnabled) {
+    this.profilingEnabled = profilingEnabled;
+    return this;
+  }
+
+  public SubscriptionBuilder withProfilingThresholdMs(long profilingThresholdMs) {
+    this.profilingThresholdMs = profilingThresholdMs;
+    return this;
+  }
+
+  public SubscriptionBuilder withOwner(OwnerId owner) {
+    this.owner = owner;
+    return this;
+  }
+
+  public SubscriptionBuilder withMonitoringDetails(MonitoringDetails monitoringDetails) {
+    this.monitoringDetails = monitoringDetails;
+    return this;
+  }
+
+  public SubscriptionBuilder withDeliveryType(DeliveryType deliveryType) {
+    this.deliveryType = deliveryType;
+    return this;
+  }
+
+  public SubscriptionBuilder withContentType(ContentType contentType) {
+    this.contentType = contentType;
+    return this;
+  }
+
+  public SubscriptionBuilder withFilter(MessageFilterSpecification filter) {
+    this.filters.add(filter);
+    return this;
+  }
+
+  public SubscriptionBuilder withMode(SubscriptionMode mode) {
+    this.mode = mode;
+    return this;
+  }
+
+  public SubscriptionBuilder withHeader(String name, String value) {
+    this.headers.add(new Header(name, value));
+    return this;
+  }
+
+  public SubscriptionBuilder withEndpointAddressResolverMetadata(
+      EndpointAddressResolverMetadata metadata) {
+    this.metadata = metadata;
+    return this;
+  }
+
+  public SubscriptionBuilder withOAuthPolicy(SubscriptionOAuthPolicy oAuthPolicy) {
+    this.oAuthPolicy = oAuthPolicy;
+    return this;
+  }
+
+  public SubscriptionBuilder withAttachingIdentityHeadersEnabled(
+      boolean attachingIdentityHeadersEnabled) {
+    this.attachingIdentityHeadersEnabled = attachingIdentityHeadersEnabled;
+    return this;
+  }
+
+  public SubscriptionBuilder withAutoDeleteWithTopicEnabled(boolean autoDeleteWithTopicEnabled) {
+    this.autoDeleteWithTopicEnabled = autoDeleteWithTopicEnabled;
+    return this;
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/TopicBuilder.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/TopicBuilder.java
index 5adb7714b8..8d54d6aa86 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/TopicBuilder.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/builder/TopicBuilder.java
@@ -1,179 +1,216 @@
 package pl.allegro.tech.hermes.test.helper.builder;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.OfflineRetentionTime;
 import pl.allegro.tech.hermes.api.OwnerId;
 import pl.allegro.tech.hermes.api.PublishingAuth;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy;
 import pl.allegro.tech.hermes.api.RetentionTime;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicDataOfflineStorage;
 import pl.allegro.tech.hermes.api.TopicLabel;
 import pl.allegro.tech.hermes.api.TopicName;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-
 public class TopicBuilder {
 
-    private static final AtomicLong sequence = new AtomicLong();
-
-    private final TopicName name;
-
-    private String description = "description";
-
-    private OwnerId owner = new OwnerId("Plaintext", "some team");
-
-    private boolean jsonToAvroDryRunEnabled = false;
+  private static final AtomicLong sequence = new AtomicLong();
 
-    private Topic.Ack ack = Topic.Ack.LEADER;
+  private final TopicName name;
 
-    private ContentType contentType = ContentType.JSON;
+  private String description = "description";
 
-    private RetentionTime retentionTime = RetentionTime.of(1, TimeUnit.DAYS);
+  private OwnerId owner = new OwnerId("Plaintext", "some team");
 
-    private boolean trackingEnabled = false;
+  private boolean jsonToAvroDryRunEnabled = false;
 
-    private boolean migratedFromJsonType = false;
+  private Topic.Ack ack = Topic.Ack.LEADER;
 
-    private boolean schemaIdAwareSerialization = false;
+  private boolean fallbackToRemoteDatacenterEnabled = false;
 
-    private int maxMessageSize = 1024 * 1024;
+  private PublishingChaosPolicy chaos = PublishingChaosPolicy.disabled();
 
-    private List<String> publishers = new ArrayList<>();
+  private ContentType contentType = ContentType.JSON;
 
-    private boolean authEnabled = false;
+  private RetentionTime retentionTime = RetentionTime.of(1, TimeUnit.DAYS);
 
-    private boolean unauthenticatedAccessEnabled = true;
+  private boolean trackingEnabled = false;
 
-    private boolean subscribingRestricted = false;
+  private boolean migratedFromJsonType = false;
 
-    private TopicDataOfflineStorage offlineStorage = TopicDataOfflineStorage.defaultOfflineStorage();
+  private boolean schemaIdAwareSerialization = false;
 
-    private Set<TopicLabel> labels = Collections.emptySet();
+  private int maxMessageSize = 1024 * 1024;
 
-    private TopicBuilder(TopicName topicName) {
-        this.name = topicName;
-    }
+  private final List<String> publishers = new ArrayList<>();
 
-    public static TopicBuilder topicWithRandomName() {
-        return topic(
-                TopicBuilder.class.getSimpleName() + "Group" + sequence.incrementAndGet(),
-                TopicBuilder.class.getSimpleName() + "Topic" + sequence.incrementAndGet()
-        );
-    }
+  private boolean authEnabled = false;
 
-    public static TopicBuilder randomTopic(String group, String topicNamePrefix) {
-        return topic(group, topicNamePrefix + "-" + UUID.randomUUID());
-    }
+  private boolean unauthenticatedAccessEnabled = true;
 
-    public static TopicBuilder topic(TopicName topicName) {
-        return new TopicBuilder(topicName);
-    }
+  private boolean subscribingRestricted = false;
 
-    public static TopicBuilder topic(String groupName, String topicName) {
-        return new TopicBuilder(new TopicName(groupName, topicName));
-    }
+  private TopicDataOfflineStorage offlineStorage = TopicDataOfflineStorage.defaultOfflineStorage();
 
-    public static TopicBuilder topic(String qualifiedName) {
-        return new TopicBuilder(TopicName.fromQualifiedName(qualifiedName));
-    }
+  private Set<TopicLabel> labels = Collections.emptySet();
 
-    public Topic build() {
-        return new Topic(
-                name, description, owner, retentionTime, migratedFromJsonType, ack, trackingEnabled, contentType,
-                jsonToAvroDryRunEnabled, schemaIdAwareSerialization, maxMessageSize,
-                new PublishingAuth(publishers, authEnabled, unauthenticatedAccessEnabled), subscribingRestricted,
-                offlineStorage, labels, null, null
-        );
-    }
+  private TopicBuilder(TopicName topicName) {
+    this.name = topicName;
+  }
 
-    public TopicBuilder withDescription(String description) {
-        this.description = description;
-        return this;
-    }
+  public static TopicBuilder topicWithRandomName() {
+    return topicWithRandomNameEndedWith("");
+  }
 
-    public TopicBuilder withOwner(OwnerId owner) {
-        this.owner = owner;
-        return this;
-    }
+  public static TopicBuilder topicWithRandomNameContaining(String string) {
+    return topic(
+        TopicBuilder.class.getSimpleName() + "Group" + sequence.incrementAndGet(),
+        TopicBuilder.class.getSimpleName() + "Topic" + string + sequence.incrementAndGet());
+  }
 
-    public TopicBuilder withRetentionTime(RetentionTime retentionTime) {
-        this.retentionTime = retentionTime;
-        return this;
-    }
+  public static TopicBuilder topicWithRandomNameEndedWith(String suffix) {
+    return topic(
+        TopicBuilder.class.getSimpleName() + "Group" + sequence.incrementAndGet(),
+        TopicBuilder.class.getSimpleName() + "Topic" + sequence.incrementAndGet() + suffix);
+  }
 
-    public TopicBuilder withRetentionTime(int retentionTime, TimeUnit unit) {
-        this.retentionTime = new RetentionTime(retentionTime, unit);
-        return this;
-    }
+  public static TopicBuilder randomTopic(String group, String topicNamePrefix) {
+    return topic(group, topicNamePrefix + "-" + UUID.randomUUID());
+  }
 
-    public TopicBuilder withJsonToAvroDryRun(boolean enabled) {
-        this.jsonToAvroDryRunEnabled = enabled;
-        return this;
-    }
+  public static TopicBuilder topic(TopicName topicName) {
+    return new TopicBuilder(topicName);
+  }
 
-    public TopicBuilder withAck(Topic.Ack ack) {
-        this.ack = ack;
-        return this;
-    }
+  public static TopicBuilder topic(String groupName, String topicName) {
+    return new TopicBuilder(new TopicName(groupName, topicName));
+  }
 
-    public TopicBuilder withTrackingEnabled(boolean enabled) {
-        this.trackingEnabled = enabled;
-        return this;
-    }
+  public static TopicBuilder topic(String qualifiedName) {
+    return new TopicBuilder(TopicName.fromQualifiedName(qualifiedName));
+  }
 
-    public TopicBuilder withContentType(ContentType contentType) {
-        this.contentType = contentType;
-        return this;
-    }
+  public Topic build() {
+    return new Topic(
+        name,
+        description,
+        owner,
+        retentionTime,
+        migratedFromJsonType,
+        ack,
+        fallbackToRemoteDatacenterEnabled,
+        chaos,
+        trackingEnabled,
+        contentType,
+        jsonToAvroDryRunEnabled,
+        schemaIdAwareSerialization,
+        maxMessageSize,
+        new PublishingAuth(publishers, authEnabled, unauthenticatedAccessEnabled),
+        subscribingRestricted,
+        offlineStorage,
+        labels,
+        null,
+        null);
+  }
 
-    public TopicBuilder migratedFromJsonType() {
-        this.migratedFromJsonType = true;
-        return this;
-    }
-
-    public TopicBuilder withSchemaIdAwareSerialization() {
-        this.schemaIdAwareSerialization = true;
-        return this;
-    }
-
-    public TopicBuilder withSubscribingRestricted() {
-        this.subscribingRestricted = true;
-        return this;
-    }
-
-    public TopicBuilder withMaxMessageSize(int size) {
-        this.maxMessageSize = size;
-        return this;
-    }
-
-    public TopicBuilder withPublisher(String serviceName) {
-        this.publishers.add(serviceName);
-        return this;
-    }
-
-    public TopicBuilder withAuthEnabled() {
-        this.authEnabled = true;
-        return this;
-    }
-
-    public TopicBuilder withUnauthenticatedAccessDisabled() {
-        this.unauthenticatedAccessEnabled = false;
-        return this;
-    }
-
-    public TopicBuilder withOfflineStorage(int days) {
-        this.offlineStorage = new TopicDataOfflineStorage(true, OfflineRetentionTime.of(days));
-        return this;
-    }
-
-    public TopicBuilder withLabels(Set<TopicLabel> labels) {
-        this.labels = labels;
-        return this;
-    }
+  public TopicBuilder withDescription(String description) {
+    this.description = description;
+    return this;
+  }
+
+  public TopicBuilder withOwner(OwnerId owner) {
+    this.owner = owner;
+    return this;
+  }
+
+  public TopicBuilder withRetentionTime(RetentionTime retentionTime) {
+    this.retentionTime = retentionTime;
+    return this;
+  }
+
+  public TopicBuilder withRetentionTime(int retentionTime, TimeUnit unit) {
+    this.retentionTime = new RetentionTime(retentionTime, unit);
+    return this;
+  }
+
+  public TopicBuilder withJsonToAvroDryRun(boolean enabled) {
+    this.jsonToAvroDryRunEnabled = enabled;
+    return this;
+  }
+
+  public TopicBuilder withAck(Topic.Ack ack) {
+    this.ack = ack;
+    return this;
+  }
+
+  public TopicBuilder withFallbackToRemoteDatacenterEnabled() {
+    this.fallbackToRemoteDatacenterEnabled = true;
+    return this;
+  }
+
+  public TopicBuilder withTrackingEnabled(boolean enabled) {
+    this.trackingEnabled = enabled;
+    return this;
+  }
+
+  public TopicBuilder withContentType(ContentType contentType) {
+    this.contentType = contentType;
+    return this;
+  }
+
+  public TopicBuilder migratedFromJsonType() {
+    this.migratedFromJsonType = true;
+    return this;
+  }
+
+  public TopicBuilder withSchemaIdAwareSerialization() {
+    this.schemaIdAwareSerialization = true;
+    return this;
+  }
+
+  public TopicBuilder withSubscribingRestricted() {
+    this.subscribingRestricted = true;
+    return this;
+  }
+
+  public TopicBuilder withMaxMessageSize(int size) {
+    this.maxMessageSize = size;
+    return this;
+  }
+
+  public TopicBuilder withPublisher(String serviceName) {
+    this.publishers.add(serviceName);
+    return this;
+  }
+
+  public TopicBuilder withAuthEnabled() {
+    this.authEnabled = true;
+    return this;
+  }
+
+  public TopicBuilder withUnauthenticatedAccessDisabled() {
+    this.unauthenticatedAccessEnabled = false;
+    return this;
+  }
+
+  public TopicBuilder withOfflineStorage(int days) {
+    this.offlineStorage = new TopicDataOfflineStorage(true, OfflineRetentionTime.of(days));
+    return this;
+  }
+
+  public TopicBuilder withLabels(Set<TopicLabel> labels) {
+    this.labels = labels;
+    return this;
+  }
+
+  public TopicBuilder withPublishingChaosPolicy(PublishingChaosPolicy chaos) {
+    this.chaos = chaos;
+    return this;
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/cache/FakeTicker.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/cache/FakeTicker.java
index 2536143568..279c582435 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/cache/FakeTicker.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/cache/FakeTicker.java
@@ -1,18 +1,17 @@
 package pl.allegro.tech.hermes.test.helper.cache;
 
 import com.google.common.base.Ticker;
-
 import java.time.Duration;
 
 public class FakeTicker extends Ticker {
-    private long currentNanos = 0;
+  private long currentNanos = 0;
 
-    @Override
-    public long read() {
-        return currentNanos;
-    }
+  @Override
+  public long read() {
+    return currentNanos;
+  }
 
-    public void advance(Duration duration) {
-        currentNanos += duration.toNanos();
-    }
+  public void advance(Duration duration) {
+    currentNanos += duration.toNanos();
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/AsyncMessagePublisher.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/AsyncMessagePublisher.java
deleted file mode 100644
index 8f600104c2..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/AsyncMessagePublisher.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.client;
-
-import jakarta.ws.rs.client.AsyncInvoker;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.InvocationCallback;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.Response;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static jakarta.ws.rs.client.Entity.text;
-
-public class AsyncMessagePublisher {
-
-    private WebTarget target;
-
-    public AsyncMessagePublisher(WebTarget target) {
-        this.target = target;
-    }
-
-    public void publishMessage(String topic, String content, InvocationCallback<Response> callback) {
-        target.path(topic).request().async().post(text(content), callback);
-    }
-
-    public void publishMessage(String topic, String content, int retries, InvocationCallback<Response> callback) {
-        checkArgument(retries > 0, "Retries should be more than zero.");
-        publishMessage(topic, text(content), retries, callback);
-    }
-
-    private void publishMessage(String topic, Entity<String> content, int retries, InvocationCallback<Response> callback) {
-        AsyncInvoker invoker = target.path(topic).request().async();
-        invoker.post(content, new PublishingRetryCallback(invoker, content, retries, callback));
-    }
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/Hermes.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/Hermes.java
deleted file mode 100644
index 96fa7cd2ec..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/Hermes.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.client;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.jakarta.rs.json.JacksonXmlBindJsonProvider;
-import jakarta.ws.rs.client.ClientRequestContext;
-import java.util.function.Function;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.proxy.WebResourceFactory;
-import pl.allegro.tech.hermes.api.endpoints.AllTopicClientsEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.BlacklistEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.FilterEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.GroupEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.ModeEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.OAuthProviderEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.OfflineRetransmissionEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.OwnerEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.QueryEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.ReadinessEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.SchemaEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.StatsEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.SubscriptionEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.SubscriptionOwnershipEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.TopicEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.UnhealthyEndpoint;
-import pl.allegro.tech.hermes.consumers.ConsumerEndpoint;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.ClientRequestFilter;
-import jakarta.ws.rs.client.WebTarget;
-
-public class Hermes {
-
-    public static final int DEFAULT_THREAD_POOL_SIZE = 10;
-    public static final int DEFAULT_CONNECT_TIMEOUT = 500;
-    public static final int DEFAULT_PUBLISHER_READ_TIMEOUT = 400;
-    public static final int DEFAULT_MANAGEMENT_READ_TIMEOUT = 1000;
-
-    private final String url;
-    private final String consumerUrl;
-    private ClientConfig managementConfig = getDefaultManagementConfig();
-    private ClientConfig publisherConfig = getDefaultPublisherConfig();
-
-    private Collection<ClientRequestFilter> filters = new ArrayList<>();
-
-    public Hermes(String url, String consumerUrl) {
-        this.url = url;
-        this.consumerUrl = consumerUrl;
-    }
-
-    private static ClientConfig getDefaultManagementConfig() {
-        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.property(ClientProperties.CONNECT_TIMEOUT, DEFAULT_MANAGEMENT_READ_TIMEOUT);
-        clientConfig.property(ClientProperties.READ_TIMEOUT, DEFAULT_MANAGEMENT_READ_TIMEOUT);
-
-        return clientConfig;
-    }
-
-    public static ClientConfig getDefaultPublisherConfig() {
-        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.property(ClientProperties.ASYNC_THREADPOOL_SIZE, DEFAULT_THREAD_POOL_SIZE);
-        clientConfig.property(ClientProperties.CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT);
-        clientConfig.property(ClientProperties.READ_TIMEOUT, DEFAULT_PUBLISHER_READ_TIMEOUT);
-
-        return clientConfig;
-    }
-
-    public static ClientBuilder getClientBuilder(ClientConfig clientConfig) {
-        return ClientBuilder.newBuilder().withConfig(clientConfig).register(
-                new JacksonXmlBindJsonProvider(
-                        new ObjectMapper().registerModule(new JavaTimeModule()),
-                        JacksonXmlBindJsonProvider.DEFAULT_ANNOTATIONS
-                )
-        );
-    }
-
-    public Hermes withPassword(String password) {
-        this.filters.add(new PasswordAuthenticationFeature(password));
-        return this;
-    }
-
-    public Hermes withAuthToken(String authToken) {
-        this.filters.add(new OAuth2AuthenticationFeature(clientRequestContext -> authToken));
-        return this;
-    }
-
-    public Hermes withAuthToken(Function<ClientRequestContext, String> authTokenSupplier) {
-        this.filters.add(new OAuth2AuthenticationFeature(authTokenSupplier));
-        return this;
-    }
-
-    public Hermes withManagementConfig(ClientConfig config) {
-        this.managementConfig = config;
-        return this;
-    }
-
-    public Hermes withPublisherConfig(ClientConfig config) {
-        this.publisherConfig = config;
-        return this;
-    }
-
-    public GroupEndpoint createGroupEndpoint() {
-        return createProxy(url, GroupEndpoint.class, managementConfig);
-    }
-
-    public TopicEndpoint createTopicEndpoint() {
-        return createProxy(url, TopicEndpoint.class, managementConfig);
-    }
-
-    public SchemaEndpoint createSchemaEndpoint() {
-        return createProxy(url, SchemaEndpoint.class, managementConfig);
-    }
-
-    public SubscriptionEndpoint createSubscriptionEndpoint() {
-        return createProxy(url, SubscriptionEndpoint.class, managementConfig);
-    }
-
-    public SubscriptionOwnershipEndpoint createSubscriptionOwnershipEndpoint() {
-        return createProxy(url, SubscriptionOwnershipEndpoint.class, managementConfig);
-    }
-
-    public QueryEndpoint createQueryEndpoint() {
-        return createProxy(url, QueryEndpoint.class, managementConfig);
-    }
-
-    public OAuthProviderEndpoint createOAuthProviderEndpoint() {
-        return createProxy(url, OAuthProviderEndpoint.class, managementConfig);
-    }
-
-    public ConsumerEndpoint createConsumerEndpoint() {
-        return createProxy(consumerUrl, ConsumerEndpoint.class, getDefaultManagementConfig());
-    }
-
-    public OwnerEndpoint createOwnerEndpoint() {
-        return createProxy(url, OwnerEndpoint.class, managementConfig);
-    }
-
-    public AllTopicClientsEndpoint createAllTopicClientsEndpoint() {
-        return createProxy(url, AllTopicClientsEndpoint.class, managementConfig);
-    }
-
-    public UnhealthyEndpoint unhealthyEndpoint() {
-        return createProxy(url, UnhealthyEndpoint.class, managementConfig);
-    }
-
-    public ModeEndpoint modeEndpoint() {
-        return createProxy(url, ModeEndpoint.class, managementConfig);
-    }
-
-    public BlacklistEndpoint createBlacklistEndpoint() {
-        return createProxy(url, BlacklistEndpoint.class, managementConfig);
-    }
-
-    public FilterEndpoint createFilterEndpoint() {
-        return createProxy(url, FilterEndpoint.class, managementConfig);
-    }
-
-    public ReadinessEndpoint createReadinessEndpoint() {
-        return createProxy(url, ReadinessEndpoint.class, managementConfig);
-    }
-
-    public StatsEndpoint createStatsEndpoint() {
-        return createProxy(url, StatsEndpoint.class, managementConfig);
-    }
-
-    public OfflineRetransmissionEndpoint createOfflineRetransmissionEndpoint() {
-        return createProxy(url, OfflineRetransmissionEndpoint.class, managementConfig);
-    }
-
-    public WebTarget createWebTargetForPublishing() {
-        String resource = TopicEndpoint.class.getAnnotation(Path.class).value();
-        return getClientBuilder(publisherConfig).build().target(url).path(resource);
-    }
-
-    private <T> T createProxy(String url, Class<T> endpoint, ClientConfig clientConfig) {
-        ClientBuilder clientBuilder = getClientBuilder(clientConfig);
-        for (ClientRequestFilter filter : filters) {
-            clientBuilder.register(filter);
-        }
-        return WebResourceFactory.newResource(endpoint, clientBuilder.build().target(url));
-    }
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/OAuth2AuthenticationFeature.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/OAuth2AuthenticationFeature.java
index de7666924f..bcc65a3484 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/OAuth2AuthenticationFeature.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/OAuth2AuthenticationFeature.java
@@ -1,20 +1,22 @@
 package pl.allegro.tech.hermes.test.helper.client;
 
-import java.io.IOException;
-import java.util.function.Function;
 import jakarta.ws.rs.client.ClientRequestContext;
 import jakarta.ws.rs.client.ClientRequestFilter;
+import java.io.IOException;
+import java.util.function.Function;
 
 public class OAuth2AuthenticationFeature implements ClientRequestFilter {
 
-    private final Function<ClientRequestContext, String> authTokenSupplier;
+  private final Function<ClientRequestContext, String> authTokenSupplier;
 
-    public OAuth2AuthenticationFeature(Function<ClientRequestContext, String> authTokenSupplier) {
-        this.authTokenSupplier = authTokenSupplier;
-    }
+  public OAuth2AuthenticationFeature(Function<ClientRequestContext, String> authTokenSupplier) {
+    this.authTokenSupplier = authTokenSupplier;
+  }
 
-    @Override
-    public void filter(ClientRequestContext requestContext) throws IOException {
-        requestContext.getHeaders().add("Authorization", String.format("Token %s", authTokenSupplier.apply(requestContext)));
-    }
+  @Override
+  public void filter(ClientRequestContext requestContext) throws IOException {
+    requestContext
+        .getHeaders()
+        .add("Authorization", String.format("Token %s", authTokenSupplier.apply(requestContext)));
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PasswordAuthenticationFeature.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PasswordAuthenticationFeature.java
index ec871bdddf..d20f726ce6 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PasswordAuthenticationFeature.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PasswordAuthenticationFeature.java
@@ -1,19 +1,19 @@
 package pl.allegro.tech.hermes.test.helper.client;
 
-import java.io.IOException;
 import jakarta.ws.rs.client.ClientRequestContext;
 import jakarta.ws.rs.client.ClientRequestFilter;
+import java.io.IOException;
 
 public class PasswordAuthenticationFeature implements ClientRequestFilter {
 
-    private final String password;
+  private final String password;
 
-    public PasswordAuthenticationFeature(String password) {
-        this.password = password;
-    }
+  public PasswordAuthenticationFeature(String password) {
+    this.password = password;
+  }
 
-    @Override
-    public void filter(ClientRequestContext requestContext) throws IOException {
-        requestContext.getHeaders().add("Hermes-Admin-Password", password);
-    }
+  @Override
+  public void filter(ClientRequestContext requestContext) throws IOException {
+    requestContext.getHeaders().add("Hermes-Admin-Password", password);
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PublishingRetryCallback.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PublishingRetryCallback.java
deleted file mode 100644
index 7a71f58838..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PublishingRetryCallback.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.client;
-
-import jakarta.ws.rs.client.AsyncInvoker;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.InvocationCallback;
-import jakarta.ws.rs.core.Response;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
-
-class PublishingRetryCallback implements InvocationCallback<Response> {
-    private final AsyncInvoker invoker;
-    private final Entity<String> message;
-    private final InvocationCallback<Response> callback;
-    private int retries;
-
-    PublishingRetryCallback(AsyncInvoker invoker,
-                            Entity<String> message,
-                            int retries,
-                            InvocationCallback<Response> callback) {
-        checkArgument(retries > 0);
-        this.invoker = invoker;
-        this.message = message;
-        this.retries = retries;
-        this.callback = callback;
-    }
-
-    @Override
-    public void completed(Response response) {
-        if (SUCCESSFUL.equals(response.getStatusInfo().getFamily()) || retries <= 0) {
-            callback.completed(response);
-        } else {
-            retry();
-        }
-    }
-
-    @Override
-    public void failed(Throwable throwable) {
-        if (retries > 0) {
-            retry();
-        } else {
-            callback.failed(throwable);
-        }
-    }
-
-    private void retry() {
-        retries--;
-        invoker.post(message, this);
-    }
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/ConsumerTestClient.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/ConsumerTestClient.java
new file mode 100644
index 0000000000..a901134c1f
--- /dev/null
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/ConsumerTestClient.java
@@ -0,0 +1,37 @@
+package pl.allegro.tech.hermes.test.helper.client.integration;
+
+import jakarta.ws.rs.core.UriBuilder;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+class ConsumerTestClient {
+
+  private static final String STATUS_SUBSCRIPTIONS = "/status/subscriptions";
+
+  private static final String METRICS_PATH = "/status/prometheus";
+
+  private final WebTestClient webTestClient;
+  private final String consumerContainerUrl;
+
+  public ConsumerTestClient(int consumerPort) {
+    this.consumerContainerUrl = "http://localhost:" + consumerPort;
+    this.webTestClient =
+        WebTestClient.bindToServer()
+            .baseUrl(consumerContainerUrl)
+            .codecs(configurer -> configurer.defaultCodecs().maxInMemorySize(16 * 1024 * 1024))
+            .build();
+  }
+
+  public WebTestClient.ResponseSpec getRunningSubscriptionsStatus() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(consumerContainerUrl).path(STATUS_SUBSCRIPTIONS).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getMetrics() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(consumerContainerUrl).path(METRICS_PATH).build())
+        .exchange();
+  }
+}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/FrontendSlowClient.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/FrontendSlowClient.java
new file mode 100644
index 0000000000..1ccd877810
--- /dev/null
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/FrontendSlowClient.java
@@ -0,0 +1,143 @@
+package pl.allegro.tech.hermes.test.helper.client.integration;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FrontendSlowClient {
+
+  public static final String MSG_BODY = "{\"field\": \"value\"}";
+
+  public String msgHeadWithContentLenght(String topicName) {
+    return "POST /topics/"
+        + topicName
+        + " HTTP/1.1\n"
+        + "Host: "
+        + host
+        + ":"
+        + port
+        + "\n"
+        + "Content-Type: application/json\n"
+        + "Content-Length: "
+        + MSG_BODY.length()
+        + "\r\n\r\n";
+  }
+
+  private String msgHeadWithChunkedEncoding(String topicName) {
+    return "POST /topics/"
+        + topicName
+        + " HTTP/1.1\n"
+        + "Host: "
+        + host
+        + ":"
+        + port
+        + "\n"
+        + "Content-Type: application/json\n"
+        + "Transfer-Encoding: chunked \r\n\r\n";
+  }
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(FrontendSlowClient.class);
+
+  private final String host;
+  private final int port;
+
+  public FrontendSlowClient(String host, int port) {
+    this.host = host;
+    this.port = port;
+  }
+
+  private final ExecutorService executor = Executors.newSingleThreadExecutor();
+
+  public String slowEvent(
+      int clientTimeout,
+      int pauseTimeBetweenChunks,
+      int delayBeforeSendingFirstData,
+      String topicName,
+      boolean chunkedEncoding)
+      throws IOException, InterruptedException {
+
+    Socket clientSocket = new Socket(host, port);
+
+    Thread.sleep(delayBeforeSendingFirstData);
+
+    DataOutputStream outToServer = new DataOutputStream(clientSocket.getOutputStream());
+    BufferedReader inFromServer =
+        new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+
+    clientSocket.setSoTimeout(clientTimeout);
+
+    if (chunkedEncoding) {
+      outToServer.writeBytes(msgHeadWithChunkedEncoding(topicName));
+      outToServer.flush();
+    } else {
+      outToServer.writeBytes(msgHeadWithContentLenght(topicName));
+      outToServer.flush();
+    }
+    sendBodyInChunks(outToServer, MSG_BODY, pauseTimeBetweenChunks, chunkedEncoding);
+
+    String response;
+    try {
+      response = readResponse(inFromServer);
+      LOGGER.info("Response: {}", response);
+    } catch (SocketTimeoutException e) {
+      LOGGER.warn("client timeout");
+      clientSocket.close();
+      throw e;
+    }
+
+    clientSocket.close();
+
+    return response;
+  }
+
+  private void sendBodyInChunks(
+      DataOutputStream outToServer, String msgBody, int pauseTime, boolean encoded) {
+    executor.execute(
+        () -> {
+          try {
+            for (int index = 0; index < msgBody.length(); index++) {
+              outToServer.writeBytes(prepareChunk(msgBody, index, encoded));
+              outToServer.flush();
+              LOGGER.info("Sent chunk");
+              if (pauseTime > 0) {
+                Thread.sleep(pauseTime);
+              }
+            }
+            if (encoded) {
+              outToServer.writeBytes("0\r\n\r\n");
+              outToServer.flush();
+              LOGGER.info("Finished chunked encoding");
+            }
+          } catch (SocketException e) {
+            LOGGER.warn("Socket closed");
+          } catch (InterruptedException | IOException e) {
+            LOGGER.error("Something went wrong while sending data", e);
+          }
+        });
+  }
+
+  private String prepareChunk(String msg, int index, boolean encoded) {
+    return encoded
+        ? String.format("1\n%c\r\n", msg.charAt(index))
+        : String.valueOf(msg.charAt(index));
+  }
+
+  private String readResponse(BufferedReader bufferedReader) throws IOException {
+    String line;
+    StringBuilder response = new StringBuilder();
+
+    while (!(line = bufferedReader.readLine()).isEmpty()) {
+      response.append(line);
+    }
+
+    return response.toString();
+  }
+}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/FrontendTestClient.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/FrontendTestClient.java
new file mode 100644
index 0000000000..e8c425effa
--- /dev/null
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/FrontendTestClient.java
@@ -0,0 +1,219 @@
+package pl.allegro.tech.hermes.test.helper.client.integration;
+
+import static jakarta.ws.rs.client.ClientBuilder.newClient;
+import static org.awaitility.Awaitility.waitAtMost;
+import static org.glassfish.jersey.client.ClientProperties.REQUEST_ENTITY_PROCESSING;
+import static org.glassfish.jersey.client.RequestEntityProcessing.CHUNKED;
+import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
+
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.glassfish.jersey.client.ClientConfig;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.reactive.JdkClientHttpConnector;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.util.MultiValueMap;
+import reactor.core.publisher.Mono;
+
+public class FrontendTestClient {
+
+  private static final String TOPIC_PATH = "/topics/{topicName}";
+  private static final String STATUS_HEALTH_PATH = "/status/health";
+  private static final String STATUS_READY_PATH = "/status/ready";
+  private static final String STATUS_PING_PATH = "/status/ping";
+  private static final String METRICS_PATH = "/status/prometheus";
+
+  private final WebTestClient webTestClient;
+  private final FrontendSlowClient slowTestClient;
+  private final String frontendContainerUrl;
+  private final Client chunkedClient;
+
+  public FrontendTestClient(int frontendPort) {
+    this.frontendContainerUrl = "http://localhost:" + frontendPort;
+    this.webTestClient =
+        WebTestClient.bindToServer(new JdkClientHttpConnector())
+            .baseUrl(frontendContainerUrl)
+            .codecs(configurer -> configurer.defaultCodecs().maxInMemorySize(16 * 1024 * 1024))
+            .build();
+    this.slowTestClient = new FrontendSlowClient("localhost", frontendPort);
+    this.chunkedClient = newClient(new ClientConfig().property(REQUEST_ENTITY_PROCESSING, CHUNKED));
+  }
+
+  public int publishUntilSuccess(String topicQualifiedName, String body) {
+    AtomicInteger attempts = new AtomicInteger(0);
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              attempts.getAndIncrement();
+              publish(topicQualifiedName, body).expectStatus().isCreated();
+            });
+    return attempts.get();
+  }
+
+  public Response publishChunked(String topicQualifiedName, String body) {
+    return chunkedClient
+        .target(UriBuilder.fromUri(frontendContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .request()
+        .post(Entity.text(body));
+  }
+
+  public int publishUntilSuccess(
+      String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
+    AtomicInteger attempts = new AtomicInteger(0);
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              attempts.getAndIncrement();
+              publish(topicQualifiedName, body, headers).expectStatus().isCreated();
+            });
+    return attempts.get();
+  }
+
+  public int publishJSONUntilSuccess(
+      String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
+    AtomicInteger attempts = new AtomicInteger(0);
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              attempts.getAndIncrement();
+              publishJSON(topicQualifiedName, body, headers).expectStatus().isCreated();
+            });
+    return attempts.get();
+  }
+
+  public int publishAvroUntilSuccess(String topicQualifiedName, byte[] body) {
+    return publishAvroUntilSuccess(topicQualifiedName, body, new HttpHeaders());
+  }
+
+  public int publishAvroUntilSuccess(
+      String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
+    AtomicInteger attempts = new AtomicInteger(0);
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              attempts.getAndIncrement();
+              publishAvro(topicQualifiedName, body, headers).expectStatus().isCreated();
+            });
+    return attempts.get();
+  }
+
+  public int publishUntilStatus(String topicQualifiedName, String body, int statusCode) {
+    AtomicInteger attempts = new AtomicInteger(0);
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              attempts.getAndIncrement();
+              publish(topicQualifiedName, body).expectStatus().isEqualTo(statusCode);
+            });
+    return attempts.get();
+  }
+
+  public WebTestClient.ResponseSpec publish(String topicQualifiedName, String body) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .body(Mono.just(body), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec publish(
+      String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .body(Mono.just(body), String.class)
+        .headers(requestHeaders -> requestHeaders.addAll(headers))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec publish(
+      String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .body(Mono.just(body), byte[].class)
+        .headers(requestHeaders -> requestHeaders.addAll(headers))
+        .exchange();
+  }
+
+  WebTestClient.ResponseSpec publishJSON(
+      String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(body), String.class)
+        .headers(requestHeaders -> requestHeaders.addAll(headers))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec publishAvro(
+      String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .header("Content-Type", AVRO_BINARY)
+        .headers(requestHeaders -> requestHeaders.addAll(headers))
+        .body(Mono.just(body), byte[].class)
+        .exchange();
+  }
+
+  WebTestClient.ResponseSpec publishWithHeaders(
+      String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .headers(it -> it.addAll(headers))
+        .body(Mono.just(body), String.class)
+        .exchange();
+  }
+
+  String publishSlowly(
+      int clientTimeout,
+      int pauseTimeBetweenChunks,
+      int delayBeforeSendingFirstData,
+      String topicName,
+      boolean chunkedEncoding)
+      throws IOException, InterruptedException {
+    return slowTestClient.slowEvent(
+        clientTimeout,
+        pauseTimeBetweenChunks,
+        delayBeforeSendingFirstData,
+        topicName,
+        chunkedEncoding);
+  }
+
+  public WebTestClient.ResponseSpec getStatusHealth() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(STATUS_HEALTH_PATH).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getStatusReady() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(STATUS_READY_PATH).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getStatusPing() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(STATUS_PING_PATH).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getMetrics() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(frontendContainerUrl).path(METRICS_PATH).build())
+        .exchange();
+  }
+}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/HermesInitHelper.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/HermesInitHelper.java
new file mode 100644
index 0000000000..6dfb3b05dd
--- /dev/null
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/HermesInitHelper.java
@@ -0,0 +1,97 @@
+package pl.allegro.tech.hermes.test.helper.client.integration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+
+import java.time.Duration;
+import pl.allegro.tech.hermes.api.Group;
+import pl.allegro.tech.hermes.api.OAuthProvider;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.api.TopicWithSchema;
+
+public class HermesInitHelper {
+
+  private final ManagementTestClient managementTestClient;
+
+  public HermesInitHelper(int managementPort) {
+    managementTestClient = new ManagementTestClient(managementPort);
+  }
+
+  public HermesInitHelper(int managementPort, String defaultHeaderName, String defaultHeaderValue) {
+    managementTestClient =
+        new ManagementTestClient(managementPort, defaultHeaderName, defaultHeaderValue);
+  }
+
+  public Topic createTopic(Topic topic) {
+    createGroupIfMissing(Group.from(topic.getName().getGroupName()));
+    managementTestClient
+        .createTopic(TopicWithSchema.topicWithSchema(topic, null))
+        .expectStatus()
+        .is2xxSuccessful();
+    waitUntilTopicCreated(topic.getQualifiedName());
+    return topic;
+  }
+
+  public Topic createTopicWithSchema(TopicWithSchema topic) {
+    createGroupIfMissing(Group.from(topic.getName().getGroupName()));
+    managementTestClient.createTopic(topic).expectStatus().is2xxSuccessful();
+    waitUntilTopicCreated(topic.getQualifiedName());
+    return topic;
+  }
+
+  public Group createGroupIfMissing(Group group) {
+    if (managementTestClient.getGroups().contains(group.getGroupName())) {
+      return group;
+    }
+
+    managementTestClient.createGroup(group).expectStatus().is2xxSuccessful();
+    waitUntilGroupCreated(group.getGroupName());
+    return group;
+  }
+
+  public Group createGroup(Group group) {
+    managementTestClient.createGroup(group).expectStatus().is2xxSuccessful();
+    waitUntilGroupCreated(group.getGroupName());
+    return group;
+  }
+
+  private void waitUntilGroupCreated(String groupName) {
+    waitAtMost(Duration.ofMinutes(1))
+        .until(() -> managementTestClient.getGroups().contains(groupName));
+  }
+
+  private void waitUntilTopicCreated(String topicQualifiedName) {
+    waitAtMost(Duration.ofMinutes(1))
+        .untilAsserted(
+            () ->
+                managementTestClient.getTopic(topicQualifiedName).expectStatus().is2xxSuccessful());
+  }
+
+  public Subscription createSubscription(Subscription subscription) {
+    managementTestClient.createSubscription(subscription).expectStatus().is2xxSuccessful();
+    waitUntilSubscriptionIsActive(subscription);
+    return subscription;
+  }
+
+  public void waitUntilSubscriptionIsActive(Subscription subscription) {
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              Subscription sub =
+                  managementTestClient
+                      .getSubscription(subscription.getQualifiedTopicName(), subscription.getName())
+                      .expectStatus()
+                      .is2xxSuccessful()
+                      .expectBody(Subscription.class)
+                      .returnResult()
+                      .getResponseBody();
+              assertThat(sub.getState()).isEqualTo(Subscription.State.ACTIVE);
+            });
+  }
+
+  public OAuthProvider createOAuthProvider(OAuthProvider provider) {
+    managementTestClient.createOAuthProvider(provider).expectStatus().is2xxSuccessful();
+    return provider;
+  }
+}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/HermesTestClient.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/HermesTestClient.java
new file mode 100644
index 0000000000..c682343ed0
--- /dev/null
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/HermesTestClient.java
@@ -0,0 +1,552 @@
+package pl.allegro.tech.hermes.test.helper.client.integration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+
+import jakarta.ws.rs.core.Response;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicLong;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.util.MultiValueMap;
+import pl.allegro.tech.hermes.api.BlacklistStatus;
+import pl.allegro.tech.hermes.api.ConsumerGroup;
+import pl.allegro.tech.hermes.api.Group;
+import pl.allegro.tech.hermes.api.MessageFiltersVerificationInput;
+import pl.allegro.tech.hermes.api.OAuthProvider;
+import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
+import pl.allegro.tech.hermes.api.OffsetRetransmissionDate;
+import pl.allegro.tech.hermes.api.PatchData;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.api.TopicWithSchema;
+import pl.allegro.tech.hermes.consumers.supervisor.process.RunningSubscriptionStatus;
+
+public class HermesTestClient {
+  private final ManagementTestClient managementTestClient;
+  private final FrontendTestClient frontendTestClient;
+  private final ConsumerTestClient consumerTestClient;
+
+  public HermesTestClient(int managementPort, int frontendPort, int consumerPort) {
+    this.managementTestClient = new ManagementTestClient(managementPort);
+    this.frontendTestClient = new FrontendTestClient(frontendPort);
+    this.consumerTestClient = new ConsumerTestClient(consumerPort);
+  }
+
+  public HermesTestClient(
+      int managementPort,
+      int frontendPort,
+      int consumerPort,
+      String defaultHeaderName,
+      String defaultHeaderValue) {
+    this.managementTestClient =
+        new ManagementTestClient(managementPort, defaultHeaderName, defaultHeaderValue);
+    this.frontendTestClient = new FrontendTestClient(frontendPort);
+    this.consumerTestClient = new ConsumerTestClient(consumerPort);
+  }
+
+  public WebTestClient.ResponseSpec createGroup(Group group) {
+    return managementTestClient.createGroup(group);
+  }
+
+  public WebTestClient.ResponseSpec createTopic(TopicWithSchema topicWithSchema) {
+    return managementTestClient.createTopic(topicWithSchema);
+  }
+
+  public WebTestClient.ResponseSpec getTopicResponse(String topicQualifiedName) {
+    return managementTestClient.getTopic(topicQualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec saveSchema(String topicQualifiedName, String schema) {
+    return managementTestClient.saveSchema(topicQualifiedName, schema);
+  }
+
+  public void ensureSchemaSaved(String topicQualifiedName, boolean validate, String schema) {
+    managementTestClient
+        .saveSchema(topicQualifiedName, validate, schema)
+        .expectStatus()
+        .isCreated();
+    waitAtMost(adjust(Duration.ofMinutes(1)))
+        .untilAsserted(
+            () -> managementTestClient.getSchema(topicQualifiedName).expectStatus().isOk());
+  }
+
+  public WebTestClient.ResponseSpec saveSchema(
+      String topicQualifiedName, boolean validate, String schema) {
+    return managementTestClient.saveSchema(topicQualifiedName, validate, schema);
+  }
+
+  public WebTestClient.ResponseSpec getSchema(String topicQualifiedName) {
+    return managementTestClient.getSchema(topicQualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec deleteSchema(String topicQualifiedName) {
+    return managementTestClient.deleteSchema(topicQualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec updateTopic(String qualifiedTopicName, PatchData patch) {
+    return managementTestClient.updateTopic(qualifiedTopicName, patch);
+  }
+
+  public Subscription getSubscription(String topicQualifiedName, String subscriptionName) {
+    return getSubscriptionResponse(topicQualifiedName, subscriptionName)
+        .expectStatus()
+        .is2xxSuccessful()
+        .expectBody(Subscription.class)
+        .returnResult()
+        .getResponseBody();
+  }
+
+  public WebTestClient.ResponseSpec getSubscriptionResponse(
+      String topicQualifiedName, String subscriptionName) {
+    return managementTestClient.getSubscription(topicQualifiedName, subscriptionName);
+  }
+
+  public WebTestClient.ResponseSpec getSubscriptionMetrics(
+      String topicQualifiedName, String subscriptionName) {
+    return managementTestClient.getSubscriptionMetrics(topicQualifiedName, subscriptionName);
+  }
+
+  public WebTestClient.ResponseSpec suspendSubscription(Topic topic, String subscription) {
+    return managementTestClient
+        .updateSubscriptionState(topic, subscription, Subscription.State.SUSPENDED)
+        .expectStatus()
+        .is2xxSuccessful();
+  }
+
+  public void waitUntilSubscriptionActivated(String topicQualifiedName, String subscriptionName) {
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              assertThat(
+                      managementTestClient
+                          .getSubscription(topicQualifiedName, subscriptionName)
+                          .expectStatus()
+                          .is2xxSuccessful()
+                          .expectBody(Subscription.class)
+                          .returnResult()
+                          .getResponseBody()
+                          .getState())
+                  .isEqualTo(Subscription.State.ACTIVE);
+              assertThat(
+                      managementTestClient
+                          .getConsumerGroupsDescription(topicQualifiedName, subscriptionName)
+                          .expectBodyList(ConsumerGroup.class)
+                          .returnResult()
+                          .getResponseBody()
+                          .get(0)
+                          .getState())
+                  .isEqualTo("Stable");
+            });
+  }
+
+  public void waitUntilSubscriptionSuspended(String topicQualifiedName, String subscriptionName) {
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              assertThat(
+                      managementTestClient
+                          .getSubscription(topicQualifiedName, subscriptionName)
+                          .expectStatus()
+                          .is2xxSuccessful()
+                          .expectBody(Subscription.class)
+                          .returnResult()
+                          .getResponseBody()
+                          .getState())
+                  .isEqualTo(Subscription.State.SUSPENDED);
+              assertThat(
+                      managementTestClient
+                          .getConsumerGroupsDescription(topicQualifiedName, subscriptionName)
+                          .expectBodyList(ConsumerGroup.class)
+                          .returnResult()
+                          .getResponseBody()
+                          .get(0)
+                          .getState())
+                  .isEqualTo("Empty");
+            });
+  }
+
+  public void waitUntilConsumerCommitsOffset(String topicQualifiedName, String subscriptionName) {
+    long committedMessagesCount = calculateCommittedMessages(topicQualifiedName, subscriptionName);
+    waitAtMost(adjust(Duration.ofMinutes(1)))
+        .untilAsserted(
+            () -> {
+              long currentCommittedMessagesCount =
+                  calculateCommittedMessages(topicQualifiedName, subscriptionName);
+              assertThat(currentCommittedMessagesCount).isGreaterThan(committedMessagesCount);
+            });
+  }
+
+  private long calculateCommittedMessages(String topicQualifiedName, String subscription) {
+    AtomicLong messagesCommittedCount = new AtomicLong(0);
+    List<ConsumerGroup> consumerGroups =
+        getConsumerGroupsDescription(topicQualifiedName, subscription)
+            .expectBodyList(ConsumerGroup.class)
+            .returnResult()
+            .getResponseBody();
+    Objects.requireNonNull(consumerGroups)
+        .forEach(
+            consumerGroup ->
+                consumerGroup
+                    .getMembers()
+                    .forEach(
+                        member ->
+                            member
+                                .getPartitions()
+                                .forEach(
+                                    partition ->
+                                        messagesCommittedCount.addAndGet(
+                                            partition.getCurrentOffset()))));
+    return messagesCommittedCount.get();
+  }
+
+  public int publishUntilSuccess(String topicQualifiedName, String body) {
+    return frontendTestClient.publishUntilSuccess(topicQualifiedName, body);
+  }
+
+  public int publishUntilStatus(String topicQualifiedName, String body, int statusCode) {
+    return frontendTestClient.publishUntilStatus(topicQualifiedName, body, statusCode);
+  }
+
+  public int publishUntilSuccess(
+      String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
+    return frontendTestClient.publishUntilSuccess(topicQualifiedName, body, headers);
+  }
+
+  public int publishJSONUntilSuccess(String topicQualifiedName, String body) {
+    return frontendTestClient.publishJSONUntilSuccess(topicQualifiedName, body, new HttpHeaders());
+  }
+
+  public int publishAvroUntilSuccess(String topicQualifiedName, byte[] body) {
+    return frontendTestClient.publishAvroUntilSuccess(topicQualifiedName, body);
+  }
+
+  public int publishAvroUntilSuccess(
+      String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
+    return frontendTestClient.publishAvroUntilSuccess(topicQualifiedName, body, headers);
+  }
+
+  public WebTestClient.ResponseSpec updateSubscription(
+      Topic topic, String subscription, PatchData patch) {
+    return managementTestClient.updateSubscription(topic, subscription, patch);
+  }
+
+  public WebTestClient.ResponseSpec publish(
+      String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
+    return frontendTestClient.publishWithHeaders(topicQualifiedName, body, headers);
+  }
+
+  public WebTestClient.ResponseSpec publish(String topicQualifiedName, String body) {
+    return frontendTestClient.publish(topicQualifiedName, body);
+  }
+
+  public WebTestClient.ResponseSpec publishAvro(String topicQualifiedName, byte[] body) {
+    return frontendTestClient.publishAvro(topicQualifiedName, body, new HttpHeaders());
+  }
+
+  public WebTestClient.ResponseSpec publishAvro(
+      String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
+    return frontendTestClient.publishAvro(topicQualifiedName, body, headers);
+  }
+
+  public WebTestClient.ResponseSpec publishJSON(String topicQualifiedName, String body) {
+    return frontendTestClient.publishJSON(topicQualifiedName, body, new HttpHeaders());
+  }
+
+  public Response publishChunked(String topicQualifiedName, String body) {
+    return frontendTestClient.publishChunked(topicQualifiedName, body);
+  }
+
+  public String publishSlowly(
+      int clientTimeout,
+      int pauseTimeBetweenChunks,
+      int delayBeforeSendingFirstData,
+      String topicName,
+      boolean chunkedEncoding)
+      throws IOException, InterruptedException {
+    return frontendTestClient.publishSlowly(
+        clientTimeout,
+        pauseTimeBetweenChunks,
+        delayBeforeSendingFirstData,
+        topicName,
+        chunkedEncoding);
+  }
+
+  public String publishSlowly(
+      int clientTimeout,
+      int pauseTimeBetweenChunks,
+      int delayBeforeSendingFirstData,
+      String topicName)
+      throws IOException, InterruptedException {
+    return publishSlowly(
+        clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topicName, false);
+  }
+
+  public void blacklistTopic(String topicQualifiedName) {
+    managementTestClient.blacklistTopic(topicQualifiedName).expectStatus().is2xxSuccessful();
+  }
+
+  public WebTestClient.ResponseSpec blacklistTopicResponse(String topicQualifiedName) {
+    return managementTestClient.blacklistTopic(topicQualifiedName);
+  }
+
+  public void unblacklistTopic(String topicQualifiedName) {
+    managementTestClient.unblacklistTopic(topicQualifiedName).expectStatus().is2xxSuccessful();
+  }
+
+  public BlacklistStatus isTopicBlacklisted(String topicQualifiedName) {
+    return managementTestClient
+        .isTopicBlacklisted(topicQualifiedName)
+        .expectStatus()
+        .is2xxSuccessful()
+        .expectBody(BlacklistStatus.class)
+        .returnResult()
+        .getResponseBody();
+  }
+
+  public WebTestClient.ResponseSpec unblacklistTopicResponse(String topicQualifiedName) {
+    return managementTestClient.unblacklistTopic(topicQualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec getLatestUndeliveredMessage(
+      String topicQualifiedName, String subscriptionName) {
+    return managementTestClient.getLatestUndeliveredMessage(topicQualifiedName, subscriptionName);
+  }
+
+  public List<RunningSubscriptionStatus> getRunningSubscriptionsStatus() {
+    return consumerTestClient
+        .getRunningSubscriptionsStatus()
+        .expectStatus()
+        .is2xxSuccessful()
+        .expectBodyList(RunningSubscriptionStatus.class)
+        .returnResult()
+        .getResponseBody();
+  }
+
+  public WebTestClient.ResponseSpec retransmit(
+      String qualifiedName,
+      String subscriptionName,
+      OffsetRetransmissionDate retransmissionDate,
+      boolean dryRun) {
+    return managementTestClient.retransmit(
+        qualifiedName, subscriptionName, retransmissionDate, dryRun);
+  }
+
+  public WebTestClient.ResponseSpec getPreview(
+      String qualifiedTopicName, String primaryKafkaClusterName, int partition, long offset) {
+    return managementTestClient.getPreview(
+        qualifiedTopicName, primaryKafkaClusterName, partition, offset);
+  }
+
+  public WebTestClient.ResponseSpec getPreview(String qualifiedTopicName) {
+    return managementTestClient.getPreview(qualifiedTopicName);
+  }
+
+  public WebTestClient.ResponseSpec getTopicMetrics(String qualifiedName) {
+    return managementTestClient.getTopicMetrics(qualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec listSubscriptions(String qualifiedName) {
+    return managementTestClient.listSubscriptions(qualifiedName, false);
+  }
+
+  public WebTestClient.ResponseSpec listTopics(String groupName) {
+    return managementTestClient.listTopics(groupName, false);
+  }
+
+  public WebTestClient.ResponseSpec getConsumersMetrics() {
+    return consumerTestClient.getMetrics();
+  }
+
+  public WebTestClient.ResponseSpec getFrontendMetrics() {
+    return frontendTestClient.getMetrics();
+  }
+
+  public WebTestClient.ResponseSpec verifyFilters(
+      String qualifiedTopicName, MessageFiltersVerificationInput input) {
+    return managementTestClient.verifyFilters(qualifiedTopicName, input);
+  }
+
+  public WebTestClient.ResponseSpec getManagementHealth() {
+    return managementTestClient.getStatusHealth();
+  }
+
+  public WebTestClient.ResponseSpec getManagementStats() {
+    return managementTestClient.getStats();
+  }
+
+  public WebTestClient.ResponseSpec setReadiness(String dc, boolean state) {
+    return managementTestClient.setReadiness(dc, state);
+  }
+
+  public WebTestClient.ResponseSpec getReadiness() {
+    return managementTestClient.getReadiness();
+  }
+
+  public WebTestClient.ResponseSpec getFrontendReadiness() {
+    return frontendTestClient.getStatusReady();
+  }
+
+  public WebTestClient.ResponseSpec getAllTopicClients(String topicQualifiedName) {
+    return managementTestClient.getAllTopicClients(topicQualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec getSubscriptionsForOwner(String source, String ownerId) {
+    return managementTestClient.getSubscriptionsForOwner(source, ownerId);
+  }
+
+  public WebTestClient.ResponseSpec deleteSubscription(
+      String topicQualifiedName, String subscriptionName) {
+    return managementTestClient.deleteSubscription(topicQualifiedName, subscriptionName);
+  }
+
+  public WebTestClient.ResponseSpec getTopicsForOwner(String source, String ownerId) {
+    return managementTestClient.getTopicsForOwner(source, ownerId);
+  }
+
+  public WebTestClient.ResponseSpec deleteTopic(String topicQualifiedName) {
+    return managementTestClient.deleteTopic(topicQualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec listTrackedTopics(String groupName) {
+    return managementTestClient.listTopics(groupName, true);
+  }
+
+  public WebTestClient.ResponseSpec queryTopics(String group, String query) {
+    return managementTestClient.queryTopics(group, query);
+  }
+
+  public WebTestClient.ResponseSpec queryGroups(String query) {
+    return managementTestClient.queryGroups(query);
+  }
+
+  public WebTestClient.ResponseSpec queryTopics(String query) {
+    return managementTestClient.queryTopics(query);
+  }
+
+  public WebTestClient.ResponseSpec queryTopicMetrics(String query) {
+    return managementTestClient.queryTopicMetrics(query);
+  }
+
+  public WebTestClient.ResponseSpec querySubscriptionMetrics(String query) {
+    return managementTestClient.querySubscriptionMetrics(query);
+  }
+
+  public WebTestClient.ResponseSpec querySubscriptions(String query) {
+    return managementTestClient.querySubscriptions(query);
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthy() {
+    return managementTestClient.listUnhealthy();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyAsPlainText() {
+    return managementTestClient.listUnhealthyAsPlainText();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForOwner(String ownerId) {
+    return managementTestClient.listUnhealthy(ownerId);
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForOwnerAsPlainText(String ownerId) {
+    return managementTestClient.listUnhealthyAsPlainText(ownerId);
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForTopic(String qualifiedName) {
+    return managementTestClient.listUnhealthyForTopic(qualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForTopicAsPlainText(String qualifiedName) {
+    return managementTestClient.listUnhealthyForTopicAsPlainText(qualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForSubscription(
+      String topicQualifiedName, String subscriptionName) {
+    return managementTestClient.listUnhealthyForSubscription(topicQualifiedName, subscriptionName);
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForSubscriptionAsPlainText(
+      String topicQualifiedName, String subscriptionName) {
+    return managementTestClient.listUnhealthyForSubscriptionAsPlainText(
+        topicQualifiedName, subscriptionName);
+  }
+
+  public WebTestClient.ResponseSpec createOAuthProvider(OAuthProvider provider) {
+    return managementTestClient.createOAuthProvider(provider);
+  }
+
+  public WebTestClient.ResponseSpec getOAuthProvider(String name) {
+    return managementTestClient.getOAuthProvider(name);
+  }
+
+  public WebTestClient.ResponseSpec removeOAuthProvider(String name) {
+    return managementTestClient.removeOAuthProvider(name);
+  }
+
+  public WebTestClient.ResponseSpec listOAuthProvider() {
+    return managementTestClient.listOAuthProvider();
+  }
+
+  public WebTestClient.ResponseSpec updateOAuthProvider(String name, PatchData patch) {
+    return managementTestClient.updateOAuthProvider(name, patch);
+  }
+
+  public WebTestClient.ResponseSpec setMode(String mode) {
+    return managementTestClient.setMode(mode);
+  }
+
+  public WebTestClient.ResponseSpec getOfflineRetransmissionTasks() {
+    return managementTestClient.getOfflineRetransmissionTasks();
+  }
+
+  public WebTestClient.ResponseSpec deleteOfflineRetransmissionTask(String taskId) {
+    return managementTestClient.deleteOfflineRetransmissionTask(taskId);
+  }
+
+  public WebTestClient.ResponseSpec createOfflineRetransmissionTask(
+      OfflineRetransmissionRequest request) {
+    return managementTestClient.createOfflineRetransmissionTask(request);
+  }
+
+  public WebTestClient.ResponseSpec createSubscription(Subscription subscription) {
+    return managementTestClient.createSubscription(subscription);
+  }
+
+  public WebTestClient.ResponseSpec listTrackedSubscriptions(String qualifiedName) {
+    return managementTestClient.listSubscriptions(qualifiedName, true);
+  }
+
+  public WebTestClient.ResponseSpec querySubscriptions(String qualifiedName, String query) {
+    return managementTestClient.querySubscriptions(qualifiedName, query);
+  }
+
+  public WebTestClient.ResponseSpec getSubscriptionHealth(String qualifiedTopicName, String name) {
+    return managementTestClient.getSubscriptionHealth(qualifiedTopicName, name);
+  }
+
+  public WebTestClient.ResponseSpec getConsumerGroupsDescription(
+      String qualifiedTopicName, String subscriptionName) {
+    return managementTestClient.getConsumerGroupsDescription(qualifiedTopicName, subscriptionName);
+  }
+
+  public WebTestClient.ResponseSpec deleteGroup(String groupName) {
+    return managementTestClient.deleteGroup(groupName);
+  }
+
+  public WebTestClient.ResponseSpec updateGroup(String groupName, Group group) {
+    return managementTestClient.updateGroup(groupName, group);
+  }
+
+  public List<String> getGroups() {
+    return managementTestClient.getGroups();
+  }
+
+  public WebTestClient.ResponseSpec moveOffsetsToTheEnd(
+      String topicQualifiedName, String subscriptionName) {
+    return managementTestClient.moveOffsetsToTheEnd(topicQualifiedName, subscriptionName);
+  }
+}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/ManagementTestClient.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/ManagementTestClient.java
new file mode 100644
index 0000000000..2735b5f710
--- /dev/null
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/integration/ManagementTestClient.java
@@ -0,0 +1,818 @@
+package pl.allegro.tech.hermes.test.helper.client.integration;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.UriBuilder;
+import java.time.Duration;
+import java.util.List;
+import org.eclipse.jetty.client.HttpClient;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.reactive.ClientHttpConnector;
+import org.springframework.http.client.reactive.JettyClientHttpConnector;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import pl.allegro.tech.hermes.api.Group;
+import pl.allegro.tech.hermes.api.MessageFiltersVerificationInput;
+import pl.allegro.tech.hermes.api.OAuthProvider;
+import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
+import pl.allegro.tech.hermes.api.OffsetRetransmissionDate;
+import pl.allegro.tech.hermes.api.PatchData;
+import pl.allegro.tech.hermes.api.Readiness;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.api.TopicWithSchema;
+import reactor.core.publisher.Mono;
+
+public class ManagementTestClient {
+
+  private static final String TOPICS_PATH = "/topics";
+
+  private static final String TOPIC_PATH = "/topics/{topicName}";
+
+  private static final String SUBSCRIPTIONS_PATH = "/topics/{topicName}/subscriptions";
+
+  private static final String SUBSCRIPTION_PATH =
+      "/topics/{topicName}/subscriptions/{subscriptionName}";
+
+  private static final String SUBSCRIPTION_STATE_PATH =
+      "/topics/{topicName}/subscriptions/{subscriptionName}/state";
+
+  private static final String SUBSCRIPTION_METRICS_PATH =
+      "/topics/{topicName}/subscriptions/{subscriptionName}/metrics";
+
+  private static final String GROUPS_PATH = "/groups";
+
+  private static final String GROUP_PATH = "/groups/{groupName}";
+
+  private static final String RETRANSMISSION_PATH =
+      "/topics/{topicName}/subscriptions/{subscriptionName}/retransmission";
+
+  private static final String BLACKLIST_TOPICS_PATH = "/blacklist/topics";
+
+  private static final String BLACKLIST_TOPIC_PATH = "/blacklist/topics/{topicName}";
+
+  private static final String LATEST_UNDELIVERED_MESSAGE =
+      "/topics/{topicName}/subscriptions/{subscriptionName}/undelivered";
+
+  private static final String TOPIC_PREVIEW = "/topics/{topicName}/preview";
+
+  private static final String TOPIC_PREVIEW_OFFSET =
+      "/topics/{topicName}/preview/cluster/{brokersClusterName}/partition/{partition}/offset/{offset}";
+
+  private static final String MOVE_SUBSCRIPTION_OFFSETS =
+      "/topics/{topicName}/subscriptions/{subscriptionName}/moveOffsetsToTheEnd";
+
+  private static final String SET_READINESS = "/readiness/datacenters/{dc}";
+
+  private static final String GET_READINESS = "/readiness/datacenters";
+
+  private static final String TOPIC_SCHEMA = "/topics/{topicName}/schema";
+
+  private static final String ALL_TOPIC_CLIENTS = "/topics/{topicName}/clients";
+
+  private static final String SUBSCRIPTIONS_BY_OWNER = "/subscriptions/owner/{source}/{ownerId}";
+
+  private static final String TOPICS_BY_OWNER = "/topics/owner/{source}/{ownerId}";
+
+  private static final String TOPIC_METRICS_PATH = "/topics/{topicName}/metrics";
+
+  private static final String FILTERS = "/filters/{topicName}";
+
+  private static final String STATUS_HEALTH = "/status/health";
+
+  private static final String STATS = "/stats";
+
+  private static final String QUERY_GROUPS = "/query/groups";
+
+  private static final String QUERY_TOPICS = "/query/topics";
+
+  private static final String QUERY_SUBSCRIPTIONS = "/query/subscriptions";
+
+  private static final String QUERY_TOPIC_METRICS = "/query/topics/metrics";
+
+  private static final String QUERY_SUBSCRIPTION_METRICS = "/query/subscriptions/metrics";
+
+  private static final String OAUTH_PROVIDERS_PATH = "/oauth/providers";
+
+  private static final String SUBSCRIPTIONS_QUERY = "/topics/{topicName}/subscriptions/query";
+
+  private static final String OAUTH_PROVIDER_PATH = "/oauth/providers/{oAuthProviderName}";
+
+  private static final String UNHEALTHY_PATH = "/unhealthy";
+
+  private static final String TOPICS_QUERY = "/topics/query";
+
+  private static final String MODE = "/mode";
+
+  private static final String OFFLINE_RETRANSMISSION_TASKS = "/offline-retransmission/tasks";
+
+  private static final String OFFLINE_RETRANSMISSION_TASK =
+      "/offline-retransmission/tasks/{taskId}";
+
+  private static final String SUBSCRIPTION_HEALTH =
+      "/topics/{topicName}/subscriptions/{subscription}/health";
+
+  private static final String CONSUMER_GROUPS =
+      "/topics/{topicName}/subscriptions/{subscription}/consumer-groups";
+
+  private static final String OWNERS_SEARCH_PATH = "/owners/sources/{source}";
+
+  private final WebTestClient webTestClient;
+
+  private final String managementContainerUrl;
+
+  private final ObjectMapper objectMapper;
+
+  public ManagementTestClient(int managementPort) {
+    this.managementContainerUrl = "http://localhost:" + managementPort;
+    this.webTestClient = configureWebTestClient().build();
+    this.objectMapper = new ObjectMapper();
+  }
+
+  public ManagementTestClient(
+      int managementPort, String defaultHeaderName, String defaultHeaderValue) {
+    this.managementContainerUrl = "http://localhost:" + managementPort;
+    this.webTestClient =
+        configureWebTestClient().defaultHeader(defaultHeaderName, defaultHeaderValue).build();
+    this.objectMapper = new ObjectMapper();
+  }
+
+  private WebTestClient.Builder configureWebTestClient() {
+    return WebTestClient.bindToServer(clientHttpConnector())
+        .responseTimeout(Duration.ofSeconds(30))
+        .baseUrl(managementContainerUrl)
+        .codecs(configurer -> configurer.defaultCodecs().maxInMemorySize(16 * 1024 * 1024));
+  }
+
+  private static ClientHttpConnector clientHttpConnector() {
+    HttpClient httpClient = new HttpClient();
+    httpClient.setMaxConnectionsPerDestination(256);
+    return new JettyClientHttpConnector(httpClient);
+  }
+
+  public WebTestClient.ResponseSpec createGroup(Group group) {
+    return sendCreateGroupRequest(group);
+  }
+
+  public List<String> getGroups() {
+    String jsonString =
+        webTestClient
+            .get()
+            .uri(GROUPS_PATH)
+            .exchange()
+            .expectBody(String.class)
+            .returnResult()
+            .getResponseBody();
+
+    return mapStringJsonToListOfString(jsonString);
+  }
+
+  public WebTestClient.ResponseSpec createTopic(TopicWithSchema topicWithSchema) {
+    return sendCreateTopicRequest(topicWithSchema);
+  }
+
+  public WebTestClient.ResponseSpec getTopic(String topicQualifiedName) {
+    return getSingleTopic(topicQualifiedName);
+  }
+
+  public WebTestClient.ResponseSpec createSubscription(Subscription subscription) {
+    return sendCreateSubscriptionRequest(subscription);
+  }
+
+  public WebTestClient.ResponseSpec updateSubscription(
+      Topic topic, String subscription, PatchData patch) {
+    return webTestClient
+        .put()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTION_PATH)
+                .build(topic.getQualifiedName(), subscription))
+        .body(Mono.just(patch), PatchData.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec updateSubscriptionState(
+      Topic topic, String subscription, Subscription.State state) {
+    return webTestClient
+        .put()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTION_STATE_PATH)
+                .build(topic.getQualifiedName(), subscription))
+        .body(Mono.just(state), Subscription.State.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getSubscription(
+      String topicQualifiedName, String subscriptionName) {
+    return getSingleSubscription(topicQualifiedName, subscriptionName);
+  }
+
+  public WebTestClient.ResponseSpec getSubscriptionMetrics(
+      String topicQualifiedName, String subscriptionName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTION_METRICS_PATH)
+                .build(topicQualifiedName, subscriptionName))
+        .exchange();
+  }
+
+  private WebTestClient.ResponseSpec getSingleTopic(String topicQualifiedName) {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .exchange();
+  }
+
+  private WebTestClient.ResponseSpec getSingleSubscription(
+      String topicQualifiedName, String subscriptionName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTION_PATH)
+                .build(topicQualifiedName, subscriptionName))
+        .exchange();
+  }
+
+  private WebTestClient.ResponseSpec sendCreateTopicRequest(TopicWithSchema topicWithSchema) {
+    return webTestClient
+        .post()
+        .uri(TOPICS_PATH)
+        .body(Mono.just(topicWithSchema), TopicWithSchema.class)
+        .exchange();
+  }
+
+  WebTestClient.ResponseSpec retransmit(
+      String topicName,
+      String subscriptionName,
+      OffsetRetransmissionDate retransmissionDate,
+      boolean dryRun) {
+    return webTestClient
+        .put()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(RETRANSMISSION_PATH)
+                .queryParam("dryRun", dryRun)
+                .build(topicName, subscriptionName))
+        .body(Mono.just(retransmissionDate), OffsetRetransmissionDate.class)
+        .exchange();
+  }
+
+  private WebTestClient.ResponseSpec sendCreateSubscriptionRequest(Subscription subscription) {
+    return webTestClient
+        .post()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTIONS_PATH)
+                .build(subscription.getQualifiedTopicName()))
+        .body(Mono.just(subscription), Subscription.class)
+        .exchange();
+  }
+
+  private WebTestClient.ResponseSpec sendCreateGroupRequest(Group group) {
+    return webTestClient.post().uri(GROUPS_PATH).body(Mono.just(group), Group.class).exchange();
+  }
+
+  private List<String> mapStringJsonToListOfString(String jsonString) {
+    try {
+      return objectMapper.readValue(jsonString, new TypeReference<>() {});
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public WebTestClient.ResponseSpec blacklistTopic(String topicQualifiedName) {
+    return webTestClient
+        .post()
+        .uri(BLACKLIST_TOPICS_PATH)
+        .body(Mono.just(List.of(topicQualifiedName)), List.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec unblacklistTopic(String topicQualifiedName) {
+    return webTestClient
+        .delete()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(BLACKLIST_TOPIC_PATH)
+                .build(topicQualifiedName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec isTopicBlacklisted(String topicQualifiedName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(BLACKLIST_TOPIC_PATH)
+                .build(topicQualifiedName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getLatestUndeliveredMessage(
+      String topicQualifiedName, String subscriptionName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(LATEST_UNDELIVERED_MESSAGE)
+                .build(topicQualifiedName, subscriptionName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getPreview(
+      String qualifiedTopicName, String primaryKafkaClusterName, int partition, long offset) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(TOPIC_PREVIEW_OFFSET)
+                .build(qualifiedTopicName, primaryKafkaClusterName, partition, offset))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getPreview(String qualifiedTopicName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(TOPIC_PREVIEW)
+                .build(qualifiedTopicName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec updateTopic(String qualifiedTopicName, PatchData patch) {
+    return webTestClient
+        .put()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(TOPIC_PATH).build(qualifiedTopicName))
+        .body(Mono.just(patch), PatchData.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getTopicMetrics(String qualifiedTopicName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(TOPIC_METRICS_PATH)
+                .build(qualifiedTopicName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listSubscriptions(String qualifiedTopicName, boolean tracked) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTIONS_PATH)
+                .queryParam("tracked", tracked)
+                .build(qualifiedTopicName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listTopics(String groupName, boolean tracked) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(TOPICS_PATH)
+                .queryParam("groupName", groupName)
+                .queryParam("tracked", tracked)
+                .build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec setReadiness(String dc, boolean state) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(SET_READINESS).build(dc))
+        .body(Mono.just(new Readiness(state)), Readiness.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getReadiness() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(GET_READINESS).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec saveSchema(
+      String qualifiedTopicName, boolean validate, String schema) {
+    return webTestClient
+        .post()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(TOPIC_SCHEMA)
+                .queryParam("validate", validate)
+                .build(qualifiedTopicName))
+        .header("Content-Type", "application/json")
+        .body(Mono.just(schema), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec saveSchema(String qualifiedTopicName, String schema) {
+    return webTestClient
+        .post()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl).path(TOPIC_SCHEMA).build(qualifiedTopicName))
+        .header("Content-Type", "application/json")
+        .body(Mono.just(schema), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getSchema(String qualifiedTopicName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl).path(TOPIC_SCHEMA).build(qualifiedTopicName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec deleteSchema(String qualifiedTopicName) {
+    return webTestClient
+        .delete()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl).path(TOPIC_SCHEMA).build(qualifiedTopicName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec verifyFilters(
+      String qualifiedTopicName, MessageFiltersVerificationInput input) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(FILTERS).build(qualifiedTopicName))
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(input), MessageFiltersVerificationInput.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getStatusHealth() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(STATUS_HEALTH).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getStats() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(STATS).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec createOAuthProvider(OAuthProvider provider) {
+    return webTestClient
+        .post()
+        .uri(OAUTH_PROVIDERS_PATH)
+        .body(Mono.just(provider), OAuthProvider.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getOAuthProvider(String name) {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(OAUTH_PROVIDER_PATH).build(name))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec removeOAuthProvider(String name) {
+    return webTestClient
+        .delete()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(OAUTH_PROVIDER_PATH).build(name))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listOAuthProvider() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(OAUTH_PROVIDERS_PATH).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec updateOAuthProvider(String name, PatchData patch) {
+    return webTestClient
+        .put()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(OAUTH_PROVIDER_PATH).build(name))
+        .body(Mono.just(patch), PatchData.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getAllTopicClients(String topicQualifiedName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(ALL_TOPIC_CLIENTS)
+                .build(topicQualifiedName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getSubscriptionsForOwner(String source, String ownerId) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTIONS_BY_OWNER)
+                .build(source, ownerId))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec deleteSubscription(
+      String topicQualifiedName, String subscriptionName) {
+    return webTestClient
+        .delete()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTION_PATH)
+                .build(topicQualifiedName, subscriptionName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getTopicsForOwner(String source, String ownerId) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl).path(TOPICS_BY_OWNER).build(source, ownerId))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec deleteTopic(String topicQualifiedName) {
+    return webTestClient
+        .delete()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(TOPIC_PATH).build(topicQualifiedName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec queryTopics(String group, String query) {
+    return webTestClient
+        .post()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(TOPICS_QUERY)
+                .queryParam("groupName", group)
+                .build())
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(query), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec queryGroups(String query) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(QUERY_GROUPS).build())
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(query), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec queryTopics(String query) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(QUERY_TOPICS).build())
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(query), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec queryTopicMetrics(String query) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(QUERY_TOPIC_METRICS).build())
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(query), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec querySubscriptionMetrics(String query) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(QUERY_SUBSCRIPTION_METRICS).build())
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(query), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec querySubscriptions(String query) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(QUERY_SUBSCRIPTIONS).build())
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(query), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthy() {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(UNHEALTHY_PATH)
+                .queryParam("respectMonitoringSeverity", "false")
+                .build())
+        .header("Accept", "application/json")
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyAsPlainText() {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(UNHEALTHY_PATH)
+                .queryParam("respectMonitoringSeverity", "false")
+                .build())
+        .header("Accept", "text/plain")
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthy(String ownerId) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(UNHEALTHY_PATH)
+                .queryParam("ownerSourceName", "Plaintext")
+                .queryParam("ownerId", ownerId)
+                .queryParam("respectMonitoringSeverity", "false")
+                .build())
+        .header("Accept", "application/json")
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyAsPlainText(String ownerId) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(UNHEALTHY_PATH)
+                .queryParam("ownerSourceName", "Plaintext")
+                .queryParam("ownerId", ownerId)
+                .queryParam("respectMonitoringSeverity", "false")
+                .build())
+        .header("Accept", "text/plain")
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForTopic(String qualifiedName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(UNHEALTHY_PATH)
+                .queryParam("qualifiedTopicNames", qualifiedName)
+                .queryParam("respectMonitoringSeverity", "false")
+                .build())
+        .header("Accept", "application/json")
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForTopicAsPlainText(String qualifiedName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(UNHEALTHY_PATH)
+                .queryParam("qualifiedTopicNames", qualifiedName)
+                .build())
+        .header("Accept", "text/plain")
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForSubscription(
+      String topicQualifiedName, String subscriptionName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(UNHEALTHY_PATH)
+                .queryParam("subscriptionNames", subscriptionName)
+                .queryParam("qualifiedTopicNames", topicQualifiedName)
+                .queryParam("respectMonitoringSeverity", "false")
+                .build())
+        .header("Accept", "application/json")
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec listUnhealthyForSubscriptionAsPlainText(
+      String topicQualifiedName, String subscriptionName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(UNHEALTHY_PATH)
+                .queryParam("subscriptionNames", subscriptionName)
+                .queryParam("qualifiedTopicNames", topicQualifiedName)
+                .queryParam("respectMonitoringSeverity", "false")
+                .build())
+        .header("Accept", "text/plain")
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec searchOwners(String source, String searchString) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(OWNERS_SEARCH_PATH)
+                .queryParam("search", searchString)
+                .build(source))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec setMode(String mode) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(MODE).queryParam("mode", mode).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getOfflineRetransmissionTasks() {
+    return webTestClient
+        .get()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(OFFLINE_RETRANSMISSION_TASKS).build())
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec deleteOfflineRetransmissionTask(String taskId) {
+    return webTestClient
+        .delete()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(OFFLINE_RETRANSMISSION_TASK)
+                .build(taskId))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec createOfflineRetransmissionTask(
+      OfflineRetransmissionRequest request) {
+    return webTestClient
+        .post()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(OFFLINE_RETRANSMISSION_TASKS).build())
+        .header("Content-Type", "application/json")
+        .body(Mono.just(request), OfflineRetransmissionRequest.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec querySubscriptions(String qualifiedTopicName, String query) {
+    return webTestClient
+        .post()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTIONS_QUERY)
+                .build(qualifiedTopicName))
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(Mono.just(query), String.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getSubscriptionHealth(String qualifiedTopicName, String name) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(SUBSCRIPTION_HEALTH)
+                .build(qualifiedTopicName, name))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec getConsumerGroupsDescription(
+      String qualifiedTopicName, String subscriptionName) {
+    return webTestClient
+        .get()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(CONSUMER_GROUPS)
+                .build(qualifiedTopicName, subscriptionName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec deleteGroup(String groupName) {
+    return webTestClient
+        .delete()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(GROUP_PATH).build(groupName))
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec updateGroup(String groupName, Group group) {
+    return webTestClient
+        .put()
+        .uri(UriBuilder.fromUri(managementContainerUrl).path(GROUP_PATH).build(groupName))
+        .body(Mono.just(group), Group.class)
+        .exchange();
+  }
+
+  public WebTestClient.ResponseSpec moveOffsetsToTheEnd(
+      String topicQualifiedName, String subscriptionName) {
+    return webTestClient
+        .post()
+        .uri(
+            UriBuilder.fromUri(managementContainerUrl)
+                .path(MOVE_SUBSCRIPTION_OFFSETS)
+                .build(topicQualifiedName, subscriptionName))
+        .exchange();
+  }
+}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ManuallyTriggeredScheduledExecutorService.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ManuallyTriggeredScheduledExecutorService.java
index 249eb557a0..da3adf2519 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ManuallyTriggeredScheduledExecutorService.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ManuallyTriggeredScheduledExecutorService.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.test.helper.concurrent;
 
+import jakarta.annotation.Nonnull;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -8,116 +9,122 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import jakarta.annotation.Nonnull;
 
 public class ManuallyTriggeredScheduledExecutorService implements ScheduledExecutorService {
 
-    private final ConcurrentLinkedQueue<ScheduledTask<?>> scheduledTasks = new ConcurrentLinkedQueue<>();
-    private boolean shutdown;
-
-    @Override
-    public ScheduledFuture<?> scheduleAtFixedRate(@Nonnull Runnable command, long initialDelay, long period, @Nonnull TimeUnit unit) {
-        return insertTask(command, initialDelay, unit);
-    }
-
-    @Override
-    public ScheduledFuture<?> scheduleWithFixedDelay(@Nonnull Runnable command, long initialDelay, long delay, @Nonnull TimeUnit unit) {
-        return insertTask(command, initialDelay, unit);
-    }
-
-    @Override
-    public void shutdown() {
-        shutdown = true;
-    }
-
-    @Override
-    public List<Runnable> shutdownNow() {
-        shutdown();
-        return List.of();
-    }
-
-    @Override
-    public boolean isShutdown() {
-        return false;
-    }
-
-    @Override
-    public boolean isTerminated() {
-        return shutdown;
-    }
-
-    @Override
-    public boolean awaitTermination(long timeout, @Nonnull TimeUnit unit) {
-        return true;
-    }
-
-    @Override
-    public ScheduledFuture<?> schedule(@Nonnull Runnable command, long delay, @Nonnull TimeUnit unit) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <V> ScheduledFuture<V> schedule(@Nonnull Callable<V> callable, long delay, @Nonnull TimeUnit unit) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void execute(@Nonnull Runnable command) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <T> Future<T> submit(@Nonnull Callable<T> task) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <T> Future<T> submit(@Nonnull Runnable task, T result) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Future<?> submit(@Nonnull Runnable task) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <T> List<Future<T>> invokeAll(@Nonnull Collection<? extends Callable<T>> tasks) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <T> List<Future<T>> invokeAll(@Nonnull Collection<? extends Callable<T>> tasks, long timeout, @Nonnull TimeUnit unit) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <T> T invokeAny(@Nonnull Collection<? extends Callable<T>> tasks) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public <T> T invokeAny(@Nonnull Collection<? extends Callable<T>> tasks, long timeout, @Nonnull TimeUnit unit) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void triggerScheduledTasks() {
-        for (ScheduledTask<?> scheduledTask : scheduledTasks) {
-            if (!scheduledTask.isCancelled()) {
-                scheduledTask.execute();
-            }
-        }
-    }
-
-    private ScheduledFuture<?> insertTask(Runnable command, long delay, TimeUnit unit) {
-        ScheduledTask<?> scheduledTask = new ScheduledTask<>(
-                () -> {
-                    command.run();
-                    return null;
-                },
-                unit.convert(delay, TimeUnit.MILLISECONDS)
-        );
-        scheduledTasks.offer(scheduledTask);
-        return scheduledTask;
-    }
+  private final ConcurrentLinkedQueue<ScheduledTask<?>> scheduledTasks =
+      new ConcurrentLinkedQueue<>();
+  private boolean shutdown;
+
+  @Override
+  public ScheduledFuture<?> scheduleAtFixedRate(
+      @Nonnull Runnable command, long initialDelay, long period, @Nonnull TimeUnit unit) {
+    return insertTask(command, initialDelay, unit);
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleWithFixedDelay(
+      @Nonnull Runnable command, long initialDelay, long delay, @Nonnull TimeUnit unit) {
+    return insertTask(command, initialDelay, unit);
+  }
+
+  @Override
+  public void shutdown() {
+    shutdown = true;
+  }
+
+  @Override
+  public List<Runnable> shutdownNow() {
+    shutdown();
+    return List.of();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return false;
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return shutdown;
+  }
+
+  @Override
+  public boolean awaitTermination(long timeout, @Nonnull TimeUnit unit) {
+    return true;
+  }
+
+  @Override
+  public ScheduledFuture<?> schedule(
+      @Nonnull Runnable command, long delay, @Nonnull TimeUnit unit) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <V> ScheduledFuture<V> schedule(
+      @Nonnull Callable<V> callable, long delay, @Nonnull TimeUnit unit) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void execute(@Nonnull Runnable command) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <T> Future<T> submit(@Nonnull Callable<T> task) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <T> Future<T> submit(@Nonnull Runnable task, T result) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Future<?> submit(@Nonnull Runnable task) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <T> List<Future<T>> invokeAll(@Nonnull Collection<? extends Callable<T>> tasks) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <T> List<Future<T>> invokeAll(
+      @Nonnull Collection<? extends Callable<T>> tasks, long timeout, @Nonnull TimeUnit unit) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <T> T invokeAny(@Nonnull Collection<? extends Callable<T>> tasks) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public <T> T invokeAny(
+      @Nonnull Collection<? extends Callable<T>> tasks, long timeout, @Nonnull TimeUnit unit) {
+    throw new UnsupportedOperationException();
+  }
+
+  public void triggerScheduledTasks() {
+    for (ScheduledTask<?> scheduledTask : scheduledTasks) {
+      if (!scheduledTask.isCancelled()) {
+        scheduledTask.execute();
+      }
+    }
+  }
+
+  private ScheduledFuture<?> insertTask(Runnable command, long delay, TimeUnit unit) {
+    ScheduledTask<?> scheduledTask =
+        new ScheduledTask<>(
+            () -> {
+              command.run();
+              return null;
+            },
+            unit.convert(delay, TimeUnit.MILLISECONDS));
+    scheduledTasks.offer(scheduledTask);
+    return scheduledTask;
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ScheduledTask.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ScheduledTask.java
index 4e9fcf7cb6..b101a29673 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ScheduledTask.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ScheduledTask.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.test.helper.concurrent;
 
+import jakarta.annotation.Nonnull;
 import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
@@ -8,62 +9,62 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import jakarta.annotation.Nonnull;
 
 class ScheduledTask<T> implements ScheduledFuture<T> {
 
-    private final Callable<T> callable;
-    private final long delay;
-    private final CompletableFuture<T> result;
+  private final Callable<T> callable;
+  private final long delay;
+  private final CompletableFuture<T> result;
 
-    public ScheduledTask(Callable<T> callable, long delay) {
-        this.callable = Objects.requireNonNull(callable);
-        this.result = new CompletableFuture<>();
-        this.delay = delay;
-    }
+  public ScheduledTask(Callable<T> callable, long delay) {
+    this.callable = Objects.requireNonNull(callable);
+    this.result = new CompletableFuture<>();
+    this.delay = delay;
+  }
 
-    public void execute() {
-        if (!result.isDone()) {
-            try {
-                callable.call();
-            } catch (Exception e) {
-                result.completeExceptionally(e);
-            }
-        }
+  public void execute() {
+    if (!result.isDone()) {
+      try {
+        callable.call();
+      } catch (Exception e) {
+        result.completeExceptionally(e);
+      }
     }
+  }
 
-    @Override
-    public long getDelay(TimeUnit unit) {
-        return unit.convert(delay, TimeUnit.MILLISECONDS);
-    }
+  @Override
+  public long getDelay(TimeUnit unit) {
+    return unit.convert(delay, TimeUnit.MILLISECONDS);
+  }
 
-    @Override
-    public int compareTo(Delayed o) {
-        return Long.compare(getDelay(TimeUnit.MILLISECONDS), o.getDelay(TimeUnit.MILLISECONDS));
-    }
+  @Override
+  public int compareTo(Delayed o) {
+    return Long.compare(getDelay(TimeUnit.MILLISECONDS), o.getDelay(TimeUnit.MILLISECONDS));
+  }
 
-    @Override
-    public boolean cancel(boolean mayInterruptIfRunning) {
-        return result.cancel(mayInterruptIfRunning);
-    }
+  @Override
+  public boolean cancel(boolean mayInterruptIfRunning) {
+    return result.cancel(mayInterruptIfRunning);
+  }
 
-    @Override
-    public boolean isCancelled() {
-        return result.isCancelled();
-    }
+  @Override
+  public boolean isCancelled() {
+    return result.isCancelled();
+  }
 
-    @Override
-    public boolean isDone() {
-        return result.isDone();
-    }
+  @Override
+  public boolean isDone() {
+    return result.isDone();
+  }
 
-    @Override
-    public T get() throws InterruptedException, ExecutionException {
-        return result.get();
-    }
+  @Override
+  public T get() throws InterruptedException, ExecutionException {
+    return result.get();
+  }
 
-    @Override
-    public T get(long timeout, @Nonnull TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-        return result.get(timeout, unit);
-    }
+  @Override
+  public T get(long timeout, @Nonnull TimeUnit unit)
+      throws InterruptedException, ExecutionException, TimeoutException {
+    return result.get(timeout, unit);
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/TestExecutorServiceFactory.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/TestExecutorServiceFactory.java
index 19b3fedda1..f4a61c13a8 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/TestExecutorServiceFactory.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/TestExecutorServiceFactory.java
@@ -1,19 +1,18 @@
 package pl.allegro.tech.hermes.test.helper.concurrent;
 
-import pl.allegro.tech.hermes.common.concurrent.ExecutorServiceFactory;
-
 import java.util.concurrent.ScheduledExecutorService;
+import pl.allegro.tech.hermes.common.concurrent.ExecutorServiceFactory;
 
 public class TestExecutorServiceFactory implements ExecutorServiceFactory {
 
-    private final ScheduledExecutorService scheduledExecutorService;
+  private final ScheduledExecutorService scheduledExecutorService;
 
-    public TestExecutorServiceFactory(ScheduledExecutorService scheduledExecutorService) {
-        this.scheduledExecutorService = scheduledExecutorService;
-    }
+  public TestExecutorServiceFactory(ScheduledExecutorService scheduledExecutorService) {
+    this.scheduledExecutorService = scheduledExecutorService;
+  }
 
-    @Override
-    public ScheduledExecutorService createSingleThreadScheduledExecutor(String nameFormat) {
-        return scheduledExecutorService;
-    }
+  @Override
+  public ScheduledExecutorService createSingleThreadScheduledExecutor(String nameFormat) {
+    return scheduledExecutorService;
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/BrokerId.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/BrokerId.java
index 9d866ce164..b7c40b547c 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/BrokerId.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/BrokerId.java
@@ -3,26 +3,26 @@
 import java.util.Objects;
 
 public class BrokerId {
-    private final int id;
+  private final int id;
 
-    public BrokerId(int id) {
-        this.id = id;
-    }
+  public BrokerId(int id) {
+    this.id = id;
+  }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        BrokerId brokerId = (BrokerId) o;
-        return id == brokerId.id;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
+    if (o == null || getClass() != o.getClass()) {
+      return false;
     }
+    BrokerId brokerId = (BrokerId) o;
+    return id == brokerId.id;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id);
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ConfluentSchemaRegistryContainer.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ConfluentSchemaRegistryContainer.java
index c7ebb866d7..deddc6bb03 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ConfluentSchemaRegistryContainer.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ConfluentSchemaRegistryContainer.java
@@ -1,31 +1,35 @@
 package pl.allegro.tech.hermes.test.helper.containers;
 
+import static java.lang.String.format;
+
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
-import static java.lang.String.format;
-
-public class ConfluentSchemaRegistryContainer extends GenericContainer<ConfluentSchemaRegistryContainer> {
-    private static final DockerImageName DEFAULT_SCHEMA_REGISTRY_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-schema-registry")
-            .withTag(ImageTags.confluentImagesTag());
-    private static final int SCHEMA_REGISTRY_PORT = 8081;
+public class ConfluentSchemaRegistryContainer
+    extends GenericContainer<ConfluentSchemaRegistryContainer> {
+  private static final DockerImageName DEFAULT_SCHEMA_REGISTRY_IMAGE_NAME =
+      DockerImageName.parse("confluentinc/cp-schema-registry")
+          .withTag(ImageTags.confluentImagesTag());
+  private static final int SCHEMA_REGISTRY_PORT = 8081;
 
-    public ConfluentSchemaRegistryContainer() {
-        super(DEFAULT_SCHEMA_REGISTRY_IMAGE_NAME);
-        addEnv("SCHEMA_REGISTRY_HOST_NAME", "localhost");
-        withExposedPorts(SCHEMA_REGISTRY_PORT);
-        withNetworkAliases("schema-registry");
-        waitingFor(Wait.forHttp("/subjects"));
-    }
+  public ConfluentSchemaRegistryContainer() {
+    super(DEFAULT_SCHEMA_REGISTRY_IMAGE_NAME);
+    addEnv("SCHEMA_REGISTRY_HOST_NAME", "localhost");
+    withExposedPorts(SCHEMA_REGISTRY_PORT);
+    withNetworkAliases("schema-registry");
+    waitingFor(Wait.forHttp("/subjects"));
+  }
 
-    public ConfluentSchemaRegistryContainer withKafkaCluster(KafkaContainerCluster cluster) {
-        withNetwork(cluster.getNetwork());
-        withEnv("SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS", "PLAINTEXT://" + cluster.getBootstrapServersForInternalClients());
-        return self();
-    }
+  public ConfluentSchemaRegistryContainer withKafkaCluster(KafkaContainerCluster cluster) {
+    withNetwork(cluster.getNetwork());
+    withEnv(
+        "SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS",
+        "PLAINTEXT://" + cluster.getBootstrapServersForInternalClients());
+    return self();
+  }
 
-    public String getUrl() {
-        return format("http://%s:%d", getHost(), getMappedPort(SCHEMA_REGISTRY_PORT));
-    }
+  public String getUrl() {
+    return format("http://%s:%d", getHost(), getMappedPort(SCHEMA_REGISTRY_PORT));
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/GooglePubSubContainer.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/GooglePubSubContainer.java
index ba4722ab3c..78c6cc61e6 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/GooglePubSubContainer.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/GooglePubSubContainer.java
@@ -5,9 +5,10 @@
 
 public class GooglePubSubContainer extends PubSubEmulatorContainer {
 
-    private static final String DOCKER_IMAGE = "gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators";
+  private static final String DOCKER_IMAGE =
+      "gcr.io/google.com/cloudsdktool/cloud-sdk:367.0.0-emulators";
 
-    public GooglePubSubContainer() {
-        super(DockerImageName.parse(DOCKER_IMAGE));
-    }
+  public GooglePubSubContainer() {
+    super(DockerImageName.parse(DOCKER_IMAGE));
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ImageTags.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ImageTags.java
index 82d59230a5..cf21b92454 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ImageTags.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ImageTags.java
@@ -1,7 +1,10 @@
 package pl.allegro.tech.hermes.test.helper.containers;
 
 public class ImageTags {
-    static String confluentImagesTag() {
-        return System.getProperty("confluentImagesTag", "6.1.0");
+  public static String confluentImagesTag() {
+    if (System.getProperty("os.arch").equals("aarch64")) {
+      return System.getProperty("confluentImagesTag", "7.6.1");
     }
+    return System.getProperty("confluentImagesTag", "6.1.0");
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/KafkaContainer.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/KafkaContainer.java
index a608318764..a5fdbd3093 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/KafkaContainer.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/KafkaContainer.java
@@ -1,149 +1,161 @@
 package pl.allegro.tech.hermes.test.helper.containers;
 
+import static pl.allegro.tech.hermes.test.helper.containers.TestcontainersUtils.copyScriptToContainer;
+import static pl.allegro.tech.hermes.test.helper.containers.TestcontainersUtils.readFileFromClasspath;
+
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.utility.DockerImageName;
 
-import java.io.IOException;
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-
-import static pl.allegro.tech.hermes.test.helper.containers.TestcontainersUtils.copyScriptToContainer;
-import static pl.allegro.tech.hermes.test.helper.containers.TestcontainersUtils.readFileFromClasspath;
-
 class KafkaContainer extends GenericContainer<KafkaContainer> {
-    private static final String START_STOP_SCRIPT = "/kafka_start_stop_wrapper.sh";
-    private static final String STARTER_SCRIPT = "/kafka_start.sh";
-    private static final int KAFKA_PORT = 9093;
-    private static final int KAFKA_INTERNAL_CLIENT_PORT = 9094;
-    private static final Duration READINESS_CHECK_TIMEOUT = Duration.ofMinutes(360);
-
-    private final String networkAlias;
-    private final BrokerId brokerId;
-    private String externalZookeeperConnect = null;
-    private int advertisedPort;
-    private boolean running = false;
-
-    KafkaContainer(DockerImageName dockerImageName, Network network, int brokerNum) {
-        super(dockerImageName);
-        withNetwork(network);
-        withExposedPorts(KAFKA_PORT);
-        this.brokerId = new BrokerId(brokerNum);
-        this.networkAlias = "broker-" + brokerNum;
-        withNetworkAliases(networkAlias);
-        withEnv("KAFKA_BROKER_ID", "" + brokerNum);
-        withEnv("KAFKA_LISTENERS",
-                "PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9092,INTERNAL_CLIENT://0.0.0.0:" + KAFKA_INTERNAL_CLIENT_PORT
-        );
-        withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT,INTERNAL_CLIENT:PLAINTEXT");
-        withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
-        withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", "1");
-        withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", "1");
-        withEnv("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
-        withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
-    }
-
-    BrokerId getBrokerId() {
-        return brokerId;
+  private static final String START_STOP_SCRIPT = "/kafka_start_stop_wrapper.sh";
+  private static final String STARTER_SCRIPT = "/kafka_start.sh";
+  private static final int KAFKA_PORT = 9093;
+  private static final int KAFKA_INTERNAL_CLIENT_PORT = 9094;
+  private static final Duration READINESS_CHECK_TIMEOUT = Duration.ofMinutes(360);
+
+  private final String networkAlias;
+  private final BrokerId brokerId;
+  private String externalZookeeperConnect = null;
+  private int advertisedPort;
+  private boolean running = false;
+
+  KafkaContainer(DockerImageName dockerImageName, Network network, int brokerNum) {
+    super(dockerImageName);
+    withNetwork(network);
+    withExposedPorts(KAFKA_PORT);
+    this.brokerId = new BrokerId(brokerNum);
+    this.networkAlias = "broker-" + brokerNum;
+    withNetworkAliases(networkAlias);
+    withEnv("KAFKA_BROKER_ID", "" + brokerNum);
+    withEnv(
+        "KAFKA_LISTENERS",
+        "PLAINTEXT://0.0.0.0:"
+            + KAFKA_PORT
+            + ",BROKER://0.0.0.0:9092,INTERNAL_CLIENT://0.0.0.0:"
+            + KAFKA_INTERNAL_CLIENT_PORT);
+    withEnv(
+        "KAFKA_LISTENER_SECURITY_PROTOCOL_MAP",
+        "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT,INTERNAL_CLIENT:PLAINTEXT");
+    withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
+    withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", "1");
+    withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", "1");
+    withEnv("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", Long.MAX_VALUE + "");
+    withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0");
+  }
+
+  BrokerId getBrokerId() {
+    return brokerId;
+  }
+
+  boolean isKafkaRunning() {
+    return running;
+  }
+
+  void stopKafka() {
+    try {
+      ExecResult execResult = execInContainer("sh", "-c", "touch /tmp/stop");
+      if (execResult.getExitCode() != 0) {
+        throw new Exception(execResult.getStderr());
+      }
+      Unreliables.retryUntilTrue(
+          (int) READINESS_CHECK_TIMEOUT.getSeconds(), TimeUnit.SECONDS, this::isStopped);
+      running = false;
+    } catch (Exception ex) {
+      throw new RuntimeException(ex);
     }
-
-    boolean isKafkaRunning() {
-        return running;
-    }
-
-    void stopKafka() {
-        try {
-            ExecResult execResult = execInContainer("sh", "-c", "touch /tmp/stop");
-            if (execResult.getExitCode() != 0) {
-                throw new Exception(execResult.getStderr());
-            }
-            Unreliables.retryUntilTrue((int) READINESS_CHECK_TIMEOUT.getSeconds(), TimeUnit.SECONDS, this::isStopped);
-            running = false;
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    void startKafka() {
-        try {
-            ExecResult execResult = execInContainer("sh", "-c", "touch /tmp/start");
-            if (execResult.getExitCode() != 0) {
-                throw new Exception(execResult.getStderr());
-            }
-            Unreliables.retryUntilTrue((int) READINESS_CHECK_TIMEOUT.getSeconds(), TimeUnit.SECONDS, this::isStarted);
-            running = true;
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
+  }
+
+  void startKafka() {
+    try {
+      ExecResult execResult = execInContainer("sh", "-c", "touch /tmp/start");
+      if (execResult.getExitCode() != 0) {
+        throw new Exception(execResult.getStderr());
+      }
+      Unreliables.retryUntilTrue(
+          (int) READINESS_CHECK_TIMEOUT.getSeconds(), TimeUnit.SECONDS, this::isStarted);
+      running = true;
+    } catch (Exception ex) {
+      throw new RuntimeException(ex);
     }
-
-    private boolean isStopped() throws IOException, InterruptedException {
-        String command = "ps aux | grep kafka";
-        ExecResult result = execInContainer("sh", "-c", command);
-        return result.getExitCode() == 0 && !result.getStdout().contains("java");
-    }
-
-    private boolean isStarted() throws IOException, InterruptedException {
-        ExecResult result = execInContainer("sh", "-c", "kafka-topics --bootstrap-server localhost:9092 --list");
-        return result.getExitCode() == 0;
-    }
-
-    KafkaContainer withExternalZookeeper(String connectString) {
-        externalZookeeperConnect = connectString;
-        return self();
-    }
-
-    KafkaContainer withAdvertisedPort(int advertisedPort) {
-        this.advertisedPort = advertisedPort;
-        return self();
-    }
-
-    String getAddressForExternalClients() {
-        return String.format("%s:%s", getHost(), advertisedPort);
-    }
-
-    String getAddressForInternalClients() {
-        return String.format("%s:%s", networkAlias, KAFKA_INTERNAL_CLIENT_PORT);
-    }
-
-    @Override
-    protected void doStart() {
-        withCommand("sh", "-c", "while [ ! -f " + START_STOP_SCRIPT + " ]; do sleep 0.1; done; " + START_STOP_SCRIPT);
-        super.doStart();
-    }
-
-    @Override
-    protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
-        try {
-            super.containerIsStarting(containerInfo, reused);
-            if (reused) {
-                return;
-            }
-            String startScript = readFileFromClasspath("testcontainers/kafka_start.sh")
-                    .replaceAll("<KAFKA_MAPPED_PORT>", advertisedPort + "")
-                    .replaceAll("<KAFKA_INTERNAL_CLIENT_PORT>", KAFKA_INTERNAL_CLIENT_PORT + "")
-                    .replaceAll("<BROKER_HOSTNAME>", networkAlias)
-                    .replaceAll("<ZOOKEEPER_CONNECT>", externalZookeeperConnect);
-            copyScriptToContainer(startScript, this, STARTER_SCRIPT);
-            String wrapperScript = readFileFromClasspath("testcontainers/kafka_start_stop_wrapper.sh")
-                    .replaceAll("<STARTER_SCRIPT>", STARTER_SCRIPT);
-            copyScriptToContainer(wrapperScript, this, START_STOP_SCRIPT);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @Override
-    protected void containerIsStarted(InspectContainerResponse containerInfo) {
-        super.containerIsStarted(containerInfo);
-        running = true;
-    }
-
-    @Override
-    protected void containerIsStopped(InspectContainerResponse containerInfo) {
-        super.containerIsStopped(containerInfo);
-        running = false;
+  }
+
+  private boolean isStopped() throws IOException, InterruptedException {
+    String command = "ps aux | grep kafka";
+    ExecResult result = execInContainer("sh", "-c", command);
+    return result.getExitCode() == 0 && !result.getStdout().contains("java");
+  }
+
+  private boolean isStarted() throws IOException, InterruptedException {
+    ExecResult result =
+        execInContainer("sh", "-c", "kafka-topics --bootstrap-server localhost:9092 --list");
+    return result.getExitCode() == 0;
+  }
+
+  KafkaContainer withExternalZookeeper(String connectString) {
+    externalZookeeperConnect = connectString;
+    return self();
+  }
+
+  KafkaContainer withAdvertisedPort(int advertisedPort) {
+    this.advertisedPort = advertisedPort;
+    return self();
+  }
+
+  String getAddressForExternalClients() {
+    return String.format("%s:%s", getHost(), advertisedPort);
+  }
+
+  String getAddressForInternalClients() {
+    return String.format("%s:%s", networkAlias, KAFKA_INTERNAL_CLIENT_PORT);
+  }
+
+  @Override
+  protected void doStart() {
+    withCommand(
+        "sh",
+        "-c",
+        "while [ ! -f " + START_STOP_SCRIPT + " ]; do sleep 0.1; done; " + START_STOP_SCRIPT);
+    super.doStart();
+  }
+
+  @Override
+  protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
+    try {
+      super.containerIsStarting(containerInfo, reused);
+      if (reused) {
+        return;
+      }
+      String startScript =
+          readFileFromClasspath("testcontainers/kafka_start.sh")
+              .replaceAll("<KAFKA_MAPPED_PORT>", advertisedPort + "")
+              .replaceAll("<KAFKA_INTERNAL_CLIENT_PORT>", KAFKA_INTERNAL_CLIENT_PORT + "")
+              .replaceAll("<BROKER_HOSTNAME>", networkAlias)
+              .replaceAll("<ZOOKEEPER_CONNECT>", externalZookeeperConnect);
+      copyScriptToContainer(startScript, this, STARTER_SCRIPT);
+      String wrapperScript =
+          readFileFromClasspath("testcontainers/kafka_start_stop_wrapper.sh")
+              .replaceAll("<STARTER_SCRIPT>", STARTER_SCRIPT);
+      copyScriptToContainer(wrapperScript, this, START_STOP_SCRIPT);
+    } catch (Exception ex) {
+      throw new RuntimeException(ex);
     }
+  }
+
+  @Override
+  protected void containerIsStarted(InspectContainerResponse containerInfo) {
+    super.containerIsStarted(containerInfo);
+    running = true;
+  }
+
+  @Override
+  protected void containerIsStopped(InspectContainerResponse containerInfo) {
+    super.containerIsStopped(containerInfo);
+    running = false;
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/KafkaContainerCluster.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/KafkaContainerCluster.java
index d9f98f7674..0af027a1ff 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/KafkaContainerCluster.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/KafkaContainerCluster.java
@@ -1,13 +1,11 @@
 package pl.allegro.tech.hermes.test.helper.containers;
 
-import org.testcontainers.containers.Container.ExecResult;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
-import org.testcontainers.containers.ToxiproxyContainer;
-import org.testcontainers.containers.ToxiproxyContainer.ContainerProxy;
-import org.testcontainers.lifecycle.Startable;
-import org.testcontainers.lifecycle.Startables;
-import org.testcontainers.utility.DockerImageName;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.stream.Collectors.toList;
+import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilTrue;
+import static pl.allegro.tech.hermes.test.helper.containers.TestcontainersUtils.copyScriptToContainer;
+import static pl.allegro.tech.hermes.test.helper.containers.TestcontainersUtils.readFileFromClasspath;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -17,203 +15,203 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static java.util.stream.Collectors.toList;
-import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilTrue;
-import static pl.allegro.tech.hermes.test.helper.containers.TestcontainersUtils.copyScriptToContainer;
-import static pl.allegro.tech.hermes.test.helper.containers.TestcontainersUtils.readFileFromClasspath;
+import org.testcontainers.containers.Container.ExecResult;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.ToxiproxyContainer;
+import org.testcontainers.containers.ToxiproxyContainer.ContainerProxy;
+import org.testcontainers.lifecycle.Startable;
+import org.testcontainers.lifecycle.Startables;
+import org.testcontainers.utility.DockerImageName;
 
 public class KafkaContainerCluster implements Startable {
-    private static final DockerImageName ZOOKEEPER_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-zookeeper")
-            .withTag(ImageTags.confluentImagesTag());
-    private static final DockerImageName KAFKA_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka")
-            .withTag(ImageTags.confluentImagesTag());
-    private static final DockerImageName TOXIPROXY_IMAGE_NAME = DockerImageName.parse("ghcr.io/shopify/toxiproxy")
-            .withTag("2.4.0").asCompatibleSubstituteFor("shopify/toxiproxy");;
-
-    private static final Duration CLUSTER_START_TIMEOUT = Duration.ofMinutes(360);
-    private static final String ZOOKEEPER_NETWORK_ALIAS = "zookeeper";
-    private static final String READINESS_CHECK_SCRIPT = "/kafka_readiness_check.sh";
-    private static final int ZOOKEEPER_PORT = 2181;
-
-    private final List<ContainerProxy> proxies = new ArrayList<>();
-    private final int brokersNum;
-    private final int minInSyncReplicas;
-    private final ZookeeperContainer zookeeper;
-    private final ToxiproxyContainer toxiproxy;
-    private final List<KafkaContainer> brokers = new ArrayList<>();
-
-    public KafkaContainerCluster(int brokersNum) {
-        checkArgument(brokersNum > 0, "brokersNum '" + brokersNum + "' must be greater than 0");
-        this.brokersNum = brokersNum;
-        this.minInSyncReplicas = Math.max(brokersNum - 1, 1);
-        this.zookeeper = createZookeeper(Network.newNetwork());
-        this.toxiproxy = new ToxiproxyContainer(TOXIPROXY_IMAGE_NAME)
-                .withNetwork(zookeeper.getNetwork());
-        int internalTopicsRf = Math.max(brokersNum - 1, 1);
-        for (int brokerId = 0; brokerId < brokersNum; brokerId++) {
-            KafkaContainer container = new KafkaContainer(KAFKA_IMAGE_NAME, zookeeper.getNetwork(), brokerId)
-                    .dependsOn(zookeeper)
-                    .withExternalZookeeper(ZOOKEEPER_NETWORK_ALIAS + ":" + ZOOKEEPER_PORT)
-                    .withEnv("KAFKA_BROKER_ID", brokerId + "")
-                    .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
-                    .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
-                    .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
-                    .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "")
-                    .withEnv("KAFKA_MIN_INSYNC_REPLICAS", minInSyncReplicas + "");
-            brokers.add(container);
-        }
-    }
-
-    private ZookeeperContainer createZookeeper(Network network) {
-        return new ZookeeperContainer(ZOOKEEPER_IMAGE_NAME, ZOOKEEPER_PORT)
-                .withNetwork(network)
-                .withNetworkAliases(ZOOKEEPER_NETWORK_ALIAS);
-    }
-
-    public List<BrokerId> getAllBrokers() {
-        return brokers.stream().map(KafkaContainer::getBrokerId).collect(toList());
-    }
-
-    public int getMinInSyncReplicas() {
-        return minInSyncReplicas;
-    }
-
-    public String getBootstrapServersForExternalClients() {
-        return brokers.stream()
-                .map(KafkaContainer::getAddressForExternalClients)
-                .collect(Collectors.joining(","));
-    }
-
-    public String getBootstrapServersForInternalClients() {
-        return brokers.stream()
-                .map(KafkaContainer::getAddressForInternalClients)
-                .collect(Collectors.joining(","));
-    }
-
-    public Network getNetwork() {
-        return zookeeper.getNetwork();
-    }
-
-    @Override
-    public void start() {
-        try {
-            startToxiproxy();
-            Startables.deepStart(brokers)
-                    .get(CLUSTER_START_TIMEOUT.getSeconds(), SECONDS);
-            String readinessScript = readFileFromClasspath("testcontainers/kafka_readiness_check.sh");
-            for (KafkaContainer kafkaContainer : brokers) {
-                copyScriptToContainer(readinessScript, kafkaContainer, READINESS_CHECK_SCRIPT);
-            }
-            waitForClusterFormation();
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private void startToxiproxy() {
-        toxiproxy.start();
-        for (KafkaContainer kafkaContainer : brokers) {
-            ContainerProxy proxy = toxiproxy.getProxy(kafkaContainer, kafkaContainer.getExposedPorts().get(0));
-            proxies.add(proxy);
-            kafkaContainer.withAdvertisedPort(proxy.getProxyPort());
-        }
-    }
-
-    public void stop(List<BrokerId> brokerIds) {
-        select(brokerIds).stream()
-                .parallel()
-                .forEach(KafkaContainer::stopKafka);
-    }
-
-    public void start(List<BrokerId> brokerIds) {
-        select(brokerIds).stream()
-                .parallel()
-                .forEach(KafkaContainer::startKafka);
-    }
-
-    private Set<KafkaContainer> select(List<BrokerId> brokerIds) {
-        return brokers.stream()
-                .filter(b -> brokerIds.contains(b.getBrokerId()))
-                .collect(Collectors.toSet());
-    }
-
-    @Override
-    public void stop() {
-        toxiproxy.stop();
-        Stream.concat(brokers.stream(), Stream.of(zookeeper))
-                .parallel()
-                .forEach(GenericContainer::stop);
-    }
-
-    public void cutOffConnectionsBetweenBrokersAndClients() {
-        proxies.forEach(proxy -> proxy.setConnectionCut(true));
-    }
-
-    public void restoreConnectionsBetweenBrokersAndClients() {
-        proxies.forEach(proxy -> proxy.setConnectionCut(false));
-    }
-
-    public void startAllStoppedBrokers() {
-        brokers.stream()
-                .filter(broker -> !broker.isKafkaRunning())
-                .parallel()
-                .forEach(KafkaContainer::startKafka);
-        waitForClusterFormation();
-    }
-
-    private void waitForClusterFormation() {
-        retryUntilTrue((int) CLUSTER_START_TIMEOUT.getSeconds(), TimeUnit.SECONDS, this::isZookeeperReady);
-        retryUntilTrue((int) CLUSTER_START_TIMEOUT.getSeconds(), TimeUnit.SECONDS, this::isKafkaReady);
-    }
-
-    private boolean isZookeeperReady() throws IOException, InterruptedException {
-        ExecResult result = zookeeper.execInContainer(
-                "sh",
-                "-c",
-                "zookeeper-shell " + ZOOKEEPER_NETWORK_ALIAS + ":" + ZOOKEEPER_PORT + " ls /brokers/ids | tail -n 1"
-        );
-        String brokers = result.getStdout();
-        return brokers != null && brokers.split(",").length == brokersNum;
-    }
-
-    private boolean isKafkaReady() throws IOException, InterruptedException {
-        KafkaContainer firstBroker = selectFirstRunningBroker();
-        ExecResult result = firstBroker.execInContainer(
-                "sh",
-                "-c",
-                READINESS_CHECK_SCRIPT + " " + brokersNum
-        );
-        return result.getExitCode() == 0;
-    }
-
-    public int countOfflinePartitions() throws IOException, InterruptedException {
-        return countPartitions("--unavailable-partitions");
-    }
-
-    public int countUnderReplicatedPartitions() throws IOException, InterruptedException {
-        return countPartitions("--under-replicated-partitions");
-    }
-
-    private int countPartitions(String option) throws IOException, InterruptedException {
-        KafkaContainer firstBroker = selectFirstRunningBroker();
-        ExecResult result = firstBroker.execInContainer(
-                "sh",
-                "-c",
-                "kafka-topics --bootstrap-server localhost:9092 --describe " + option + " | wc -l"
-        );
-        String sanitizedOutput = result.getStdout()
-                .replaceAll("\"", "")
-                .replaceAll("\\s+", "");
-        return Integer.parseInt(sanitizedOutput);
-    }
-
-    private KafkaContainer selectFirstRunningBroker() {
-        return brokers.stream()
-                .filter(KafkaContainer::isKafkaRunning)
-                .findFirst()
-                .orElseThrow(() -> new IllegalStateException("There is no running broker"));
-    }
+  private static final DockerImageName ZOOKEEPER_IMAGE_NAME =
+      DockerImageName.parse("confluentinc/cp-zookeeper").withTag(ImageTags.confluentImagesTag());
+  private static final DockerImageName KAFKA_IMAGE_NAME =
+      DockerImageName.parse("confluentinc/cp-kafka").withTag(ImageTags.confluentImagesTag());
+  private static final DockerImageName TOXIPROXY_IMAGE_NAME =
+      DockerImageName.parse("ghcr.io/shopify/toxiproxy")
+          .withTag("2.4.0")
+          .asCompatibleSubstituteFor("shopify/toxiproxy");
+
+  private static final Duration CLUSTER_START_TIMEOUT = Duration.ofMinutes(360);
+  private static final String ZOOKEEPER_NETWORK_ALIAS = "zookeeper";
+  private static final String READINESS_CHECK_SCRIPT = "/kafka_readiness_check.sh";
+  private static final int ZOOKEEPER_PORT = 2181;
+
+  private final List<ContainerProxy> proxies = new ArrayList<>();
+  private final int brokersNum;
+  private final int minInSyncReplicas;
+  private final ZookeeperContainer zookeeper;
+  private final ToxiproxyContainer toxiproxy;
+  private final List<KafkaContainer> brokers = new ArrayList<>();
+
+  public KafkaContainerCluster(int brokersNum) {
+    checkArgument(brokersNum > 0, "brokersNum '" + brokersNum + "' must be greater than 0");
+    this.brokersNum = brokersNum;
+    this.minInSyncReplicas = Math.max(brokersNum - 1, 1);
+    this.zookeeper = createZookeeper(Network.newNetwork());
+    this.toxiproxy =
+        new ToxiproxyContainer(TOXIPROXY_IMAGE_NAME).withNetwork(zookeeper.getNetwork());
+    int internalTopicsRf = Math.max(brokersNum - 1, 1);
+    for (int brokerId = 0; brokerId < brokersNum; brokerId++) {
+      KafkaContainer container =
+          new KafkaContainer(KAFKA_IMAGE_NAME, zookeeper.getNetwork(), brokerId)
+              .dependsOn(zookeeper)
+              .withExternalZookeeper(ZOOKEEPER_NETWORK_ALIAS + ":" + ZOOKEEPER_PORT)
+              .withEnv("KAFKA_BROKER_ID", brokerId + "")
+              .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", internalTopicsRf + "")
+              .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", internalTopicsRf + "")
+              .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", internalTopicsRf + "")
+              .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", internalTopicsRf + "")
+              .withEnv("KAFKA_MIN_INSYNC_REPLICAS", minInSyncReplicas + "");
+      brokers.add(container);
+    }
+  }
+
+  private ZookeeperContainer createZookeeper(Network network) {
+    return new ZookeeperContainer(ZOOKEEPER_IMAGE_NAME, ZOOKEEPER_PORT)
+        .withNetwork(network)
+        .withNetworkAliases(ZOOKEEPER_NETWORK_ALIAS);
+  }
+
+  public List<BrokerId> getAllBrokers() {
+    return brokers.stream().map(KafkaContainer::getBrokerId).collect(toList());
+  }
+
+  public int getMinInSyncReplicas() {
+    return minInSyncReplicas;
+  }
+
+  public String getBootstrapServersForExternalClients() {
+    return brokers.stream()
+        .map(KafkaContainer::getAddressForExternalClients)
+        .collect(Collectors.joining(","));
+  }
+
+  public String getBootstrapServersForInternalClients() {
+    return brokers.stream()
+        .map(KafkaContainer::getAddressForInternalClients)
+        .collect(Collectors.joining(","));
+  }
+
+  public Network getNetwork() {
+    return zookeeper.getNetwork();
+  }
+
+  @Override
+  public void start() {
+    try {
+      startToxiproxy();
+      Startables.deepStart(brokers).get(CLUSTER_START_TIMEOUT.getSeconds(), SECONDS);
+      String readinessScript = readFileFromClasspath("testcontainers/kafka_readiness_check.sh");
+      for (KafkaContainer kafkaContainer : brokers) {
+        copyScriptToContainer(readinessScript, kafkaContainer, READINESS_CHECK_SCRIPT);
+      }
+      waitForClusterFormation();
+    } catch (Exception ex) {
+      throw new RuntimeException(ex);
+    }
+  }
+
+  private void startToxiproxy() {
+    toxiproxy.start();
+    for (KafkaContainer kafkaContainer : brokers) {
+      ContainerProxy proxy =
+          toxiproxy.getProxy(kafkaContainer, kafkaContainer.getExposedPorts().get(0));
+      proxies.add(proxy);
+      kafkaContainer.withAdvertisedPort(proxy.getProxyPort());
+    }
+  }
+
+  public void stop(List<BrokerId> brokerIds) {
+    select(brokerIds).stream().parallel().forEach(KafkaContainer::stopKafka);
+  }
+
+  public void start(List<BrokerId> brokerIds) {
+    select(brokerIds).stream().parallel().forEach(KafkaContainer::startKafka);
+  }
+
+  private Set<KafkaContainer> select(List<BrokerId> brokerIds) {
+    return brokers.stream()
+        .filter(b -> brokerIds.contains(b.getBrokerId()))
+        .collect(Collectors.toSet());
+  }
+
+  @Override
+  public void stop() {
+    toxiproxy.stop();
+    Stream.concat(brokers.stream(), Stream.of(zookeeper))
+        .parallel()
+        .forEach(GenericContainer::stop);
+  }
+
+  public void cutOffConnectionsBetweenBrokersAndClients() {
+    proxies.forEach(proxy -> proxy.setConnectionCut(true));
+  }
+
+  public void restoreConnectionsBetweenBrokersAndClients() {
+    proxies.forEach(proxy -> proxy.setConnectionCut(false));
+  }
+
+  public void startAllStoppedBrokers() {
+    brokers.stream()
+        .filter(broker -> !broker.isKafkaRunning())
+        .parallel()
+        .forEach(KafkaContainer::startKafka);
+    waitForClusterFormation();
+  }
+
+  private void waitForClusterFormation() {
+    retryUntilTrue(
+        (int) CLUSTER_START_TIMEOUT.getSeconds(), TimeUnit.SECONDS, this::isZookeeperReady);
+    retryUntilTrue((int) CLUSTER_START_TIMEOUT.getSeconds(), TimeUnit.SECONDS, this::isKafkaReady);
+  }
+
+  private boolean isZookeeperReady() throws IOException, InterruptedException {
+    ExecResult result =
+        zookeeper.execInContainer(
+            "sh",
+            "-c",
+            "zookeeper-shell "
+                + ZOOKEEPER_NETWORK_ALIAS
+                + ":"
+                + ZOOKEEPER_PORT
+                + " ls /brokers/ids | tail -n 1");
+    String brokers = result.getStdout();
+    return brokers != null && brokers.split(",").length == brokersNum;
+  }
+
+  private boolean isKafkaReady() throws IOException, InterruptedException {
+    KafkaContainer firstBroker = selectFirstRunningBroker();
+    ExecResult result =
+        firstBroker.execInContainer("sh", "-c", READINESS_CHECK_SCRIPT + " " + brokersNum);
+    return result.getExitCode() == 0;
+  }
+
+  public int countOfflinePartitions() throws IOException, InterruptedException {
+    return countPartitions("--unavailable-partitions");
+  }
+
+  public int countUnderReplicatedPartitions() throws IOException, InterruptedException {
+    return countPartitions("--under-replicated-partitions");
+  }
+
+  private int countPartitions(String option) throws IOException, InterruptedException {
+    KafkaContainer firstBroker = selectFirstRunningBroker();
+    ExecResult result =
+        firstBroker.execInContainer(
+            "sh",
+            "-c",
+            "kafka-topics --bootstrap-server localhost:9092 --describe " + option + " | wc -l");
+    String sanitizedOutput = result.getStdout().replaceAll("\"", "").replaceAll("\\s+", "");
+    return Integer.parseInt(sanitizedOutput);
+  }
+
+  private KafkaContainer selectFirstRunningBroker() {
+    return brokers.stream()
+        .filter(KafkaContainer::isKafkaRunning)
+        .findFirst()
+        .orElseThrow(() -> new IllegalStateException("There is no running broker"));
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/TestcontainersUtils.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/TestcontainersUtils.java
index 7286a46d36..6fb010caf7 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/TestcontainersUtils.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/TestcontainersUtils.java
@@ -1,27 +1,29 @@
 package pl.allegro.tech.hermes.test.helper.containers;
 
-import org.testcontainers.containers.ContainerState;
-import org.testcontainers.images.builder.Transferable;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
+import org.testcontainers.containers.ContainerState;
+import org.testcontainers.images.builder.Transferable;
+import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 public class TestcontainersUtils {
 
-    public static void copyScriptToContainer(String content, ContainerState containerState, String target) {
-        containerState.copyFileToContainer(Transferable.of(content.getBytes(StandardCharsets.UTF_8), 0777), target);
-    }
+  public static void copyScriptToContainer(
+      String content, ContainerState containerState, String target) {
+    containerState.copyFileToContainer(
+        Transferable.of(content.getBytes(StandardCharsets.UTF_8), 0777), target);
+  }
 
-    public static String readFileFromClasspath(String fileName) throws IOException {
-        InputStream inputStream = TestcontainersUtils.class.getClassLoader().getResourceAsStream(fileName);
-        if (inputStream == null) {
-            throw new FileNotFoundException("File '" + fileName + "' does not exist");
-        }
-        return IOUtils.toString(inputStream, UTF_8);
+  public static String readFileFromClasspath(String fileName) throws IOException {
+    InputStream inputStream =
+        TestcontainersUtils.class.getClassLoader().getResourceAsStream(fileName);
+    if (inputStream == null) {
+      throw new FileNotFoundException("File '" + fileName + "' does not exist");
     }
+    return IOUtils.toString(inputStream, UTF_8);
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ZookeeperContainer.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ZookeeperContainer.java
index 787b8a364c..817e327831 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ZookeeperContainer.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/containers/ZookeeperContainer.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.test.helper.containers;
 
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -7,52 +8,50 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.Optional;
-
 public class ZookeeperContainer extends GenericContainer<ZookeeperContainer> {
-    private static final DockerImageName DEFAULT_ZOOKEEPER_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-zookeeper")
-            .withTag(ImageTags.confluentImagesTag());
-    private static final int DEFAULT_ZOOKEEPER_PORT = 2181;
-    private Logger logger;
-
-    private final int clientPort;
-
-    public ZookeeperContainer() {
-        this(DEFAULT_ZOOKEEPER_IMAGE_NAME, DEFAULT_ZOOKEEPER_PORT);
-    }
-
-    public ZookeeperContainer(String loggerName) {
-        this(DEFAULT_ZOOKEEPER_IMAGE_NAME, DEFAULT_ZOOKEEPER_PORT, Optional.of(loggerName));
-    }
-
-    public ZookeeperContainer(DockerImageName zooKeeperImage, int clientPort) {
-        this(zooKeeperImage, clientPort, Optional.empty());
+  private static final DockerImageName DEFAULT_ZOOKEEPER_IMAGE_NAME =
+      DockerImageName.parse("confluentinc/cp-zookeeper").withTag(ImageTags.confluentImagesTag());
+  private static final int DEFAULT_ZOOKEEPER_PORT = 2181;
+  private Logger logger;
+
+  private final int clientPort;
+
+  public ZookeeperContainer() {
+    this(DEFAULT_ZOOKEEPER_IMAGE_NAME, DEFAULT_ZOOKEEPER_PORT);
+  }
+
+  public ZookeeperContainer(String loggerName) {
+    this(DEFAULT_ZOOKEEPER_IMAGE_NAME, DEFAULT_ZOOKEEPER_PORT, Optional.of(loggerName));
+  }
+
+  public ZookeeperContainer(DockerImageName zooKeeperImage, int clientPort) {
+    this(zooKeeperImage, clientPort, Optional.empty());
+  }
+
+  private ZookeeperContainer(
+      DockerImageName zooKeeperImage, int clientPort, Optional<String> maybeLoggerName) {
+    super(zooKeeperImage);
+    maybeLoggerName.ifPresent(s -> this.logger = LoggerFactory.getLogger(s));
+    withExposedPorts(clientPort);
+    withEnv("ZOOKEEPER_CLIENT_PORT", String.valueOf(clientPort));
+    this.clientPort = clientPort;
+  }
+
+  @Override
+  public void start() {
+    super.start();
+    waitingFor(Wait.forHealthcheck());
+    setupLogger();
+  }
+
+  private void setupLogger() {
+    if (this.logger != null) {
+      Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(this.logger);
+      followOutput(logConsumer);
     }
+  }
 
-    private ZookeeperContainer(DockerImageName zooKeeperImage, int clientPort, Optional<String> maybeLoggerName) {
-        super(zooKeeperImage);
-        maybeLoggerName.ifPresent(s -> this.logger = LoggerFactory.getLogger(s));
-        withExposedPorts(clientPort);
-        withEnv("ZOOKEEPER_CLIENT_PORT", String.valueOf(clientPort));
-        this.clientPort = clientPort;
-
-    }
-
-    @Override
-    public void start() {
-        super.start();
-        waitingFor(Wait.forHealthcheck());
-        setupLogger();
-    }
-
-    private void setupLogger() {
-        if (this.logger != null) {
-            Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(this.logger);
-            followOutput(logConsumer);
-        }
-    }
-
-    public String getConnectionString() {
-        return String.format("%s:%s", getHost(), getMappedPort(clientPort));
-    }
+  public String getConnectionString() {
+    return String.format("%s:%s", getHost(), getMappedPort(clientPort));
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/BrokerOperations.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/BrokerOperations.java
deleted file mode 100644
index 5175686c67..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/BrokerOperations.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.endpoint;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.admin.ListOffsetsResult;
-import org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
-import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.admin.OffsetSpec;
-import org.apache.kafka.clients.consumer.OffsetAndMetadata;
-import org.apache.kafka.common.TopicPartition;
-import pl.allegro.tech.hermes.api.SubscriptionName;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.common.kafka.ConsumerGroupId;
-import pl.allegro.tech.hermes.common.kafka.JsonToAvroMigrationKafkaNamesMapper;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
-
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
-import static java.util.Collections.singletonList;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static java.util.stream.Collectors.toMap;
-import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG;
-import static org.apache.kafka.clients.CommonClientConfigs.DEFAULT_SECURITY_PROTOCOL;
-import static org.apache.kafka.clients.CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG;
-import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
-/**
- * Created to perform operations directly on broker excluding Hermes internal structures
- */
-public class BrokerOperations {
-
-    private static final int DEFAULT_PARTITIONS = 2;
-    private static final int DEFAULT_REPLICATION_FACTOR = 1;
-
-    private final Map<String, AdminClient> adminClients;
-    private final KafkaNamesMapper kafkaNamesMapper;
-
-    public BrokerOperations(Map<String, String> kafkaConnection, String namespace) {
-        adminClients = kafkaConnection.entrySet().stream()
-                .collect(toMap(Map.Entry::getKey, e -> brokerAdminClient(e.getValue())));
-        String namespaceSeparator = "_";
-        kafkaNamesMapper = new JsonToAvroMigrationKafkaNamesMapper(namespace, namespaceSeparator);
-    }
-
-    public void createTopic(String topicName) {
-        adminClients.values().forEach(c -> createTopic(topicName, c));
-    }
-
-    public void createTopic(String topicName, String brokerName) {
-        createTopic(topicName, adminClients.get(brokerName));
-    }
-
-    public List<ConsumerGroupOffset> getTopicPartitionsOffsets(SubscriptionName subscriptionName) {
-        ConsumerGroupId consumerGroupId = kafkaNamesMapper.toConsumerGroupId(subscriptionName);
-        return adminClients.values().stream()
-                .flatMap(client -> {
-                    Map<TopicPartition, OffsetAndMetadata> currentOffsets = getTopicCurrentOffsets(consumerGroupId, client);
-                    Map<TopicPartition, ListOffsetsResultInfo> endOffsets = getEndOffsets(client, new ArrayList<>(currentOffsets.keySet()));
-                    return currentOffsets.keySet()
-                            .stream()
-                            .map(partition -> new ConsumerGroupOffset(
-                                    currentOffsets.get(partition).offset(),
-                                    endOffsets.get(partition).offset())
-                            );
-                }).collect(Collectors.toList());
-    }
-
-    private Map<TopicPartition, OffsetAndMetadata> getTopicCurrentOffsets(ConsumerGroupId consumerGroupId, AdminClient client) {
-        try {
-            return client.listConsumerGroupOffsets(consumerGroupId.asString()).partitionsToOffsetAndMetadata().get();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private Map<TopicPartition, ListOffsetsResultInfo> getEndOffsets(AdminClient client, List<TopicPartition> partitions) {
-        try {
-            ListOffsetsResult listOffsetsResult = client.listOffsets(
-                    partitions.stream().collect(toMap(Function.identity(), p -> OffsetSpec.latest())));
-            return listOffsetsResult.all().get();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void createTopic(String topicName, AdminClient adminClient) {
-        Topic topic = topic(topicName).build();
-        kafkaNamesMapper.toKafkaTopics(topic)
-                .forEach(kafkaTopic -> createTopic(adminClient, kafkaTopic.name().asString()));
-    }
-
-    private void createTopic(AdminClient adminClient, String topicName) {
-        try {
-            NewTopic topic = new NewTopic(topicName, DEFAULT_PARTITIONS, (short) DEFAULT_REPLICATION_FACTOR);
-            adminClient.createTopics(singletonList(topic))
-                    .all()
-                    .get(1, MINUTES);
-        } catch (ExecutionException | TimeoutException | InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public boolean topicExists(String topicName, String kafkaClusterName) {
-        Topic topic = topic(topicName).build();
-        return kafkaNamesMapper.toKafkaTopics(topic)
-                .allMatch(kafkaTopic -> topicExists(kafkaClusterName, kafkaTopic));
-    }
-
-    private boolean topicExists(String kafkaClusterName, KafkaTopic kafkaTopic) {
-        try {
-            return adminClients.get(kafkaClusterName)
-                    .listTopics()
-                    .names()
-                    .get(1, MINUTES)
-                    .contains(kafkaTopic.name().asString());
-        } catch (ExecutionException | TimeoutException | InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private AdminClient brokerAdminClient(String bootstrapKafkaServer) {
-        Properties props = new Properties();
-        props.put(BOOTSTRAP_SERVERS_CONFIG, bootstrapKafkaServer);
-        props.put(SECURITY_PROTOCOL_CONFIG, DEFAULT_SECURITY_PROTOCOL);
-        props.put(REQUEST_TIMEOUT_MS_CONFIG, 10000);
-        return AdminClient.create(props);
-    }
-
-    public static class ConsumerGroupOffset {
-        private final long currentOffset;
-        private final long endOffset;
-
-        ConsumerGroupOffset(long currentOffset, long endOffset) {
-            this.currentOffset = currentOffset;
-            this.endOffset = endOffset;
-        }
-
-        public boolean movedToEnd() {
-            return currentOffset == endOffset;
-        }
-    }
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesAPIOperations.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesAPIOperations.java
deleted file mode 100644
index 2c2e5cd898..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesAPIOperations.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.endpoint;
-
-import pl.allegro.tech.hermes.api.BatchSubscriptionPolicy;
-import pl.allegro.tech.hermes.api.ContentType;
-import pl.allegro.tech.hermes.api.Group;
-import pl.allegro.tech.hermes.api.OAuthProvider;
-import pl.allegro.tech.hermes.api.PatchData;
-import pl.allegro.tech.hermes.api.Readiness;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.SubscriptionMode;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.api.TopicWithSchema;
-import pl.allegro.tech.hermes.api.helpers.Patch;
-
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-import jakarta.ws.rs.core.Response;
-
-import static jakarta.ws.rs.core.Response.Status.ACCEPTED;
-import static jakarta.ws.rs.core.Response.Status.CREATED;
-import static jakarta.ws.rs.core.Response.Status.OK;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy;
-import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
-public class HermesAPIOperations {
-
-    protected final HermesEndpoints endpoints;
-    protected final Waiter wait;
-
-    public HermesAPIOperations(HermesEndpoints endpoints, Waiter wait) {
-        this.endpoints = endpoints;
-        this.wait = wait;
-    }
-
-    public void createGroup(String group) {
-        if (endpoints.group().list().contains(group)) {
-            return;
-        }
-        assertThat(endpoints.group().create(new Group(group)).getStatus()).isEqualTo(CREATED.getStatusCode());
-
-        wait.untilGroupCreated(group);
-    }
-
-    public TopicWithSchema createTopic(String group, String topic) {
-        Topic created = topic(group, topic)
-                .withRetentionTime(7, TimeUnit.DAYS)
-                .withDescription("Test topic")
-                .build();
-        return createTopic(created);
-    }
-
-    public TopicWithSchema createTopic(Topic topic) {
-        return createTopic(topic, null);
-    }
-
-    public TopicWithSchema createTopic(Topic topic, String schema) {
-        return createTopic(topicWithSchema(topic, schema));
-    }
-
-    public TopicWithSchema createTopic(TopicWithSchema topicWithSchema) {
-        if (endpoints.findTopics(topicWithSchema, topicWithSchema.isTrackingEnabled()).contains(topicWithSchema.getQualifiedName())) {
-            return topicWithSchema;
-        }
-        assertThat(createTopicResponse(topicWithSchema).getStatus()).isEqualTo(CREATED.getStatusCode());
-
-        wait.untilTopicCreated(topicWithSchema);
-        return topicWithSchema;
-    }
-
-    public Response createTopicResponse(TopicWithSchema topicWithSchema) {
-        return endpoints.topic().create(topicWithSchema);
-    }
-
-    public void saveSchema(Topic topic, String schema) {
-        Response response = endpoints.schema().save(topic.getQualifiedName(), false, schema);
-        assertThat(response.getStatus()).isEqualTo(CREATED.getStatusCode());
-
-        wait.untilSchemaCreated(topic);
-    }
-
-    public Response getSchemaResponse(Topic topic) {
-        Response response = endpoints.schema().get(topic.getQualifiedName());
-        System.out.println(response.toString());
-        return response;
-    }
-
-    public Subscription createSubscription(Topic topic, String subscriptionName, URI endpoint) {
-        return createSubscription(topic, subscriptionName, endpoint.toString(), ContentType.JSON);
-    }
-
-    public Subscription createSubscription(Topic topic, String subscriptionName, String endpoint) {
-        return createSubscription(topic, subscriptionName, endpoint, ContentType.JSON);
-    }
-
-    public Subscription createSubscription(Topic topic, String subscriptionName, String endpoint, Subscription.State state) {
-        return createSubscription(topic, subscriptionName, endpoint, ContentType.JSON, SubscriptionMode.ANYCAST, state);
-    }
-
-    public Subscription createSubscription(Topic topic, String subscriptionName, URI endpoint, Subscription.State state) {
-        return createSubscription(topic, subscriptionName, endpoint.toString(), ContentType.JSON, SubscriptionMode.ANYCAST, state);
-    }
-
-    public Subscription createSubscription(Topic topic, String subscriptionName, String endpoint, ContentType contentType) {
-        return createSubscription(topic, subscriptionName, endpoint, contentType, SubscriptionMode.ANYCAST, Subscription.State.PENDING);
-    }
-
-    public Subscription createSubscription(Topic topic, String subscriptionName, URI endpoint, ContentType contentType) {
-        return createSubscription(
-                topic,
-                subscriptionName,
-                endpoint.toString(),
-                contentType,
-                SubscriptionMode.ANYCAST,
-                Subscription.State.PENDING);
-    }
-
-    public Subscription createSubscription(Topic topic,
-                                           String subscriptionName,
-                                           String endpoint,
-                                           ContentType contentType,
-                                           SubscriptionMode mode,
-                                           Subscription.State state) {
-        Subscription subscription = subscription(topic, subscriptionName)
-                .withEndpoint(endpoint)
-                .withContentType(contentType)
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults().build())
-                .withMode(mode)
-                .withState(state)
-                .build();
-
-        return createSubscription(topic, subscription);
-    }
-
-    public Subscription createSubscription(Topic topic, Subscription subscription) {
-        if (endpoints.findSubscriptions(topic.getName().getGroupName(), topic.getName().getName(), subscription.isTrackingEnabled())
-                .contains(subscription.getName())) {
-            return subscription;
-        }
-
-        assertThat(endpoints.subscription().create(topic.getQualifiedName(), subscription).getStatus()).isEqualTo(CREATED.getStatusCode());
-
-        wait.untilSubscriptionCreated(topic, subscription);
-        return subscription;
-    }
-
-    public Subscription createBroadcastSubscription(Topic topic, String subscriptionName, String endpoint) {
-        return createSubscription(
-                topic,
-                subscriptionName,
-                endpoint,
-                ContentType.JSON,
-                SubscriptionMode.BROADCAST,
-                Subscription.State.PENDING);
-    }
-
-    public Topic buildTopic(String group, String topic) {
-        createGroup(group);
-        return createTopic(group, topic);
-    }
-
-    public TopicWithSchema buildTopicWithSchema(TopicWithSchema topic) {
-        createGroup(topic.getName().getGroupName());
-        return createTopic(topic);
-    }
-
-    public TopicWithSchema buildTopic(Topic topic) {
-        createGroup(topic.getName().getGroupName());
-        return createTopic(topic);
-    }
-
-    public Response suspendSubscription(Topic topic, String subscription) {
-        return endpoints.subscription().updateState(topic.getQualifiedName(), subscription, Subscription.State.SUSPENDED);
-    }
-
-    public void updateSubscription(String group, String topic, String subscription, PatchData patch) {
-        String qualifiedTopicName = group + "." + topic;
-
-        assertThat(endpoints.subscription().update(qualifiedTopicName, subscription, patch).getStatus()).isEqualTo(OK.getStatusCode());
-    }
-
-    public Topic getTopic(String group, String topic) {
-        return endpoints.topic().get(group + "." + topic);
-    }
-
-    public void updateTopic(String group, String topic, PatchData patch) {
-        updateTopic(new TopicName(group, topic), patch);
-    }
-
-    public void updateTopic(TopicName topicName, PatchData patch) {
-        Topic beforeUpdate = endpoints.topic().get(topicName.qualifiedName());
-        Topic reference = Patch.apply(beforeUpdate, patch);
-
-        assertThat(endpoints.topic().update(topicName.qualifiedName(), patch).getStatus()).isEqualTo(OK.getStatusCode());
-        wait.untilTopicUpdated(reference);
-    }
-
-    public void createBatchSubscription(Topic topic, String endpoint, int messageTtl, int messageBackoff, int batchSize, int batchTime,
-                                        int batchVolume, boolean retryOnClientErrors) {
-        BatchSubscriptionPolicy policy = batchSubscriptionPolicy()
-                .applyDefaults()
-                .withMessageTtl(messageTtl)
-                .withMessageBackoff(messageBackoff)
-                .withBatchSize(batchSize)
-                .withBatchTime(batchTime)
-                .withBatchVolume(batchVolume)
-                .withClientErrorRetry(retryOnClientErrors)
-                .withRequestTimeout(100)
-                .build();
-
-        createBatchSubscription(topic, endpoint, policy);
-    }
-
-    public void createBatchSubscription(Topic topic, String endpoint, BatchSubscriptionPolicy policy) {
-        Subscription subscription = subscription(topic, "batchSubscription")
-                .withEndpoint(endpoint)
-                .withContentType(ContentType.JSON)
-                .withSubscriptionPolicy(policy)
-                .build();
-
-        createSubscription(topic, subscription);
-    }
-
-    public void createBatchSubscription(Topic topic, URI endpoint, BatchSubscriptionPolicy policy) {
-        createBatchSubscription(topic, endpoint.toString(), policy);
-    }
-
-    public void createOAuthProvider(OAuthProvider oAuthProvider) {
-        if (endpoints.oAuthProvider().list().contains(oAuthProvider.getName())) {
-            return;
-        }
-        assertThat(endpoints.oAuthProvider().create(oAuthProvider).getStatus()).isEqualTo(CREATED.getStatusCode());
-
-        wait.untilOAuthProviderCreated(oAuthProvider.getName());
-    }
-
-    public void setReadiness(String dcName, boolean isReady) {
-        assertThat(endpoints.readiness().setReadiness(dcName, new Readiness(isReady)).getStatus()).isEqualTo(ACCEPTED.getStatusCode());
-    }
-
-    public boolean isInReadWriteMode() {
-        return "readWrite".equals(endpoints.modeEndpoint().getMode());
-    }
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesEndpoints.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesEndpoints.java
deleted file mode 100644
index 6743865640..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesEndpoints.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.endpoint;
-
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.endpoints.AllTopicClientsEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.BlacklistEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.FilterEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.GroupEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.ModeEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.OAuthProviderEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.OfflineRetransmissionEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.OwnerEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.QueryEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.ReadinessEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.SchemaEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.StatsEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.SubscriptionEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.SubscriptionOwnershipEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.TopicEndpoint;
-import pl.allegro.tech.hermes.api.endpoints.UnhealthyEndpoint;
-import pl.allegro.tech.hermes.consumers.ConsumerEndpoint;
-import pl.allegro.tech.hermes.test.helper.client.Hermes;
-
-import java.util.List;
-
-public class HermesEndpoints {
-
-    private final GroupEndpoint groupEndpoint;
-
-    private final TopicEndpoint topicEndpoint;
-
-    private final SubscriptionEndpoint subscriptionEndpoint;
-
-    private final SubscriptionOwnershipEndpoint subscriptionOwnershipEndpoint;
-
-    private final AllTopicClientsEndpoint allTopicClientsEndpoint;
-
-    private final SchemaEndpoint schemaEndpoint;
-
-    private final QueryEndpoint queryEndpoint;
-
-    private final OAuthProviderEndpoint oAuthProviderEndpoint;
-
-    private final ConsumerEndpoint consumerEndpoint;
-
-    private final OwnerEndpoint ownerEndpoint;
-
-    private final BlacklistEndpoint blacklistEndpoint;
-
-    private final UnhealthyEndpoint unhealthyEndpoint;
-
-    private final ModeEndpoint modeEndpoint;
-
-    private final FilterEndpoint filterEndpoint;
-
-    private final ReadinessEndpoint readinessEndpoint;
-
-    private final OfflineRetransmissionEndpoint offlineRetransmissionEndpoint;
-
-    private final StatsEndpoint statsEndpoint;
-
-    public HermesEndpoints(Hermes hermes) {
-        this.groupEndpoint = hermes.createGroupEndpoint();
-        this.topicEndpoint = hermes.createTopicEndpoint();
-        this.subscriptionEndpoint = hermes.createSubscriptionEndpoint();
-        this.subscriptionOwnershipEndpoint = hermes.createSubscriptionOwnershipEndpoint();
-        this.schemaEndpoint = hermes.createSchemaEndpoint();
-        this.queryEndpoint = hermes.createQueryEndpoint();
-        this.blacklistEndpoint = hermes.createBlacklistEndpoint();
-        this.oAuthProviderEndpoint = hermes.createOAuthProviderEndpoint();
-        this.consumerEndpoint = hermes.createConsumerEndpoint();
-        this.ownerEndpoint = hermes.createOwnerEndpoint();
-        this.unhealthyEndpoint = hermes.unhealthyEndpoint();
-        this.modeEndpoint = hermes.modeEndpoint();
-        this.filterEndpoint = hermes.createFilterEndpoint();
-        this.readinessEndpoint = hermes.createReadinessEndpoint();
-        this.offlineRetransmissionEndpoint = hermes.createOfflineRetransmissionEndpoint();
-        this.allTopicClientsEndpoint = hermes.createAllTopicClientsEndpoint();
-        this.statsEndpoint = hermes.createStatsEndpoint();
-    }
-
-    public HermesEndpoints(String hermesFrontendUrl, String consumerUrl) {
-        this(createHermesFromUrl(hermesFrontendUrl, consumerUrl));
-    }
-
-    private static Hermes createHermesFromUrl(String hermesFrontendUrl, String consumerUrl) {
-        return new Hermes(hermesFrontendUrl, consumerUrl)
-                .withManagementConfig(JerseyClientFactory.createConfig())
-                .withPublisherConfig(JerseyClientFactory.createConfig());
-    }
-
-    public GroupEndpoint group() {
-        return groupEndpoint;
-    }
-
-    public TopicEndpoint topic() {
-        return topicEndpoint;
-    }
-
-    public SubscriptionEndpoint subscription() {
-        return subscriptionEndpoint;
-    }
-
-    public SubscriptionOwnershipEndpoint subscriptionOwnershipEndpoint() {
-        return subscriptionOwnershipEndpoint;
-    }
-
-    public AllTopicClientsEndpoint allTopicClientsEndpoint() {
-        return allTopicClientsEndpoint;
-    }
-
-    public SchemaEndpoint schema() {
-        return schemaEndpoint;
-    }
-
-    public QueryEndpoint query() {
-        return queryEndpoint;
-    }
-
-    public OwnerEndpoint owner() {
-        return ownerEndpoint;
-    }
-
-    public UnhealthyEndpoint unhealthyEndpoint() {
-        return unhealthyEndpoint;
-    }
-
-    public BlacklistEndpoint blacklist() {
-        return blacklistEndpoint;
-    }
-
-    public ModeEndpoint modeEndpoint() {
-        return modeEndpoint;
-    }
-
-    public List<String> findTopics(Topic topic, boolean tracking) {
-        return topicEndpoint.list(topic.getName().getGroupName(), tracking);
-    }
-
-    public List<String> findSubscriptions(String group, String topic, boolean tracked) {
-        return subscriptionEndpoint.list(group + "." + topic, tracked);
-    }
-
-    public OAuthProviderEndpoint oAuthProvider() {
-        return oAuthProviderEndpoint;
-    }
-
-    public ConsumerEndpoint consumer() {
-        return consumerEndpoint;
-    }
-
-    public FilterEndpoint filter() {
-        return filterEndpoint;
-    }
-
-    public ReadinessEndpoint readiness() {
-        return readinessEndpoint;
-    }
-
-    public OfflineRetransmissionEndpoint offlineRetransmission() {
-        return offlineRetransmissionEndpoint;
-    }
-
-    public StatsEndpoint statsEndpoint() { return statsEndpoint; }
-}
-
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesPublisher.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesPublisher.java
deleted file mode 100644
index 0d477beee5..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesPublisher.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.endpoint;
-
-import pl.allegro.tech.hermes.api.endpoints.TopicEndpoint;
-import pl.allegro.tech.hermes.test.helper.client.Hermes;
-
-import java.util.Map;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedHashMap;
-import jakarta.ws.rs.core.Response;
-
-public class HermesPublisher {
-
-    private final TopicEndpoint topicEndpoint;
-    private final WebTarget webTarget;
-
-    public HermesPublisher(String hermesFrontendUrl) {
-        Hermes hermes = hermes(hermesFrontendUrl);
-        this.topicEndpoint = hermes.createTopicEndpoint();
-        this.webTarget = hermes.createWebTargetForPublishing();
-    }
-
-    public Response publish(String qualifiedTopicName, String message) {
-        return topicEndpoint.publishMessage(qualifiedTopicName, message);
-    }
-
-    public Response publish(String qualifiedTopicName, String message, Map<String, String> headers) {
-        String contentType = headers.getOrDefault("Content-Type", MediaType.TEXT_PLAIN);
-        return webTarget.path(qualifiedTopicName).request().headers(new MultivaluedHashMap<>(headers))
-                .post(Entity.entity(message, contentType));
-    }
-
-    public Response publish(String qualifiedTopicName, byte[] message) {
-        return topicEndpoint.publishMessage(qualifiedTopicName, message);
-    }
-
-    public Response publishAvro(String qualifiedTopicName, byte[] message, Map<String, String> headers) {
-        return webTarget.path(qualifiedTopicName).request().headers(new MultivaluedHashMap<>(headers))
-                .post(Entity.entity(message, "avro/binary"));
-    }
-
-    private Hermes hermes(String hermesFrontendUrl) {
-        return new Hermes(hermesFrontendUrl, hermesFrontendUrl)
-                .withManagementConfig(JerseyClientFactory.createConfig())
-                .withPublisherConfig(JerseyClientFactory.createConfig());
-    }
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/JerseyClientFactory.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/JerseyClientFactory.java
deleted file mode 100644
index 43297b5bcf..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/JerseyClientFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.endpoint;
-
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
-
-public class JerseyClientFactory {
-
-    public static Client create() {
-        return ClientBuilder.newClient(createConfig());
-    }
-
-    static ClientConfig createConfig() {
-        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.property(ClientProperties.ASYNC_THREADPOOL_SIZE, 10);
-        clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 5000);
-        clientConfig.property(ClientProperties.READ_TIMEOUT, 80000);
-        return clientConfig;
-    }
-
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/MultiUrlEndpointAddressResolver.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/MultiUrlEndpointAddressResolver.java
index 7980fab7e7..efb1c07bf5 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/MultiUrlEndpointAddressResolver.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/MultiUrlEndpointAddressResolver.java
@@ -1,6 +1,10 @@
 package pl.allegro.tech.hermes.test.helper.endpoint;
 
 import com.google.common.base.Throwables;
+import java.net.URI;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import pl.allegro.tech.hermes.api.EndpointAddress;
 import pl.allegro.tech.hermes.api.EndpointAddressResolverMetadata;
 import pl.allegro.tech.hermes.consumers.consumer.Message;
@@ -10,41 +14,38 @@
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.EndpointAddressResolver;
 import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.InterpolatingEndpointAddressResolver;
 
-import java.net.URI;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 public class MultiUrlEndpointAddressResolver implements EndpointAddressResolver {
 
-    private final EndpointAddressResolver delegate = new InterpolatingEndpointAddressResolver(new MessageBodyInterpolator());
-
-    @Override
-    public List<URI> resolveAll(EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
-            throws EndpointAddressResolutionException {
-        return Stream.of(address.getEndpoint().split(";"))
-                .map(url -> safeResolve(message, url, metadata))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public URI resolve(EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
-            throws EndpointAddressResolutionException {
-        return delegate.resolve(address, message, metadata);
-    }
-
-    @Override
-    public URI resolve(EndpointAddress address, MessageBatch batch, EndpointAddressResolverMetadata metadata)
-            throws EndpointAddressResolutionException {
-        return delegate.resolve(address, batch, metadata);
-    }
-
-    private URI safeResolve(Message message, String url, EndpointAddressResolverMetadata metadata) {
-        try {
-            return delegate.resolve(EndpointAddress.of(url), message, metadata);
-        } catch (EndpointAddressResolutionException e) {
-            throw Throwables.propagate(e);
-        }
+  private final EndpointAddressResolver delegate =
+      new InterpolatingEndpointAddressResolver(new MessageBodyInterpolator());
+
+  @Override
+  public List<URI> resolveAll(
+      EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata) {
+    return Stream.of(address.getEndpoint().split(";"))
+        .map(url -> safeResolve(message, url, metadata))
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public URI resolve(
+      EndpointAddress address, Message message, EndpointAddressResolverMetadata metadata)
+      throws EndpointAddressResolutionException {
+    return delegate.resolve(address, message, metadata);
+  }
+
+  @Override
+  public URI resolve(
+      EndpointAddress address, MessageBatch batch, EndpointAddressResolverMetadata metadata)
+      throws EndpointAddressResolutionException {
+    return delegate.resolve(address, batch, metadata);
+  }
+
+  private URI safeResolve(Message message, String url, EndpointAddressResolverMetadata metadata) {
+    try {
+      return delegate.resolve(EndpointAddress.of(url), message, metadata);
+    } catch (EndpointAddressResolutionException e) {
+      throw Throwables.propagate(e);
     }
-
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/RemoteServiceEndpoint.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/RemoteServiceEndpoint.java
index 3c465277ee..edd75353e6 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/RemoteServiceEndpoint.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/RemoteServiceEndpoint.java
@@ -1,254 +1,266 @@
 package pl.allegro.tech.hermes.test.helper.endpoint;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
+import static jakarta.ws.rs.core.Response.Status.MOVED_PERMANENTLY;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import com.google.common.collect.Iterables;
-import com.jayway.awaitility.Duration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.test.helper.message.TestMessage;
-
 import java.net.URI;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
-import static com.jayway.awaitility.Awaitility.await;
-import static java.util.stream.Collectors.toList;
-import static jakarta.ws.rs.core.Response.Status.MOVED_PERMANENTLY;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
 public class RemoteServiceEndpoint {
 
-    private static final Logger logger = LoggerFactory.getLogger(RemoteServiceEndpoint.class);
+  private static final Logger logger = LoggerFactory.getLogger(RemoteServiceEndpoint.class);
 
-    private final List<LoggedRequest> receivedRequests = Collections.synchronizedList(new ArrayList<>());
-    private final String path;
-    private final URI url;
+  private final List<LoggedRequest> receivedRequests =
+      Collections.synchronizedList(new ArrayList<>());
+  private final String path;
+  private final URI url;
 
-    private final WireMock listener;
-    private final WireMockServer service;
+  private final WireMock listener;
+  private final WireMockServer service;
 
-    private List<String> expectedMessages = new ArrayList<>();
+  private List<String> expectedMessages = new ArrayList<>();
 
-    private int returnedStatusCode = 200;
-    private int delay = 0;
+  private int returnedStatusCode = 200;
+  private int delay = 0;
 
-    public RemoteServiceEndpoint(WireMockServer service) {
-        this(service, "/");
-    }
+  public RemoteServiceEndpoint(WireMockServer service) {
+    this(service, "/");
+  }
 
-    public RemoteServiceEndpoint(WireMockServer service, final String path) {
-        this.listener = new WireMock("localhost", service.port());
-        this.path = path;
-        this.url = URI.create(String.format("http://localhost:%d%s", service.port(), path));
-        this.service = service;
+  public RemoteServiceEndpoint(WireMockServer service, final String path) {
+    this.listener = new WireMock("localhost", service.port());
+    this.path = path;
+    this.url = URI.create(String.format("http://localhost:%d%s", service.port(), path));
+    this.service = service;
 
-        service.resetMappings();
-        service.resetRequests();
-        service.resetScenarios();
+    service.resetMappings();
+    service.resetRequests();
+    service.resetScenarios();
 
-        service.addMockServiceRequestListener((request, response) -> {
-            if (path.equals(request.getUrl())) {
-                receivedRequests.add(LoggedRequest.createFrom(request));
-            }
+    service.addMockServiceRequestListener(
+        (request, response) -> {
+          if (path.equals(request.getUrl())) {
+            receivedRequests.add(LoggedRequest.createFrom(request));
+          }
         });
-    }
-
-    public void expectMessages(TestMessage... messages) {
-        expectMessages(Arrays.stream(messages).map(TestMessage::body).collect(toList()));
-    }
-
-    public void expectMessages(String... messages) {
-        expectMessages(Arrays.asList(messages));
-    }
-
-    public void expectMessages(List<String> messages) {
-        receivedRequests.clear();
-        expectedMessages = messages;
-        messages.forEach(m -> listener
-            .register(
-                post(urlEqualTo(path))
-                .willReturn(aResponse().withStatus(returnedStatusCode).withFixedDelay(delay))));
-    }
-
-    public void redirectMessage(String message) {
-        receivedRequests.clear();
-
-        expectedMessages = Collections.singletonList(message);
-
-        listener.register(
-            post(urlEqualTo(path))
-            .willReturn(aResponse()
-                .withStatus(MOVED_PERMANENTLY.getStatusCode())
-                .withHeader("Location", "http://localhost:" + service.port())));
-    }
-
-    public void retryMessage(String message, int delay) {
-        receivedRequests.clear();
-        expectedMessages = Arrays.asList(message, message);
-        int retryStatusCode = 503;
-        listener.register(
-                post(urlEqualTo(path))
-                        .inScenario("retrying")
-                        .whenScenarioStateIs(STARTED)
-                        .willSetStateTo("retried")
-                        .willReturn(aResponse()
-                                .withStatus(retryStatusCode)
-                                .withHeader("Retry-After", Integer.toString(delay))
-                                .withFixedDelay(delay)));
-        listener.register(
+  }
+
+  public void expectMessages(TestMessage... messages) {
+    expectMessages(Arrays.stream(messages).map(TestMessage::body).collect(toList()));
+  }
+
+  public void expectMessages(String... messages) {
+    expectMessages(Arrays.asList(messages));
+  }
+
+  public void expectMessages(List<String> messages) {
+    receivedRequests.clear();
+    expectedMessages = messages;
+    messages.forEach(
+        m ->
+            listener.register(
                 post(urlEqualTo(path))
-                        .inScenario("retrying")
-                        .whenScenarioStateIs("retried")
-                        .willReturn(aResponse().withStatus(returnedStatusCode).withFixedDelay(delay)));
+                    .willReturn(aResponse().withStatus(returnedStatusCode).withFixedDelay(delay))));
+  }
+
+  public void redirectMessage(String message) {
+    receivedRequests.clear();
+
+    expectedMessages = Collections.singletonList(message);
+
+    listener.register(
+        post(urlEqualTo(path))
+            .willReturn(
+                aResponse()
+                    .withStatus(MOVED_PERMANENTLY.getStatusCode())
+                    .withHeader("Location", "http://localhost:" + service.port())));
+  }
+
+  public void retryMessage(String message, int delay) {
+    receivedRequests.clear();
+    expectedMessages = Arrays.asList(message, message);
+    int retryStatusCode = 503;
+    listener.register(
+        post(urlEqualTo(path))
+            .inScenario("retrying")
+            .whenScenarioStateIs(STARTED)
+            .willSetStateTo("retried")
+            .willReturn(
+                aResponse()
+                    .withStatus(retryStatusCode)
+                    .withHeader("Retry-After", Integer.toString(delay))
+                    .withFixedDelay(delay)));
+    listener.register(
+        post(urlEqualTo(path))
+            .inScenario("retrying")
+            .whenScenarioStateIs("retried")
+            .willReturn(aResponse().withStatus(returnedStatusCode).withFixedDelay(delay)));
+  }
+
+  public void slowThenFastMessage(String message, int chunks, int delayMs) {
+    receivedRequests.clear();
+    expectedMessages = Arrays.asList(message, message);
+
+    listener.register(
+        post(urlEqualTo(path))
+            .inScenario("slowAndFast")
+            .whenScenarioStateIs(STARTED)
+            .willSetStateTo("slow")
+            .willReturn(
+                aResponse()
+                    .withStatus(returnedStatusCode)
+                    .withBody("I am very slow!")
+                    .withChunkedDribbleDelay(chunks, delayMs)));
+
+    listener.register(
+        post(urlEqualTo(path))
+            .inScenario("slowAndFast")
+            .whenScenarioStateIs("slow")
+            .willReturn(aResponse().withStatus(returnedStatusCode).withFixedDelay(0)));
+  }
+
+  public void setReturnedStatusCode(int statusCode) {
+    returnedStatusCode = statusCode;
+  }
+
+  public void waitUntilReceived(long seconds) {
+    logger.info("Expecting to receive {} messages", expectedMessages.size());
+    await()
+        .atMost(adjust(Duration.ofSeconds(seconds)))
+        .untilAsserted(
+            () ->
+                assertThat(receivedRequests.size())
+                    .isGreaterThanOrEqualTo(expectedMessages.size()));
+    synchronized (receivedRequests) {
+      assertThat(receivedRequests.stream().map(LoggedRequest::getBodyAsString).collect(toList()))
+          .containsAll(expectedMessages);
     }
-
-    public void slowThenFastMessage(String message, int chunks, int delayMs) {
-        receivedRequests.clear();
-        expectedMessages = Arrays.asList(message, message);
-
-        listener.register(
-                post(urlEqualTo(path))
-                        .inScenario("slowAndFast")
-                        .whenScenarioStateIs(STARTED)
-                        .willSetStateTo("slow")
-                        .willReturn(
-                                aResponse()
-                                        .withStatus(returnedStatusCode)
-                                        .withBody("I am very slow!")
-                                        .withChunkedDribbleDelay(chunks, delayMs)
-                        )
-        );
-
-        listener.register(
-                post(urlEqualTo(path))
-                        .inScenario("slowAndFast")
-                        .whenScenarioStateIs("slow")
-                        .willReturn(
-                                aResponse()
-                                        .withStatus(returnedStatusCode)
-                                        .withFixedDelay(0)
-                        )
-        );
+  }
+
+  public void waitUntilReceived(long seconds, int numberOfExpectedMessages) {
+    waitUntilReceived(seconds, numberOfExpectedMessages, body -> {});
+  }
+
+  public void waitUntilReceived(Consumer<String> requestBodyConsumer) {
+    waitUntilRequestReceived(
+        loggedRequest -> requestBodyConsumer.accept(loggedRequest.getBodyAsString()));
+  }
+
+  public void waitUntilRequestReceived(Consumer<LoggedRequest> requestConsumer) {
+    waitUntilReceived(60, 1, requestConsumer);
+  }
+
+  public void waitUntilReceived(
+      long seconds, int numberOfExpectedMessages, Consumer<LoggedRequest> requestBodyConsumer) {
+    logger.info("Expecting to receive {} messages", numberOfExpectedMessages);
+    await()
+        .atMost(adjust(Duration.ofSeconds(seconds)))
+        .untilAsserted(
+            () ->
+                assertThat(receivedRequests.size())
+                    .isGreaterThanOrEqualTo(numberOfExpectedMessages));
+    synchronized (receivedRequests) {
+      receivedRequests.forEach(requestBodyConsumer);
     }
-
-    public void setReturnedStatusCode(int statusCode) {
-        returnedStatusCode = statusCode;
+  }
+
+  public void waitUntilReceived(
+      Duration duration,
+      int numberOfExpectedMessages,
+      Consumer<LoggedRequest> requestBodyConsumer) {
+    logger.info("Expecting to receive {} messages", numberOfExpectedMessages);
+    await()
+        .atMost(duration)
+        .untilAsserted(
+            () -> assertThat(receivedRequests.size()).isEqualTo(numberOfExpectedMessages));
+    synchronized (receivedRequests) {
+      receivedRequests.forEach(requestBodyConsumer);
     }
+  }
 
-    public void waitUntilReceived(long seconds) {
-        logger.info("Expecting to receive {} messages", expectedMessages.size());
-        await().atMost(adjust(new Duration(seconds, TimeUnit.SECONDS))).until(() ->
-                assertThat(receivedRequests.size()).isGreaterThanOrEqualTo(expectedMessages.size()));
-        synchronized (receivedRequests) {
-            assertThat(receivedRequests.stream().map(LoggedRequest::getBodyAsString).collect(toList())).containsAll(expectedMessages);
-        }
-    }
+  public void waitUntilReceived() {
+    this.waitUntilReceived(60);
+  }
 
-    public void waitUntilReceived(long seconds, int numberOfExpectedMessages) {
-        waitUntilReceived(seconds, numberOfExpectedMessages, body -> {});
-    }
+  public void makeSureNoneReceived() {
+    logger.info("Expecting to receive no messages");
+    assertThat(receivedRequests).isEmpty();
+  }
 
-    public void waitUntilReceived(Consumer<String> requestBodyConsumer) {
-        waitUntilRequestReceived(loggedRequest -> requestBodyConsumer.accept(loggedRequest.getBodyAsString()));
+  public LoggedRequest getLastReceivedRequest() {
+    synchronized (receivedRequests) {
+      return Iterables.getLast(receivedRequests);
     }
+  }
 
-    public void waitUntilRequestReceived(Consumer<LoggedRequest> requestConsumer) {
-        waitUntilReceived(60, 1, requestConsumer);
+  public LoggedRequest getFirstReceivedRequest() {
+    LoggedRequest item = Iterables.getFirst(receivedRequests, null);
+    if (item == null) {
+      throw new NoSuchElementException();
     }
+    return item;
+  }
 
-    public void waitUntilReceived(long seconds, int numberOfExpectedMessages, Consumer<LoggedRequest> requestBodyConsumer) {
-        logger.info("Expecting to receive {} messages", numberOfExpectedMessages);
-        await().atMost(adjust(new Duration(seconds, TimeUnit.SECONDS))).until(() ->
-                assertThat(receivedRequests.size()).isGreaterThanOrEqualTo(numberOfExpectedMessages));
-        synchronized (receivedRequests) {
-            receivedRequests.stream().forEach(requestBodyConsumer::accept);
-        }
+  public boolean receivedMessageWithHeader(String header, String value) {
+    synchronized (receivedRequests) {
+      return receivedRequests.stream().anyMatch(r -> r.header(header).containsValue(value));
     }
-
-    public void waitUntilReceived(Duration duration, int numberOfExpectedMessages, Consumer<LoggedRequest> requestBodyConsumer) {
-        logger.info("Expecting to receive {} messages", numberOfExpectedMessages);
-        await().atMost(duration).until(() -> assertThat(receivedRequests.size()).isEqualTo(numberOfExpectedMessages));
-        synchronized (receivedRequests) {
-            receivedRequests.stream().forEach(requestBodyConsumer::accept);
-        }
-    }
-
-    public void waitUntilReceived() {
-        this.waitUntilReceived(60);
-    }
-
-    public void makeSureNoneReceived() {
-        logger.info("Expecting to receive no messages");
-        assertThat(receivedRequests).isEmpty();
-    }
-
-    public LoggedRequest getLastReceivedRequest() {
-        synchronized (receivedRequests) {
-            return Iterables.getLast(receivedRequests);
-        }
-    }
-
-    public LoggedRequest getFirstReceivedRequest() {
-        LoggedRequest item = Iterables.getFirst(receivedRequests, null);
-        if (item == null) {
-            throw new NoSuchElementException();
-        }
-        return item;
-    }
-
-    public boolean receivedMessageWithHeader(String header, String value) {
-        synchronized (receivedRequests) {
-            return receivedRequests.stream().anyMatch(r -> r.header(header).containsValue(value));
-        }
-    }
-
-    public java.time.Duration durationBetweenFirstAndLastRequest() {
-        return java.time.Duration.between(
-                getFirstReceivedRequest().getLoggedDate().toInstant(),
-                getLastReceivedRequest().getLoggedDate().toInstant());
-    }
-
-    public LoggedRequest waitAndGetLastRequest() {
-        waitUntilReceived();
-        return getLastReceivedRequest();
-    }
-
-    public void reset() {
-        delay = 0;
-        returnedStatusCode = 200;
-        receivedRequests.clear();
-        listener.resetMappings();
-        service.resetMappings();
-    }
-
-    public RemoteServiceEndpoint setDelay(int delay) {
-        this.delay = delay;
-        return this;
-    }
-
-    public URI getUrl() {
-        return url;
-    }
-
-    public int getServicePort() {
-        return this.service.port();
-    }
-
-    public void stop() {
-        listener.shutdown();
-        service.shutdown();
-    }
-
+  }
+
+  public java.time.Duration durationBetweenFirstAndLastRequest() {
+    return java.time.Duration.between(
+        getFirstReceivedRequest().getLoggedDate().toInstant(),
+        getLastReceivedRequest().getLoggedDate().toInstant());
+  }
+
+  public LoggedRequest waitAndGetLastRequest() {
+    waitUntilReceived();
+    return getLastReceivedRequest();
+  }
+
+  public void reset() {
+    delay = 0;
+    returnedStatusCode = 200;
+    receivedRequests.clear();
+    listener.resetMappings();
+    service.resetMappings();
+  }
+
+  public RemoteServiceEndpoint setDelay(int delay) {
+    this.delay = delay;
+    return this;
+  }
+
+  public URI getUrl() {
+    return url;
+  }
+
+  public int getServicePort() {
+    return this.service.port();
+  }
+
+  public void stop() {
+    listener.shutdown();
+    service.shutdown();
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/TimeoutAdjuster.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/TimeoutAdjuster.java
index 524d13d866..295d5a3f03 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/TimeoutAdjuster.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/TimeoutAdjuster.java
@@ -1,19 +1,18 @@
 package pl.allegro.tech.hermes.test.helper.endpoint;
 
-import com.jayway.awaitility.Duration;
-
-import java.util.concurrent.TimeUnit;
-
 import static java.lang.Double.parseDouble;
 
+import java.time.Duration;
+
 public class TimeoutAdjuster {
-    private static double timeoutMultiplier = parseDouble(System.getProperty("tests.timeout.multiplier", "1"));
+  private static final double timeoutMultiplier =
+      parseDouble(System.getProperty("tests.timeout.multiplier", "1"));
 
-    public static long adjust(long value) {
-        return (long) Math.floor(value * timeoutMultiplier);
-    }
+  public static long adjust(long value) {
+    return (long) Math.floor(value * timeoutMultiplier);
+  }
 
-    public static Duration adjust(Duration duration) {
-        return new Duration(adjust(duration.getValueInMS()), TimeUnit.MILLISECONDS);
-    }
+  public static Duration adjust(Duration duration) {
+    return Duration.ofMillis(adjust(duration.toMillis()));
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/Waiter.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/Waiter.java
deleted file mode 100644
index 785cfce584..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/Waiter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.endpoint;
-
-import com.jayway.awaitility.Duration;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.Topic;
-
-import jakarta.ws.rs.core.Response;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
-public class Waiter {
-
-    private final HermesEndpoints endpoints;
-
-    public Waiter(HermesEndpoints endpoints) {
-        this.endpoints = endpoints;
-    }
-
-    public void untilSubscriptionCreated(Topic topic, Subscription subscription) {
-        untilSubscriptionCreated(topic, subscription.getName(), subscription.isTrackingEnabled());
-    }
-
-    public void untilSubscriptionCreated(Topic topic, String subscription, boolean isTracked) {
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                endpoints.subscription().list(topic.getQualifiedName(), isTracked).contains(subscription)
-        );
-    }
-
-    public void untilSubscriptionRemoved(Subscription sub) {
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                !endpoints.subscription().list(sub.getQualifiedTopicName(), sub.isTrackingEnabled()).contains(sub.getName())
-        );
-    }
-
-    public void untilGroupCreated(String group) {
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                endpoints.group().list().contains(group)
-        );
-    }
-
-    public void untilTopicCreated(Topic topic) {
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                endpoints.findTopics(topic, topic.isTrackingEnabled()).contains(topic.getQualifiedName())
-        );
-    }
-
-    public void untilTopicRemoved(Topic topic) {
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                !endpoints.findTopics(topic, topic.isTrackingEnabled()).contains(topic.getQualifiedName()));
-    }
-
-    public void untilSchemaCreated(Topic topic) {
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                endpoints.schema().get(topic.getQualifiedName()).getStatus() == Response.Status.OK.getStatusCode()
-        );
-    }
-
-    public void untilTopicUpdated(Topic reference) {
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                endpoints.topic().get(reference.getQualifiedName()).equals(reference)
-        );
-    }
-
-    public void untilOAuthProviderCreated(String oAuthProviderName) {
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                endpoints.oAuthProvider().get(oAuthProviderName) != null
-        );
-    }
-}
-
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/HermesTestApp.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/HermesTestApp.java
new file mode 100644
index 0000000000..85b960fbd2
--- /dev/null
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/HermesTestApp.java
@@ -0,0 +1,14 @@
+package pl.allegro.tech.hermes.test.helper.environment;
+
+public interface HermesTestApp {
+
+  HermesTestApp start();
+
+  void stop();
+
+  boolean shouldBeRestarted();
+
+  void restoreDefaultSettings();
+
+  int getPort();
+}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/Starter.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/Starter.java
index 1291fe3d18..1cc7872bb4 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/Starter.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/Starter.java
@@ -2,9 +2,9 @@
 
 public interface Starter<T> {
 
-    void start() throws Exception;
+  void start() throws Exception;
 
-    void stop() throws Exception;
+  void stop() throws Exception;
 
-    T instance();
+  T instance();
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/WireMockStarter.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/WireMockStarter.java
deleted file mode 100644
index 69ad3f228e..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/environment/WireMockStarter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.environment;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class WireMockStarter implements Starter<WireMockServer> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(WireMockStarter.class);
-
-    private final int port;
-
-    private WireMockServer wireMockServer;
-
-    public WireMockStarter(int port) {
-        this.port = port;
-    }
-
-    @Override
-    public WireMockServer instance() {
-        return wireMockServer;
-    }
-
-    @Override
-    public void start() throws Exception {
-        LOGGER.info("Starting wiremock");
-        wireMockServer = new WireMockServer(port);
-        wireMockServer.start();
-    }
-
-    @Override
-    public void stop() throws Exception {
-        LOGGER.info("Stopping wiremock");
-        wireMockServer.stop();
-    }
-
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/message/TestMessage.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/message/TestMessage.java
index 91ed2bdcf4..4896e7c2ae 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/message/TestMessage.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/message/TestMessage.java
@@ -2,66 +2,64 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
+import pl.allegro.tech.hermes.common.message.wrapper.AvroMetadataMarker;
 
 public final class TestMessage {
 
-    private static final ObjectMapper objectMapper = new ObjectMapper();
+  private static final ObjectMapper objectMapper = new ObjectMapper();
 
-    private final Map<String, Object> content = new LinkedHashMap<>();
+  private final Map<String, Object> content = new LinkedHashMap<>();
 
-    private TestMessage() {
-    }
+  private TestMessage() {}
 
-    public static TestMessage of(String key, Object value) {
-        return new TestMessage().append(key, value);
-    }
-
-    public static TestMessage[] simpleMessages(int n) {
-        TestMessage[] simpleMessages = new TestMessage[n];
+  public static TestMessage of(String key, Object value) {
+    return new TestMessage().append(key, value);
+  }
 
-        for (int i = 0; i < n; i++) {
-            simpleMessages[i] = simple();
-        }
+  public static TestMessage[] simpleMessages(int n) {
+    TestMessage[] simpleMessages = new TestMessage[n];
 
-        return simpleMessages;
+    for (int i = 0; i < n; i++) {
+      simpleMessages[i] = simple();
     }
 
-    public static TestMessage simple() {
-        return new TestMessage().append("hello", "world");
-    }
+    return simpleMessages;
+  }
 
-    public static TestMessage random() {
-        return new TestMessage().append("random", UUID.randomUUID().toString());
-    }
+  public static TestMessage simple() {
+    return new TestMessage().append("hello", "world");
+  }
 
-    public TestMessage append(String key, Object value) {
-        content.put(key, value);
-        return this;
-    }
+  public static TestMessage random() {
+    return new TestMessage().append("random", UUID.randomUUID().toString());
+  }
 
-    public TestMessage withEmptyAvroMetadata() {
-        return append(AvroMetadataMarker.METADATA_MARKER, null);
-    }
+  public TestMessage append(String key, Object value) {
+    content.put(key, value);
+    return this;
+  }
 
-    public String body() {
-        return toString();
-    }
+  public TestMessage withEmptyAvroMetadata() {
+    return append(AvroMetadataMarker.METADATA_MARKER, null);
+  }
 
-    public Map<String, Object> getContent() {
-        return content;
-    }
+  public String body() {
+    return toString();
+  }
+
+  public Map<String, Object> getContent() {
+    return content;
+  }
 
-    @Override
-    public String toString() {
-        try {
-            return objectMapper.writeValueAsString(content);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+  @Override
+  public String toString() {
+    try {
+      return objectMapper.writeValueAsString(content);
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
     }
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/metrics/MicrometerUtils.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/metrics/MicrometerUtils.java
index 759ec0363c..8852008ffe 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/metrics/MicrometerUtils.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/metrics/MicrometerUtils.java
@@ -4,16 +4,25 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.search.Search;
-
 import java.util.Optional;
 import java.util.function.Function;
 
 public class MicrometerUtils {
-    public static <T extends Meter, R> Optional<R> metricValue(MeterRegistry meterRegistry, String metricName, Tags tags, Function<Search, T> searchMapper, Function<T, R> metricValueMapper) {
-        return Optional.ofNullable(searchMapper.apply(meterRegistry.find(metricName).tags(tags))).map(metricValueMapper);
-    }
+  public static <T extends Meter, R> Optional<R> metricValue(
+      MeterRegistry meterRegistry,
+      String metricName,
+      Tags tags,
+      Function<Search, T> searchMapper,
+      Function<T, R> metricValueMapper) {
+    return Optional.ofNullable(searchMapper.apply(meterRegistry.find(metricName).tags(tags)))
+        .map(metricValueMapper);
+  }
 
-    public static <T extends Meter, R> Optional<R> metricValue(MeterRegistry meterRegistry, String metricName, Function<Search, T> searchMapper, Function<T, R> metricValueMapper) {
-        return metricValue(meterRegistry, metricName, Tags.empty(), searchMapper, metricValueMapper);
-    }
+  public static <T extends Meter, R> Optional<R> metricValue(
+      MeterRegistry meterRegistry,
+      String metricName,
+      Function<Search, T> searchMapper,
+      Function<T, R> metricValueMapper) {
+    return metricValue(meterRegistry, metricName, Tags.empty(), searchMapper, metricValueMapper);
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/metrics/TestMetricsFacadeFactory.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/metrics/TestMetricsFacadeFactory.java
index 1b415b44a9..c474ee36e6 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/metrics/TestMetricsFacadeFactory.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/metrics/TestMetricsFacadeFactory.java
@@ -1,17 +1,11 @@
 package pl.allegro.tech.hermes.test.helper.metrics;
 
-import com.codahale.metrics.MetricRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
 
 public class TestMetricsFacadeFactory {
 
-    public static MetricsFacade create() {
-        return new MetricsFacade(
-                new SimpleMeterRegistry(),
-                new HermesMetrics(new MetricRegistry(), new PathsCompiler("localhost"))
-        );
-    }
+  public static MetricsFacade create() {
+    return new MetricsFacade(new SimpleMeterRegistry());
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthClient.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthClient.java
index a45baeb443..d02aa3b69a 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthClient.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthClient.java
@@ -1,5 +1,3 @@
 package pl.allegro.tech.hermes.test.helper.oauth.server;
 
-public record OAuthClient(String clientId, String secret) {
-
-}
+public record OAuthClient(String clientId, String secret) {}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthResourceOwner.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthResourceOwner.java
index 79b1e53463..f221c03d99 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthResourceOwner.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthResourceOwner.java
@@ -1,4 +1,3 @@
 package pl.allegro.tech.hermes.test.helper.oauth.server;
 
-public record OAuthResourceOwner(String username, String password) {
-}
+public record OAuthResourceOwner(String username, String password) {}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthTestServer.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthTestServer.java
index 09736f6b12..334f727a63 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthTestServer.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/oauth/server/OAuthTestServer.java
@@ -1,96 +1,80 @@
 package pl.allegro.tech.hermes.test.helper.oauth.server;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static org.apache.hc.core5.http.HttpStatus.SC_OK;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.WireMockServer;
-
 import java.util.Map;
 import java.util.UUID;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static org.apache.http.HttpStatus.SC_OK;
-
 public class OAuthTestServer {
 
-    private static final String OAUTH2_TOKEN_ENDPOINT = "/oauth2/token";
+  private static final String OAUTH2_TOKEN_ENDPOINT = "/oauth2/token";
 
-    private final ObjectMapper objectMapper = new ObjectMapper();
-    private final WireMockServer wireMockServer;
+  private final ObjectMapper objectMapper = new ObjectMapper();
+  private final WireMockServer wireMockServer;
 
-    public OAuthTestServer() {
-        wireMockServer = new WireMockServer(0);
-    }
+  public OAuthTestServer() {
+    wireMockServer = new WireMockServer(0);
+  }
 
-    public String getTokenEndpoint() {
-        return String.format("http://localhost:%s%s", wireMockServer.port(), OAUTH2_TOKEN_ENDPOINT);
-    }
+  public String getTokenEndpoint() {
+    return String.format("http://localhost:%s%s", wireMockServer.port(), OAUTH2_TOKEN_ENDPOINT);
+  }
 
-    public String stubAccessTokenForPasswordGrant(OAuthClient client, OAuthResourceOwner resourceOwner) {
-        String token = UUID.randomUUID().toString();
-        Map<String, String> params = Map.of(
-                "access_token", token,
-                "token_type", "Bearer"
-        );
-        try {
-            String body = objectMapper.writeValueAsString(params);
-            wireMockServer.addStubMapping(
-                    post(urlPathEqualTo(OAUTH2_TOKEN_ENDPOINT))
-                            .withQueryParam("grant_type", equalTo("password"))
-                            .withQueryParam("scope", equalTo(""))
-                            .withQueryParam("client_id", equalTo(client.clientId()))
-                            .withQueryParam("client_secret", equalTo(client.secret()))
-                            .withQueryParam("username", equalTo(resourceOwner.username()))
-                            .withQueryParam("password", equalTo(resourceOwner.password()))
-                            .willReturn(
-                                    aResponse()
-                                            .withBody(body)
-                                            .withStatus(SC_OK)
-                            )
-                            .build());
-            return token;
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+  public String stubAccessTokenForPasswordGrant(
+      OAuthClient client, OAuthResourceOwner resourceOwner) {
+    String token = UUID.randomUUID().toString();
+    Map<String, String> params = Map.of("access_token", token, "token_type", "Bearer");
+    try {
+      String body = objectMapper.writeValueAsString(params);
+      wireMockServer.addStubMapping(
+          post(urlPathEqualTo(OAUTH2_TOKEN_ENDPOINT))
+              .withQueryParam("grant_type", equalTo("password"))
+              .withQueryParam("client_id", equalTo(client.clientId()))
+              .withQueryParam("client_secret", equalTo(client.secret()))
+              .withQueryParam("username", equalTo(resourceOwner.username()))
+              .withQueryParam("password", equalTo(resourceOwner.password()))
+              .willReturn(aResponse().withBody(body).withStatus(SC_OK))
+              .build());
+      return token;
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
     }
+  }
 
-    public String stubAccessTokenForClientCredentials(OAuthClient client) {
-        String token = UUID.randomUUID().toString();
-        Map<String, String> params = Map.of(
-                "access_token", token,
-                "token_type", "Bearer"
-        );
-        try {
-            String body = objectMapper.writeValueAsString(params);
-            wireMockServer.addStubMapping(
-                    post(urlPathEqualTo(OAUTH2_TOKEN_ENDPOINT))
-                            .withQueryParam("grant_type", equalTo("client_credentials"))
-                            .withQueryParam("scope", equalTo(""))
-                            .withQueryParam("client_id", equalTo(client.clientId()))
-                            .withQueryParam("client_secret", equalTo(client.secret()))
-                            .willReturn(
-                                    aResponse()
-                                            .withBody(body)
-                                            .withStatus(SC_OK)
-                            )
-                            .build());
-            return token;
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+  public String stubAccessTokenForClientCredentials(OAuthClient client) {
+    String token = UUID.randomUUID().toString();
+    Map<String, String> params = Map.of("access_token", token, "token_type", "Bearer");
+    try {
+      String body = objectMapper.writeValueAsString(params);
+      wireMockServer.addStubMapping(
+          post(urlPathEqualTo(OAUTH2_TOKEN_ENDPOINT))
+              .withQueryParam("grant_type", equalTo("client_credentials"))
+              .withQueryParam("client_id", equalTo(client.clientId()))
+              .withQueryParam("client_secret", equalTo(client.secret()))
+              .willReturn(aResponse().withBody(body).withStatus(SC_OK))
+              .build());
+      return token;
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
     }
+  }
 
-    public void reset() {
-        wireMockServer.resetAll();
-    }
+  public void reset() {
+    wireMockServer.resetAll();
+  }
 
-    public void start() {
-        wireMockServer.start();
-    }
+  public void start() {
+    wireMockServer.start();
+  }
 
-    public void stop() {
-        wireMockServer.stop();
-    }
+  public void stop() {
+    wireMockServer.stop();
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/retry/Retry.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/retry/Retry.java
deleted file mode 100644
index b0411a4235..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/retry/Retry.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.retry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.IRetryAnalyzer;
-import org.testng.ITestResult;
-
-import static java.lang.Integer.parseInt;
-
-public class Retry implements IRetryAnalyzer {
-    private int retryCount = 0;
-    private static final int maxRetryCount = parseInt(System.getProperty("tests.retry.count", "2"));
-    private static final Logger logger = LoggerFactory.getLogger(Retry.class);
-
-    @Override
-    public boolean retry(ITestResult result) {
-        logger.error("Retrying test {}.{}", result.getTestClass().getName(), result.getMethod().getMethodName(), result.getThrowable());
-        if (isRetryAvailable()) {
-            retryCount++;
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isRetryAvailable() {
-        return retryCount < maxRetryCount;
-    }
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/retry/RetryListener.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/retry/RetryListener.java
deleted file mode 100644
index 40b3b0216c..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/retry/RetryListener.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.retry;
-
-import org.testng.IRetryAnalyzer;
-import org.testng.ITestResult;
-import org.testng.Reporter;
-import org.testng.TestListenerAdapter;
-
-public class RetryListener extends TestListenerAdapter {
-
-    @Override
-    public void onTestFailure(ITestResult result) {
-        IRetryAnalyzer analyzer = result.getMethod().getRetryAnalyzer(result);
-        if (analyzer != null && analyzer instanceof Retry) {
-            result.setStatus(((Retry) analyzer).isRetryAvailable() ? ITestResult.SKIP : ITestResult.FAILURE);
-            Reporter.setCurrentTestResult(result);
-        }
-    }
-
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/time/ModifiableClock.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/time/ModifiableClock.java
index a1be85dc1b..0967facbac 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/time/ModifiableClock.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/time/ModifiableClock.java
@@ -1,37 +1,37 @@
 package pl.allegro.tech.hermes.test.helper.time;
 
+import static java.time.Instant.now;
+
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 
-import static java.time.Instant.now;
-
 public class ModifiableClock extends Clock {
 
-    private Clock clock = fixed(now(systemDefaultZone()), ZoneId.systemDefault());
+  private Clock clock = fixed(now(systemDefaultZone()), ZoneId.systemDefault());
 
-    public void advanceMinutes(int minutes) {
-        clock = fixed(now(clock).plus(minutes, ChronoUnit.MINUTES), ZoneId.systemDefault());
-    }
+  public void advanceMinutes(int minutes) {
+    clock = fixed(now(clock).plus(minutes, ChronoUnit.MINUTES), ZoneId.systemDefault());
+  }
 
-    public void advance(Duration step) {
-        clock = fixed(now(clock).plus(step), ZoneId.systemDefault());
-    }
+  public void advance(Duration step) {
+    clock = fixed(now(clock).plus(step), ZoneId.systemDefault());
+  }
 
-    @Override
-    public ZoneId getZone() {
-        return clock.getZone();
-    }
+  @Override
+  public ZoneId getZone() {
+    return clock.getZone();
+  }
 
-    @Override
-    public Clock withZone(ZoneId zone) {
-        return clock.withZone(zone);
-    }
+  @Override
+  public Clock withZone(ZoneId zone) {
+    return clock.withZone(zone);
+  }
 
-    @Override
-    public Instant instant() {
-        return clock.instant();
-    }
+  @Override
+  public Instant instant() {
+    return clock.instant();
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/util/Ports.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/util/Ports.java
index a2ab3df979..420703ee94 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/util/Ports.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/util/Ports.java
@@ -1,73 +1,74 @@
 package pl.allegro.tech.hermes.test.helper.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
 import java.net.Socket;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class Ports {
 
-    private static final Logger logger = LoggerFactory.getLogger(Ports.class);
+  private static final Logger logger = LoggerFactory.getLogger(Ports.class);
 
-    private Ports() {
-    }
+  private Ports() {}
 
-    public static int nextAvailable() {
-        try {
-            ServerSocket socket = new ServerSocket(0);
-            socket.setReuseAddress(true);
-            int port = socket.getLocalPort();
-            socket.getLocalSocketAddress();
-            socket.close();
+  public static int nextAvailable() {
+    try {
+      ServerSocket socket = new ServerSocket(0);
+      socket.setReuseAddress(true);
+      int port = socket.getLocalPort();
+      socket.getLocalSocketAddress();
+      socket.close();
 
-            // second check whether the port is available as on some dynamic environments it can be still in use
-            try (Socket ignore = new Socket("127.0.0.1", port)) {
-                logger.warn("Connected to randomly selected port {} meaning it is still in use. Drawing next port.", port);
-                return nextAvailable();
-            } catch (ConnectException ex) {
-                // expected exception as on provided port no one should listen
-                return port;
-            }
-        } catch (IOException exception) {
-            throw new NoAvailablePortException(exception);
-        }
+      // second check whether the port is available as on some dynamic environments it can be still
+      // in use
+      try (Socket ignore = new Socket("127.0.0.1", port)) {
+        logger.warn(
+            "Connected to randomly selected port {} meaning it is still in use. Drawing next port.",
+            port);
+        return nextAvailable();
+      } catch (ConnectException ex) {
+        // expected exception as on provided port no one should listen
+        return port;
+      }
+    } catch (IOException exception) {
+      throw new NoAvailablePortException(exception);
     }
+  }
 
-    public static int nextAvailable(int min, int max) {
-        for (int port = min; port <= max; ++port) {
-            if (isPortAvailable(port)) {
-                return port;
-            }
-        }
-        throw new NoAvailablePortException("Problem finding port in a scope: " + min + " " + max);
+  public static int nextAvailable(int min, int max) {
+    for (int port = min; port <= max; ++port) {
+      if (isPortAvailable(port)) {
+        return port;
+      }
     }
+    throw new NoAvailablePortException("Problem finding port in a scope: " + min + " " + max);
+  }
 
-    public static boolean isPortAvailable(int port) {
-        try {
-            try (ServerSocket socket = new ServerSocket(port)) {
-                socket.setReuseAddress(true);
+  public static boolean isPortAvailable(int port) {
+    try {
+      try (ServerSocket socket = new ServerSocket(port)) {
+        socket.setReuseAddress(true);
 
-                try (DatagramSocket datagramSocket = new DatagramSocket(port)) {
-                    datagramSocket.setReuseAddress(true);
-                    return true;
-                }
-            }
-        } catch (IOException e) {
-            return false;
+        try (DatagramSocket datagramSocket = new DatagramSocket(port)) {
+          datagramSocket.setReuseAddress(true);
+          return true;
         }
+      }
+    } catch (IOException e) {
+      return false;
     }
+  }
 
-    public static class NoAvailablePortException extends RuntimeException {
-        public NoAvailablePortException(Throwable cause) {
-            super(cause);
-        }
+  public static class NoAvailablePortException extends RuntimeException {
+    public NoAvailablePortException(Throwable cause) {
+      super(cause);
+    }
 
-        public NoAvailablePortException(String message) {
-            super(message);
-        }
+    public NoAvailablePortException(String message) {
+      super(message);
     }
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperBaseTest.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperBaseTest.java
index 648fb90aaa..73b2330472 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperBaseTest.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperBaseTest.java
@@ -11,59 +11,59 @@
 @SuppressFBWarnings("MS_PKGPROTECT")
 public abstract class ZookeeperBaseTest {
 
-    protected static TestingServer zookeeperServer;
+  protected static TestingServer zookeeperServer;
 
-    protected static CuratorFramework zookeeperClient;
+  protected static CuratorFramework zookeeperClient;
 
-    protected static ZookeeperWaiter wait;
+  protected static ZookeeperWaiter wait;
 
-    protected ZookeeperBaseTest() {
-    }
+  protected ZookeeperBaseTest() {}
 
-    @BeforeClass
-    public static void beforeZookeeperClass() throws Exception {
-        zookeeperServer = new TestingServer(45678);
-        zookeeperClient = CuratorFrameworkFactory.builder()
-                .connectString(zookeeperServer.getConnectString())
-                .retryPolicy(new ExponentialBackoffRetry(1000, 3))
-                .build();
-        zookeeperClient.start();
-        wait = new ZookeeperWaiter(zookeeperClient);
+  @BeforeClass
+  public static void beforeZookeeperClass() throws Exception {
+    zookeeperServer = new TestingServer(45678);
+    zookeeperClient =
+        CuratorFrameworkFactory.builder()
+            .connectString(zookeeperServer.getConnectString())
+            .retryPolicy(new ExponentialBackoffRetry(1000, 3))
+            .build();
+    zookeeperClient.start();
+    wait = new ZookeeperWaiter(zookeeperClient);
 
-        wait.untilZookeeperClientStarted();
-    }
+    wait.untilZookeeperClientStarted();
+  }
 
-    protected static CuratorFramework newClient() {
-        CuratorFramework newClient = CuratorFrameworkFactory.builder()
-                .connectString(zookeeperServer.getConnectString())
-                .retryPolicy(new ExponentialBackoffRetry(1000, 3))
-                .build();
-        newClient.start();
-        wait.untilZookeeperClientStarted(newClient);
-        return newClient;
-    }
+  protected static CuratorFramework newClient() {
+    CuratorFramework newClient =
+        CuratorFrameworkFactory.builder()
+            .connectString(zookeeperServer.getConnectString())
+            .retryPolicy(new ExponentialBackoffRetry(1000, 3))
+            .build();
+    newClient.start();
+    wait.untilZookeeperClientStarted(newClient);
+    return newClient;
+  }
 
-    @AfterClass
-    public static void tearDown() throws Exception {
-        zookeeperServer.stop();
-    }
+  @AfterClass
+  public static void tearDown() throws Exception {
+    zookeeperServer.stop();
+  }
 
-    protected void createPath(String path) throws Exception {
-        if (zookeeperClient.checkExists().forPath(path) == null) {
-            zookeeperClient.create().creatingParentsIfNeeded().forPath(path);
-        }
+  protected void createPath(String path) throws Exception {
+    if (zookeeperClient.checkExists().forPath(path) == null) {
+      zookeeperClient.create().creatingParentsIfNeeded().forPath(path);
     }
+  }
 
-    protected void deleteData(String path) throws Exception {
-        if (zookeeperClient.checkExists().forPath(path) != null) {
-            zookeeperClient.delete().deletingChildrenIfNeeded().forPath(path);
-        }
+  protected void deleteData(String path) throws Exception {
+    if (zookeeperClient.checkExists().forPath(path) != null) {
+      zookeeperClient.delete().deletingChildrenIfNeeded().forPath(path);
     }
+  }
 
-    protected void deleteAllNodes() throws Exception {
-        if (zookeeperClient.checkExists().forPath("/hermes") != null) {
-            zookeeperClient.delete().guaranteed().deletingChildrenIfNeeded().forPath("/hermes");
-        }
+  protected void deleteAllNodes() throws Exception {
+    if (zookeeperClient.checkExists().forPath("/hermes") != null) {
+      zookeeperClient.delete().guaranteed().deletingChildrenIfNeeded().forPath("/hermes");
     }
-
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperDataSaver.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperDataSaver.java
deleted file mode 100644
index dec3ae7bf4..0000000000
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperDataSaver.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package pl.allegro.tech.hermes.test.helper.zookeeper;
-
-import org.apache.curator.framework.CuratorFramework;
-
-public class ZookeeperDataSaver {
-
-    public static void save(CuratorFramework curatorFramework, String path, byte[] data) {
-        try {
-            if (curatorFramework.checkExists().forPath(path) == null) {
-                curatorFramework.create().creatingParentsIfNeeded().forPath(path, data);
-            } else {
-                curatorFramework.setData().forPath(path, data);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("Could not store data in zookeeper under path: " + path, e);
-        }
-    }
-}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperResource.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperResource.java
index cb997c1781..151fea1c79 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperResource.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperResource.java
@@ -1,128 +1,100 @@
 package pl.allegro.tech.hermes.test.helper.zookeeper;
 
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.RetryOneTime;
 import org.apache.curator.test.TestingServer;
 import org.junit.rules.ExternalResource;
 
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-
 public class ZookeeperResource extends ExternalResource {
 
-    private static Starter zookeeperStarter;
+  private static Starter zookeeperStarter;
 
-    private final int curatorPort;
-    
-    private final boolean initializeOnce;
+  private final int curatorPort;
 
-    private final Consumer<Starter> initializer;
+  private final boolean initializeOnce;
+
+  private final Consumer<Starter> initializer;
+
+  public ZookeeperResource(int curatorPort, boolean initializeOnce, Consumer<Starter> initializer) {
+    this.curatorPort = curatorPort;
+    this.initializeOnce = initializeOnce;
+    this.initializer = initializer;
+  }
+
+  public CuratorFramework curator() {
+    return zookeeperStarter.curator();
+  }
 
-    public ZookeeperResource(int curatorPort, boolean initializeOnce) {
-        this(curatorPort, initializeOnce, starter -> {});
+  @Override
+  protected void before() throws Throwable {
+    if (initializeOnce) {
+      if (zookeeperStarter == null) {
+        zookeeperStarter = new Starter(curatorPort, initializer);
+        zookeeperStarter.start();
+      }
+    } else {
+      zookeeperStarter = new Starter(curatorPort, initializer);
+      zookeeperStarter.start();
     }
-    
-    public ZookeeperResource(int curatorPort, boolean initializeOnce, Consumer<Starter> initializer) {
-        this.curatorPort = curatorPort;
-        this.initializeOnce = initializeOnce;
-        this.initializer = initializer;
+  }
+
+  @Override
+  protected void after() {
+    if (!initializeOnce) {
+      zookeeperStarter.stop();
+    } else {
+      zookeeperStarter.registerShutdownHook();
     }
+  }
 
-    public CuratorFramework curator() {
-        return zookeeperStarter.curator();
-    }
+  public static final class Starter {
 
-    public int curatorPort() {
-        return curatorPort;
-    }
-    
-    @Override
-    protected void before() throws Throwable {
-        if (initializeOnce) {
-            if (zookeeperStarter == null) {
-                zookeeperStarter = new Starter(curatorPort, initializer);
-                zookeeperStarter.start();
-            }
-        } else {
-            zookeeperStarter = new Starter(curatorPort, initializer);
-            zookeeperStarter.start();
-        }
+    private final int curatorPort;
+
+    private final Consumer<Starter> initializer;
+
+    private TestingServer server;
+
+    private CuratorFramework curator;
+
+    Starter(int curatorPort, Consumer<Starter> initializer) {
+      this.curatorPort = curatorPort;
+      this.initializer = initializer;
     }
 
-    @Override
-    protected void after() {
-        if (!initializeOnce) {
-            zookeeperStarter.stop();
-        } else {
-            zookeeperStarter.registerShutdownHook();
-        }
+    public CuratorFramework curator() {
+      return curator;
     }
 
-    public void deleteData(String path) throws Exception {
-        if (zookeeperStarter.curator().checkExists().forPath(path) != null) {
-            zookeeperStarter.curator().delete().deletingChildrenIfNeeded().forPath(path);
-        }
+    void start() {
+      try {
+        server = new TestingServer(curatorPort, true);
+        this.curator =
+            CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1000));
+        this.curator.start();
+
+        this.curator.blockUntilConnected(10, TimeUnit.SECONDS);
+        initializer.accept(this);
+      } catch (Exception ex) {
+        throw new IllegalStateException("Failed to start Zookeeper", ex);
+      }
     }
 
-    public void deleteAllNodes() throws Exception {
-        zookeeperStarter.curator().delete().guaranteed().deletingChildrenIfNeeded().forPath("/hermes");
+    void stop() {
+      try {
+        this.curator.close();
+        this.server.close();
+      } catch (IOException ex) {
+        throw new IllegalStateException("Failed to stop zookeeper", ex);
+      }
     }
-    
-    public static final class Starter {
-
-        private final int curatorPort;
-
-        private final Consumer<Starter> initializer;
-        
-        private TestingServer server;
-
-        private CuratorFramework curator;
-
-        Starter(int curatorPort, Consumer<Starter> initializer) {
-            this.curatorPort = curatorPort;
-            this.initializer = initializer;
-        }
-
-        public CuratorFramework curator() {
-            return curator;
-        }
-
-        public int curatorPort() {
-            return curatorPort;
-        }
-
-        void start() {
-            try {
-                server = new TestingServer(curatorPort, true);
-                this.curator = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1000));
-                this.curator.start();
-
-                this.curator.blockUntilConnected(10, TimeUnit.SECONDS);
-                initializer.accept(this);
-            } catch (Exception ex) {
-                throw new IllegalStateException("Failed to start Zookeeper", ex);
-            }
-        }
-
-        void stop() {
-            try {
-                this.curator.close();
-                this.server.close();
-            } catch (IOException ex) {
-                throw new IllegalStateException("Failed to stop zookeeper", ex);
-            }
-        }
-        
-        void registerShutdownHook() {
-            Runtime.getRuntime().addShutdownHook(new Thread() {
-                @Override
-                public void run() {
-                    Starter.this.stop();
-                }
-            });
-        }
-        
+
+    void registerShutdownHook() {
+      Runtime.getRuntime().addShutdownHook(new Thread(Starter.this::stop));
     }
+  }
 }
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperWaiter.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperWaiter.java
index f9e457174e..fa1ec5237e 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperWaiter.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperWaiter.java
@@ -1,59 +1,34 @@
 package pl.allegro.tech.hermes.test.helper.zookeeper;
 
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.imps.CuratorFrameworkState;
+import static org.awaitility.Awaitility.await;
 
 import java.util.concurrent.TimeUnit;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.joining;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.imps.CuratorFrameworkState;
 
 public class ZookeeperWaiter {
 
-    private final CuratorFramework zookeeper;
-
-    public ZookeeperWaiter(CuratorFramework zookeeper) {
-        this.zookeeper = zookeeper;
-    }
-
-    public void untilZookeeperClientStarted() {
-        this.untilZookeeperClientStarted(zookeeper);
-    }
-
-    public void untilZookeeperClientStarted(CuratorFramework client) {
-        await().atMost(2, TimeUnit.SECONDS).until(() -> client.getState() == CuratorFrameworkState.STARTED);
-    }
-
-    public void untilZookeeperClientStopped() {
-        this.untilZookeeperClientStopped(zookeeper);
-    }
-
-    public void untilZookeeperClientStopped(CuratorFramework client) {
-        await().atMost(2, TimeUnit.SECONDS).until(() -> client.getState() == CuratorFrameworkState.STOPPED);
-    }
-
-    public void untilZookeeperPathIsCreated(final String path) {
-        await().atMost(2, TimeUnit.SECONDS).until(() -> zookeeper.getData().forPath(path) != null);
-    }
+  private final CuratorFramework zookeeper;
 
-    public void untilZookeeperPathIsCreated(String... path) {
-        untilZookeeperPathIsCreated(stream(path).collect(joining("/")));
-    }
+  public ZookeeperWaiter(CuratorFramework zookeeper) {
+    this.zookeeper = zookeeper;
+  }
 
-    public void untilZookeeperPathIsEmpty(final String path) {
-        await().atMost(2, TimeUnit.SECONDS).until(() -> zookeeper.getChildren().forPath(path).isEmpty());
-    }
+  public void untilZookeeperClientStarted() {
+    this.untilZookeeperClientStarted(zookeeper);
+  }
 
-    public void untilZookeeperPathIsEmpty(String... path) {
-        untilZookeeperPathIsEmpty(stream(path).collect(joining("/")));
-    }
+  public void untilZookeeperClientStarted(CuratorFramework client) {
+    await()
+        .atMost(2, TimeUnit.SECONDS)
+        .until(() -> client.getState() == CuratorFrameworkState.STARTED);
+  }
 
-    public void untilZookeeperPathNotExists(final String path) {
-        await().atMost(2, TimeUnit.SECONDS).until(() -> zookeeper.checkExists().forPath(path) == null);
-    }
+  public void untilZookeeperPathIsCreated(final String path) {
+    await().atMost(2, TimeUnit.SECONDS).until(() -> zookeeper.getData().forPath(path) != null);
+  }
 
-    public void untilZookeeperPathNotExists(String... path) {
-        untilZookeeperPathNotExists(stream(path).collect(joining("/")));
-    }
+  public void untilZookeeperPathNotExists(final String path) {
+    await().atMost(2, TimeUnit.SECONDS).until(() -> zookeeper.checkExists().forPath(path) == null);
+  }
 }
diff --git a/hermes-tracker-elasticsearch/build.gradle b/hermes-tracker-elasticsearch/build.gradle
index 9641184d82..6e18bada83 100644
--- a/hermes-tracker-elasticsearch/build.gradle
+++ b/hermes-tracker-elasticsearch/build.gradle
@@ -4,15 +4,16 @@ plugins {
 dependencies {
     implementation project(':hermes-common')
     implementation project(':hermes-tracker')
-    implementation 'org.slf4j:slf4j-api:2.0.4'
+    implementation 'org.slf4j:slf4j-api:2.0.13'
+    // TODO: client has to have the same major version as backend: https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/client.html
+    // we need to use test-containers for elasticsearch server to able to use newer client.
     api group: 'org.elasticsearch.client', name: 'transport', version: '6.8.12'
 
     testImplementation project(path: ":hermes-tracker", configuration: "testArtifacts")
     testImplementation project(path: ":hermes-test-helper")
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock
+    // this should be migrated to testcontainers
     testImplementation 'pl.allegro.tech:embedded-elasticsearch:2.10.0'
     testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: versions.junit_jupiter
-}
-
-test.useTestNG()
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/DailyIndexFactory.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/DailyIndexFactory.java
index 5aff871ef7..f91ac51ae9 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/DailyIndexFactory.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/DailyIndexFactory.java
@@ -6,21 +6,21 @@
 
 public abstract class DailyIndexFactory implements IndexFactory {
 
-    private final String basePath;
-    private final Clock clock;
-    private final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy_MM_dd");
+  private final String basePath;
+  private final Clock clock;
+  private final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy_MM_dd");
 
-    public DailyIndexFactory(String basePath) {
-        this(basePath, Clock.systemUTC());
-    }
+  public DailyIndexFactory(String basePath) {
+    this(basePath, Clock.systemUTC());
+  }
 
-    public DailyIndexFactory(String basePath, Clock clock) {
-        this.basePath = basePath;
-        this.clock = clock;
-    }
+  public DailyIndexFactory(String basePath, Clock clock) {
+    this.basePath = basePath;
+    this.clock = clock;
+  }
 
-    @Override
-    public String createIndex() {
-        return basePath + "_" + dateTimeFormatter.format(LocalDate.now(clock));
-    }
+  @Override
+  public String createIndex() {
+    return basePath + "_" + dateTimeFormatter.format(LocalDate.now(clock));
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchClientFactory.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchClientFactory.java
index 47ce58655a..1e44846690 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchClientFactory.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchClientFactory.java
@@ -1,38 +1,37 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 public class ElasticsearchClientFactory {
 
-    private final TransportClient client;
+  private final TransportClient client;
 
-    public ElasticsearchClientFactory(int port, String clusterName, String... hosts) {
-        client = new PreBuiltTransportClient(
-                Settings.builder().put("cluster.name", clusterName).build());
+  public ElasticsearchClientFactory(int port, String clusterName, String... hosts) {
+    client =
+        new PreBuiltTransportClient(Settings.builder().put("cluster.name", clusterName).build());
 
-        for (String host : hosts) {
-            try {
-                client.addTransportAddress(new TransportAddress(InetAddress.getByName(host), port));
-            } catch (UnknownHostException e) {
-                throw new RuntimeException("Unknown host", e);
-            }
-        }
+    for (String host : hosts) {
+      try {
+        client.addTransportAddress(new TransportAddress(InetAddress.getByName(host), port));
+      } catch (UnknownHostException e) {
+        throw new RuntimeException("Unknown host", e);
+      }
     }
+  }
 
-    public Client client() {
-        return client;
-    }
+  public Client client() {
+    return client;
+  }
 
-    public void close() {
-        if (client != null) {
-            client.close();
-        }
+  public void close() {
+    if (client != null) {
+      client.close();
     }
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchDocument.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchDocument.java
index ec6d3b364e..02d9d9be53 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchDocument.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchDocument.java
@@ -1,27 +1,26 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch;
 
+import java.util.concurrent.Callable;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
-import java.util.concurrent.Callable;
-
 public class ElasticsearchDocument {
 
-    private final BytesReference bytesReference;
+  private final BytesReference bytesReference;
 
-    private ElasticsearchDocument(BytesReference bytesReference) {
-        this.bytesReference = bytesReference;
-    }
+  private ElasticsearchDocument(BytesReference bytesReference) {
+    this.bytesReference = bytesReference;
+  }
 
-    public BytesReference bytes() {
-        return bytesReference;
-    }
+  public BytesReference bytes() {
+    return bytesReference;
+  }
 
-    public static ElasticsearchDocument build(Callable<XContentBuilder> builder) {
-        try {
-            return new ElasticsearchDocument(BytesReference.bytes(builder.call()));
-        } catch (Exception e) {
-            throw new ElasticsearchRepositoryException(e);
-        }
+  public static ElasticsearchDocument build(Callable<XContentBuilder> builder) {
+    try {
+      return new ElasticsearchDocument(BytesReference.bytes(builder.call()));
+    } catch (Exception e) {
+      throw new ElasticsearchRepositoryException(e);
     }
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchQueueCommitter.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchQueueCommitter.java
index daed417560..69d60dd017 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchQueueCommitter.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchQueueCommitter.java
@@ -1,54 +1,62 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch;
 
-import com.codahale.metrics.Timer;
+import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ThreadFactory;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.xcontent.XContentType;
 import pl.allegro.tech.hermes.metrics.HermesTimer;
 import pl.allegro.tech.hermes.tracker.QueueCommitter;
 
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ThreadFactory;
-
-import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
 public class ElasticsearchQueueCommitter extends QueueCommitter<ElasticsearchDocument> {
 
-    private final IndexFactory indexFactory;
-    private final Client client;
-    private final String typeName;
-
-    public ElasticsearchQueueCommitter(BlockingQueue<ElasticsearchDocument> queue,
-                                       HermesTimer timer,
-                                       IndexFactory indexFactory,
-                                       String typeName,
-                                       Client client) {
-        super(queue, timer);
-        this.indexFactory = indexFactory;
-        this.typeName = typeName;
-        this.client = client;
-    }
-
-    @Override
-    protected void processBatch(List<ElasticsearchDocument> batch) throws ExecutionException, InterruptedException {
-        BulkRequestBuilder bulk = client.prepareBulk();
-        batch.forEach(entry -> bulk.add(
-                client.prepareIndex(indexFactory.createIndex(), typeName).setSource(entry.bytes(), XContentType.JSON)));
-        bulk.execute().get();
-    }
-
-    public static void scheduleCommitAtFixedRate(BlockingQueue<ElasticsearchDocument> queue,
-                                                 IndexFactory indexFactory,
-                                                 String typeName,
-                                                 Client client,
-                                                 HermesTimer timer,
-                                                 int interval) {
-        ElasticsearchQueueCommitter committer = new ElasticsearchQueueCommitter(queue, timer, indexFactory, typeName, client);
-        ThreadFactory factory = new ThreadFactoryBuilder().setNameFormat("elasticsearch-queue-committer-%d").build();
-        newSingleThreadScheduledExecutor(factory).scheduleAtFixedRate(committer, interval, interval, MILLISECONDS);
-    }
+  private final IndexFactory indexFactory;
+  private final Client client;
+  private final String typeName;
+
+  public ElasticsearchQueueCommitter(
+      BlockingQueue<ElasticsearchDocument> queue,
+      HermesTimer timer,
+      IndexFactory indexFactory,
+      String typeName,
+      Client client) {
+    super(queue, timer);
+    this.indexFactory = indexFactory;
+    this.typeName = typeName;
+    this.client = client;
+  }
+
+  @Override
+  protected void processBatch(List<ElasticsearchDocument> batch)
+      throws ExecutionException, InterruptedException {
+    BulkRequestBuilder bulk = client.prepareBulk();
+    batch.forEach(
+        entry ->
+            bulk.add(
+                client
+                    .prepareIndex(indexFactory.createIndex(), typeName)
+                    .setSource(entry.bytes(), XContentType.JSON)));
+    bulk.execute().get();
+  }
+
+  public static void scheduleCommitAtFixedRate(
+      BlockingQueue<ElasticsearchDocument> queue,
+      IndexFactory indexFactory,
+      String typeName,
+      Client client,
+      HermesTimer timer,
+      int interval) {
+    ElasticsearchQueueCommitter committer =
+        new ElasticsearchQueueCommitter(queue, timer, indexFactory, typeName, client);
+    ThreadFactory factory =
+        new ThreadFactoryBuilder().setNameFormat("elasticsearch-queue-committer-%d").build();
+    newSingleThreadScheduledExecutor(factory)
+        .scheduleAtFixedRate(committer, interval, interval, MILLISECONDS);
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchRepositoryException.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchRepositoryException.java
index fac38704d4..ece926224a 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchRepositoryException.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchRepositoryException.java
@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch;
 
 public class ElasticsearchRepositoryException extends RuntimeException {
-    public ElasticsearchRepositoryException(Throwable cause) {
-        super(cause);
-    }
+  public ElasticsearchRepositoryException(Throwable cause) {
+    super(cause);
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/IndexFactory.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/IndexFactory.java
index 5507be19ee..ada42aaa03 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/IndexFactory.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/IndexFactory.java
@@ -2,5 +2,5 @@
 
 public interface IndexFactory {
 
-    String createIndex();
+  String createIndex();
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/LogSchemaAware.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/LogSchemaAware.java
index 7337876cbc..dcee42c102 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/LogSchemaAware.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/LogSchemaAware.java
@@ -2,20 +2,20 @@
 
 public interface LogSchemaAware {
 
-    String MESSAGE_ID = "messageId";
-    String BATCH_ID = "batchId";
-    String TIMESTAMP = "timestamp";
-    String TIMESTAMP_SECONDS = "timestamp_seconds";
-    String PUBLISH_TIMESTAMP = "publish_timestamp";
-    String STATUS = "status";
-    String TOPIC_NAME = "topicName";
-    String SUBSCRIPTION = "subscription";
-    String PARTITION = "partition";
-    String OFFSET = "offset";
-    String REASON = "reason";
-    String CLUSTER = "cluster";
-    String SOURCE_HOSTNAME = "hostname";
-    String REMOTE_HOSTNAME = "remote_hostname";
-    String EXTRA_REQUEST_HEADERS = "extra_request_headers";
-
+  String MESSAGE_ID = "messageId";
+  String BATCH_ID = "batchId";
+  String TIMESTAMP = "timestamp";
+  String TIMESTAMP_SECONDS = "timestamp_seconds";
+  String PUBLISH_TIMESTAMP = "publish_timestamp";
+  String STATUS = "status";
+  String TOPIC_NAME = "topicName";
+  String SUBSCRIPTION = "subscription";
+  String PARTITION = "partition";
+  String OFFSET = "offset";
+  String REASON = "reason";
+  String CLUSTER = "cluster";
+  String SOURCE_HOSTNAME = "hostname";
+  String REMOTE_HOSTNAME = "remote_hostname";
+  String EXTRA_REQUEST_HEADERS = "extra_request_headers";
+  String STORAGE_DATACENTER = "storageDc";
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/SchemaManager.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/SchemaManager.java
index 93fa41b989..64bd9c6be1 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/SchemaManager.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/SchemaManager.java
@@ -1,20 +1,5 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch;
 
-import org.elasticsearch.action.admin.indices.alias.Alias;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import pl.allegro.tech.hermes.tracker.elasticsearch.consumers.ConsumersDailyIndexFactory;
-import pl.allegro.tech.hermes.tracker.elasticsearch.consumers.ConsumersIndexFactory;
-import pl.allegro.tech.hermes.tracker.elasticsearch.frontend.FrontendDailyIndexFactory;
-import pl.allegro.tech.hermes.tracker.elasticsearch.frontend.FrontendIndexFactory;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.function.Function;
-
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.BATCH_ID;
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.CLUSTER;
@@ -27,126 +12,217 @@
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.REMOTE_HOSTNAME;
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.SOURCE_HOSTNAME;
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.STATUS;
+import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.STORAGE_DATACENTER;
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.SUBSCRIPTION;
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.TIMESTAMP;
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.TIMESTAMP_SECONDS;
 import static pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware.TOPIC_NAME;
 
-public class SchemaManager {
-
-    public static final String PUBLISHED_INDEX = "published_messages";
-    public static final String PUBLISHED_TYPE = "published_message";
-    public static final String PUBLISHED_ALIAS_NAME = "alias_published_messages";
-    public static final String PUBLISHED_TEMPLATE_NAME = "template_published_messages";
-    public static final String PUBLISHED_INDICES_REG_EXP = "published_messages_*";
-
-    public static final String SENT_INDEX = "sent_messages";
-    public static final String SENT_TYPE = "sent_message";
-    public static final String SENT_ALIAS_NAME = "alias_sent_messages";
-    public static final String SENT_TEMPLATE_NAME = "template_sent_messages";
-    public static final String SENT_INDICES_REG_EXP = "sent_messages_*";
-
-    private final Client client;
-    private final FrontendIndexFactory frontendIndexFactory;
-    private final ConsumersIndexFactory consumersIndexFactory;
-    private final boolean dynamicMappingEnabled;
-
-    public static SchemaManager schemaManagerWithDailyIndexes(Client elasticClient) {
-        return new SchemaManager(elasticClient, new FrontendDailyIndexFactory(), new ConsumersDailyIndexFactory());
-    }
-
-    public SchemaManager(Client client, FrontendIndexFactory frontendIndexFactory, ConsumersIndexFactory consumersIndexFactory) {
-        this(client, frontendIndexFactory, consumersIndexFactory, true);
-    }
-
-    public SchemaManager(Client client, FrontendIndexFactory frontendIndexFactory, ConsumersIndexFactory consumersIndexFactory,
-                         boolean dynamicMappingEnabled) {
-        this.client = client;
-        this.frontendIndexFactory = frontendIndexFactory;
-        this.consumersIndexFactory = consumersIndexFactory;
-        this.dynamicMappingEnabled = dynamicMappingEnabled;
-    }
-
-    public void ensureSchema() {
-        createTemplate(PUBLISHED_TEMPLATE_NAME, PUBLISHED_TYPE, PUBLISHED_INDICES_REG_EXP, PUBLISHED_ALIAS_NAME,
-                preparePublishedMapping());
-        createTemplate(SENT_TEMPLATE_NAME, SENT_TYPE, SENT_INDICES_REG_EXP, SENT_ALIAS_NAME, prepareSentMapping());
-
-        createIndexIfNeeded(frontendIndexFactory);
-        createIndexIfNeeded(consumersIndexFactory);
-
-        createAlias(frontendIndexFactory, PUBLISHED_ALIAS_NAME);
-        createAlias(consumersIndexFactory, SENT_ALIAS_NAME);
-    }
-
-    private void createIndexIfNeeded(IndexFactory indexFactory) {
-        IndicesExistsResponse response =
-                client.admin().indices().exists(new IndicesExistsRequest(indexFactory.createIndex())).actionGet();
-
-        if (response.isExists()) {
-            return;
-        }
-
-        client.admin().indices().prepareCreate(indexFactory.createIndex()).execute().actionGet();
-    }
-
-    private void createAlias(IndexFactory indexFactory, String alias) {
-        client.admin().indices().prepareAliases()
-                .addAlias(indexFactory.createIndex(), alias)
-                .execute().actionGet();
-    }
-
-    private void createTemplate(String templateName, String indexType, String indicesRegExp, String aliasName,
-                                XContentBuilder templateMapping) {
-
-        PutIndexTemplateRequest publishedTemplateRequest = new PutIndexTemplateRequest(templateName)
-                .patterns(Arrays.asList(indicesRegExp))
-                .mapping(indexType, templateMapping)
-                .alias(new Alias(aliasName));
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.function.Function;
+import org.elasticsearch.action.admin.indices.alias.Alias;
+import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
+import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import pl.allegro.tech.hermes.tracker.elasticsearch.consumers.ConsumersDailyIndexFactory;
+import pl.allegro.tech.hermes.tracker.elasticsearch.consumers.ConsumersIndexFactory;
+import pl.allegro.tech.hermes.tracker.elasticsearch.frontend.FrontendDailyIndexFactory;
+import pl.allegro.tech.hermes.tracker.elasticsearch.frontend.FrontendIndexFactory;
 
-        client.admin().indices().putTemplate(publishedTemplateRequest).actionGet();
-    }
+public class SchemaManager {
 
-    private XContentBuilder preparePublishedMapping() {
-        return prepareMapping(PUBLISHED_TYPE, Function.identity());
+  public static final String PUBLISHED_INDEX = "published_messages";
+  public static final String PUBLISHED_TYPE = "published_message";
+  public static final String PUBLISHED_ALIAS_NAME = "alias_published_messages";
+  public static final String PUBLISHED_TEMPLATE_NAME = "template_published_messages";
+  public static final String PUBLISHED_INDICES_REG_EXP = "published_messages_*";
+
+  public static final String SENT_INDEX = "sent_messages";
+  public static final String SENT_TYPE = "sent_message";
+  public static final String SENT_ALIAS_NAME = "alias_sent_messages";
+  public static final String SENT_TEMPLATE_NAME = "template_sent_messages";
+  public static final String SENT_INDICES_REG_EXP = "sent_messages_*";
+
+  private final Client client;
+  private final FrontendIndexFactory frontendIndexFactory;
+  private final ConsumersIndexFactory consumersIndexFactory;
+  private final boolean dynamicMappingEnabled;
+
+  public static SchemaManager schemaManagerWithDailyIndexes(Client elasticClient) {
+    return new SchemaManager(
+        elasticClient, new FrontendDailyIndexFactory(), new ConsumersDailyIndexFactory());
+  }
+
+  public SchemaManager(
+      Client client,
+      FrontendIndexFactory frontendIndexFactory,
+      ConsumersIndexFactory consumersIndexFactory) {
+    this(client, frontendIndexFactory, consumersIndexFactory, true);
+  }
+
+  public SchemaManager(
+      Client client,
+      FrontendIndexFactory frontendIndexFactory,
+      ConsumersIndexFactory consumersIndexFactory,
+      boolean dynamicMappingEnabled) {
+    this.client = client;
+    this.frontendIndexFactory = frontendIndexFactory;
+    this.consumersIndexFactory = consumersIndexFactory;
+    this.dynamicMappingEnabled = dynamicMappingEnabled;
+  }
+
+  public void ensureSchema() {
+    createTemplate(
+        PUBLISHED_TEMPLATE_NAME,
+        PUBLISHED_TYPE,
+        PUBLISHED_INDICES_REG_EXP,
+        PUBLISHED_ALIAS_NAME,
+        preparePublishedMapping());
+    createTemplate(
+        SENT_TEMPLATE_NAME, SENT_TYPE, SENT_INDICES_REG_EXP, SENT_ALIAS_NAME, prepareSentMapping());
+
+    createIndexIfNeeded(frontendIndexFactory);
+    createIndexIfNeeded(consumersIndexFactory);
+
+    createAlias(frontendIndexFactory, PUBLISHED_ALIAS_NAME);
+    createAlias(consumersIndexFactory, SENT_ALIAS_NAME);
+  }
+
+  private void createIndexIfNeeded(IndexFactory indexFactory) {
+    IndicesExistsResponse response =
+        client
+            .admin()
+            .indices()
+            .exists(new IndicesExistsRequest(indexFactory.createIndex()))
+            .actionGet();
+
+    if (response.isExists()) {
+      return;
     }
 
-    private XContentBuilder prepareSentMapping() {
-        return prepareMapping(SENT_TYPE, contentBuilder -> {
-            try {
-                return contentBuilder
-                        .startObject(SUBSCRIPTION).field("type", "keyword").field("norms", false).endObject()
-                        .startObject(PUBLISH_TIMESTAMP).field("type", "date").field("index", false).endObject()
-                        .startObject(BATCH_ID).field("type", "keyword").field("norms", false).endObject()
-                        .startObject(OFFSET).field("type", "long").endObject()
-                        .startObject(PARTITION).field("type", "integer").endObject();
-            } catch (IOException e) {
-                throw new ElasticsearchRepositoryException(e);
-            }
+    client.admin().indices().prepareCreate(indexFactory.createIndex()).execute().actionGet();
+  }
+
+  private void createAlias(IndexFactory indexFactory, String alias) {
+    client
+        .admin()
+        .indices()
+        .prepareAliases()
+        .addAlias(indexFactory.createIndex(), alias)
+        .execute()
+        .actionGet();
+  }
+
+  private void createTemplate(
+      String templateName,
+      String indexType,
+      String indicesRegExp,
+      String aliasName,
+      XContentBuilder templateMapping) {
+
+    PutIndexTemplateRequest publishedTemplateRequest =
+        new PutIndexTemplateRequest(templateName)
+            .patterns(Arrays.asList(indicesRegExp))
+            .mapping(indexType, templateMapping)
+            .alias(new Alias(aliasName));
+
+    client.admin().indices().putTemplate(publishedTemplateRequest).actionGet();
+  }
+
+  private XContentBuilder preparePublishedMapping() {
+    return prepareMapping(PUBLISHED_TYPE, Function.identity());
+  }
+
+  private XContentBuilder prepareSentMapping() {
+    return prepareMapping(
+        SENT_TYPE,
+        contentBuilder -> {
+          try {
+            return contentBuilder
+                .startObject(SUBSCRIPTION)
+                .field("type", "keyword")
+                .field("norms", false)
+                .endObject()
+                .startObject(PUBLISH_TIMESTAMP)
+                .field("type", "date")
+                .field("index", false)
+                .endObject()
+                .startObject(BATCH_ID)
+                .field("type", "keyword")
+                .field("norms", false)
+                .endObject()
+                .startObject(OFFSET)
+                .field("type", "long")
+                .endObject()
+                .startObject(PARTITION)
+                .field("type", "integer")
+                .endObject();
+          } catch (IOException e) {
+            throw new ElasticsearchRepositoryException(e);
+          }
         });
+  }
+
+  private XContentBuilder prepareMapping(
+      String indexType, Function<XContentBuilder, XContentBuilder> additionalMapping) {
+    try {
+      XContentBuilder jsonBuilder =
+          jsonBuilder()
+              .startObject()
+              .startObject(indexType)
+              .field("dynamic", dynamicMappingEnabled)
+              .startObject("properties")
+              .startObject(MESSAGE_ID)
+              .field("type", "keyword")
+              .field("norms", false)
+              .endObject()
+              .startObject(TIMESTAMP)
+              .field("type", "date")
+              .field("index", false)
+              .endObject()
+              .startObject(TIMESTAMP_SECONDS)
+              .field("type", "date")
+              .field("format", "epoch_second")
+              .endObject()
+              .startObject(TOPIC_NAME)
+              .field("type", "keyword")
+              .field("norms", false)
+              .endObject()
+              .startObject(STATUS)
+              .field("type", "keyword")
+              .field("norms", false)
+              .endObject()
+              .startObject(CLUSTER)
+              .field("type", "keyword")
+              .field("norms", false)
+              .endObject()
+              .startObject(SOURCE_HOSTNAME)
+              .field("type", "keyword")
+              .field("norms", false)
+              .endObject()
+              .startObject(REMOTE_HOSTNAME)
+              .field("type", "keyword")
+              .field("norms", false)
+              .endObject()
+              .startObject(REASON)
+              .field("type", "text")
+              .field("norms", false)
+              .endObject()
+              .startObject(STORAGE_DATACENTER)
+              .field("type", "text")
+              .field("norms", false)
+              .endObject()
+              .startObject(EXTRA_REQUEST_HEADERS)
+              .field("type", "text")
+              .field("norms", false)
+              .endObject();
+
+      return additionalMapping.apply(jsonBuilder).endObject().endObject().endObject();
+    } catch (IOException ex) {
+      throw new ElasticsearchRepositoryException(ex);
     }
-
-    private XContentBuilder prepareMapping(String indexType, Function<XContentBuilder, XContentBuilder> additionalMapping) {
-        try {
-            XContentBuilder jsonBuilder = jsonBuilder()
-                .startObject()
-                    .startObject(indexType)
-                        .field("dynamic", dynamicMappingEnabled)
-                        .startObject("properties")
-                            .startObject(MESSAGE_ID).field("type", "keyword").field("norms", false).endObject()
-                            .startObject(TIMESTAMP).field("type", "date").field("index", false).endObject()
-                            .startObject(TIMESTAMP_SECONDS).field("type", "date").field("format", "epoch_second").endObject()
-                            .startObject(TOPIC_NAME).field("type", "keyword").field("norms", false).endObject()
-                            .startObject(STATUS).field("type", "keyword").field("norms", false).endObject()
-                            .startObject(CLUSTER).field("type", "keyword").field("norms", false).endObject()
-                            .startObject(SOURCE_HOSTNAME).field("type", "keyword").field("norms", false).endObject()
-                            .startObject(REMOTE_HOSTNAME).field("type", "keyword").field("norms", false).endObject()
-                            .startObject(REASON).field("type", "text").field("norms", false).endObject()
-                            .startObject(EXTRA_REQUEST_HEADERS).field("type", "text").field("norms", false).endObject();
-
-            return additionalMapping.apply(jsonBuilder).endObject().endObject().endObject();
-        } catch (IOException ex) {
-            throw new ElasticsearchRepositoryException(ex);
-        }
-    }
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersDailyIndexFactory.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersDailyIndexFactory.java
index d5d2d1be4a..aaa8a6459e 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersDailyIndexFactory.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersDailyIndexFactory.java
@@ -1,17 +1,16 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.consumers;
 
+import java.time.Clock;
 import pl.allegro.tech.hermes.tracker.elasticsearch.DailyIndexFactory;
 import pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager;
 
-import java.time.Clock;
-
 public class ConsumersDailyIndexFactory extends DailyIndexFactory implements ConsumersIndexFactory {
 
-    public ConsumersDailyIndexFactory(Clock clock) {
-        super(SchemaManager.SENT_INDEX, clock);
-    }
+  public ConsumersDailyIndexFactory(Clock clock) {
+    super(SchemaManager.SENT_INDEX, clock);
+  }
 
-    public ConsumersDailyIndexFactory() {
-        super(SchemaManager.SENT_INDEX);
-    }
+  public ConsumersDailyIndexFactory() {
+    super(SchemaManager.SENT_INDEX);
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersElasticsearchLogRepository.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersElasticsearchLogRepository.java
index 14f3384081..b9b1ed45b6 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersElasticsearchLogRepository.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersElasticsearchLogRepository.java
@@ -1,5 +1,15 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.consumers;
 
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.DISCARDED;
+import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.FAILED;
+import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.FILTERED;
+import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.INFLIGHT;
+import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.SUCCESS;
+import static pl.allegro.tech.hermes.tracker.elasticsearch.ElasticsearchDocument.build;
+
+import java.io.IOException;
+import java.util.concurrent.BlockingQueue;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -15,177 +25,185 @@
 import pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware;
 import pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager;
 
-import java.io.IOException;
-import java.util.concurrent.BlockingQueue;
-
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.DISCARDED;
-import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.FAILED;
-import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.FILTERED;
-import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.INFLIGHT;
-import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.SUCCESS;
-import static pl.allegro.tech.hermes.tracker.elasticsearch.ElasticsearchDocument.build;
-
 public class ConsumersElasticsearchLogRepository
-        extends BatchingLogRepository<ElasticsearchDocument>
-        implements LogRepository, LogSchemaAware {
-
-    private static final int DOCUMENT_EXPECTED_SIZE = 1024;
-
-    private final Client elasticClient;
-
-    private ConsumersElasticsearchLogRepository(Client elasticClient,
-                                                String clusterName,
-                                                String hostname,
-                                                int queueSize,
-                                                int commitInterval,
-                                                IndexFactory indexFactory,
-                                                String typeName,
-                                                MetricsFacade metricsFacade) {
-        super(queueSize, clusterName, hostname);
-        this.elasticClient = elasticClient;
-        registerMetrics(commitInterval, indexFactory, typeName, metricsFacade.trackerElasticSearch());
-    }
-
-    @Override
-    public void logSuccessful(MessageMetadata message, String hostname, long timestamp) {
-        queue.offer(build(() ->
+    extends BatchingLogRepository<ElasticsearchDocument> implements LogRepository, LogSchemaAware {
+
+  private static final int DOCUMENT_EXPECTED_SIZE = 1024;
+
+  private final Client elasticClient;
+
+  private ConsumersElasticsearchLogRepository(
+      Client elasticClient,
+      String clusterName,
+      String hostname,
+      int queueSize,
+      int commitInterval,
+      IndexFactory indexFactory,
+      String typeName,
+      MetricsFacade metricsFacade) {
+    super(queueSize, clusterName, hostname);
+    this.elasticClient = elasticClient;
+    registerMetrics(commitInterval, indexFactory, typeName, metricsFacade.trackerElasticSearch());
+  }
+
+  @Override
+  public void logSuccessful(MessageMetadata message, String hostname, long timestamp) {
+    queue.offer(
+        build(
+            () ->
                 notEndedDocument(message, timestamp, SUCCESS.toString())
-                        .field(REMOTE_HOSTNAME, hostname)
-                        .endObject()));
-    }
-
-    @Override
-    public void logFailed(MessageMetadata message, String hostname, long timestamp, String reason) {
-        queue.offer(build(() ->
+                    .field(REMOTE_HOSTNAME, hostname)
+                    .endObject()));
+  }
+
+  @Override
+  public void logFailed(MessageMetadata message, String hostname, long timestamp, String reason) {
+    queue.offer(
+        build(
+            () ->
                 notEndedDocument(message, timestamp, FAILED.toString())
-                        .field(REASON, reason)
-                        .field(REMOTE_HOSTNAME, hostname)
-                        .endObject()));
-    }
-
-    @Override
-    public void logDiscarded(MessageMetadata message, long timestamp, String reason) {
-        queue.offer(document(message, timestamp, DISCARDED, reason));
+                    .field(REASON, reason)
+                    .field(REMOTE_HOSTNAME, hostname)
+                    .endObject()));
+  }
+
+  @Override
+  public void logDiscarded(MessageMetadata message, long timestamp, String reason) {
+    queue.offer(document(message, timestamp, DISCARDED, reason));
+  }
+
+  @Override
+  public void logInflight(MessageMetadata message, long timestamp) {
+    queue.offer(document(message, timestamp, INFLIGHT));
+  }
+
+  @Override
+  public void logFiltered(MessageMetadata message, long timestamp, String reason) {
+    queue.offer(document(message, timestamp, FILTERED, reason));
+  }
+
+  @Override
+  public void close() {
+    elasticClient.close();
+  }
+
+  private ElasticsearchDocument document(
+      MessageMetadata message, long createdAt, SentMessageTraceStatus status) {
+    return build(() -> notEndedDocument(message, createdAt, status.toString()).endObject());
+  }
+
+  private ElasticsearchDocument document(
+      MessageMetadata message, long timestamp, SentMessageTraceStatus status, String reason) {
+    return build(
+        () ->
+            notEndedDocument(message, timestamp, status.toString())
+                .field(REASON, reason)
+                .endObject());
+  }
+
+  protected XContentBuilder notEndedDocument(MessageMetadata message, long timestamp, String status)
+      throws IOException {
+    return jsonBuilder(new BytesStreamOutput(DOCUMENT_EXPECTED_SIZE))
+        .startObject()
+        .field(MESSAGE_ID, message.getMessageId())
+        .field(BATCH_ID, message.getBatchId())
+        .field(TIMESTAMP, timestamp)
+        .field(TIMESTAMP_SECONDS, toSeconds(timestamp))
+        .field(PUBLISH_TIMESTAMP, message.getPublishingTimestamp())
+        .field(TOPIC_NAME, message.getTopic())
+        .field(SUBSCRIPTION, message.getSubscription())
+        .field(STATUS, status)
+        .field(OFFSET, message.getOffset())
+        .field(PARTITION, message.getPartition())
+        .field(CLUSTER, clusterName)
+        .field(SOURCE_HOSTNAME, hostname);
+  }
+
+  private void registerMetrics(
+      int commitInterval,
+      IndexFactory indexFactory,
+      String typeName,
+      TrackerElasticSearchMetrics trackerMetrics) {
+    trackerMetrics.registerConsumerTrackerElasticSearchQueueSizeGauge(
+        this.queue, BlockingQueue::size);
+    trackerMetrics.registerConsumerTrackerElasticSearchRemainingCapacity(
+        this.queue, BlockingQueue::size);
+
+    ElasticsearchQueueCommitter.scheduleCommitAtFixedRate(
+        this.queue,
+        indexFactory,
+        typeName,
+        elasticClient,
+        trackerMetrics.trackerElasticSearchCommitLatencyTimer(),
+        commitInterval);
+  }
+
+  private long toSeconds(long millis) {
+    return millis / 1000;
+  }
+
+  public static class Builder {
+
+    private Client elasticClient;
+    private String clusterName = "primary";
+    private String hostName = "unknown";
+    private int queueSize = 1000;
+    private int commitInterval = 100;
+    private ConsumersIndexFactory indexFactory = new ConsumersDailyIndexFactory();
+    private String typeName = SchemaManager.SENT_TYPE;
+
+    private final MetricsFacade metricsFacade;
+
+    public Builder(Client elasticClient, MetricsFacade metricsFacade) {
+      this.elasticClient = elasticClient;
+      this.metricsFacade = metricsFacade;
     }
 
-    @Override
-    public void logInflight(MessageMetadata message, long timestamp) {
-        queue.offer(document(message, timestamp, INFLIGHT));
+    public Builder withElasticClient(Client elasticClient) {
+      this.elasticClient = elasticClient;
+      return this;
     }
 
-    @Override
-    public void logFiltered(MessageMetadata message, long timestamp, String reason) {
-        queue.offer(document(message, timestamp, FILTERED, reason));
+    public Builder withClusterName(String clusterName) {
+      this.clusterName = clusterName;
+      return this;
     }
 
-    @Override
-    public void close() {
-        elasticClient.close();
+    public Builder withHostName(String hostName) {
+      this.hostName = hostName;
+      return this;
     }
 
-    private ElasticsearchDocument document(MessageMetadata message, long createdAt, SentMessageTraceStatus status) {
-        return build(() -> notEndedDocument(message, createdAt, status.toString()).endObject());
+    public Builder withQueueSize(int queueSize) {
+      this.queueSize = queueSize;
+      return this;
     }
 
-    private ElasticsearchDocument document(MessageMetadata message, long timestamp, SentMessageTraceStatus status, String reason) {
-        return build(() -> notEndedDocument(message, timestamp, status.toString()).field(REASON, reason).endObject());
+    public Builder withCommitInterval(int commitInterval) {
+      this.commitInterval = commitInterval;
+      return this;
     }
 
-    protected XContentBuilder notEndedDocument(MessageMetadata message, long timestamp, String status)
-            throws IOException {
-        return jsonBuilder(new BytesStreamOutput(DOCUMENT_EXPECTED_SIZE))
-                .startObject()
-                .field(MESSAGE_ID, message.getMessageId())
-                .field(BATCH_ID, message.getBatchId())
-                .field(TIMESTAMP, timestamp)
-                .field(TIMESTAMP_SECONDS, toSeconds(timestamp))
-                .field(PUBLISH_TIMESTAMP, message.getPublishingTimestamp())
-                .field(TOPIC_NAME, message.getTopic())
-                .field(SUBSCRIPTION, message.getSubscription())
-                .field(STATUS, status)
-                .field(OFFSET, message.getOffset())
-                .field(PARTITION, message.getPartition())
-                .field(CLUSTER, clusterName)
-                .field(SOURCE_HOSTNAME, hostname);
-    }
-
-    private void registerMetrics(int commitInterval,
-                                 IndexFactory indexFactory,
-                                 String typeName,
-                                 TrackerElasticSearchMetrics trackerMetrics) {
-        trackerMetrics.registerConsumerTrackerElasticSearchQueueSizeGauge(this.queue, BlockingQueue::size);
-        trackerMetrics.registerConsumerTrackerElasticSearchRemainingCapacity(this.queue, BlockingQueue::size);
-
-        ElasticsearchQueueCommitter.scheduleCommitAtFixedRate(this.queue, indexFactory, typeName, elasticClient,
-                trackerMetrics.trackerElasticSearchCommitLatencyTimer(), commitInterval);
+    public Builder withTypeName(String typeName) {
+      this.typeName = typeName;
+      return this;
     }
 
-    private long toSeconds(long millis) {
-        return millis / 1000;
+    public Builder withIndexFactory(ConsumersIndexFactory indexFactory) {
+      this.indexFactory = indexFactory;
+      return this;
     }
 
-    public static class Builder {
-
-        private Client elasticClient;
-        private String clusterName = "primary";
-        private String hostName = "unknown";
-        private int queueSize = 1000;
-        private int commitInterval = 100;
-        private ConsumersIndexFactory indexFactory = new ConsumersDailyIndexFactory();
-        private String typeName = SchemaManager.SENT_TYPE;
-
-        private final MetricsFacade metricsFacade;
-
-        public Builder(Client elasticClient, MetricsFacade metricsFacade) {
-            this.elasticClient = elasticClient;
-            this.metricsFacade = metricsFacade;
-        }
-
-        public Builder withElasticClient(Client elasticClient) {
-            this.elasticClient = elasticClient;
-            return this;
-        }
-
-        public Builder withClusterName(String clusterName) {
-            this.clusterName = clusterName;
-            return this;
-        }
-
-        public Builder withHostName(String hostName) {
-            this.hostName = hostName;
-            return this;
-        }
-
-        public Builder withQueueSize(int queueSize) {
-            this.queueSize = queueSize;
-            return this;
-        }
-
-        public Builder withCommitInterval(int commitInterval) {
-            this.commitInterval = commitInterval;
-            return this;
-        }
-
-        public Builder withTypeName(String typeName) {
-            this.typeName = typeName;
-            return this;
-        }
-
-        public Builder withIndexFactory(ConsumersIndexFactory indexFactory) {
-            this.indexFactory = indexFactory;
-            return this;
-        }
-
-        public ConsumersElasticsearchLogRepository build() {
-            return new ConsumersElasticsearchLogRepository(elasticClient,
-                    clusterName,
-                    hostName,
-                    queueSize,
-                    commitInterval,
-                    indexFactory,
-                    typeName,
-                    metricsFacade);
-        }
+    public ConsumersElasticsearchLogRepository build() {
+      return new ConsumersElasticsearchLogRepository(
+          elasticClient,
+          clusterName,
+          hostName,
+          queueSize,
+          commitInterval,
+          indexFactory,
+          typeName,
+          metricsFacade);
     }
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersIndexFactory.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersIndexFactory.java
index e00f5e5ac6..1d3b4921f5 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersIndexFactory.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersIndexFactory.java
@@ -2,5 +2,4 @@
 
 import pl.allegro.tech.hermes.tracker.elasticsearch.IndexFactory;
 
-public interface ConsumersIndexFactory extends IndexFactory {
-}
+public interface ConsumersIndexFactory extends IndexFactory {}
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendDailyIndexFactory.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendDailyIndexFactory.java
index 74ad4c91ce..63466e3958 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendDailyIndexFactory.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendDailyIndexFactory.java
@@ -1,17 +1,16 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.frontend;
 
+import java.time.Clock;
 import pl.allegro.tech.hermes.tracker.elasticsearch.DailyIndexFactory;
 import pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager;
 
-import java.time.Clock;
-
 public class FrontendDailyIndexFactory extends DailyIndexFactory implements FrontendIndexFactory {
 
-    public FrontendDailyIndexFactory(Clock clock) {
-        super(SchemaManager.PUBLISHED_INDEX, clock);
-    }
+  public FrontendDailyIndexFactory(Clock clock) {
+    super(SchemaManager.PUBLISHED_INDEX, clock);
+  }
 
-    public FrontendDailyIndexFactory() {
-        super(SchemaManager.PUBLISHED_INDEX);
-    }
+  public FrontendDailyIndexFactory() {
+    super(SchemaManager.PUBLISHED_INDEX);
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendElasticsearchLogRepository.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendElasticsearchLogRepository.java
index 9fcc5339dc..6fbcf311e3 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendElasticsearchLogRepository.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendElasticsearchLogRepository.java
@@ -1,9 +1,18 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.frontend;
 
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.ERROR;
+import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.INFLIGHT;
+import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.SUCCESS;
+import static pl.allegro.tech.hermes.common.http.ExtraRequestHeadersCollector.extraRequestHeadersCollector;
+import static pl.allegro.tech.hermes.tracker.elasticsearch.ElasticsearchDocument.build;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import pl.allegro.tech.hermes.api.PublishedMessageTraceStatus;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
 import pl.allegro.tech.hermes.common.metric.TrackerElasticSearchMetrics;
 import pl.allegro.tech.hermes.tracker.BatchingLogRepository;
@@ -14,191 +23,223 @@
 import pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager;
 import pl.allegro.tech.hermes.tracker.frontend.LogRepository;
 
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.ERROR;
-import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.INFLIGHT;
-import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.SUCCESS;
-import static pl.allegro.tech.hermes.common.http.ExtraRequestHeadersCollector.extraRequestHeadersCollector;
-import static pl.allegro.tech.hermes.tracker.elasticsearch.ElasticsearchDocument.build;
-
-public class FrontendElasticsearchLogRepository
-        extends BatchingLogRepository<ElasticsearchDocument>
-        implements LogRepository, LogSchemaAware {
-
-    private static final int DOCUMENT_EXPECTED_SIZE = 1024;
-
-    private final Client elasticClient;
-
-    private FrontendElasticsearchLogRepository(Client elasticClient,
-                                               String clusterName,
-                                               String hostname,
-                                               int queueSize,
-                                               int commitInterval,
-                                               IndexFactory indexFactory,
-                                               String typeName,
-                                               MetricsFacade metricsFacade) {
-        super(queueSize, clusterName, hostname);
-        this.elasticClient = elasticClient;
-        registerMetrics(commitInterval, indexFactory, typeName, metricsFacade.trackerElasticSearch());
-    }
-
-    @Override
-    public void logPublished(String messageId,
-                             long timestamp,
-                             String topicName,
-                             String hostname,
-                             Map<String, String> extraRequestHeaders) {
-        queue.offer(build(() -> document(messageId, timestamp, topicName, SUCCESS, hostname, extraRequestHeaders)));
+public class FrontendElasticsearchLogRepository extends BatchingLogRepository<ElasticsearchDocument>
+    implements LogRepository, LogSchemaAware {
+
+  private static final int DOCUMENT_EXPECTED_SIZE = 1024;
+
+  private final Client elasticClient;
+
+  private FrontendElasticsearchLogRepository(
+      Client elasticClient,
+      String clusterName,
+      String hostname,
+      int queueSize,
+      int commitInterval,
+      IndexFactory indexFactory,
+      String typeName,
+      MetricsFacade metricsFacade) {
+    super(queueSize, clusterName, hostname);
+    this.elasticClient = elasticClient;
+    registerMetrics(commitInterval, indexFactory, typeName, metricsFacade.trackerElasticSearch());
+  }
+
+  @Override
+  public void logPublished(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String hostname,
+      String storageDatacenter,
+      Map<String, String> extraRequestHeaders) {
+    queue.offer(
+        build(
+            () ->
+                success(
+                    messageId,
+                    timestamp,
+                    topicName,
+                    hostname,
+                    storageDatacenter,
+                    extraRequestHeaders)));
+  }
+
+  @Override
+  public void logError(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String reason,
+      String hostname,
+      Map<String, String> extraRequestHeaders) {
+    queue.offer(
+        build(() -> error(messageId, timestamp, topicName, reason, hostname, extraRequestHeaders)));
+  }
+
+  @Override
+  public void logInflight(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String hostname,
+      Map<String, String> extraRequestHeaders) {
+    queue.offer(
+        build(() -> inflight(messageId, timestamp, topicName, hostname, extraRequestHeaders)));
+  }
+
+  @Override
+  public void close() {
+    this.elasticClient.close();
+  }
+
+  private XContentBuilder success(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String hostname,
+      String storageDatacenter,
+      Map<String, String> extraRequestHeaders)
+      throws IOException {
+    return notEndedDocument(
+            messageId, timestamp, topicName, SUCCESS.toString(), hostname, extraRequestHeaders)
+        .field(STORAGE_DATACENTER, storageDatacenter)
+        .endObject();
+  }
+
+  private XContentBuilder inflight(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String hostname,
+      Map<String, String> extraRequestHeaders)
+      throws IOException {
+    return notEndedDocument(
+            messageId, timestamp, topicName, INFLIGHT.name(), hostname, extraRequestHeaders)
+        .endObject();
+  }
+
+  private XContentBuilder error(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String reason,
+      String hostname,
+      Map<String, String> extraRequestHeaders)
+      throws IOException {
+    return notEndedDocument(
+            messageId, timestamp, topicName, ERROR.toString(), hostname, extraRequestHeaders)
+        .field(REASON, reason)
+        .endObject();
+  }
+
+  protected XContentBuilder notEndedDocument(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String status,
+      String hostname,
+      Map<String, String> extraRequestHeaders)
+      throws IOException {
+    return jsonBuilder(new BytesStreamOutput(DOCUMENT_EXPECTED_SIZE))
+        .startObject()
+        .field(MESSAGE_ID, messageId)
+        .field(TIMESTAMP, timestamp)
+        .field(TIMESTAMP_SECONDS, toSeconds(timestamp))
+        .field(TOPIC_NAME, topicName)
+        .field(STATUS, status)
+        .field(CLUSTER, clusterName)
+        .field(SOURCE_HOSTNAME, this.hostname)
+        .field(REMOTE_HOSTNAME, hostname)
+        .field(
+            EXTRA_REQUEST_HEADERS,
+            extraRequestHeaders.entrySet().stream().collect(extraRequestHeadersCollector()));
+  }
+
+  private void registerMetrics(
+      int commitInterval,
+      IndexFactory indexFactory,
+      String typeName,
+      TrackerElasticSearchMetrics trackerMetrics) {
+    trackerMetrics.registerProducerTrackerElasticSearchQueueSizeGauge(
+        this.queue, BlockingQueue::size);
+    trackerMetrics.registerProducerTrackerElasticSearchRemainingCapacity(
+        this.queue, BlockingQueue::size);
+
+    ElasticsearchQueueCommitter.scheduleCommitAtFixedRate(
+        this.queue,
+        indexFactory,
+        typeName,
+        elasticClient,
+        trackerMetrics.trackerElasticSearchCommitLatencyTimer(),
+        commitInterval);
+  }
+
+  private long toSeconds(long millis) {
+    return millis / 1000;
+  }
+
+  public static class Builder {
+
+    private Client elasticClient;
+    private String clusterName = "primary";
+    private String hostName = "unknown";
+    private int queueSize = 1000;
+    private int commitInterval = 100;
+    private FrontendIndexFactory indexFactory = new FrontendDailyIndexFactory();
+    private String typeName = SchemaManager.PUBLISHED_TYPE;
+
+    private final MetricsFacade metricsFacade;
+
+    public Builder(Client elasticClient, MetricsFacade metricsFacade) {
+      this.elasticClient = elasticClient;
+      this.metricsFacade = metricsFacade;
     }
 
-    @Override
-    public void logError(String messageId,
-                         long timestamp,
-                         String topicName,
-                         String reason,
-                         String hostname,
-                         Map<String, String> extraRequestHeaders) {
-        queue.offer(build(() -> document(messageId, timestamp, topicName, ERROR, reason, hostname, extraRequestHeaders)));
+    public Builder withElasticClient(Client elasticClient) {
+      this.elasticClient = elasticClient;
+      return this;
     }
 
-    @Override
-    public void logInflight(String messageId,
-                            long timestamp,
-                            String topicName,
-                            String hostname,
-                            Map<String, String> extraRequestHeaders) {
-        queue.offer(build(() -> document(messageId, timestamp, topicName, INFLIGHT, hostname, extraRequestHeaders)));
+    public Builder withClusterName(String clusterName) {
+      this.clusterName = clusterName;
+      return this;
     }
 
-    @Override
-    public void close() {
-        this.elasticClient.close();
+    public Builder withHostName(String hostName) {
+      this.hostName = hostName;
+      return this;
     }
 
-    private XContentBuilder document(String messageId,
-                                     long timestamp,
-                                     String topicName,
-                                     PublishedMessageTraceStatus status,
-                                     String hostname,
-                                     Map<String, String> extraRequestHeaders)
-            throws IOException {
-        return notEndedDocument(messageId, timestamp, topicName, status.toString(), hostname, extraRequestHeaders).endObject();
+    public Builder withQueueSize(int queueSize) {
+      this.queueSize = queueSize;
+      return this;
     }
 
-    private XContentBuilder document(String messageId,
-                                     long timestamp,
-                                     String topicName,
-                                     PublishedMessageTraceStatus status,
-                                     String reason,
-                                     String hostname,
-                                     Map<String, String> extraRequestHeaders)
-            throws IOException {
-        return notEndedDocument(messageId, timestamp, topicName, status.toString(), hostname, extraRequestHeaders)
-                .field(REASON, reason)
-                .endObject();
+    public Builder withCommitInterval(int commitInterval) {
+      this.commitInterval = commitInterval;
+      return this;
     }
 
-    protected XContentBuilder notEndedDocument(String messageId,
-                                               long timestamp,
-                                               String topicName,
-                                               String status,
-                                               String hostname,
-                                               Map<String, String> extraRequestHeaders)
-            throws IOException {
-        return jsonBuilder(new BytesStreamOutput(DOCUMENT_EXPECTED_SIZE))
-                .startObject()
-                .field(MESSAGE_ID, messageId)
-                .field(TIMESTAMP, timestamp)
-                .field(TIMESTAMP_SECONDS, toSeconds(timestamp))
-                .field(TOPIC_NAME, topicName)
-                .field(STATUS, status)
-                .field(CLUSTER, clusterName)
-                .field(SOURCE_HOSTNAME, this.hostname)
-                .field(REMOTE_HOSTNAME, hostname)
-                .field(EXTRA_REQUEST_HEADERS, extraRequestHeaders.entrySet().stream()
-                    .collect(extraRequestHeadersCollector()));
-    }
-
-    private void registerMetrics(int commitInterval,
-                                 IndexFactory indexFactory,
-                                 String typeName,
-                                 TrackerElasticSearchMetrics trackerMetrics) {
-        trackerMetrics.registerProducerTrackerElasticSearchQueueSizeGauge(this.queue, BlockingQueue::size);
-        trackerMetrics.registerProducerTrackerElasticSearchRemainingCapacity(this.queue, BlockingQueue::size);
-
-        ElasticsearchQueueCommitter.scheduleCommitAtFixedRate(this.queue, indexFactory, typeName, elasticClient,
-                trackerMetrics.trackerElasticSearchCommitLatencyTimer(), commitInterval);
+    public Builder withTypeName(String typeName) {
+      this.typeName = typeName;
+      return this;
     }
 
-    private long toSeconds(long millis) {
-        return millis / 1000;
+    public Builder withIndexFactory(FrontendIndexFactory indexFactory) {
+      this.indexFactory = indexFactory;
+      return this;
     }
 
-    public static class Builder {
-
-        private Client elasticClient;
-        private String clusterName = "primary";
-        private String hostName = "unknown";
-        private int queueSize = 1000;
-        private int commitInterval = 100;
-        private FrontendIndexFactory indexFactory = new FrontendDailyIndexFactory();
-        private String typeName = SchemaManager.PUBLISHED_TYPE;
-
-        private final MetricsFacade metricsFacade;
-
-        public Builder(Client elasticClient, MetricsFacade metricsFacade) {
-            this.elasticClient = elasticClient;
-            this.metricsFacade = metricsFacade;
-        }
-
-        public Builder withElasticClient(Client elasticClient) {
-            this.elasticClient = elasticClient;
-            return this;
-        }
-
-        public Builder withClusterName(String clusterName) {
-            this.clusterName = clusterName;
-            return this;
-        }
-
-        public Builder withHostName(String hostName) {
-            this.hostName = hostName;
-            return this;
-        }
-
-        public Builder withQueueSize(int queueSize) {
-            this.queueSize = queueSize;
-            return this;
-        }
-
-        public Builder withCommitInterval(int commitInterval) {
-            this.commitInterval = commitInterval;
-            return this;
-        }
-
-        public Builder withTypeName(String typeName) {
-            this.typeName = typeName;
-            return this;
-        }
-
-        public Builder withIndexFactory(FrontendIndexFactory indexFactory) {
-            this.indexFactory = indexFactory;
-            return this;
-        }
-
-        public FrontendElasticsearchLogRepository build() {
-            return new FrontendElasticsearchLogRepository(elasticClient,
-                    clusterName,
-                    hostName,
-                    queueSize,
-                    commitInterval,
-                    indexFactory,
-                    typeName,
-                    metricsFacade);
-        }
+    public FrontendElasticsearchLogRepository build() {
+      return new FrontendElasticsearchLogRepository(
+          elasticClient,
+          clusterName,
+          hostName,
+          queueSize,
+          commitInterval,
+          indexFactory,
+          typeName,
+          metricsFacade);
     }
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendIndexFactory.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendIndexFactory.java
index a555716fc5..ed94098c3d 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendIndexFactory.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendIndexFactory.java
@@ -2,5 +2,4 @@
 
 import pl.allegro.tech.hermes.tracker.elasticsearch.IndexFactory;
 
-public interface FrontendIndexFactory extends IndexFactory {
-}
+public interface FrontendIndexFactory extends IndexFactory {}
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/ElasticsearchLogRepository.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/ElasticsearchLogRepository.java
index ff514c7c13..4b1fef83fc 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/ElasticsearchLogRepository.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/ElasticsearchLogRepository.java
@@ -1,6 +1,16 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.management;
 
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.toList;
+import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager.schemaManagerWithDailyIndexes;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Stream;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -15,99 +25,105 @@
 import pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager;
 import pl.allegro.tech.hermes.tracker.management.LogRepository;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Stream;
-
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toList;
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager.schemaManagerWithDailyIndexes;
-
 public class ElasticsearchLogRepository implements LogRepository, LogSchemaAware {
 
-    private static final int LIMIT = 1000;
-
-    private final Client elasticClient;
-
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    public ElasticsearchLogRepository(Client elasticClient) {
-        this(elasticClient, schemaManagerWithDailyIndexes(elasticClient));
-    }
-
-    public ElasticsearchLogRepository(Client elasticClient, SchemaManager schemaManager) {
-        this.elasticClient = elasticClient;
-        schemaManager.ensureSchema();
+  private static final int LIMIT = 1000;
+
+  private final Client elasticClient;
+
+  private final ObjectMapper objectMapper = new ObjectMapper();
+
+  public ElasticsearchLogRepository(Client elasticClient) {
+    this(elasticClient, schemaManagerWithDailyIndexes(elasticClient));
+  }
+
+  public ElasticsearchLogRepository(Client elasticClient, SchemaManager schemaManager) {
+    this.elasticClient = elasticClient;
+    schemaManager.ensureSchema();
+  }
+
+  @Override
+  public List<SentMessageTrace> getLastUndeliveredMessages(
+      String topicName, String subscriptionName, int limit) {
+    SearchResponse response =
+        searchSentMessages(
+            limit,
+            SortOrder.DESC,
+            boolQuery()
+                .must(termQuery(TOPIC_NAME, topicName))
+                .must(termQuery(SUBSCRIPTION, subscriptionName))
+                .must(termQuery(STATUS, SentMessageTraceStatus.DISCARDED.name())));
+
+    return stream(response.getHits().getHits())
+        .map(hit -> toMessageTrace(hit, SentMessageTrace.class))
+        .collect(toList());
+  }
+
+  @Override
+  public List<MessageTrace> getMessageStatus(
+      String topicName, String subscriptionName, String messageId) {
+
+    try {
+      SearchResponse publishedResponse =
+          searchPublishedMessages(
+              LIMIT,
+              boolQuery()
+                  .must(termQuery(TOPIC_NAME, topicName))
+                  .must(termQuery(MESSAGE_ID, messageId)));
+
+      SearchResponse sentResponse =
+          searchSentMessages(
+              LIMIT,
+              SortOrder.ASC,
+              boolQuery()
+                  .must(termQuery(TOPIC_NAME, topicName))
+                  .must(termQuery(SUBSCRIPTION, subscriptionName))
+                  .must(termQuery(MESSAGE_ID, messageId)));
+
+      return Stream.concat(
+              stream(publishedResponse.getHits().getHits())
+                  .map(hit -> toMessageTrace(hit, PublishedMessageTrace.class)),
+              stream(sentResponse.getHits().getHits())
+                  .map(hit -> toMessageTrace(hit, SentMessageTrace.class)))
+          .collect(toList());
+    } catch (InterruptedException | ExecutionException ex) {
+      throw new ElasticsearchRepositoryException(ex);
     }
-
-    @Override
-    public List<SentMessageTrace> getLastUndeliveredMessages(String topicName, String subscriptionName, int limit) {
-        SearchResponse response = searchSentMessages(limit, SortOrder.DESC,
-                boolQuery()
-                        .must(termQuery(TOPIC_NAME, topicName))
-                        .must(termQuery(SUBSCRIPTION, subscriptionName))
-                        .must(termQuery(STATUS, SentMessageTraceStatus.DISCARDED.name())));
-
-        return stream(response.getHits().getHits())
-                .map(hit -> toMessageTrace(hit, SentMessageTrace.class))
-                .collect(toList());
-    }
-
-    @Override
-    public List<MessageTrace> getMessageStatus(String topicName, String subscriptionName, String messageId) {
-
-        try {
-            SearchResponse publishedResponse = searchPublishedMessages(LIMIT,
-                    boolQuery()
-                            .must(termQuery(TOPIC_NAME, topicName))
-                            .must(termQuery(MESSAGE_ID, messageId)));
-
-            SearchResponse sentResponse = searchSentMessages(LIMIT, SortOrder.ASC,
-                    boolQuery()
-                            .must(termQuery(TOPIC_NAME, topicName))
-                            .must(termQuery(SUBSCRIPTION, subscriptionName))
-                            .must(termQuery(MESSAGE_ID, messageId)));
-
-            return Stream.concat(
-                    stream(publishedResponse.getHits().getHits()).map(hit -> toMessageTrace(hit, PublishedMessageTrace.class)),
-                    stream(sentResponse.getHits().getHits()).map(hit -> toMessageTrace(hit, SentMessageTrace.class)))
-                    .collect(toList());
-        } catch (InterruptedException | ExecutionException ex) {
-            throw new ElasticsearchRepositoryException(ex);
-        }
-    }
-
-    private SearchResponse searchSentMessages(int limit, SortOrder sort, QueryBuilder query) {
-        return elasticClient.prepareSearch(SchemaManager.SENT_ALIAS_NAME)
-                .setTypes(SchemaManager.SENT_TYPE)
-                .setTrackScores(true)
-                .setQuery(query)
-                .addSort(TIMESTAMP_SECONDS, sort)
-                .setSize(limit)
-                .execute()
-                .actionGet();
-    }
-
-    private SearchResponse searchPublishedMessages(int limit, QueryBuilder query) throws InterruptedException, ExecutionException {
-        return elasticClient.prepareSearch(SchemaManager.PUBLISHED_ALIAS_NAME)
-                .setTypes(SchemaManager.PUBLISHED_TYPE)
-                .setTrackScores(true)
-                .setQuery(query)
-                .addSort(TIMESTAMP_SECONDS, SortOrder.ASC)
-                .setSize(limit)
-                .execute()
-                .get();
-    }
-
-    private <T> T toMessageTrace(SearchHit h, Class<T> messageTraceType) {
-        try {
-            return objectMapper.readValue(h.getSourceRef().streamInput(), messageTraceType);
-        } catch (IOException e) {
-            throw new RuntimeException(
-                    "Exception during deserialization of message trace class named " + messageTraceType.getCanonicalName(), e);
-        }
+  }
+
+  private SearchResponse searchSentMessages(int limit, SortOrder sort, QueryBuilder query) {
+    return elasticClient
+        .prepareSearch(SchemaManager.SENT_ALIAS_NAME)
+        .setTypes(SchemaManager.SENT_TYPE)
+        .setTrackScores(true)
+        .setQuery(query)
+        .addSort(TIMESTAMP_SECONDS, sort)
+        .setSize(limit)
+        .execute()
+        .actionGet();
+  }
+
+  private SearchResponse searchPublishedMessages(int limit, QueryBuilder query)
+      throws InterruptedException, ExecutionException {
+    return elasticClient
+        .prepareSearch(SchemaManager.PUBLISHED_ALIAS_NAME)
+        .setTypes(SchemaManager.PUBLISHED_TYPE)
+        .setTrackScores(true)
+        .setQuery(query)
+        .addSort(TIMESTAMP_SECONDS, SortOrder.ASC)
+        .setSize(limit)
+        .execute()
+        .get();
+  }
+
+  private <T> T toMessageTrace(SearchHit h, Class<T> messageTraceType) {
+    try {
+      return objectMapper.readValue(h.getSourceRef().streamInput(), messageTraceType);
+    } catch (IOException e) {
+      throw new RuntimeException(
+          "Exception during deserialization of message trace class named "
+              + messageTraceType.getCanonicalName(),
+          e);
     }
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/MultiElasticsearchLogRepository.java b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/MultiElasticsearchLogRepository.java
index b49e5d0afc..54cfc1d472 100644
--- a/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/MultiElasticsearchLogRepository.java
+++ b/hermes-tracker-elasticsearch/src/main/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/MultiElasticsearchLogRepository.java
@@ -1,38 +1,38 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.management;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.elasticsearch.client.Client;
 import pl.allegro.tech.hermes.api.MessageTrace;
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 import pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware;
 import pl.allegro.tech.hermes.tracker.management.LogRepository;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class MultiElasticsearchLogRepository implements LogRepository, LogSchemaAware {
 
-    private List<ElasticsearchLogRepository> elasticsearchLogRepositories;
+  private final List<ElasticsearchLogRepository> elasticsearchLogRepositories;
 
-    public MultiElasticsearchLogRepository(List<Client> elasticClients) {
-        elasticsearchLogRepositories = elasticClients.stream()
-                .map(ElasticsearchLogRepository::new)
-                .collect(Collectors.toList());
-    }
+  public MultiElasticsearchLogRepository(List<Client> elasticClients) {
+    elasticsearchLogRepositories =
+        elasticClients.stream().map(ElasticsearchLogRepository::new).collect(Collectors.toList());
+  }
 
-    @Override
-    public List<SentMessageTrace> getLastUndeliveredMessages(String topicName, String subscriptionName, int limit) {
-        return elasticsearchLogRepositories.stream()
-                .map(repo -> repo.getLastUndeliveredMessages(topicName, subscriptionName, limit))
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-    }
+  @Override
+  public List<SentMessageTrace> getLastUndeliveredMessages(
+      String topicName, String subscriptionName, int limit) {
+    return elasticsearchLogRepositories.stream()
+        .map(repo -> repo.getLastUndeliveredMessages(topicName, subscriptionName, limit))
+        .flatMap(Collection::stream)
+        .collect(Collectors.toList());
+  }
 
-    @Override
-    public List<MessageTrace> getMessageStatus(String qualifiedTopicName, String subscriptionName, String messageId) {
-        return elasticsearchLogRepositories.stream()
-                .map(repo -> repo.getMessageStatus(qualifiedTopicName, subscriptionName, messageId))
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-    }
+  @Override
+  public List<MessageTrace> getMessageStatus(
+      String qualifiedTopicName, String subscriptionName, String messageId) {
+    return elasticsearchLogRepositories.stream()
+        .map(repo -> repo.getMessageStatus(qualifiedTopicName, subscriptionName, messageId))
+        .flatMap(Collection::stream)
+        .collect(Collectors.toList());
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/test/groovy/pl/allegro/tech/hermes/tracker/elasticsearch/DailyIndexFactoryTest.groovy b/hermes-tracker-elasticsearch/src/test/groovy/pl/allegro/tech/hermes/tracker/elasticsearch/DailyIndexFactoryTest.groovy
index bd4d0adcd1..c76f236fbe 100644
--- a/hermes-tracker-elasticsearch/src/test/groovy/pl/allegro/tech/hermes/tracker/elasticsearch/DailyIndexFactoryTest.groovy
+++ b/hermes-tracker-elasticsearch/src/test/groovy/pl/allegro/tech/hermes/tracker/elasticsearch/DailyIndexFactoryTest.groovy
@@ -9,7 +9,6 @@ import java.time.Clock
 import static java.time.LocalDate.of
 import static java.time.ZoneId.systemDefault
 import static java.time.ZoneOffset.UTC
-import static org.assertj.core.api.Assertions.assertThat
 
 class DailyIndexFactoryTest extends Specification {
 
@@ -18,7 +17,7 @@ class DailyIndexFactoryTest extends Specification {
 
     def "should create daily index"() {
         expect:
-        assertThat(indexFactory.createIndex()).endsWith("_2000_01_01")
+        indexFactory.createIndex().endsWith("_2000_01_01")
 
         where:
         indexFactory << [new FrontendDailyIndexFactory(clock), new ConsumersDailyIndexFactory(clock)]
diff --git a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchResource.java b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchResource.java
index 82292ace2b..efc54f195a 100644
--- a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchResource.java
+++ b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/ElasticsearchResource.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch;
 
+import static pl.allegro.tech.embeddedelasticsearch.PopularProperties.CLUSTER_NAME;
+import static pl.allegro.tech.embeddedelasticsearch.PopularProperties.HTTP_PORT;
+import static pl.allegro.tech.embeddedelasticsearch.PopularProperties.TRANSPORT_TCP_PORT;
+
+import java.net.InetAddress;
+import java.nio.file.Files;
+import java.util.concurrent.TimeUnit;
 import org.elasticsearch.client.AdminClient;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
@@ -11,74 +18,78 @@
 import pl.allegro.tech.embeddedelasticsearch.EmbeddedElastic;
 import pl.allegro.tech.hermes.test.helper.util.Ports;
 
-import java.net.InetAddress;
-import java.nio.file.Files;
-import java.util.concurrent.TimeUnit;
-
-import static pl.allegro.tech.embeddedelasticsearch.PopularProperties.CLUSTER_NAME;
-import static pl.allegro.tech.embeddedelasticsearch.PopularProperties.HTTP_PORT;
-import static pl.allegro.tech.embeddedelasticsearch.PopularProperties.TRANSPORT_TCP_PORT;
-
 public class ElasticsearchResource extends ExternalResource implements LogSchemaAware {
 
-    private static final String ELASTIC_VERSION = "6.1.4";
-    private static final String CLUSTER_NAME_VALUE = "myTestCluster";
-
-    private final EmbeddedElastic embeddedElastic;
-    private Client client;
-
-    public ElasticsearchResource() {
-        int port = Ports.nextAvailable();
-        int httpPort = Ports.nextAvailable();
-
-        try {
-            embeddedElastic = EmbeddedElastic.builder()
-                    .withElasticVersion(ELASTIC_VERSION)
-                    .withSetting(TRANSPORT_TCP_PORT, port)
-                    .withSetting(HTTP_PORT, httpPort)
-                    .withSetting(CLUSTER_NAME, CLUSTER_NAME_VALUE)
-                    // embedded elastic search runs with "UseConcMarkSweepGC" which is invalid in Java 17
-                    .withEsJavaOpts("-Xms128m -Xmx512m -XX:+IgnoreUnrecognizedVMOptions")
-                    .withStartTimeout(1, TimeUnit.MINUTES)
-                    .withCleanInstallationDirectoryOnStop(true)
-                    .withInstallationDirectory(Files.createTempDirectory("elasticsearch-installation-" + port).toFile())
-                    .build();
-
-        } catch (Exception e) {
-            throw new RuntimeException("Unchecked exception", e);
-        }
-    }
-
-    @Override
-    public void before() throws Throwable {
-        embeddedElastic.start();
-
-        client = new PreBuiltTransportClient(Settings.builder().put(CLUSTER_NAME, CLUSTER_NAME_VALUE).build())
-                .addTransportAddress(
-                        new TransportAddress(InetAddress.getByName("localhost"), embeddedElastic.getTransportTcpPort()));
-    }
-
-    @Override
-    public void after() {
-        embeddedElastic.stop();
-        client.close();
-    }
-
-    public Client client() {
-        return client;
-    }
-
-    public AdminClient adminClient() {
-        return client.admin();
-    }
-
-    public ImmutableOpenMap<String, IndexMetaData> getIndices() {
-        return client.admin().cluster().prepareState().execute().actionGet().getState().getMetaData().getIndices();
-    }
-
-    public void cleanStructures() {
-        embeddedElastic.deleteIndices();
-        embeddedElastic.deleteTemplates();
+  private static final String ELASTIC_VERSION = "6.1.4";
+  private static final String CLUSTER_NAME_VALUE = "myTestCluster";
+
+  private final EmbeddedElastic embeddedElastic;
+  private Client client;
+
+  public ElasticsearchResource() {
+    int port = Ports.nextAvailable();
+    int httpPort = Ports.nextAvailable();
+
+    try {
+      embeddedElastic =
+          EmbeddedElastic.builder()
+              .withElasticVersion(ELASTIC_VERSION)
+              .withSetting(TRANSPORT_TCP_PORT, port)
+              .withSetting(HTTP_PORT, httpPort)
+              .withSetting(CLUSTER_NAME, CLUSTER_NAME_VALUE)
+              // embedded elastic search runs with "UseConcMarkSweepGC" which is invalid in Java 17
+              .withEsJavaOpts("-Xms128m -Xmx512m -XX:+IgnoreUnrecognizedVMOptions")
+              .withStartTimeout(1, TimeUnit.MINUTES)
+              .withCleanInstallationDirectoryOnStop(true)
+              .withInstallationDirectory(
+                  Files.createTempDirectory("elasticsearch-installation-" + port).toFile())
+              .build();
+
+    } catch (Exception e) {
+      throw new RuntimeException("Unchecked exception", e);
     }
-
+  }
+
+  @Override
+  public void before() throws Throwable {
+    embeddedElastic.start();
+
+    client =
+        new PreBuiltTransportClient(
+                Settings.builder().put(CLUSTER_NAME, CLUSTER_NAME_VALUE).build())
+            .addTransportAddress(
+                new TransportAddress(
+                    InetAddress.getByName("localhost"), embeddedElastic.getTransportTcpPort()));
+  }
+
+  @Override
+  public void after() {
+    embeddedElastic.stop();
+    client.close();
+  }
+
+  public Client client() {
+    return client;
+  }
+
+  public AdminClient adminClient() {
+    return client.admin();
+  }
+
+  public ImmutableOpenMap<String, IndexMetaData> getIndices() {
+    return client
+        .admin()
+        .cluster()
+        .prepareState()
+        .execute()
+        .actionGet()
+        .getState()
+        .getMetaData()
+        .getIndices();
+  }
+
+  public void cleanStructures() {
+    embeddedElastic.deleteIndices();
+    embeddedElastic.deleteTemplates();
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersElasticsearchLogRepositoryTest.java b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersElasticsearchLogRepositoryTest.java
index 3f4d5de1c0..4bad544276 100644
--- a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersElasticsearchLogRepositoryTest.java
+++ b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/consumers/ConsumersElasticsearchLogRepositoryTest.java
@@ -1,16 +1,22 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.consumers;
 
-import com.codahale.metrics.MetricRegistry;
+import static org.awaitility.Awaitility.await;
+import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import pl.allegro.tech.hermes.api.SentMessageTraceStatus;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.tracker.consumers.AbstractLogRepositoryTest;
 import pl.allegro.tech.hermes.tracker.consumers.LogRepository;
 import pl.allegro.tech.hermes.tracker.elasticsearch.ElasticsearchResource;
@@ -19,87 +25,93 @@
 import pl.allegro.tech.hermes.tracker.elasticsearch.frontend.FrontendDailyIndexFactory;
 import pl.allegro.tech.hermes.tracker.elasticsearch.frontend.FrontendIndexFactory;
 
-import java.time.Clock;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-
-public class ConsumersElasticsearchLogRepositoryTest extends AbstractLogRepositoryTest implements LogSchemaAware {
-
-    private static final String CLUSTER_NAME = "primary";
-
-    private static final Clock clock = Clock.fixed(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
-    private static final ConsumersIndexFactory indexFactory = new ConsumersDailyIndexFactory(clock);
-    private static final FrontendIndexFactory frontendIndexFactory = new FrontendDailyIndexFactory(clock);
-    private static final MetricsFacade metricsFacade = new MetricsFacade(
-            new SimpleMeterRegistry(),
-            new HermesMetrics(new MetricRegistry(), new PathsCompiler(""))
-    );
-
-
-    private static ElasticsearchResource elasticsearch = new ElasticsearchResource();
-    private SchemaManager schemaManager;
-
-    @BeforeSuite
-    public void before() throws Throwable {
-        elasticsearch.before();
-        schemaManager = new SchemaManager(elasticsearch.client(), frontendIndexFactory, indexFactory, false);
-    }
-
-    @AfterSuite
-    public void after() {
-        elasticsearch.after();
-    }
-
-    @Override
-    protected LogRepository createLogRepository() {
-        schemaManager.ensureSchema();
-        return new ConsumersElasticsearchLogRepository.Builder(elasticsearch.client(), metricsFacade)
-                .withIndexFactory(indexFactory)
-                .build();
-    }
-
-    @Override
-    protected void awaitUntilMessageIsPersisted(String topic, String subscription, String id,
-                                                SentMessageTraceStatus status) {
-        awaitUntilPersisted(getMessageFilter(topic, subscription, id, status));
-    }
-
-    @Override
-    protected void awaitUntilBatchMessageIsPersisted(String topic, String subscription, String messageId, String batchId,
-                                                     SentMessageTraceStatus status) {
-        awaitUntilPersisted(getMessageBatchFilter(topic, subscription, messageId, batchId, status));
-    }
-
-    private void awaitUntilPersisted(QueryBuilder query) {
-        await().atMost(ONE_MINUTE).until(() -> {
-            SearchResponse response = elasticsearch.client().prepareSearch(indexFactory.createIndex())
-                    .setTypes(SchemaManager.SENT_TYPE)
-                    .setQuery(query)
-                    .execute().get();
-            return response.getHits().getTotalHits() == 1;
-        });
-    }
-
-    private BoolQueryBuilder getMessageFilter(String topic, String subscription, String id,
-                                              SentMessageTraceStatus status) {
-        BoolQueryBuilder queryBuilder = boolQuery()
-                .must(termQuery(TOPIC_NAME, topic))
-                .must(termQuery(SUBSCRIPTION, subscription))
-                .must(termQuery(MESSAGE_ID, id))
-                .must(termQuery(STATUS, status.toString()))
-                .must(termQuery(CLUSTER, CLUSTER_NAME));
-        return queryBuilder;
-    }
-
-    private QueryBuilder getMessageBatchFilter(String topic, String subscription, String messageId, String batchId,
-                                               SentMessageTraceStatus status) {
-        return getMessageFilter(topic, subscription, messageId, status)
-                .must(termQuery(BATCH_ID, batchId));
-    }
+public class ConsumersElasticsearchLogRepositoryTest extends AbstractLogRepositoryTest
+    implements LogSchemaAware {
+
+  private static final String CLUSTER_NAME = "primary";
+
+  private static final Clock clock =
+      Clock.fixed(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
+  private static final ConsumersIndexFactory indexFactory = new ConsumersDailyIndexFactory(clock);
+  private static final FrontendIndexFactory frontendIndexFactory =
+      new FrontendDailyIndexFactory(clock);
+  private static final MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry());
+
+  private static final ElasticsearchResource elasticsearch = new ElasticsearchResource();
+  private static SchemaManager schemaManager;
+
+  @BeforeClass
+  public static void beforeAll() throws Throwable {
+    elasticsearch.before();
+    schemaManager =
+        new SchemaManager(elasticsearch.client(), frontendIndexFactory, indexFactory, false);
+  }
+
+  @AfterClass
+  public static void afterAll() {
+    elasticsearch.after();
+  }
+
+  @Override
+  protected LogRepository createLogRepository() {
+    schemaManager.ensureSchema();
+    return new ConsumersElasticsearchLogRepository.Builder(elasticsearch.client(), metricsFacade)
+        .withIndexFactory(indexFactory)
+        .build();
+  }
+
+  @Override
+  protected void awaitUntilMessageIsPersisted(
+      String topic, String subscription, String id, SentMessageTraceStatus status) {
+    awaitUntilPersisted(getMessageFilter(topic, subscription, id, status));
+  }
+
+  @Override
+  protected void awaitUntilBatchMessageIsPersisted(
+      String topic,
+      String subscription,
+      String messageId,
+      String batchId,
+      SentMessageTraceStatus status) {
+    awaitUntilPersisted(getMessageBatchFilter(topic, subscription, messageId, batchId, status));
+  }
+
+  private void awaitUntilPersisted(QueryBuilder query) {
+    await()
+        .atMost(Duration.ofMinutes(1))
+        .until(
+            () -> {
+              SearchResponse response =
+                  elasticsearch
+                      .client()
+                      .prepareSearch(indexFactory.createIndex())
+                      .setTypes(SchemaManager.SENT_TYPE)
+                      .setQuery(query)
+                      .execute()
+                      .get();
+              return response.getHits().getTotalHits() == 1;
+            });
+  }
+
+  private BoolQueryBuilder getMessageFilter(
+      String topic, String subscription, String id, SentMessageTraceStatus status) {
+    BoolQueryBuilder queryBuilder =
+        boolQuery()
+            .must(termQuery(TOPIC_NAME, topic))
+            .must(termQuery(SUBSCRIPTION, subscription))
+            .must(termQuery(MESSAGE_ID, id))
+            .must(termQuery(STATUS, status.toString()))
+            .must(termQuery(CLUSTER, CLUSTER_NAME));
+    return queryBuilder;
+  }
+
+  private QueryBuilder getMessageBatchFilter(
+      String topic,
+      String subscription,
+      String messageId,
+      String batchId,
+      SentMessageTraceStatus status) {
+    return getMessageFilter(topic, subscription, messageId, status)
+        .must(termQuery(BATCH_ID, batchId));
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendElasticsearchLogRepositoryTest.java b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendElasticsearchLogRepositoryTest.java
index 415e80e789..de7deaa1c4 100644
--- a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendElasticsearchLogRepositoryTest.java
+++ b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/frontend/FrontendElasticsearchLogRepositoryTest.java
@@ -1,16 +1,23 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.frontend;
 
-import com.codahale.metrics.MetricRegistry;
+import static org.awaitility.Awaitility.await;
+import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import pl.allegro.tech.hermes.api.PublishedMessageTraceStatus;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.tracker.elasticsearch.ElasticsearchResource;
 import pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware;
 import pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager;
@@ -19,99 +26,127 @@
 import pl.allegro.tech.hermes.tracker.frontend.AbstractLogRepositoryTest;
 import pl.allegro.tech.hermes.tracker.frontend.LogRepository;
 
-import java.time.Clock;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-
-public class FrontendElasticsearchLogRepositoryTest extends AbstractLogRepositoryTest implements LogSchemaAware {
-
-    private static final String CLUSTER_NAME = "primary";
-
-    private static final Clock clock = Clock.fixed(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
-    private static final FrontendIndexFactory frontendIndexFactory = new FrontendDailyIndexFactory(clock);
-    private static final ConsumersIndexFactory consumersIndexFactory = new ConsumersDailyIndexFactory(clock);
-    private static final MetricsFacade metricsFacade = new MetricsFacade(
-            new SimpleMeterRegistry(),
-            new HermesMetrics(new MetricRegistry(), new PathsCompiler(""))
-    );
-
-    private static final ElasticsearchResource elasticsearch = new ElasticsearchResource();
-
-    private SchemaManager schemaManager;
-
-    @BeforeSuite
-    public void before() throws Throwable {
-        elasticsearch.before();
-        schemaManager = new SchemaManager(elasticsearch.client(), frontendIndexFactory, consumersIndexFactory, false);
-    }
-
-    @AfterSuite
-    public void after() {
-        elasticsearch.after();
-    }
-
-    @Override
-    protected LogRepository createRepository() {
-        schemaManager.ensureSchema();
-
-        return new FrontendElasticsearchLogRepository.Builder(elasticsearch.client(), metricsFacade)
-                .withIndexFactory(frontendIndexFactory)
-                .build();
+public class FrontendElasticsearchLogRepositoryTest extends AbstractLogRepositoryTest
+    implements LogSchemaAware {
+
+  private static final String CLUSTER_NAME = "primary";
+
+  private static final Clock clock =
+      Clock.fixed(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
+  private static final FrontendIndexFactory frontendIndexFactory =
+      new FrontendDailyIndexFactory(clock);
+  private static final ConsumersIndexFactory consumersIndexFactory =
+      new ConsumersDailyIndexFactory(clock);
+  private static final MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry());
+
+  private static final ElasticsearchResource elasticsearch = new ElasticsearchResource();
+
+  private static SchemaManager schemaManager;
+
+  @BeforeClass
+  public static void beforeAll() throws Throwable {
+    elasticsearch.before();
+    schemaManager =
+        new SchemaManager(
+            elasticsearch.client(), frontendIndexFactory, consumersIndexFactory, false);
+  }
+
+  @AfterClass
+  public static void afterAll() {
+    elasticsearch.after();
+  }
+
+  @Override
+  protected LogRepository createRepository() {
+    schemaManager.ensureSchema();
+
+    return new FrontendElasticsearchLogRepository.Builder(elasticsearch.client(), metricsFacade)
+        .withIndexFactory(frontendIndexFactory)
+        .build();
+  }
+
+  @Override
+  protected void awaitUntilSuccessMessageIsPersisted(
+      String topic,
+      String id,
+      String remoteHostname,
+      String storageDatacenter,
+      String... extraRequestHeadersKeywords)
+      throws Exception {
+    awaitUntilMessageIsIndexed(
+        getQuery(
+                topic,
+                id,
+                PublishedMessageTraceStatus.SUCCESS,
+                remoteHostname,
+                extraRequestHeadersKeywords)
+            .must(matchQuery(STORAGE_DATACENTER, storageDatacenter)));
+  }
+
+  @Override
+  protected void awaitUntilInflightMessageIsPersisted(
+      String topic, String id, String remoteHostname, String... extraRequestHeadersKeywords)
+      throws Exception {
+    awaitUntilMessageIsIndexed(
+        getQuery(
+            topic,
+            id,
+            PublishedMessageTraceStatus.INFLIGHT,
+            remoteHostname,
+            extraRequestHeadersKeywords));
+  }
+
+  @Override
+  protected void awaitUntilErrorMessageIsPersisted(
+      String topic,
+      String id,
+      String reason,
+      String remoteHostname,
+      String... extraRequestHeadersKeywords)
+      throws Exception {
+    awaitUntilMessageIsIndexed(
+        getQuery(
+                topic,
+                id,
+                PublishedMessageTraceStatus.ERROR,
+                remoteHostname,
+                extraRequestHeadersKeywords)
+            .must(matchQuery(REASON, reason)));
+  }
+
+  private BoolQueryBuilder getQuery(
+      String topic,
+      String id,
+      PublishedMessageTraceStatus status,
+      String remoteHostname,
+      String... extraRequestHeadersKeywords) {
+    BoolQueryBuilder queryBuilder =
+        boolQuery()
+            .must(termQuery(TOPIC_NAME, topic))
+            .must(termQuery(MESSAGE_ID, id))
+            .must(termQuery(STATUS, status.toString()))
+            .must(termQuery(CLUSTER, CLUSTER_NAME))
+            .must(termQuery(REMOTE_HOSTNAME, remoteHostname));
+    for (String extraRequestHeadersKeyword : extraRequestHeadersKeywords) {
+      queryBuilder.must(termQuery(EXTRA_REQUEST_HEADERS, extraRequestHeadersKeyword));
     }
-
-    @Override
-    protected void awaitUntilMessageIsPersisted(String topic,
-                                                String id,
-                                                String reason,
-                                                String remoteHostname,
-                                                PublishedMessageTraceStatus status,
-                                                String... extraRequestHeadersKeywords) {
-        awaitUntilMessageIsIndexed(
-                getPublishedQuery(topic, id, status, remoteHostname, extraRequestHeadersKeywords)
-                        .must(matchQuery(REASON, reason)));
-    }
-
-    @Override
-    protected void awaitUntilMessageIsPersisted(String topic,
-                                                String id,
-                                                String remoteHostname,
-                                                PublishedMessageTraceStatus status,
-                                                String... extraRequestHeadersKeywords) {
-        awaitUntilMessageIsIndexed(getPublishedQuery(topic, id, status, remoteHostname, extraRequestHeadersKeywords));
-    }
-
-    private BoolQueryBuilder getPublishedQuery(String topic,
-                                               String id,
-                                               PublishedMessageTraceStatus status,
-                                               String remoteHostname,
-                                               String... extraRequestHeadersKeywords) {
-        BoolQueryBuilder queryBuilder = boolQuery()
-                .must(termQuery(TOPIC_NAME, topic))
-                .must(termQuery(MESSAGE_ID, id))
-                .must(termQuery(STATUS, status.toString()))
-                .must(termQuery(CLUSTER, CLUSTER_NAME))
-                .must(termQuery(REMOTE_HOSTNAME, remoteHostname));
-        for (String extraRequestHeadersKeyword : extraRequestHeadersKeywords) {
-            queryBuilder.must(termQuery(EXTRA_REQUEST_HEADERS, extraRequestHeadersKeyword));
-        }
-        return queryBuilder;
-    }
-
-    private void awaitUntilMessageIsIndexed(QueryBuilder query) {
-        await().atMost(ONE_MINUTE).until(() -> {
-            SearchResponse response = elasticsearch.client().prepareSearch(frontendIndexFactory.createIndex())
-                    .setTypes(SchemaManager.PUBLISHED_TYPE)
-                    .setQuery(query)
-                    .execute().get();
-            return response.getHits().getTotalHits() == 1;
-        });
-    }
-
-}
\ No newline at end of file
+    return queryBuilder;
+  }
+
+  private void awaitUntilMessageIsIndexed(QueryBuilder query) {
+    await()
+        .atMost(Duration.ofMinutes(1))
+        .until(
+            () -> {
+              SearchResponse response =
+                  elasticsearch
+                      .client()
+                      .prepareSearch(frontendIndexFactory.createIndex())
+                      .setTypes(SchemaManager.PUBLISHED_TYPE)
+                      .setQuery(query)
+                      .execute()
+                      .get();
+              return response.getHits().getTotalHits() == 1;
+            });
+  }
+}
diff --git a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/ElasticsearchLogRepositoryTest.java b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/ElasticsearchLogRepositoryTest.java
index 835ec31077..b332b8703f 100644
--- a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/ElasticsearchLogRepositoryTest.java
+++ b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/ElasticsearchLogRepositoryTest.java
@@ -1,19 +1,31 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.management;
 
-import com.codahale.metrics.MetricRegistry;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.DISCARDED;
+import static pl.allegro.tech.hermes.common.http.ExtraRequestHeadersCollector.extraRequestHeadersCollector;
+
 import com.google.common.collect.ImmutableMap;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Test;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
 import pl.allegro.tech.hermes.api.MessageTrace;
 import pl.allegro.tech.hermes.api.PublishedMessageTrace;
 import pl.allegro.tech.hermes.api.PublishedMessageTraceStatus;
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 import pl.allegro.tech.hermes.api.SentMessageTraceStatus;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
 import pl.allegro.tech.hermes.tracker.consumers.TestMessageMetadata;
 import pl.allegro.tech.hermes.tracker.elasticsearch.ElasticsearchResource;
@@ -27,149 +39,171 @@
 import pl.allegro.tech.hermes.tracker.elasticsearch.frontend.FrontendIndexFactory;
 import pl.allegro.tech.hermes.tracker.management.LogRepository;
 
-import java.time.Clock;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.DISCARDED;
-import static pl.allegro.tech.hermes.common.http.ExtraRequestHeadersCollector.extraRequestHeadersCollector;
-
 public class ElasticsearchLogRepositoryTest implements LogSchemaAware {
 
-    private static final String CLUSTER_NAME = "primary";
-    private static final String REASON_MESSAGE = "Bad Request";
-
-    private static final Clock clock = Clock.fixed(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
-    private static final FrontendIndexFactory frontendIndexFactory = new FrontendDailyIndexFactory(clock);
-    private static final ConsumersIndexFactory consumersIndexFactory = new ConsumersDailyIndexFactory(clock);
-    private static final MetricsFacade metricsFacade = new MetricsFacade(
-            new SimpleMeterRegistry(),
-            new HermesMetrics(new MetricRegistry(), new PathsCompiler(""))
-    );
-
-    private static final ElasticsearchResource elasticsearch = new ElasticsearchResource();
-
-    private LogRepository logRepository;
-    private FrontendElasticsearchLogRepository frontendLogRepository;
-    private ConsumersElasticsearchLogRepository consumersLogRepository;
-
-    @BeforeSuite
-    public void before() throws Throwable {
-        elasticsearch.before();
-        SchemaManager schemaManager = new SchemaManager(elasticsearch.client(), frontendIndexFactory, consumersIndexFactory, false);
-        logRepository = new ElasticsearchLogRepository(elasticsearch.client(), schemaManager);
-
-        frontendLogRepository = new FrontendElasticsearchLogRepository.Builder(
-                elasticsearch.client(), metricsFacade)
-                .withIndexFactory(frontendIndexFactory)
-                .build();
-
-        consumersLogRepository = new ConsumersElasticsearchLogRepository.Builder(
-                elasticsearch.client(), metricsFacade)
-                .withIndexFactory(consumersIndexFactory)
-                .build();
-    }
-
-    @AfterSuite
-    public void after() {
-        elasticsearch.after();
-    }
-
-    // TODO: figure out why this test sometimes *consistently* fails on CI
-    @Test(enabled = false)
-    public void shouldGetLastUndelivered() throws Exception {
-        //given
-        String topic = "elasticsearch.lastUndelivered";
-        String subscription = "subscription";
-        MessageMetadata firstDiscarded = TestMessageMetadata.of("1234", topic, subscription);
-        long firstTimestamp = System.currentTimeMillis();
-
-        MessageMetadata secondDiscarded = TestMessageMetadata.of("5678", topic, subscription);
-        // difference between first and second timestamp must be bigger than 1000ms as query sorts by seconds
-        long secondTimestamp = firstTimestamp + 2000;
-
-        // when
-        consumersLogRepository.logDiscarded(firstDiscarded, firstTimestamp, REASON_MESSAGE);
-        consumersLogRepository.logDiscarded(secondDiscarded, secondTimestamp, REASON_MESSAGE);
-
-        // then
-        assertThat(fetchLastUndelivered(topic, subscription))
-            .containsExactly(sentMessageTrace(secondDiscarded, secondTimestamp, DISCARDED));
-    }
-
-    @Test
-    public void shouldGetMessageStatus() {
-        //given
-        MessageMetadata messageMetadata = TestMessageMetadata.of("1234", "elasticsearch.messageStatus", "subscription");
-        long timestamp = System.currentTimeMillis();
-        ImmutableMap<String, String> extraRequestHeaders = ImmutableMap.of("x-header1", "value1", "x-header2", "value2");
-
-        frontendLogRepository.logPublished("1234", timestamp, "elasticsearch.messageStatus", "localhost", extraRequestHeaders);
-        consumersLogRepository.logSuccessful(messageMetadata, "localhost", timestamp);
-
-        //when
-        assertThat(fetchMessageStatus(messageMetadata))
-                .contains(publishedMessageTrace(messageMetadata, extraRequestHeaders, timestamp, PublishedMessageTraceStatus.SUCCESS))
-                .contains(sentMessageTrace(messageMetadata, timestamp, SentMessageTraceStatus.SUCCESS));
-    }
-
-    private List<SentMessageTrace> fetchLastUndelivered(String topic, String subscription) {
-        final List<SentMessageTrace> lastUndelivered = new ArrayList<>();
-
-        await().atMost(ONE_MINUTE).until(() -> {
-            lastUndelivered.clear();
-            lastUndelivered.addAll(logRepository.getLastUndeliveredMessages(topic, subscription, 1));
-            return lastUndelivered.size() == 1;
-        });
-        return lastUndelivered;
-    }
-
-    private List<MessageTrace> fetchMessageStatus(MessageMetadata messageMetadata) {
-        List<MessageTrace> status = new ArrayList<>();
-
-        await().atMost(ONE_MINUTE).until(() -> {
-            status.clear();
-            status.addAll(logRepository.getMessageStatus(messageMetadata.getTopic(), messageMetadata.getSubscription(),
-                    messageMetadata.getMessageId()));
-            return status.size() == 2;
-        });
-
-        return status;
-    }
-
-    private SentMessageTrace sentMessageTrace(MessageMetadata messageMetadata, long timestamp, SentMessageTraceStatus status) {
-        return SentMessageTrace.Builder.sentMessageTrace(
-                        messageMetadata.getMessageId(),
-                        messageMetadata.getBatchId(),
-                        status
-                )
-                .withTimestamp(timestamp)
-                .withSubscription(messageMetadata.getSubscription())
-                .withTopicName(messageMetadata.getTopic())
-                .withReason(REASON_MESSAGE)
-                .withPartition(messageMetadata.getPartition())
-                .withOffset(messageMetadata.getOffset())
-                .withCluster(CLUSTER_NAME)
-                .build();
-    }
-
-    private PublishedMessageTrace publishedMessageTrace(MessageMetadata messageMetadata, Map<String, String> extraRequestHeaders,
-                                                        long timestamp, PublishedMessageTraceStatus status) {
-        return new PublishedMessageTrace(messageMetadata.getMessageId(),
+  private static final String CLUSTER_NAME = "primary";
+  private static final String REASON_MESSAGE = "Bad Request";
+
+  private static final Clock clock =
+      Clock.fixed(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
+  private static final FrontendIndexFactory frontendIndexFactory =
+      new FrontendDailyIndexFactory(clock);
+  private static final ConsumersIndexFactory consumersIndexFactory =
+      new ConsumersDailyIndexFactory(clock);
+  private static final MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry());
+
+  private static final ElasticsearchResource elasticsearch = new ElasticsearchResource();
+
+  private LogRepository logRepository;
+  private FrontendElasticsearchLogRepository frontendLogRepository;
+  private ConsumersElasticsearchLogRepository consumersLogRepository;
+
+  @BeforeClass
+  public static void beforeAll() throws Throwable {
+    elasticsearch.before();
+  }
+
+  @AfterClass
+  public static void afterAll() {
+    elasticsearch.after();
+  }
+
+  @Before
+  public void setUp() {
+    SchemaManager schemaManager =
+        new SchemaManager(
+            elasticsearch.client(), frontendIndexFactory, consumersIndexFactory, false);
+    logRepository = new ElasticsearchLogRepository(elasticsearch.client(), schemaManager);
+
+    frontendLogRepository =
+        new FrontendElasticsearchLogRepository.Builder(elasticsearch.client(), metricsFacade)
+            .withIndexFactory(frontendIndexFactory)
+            .build();
+
+    consumersLogRepository =
+        new ConsumersElasticsearchLogRepository.Builder(elasticsearch.client(), metricsFacade)
+            .withIndexFactory(consumersIndexFactory)
+            .build();
+  }
+
+  // TODO: figure out why this test sometimes *consistently* fails on CI
+  @Ignore
+  @Test
+  public void shouldGetLastUndelivered() throws Exception {
+    // given
+    String topic = "elasticsearch.lastUndelivered";
+    String subscription = "subscription";
+    MessageMetadata firstDiscarded = TestMessageMetadata.of("1234", topic, subscription);
+    long firstTimestamp = System.currentTimeMillis();
+
+    MessageMetadata secondDiscarded = TestMessageMetadata.of("5678", topic, subscription);
+    // difference between first and second timestamp must be bigger than 1000ms as query sorts by
+    // seconds
+    long secondTimestamp = firstTimestamp + 2000;
+
+    // when
+    consumersLogRepository.logDiscarded(firstDiscarded, firstTimestamp, REASON_MESSAGE);
+    consumersLogRepository.logDiscarded(secondDiscarded, secondTimestamp, REASON_MESSAGE);
+
+    // then
+    assertThat(fetchLastUndelivered(topic, subscription))
+        .containsExactly(sentMessageTrace(secondDiscarded, secondTimestamp, DISCARDED));
+  }
+
+  @Test
+  public void shouldGetMessageStatus() {
+    // given
+    String datacenter = "dc1";
+    MessageMetadata messageMetadata =
+        TestMessageMetadata.of("1234", "elasticsearch.messageStatus", "subscription");
+    long timestamp = System.currentTimeMillis();
+    ImmutableMap<String, String> extraRequestHeaders =
+        ImmutableMap.of("x-header1", "value1", "x-header2", "value2");
+
+    frontendLogRepository.logPublished(
+        "1234",
+        timestamp,
+        "elasticsearch.messageStatus",
+        "localhost",
+        datacenter,
+        extraRequestHeaders);
+    consumersLogRepository.logSuccessful(messageMetadata, "localhost", timestamp);
+
+    // when
+    assertThat(fetchMessageStatus(messageMetadata))
+        .contains(
+            publishedMessageTrace(
+                messageMetadata,
+                extraRequestHeaders,
                 timestamp,
-                messageMetadata.getTopic(),
-                status,
-                null,
-                null,
-                CLUSTER_NAME,
-                extraRequestHeaders.entrySet().stream()
-                    .collect(extraRequestHeadersCollector()));
-    }
-}
\ No newline at end of file
+                PublishedMessageTraceStatus.SUCCESS,
+                datacenter))
+        .contains(sentMessageTrace(messageMetadata, timestamp, SentMessageTraceStatus.SUCCESS));
+  }
+
+  private List<SentMessageTrace> fetchLastUndelivered(String topic, String subscription) {
+    final List<SentMessageTrace> lastUndelivered = new ArrayList<>();
+
+    await()
+        .atMost(Duration.ofMinutes(1))
+        .until(
+            () -> {
+              lastUndelivered.clear();
+              lastUndelivered.addAll(
+                  logRepository.getLastUndeliveredMessages(topic, subscription, 1));
+              return lastUndelivered.size() == 1;
+            });
+    return lastUndelivered;
+  }
+
+  private List<MessageTrace> fetchMessageStatus(MessageMetadata messageMetadata) {
+    List<MessageTrace> status = new ArrayList<>();
+
+    await()
+        .atMost(Duration.ofMinutes(1))
+        .until(
+            () -> {
+              status.clear();
+              status.addAll(
+                  logRepository.getMessageStatus(
+                      messageMetadata.getTopic(),
+                      messageMetadata.getSubscription(),
+                      messageMetadata.getMessageId()));
+              return status.size() == 2;
+            });
+
+    return status;
+  }
+
+  private SentMessageTrace sentMessageTrace(
+      MessageMetadata messageMetadata, long timestamp, SentMessageTraceStatus status) {
+    return SentMessageTrace.Builder.sentMessageTrace(
+            messageMetadata.getMessageId(), messageMetadata.getBatchId(), status)
+        .withTimestamp(timestamp)
+        .withSubscription(messageMetadata.getSubscription())
+        .withTopicName(messageMetadata.getTopic())
+        .withReason(REASON_MESSAGE)
+        .withPartition(messageMetadata.getPartition())
+        .withOffset(messageMetadata.getOffset())
+        .withCluster(CLUSTER_NAME)
+        .build();
+  }
+
+  private PublishedMessageTrace publishedMessageTrace(
+      MessageMetadata messageMetadata,
+      Map<String, String> extraRequestHeaders,
+      long timestamp,
+      PublishedMessageTraceStatus status,
+      String storageDatacenter) {
+    return new PublishedMessageTrace(
+        messageMetadata.getMessageId(),
+        timestamp,
+        messageMetadata.getTopic(),
+        status,
+        null,
+        null,
+        CLUSTER_NAME,
+        extraRequestHeaders.entrySet().stream().collect(extraRequestHeadersCollector()),
+        storageDatacenter);
+  }
+}
diff --git a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/MultiElasticsearchLogRepositoryTest.java b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/MultiElasticsearchLogRepositoryTest.java
index e71de09265..027152e937 100644
--- a/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/MultiElasticsearchLogRepositoryTest.java
+++ b/hermes-tracker-elasticsearch/src/test/java/pl/allegro/tech/hermes/tracker/elasticsearch/management/MultiElasticsearchLogRepositoryTest.java
@@ -1,24 +1,34 @@
 package pl.allegro.tech.hermes.tracker.elasticsearch.management;
 
-import com.codahale.metrics.MetricRegistry;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.common.http.ExtraRequestHeadersCollector.extraRequestHeadersCollector;
+
 import com.google.common.collect.ImmutableMap;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Test;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import pl.allegro.tech.hermes.api.MessageTrace;
 import pl.allegro.tech.hermes.api.PublishedMessageTrace;
 import pl.allegro.tech.hermes.api.PublishedMessageTraceStatus;
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 import pl.allegro.tech.hermes.api.SentMessageTraceStatus;
-import pl.allegro.tech.hermes.common.metric.HermesMetrics;
 import pl.allegro.tech.hermes.common.metric.MetricsFacade;
-import pl.allegro.tech.hermes.metrics.PathsCompiler;
 import pl.allegro.tech.hermes.tracker.consumers.MessageMetadata;
 import pl.allegro.tech.hermes.tracker.consumers.TestMessageMetadata;
 import pl.allegro.tech.hermes.tracker.elasticsearch.ElasticsearchResource;
 import pl.allegro.tech.hermes.tracker.elasticsearch.LogSchemaAware;
-import pl.allegro.tech.hermes.tracker.elasticsearch.SchemaManager;
 import pl.allegro.tech.hermes.tracker.elasticsearch.consumers.ConsumersDailyIndexFactory;
 import pl.allegro.tech.hermes.tracker.elasticsearch.consumers.ConsumersElasticsearchLogRepository;
 import pl.allegro.tech.hermes.tracker.elasticsearch.consumers.ConsumersIndexFactory;
@@ -27,122 +37,135 @@
 import pl.allegro.tech.hermes.tracker.elasticsearch.frontend.FrontendIndexFactory;
 import pl.allegro.tech.hermes.tracker.management.LogRepository;
 
-import java.time.Clock;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Duration.ONE_MINUTE;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.common.http.ExtraRequestHeadersCollector.extraRequestHeadersCollector;
-
-
 public class MultiElasticsearchLogRepositoryTest implements LogSchemaAware {
 
-    private static final String CLUSTER_NAME = "primary";
-    private static final String REASON_MESSAGE = "Bad Request";
-
-    private static final Clock clock = Clock.fixed(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
-    private static final FrontendIndexFactory frontendIndexFactory = new FrontendDailyIndexFactory(clock);
-    private static final ConsumersIndexFactory consumersIndexFactory = new ConsumersDailyIndexFactory(clock);
-    private static final MetricsFacade metricsFacade = new MetricsFacade(
-            new SimpleMeterRegistry(),
-            new HermesMetrics(new MetricRegistry(), new PathsCompiler(""))
-    );
-
-    private static final ElasticsearchResource elasticsearch1 = new ElasticsearchResource();
-    private static final ElasticsearchResource elasticsearch2 = new ElasticsearchResource();
-
-    private LogRepository logRepository;
-    private FrontendElasticsearchLogRepository frontendLogRepository;
-    private ConsumersElasticsearchLogRepository consumersLogRepository;
-
-    @BeforeSuite
-    public void before() throws Throwable {
-        elasticsearch1.before();
-        elasticsearch2.before();
-
-        SchemaManager schemaManager = new SchemaManager(elasticsearch1.client(), frontendIndexFactory, consumersIndexFactory, false);
-        logRepository = new MultiElasticsearchLogRepository(Arrays.asList(elasticsearch1.client(), elasticsearch2.client()));
-
-        frontendLogRepository = new FrontendElasticsearchLogRepository.Builder(
-                elasticsearch1.client(), metricsFacade)
-                .withIndexFactory(frontendIndexFactory)
-                .build();
-
-        consumersLogRepository = new ConsumersElasticsearchLogRepository.Builder(
-                elasticsearch2.client(), metricsFacade)
-                .withIndexFactory(consumersIndexFactory)
-                .build();
-    }
-
-    @AfterSuite
-    public void after() {
-        elasticsearch1.after();
-        elasticsearch2.after();
-    }
-
-    @Test
-    public void shouldGetMessageStatus() {
-        // given
-        Map<String, String> extraRequestHeaders = ImmutableMap.of("x-header1", "value1", "x-header2", "value2");
-        MessageMetadata messageMetadata = TestMessageMetadata.of("1234", "elasticsearch1.messageStatus", "subscription");
-        long timestamp = System.currentTimeMillis();
-
-        // when
-        frontendLogRepository.logPublished("1234", timestamp, "elasticsearch1.messageStatus", "localhost", extraRequestHeaders);
-        consumersLogRepository.logSuccessful(messageMetadata, "localhost", timestamp);
-
-        // then
-        assertThat(fetchMessageStatus(messageMetadata))
-                .contains(publishedMessageTrace(messageMetadata, extraRequestHeaders, timestamp, PublishedMessageTraceStatus.SUCCESS))
-                .contains(sentMessageTrace(messageMetadata, timestamp, SentMessageTraceStatus.SUCCESS));
-    }
-
-    private List<MessageTrace> fetchMessageStatus(MessageMetadata messageMetadata) {
-        List<MessageTrace> status = new ArrayList<>();
-
-        await().atMost(ONE_MINUTE).until(() -> {
-            status.clear();
-            status.addAll(logRepository.getMessageStatus(messageMetadata.getTopic(), messageMetadata.getSubscription(),
-                    messageMetadata.getMessageId()));
-            return status.size() == 2;
-        });
-
-        return status;
-    }
-
-    private SentMessageTrace sentMessageTrace(MessageMetadata messageMetadata, long timestamp, SentMessageTraceStatus status) {
-        return SentMessageTrace.Builder.sentMessageTrace(
-                        messageMetadata.getMessageId(),
-                        messageMetadata.getBatchId(),
-                        status
-                )
-                .withTimestamp(timestamp)
-                .withSubscription(messageMetadata.getSubscription())
-                .withTopicName(messageMetadata.getTopic())
-                .withReason(REASON_MESSAGE)
-                .withPartition(messageMetadata.getPartition())
-                .withOffset(messageMetadata.getOffset())
-                .withCluster(CLUSTER_NAME)
-                .build();
-    }
-
-    private PublishedMessageTrace publishedMessageTrace(MessageMetadata messageMetadata, Map<String, String> extraRequestHeaders,
-                                                        long timestamp, PublishedMessageTraceStatus status) {
-        return new PublishedMessageTrace(messageMetadata.getMessageId(),
+  private static final String CLUSTER_NAME = "primary";
+  private static final String REASON_MESSAGE = "Bad Request";
+
+  private static final Clock clock =
+      Clock.fixed(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
+  private static final FrontendIndexFactory frontendIndexFactory =
+      new FrontendDailyIndexFactory(clock);
+  private static final ConsumersIndexFactory consumersIndexFactory =
+      new ConsumersDailyIndexFactory(clock);
+  private static final MetricsFacade metricsFacade = new MetricsFacade(new SimpleMeterRegistry());
+
+  private static final ElasticsearchResource elasticsearch1 = new ElasticsearchResource();
+  private static final ElasticsearchResource elasticsearch2 = new ElasticsearchResource();
+
+  private LogRepository logRepository;
+  private FrontendElasticsearchLogRepository frontendLogRepository;
+  private ConsumersElasticsearchLogRepository consumersLogRepository;
+
+  @BeforeClass
+  public static void beforeAll() throws Throwable {
+    elasticsearch1.before();
+    elasticsearch2.before();
+  }
+
+  @AfterClass
+  public static void afterAll() {
+    elasticsearch1.after();
+    elasticsearch2.after();
+  }
+
+  @Before
+  public void setUp() {
+    logRepository =
+        new MultiElasticsearchLogRepository(
+            Arrays.asList(elasticsearch1.client(), elasticsearch2.client()));
+
+    frontendLogRepository =
+        new FrontendElasticsearchLogRepository.Builder(elasticsearch1.client(), metricsFacade)
+            .withIndexFactory(frontendIndexFactory)
+            .build();
+
+    consumersLogRepository =
+        new ConsumersElasticsearchLogRepository.Builder(elasticsearch2.client(), metricsFacade)
+            .withIndexFactory(consumersIndexFactory)
+            .build();
+  }
+
+  @Test
+  public void shouldGetMessageStatus() {
+    // given
+    String datacenter = "dc1";
+    Map<String, String> extraRequestHeaders =
+        ImmutableMap.of("x-header1", "value1", "x-header2", "value2");
+    MessageMetadata messageMetadata =
+        TestMessageMetadata.of("1234", "elasticsearch1.messageStatus", "subscription");
+    long timestamp = System.currentTimeMillis();
+
+    // when
+    frontendLogRepository.logPublished(
+        "1234",
+        timestamp,
+        "elasticsearch1.messageStatus",
+        "localhost",
+        datacenter,
+        extraRequestHeaders);
+    consumersLogRepository.logSuccessful(messageMetadata, "localhost", timestamp);
+
+    // then
+    assertThat(fetchMessageStatus(messageMetadata))
+        .contains(
+            publishedMessageTrace(
+                messageMetadata,
+                extraRequestHeaders,
                 timestamp,
-                messageMetadata.getTopic(),
-                status,
-                null,
-                null,
-                CLUSTER_NAME,
-                extraRequestHeaders.entrySet().stream()
-                    .collect(extraRequestHeadersCollector()));
-    }
+                PublishedMessageTraceStatus.SUCCESS,
+                datacenter))
+        .contains(sentMessageTrace(messageMetadata, timestamp, SentMessageTraceStatus.SUCCESS));
+  }
+
+  private List<MessageTrace> fetchMessageStatus(MessageMetadata messageMetadata) {
+    List<MessageTrace> status = new ArrayList<>();
+
+    await()
+        .atMost(Duration.ofMinutes(1))
+        .until(
+            () -> {
+              status.clear();
+              status.addAll(
+                  logRepository.getMessageStatus(
+                      messageMetadata.getTopic(),
+                      messageMetadata.getSubscription(),
+                      messageMetadata.getMessageId()));
+              return status.size() == 2;
+            });
+
+    return status;
+  }
+
+  private SentMessageTrace sentMessageTrace(
+      MessageMetadata messageMetadata, long timestamp, SentMessageTraceStatus status) {
+    return SentMessageTrace.Builder.sentMessageTrace(
+            messageMetadata.getMessageId(), messageMetadata.getBatchId(), status)
+        .withTimestamp(timestamp)
+        .withSubscription(messageMetadata.getSubscription())
+        .withTopicName(messageMetadata.getTopic())
+        .withReason(REASON_MESSAGE)
+        .withPartition(messageMetadata.getPartition())
+        .withOffset(messageMetadata.getOffset())
+        .withCluster(CLUSTER_NAME)
+        .build();
+  }
+
+  private PublishedMessageTrace publishedMessageTrace(
+      MessageMetadata messageMetadata,
+      Map<String, String> extraRequestHeaders,
+      long timestamp,
+      PublishedMessageTraceStatus status,
+      String storageDatacenter) {
+    return new PublishedMessageTrace(
+        messageMetadata.getMessageId(),
+        timestamp,
+        messageMetadata.getTopic(),
+        status,
+        null,
+        null,
+        CLUSTER_NAME,
+        extraRequestHeaders.entrySet().stream().collect(extraRequestHeadersCollector()),
+        storageDatacenter);
+  }
 }
diff --git a/hermes-tracker-elasticsearch/src/test/resources/allure.properties b/hermes-tracker-elasticsearch/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-tracker-elasticsearch/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/BatchingLogRepository.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/BatchingLogRepository.java
index 6cfbd51797..b57a5f339a 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/BatchingLogRepository.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/BatchingLogRepository.java
@@ -5,15 +5,13 @@
 
 public class BatchingLogRepository<T> {
 
-    protected final String clusterName;
-    protected final String hostname;
-    protected BlockingQueue<T> queue;
+  protected final String clusterName;
+  protected final String hostname;
+  protected BlockingQueue<T> queue;
 
-    public BatchingLogRepository(int queueSize,
-                                 String clusterName,
-                                 String hostname) {
-        this.queue = new LinkedBlockingQueue<>(queueSize);
-        this.clusterName = clusterName;
-        this.hostname = hostname;
-    }
-}
\ No newline at end of file
+  public BatchingLogRepository(int queueSize, String clusterName, String hostname) {
+    this.queue = new LinkedBlockingQueue<>(queueSize);
+    this.clusterName = clusterName;
+    this.hostname = hostname;
+  }
+}
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/QueueCommitter.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/QueueCommitter.java
index 3bae8d6131..fb2f98f21c 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/QueueCommitter.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/QueueCommitter.java
@@ -1,46 +1,44 @@
 package pl.allegro.tech.hermes.tracker;
 
-import com.codahale.metrics.Timer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.metrics.HermesTimer;
-import pl.allegro.tech.hermes.metrics.HermesTimerContext;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.metrics.HermesTimer;
+import pl.allegro.tech.hermes.metrics.HermesTimerContext;
 
 public abstract class QueueCommitter<T> implements Runnable {
-    private static final Logger LOGGER = LoggerFactory.getLogger(QueueCommitter.class);
-
-    private final BlockingQueue<T> queue;
-    private final HermesTimer timer;
-
-    public QueueCommitter(BlockingQueue<T> queue, HermesTimer timer) {
-        this.queue = queue;
-        this.timer = timer;
-    }
-
-    @Override
-    public void run() {
-        try {
-            if (!queue.isEmpty()) {
-                HermesTimerContext ctx = timer.time();
-                commit();
-                ctx.close();
-            }
-        } catch (Exception ex) {
-            LOGGER.error("Could not commit batch.", ex);
-        }
-    }
-
-    private void commit() throws Exception {
-        List<T> batch = new ArrayList<>();
-        queue.drainTo(batch);
-        processBatch(batch);
+  private static final Logger LOGGER = LoggerFactory.getLogger(QueueCommitter.class);
+
+  private final BlockingQueue<T> queue;
+  private final HermesTimer timer;
+
+  public QueueCommitter(BlockingQueue<T> queue, HermesTimer timer) {
+    this.queue = queue;
+    this.timer = timer;
+  }
+
+  @Override
+  public void run() {
+    try {
+      if (!queue.isEmpty()) {
+        HermesTimerContext ctx = timer.time();
+        commit();
+        ctx.close();
+      }
+    } catch (Exception ex) {
+      LOGGER.error("Could not commit batch.", ex);
     }
+  }
 
-    protected abstract void processBatch(List<T> batch) throws ExecutionException, InterruptedException;
+  private void commit() throws Exception {
+    List<T> batch = new ArrayList<>();
+    queue.drainTo(batch);
+    processBatch(batch);
+  }
 
+  protected abstract void processBatch(List<T> batch)
+      throws ExecutionException, InterruptedException;
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/DiscardedSendingTracker.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/DiscardedSendingTracker.java
index 3c2145185f..ef97d13e21 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/DiscardedSendingTracker.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/DiscardedSendingTracker.java
@@ -5,37 +5,28 @@
 
 public class DiscardedSendingTracker implements SendingTracker {
 
+  private final List<LogRepository> repositories;
+  private final Clock clock;
 
-    private final List<LogRepository> repositories;
-    private final Clock clock;
+  DiscardedSendingTracker(List<LogRepository> repositories, Clock clock) {
+    this.repositories = repositories;
+    this.clock = clock;
+  }
 
-    DiscardedSendingTracker(List<LogRepository> repositories, Clock clock) {
-        this.repositories = repositories;
-        this.clock = clock;
-    }
+  @Override
+  public void logSent(MessageMetadata message, String hostname) {}
 
-    @Override
-    public void logSent(MessageMetadata message, String hostname) {
+  @Override
+  public void logFailed(MessageMetadata message, String reason, String hostname) {}
 
-    }
+  @Override
+  public void logDiscarded(MessageMetadata message, String reason) {
+    repositories.forEach(r -> r.logDiscarded(message, clock.millis(), reason));
+  }
 
-    @Override
-    public void logFailed(MessageMetadata message, String reason, String hostname) {
-    }
+  @Override
+  public void logInflight(MessageMetadata message) {}
 
-    @Override
-    public void logDiscarded(MessageMetadata message, String reason) {
-        repositories.forEach(r ->
-                r.logDiscarded(message, clock.millis(), reason));
-    }
-
-    @Override
-    public void logInflight(MessageMetadata message) {
-
-    }
-
-    @Override
-    public void logFiltered(MessageMetadata messageMetadata, String reason) {
-
-    }
+  @Override
+  public void logFiltered(MessageMetadata messageMetadata, String reason) {}
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/LogRepository.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/LogRepository.java
index 3a778029b7..227ad0fd04 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/LogRepository.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/LogRepository.java
@@ -2,15 +2,15 @@
 
 public interface LogRepository {
 
-    void logSuccessful(MessageMetadata message, String hostname, long timestamp);
+  void logSuccessful(MessageMetadata message, String hostname, long timestamp);
 
-    void logFailed(MessageMetadata message, String hostname, long timestamp, String reason);
+  void logFailed(MessageMetadata message, String hostname, long timestamp, String reason);
 
-    void logDiscarded(MessageMetadata message, long timestamp, String reason);
+  void logDiscarded(MessageMetadata message, long timestamp, String reason);
 
-    void logInflight(MessageMetadata message, long timestamp);
+  void logInflight(MessageMetadata message, long timestamp);
 
-    void logFiltered(MessageMetadata message, long timestamp, String reason);
+  void logFiltered(MessageMetadata message, long timestamp, String reason);
 
-    void close();
+  void close();
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/MessageMetadata.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/MessageMetadata.java
index 0e5bed04ab..21775d1ad1 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/MessageMetadata.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/MessageMetadata.java
@@ -2,89 +2,100 @@
 
 public class MessageMetadata {
 
-    private final String messageId;
-    private final String batchId;
-    private final long offset;
-    private final int partition;
-    private final long partitionAssignmentTerm;
-    private final String topic;
-    private final String kafkaTopic;
-    private final String subscription;
-    private final long publishingTimestamp;
-    private final long readingTimestamp;
+  private final String messageId;
+  private final String batchId;
+  private final long offset;
+  private final int partition;
+  private final long partitionAssignmentTerm;
+  private final String topic;
+  private final String kafkaTopic;
+  private final String subscription;
+  private final long publishingTimestamp;
+  private final long readingTimestamp;
 
-    public MessageMetadata(String messageId,
-                           long offset,
-                           int partition,
-                           long partitionAssignmentTerm,
-                           String topic,
-                           String subscription,
-                           String kafkaTopic,
-                           long publishingTimestamp,
-                           long readingTimestamp) {
-        this(messageId, "", offset, partition, partitionAssignmentTerm, topic, subscription, kafkaTopic, publishingTimestamp,
-            readingTimestamp);
-    }
+  public MessageMetadata(
+      String messageId,
+      long offset,
+      int partition,
+      long partitionAssignmentTerm,
+      String topic,
+      String subscription,
+      String kafkaTopic,
+      long publishingTimestamp,
+      long readingTimestamp) {
+    this(
+        messageId,
+        "",
+        offset,
+        partition,
+        partitionAssignmentTerm,
+        topic,
+        subscription,
+        kafkaTopic,
+        publishingTimestamp,
+        readingTimestamp);
+  }
 
-    public MessageMetadata(String messageId,
-                           String batchId,
-                           long offset,
-                           int partition,
-                           long partitionAssignmentTerm,
-                           String topic,
-                           String subscription,
-                           String kafkaTopic,
-                           long publishingTimestamp,
-                           long readingTimestamp) {
-        this.messageId = messageId;
-        this.batchId = batchId;
-        this.offset = offset;
-        this.partition = partition;
-        this.partitionAssignmentTerm = partitionAssignmentTerm;
-        this.topic = topic;
-        this.subscription = subscription;
-        this.kafkaTopic = kafkaTopic;
-        this.publishingTimestamp = publishingTimestamp;
-        this.readingTimestamp = readingTimestamp;
-    }
+  public MessageMetadata(
+      String messageId,
+      String batchId,
+      long offset,
+      int partition,
+      long partitionAssignmentTerm,
+      String topic,
+      String subscription,
+      String kafkaTopic,
+      long publishingTimestamp,
+      long readingTimestamp) {
+    this.messageId = messageId;
+    this.batchId = batchId;
+    this.offset = offset;
+    this.partition = partition;
+    this.partitionAssignmentTerm = partitionAssignmentTerm;
+    this.topic = topic;
+    this.subscription = subscription;
+    this.kafkaTopic = kafkaTopic;
+    this.publishingTimestamp = publishingTimestamp;
+    this.readingTimestamp = readingTimestamp;
+  }
 
-    public String getMessageId() {
-        return messageId;
-    }
+  public String getMessageId() {
+    return messageId;
+  }
 
-    public long getOffset() {
-        return offset;
-    }
+  public long getOffset() {
+    return offset;
+  }
 
-    public int getPartition() {
-        return partition;
-    }
+  public int getPartition() {
+    return partition;
+  }
 
-    public long getPartitionAssignmentTerm() {
-        return partitionAssignmentTerm;
-    }
+  public long getPartitionAssignmentTerm() {
+    return partitionAssignmentTerm;
+  }
 
-    public String getTopic() {
-        return topic;
-    }
+  public String getTopic() {
+    return topic;
+  }
 
-    public String getSubscription() {
-        return subscription;
-    }
+  public String getSubscription() {
+    return subscription;
+  }
 
-    public long getPublishingTimestamp() {
-        return publishingTimestamp;
-    }
+  public long getPublishingTimestamp() {
+    return publishingTimestamp;
+  }
 
-    public long getReadingTimestamp() {
-        return readingTimestamp;
-    }
+  public long getReadingTimestamp() {
+    return readingTimestamp;
+  }
 
-    public String getBatchId() {
-        return batchId;
-    }
+  public String getBatchId() {
+    return batchId;
+  }
 
-    public String getKafkaTopic() {
-        return kafkaTopic;
-    }
+  public String getKafkaTopic() {
+    return kafkaTopic;
+  }
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/NoOperationSendingTracker.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/NoOperationSendingTracker.java
index 9c0a81a756..71e22bb5a2 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/NoOperationSendingTracker.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/NoOperationSendingTracker.java
@@ -2,28 +2,18 @@
 
 public class NoOperationSendingTracker implements SendingTracker {
 
-    @Override
-    public void logSent(MessageMetadata message, String hostname) {
+  @Override
+  public void logSent(MessageMetadata message, String hostname) {}
 
-    }
+  @Override
+  public void logFailed(MessageMetadata message, String reason, String hostname) {}
 
-    @Override
-    public void logFailed(MessageMetadata message, String reason, String hostname) {
+  @Override
+  public void logDiscarded(MessageMetadata message, String reason) {}
 
-    }
+  @Override
+  public void logInflight(MessageMetadata message) {}
 
-    @Override
-    public void logDiscarded(MessageMetadata message, String reason) {
-
-    }
-
-    @Override
-    public void logInflight(MessageMetadata message) {
-
-    }
-
-    @Override
-    public void logFiltered(MessageMetadata messageMetadata, String reason) {
-
-    }
+  @Override
+  public void logFiltered(MessageMetadata messageMetadata, String reason) {}
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/SendingMessageTracker.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/SendingMessageTracker.java
index 0b576a2595..8e5fd76a7a 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/SendingMessageTracker.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/SendingMessageTracker.java
@@ -4,37 +4,36 @@
 import java.util.List;
 
 class SendingMessageTracker implements SendingTracker {
-    private final List<LogRepository> repositories;
-    private final Clock clock;
-
-    SendingMessageTracker(List<LogRepository> repositories, Clock clock) {
-        this.repositories = repositories;
-        this.clock = clock;
-    }
-
-    @Override
-    public void logSent(MessageMetadata message, String hostname) {
-        repositories.forEach(r -> r.logSuccessful(message, hostname, clock.millis()));
-    }
-
-    @Override
-    public void logFailed(MessageMetadata message, String reason, String hostname) {
-        repositories.forEach(r -> r.logFailed(message, hostname, clock.millis(), reason));
-    }
-
-    @Override
-    public void logDiscarded(MessageMetadata message, String reason) {
-        repositories.forEach(r ->
-                r.logDiscarded(message, clock.millis(), reason));
-    }
-
-    @Override
-    public void logInflight(MessageMetadata message) {
-        repositories.forEach(r -> r.logInflight(message, clock.millis()));
-    }
-
-    @Override
-    public void logFiltered(MessageMetadata message, String reason) {
-        repositories.forEach(r -> r.logFiltered(message, clock.millis(), reason));
-    }
+  private final List<LogRepository> repositories;
+  private final Clock clock;
+
+  SendingMessageTracker(List<LogRepository> repositories, Clock clock) {
+    this.repositories = repositories;
+    this.clock = clock;
+  }
+
+  @Override
+  public void logSent(MessageMetadata message, String hostname) {
+    repositories.forEach(r -> r.logSuccessful(message, hostname, clock.millis()));
+  }
+
+  @Override
+  public void logFailed(MessageMetadata message, String reason, String hostname) {
+    repositories.forEach(r -> r.logFailed(message, hostname, clock.millis(), reason));
+  }
+
+  @Override
+  public void logDiscarded(MessageMetadata message, String reason) {
+    repositories.forEach(r -> r.logDiscarded(message, clock.millis(), reason));
+  }
+
+  @Override
+  public void logInflight(MessageMetadata message) {
+    repositories.forEach(r -> r.logInflight(message, clock.millis()));
+  }
+
+  @Override
+  public void logFiltered(MessageMetadata message, String reason) {
+    repositories.forEach(r -> r.logFiltered(message, clock.millis(), reason));
+  }
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/SendingTracker.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/SendingTracker.java
index a7f85c9dfa..0b3cb2e861 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/SendingTracker.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/SendingTracker.java
@@ -1,13 +1,13 @@
 package pl.allegro.tech.hermes.tracker.consumers;
 
 public interface SendingTracker {
-    void logSent(MessageMetadata message, String hostname);
+  void logSent(MessageMetadata message, String hostname);
 
-    void logFailed(MessageMetadata message, String reason, String hostname);
+  void logFailed(MessageMetadata message, String reason, String hostname);
 
-    void logDiscarded(MessageMetadata message, String reason);
+  void logDiscarded(MessageMetadata message, String reason);
 
-    void logInflight(MessageMetadata message);
+  void logInflight(MessageMetadata message);
 
-    void logFiltered(MessageMetadata messageMetadata, String reason);
+  void logFiltered(MessageMetadata messageMetadata, String reason);
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/Trackers.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/Trackers.java
index 127cc6e4d9..dd816ce876 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/Trackers.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/consumers/Trackers.java
@@ -1,37 +1,35 @@
 package pl.allegro.tech.hermes.tracker.consumers;
 
-import pl.allegro.tech.hermes.api.Subscription;
-
 import java.time.Clock;
 import java.util.List;
+import pl.allegro.tech.hermes.api.Subscription;
 
 public class Trackers {
 
-    private final List<LogRepository> repositories;
-    private final SendingMessageTracker sendingMessageTracker;
-    private final DiscardedSendingTracker discardedSendingTracker;
-    private final NoOperationSendingTracker noOperationDeliveryTracker;
-
-    public Trackers(List<LogRepository> repositories) {
-        this.repositories = repositories;
-        this.sendingMessageTracker = new SendingMessageTracker(repositories, Clock.systemUTC());
-        this.discardedSendingTracker = new DiscardedSendingTracker(repositories, Clock.systemUTC());
-        this.noOperationDeliveryTracker = new NoOperationSendingTracker();
+  private final List<LogRepository> repositories;
+  private final SendingMessageTracker sendingMessageTracker;
+  private final DiscardedSendingTracker discardedSendingTracker;
+  private final NoOperationSendingTracker noOperationDeliveryTracker;
+
+  public Trackers(List<LogRepository> repositories) {
+    this.repositories = repositories;
+    this.sendingMessageTracker = new SendingMessageTracker(repositories, Clock.systemUTC());
+    this.discardedSendingTracker = new DiscardedSendingTracker(repositories, Clock.systemUTC());
+    this.noOperationDeliveryTracker = new NoOperationSendingTracker();
+  }
+
+  public SendingTracker get(Subscription subscription) {
+    switch (subscription.getTrackingMode()) {
+      case TRACK_ALL:
+        return sendingMessageTracker;
+      case TRACK_DISCARDED_ONLY:
+        return discardedSendingTracker;
+      default:
+        return noOperationDeliveryTracker;
     }
+  }
 
-    public SendingTracker get(Subscription subscription) {
-        switch (subscription.getTrackingMode()) {
-            case TRACK_ALL:
-                return sendingMessageTracker;
-            case TRACK_DISCARDED_ONLY:
-                return discardedSendingTracker;
-            default:
-                return noOperationDeliveryTracker;
-
-        }
-    }
-
-    public void close() {
-        repositories.forEach(LogRepository::close);
-    }
+  public void close() {
+    repositories.forEach(LogRepository::close);
+  }
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/LogRepository.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/LogRepository.java
index 35000df3b5..604601856d 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/LogRepository.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/LogRepository.java
@@ -4,16 +4,28 @@
 
 public interface LogRepository {
 
-    void logPublished(String messageId, long timestamp, String topicName, String hostname, Map<String, String> extraRequestHeaders);
+  void logPublished(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String hostname,
+      String storageDatacenter,
+      Map<String, String> extraRequestHeaders);
 
-    void logError(String messageId,
-                  long timestamp,
-                  String topicName,
-                  String reason,
-                  String hostname,
-                  Map<String, String> extraRequestHeaders);
+  void logError(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String reason,
+      String hostname,
+      Map<String, String> extraRequestHeaders);
 
-    void logInflight(String messageId, long timestamp, String topicName, String hostname, Map<String, String> extraRequestHeaders);
+  void logInflight(
+      String messageId,
+      long timestamp,
+      String topicName,
+      String hostname,
+      Map<String, String> extraRequestHeaders);
 
-    void close();
+  void close();
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/NoOperationPublishingTracker.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/NoOperationPublishingTracker.java
index 94fa866ded..477d60efc9 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/NoOperationPublishingTracker.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/NoOperationPublishingTracker.java
@@ -1,20 +1,30 @@
 package pl.allegro.tech.hermes.tracker.frontend;
 
-import pl.allegro.tech.hermes.api.TopicName;
-
 import java.util.Map;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public class NoOperationPublishingTracker implements PublishingTracker {
 
-    @Override
-    public void logInflight(String messageId, TopicName topicName, String hostname, Map<String, String> extraRequestHeaders) {
-    }
+  @Override
+  public void logInflight(
+      String messageId,
+      TopicName topicName,
+      String hostname,
+      Map<String, String> extraRequestHeaders) {}
 
-    @Override
-    public void logPublished(String messageId, TopicName topicName, String hostname, Map<String, String> extraRequestHeaders) {
-    }
+  @Override
+  public void logPublished(
+      String messageId,
+      TopicName topicName,
+      String hostname,
+      String storageDatacenter,
+      Map<String, String> extraRequestHeaders) {}
 
-    @Override
-    public void logError(String messageId, TopicName topicName, String reason, String hostname, Map<String, String> extraRequestHeaders) {
-    }
+  @Override
+  public void logError(
+      String messageId,
+      TopicName topicName,
+      String reason,
+      String hostname,
+      Map<String, String> extraRequestHeaders) {}
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/PublishingMessageTracker.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/PublishingMessageTracker.java
index aefbe7ca81..ca8f4652a0 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/PublishingMessageTracker.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/PublishingMessageTracker.java
@@ -1,41 +1,77 @@
 package pl.allegro.tech.hermes.tracker.frontend;
 
-import pl.allegro.tech.hermes.api.TopicName;
-
 import java.time.Clock;
 import java.util.List;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public class PublishingMessageTracker implements PublishingTracker {
 
-    private final List<LogRepository> repositories;
-    private final Clock clock;
+  private final List<LogRepository> repositories;
+  private final Clock clock;
 
-    public PublishingMessageTracker(List<LogRepository> repositories, Clock clock) {
-        this.repositories = repositories;
-        this.clock = clock;
-    }
+  public PublishingMessageTracker(List<LogRepository> repositories, Clock clock) {
+    this.repositories = repositories;
+    this.clock = clock;
+  }
 
-    @Override
-    public void logInflight(String messageId, TopicName topicName, String hostname, Map<String, String> extraRequestHeaders) {
-        repositories.forEach(r -> r.logInflight(messageId, clock.millis(), topicName.qualifiedName(), hostname, extraRequestHeaders));
-    }
+  @Override
+  public void logInflight(
+      String messageId,
+      TopicName topicName,
+      String hostname,
+      Map<String, String> extraRequestHeaders) {
+    repositories.forEach(
+        r ->
+            r.logInflight(
+                messageId,
+                clock.millis(),
+                topicName.qualifiedName(),
+                hostname,
+                extraRequestHeaders));
+  }
 
-    @Override
-    public void logPublished(String messageId, TopicName topicName, String hostname, Map<String, String> extraRequestHeaders) {
-        repositories.forEach(r -> r.logPublished(messageId, clock.millis(), topicName.qualifiedName(), hostname, extraRequestHeaders));
-    }
+  @Override
+  public void logPublished(
+      String messageId,
+      TopicName topicName,
+      String hostname,
+      String storageDatacenter,
+      Map<String, String> extraRequestHeaders) {
+    repositories.forEach(
+        r ->
+            r.logPublished(
+                messageId,
+                clock.millis(),
+                topicName.qualifiedName(),
+                hostname,
+                storageDatacenter,
+                extraRequestHeaders));
+  }
 
-    @Override
-    public void logError(String messageId, TopicName topicName, String reason, String hostname, Map<String, String> extraRequestHeaders) {
-        repositories.forEach(r -> r.logError(messageId, clock.millis(), topicName.qualifiedName(), reason, hostname, extraRequestHeaders));
-    }
+  @Override
+  public void logError(
+      String messageId,
+      TopicName topicName,
+      String reason,
+      String hostname,
+      Map<String, String> extraRequestHeaders) {
+    repositories.forEach(
+        r ->
+            r.logError(
+                messageId,
+                clock.millis(),
+                topicName.qualifiedName(),
+                reason,
+                hostname,
+                extraRequestHeaders));
+  }
 
-    public void add(LogRepository logRepository) {
-        repositories.add(logRepository);
-    }
+  public void add(LogRepository logRepository) {
+    repositories.add(logRepository);
+  }
 
-    public void close() {
-        repositories.forEach(LogRepository::close);
-    }
+  public void close() {
+    repositories.forEach(LogRepository::close);
+  }
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/PublishingTracker.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/PublishingTracker.java
index 039c6f1c9e..3563dbd9dd 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/PublishingTracker.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/PublishingTracker.java
@@ -1,13 +1,26 @@
 package pl.allegro.tech.hermes.tracker.frontend;
 
-import pl.allegro.tech.hermes.api.TopicName;
-
 import java.util.Map;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public interface PublishingTracker {
-    void logInflight(String messageId, TopicName topicName, String hostname, Map<String, String> extraRequestHeaders);
+  void logInflight(
+      String messageId,
+      TopicName topicName,
+      String hostname,
+      Map<String, String> extraRequestHeaders);
 
-    void logPublished(String messageId, TopicName topicName, String hostname, Map<String, String> extraRequestHeaders);
+  void logPublished(
+      String messageId,
+      TopicName topicName,
+      String hostname,
+      String storageDatacenter,
+      Map<String, String> extraRequestHeaders);
 
-    void logError(String messageId, TopicName topicName, String reason, String hostname, Map<String, String> extraRequestHeaders);
+  void logError(
+      String messageId,
+      TopicName topicName,
+      String reason,
+      String hostname,
+      Map<String, String> extraRequestHeaders);
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/Trackers.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/Trackers.java
index 5b5ac34d09..31d2851f1d 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/Trackers.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/frontend/Trackers.java
@@ -1,33 +1,36 @@
 package pl.allegro.tech.hermes.tracker.frontend;
 
-import pl.allegro.tech.hermes.api.Topic;
-
 import java.time.Clock;
 import java.util.List;
+import pl.allegro.tech.hermes.api.Topic;
 
 public class Trackers {
 
-    private final PublishingMessageTracker publishingMessageTracker;
-    private final NoOperationPublishingTracker noOperationPublishingTracker;
-
-    public Trackers(List<LogRepository> logRepositories) {
-        this(new PublishingMessageTracker(logRepositories, Clock.systemUTC()), new NoOperationPublishingTracker());
-    }
-
-    Trackers(PublishingMessageTracker publishingMessageTracker, NoOperationPublishingTracker noOperationPublishingTracker) {
-        this.publishingMessageTracker = publishingMessageTracker;
-        this.noOperationPublishingTracker = noOperationPublishingTracker;
-    }
-
-    public PublishingTracker get(Topic topic) {
-        return topic.isTrackingEnabled() ? publishingMessageTracker : noOperationPublishingTracker;
-    }
-
-    public void add(LogRepository logRepository) {
-        publishingMessageTracker.add(logRepository);
-    }
-
-    public void close() {
-        publishingMessageTracker.close();
-    }
+  private final PublishingMessageTracker publishingMessageTracker;
+  private final NoOperationPublishingTracker noOperationPublishingTracker;
+
+  public Trackers(List<LogRepository> logRepositories) {
+    this(
+        new PublishingMessageTracker(logRepositories, Clock.systemUTC()),
+        new NoOperationPublishingTracker());
+  }
+
+  Trackers(
+      PublishingMessageTracker publishingMessageTracker,
+      NoOperationPublishingTracker noOperationPublishingTracker) {
+    this.publishingMessageTracker = publishingMessageTracker;
+    this.noOperationPublishingTracker = noOperationPublishingTracker;
+  }
+
+  public PublishingTracker get(Topic topic) {
+    return topic.isTrackingEnabled() ? publishingMessageTracker : noOperationPublishingTracker;
+  }
+
+  public void add(LogRepository logRepository) {
+    publishingMessageTracker.add(logRepository);
+  }
+
+  public void close() {
+    publishingMessageTracker.close();
+  }
 }
diff --git a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/management/LogRepository.java b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/management/LogRepository.java
index f3166ab2f8..1c4079ecda 100644
--- a/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/management/LogRepository.java
+++ b/hermes-tracker/src/main/java/pl/allegro/tech/hermes/tracker/management/LogRepository.java
@@ -1,13 +1,14 @@
 package pl.allegro.tech.hermes.tracker.management;
 
+import java.util.List;
 import pl.allegro.tech.hermes.api.MessageTrace;
 import pl.allegro.tech.hermes.api.SentMessageTrace;
 
-import java.util.List;
-
 public interface LogRepository {
 
-    List<SentMessageTrace> getLastUndeliveredMessages(String topicName, String subscriptionName, int limit);
+  List<SentMessageTrace> getLastUndeliveredMessages(
+      String topicName, String subscriptionName, int limit);
 
-    List<MessageTrace> getMessageStatus(String qualifiedTopicName, String subscriptionName, String messageId);
+  List<MessageTrace> getMessageStatus(
+      String qualifiedTopicName, String subscriptionName, String messageId);
 }
diff --git a/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/AbstractLogRepositoryTest.java b/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/AbstractLogRepositoryTest.java
index 8bc4b6fa2d..c266a951c1 100644
--- a/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/AbstractLogRepositoryTest.java
+++ b/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/AbstractLogRepositoryTest.java
@@ -1,107 +1,88 @@
 package pl.allegro.tech.hermes.tracker.consumers;
 
-import org.testng.ITestContext;
-import org.testng.ITestNGMethod;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.SentMessageTraceStatus;
-import pl.allegro.tech.hermes.test.helper.retry.Retry;
-import pl.allegro.tech.hermes.test.helper.retry.RetryListener;
-
 import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.DISCARDED;
 import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.INFLIGHT;
 import static pl.allegro.tech.hermes.api.SentMessageTraceStatus.SUCCESS;
 
-@Listeners({RetryListener.class})
+import org.junit.Before;
+import org.junit.Test;
+import pl.allegro.tech.hermes.api.SentMessageTraceStatus;
+
 public abstract class AbstractLogRepositoryTest {
 
-    private static final String SUBSCRIPTION = "subscription";
-
-    private LogRepository logRepository;
-
-    @BeforeSuite
-    public void setUpRetry(ITestContext context) {
-        for (ITestNGMethod method : context.getAllTestMethods()) {
-            method.setRetryAnalyzerClass(Retry.class);
-        }
-    }
-
-    @BeforeTest
-    public void setUp() throws Exception {
-        logRepository = createLogRepository();
-    }
-
-    protected abstract LogRepository createLogRepository();
-
-    @Test
-    public void shouldLogSentMessage() throws Exception {
-        // given
-        String id = "sentMessage";
-        String topic = "group.sentMessage";
-
-        // when
-        logRepository.logSuccessful(TestMessageMetadata.of(id, topic, SUBSCRIPTION), "host", 1234L);
-
-        // then
-        awaitUntilMessageIsPersisted(topic, SUBSCRIPTION, id, SUCCESS);
-    }
-
-    @Test
-    public void shouldLogInflightMessage() throws Exception {
-        // given
-        String id = "inflightMessage";
-        String topic = "group.inflightMessage";
-
-        // when
-        logRepository.logInflight(TestMessageMetadata.of(id, topic, SUBSCRIPTION), 1234L);
-
-        // then
-        awaitUntilMessageIsPersisted(topic, SUBSCRIPTION, id, INFLIGHT);
-    }
-
-    @Test
-    public void shouldLogUndeliveredMessage() throws Exception {
-        // given
-        String id = "undeliveredMessage";
-        String topic = "group.undeliveredMessage";
-
-        // when
-        logRepository.logDiscarded(TestMessageMetadata.of(id, topic, SUBSCRIPTION), 1234L, "reason");
-
-        // then
-        awaitUntilMessageIsPersisted(topic, SUBSCRIPTION, id, DISCARDED);
-    }
-
-    @Test
-    public void shouldLogBatchIdInSentMessage() throws Exception {
-        // given
-        String messageId = "messageId";
-        String batchId = "batchId";
-        String topic = "group.sentBatchMessage";
-
-        // when
-        logRepository.logSuccessful(TestMessageMetadata.of(messageId, batchId, topic, SUBSCRIPTION), "host", 1234L);
-
-        // then
-        awaitUntilBatchMessageIsPersisted(topic, SUBSCRIPTION, messageId, batchId, SUCCESS);
-    }
-
-    protected abstract void awaitUntilMessageIsPersisted(
-        String topic,
-        String subscription,
-        String id,
-        SentMessageTraceStatus status
-    )
-        throws Exception;
-
-    protected abstract void awaitUntilBatchMessageIsPersisted(
-        String topic,
-        String subscription,
-        String messageId,
-        String batchId,
-        SentMessageTraceStatus status
-    )
-        throws Exception;
+  private static final String SUBSCRIPTION = "subscription";
+
+  private LogRepository logRepository;
+
+  @Before
+  public void setUp() {
+    logRepository = createLogRepository();
+  }
+
+  protected abstract LogRepository createLogRepository();
+
+  @Test
+  public void shouldLogSentMessage() throws Exception {
+    // given
+    String id = "sentMessage";
+    String topic = "group.sentMessage";
+
+    // when
+    logRepository.logSuccessful(TestMessageMetadata.of(id, topic, SUBSCRIPTION), "host", 1234L);
+
+    // then
+    awaitUntilMessageIsPersisted(topic, SUBSCRIPTION, id, SUCCESS);
+  }
+
+  @Test
+  public void shouldLogInflightMessage() throws Exception {
+    // given
+    String id = "inflightMessage";
+    String topic = "group.inflightMessage";
+
+    // when
+    logRepository.logInflight(TestMessageMetadata.of(id, topic, SUBSCRIPTION), 1234L);
+
+    // then
+    awaitUntilMessageIsPersisted(topic, SUBSCRIPTION, id, INFLIGHT);
+  }
+
+  @Test
+  public void shouldLogUndeliveredMessage() throws Exception {
+    // given
+    String id = "undeliveredMessage";
+    String topic = "group.undeliveredMessage";
+
+    // when
+    logRepository.logDiscarded(TestMessageMetadata.of(id, topic, SUBSCRIPTION), 1234L, "reason");
+
+    // then
+    awaitUntilMessageIsPersisted(topic, SUBSCRIPTION, id, DISCARDED);
+  }
+
+  @Test
+  public void shouldLogBatchIdInSentMessage() throws Exception {
+    // given
+    String messageId = "messageId";
+    String batchId = "batchId";
+    String topic = "group.sentBatchMessage";
+
+    // when
+    logRepository.logSuccessful(
+        TestMessageMetadata.of(messageId, batchId, topic, SUBSCRIPTION), "host", 1234L);
+
+    // then
+    awaitUntilBatchMessageIsPersisted(topic, SUBSCRIPTION, messageId, batchId, SUCCESS);
+  }
+
+  protected abstract void awaitUntilMessageIsPersisted(
+      String topic, String subscription, String id, SentMessageTraceStatus status) throws Exception;
+
+  protected abstract void awaitUntilBatchMessageIsPersisted(
+      String topic,
+      String subscription,
+      String messageId,
+      String batchId,
+      SentMessageTraceStatus status)
+      throws Exception;
 }
diff --git a/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/TestMessageMetadata.java b/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/TestMessageMetadata.java
index e4913f3096..fafc491e78 100644
--- a/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/TestMessageMetadata.java
+++ b/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/TestMessageMetadata.java
@@ -2,19 +2,29 @@
 
 public class TestMessageMetadata {
 
-    public static MessageMetadata of(String messageId, String topic, String subscription) {
-        return of(messageId, topic, subscription, 1L, 1);
-    }
+  public static MessageMetadata of(String messageId, String topic, String subscription) {
+    return of(messageId, topic, subscription, 1L, 1);
+  }
 
-    public static MessageMetadata of(String messageId, String topic, String subscription, long offset, int partition) {
-        return new MessageMetadata(messageId, offset, partition, 123L, topic, subscription, topic, 123456L, 123456L);
-    }
+  public static MessageMetadata of(
+      String messageId, String topic, String subscription, long offset, int partition) {
+    return new MessageMetadata(
+        messageId, offset, partition, 123L, topic, subscription, topic, 123456L, 123456L);
+  }
 
-    public static MessageMetadata of(String messageId, String batchId, String topic, String subscription) {
-        return of(messageId, batchId, topic, subscription, 1L, 1);
-    }
+  public static MessageMetadata of(
+      String messageId, String batchId, String topic, String subscription) {
+    return of(messageId, batchId, topic, subscription, 1L, 1);
+  }
 
-    public static MessageMetadata of(String messageId, String batchId, String topic, String subscription, long offset, int partition) {
-        return new MessageMetadata(messageId, batchId, offset, partition, 123L, topic, subscription, topic, 123456L, 123456L);
-    }
+  public static MessageMetadata of(
+      String messageId,
+      String batchId,
+      String topic,
+      String subscription,
+      long offset,
+      int partition) {
+    return new MessageMetadata(
+        messageId, batchId, offset, partition, 123L, topic, subscription, topic, 123456L, 123456L);
+  }
 }
diff --git a/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/TrackersTest.java b/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/TrackersTest.java
index 3d4c79819c..8e8bf30c81 100644
--- a/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/TrackersTest.java
+++ b/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/consumers/TrackersTest.java
@@ -1,38 +1,36 @@
 package pl.allegro.tech.hermes.tracker.consumers;
 
-import org.junit.Test;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.TrackingMode;
-
-import java.util.ArrayList;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static pl.allegro.tech.hermes.api.TrackingMode.TRACKING_OFF;
 import static pl.allegro.tech.hermes.api.TrackingMode.TRACK_ALL;
 import static pl.allegro.tech.hermes.api.TrackingMode.TRACK_DISCARDED_ONLY;
 import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
 
-public class TrackersTest {
-
-    @Test
-    public void shouldDispatchCorrectTracker() {
-        // given
-        Trackers trackers = new Trackers(new ArrayList<>());
-
-        // when
-        SendingTracker trackingOffTracker = trackers.get(subscriptionWithTrackingMode(TRACKING_OFF));
-        SendingTracker trackDiscardedOnlyTracker = trackers.get(subscriptionWithTrackingMode(TRACK_DISCARDED_ONLY));
-        SendingTracker trackAllTracker = trackers.get(subscriptionWithTrackingMode(TRACK_ALL));
+import java.util.ArrayList;
+import org.junit.Test;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.TrackingMode;
 
-        // then
-        assertThat(trackingOffTracker.getClass()).isEqualTo(NoOperationSendingTracker.class);
-        assertThat(trackDiscardedOnlyTracker.getClass()).isEqualTo(DiscardedSendingTracker.class);
-        assertThat(trackAllTracker.getClass()).isEqualTo(SendingMessageTracker.class);
-    }
+public class TrackersTest {
 
-    private static Subscription subscriptionWithTrackingMode(TrackingMode trackingMode) {
-        return subscription("group.topic", "sub")
-                .withTrackingMode(trackingMode)
-                .build();
-    }
-}
\ No newline at end of file
+  @Test
+  public void shouldDispatchCorrectTracker() {
+    // given
+    Trackers trackers = new Trackers(new ArrayList<>());
+
+    // when
+    SendingTracker trackingOffTracker = trackers.get(subscriptionWithTrackingMode(TRACKING_OFF));
+    SendingTracker trackDiscardedOnlyTracker =
+        trackers.get(subscriptionWithTrackingMode(TRACK_DISCARDED_ONLY));
+    SendingTracker trackAllTracker = trackers.get(subscriptionWithTrackingMode(TRACK_ALL));
+
+    // then
+    assertThat(trackingOffTracker.getClass()).isEqualTo(NoOperationSendingTracker.class);
+    assertThat(trackDiscardedOnlyTracker.getClass()).isEqualTo(DiscardedSendingTracker.class);
+    assertThat(trackAllTracker.getClass()).isEqualTo(SendingMessageTracker.class);
+  }
+
+  private static Subscription subscriptionWithTrackingMode(TrackingMode trackingMode) {
+    return subscription("group.topic", "sub").withTrackingMode(trackingMode).build();
+  }
+}
diff --git a/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/frontend/AbstractLogRepositoryTest.java b/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/frontend/AbstractLogRepositoryTest.java
index 1fd9521252..4124863d22 100644
--- a/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/frontend/AbstractLogRepositoryTest.java
+++ b/hermes-tracker/src/test/java/pl/allegro/tech/hermes/tracker/frontend/AbstractLogRepositoryTest.java
@@ -1,103 +1,93 @@
 package pl.allegro.tech.hermes.tracker.frontend;
 
-import com.google.common.collect.ImmutableMap;
-import org.testng.ITestContext;
-import org.testng.ITestNGMethod;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.PublishedMessageTraceStatus;
-import pl.allegro.tech.hermes.test.helper.retry.Retry;
-import pl.allegro.tech.hermes.test.helper.retry.RetryListener;
+import static java.lang.System.currentTimeMillis;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
 
-import static java.lang.System.currentTimeMillis;
-import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.ERROR;
-import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.INFLIGHT;
-import static pl.allegro.tech.hermes.api.PublishedMessageTraceStatus.SUCCESS;
-
-@Listeners({RetryListener.class})
 public abstract class AbstractLogRepositoryTest {
 
-    private LogRepository logRepository;
-
-    @BeforeSuite
-    public void setUpRetry(ITestContext context) {
-        for (ITestNGMethod method : context.getAllTestMethods()) {
-            method.setRetryAnalyzerClass(Retry.class);
-        }
-    }
-
-    @BeforeTest
-    public void setup() {
-        logRepository = createRepository();
-    }
-
-    protected abstract LogRepository createRepository();
-
-    @Test
-    public void shouldLogPublished() throws Exception {
-        // given
-        String id = "publishedMessage";
-        String topic = "group.sentMessage";
-        String hostname = "172.16.254.1";
-        Map<String, String> extraRequestHeaders = ImmutableMap.of("header1", "value1", "header2", "value2");
-
-        // when
-        logRepository.logPublished(id, currentTimeMillis(), topic, hostname, extraRequestHeaders);
-
-        // then
-        awaitUntilMessageIsPersisted(topic, id, hostname, SUCCESS, "header1", "value1", "header2", "value2");
-    }
-
-    @Test
-    public void shouldLogError() throws Exception {
-        // given
-        String id = "errorMessage";
-        String topic = "group.sentMessage";
-        String hostname = "172.16.254.1";
-        Map<String, String> extraRequestHeaders = ImmutableMap.of("header1", "value1", "header2", "value2");
-
-        // when
-        logRepository.logError(id, currentTimeMillis(), topic, "reason", hostname, extraRequestHeaders);
-
-        // then
-        awaitUntilMessageIsPersisted(topic, id, "reason", hostname, ERROR, "header1", "value1", "header2", "value2");
-    }
-
-    @Test
-    public void shouldLogInflight() throws Exception {
-        // given
-        String id = "inflightMessage";
-        String topic = "group.sentMessage";
-        String hostname = "172.16.254.1";
-        Map<String, String> extraRequestHeaders = ImmutableMap.of("header1", "value1", "header2", "value2");
-
-        // when
-        logRepository.logInflight(id, currentTimeMillis(), topic, hostname, extraRequestHeaders);
-
-        // then
-        awaitUntilMessageIsPersisted(topic, id, hostname, INFLIGHT, "header1", "value1", "header2", "value2");
-    }
-
-    protected abstract void awaitUntilMessageIsPersisted(
-        String topic,
-        String id,
-        String remoteHostname,
-        PublishedMessageTraceStatus status,
-        String... extraRequestHeadersKeywords
-    )
-        throws Exception;
-
-    protected abstract void awaitUntilMessageIsPersisted(
-        String topic,
-        String id,
-        String reason,
-        String remoteHostname,
-        PublishedMessageTraceStatus status,
-        String... extraRequestHeadersKeywords
-    )
-        throws Exception;
-}
\ No newline at end of file
+  private LogRepository logRepository;
+
+  @Before
+  public void setup() {
+    logRepository = createRepository();
+  }
+
+  protected abstract LogRepository createRepository();
+
+  @Test
+  public void shouldLogPublished() throws Exception {
+    // given
+    String id = "publishedMessage";
+    String topic = "group.sentMessage";
+    String hostname = "172.16.254.1";
+    String datacenter = "dc1";
+    Map<String, String> extraRequestHeaders =
+        ImmutableMap.of("header1", "value1", "header2", "value2");
+
+    // when
+    logRepository.logPublished(
+        id, currentTimeMillis(), topic, hostname, datacenter, extraRequestHeaders);
+
+    // then
+    awaitUntilSuccessMessageIsPersisted(
+        topic, id, hostname, datacenter, "header1", "value1", "header2", "value2");
+  }
+
+  @Test
+  public void shouldLogError() throws Exception {
+    // given
+    String id = "errorMessage";
+    String topic = "group.sentMessage";
+    String hostname = "172.16.254.1";
+    Map<String, String> extraRequestHeaders =
+        ImmutableMap.of("header1", "value1", "header2", "value2");
+
+    // when
+    logRepository.logError(id, currentTimeMillis(), topic, "reason", hostname, extraRequestHeaders);
+
+    // then
+    awaitUntilErrorMessageIsPersisted(
+        topic, id, "reason", hostname, "header1", "value1", "header2", "value2");
+  }
+
+  @Test
+  public void shouldLogInflight() throws Exception {
+    // given
+    String id = "inflightMessage";
+    String topic = "group.sentMessage";
+    String hostname = "172.16.254.1";
+    Map<String, String> extraRequestHeaders =
+        ImmutableMap.of("header1", "value1", "header2", "value2");
+
+    // when
+    logRepository.logInflight(id, currentTimeMillis(), topic, hostname, extraRequestHeaders);
+
+    // then
+    awaitUntilInflightMessageIsPersisted(
+        topic, id, hostname, "header1", "value1", "header2", "value2");
+  }
+
+  protected abstract void awaitUntilSuccessMessageIsPersisted(
+      String topic,
+      String id,
+      String remoteHostname,
+      String storageDatacenter,
+      String... extraRequestHeadersKeywords)
+      throws Exception;
+
+  protected abstract void awaitUntilInflightMessageIsPersisted(
+      String topic, String id, String remoteHostname, String... extraRequestHeadersKeywords)
+      throws Exception;
+
+  protected abstract void awaitUntilErrorMessageIsPersisted(
+      String topic,
+      String id,
+      String reason,
+      String remoteHostname,
+      String... extraRequestHeadersKeywords)
+      throws Exception;
+}
diff --git a/hermes-tracker/src/test/resources/allure.properties b/hermes-tracker/src/test/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/hermes-tracker/src/test/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
index 4f57b8145f..3635214a1f 100644
--- a/integration-tests/build.gradle
+++ b/integration-tests/build.gradle
@@ -3,6 +3,13 @@ repositories {
     maven { url 'https://repository.jboss.org/nexus/content/groups/public' }
 }
 
+configurations {
+    agent {
+        canBeResolved = true
+        canBeConsumed = true
+    }
+}
+
 dependencies {
     testImplementation project(':hermes-common')
     testImplementation project(':hermes-test-helper')
@@ -14,15 +21,23 @@ dependencies {
     testImplementation group: 'org.testcontainers', name: 'testcontainers', version: versions.testcontainers
     testImplementation group: 'org.testcontainers', name: 'gcloud', version: versions.testcontainers
     testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
-    testImplementation group: 'org.springframework', name: 'spring-webflux', version: '6.0.8'
-    testImplementation group: 'org.springframework', name: 'spring-test', version: '6.0.8'
-    testImplementation group: 'org.eclipse.jetty', name: 'jetty-reactive-httpclient', version: '3.0.4'
+    testImplementation group: 'org.springframework', name: 'spring-webflux', version: versions.spring_web
+    testImplementation group: 'org.springframework', name: 'spring-test', version: versions.spring_web
+    testImplementation group: 'org.eclipse.jetty', name: 'jetty-reactive-httpclient', version: '4.0.3'
     testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.2.0'
-    testImplementation group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.0'
+    testImplementation group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.4'
+    // TODO: can we update it ? Which version of server our clients use ?
     testImplementation(group: 'org.hornetq', name: 'hornetq-jms-server', version: '2.4.1.Final') {
         exclude module: 'hornetq-native'
     }
 
+    // Import allure-bom to ensure correct versions of all the dependencies are used
+    testImplementation(platform("io.qameta.allure:allure-bom:$versions.allure"))
+    // Add necessary Allure dependencies to dependencies section
+    testImplementation("io.qameta.allure:allure-junit5")
+
+    agent "org.aspectj:aspectjweaver:1.9.21"
+
     testImplementation group: 'org.assertj', name: 'assertj-core', version: versions.assertj
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: versions.junit_jupiter
@@ -61,6 +76,8 @@ def registerIntegrationTestTask(String name, SourceSet common) {
             args += "-DconfluentImagesTag=${project.property("confluentImagesTag")}"
         }
 
+        args += "-javaagent:${configurations.agent.singleFile}"
+
         args += chronicleMapJvmArgs
 
         jvmArgs = args
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/EndpointAddressResolverConfiguration.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/EndpointAddressResolverConfiguration.java
index 676759d1bd..b5f92f0cd7 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/EndpointAddressResolverConfiguration.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/EndpointAddressResolverConfiguration.java
@@ -10,10 +10,10 @@
 @Configuration
 public class EndpointAddressResolverConfiguration {
 
-    @Bean
-    @Primary
-    @Profile("integration")
-    public EndpointAddressResolver testMultiUrlEndpointAddressResolver() {
-        return new MultiUrlEndpointAddressResolver();
-    }
+  @Bean
+  @Primary
+  @Profile("integration")
+  public EndpointAddressResolver testMultiUrlEndpointAddressResolver() {
+    return new MultiUrlEndpointAddressResolver();
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/GoogleTransportChannelProviderConfiguration.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/GoogleTransportChannelProviderConfiguration.java
index 52d1e82286..95ae412762 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/GoogleTransportChannelProviderConfiguration.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/GoogleTransportChannelProviderConfiguration.java
@@ -16,13 +16,16 @@
 @EnableConfigurationProperties(GooglePubSubSenderProperties.class)
 public class GoogleTransportChannelProviderConfiguration {
 
-    @Bean
-    @Primary
-    @Profile("integration")
-    public TransportChannelProvider integrationTransportChannelProvider(GooglePubSubSenderProperties googlePubSubSenderProperties) {
-        final ManagedChannel channel = ManagedChannelBuilder.forTarget(
-                        googlePubSubSenderProperties.getTransportChannelProviderAddress())
-                .usePlaintext().build();
-        return FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
-    }
+  @Bean
+  @Primary
+  @Profile("integration")
+  public TransportChannelProvider integrationTransportChannelProvider(
+      GooglePubSubSenderProperties googlePubSubSenderProperties) {
+    final ManagedChannel channel =
+        ManagedChannelBuilder.forTarget(
+                googlePubSubSenderProperties.getTransportChannelProviderAddress())
+            .usePlaintext()
+            .build();
+    return FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/KafkaNamesMapperConfiguration.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/KafkaNamesMapperConfiguration.java
index a526540e13..e4b01f583c 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/KafkaNamesMapperConfiguration.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/consumers/KafkaNamesMapperConfiguration.java
@@ -13,10 +13,11 @@
 @EnableConfigurationProperties(KafkaClustersProperties.class)
 public class KafkaNamesMapperConfiguration {
 
-    @Bean
-    @Primary
-    @Profile("integration")
-    public KafkaNamesMapper testKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
-        return new IntegrationTestKafkaNamesMapperFactory(kafkaClustersProperties.getNamespace()).create();
-    }
+  @Bean
+  @Primary
+  @Profile("integration")
+  public KafkaNamesMapper testKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
+    return new IntegrationTestKafkaNamesMapperFactory(kafkaClustersProperties.getNamespace())
+        .create();
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/env/BrokerOperations.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/env/BrokerOperations.java
new file mode 100644
index 0000000000..6472e23ae1
--- /dev/null
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/env/BrokerOperations.java
@@ -0,0 +1,141 @@
+package pl.allegro.tech.hermes.env;
+
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.stream.Collectors.toMap;
+import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG;
+import static org.apache.kafka.clients.CommonClientConfigs.DEFAULT_SECURITY_PROTOCOL;
+import static org.apache.kafka.clients.CommonClientConfigs.REQUEST_TIMEOUT_MS_CONFIG;
+import static org.apache.kafka.clients.CommonClientConfigs.SECURITY_PROTOCOL_CONFIG;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.ListOffsetsResult;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.admin.OffsetSpec;
+import org.apache.kafka.clients.consumer.OffsetAndMetadata;
+import org.apache.kafka.common.TopicPartition;
+import pl.allegro.tech.hermes.api.SubscriptionName;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.common.kafka.ConsumerGroupId;
+import pl.allegro.tech.hermes.common.kafka.JsonToAvroMigrationKafkaNamesMapper;
+import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
+import pl.allegro.tech.hermes.common.kafka.KafkaTopic;
+import pl.allegro.tech.hermes.common.kafka.KafkaTopicName;
+
+public class BrokerOperations {
+
+  private static final int DEFAULT_PARTITIONS = 2;
+  private static final int DEFAULT_REPLICATION_FACTOR = 1;
+
+  private final AdminClient adminClient;
+
+  private final KafkaNamesMapper kafkaNamesMapper;
+
+  public BrokerOperations(String brokerList, String namespace) {
+    this.adminClient = brokerAdminClient(brokerList);
+    String namespaceSeparator = "_";
+    this.kafkaNamesMapper = new JsonToAvroMigrationKafkaNamesMapper(namespace, namespaceSeparator);
+  }
+
+  public List<ConsumerGroupOffset> getTopicPartitionsOffsets(SubscriptionName subscriptionName) {
+    ConsumerGroupId consumerGroupId = kafkaNamesMapper.toConsumerGroupId(subscriptionName);
+
+    Map<TopicPartition, OffsetAndMetadata> currentOffsets = getTopicCurrentOffsets(consumerGroupId);
+    Map<TopicPartition, ListOffsetsResult.ListOffsetsResultInfo> endOffsets =
+        getEndOffsets(new ArrayList<>(currentOffsets.keySet()));
+    return currentOffsets.keySet().stream()
+        .map(
+            partition ->
+                new ConsumerGroupOffset(
+                    currentOffsets.get(partition).offset(), endOffsets.get(partition).offset()))
+        .collect(Collectors.toList());
+  }
+
+  private Map<TopicPartition, OffsetAndMetadata> getTopicCurrentOffsets(
+      ConsumerGroupId consumerGroupId) {
+    try {
+      return adminClient
+          .listConsumerGroupOffsets(consumerGroupId.asString())
+          .partitionsToOffsetAndMetadata()
+          .get();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private Map<TopicPartition, ListOffsetsResult.ListOffsetsResultInfo> getEndOffsets(
+      List<TopicPartition> partitions) {
+    try {
+      ListOffsetsResult listOffsetsResult =
+          adminClient.listOffsets(
+              partitions.stream().collect(toMap(Function.identity(), p -> OffsetSpec.latest())));
+      return listOffsetsResult.all().get();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public void createTopic(String topicName) {
+    Topic topic = topic(topicName).build();
+    kafkaNamesMapper.toKafkaTopics(topic).forEach(kafkaTopic -> createTopic(kafkaTopic.name()));
+  }
+
+  private void createTopic(KafkaTopicName topicName) {
+    try {
+      NewTopic topic =
+          new NewTopic(
+              topicName.asString(), DEFAULT_PARTITIONS, (short) DEFAULT_REPLICATION_FACTOR);
+      adminClient.createTopics(singletonList(topic)).all().get(1, MINUTES);
+    } catch (ExecutionException | TimeoutException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public boolean topicExists(String topicName) {
+    Topic topic = topic(topicName).build();
+    return kafkaNamesMapper.toKafkaTopics(topic).allMatch(this::topicExists);
+  }
+
+  private boolean topicExists(KafkaTopic kafkaTopic) {
+    try {
+      return adminClient
+          .listTopics()
+          .names()
+          .get(1, MINUTES)
+          .contains(kafkaTopic.name().asString());
+    } catch (ExecutionException | TimeoutException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private AdminClient brokerAdminClient(String brokerList) {
+    Properties props = new Properties();
+    props.put(BOOTSTRAP_SERVERS_CONFIG, brokerList);
+    props.put(SECURITY_PROTOCOL_CONFIG, DEFAULT_SECURITY_PROTOCOL);
+    props.put(REQUEST_TIMEOUT_MS_CONFIG, 10000);
+    return AdminClient.create(props);
+  }
+
+  public static class ConsumerGroupOffset {
+    private final long currentOffset;
+    private final long endOffset;
+
+    ConsumerGroupOffset(long currentOffset, long endOffset) {
+      this.currentOffset = currentOffset;
+      this.endOffset = endOffset;
+    }
+
+    public boolean movedToEnd() {
+      return currentOffset == endOffset;
+    }
+  }
+}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/env/IntegrationTestKafkaNamesMapperFactory.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/env/IntegrationTestKafkaNamesMapperFactory.java
index cc431fd4ee..157a2e6fa2 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/env/IntegrationTestKafkaNamesMapperFactory.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/env/IntegrationTestKafkaNamesMapperFactory.java
@@ -5,13 +5,13 @@
 
 public class IntegrationTestKafkaNamesMapperFactory {
 
-    private final String namespace;
+  private final String namespace;
 
-    public IntegrationTestKafkaNamesMapperFactory(String namespace) {
-        this.namespace = namespace;
-    }
+  public IntegrationTestKafkaNamesMapperFactory(String namespace) {
+    this.namespace = namespace;
+  }
 
-    public KafkaNamesMapper create() {
-        return new JsonToAvroMigrationKafkaNamesMapper(namespace, "_");
-    }
+  public KafkaNamesMapper create() {
+    return new JsonToAvroMigrationKafkaNamesMapper(namespace, "_");
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/AuthConfiguration.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/AuthConfiguration.java
new file mode 100644
index 0000000000..b6608d069e
--- /dev/null
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/AuthConfiguration.java
@@ -0,0 +1,38 @@
+package pl.allegro.tech.hermes.frontend;
+
+import com.google.common.collect.Lists;
+import io.undertow.security.impl.BasicAuthenticationMechanism;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import pl.allegro.tech.hermes.frontend.server.auth.AuthenticationConfiguration;
+
+@Configuration
+public class AuthConfiguration {
+
+  @Value("${auth.username}")
+  private String username;
+
+  @Value("${auth.password}")
+  private String password;
+
+  @Bean
+  @Profile("authRequired")
+  public AuthenticationConfiguration requiredAuthenticationConfiguration() {
+    return getAuthConfig(true);
+  }
+
+  @Bean
+  @Profile("authNonRequired")
+  public AuthenticationConfiguration notRequiredAuthenticationConfiguration() {
+    return getAuthConfig(false);
+  }
+
+  private AuthenticationConfiguration getAuthConfig(boolean isAuthenticationRequired) {
+    return new AuthenticationConfiguration(
+        exchange -> isAuthenticationRequired,
+        Lists.newArrayList(new BasicAuthenticationMechanism("basicAuthRealm")),
+        new SingleUserAwareIdentityManager(username, password));
+  }
+}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/FrontendConfigurationProperties.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/FrontendConfigurationProperties.java
index f37f129891..14f9c1177b 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/FrontendConfigurationProperties.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/FrontendConfigurationProperties.java
@@ -1,39 +1,50 @@
 package pl.allegro.tech.hermes.frontend;
 
 public class FrontendConfigurationProperties {
-        public static String SPRING_PROFILES_ACTIVE = "spring.profiles.active";
-        public static String MESSAGES_LOCAL_STORAGE_DIRECTORY = "frontend.messages.local.storage.directory";
-        public static String MESSAGES_LOCAL_STORAGE_ENABLED = "frontend.messages.local.storage.enabled";
-        public static String FRONTEND_THROUGHPUT_TYPE = "frontend.throughput.type";
-        public static String FRONTEND_THROUGHPUT_FIXED_MAX = "frontend.throughput.fixedMax";
-        public static String FRONTEND_MESSAGE_PREVIEW_ENABLED = "frontend.message.preview.enabled";
-        public static String FRONTEND_MESSAGE_PREVIEW_LOG_PERSIST_PERIOD = "frontend.message.preview.logPersistPeriod";
-        public static String FRONTEND_READINESS_CHECK_ENABLED = "frontend.readiness.check.enabled";
-        public static String FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED = "frontend.readiness.check.kafkaCheckEnabled";
-        public static String FRONTEND_READINESS_CHECK_INTERVAL_SECONDS = "frontend.readiness.check.interval";
-        public static String FRONTEND_AUTHENTICATION_MODE = "frontend.handlers.authentication.mode";
-        public static String FRONTEND_AUTHENTICATION_ENABLED = "frontend.handlers.authentication.enabled";
-        public static String FRONTEND_KEEP_ALIVE_HEADER_ENABLED = "frontend.handlers.keepAliveHeader.enabled";
-        public static String FRONTEND_KEEP_ALIVE_HEADER_TIMEOUT = "frontend.handlers.keepAliveHeader.timeout";
-        public static String FRONTEND_IDLE_TIMEOUT = "frontend.handlers.idleTimeout";
-        public static String METRICS_ZOOKEEPER_REPORTER_ENABLED = "frontend.metrics.zookeeperReporterEnabled";
-        public static String METRICS_GRAPHITE_REPORTER_ENABLED = "frontend.metrics.graphiteReporterEnabled";
-        public static String METRICS_MICROMETER_REPORT_PERIOD = "frontend.metrics.micrometer.reportPeriod";
-        public static String GRAPHITE_PORT = "frontend.graphite.port";
-        public static String SCHEMA_CACHE_ENABLED = "frontend.schema.cache.enabled";
-        public static String SCHEMA_REPOSITORY_SERVER_URL = "frontend.schema.repository.serverUrl";
-        public static String FRONTEND_SSL_ENABLED = "frontend.ssl.enabled";
-        public static String FRONTEND_SSL_PORT = "frontend.ssl.port";
-        public static String FRONTEND_SSL_KEYSTORE_SOURCE = "frontend.ssl.keystoreSource";
-        public static String FRONTEND_SSL_TRUSTSTORE_SOURCE = "frontend.ssl.truststoreSource";
-        public static String FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE = "frontend.handlers.forceTopicMaxMessageSize";
-        public static String FRONTEND_HTTP2_ENABLED = "frontend.server.http2Enabled";
-        public static String FRONTEND_GRACEFUL_SHUTDOWN_ENABLED = "frontend.server.gracefulShutdownEnabled";
-        public static String FRONTEND_PORT = "frontend.server.port";
-        public static String ZOOKEEPER_CONNECTION_STRING = "frontend.zookeeper.clusters.[0].connectionString";
-        public static String KAFKA_PRODUCER_METADATA_MAX_AGE = "frontend.kafka.producer.metadataMaxAge";
-        public static String KAFKA_BROKER_LIST = "frontend.kafka.clusters.[0].brokerList";
-        public static String KAFKA_NAMESPACE = "frontend.kafka.namespace";
-        public static String FRONTEND_HEADER_PROPAGATION_ENABLED = "frontend.header.propagation.enabled";
-        public static String FRONTEND_HEADER_PROPAGATION_ALLOWED = "frontend.header.propagation.allowFilter";
+  public static String SPRING_PROFILES_ACTIVE = "spring.profiles.active";
+  public static String AUTH_USERNAME = "auth.username";
+  public static String AUTH_PASSWORD = "auth.password";
+  public static String MESSAGES_LOCAL_STORAGE_DIRECTORY =
+      "frontend.messages.local.storage.directory";
+  public static String MESSAGES_LOCAL_STORAGE_ENABLED = "frontend.messages.local.storage.enabled";
+  public static String FRONTEND_THROUGHPUT_TYPE = "frontend.throughput.type";
+  public static String FRONTEND_THROUGHPUT_FIXED_MAX = "frontend.throughput.fixedMax";
+  public static String FRONTEND_MESSAGE_PREVIEW_ENABLED = "frontend.message.preview.enabled";
+  public static String FRONTEND_MESSAGE_PREVIEW_LOG_PERSIST_PERIOD =
+      "frontend.message.preview.logPersistPeriod";
+  public static String FRONTEND_READINESS_CHECK_ENABLED = "frontend.readiness.check.enabled";
+  public static String FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED =
+      "frontend.readiness.check.kafkaCheckEnabled";
+  public static String FRONTEND_READINESS_CHECK_INTERVAL_SECONDS =
+      "frontend.readiness.check.interval";
+  public static String FRONTEND_AUTHENTICATION_MODE = "frontend.handlers.authentication.mode";
+  public static String FRONTEND_AUTHENTICATION_ENABLED = "frontend.handlers.authentication.enabled";
+  public static String FRONTEND_KEEP_ALIVE_HEADER_ENABLED =
+      "frontend.handlers.keepAliveHeader.enabled";
+  public static String FRONTEND_KEEP_ALIVE_HEADER_TIMEOUT =
+      "frontend.handlers.keepAliveHeader.timeout";
+  public static String FRONTEND_IDLE_TIMEOUT = "frontend.handlers.idleTimeout";
+  public static String METRICS_MICROMETER_REPORT_PERIOD =
+      "frontend.metrics.micrometer.reportPeriod";
+  public static String SCHEMA_CACHE_ENABLED = "frontend.schema.cache.enabled";
+  public static String SCHEMA_REPOSITORY_SERVER_URL = "frontend.schema.repository.serverUrl";
+  public static String FRONTEND_SSL_ENABLED = "frontend.ssl.enabled";
+  public static String FRONTEND_SSL_PORT = "frontend.ssl.port";
+  public static String FRONTEND_SSL_KEYSTORE_SOURCE = "frontend.ssl.keystoreSource";
+  public static String FRONTEND_SSL_TRUSTSTORE_SOURCE = "frontend.ssl.truststoreSource";
+  public static String FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE =
+      "frontend.handlers.forceTopicMaxMessageSize";
+  public static String FRONTEND_HTTP2_ENABLED = "frontend.server.http2Enabled";
+  public static String FRONTEND_GRACEFUL_SHUTDOWN_ENABLED =
+      "frontend.server.gracefulShutdownEnabled";
+  public static String FRONTEND_PORT = "frontend.server.port";
+  public static String ZOOKEEPER_CONNECTION_STRING =
+      "frontend.zookeeper.clusters.[0].connectionString";
+  public static String KAFKA_PRODUCER_METADATA_MAX_AGE = "frontend.kafka.producer.metadataMaxAge";
+  public static String KAFKA_BROKER_LIST = "frontend.kafka.clusters.[0].brokerList";
+  public static String KAFKA_NAMESPACE = "frontend.kafka.namespace";
+  public static String FRONTEND_HEADER_PROPAGATION_ENABLED =
+      "frontend.http.headers.propagationEnabled";
+  public static String FRONTEND_HEADER_PROPAGATION_ALLOWED = "frontend.http.headers.allowedSet";
+  public static String BROKER_LATENCY_REPORTER_ENABLED = "frontend.brokerLatencyReporter.enabled";
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/KafkaNamesMapperConfiguration.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/KafkaNamesMapperConfiguration.java
index 822cbe6c67..344040b180 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/KafkaNamesMapperConfiguration.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/KafkaNamesMapperConfiguration.java
@@ -13,10 +13,11 @@
 @EnableConfigurationProperties(KafkaClustersProperties.class)
 public class KafkaNamesMapperConfiguration {
 
-    @Bean
-    @Primary
-    @Profile("integration")
-    public KafkaNamesMapper testKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
-        return new IntegrationTestKafkaNamesMapperFactory(kafkaClustersProperties.getNamespace()).create();
-    }
+  @Bean
+  @Primary
+  @Profile("integration")
+  public KafkaNamesMapper testKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
+    return new IntegrationTestKafkaNamesMapperFactory(kafkaClustersProperties.getNamespace())
+        .create();
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/SingleUserAwareIdentityManager.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/SingleUserAwareIdentityManager.java
new file mode 100644
index 0000000000..608785cd8b
--- /dev/null
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/frontend/SingleUserAwareIdentityManager.java
@@ -0,0 +1,67 @@
+package pl.allegro.tech.hermes.frontend;
+
+import io.undertow.security.idm.Account;
+import io.undertow.security.idm.Credential;
+import io.undertow.security.idm.IdentityManager;
+import io.undertow.security.idm.PasswordCredential;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Set;
+import pl.allegro.tech.hermes.frontend.server.auth.Roles;
+
+public class SingleUserAwareIdentityManager implements IdentityManager {
+
+  private final String username;
+  private final String password;
+
+  public SingleUserAwareIdentityManager(String username, String password) {
+    this.username = username;
+    this.password = password;
+  }
+
+  @Override
+  public Account verify(Account account) {
+    return null;
+  }
+
+  @Override
+  public Account verify(String username, Credential credential) {
+    String password = new String(((PasswordCredential) credential).getPassword());
+    if (this.username.equals(username) && this.password.equals(password)) {
+      return new SomeUserAccount(username);
+    }
+    return null;
+  }
+
+  @Override
+  public Account verify(Credential credential) {
+    return null;
+  }
+
+  private static final class SomeUserAccount implements Account {
+
+    private final Principal principal;
+
+    private SomeUserAccount(String username) {
+      this.principal = new SomeUserPrincipal(username);
+    }
+
+    @Override
+    public Principal getPrincipal() {
+      return principal;
+    }
+
+    @Override
+    public Set<String> getRoles() {
+      return Collections.singleton(Roles.PUBLISHER);
+    }
+  }
+
+  private record SomeUserPrincipal(String username) implements Principal {
+
+    @Override
+    public String getName() {
+      return username;
+    }
+  }
+}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/GooglePubSubAssertion.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/GooglePubSubAssertion.java
index 76783fc483..c494213ea2 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/GooglePubSubAssertion.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/GooglePubSubAssertion.java
@@ -1,23 +1,23 @@
 package pl.allegro.tech.hermes.integrationtests.assertions;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.google.pubsub.v1.PubsubMessage;
 import org.assertj.core.api.AbstractAssert;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class GooglePubSubAssertion extends AbstractAssert<GooglePubSubAssertion, PubsubMessage> {
 
-    GooglePubSubAssertion(PubsubMessage actual) {
-        super(actual, GooglePubSubAssertion.class);
-    }
+  GooglePubSubAssertion(PubsubMessage actual) {
+    super(actual, GooglePubSubAssertion.class);
+  }
 
-    public GooglePubSubAssertion hasAttribute(String name) {
-        assertThat(actual.getAttributesMap()).containsKey(name);
-        return this;
-    }
+  public GooglePubSubAssertion hasAttribute(String name) {
+    assertThat(actual.getAttributesMap()).containsKey(name);
+    return this;
+  }
 
-    public GooglePubSubAssertion hasBody(String body) {
-        assertThat(actual.getData().toStringUtf8()).isEqualTo(body);
-        return this;
-    }
+  public GooglePubSubAssertion hasBody(String body) {
+    assertThat(actual.getData().toStringUtf8()).isEqualTo(body);
+    return this;
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/HermesAssertions.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/HermesAssertions.java
index 53f03e3eab..a60cfdd0ef 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/HermesAssertions.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/HermesAssertions.java
@@ -7,23 +7,21 @@
 
 public final class HermesAssertions extends Assertions {
 
-    private HermesAssertions() {
-    }
+  private HermesAssertions() {}
 
-    public static HttpResponseAssertion assertThat(Response response) {
-        return new HttpResponseAssertion(response);
-    }
+  public static HttpResponseAssertion assertThat(Response response) {
+    return new HttpResponseAssertion(response);
+  }
 
+  public static WiremockRequestAssertion assertThat(LoggedRequest request) {
+    return new WiremockRequestAssertion(request);
+  }
 
-    public static WiremockRequestAssertion assertThat(LoggedRequest request) {
-        return new WiremockRequestAssertion(request);
-    }
+  public static PrometheusMetricsAssertion assertThatMetrics(String body) {
+    return new PrometheusMetricsAssertion(body);
+  }
 
-    public static PrometheusMetricsAssertion assertThatMetrics(String body) {
-        return new PrometheusMetricsAssertion(body);
-    }
-
-    public static GooglePubSubAssertion assertThat(PubsubMessage message) {
-        return new GooglePubSubAssertion(message);
-    }
+  public static GooglePubSubAssertion assertThat(PubsubMessage message) {
+    return new GooglePubSubAssertion(message);
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/HttpResponseAssertion.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/HttpResponseAssertion.java
index 2cdc41fb6c..9bba9f88dc 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/HttpResponseAssertion.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/HttpResponseAssertion.java
@@ -1,45 +1,18 @@
 package pl.allegro.tech.hermes.integrationtests.assertions;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import jakarta.ws.rs.core.Response;
 import org.assertj.core.api.AbstractAssert;
-import pl.allegro.tech.hermes.api.ErrorCode;
-import pl.allegro.tech.hermes.api.ErrorDescription;
-
-import java.util.Arrays;
-
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class HttpResponseAssertion extends AbstractAssert<HttpResponseAssertion, Response> {
 
-    HttpResponseAssertion(Response actual) {
-        super(actual, HttpResponseAssertion.class);
-    }
-
-    public HttpResponseAssertion hasStatus(Response.Status status) {
-        assertThat(actual.getStatus()).isEqualTo(status.getStatusCode());
-        return this;
-    }
-
-    public HttpResponseAssertion hasStatusFamily(Response.Status.Family statusFamily) {
-        assertThat(actual.getStatusInfo().getFamily()).isEqualTo(statusFamily);
-        return this;
-    }
-
-    public HttpResponseAssertion hasErrorCode(ErrorCode errorCode) {
-        ErrorDescription error = actual.readEntity(ErrorDescription.class);
-        assertThat(error).isNotNull();
-        assertThat(error.getCode()).isEqualTo(errorCode);
-        return this;
-    }
-
-    public HttpResponseAssertion containsMessage(String msg) {
-        assertThat(actual.readEntity(String.class)).contains(msg);
-        return this;
-    }
+  HttpResponseAssertion(Response actual) {
+    super(actual, HttpResponseAssertion.class);
+  }
 
-    public HttpResponseAssertion containsMessages(String... messages) {
-        String responseBody = actual.readEntity(String.class);
-        assertThat(Arrays.stream(messages).allMatch(responseBody::contains)).isTrue();
-        return this;
-    }
+  public HttpResponseAssertion hasStatus(Response.Status status) {
+    assertThat(actual.getStatus()).isEqualTo(status.getStatusCode());
+    return this;
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/PrometheusMetricsAssertion.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/PrometheusMetricsAssertion.java
index ef2273feac..daec625d66 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/PrometheusMetricsAssertion.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/PrometheusMetricsAssertion.java
@@ -1,97 +1,122 @@
 package pl.allegro.tech.hermes.integrationtests.assertions;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class PrometheusMetricsAssertion {
 
-    private static final Pattern METRIC_LINE_PATTERN = Pattern.compile("^[a-z_]+\\{(.*)\\} (\\d+\\.\\d+)$");
+  private static final Pattern METRIC_LINE_PATTERN =
+      Pattern.compile("^[a-z_]+\\{(.*)\\} (\\d+\\.\\d+)$");
+
+  private final String actualBody;
 
-    private final String actualBody;
+  PrometheusMetricsAssertion(String actualBody) {
+    this.actualBody = actualBody;
+  }
 
-    PrometheusMetricsAssertion(String actualBody) {
-        this.actualBody = actualBody;
+  public PrometheusMetricWithNameAssertion contains(String metricName) {
+    List<String> matchedLines =
+        actualBody.lines().filter(line -> line.startsWith(metricName + "{")).toList();
+    assertThat(matchedLines).overridingErrorMessage("Metric %s doesn't exist").isNotEmpty();
+    return new PrometheusMetricWithNameAssertion(matchedLines);
+  }
+
+  public static class PrometheusMetricWithNameAssertion {
+
+    private final List<String> actualMetrics;
+
+    PrometheusMetricWithNameAssertion(List<String> actualMetrics) {
+      this.actualMetrics = actualMetrics;
     }
 
-    public PrometheusMetricWithNameAssertion contains(String metricName) {
-        List<String> matchedLines = actualBody.lines()
-                .filter(line -> line.startsWith(metricName + "{"))
-                .toList();
-        assertThat(matchedLines).overridingErrorMessage("Metric %s doesn't exist").isNotEmpty();
-        return new PrometheusMetricWithNameAssertion(matchedLines);
+    public PrometheusMetricAssertion withLabels(
+        String label0, String value0, String label1, String value1) {
+      return withLabels(new String[] {label0, label1}, new String[] {value0, value1});
     }
 
-    public static class PrometheusMetricWithNameAssertion {
-
-        private final List<String> actualMetrics;
-
-        PrometheusMetricWithNameAssertion(List<String> actualMetrics) {
-            this.actualMetrics = actualMetrics;
-        }
-
-        public PrometheusMetricAssertion withLabels(String label0, String value0,
-                                                            String label1, String value1,
-                                                            String label2, String value2) {
-            return withLabels(
-                    new String[]{label0, label1, label2},
-                    new String[]{value0, value1, value2}
-            );
-        }
-
-        public PrometheusMetricAssertion withLabels(String label0, String value0,
-                                                            String label1, String value1,
-                                                            String label2, String value2,
-                                                            String label3, String value3) {
-            return withLabels(
-                    new String[]{label0, label1, label2, label3},
-                    new String[]{value0, value1, value2, value3}
-            );
-        }
-
-        private PrometheusMetricAssertion withLabels(String[] names, String[] values) {
-            List<String> matchedLines = actualMetrics.stream()
-                    .filter(line -> {
-                        Matcher matcher = METRIC_LINE_PATTERN.matcher(line);
-                        String labels;
-                        if (matcher.matches()) {
-                            labels = matcher.group(1);
-                        } else {
-                            throw new IllegalStateException("Unexpected line: " + line);
-                        }
-                        for (int i = 0; i < names.length; i++) {
-                            if (!labels.contains(names[i] + "=\"" + values[i] + "\"")) {
-                                return false;
-                            }
-                        }
-                        return true;
-                    })
-                    .toList();
-            assertThat(matchedLines).overridingErrorMessage("There is no metric with provided labels").isNotEmpty();
-            assertThat(matchedLines).overridingErrorMessage("Found more than one metric with provided labels").hasSize(1);
-            return new PrometheusMetricAssertion(matchedLines.get(0));
-        }
+    public PrometheusMetricAssertion withLabels(
+        String label0, String value0, String label1, String value1, String label2, String value2) {
+      return withLabels(
+          new String[] {label0, label1, label2}, new String[] {value0, value1, value2});
     }
 
-    public static class PrometheusMetricAssertion {
+    public PrometheusMetricAssertion withLabels(
+        String label0,
+        String value0,
+        String label1,
+        String value1,
+        String label2,
+        String value2,
+        String label3,
+        String value3) {
+      return withLabels(
+          new String[] {label0, label1, label2, label3},
+          new String[] {value0, value1, value2, value3});
+    }
 
-        private final String actualLine;
+    private PrometheusMetricAssertion withLabels(String[] names, String[] values) {
+      List<String> matchedLines =
+          actualMetrics.stream()
+              .filter(
+                  line -> {
+                    Matcher matcher = METRIC_LINE_PATTERN.matcher(line);
+                    String labels;
+                    if (matcher.matches()) {
+                      labels = matcher.group(1);
+                    } else {
+                      throw new IllegalStateException("Unexpected line: " + line);
+                    }
+                    for (int i = 0; i < names.length; i++) {
+                      if (!labels.contains(names[i] + "=\"" + values[i] + "\"")) {
+                        return false;
+                      }
+                    }
+                    return true;
+                  })
+              .toList();
+      assertThat(matchedLines)
+          .overridingErrorMessage("There is no metric with provided labels")
+          .isNotEmpty();
+      assertThat(matchedLines)
+          .overridingErrorMessage("Found more than one metric with provided labels")
+          .hasSize(1);
+      return new PrometheusMetricAssertion(matchedLines.get(0));
+    }
+  }
 
-        PrometheusMetricAssertion(String actualLine) {
-            this.actualLine = actualLine;
-        }
+  public static class PrometheusMetricAssertion {
+
+    private final String actualLine;
+
+    PrometheusMetricAssertion(String actualLine) {
+      this.actualLine = actualLine;
+    }
+
+    public void withValue(double expectedValue) {
+      double actualValue = extractValue();
+      assertThat(actualValue).isEqualTo(expectedValue);
+    }
+
+    public double withInitialValue() {
+      return extractValue();
+    }
+
+    public void withValueGreaterThan(double expectedValue) {
+      double actualValue = extractValue();
+      assertThat(actualValue).isGreaterThan(expectedValue);
+    }
 
-        public void withValue(double expectedValue) {
-            Matcher matcher = METRIC_LINE_PATTERN.matcher(actualLine);
-            if (matcher.matches()) {
-                String valueStr = matcher.group(2);
-                double actualValue = Double.parseDouble(valueStr);
-                assertThat(actualValue).isEqualTo(expectedValue);
-            } else {
-                throw new IllegalStateException("Unexpected line: " + actualLine);
-            }
-        }
+    private double extractValue() {
+      Matcher matcher = METRIC_LINE_PATTERN.matcher(actualLine);
+      if (matcher.matches()) {
+        String valueStr = matcher.group(2);
+        return Double.parseDouble(valueStr);
+      } else {
+        throw new IllegalStateException("Unexpected line: " + actualLine);
+      }
     }
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/WiremockRequestAssertion.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/WiremockRequestAssertion.java
index 7a34cd3bfb..c6cc0e87eb 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/WiremockRequestAssertion.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/assertions/WiremockRequestAssertion.java
@@ -1,27 +1,25 @@
 package pl.allegro.tech.hermes.integrationtests.assertions;
 
-import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-import org.assertj.core.api.AbstractAssert;
+import static org.assertj.core.api.Assertions.assertThat;
 
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import java.util.Map;
+import org.assertj.core.api.AbstractAssert;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class WiremockRequestAssertion extends AbstractAssert<WiremockRequestAssertion, LoggedRequest> {
+public class WiremockRequestAssertion
+    extends AbstractAssert<WiremockRequestAssertion, LoggedRequest> {
 
-    protected WiremockRequestAssertion(LoggedRequest actual) {
-        super(actual, WiremockRequestAssertion.class);
-    }
+  protected WiremockRequestAssertion(LoggedRequest actual) {
+    super(actual, WiremockRequestAssertion.class);
+  }
 
-    public WiremockRequestAssertion hasHeaderValue(String header, String value) {
-        assertThat(actual.getHeader(header)).isEqualTo(value);
-        return this;
-    }
+  public WiremockRequestAssertion hasHeaderValue(String header, String value) {
+    assertThat(actual.getHeader(header)).isEqualTo(value);
+    return this;
+  }
 
-    public WiremockRequestAssertion containsAllHeaders(Map<String, String> headers) {
-        headers.forEach((header, value) -> {
-            assertThat(actual.getHeader(header)).isEqualTo(value);
-        });
-        return this;
-    }
+  public WiremockRequestAssertion containsAllHeaders(Map<String, String> headers) {
+    headers.forEach((header, value) -> assertThat(actual.getHeader(header)).isEqualTo(value));
+    return this;
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/ConsumerTestClient.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/ConsumerTestClient.java
deleted file mode 100644
index 8bd61361c3..0000000000
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/ConsumerTestClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package pl.allegro.tech.hermes.integrationtests.client;
-
-import jakarta.ws.rs.core.UriBuilder;
-import org.springframework.test.web.reactive.server.WebTestClient;
-
-class ConsumerTestClient {
-
-    private static final String STATUS_SUBSCRIPTIONS = "/status/subscriptions";
-
-    private static final String METRICS_PATH = "/status/prometheus";
-
-    private final WebTestClient webTestClient;
-    private final String consumerContainerUrl;
-
-    public ConsumerTestClient(int consumerPort) {
-        this.consumerContainerUrl = "http://localhost:" + consumerPort;
-        this.webTestClient = WebTestClient
-                .bindToServer()
-                .baseUrl(consumerContainerUrl)
-                .build();
-    }
-
-    public WebTestClient.ResponseSpec getRunningSubscriptionsStatus() {
-        return webTestClient.get().uri(UriBuilder.fromUri(consumerContainerUrl)
-                        .path(STATUS_SUBSCRIPTIONS)
-                        .build())
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getMetrics() {
-        return webTestClient.get().uri(UriBuilder.fromUri(consumerContainerUrl)
-                        .path(METRICS_PATH)
-                        .build())
-                .exchange();
-    }
-}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/FrontendSlowClient.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/FrontendSlowClient.java
deleted file mode 100644
index 671c04af8d..0000000000
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/FrontendSlowClient.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package pl.allegro.tech.hermes.integrationtests.client;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class FrontendSlowClient {
-
-    public static final String MSG_BODY = "{\"field\": \"value\"}";
-
-    public String msgHeadWithContentLenght(String topicName) {
-        return "POST /topics/" + topicName + " HTTP/1.1\n"
-                + "Host: " + host + ":" + port + "\n"
-                + "Content-Type: application/json\n"
-                + "Content-Length: " + MSG_BODY.length() + "\r\n\r\n";
-    }
-
-    private String msgHeadWithChunkedEncoding(String topicName) {
-        return "POST /topics/" + topicName + " HTTP/1.1\n"
-                + "Host: " + host + ":" + port + "\n"
-                + "Content-Type: application/json\n"
-                + "Transfer-Encoding: chunked \r\n\r\n";
-    }
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(FrontendSlowClient.class);
-
-    private final String host;
-    private final int port;
-
-    public FrontendSlowClient(String host, int port) {
-        this.host = host;
-        this.port = port;
-    }
-
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
-
-    public String slowEvent(int clientTimeout, int pauseTimeBetweenChunks, int delayBeforeSendingFirstData, String topicName)
-            throws IOException, InterruptedException {
-        return slowEvent(clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topicName, false);
-    }
-
-    public String slowEvent(int clientTimeout, int pauseTimeBetweenChunks, int delayBeforeSendingFirstData,
-                            String topicName, boolean chunkedEncoding)
-            throws IOException, InterruptedException {
-
-        Socket clientSocket = new Socket(host, port);
-
-        Thread.sleep(delayBeforeSendingFirstData);
-
-        DataOutputStream outToServer = new DataOutputStream(clientSocket.getOutputStream());
-        BufferedReader inFromServer = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
-
-        clientSocket.setSoTimeout(clientTimeout);
-
-        if (chunkedEncoding) {
-            outToServer.writeBytes(msgHeadWithChunkedEncoding(topicName));
-            outToServer.flush();
-        } else {
-            outToServer.writeBytes(msgHeadWithContentLenght(topicName));
-            outToServer.flush();
-        }
-        sendBodyInChunks(outToServer, MSG_BODY, pauseTimeBetweenChunks, chunkedEncoding);
-
-        String response;
-        try {
-            response = readResponse(inFromServer);
-            LOGGER.info("Response: {}", response);
-        } catch (SocketTimeoutException e) {
-            LOGGER.warn("client timeout");
-            clientSocket.close();
-            throw e;
-        }
-
-        clientSocket.close();
-
-        return response;
-    }
-
-    private void sendBodyInChunks(DataOutputStream outToServer, String msgBody, int pauseTime, boolean encoded) {
-        executor.execute(() -> {
-            try {
-                for (int index = 0; index < msgBody.length(); index++) {
-                    outToServer.writeBytes(prepareChunk(msgBody, index, encoded));
-                    outToServer.flush();
-                    LOGGER.info("Sent chunk");
-                    if (pauseTime > 0) {
-                        Thread.sleep(pauseTime);
-                    }
-                }
-                if (encoded) {
-                    outToServer.writeBytes("0\r\n\r\n");
-                    outToServer.flush();
-                    LOGGER.info("Finished chunked encoding");
-                }
-            } catch (SocketException e) {
-                LOGGER.warn("Socket closed");
-            } catch (InterruptedException | IOException e) {
-                LOGGER.error("Something went wrong while sending data", e);
-            }
-        });
-    }
-
-    private String prepareChunk(String msg, int index, boolean encoded) {
-        return encoded ? String.format("1\n%c\r\n", msg.charAt(index)) : String.valueOf(msg.charAt(index));
-    }
-
-    private String readResponse(BufferedReader bufferedReader) throws IOException {
-        String line;
-        StringBuilder response = new StringBuilder();
-
-        while (!(line = bufferedReader.readLine()).equals("")) {
-            response.append(line);
-        }
-
-        return response.toString();
-    }
-}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/FrontendTestClient.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/FrontendTestClient.java
deleted file mode 100644
index 8c7f4c3692..0000000000
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/FrontendTestClient.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package pl.allegro.tech.hermes.integrationtests.client;
-
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.UriBuilder;
-import org.glassfish.jersey.client.ClientConfig;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.util.MultiValueMap;
-import reactor.core.publisher.Mono;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static jakarta.ws.rs.client.ClientBuilder.newClient;
-import static org.awaitility.Awaitility.waitAtMost;
-import static org.glassfish.jersey.client.ClientProperties.REQUEST_ENTITY_PROCESSING;
-import static org.glassfish.jersey.client.RequestEntityProcessing.CHUNKED;
-import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY;
-
-public class FrontendTestClient {
-
-    private static final String TOPIC_PATH = "/topics/{topicName}";
-    private static final String STATUS_HEALTH_PATH = "/status/health";
-    private static final String STATUS_READY_PATH = "/status/ready";
-    private static final String STATUS_PING_PATH = "/status/ping";
-
-    private final WebTestClient webTestClient;
-    private final FrontendSlowClient slowTestClient;
-    private final String frontendContainerUrl;
-    private final Client chunkedClient;
-
-    public FrontendTestClient(int frontendPort) {
-        this.frontendContainerUrl = "http://localhost:" + frontendPort;
-        this.webTestClient = WebTestClient
-                .bindToServer()
-                .baseUrl(frontendContainerUrl)
-                .build();
-        this.slowTestClient = new FrontendSlowClient("localhost", frontendPort);
-        this.chunkedClient = newClient(new ClientConfig().property(REQUEST_ENTITY_PROCESSING, CHUNKED));
-    }
-
-    public int publishUntilSuccess(String topicQualifiedName, String body) {
-        AtomicInteger attempts = new AtomicInteger(0);
-        waitAtMost(Duration.ofSeconds(10))
-                .untilAsserted(() -> {
-                    attempts.getAndIncrement();
-                    publish(topicQualifiedName, body).expectStatus().isCreated();
-                });
-        return attempts.get();
-    }
-
-    public Response publishChunked(String topicQualifiedName, String body) {
-        return chunkedClient.target(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .request().post(Entity.text(body));
-
-    }
-
-    public int publishUntilSuccess(String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
-        AtomicInteger attempts = new AtomicInteger(0);
-        waitAtMost(Duration.ofSeconds(10))
-                .untilAsserted(() -> {
-                    attempts.getAndIncrement();
-                    publish(topicQualifiedName, body, headers).expectStatus().isCreated();
-                });
-        return attempts.get();
-    }
-
-    public int publishJSONUntilSuccess(String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
-        AtomicInteger attempts = new AtomicInteger(0);
-        waitAtMost(Duration.ofSeconds(10))
-                .untilAsserted(() -> {
-                    attempts.getAndIncrement();
-                    publishJSON(topicQualifiedName, body, headers).expectStatus().isCreated();
-                });
-        return attempts.get();
-    }
-
-    public int publishAvroUntilSuccess(String topicQualifiedName, byte[] body) {
-        return publishAvroUntilSuccess(topicQualifiedName, body, new HttpHeaders());
-    }
-
-    public int publishAvroUntilSuccess(String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
-        AtomicInteger attempts = new AtomicInteger(0);
-        waitAtMost(Duration.ofSeconds(10))
-                .untilAsserted(() -> {
-                    attempts.getAndIncrement();
-                    publishAvro(topicQualifiedName, body, headers).expectStatus().isCreated();
-                });
-        return attempts.get();
-    }
-
-    public int publishUntilStatus(String topicQualifiedName, String body, int statusCode) {
-        AtomicInteger attempts = new AtomicInteger(0);
-        waitAtMost(Duration.ofSeconds(10))
-                .untilAsserted(() -> {
-                    attempts.getAndIncrement();
-                    publish(topicQualifiedName, body).expectStatus().isEqualTo(statusCode);
-                });
-        return attempts.get();
-    }
-
-    public WebTestClient.ResponseSpec publish(String topicQualifiedName, String body) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .body(Mono.just(body), String.class)
-                .exchange();
-    }
-
-    WebTestClient.ResponseSpec publish(String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .body(Mono.just(body), String.class)
-                .headers(requestHeaders -> requestHeaders.addAll(headers))
-                .exchange();
-    }
-
-    WebTestClient.ResponseSpec publishJSON(String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(Mono.just(body), String.class)
-                .headers(requestHeaders -> requestHeaders.addAll(headers))
-                .exchange();
-    }
-
-    WebTestClient.ResponseSpec publishAvro(String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .header("Content-Type", AVRO_BINARY)
-                .headers(requestHeaders -> requestHeaders.addAll(headers))
-                .body(Mono.just(body), byte[].class)
-                .exchange();
-    }
-
-    WebTestClient.ResponseSpec publishWithHeaders(String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .headers(it -> it.addAll(headers))
-                .body(Mono.just(body), String.class)
-                .exchange();
-    }
-
-    String publishSlowly(int clientTimeout, int pauseTimeBetweenChunks, int delayBeforeSendingFirstData,
-                         String topicName, boolean chunkedEncoding) throws IOException, InterruptedException{
-        return slowTestClient.slowEvent(clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topicName, chunkedEncoding);
-    }
-
-    public WebTestClient.ResponseSpec getStatusHealth() {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(STATUS_HEALTH_PATH)
-                        .build())
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getStatusReady() {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(STATUS_READY_PATH)
-                        .build())
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getStatusPing() {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(frontendContainerUrl)
-                        .path(STATUS_PING_PATH)
-                        .build())
-                .exchange();
-    }
-}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/HermesTestClient.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/HermesTestClient.java
deleted file mode 100644
index de4f98008d..0000000000
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/HermesTestClient.java
+++ /dev/null
@@ -1,369 +0,0 @@
-package pl.allegro.tech.hermes.integrationtests.client;
-
-import com.jayway.awaitility.Duration;
-import jakarta.ws.rs.core.Response;
-import org.springframework.http.HttpHeaders;
-import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.util.MultiValueMap;
-import pl.allegro.tech.hermes.api.BlacklistStatus;
-import pl.allegro.tech.hermes.api.Group;
-import pl.allegro.tech.hermes.api.MessageFiltersVerificationInput;
-import pl.allegro.tech.hermes.api.OAuthProvider;
-import pl.allegro.tech.hermes.api.OffsetRetransmissionDate;
-import pl.allegro.tech.hermes.api.PatchData;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicWithSchema;
-import pl.allegro.tech.hermes.consumers.supervisor.process.RunningSubscriptionStatus;
-
-import java.io.IOException;
-import java.util.List;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
-public class HermesTestClient {
-    private final ManagementTestClient managementTestClient;
-    private final FrontendTestClient frontendTestClient;
-    private final ConsumerTestClient consumerTestClient;
-
-    public HermesTestClient(int managementPort, int frontendPort, int consumerPort) {
-        this.managementTestClient = new ManagementTestClient(managementPort);
-        this.frontendTestClient = new FrontendTestClient(frontendPort);
-        this.consumerTestClient = new ConsumerTestClient(consumerPort);
-    }
-
-    public WebTestClient.ResponseSpec createGroup(Group group) {
-        return managementTestClient.createGroup(group);
-    }
-
-    public WebTestClient.ResponseSpec createTopic(TopicWithSchema topicWithSchema) {
-        return managementTestClient.createTopic(topicWithSchema);
-    }
-
-    public WebTestClient.ResponseSpec getTopicResponse(String topicQualifiedName) {
-        return managementTestClient.getTopic(topicQualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec saveSchema(String topicQualifiedName, String schema) {
-        return managementTestClient.saveSchema(topicQualifiedName, schema);
-
-    }
-
-    public void ensureSchemaSaved(String topicQualifiedName, boolean validate, String schema) {
-        managementTestClient.saveSchema(topicQualifiedName, validate, schema)
-                .expectStatus().isCreated();
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                managementTestClient.getSchema(topicQualifiedName).expectStatus().isOk()
-        );
-    }
-
-    public WebTestClient.ResponseSpec saveSchema(String topicQualifiedName, boolean validate, String schema) {
-        return managementTestClient.saveSchema(topicQualifiedName, validate, schema);
-    }
-
-    public WebTestClient.ResponseSpec getSchema(String topicQualifiedName) {
-        return managementTestClient.getSchema(topicQualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec deleteSchema(String topicQualifiedName) {
-        return managementTestClient.deleteSchema(topicQualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec updateTopic(String qualifiedTopicName, PatchData patch) {
-        return managementTestClient.updateTopic(qualifiedTopicName, patch);
-    }
-
-    public Subscription getSubscription(String topicQualifiedName, String subscriptionName) {
-        return getSubscriptionResponse(topicQualifiedName, subscriptionName)
-                .expectStatus()
-                .is2xxSuccessful()
-                .expectBody(Subscription.class)
-                .returnResult()
-                .getResponseBody();
-    }
-
-    public WebTestClient.ResponseSpec getSubscriptionResponse(String topicQualifiedName, String subscriptionName) {
-        return managementTestClient.getSubscription(topicQualifiedName, subscriptionName);
-    }
-
-    public WebTestClient.ResponseSpec getSubscriptionMetrics(String topicQualifiedName, String subscriptionName) {
-        return managementTestClient.getSubscriptionMetrics(topicQualifiedName, subscriptionName);
-    }
-
-    public void suspendSubscription(Topic topic, String subscription) {
-        managementTestClient.updateSubscriptionState(topic, subscription, Subscription.State.SUSPENDED)
-                .expectStatus()
-                .is2xxSuccessful();
-    }
-
-    public void waitUntilSubscriptionActivated(String topicQualifiedName, String subscriptionName) {
-        waitAtMost(Duration.TEN_SECONDS)
-                .until(() -> managementTestClient.getSubscription(topicQualifiedName, subscriptionName)
-                        .expectStatus()
-                        .is2xxSuccessful()
-                        .expectBody(Subscription.class)
-                        .returnResult().getResponseBody().getState().equals(Subscription.State.ACTIVE)
-                );
-    }
-
-    public void waitUntilSubscriptionSuspended(String topicQualifiedName, String subscriptionName) {
-        waitAtMost(Duration.TEN_SECONDS)
-                .until(() -> managementTestClient.getSubscription(topicQualifiedName, subscriptionName)
-                        .expectStatus()
-                        .is2xxSuccessful()
-                        .expectBody(Subscription.class)
-                        .returnResult().getResponseBody().getState().equals(Subscription.State.SUSPENDED)
-                );
-    }
-
-    public int publishUntilSuccess(String topicQualifiedName, String body) {
-        return frontendTestClient.publishUntilSuccess(topicQualifiedName, body);
-    }
-
-    public int publishUntilStatus(String topicQualifiedName, String body, int statusCode) {
-        return frontendTestClient.publishUntilStatus(topicQualifiedName, body, statusCode);
-    }
-
-    public int publishUntilSuccess(String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
-        return frontendTestClient.publishUntilSuccess(topicQualifiedName, body, headers);
-    }
-
-    public int publishJSONUntilSuccess(String topicQualifiedName, String body) {
-        return frontendTestClient.publishJSONUntilSuccess(topicQualifiedName, body, new HttpHeaders());
-    }
-
-    public int publishAvroUntilSuccess(String topicQualifiedName, byte[] body) {
-        return frontendTestClient.publishAvroUntilSuccess(topicQualifiedName, body);
-    }
-
-    public int publishAvroUntilSuccess(String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
-        return frontendTestClient.publishAvroUntilSuccess(topicQualifiedName, body, headers);
-    }
-
-    public void updateSubscription(Topic topic, String subscription, PatchData patch) {
-        managementTestClient.updateSubscription(topic, subscription, patch)
-                .expectStatus()
-                .is2xxSuccessful();
-    }
-
-    public WebTestClient.ResponseSpec publish(String topicQualifiedName, String body, MultiValueMap<String, String> headers) {
-        return frontendTestClient.publishWithHeaders(topicQualifiedName, body, headers);
-    }
-
-    public WebTestClient.ResponseSpec publish(String topicQualifiedName, String body) {
-        return frontendTestClient.publish(topicQualifiedName, body);
-    }
-
-    public WebTestClient.ResponseSpec publishAvro(String topicQualifiedName, byte[] body) {
-        return frontendTestClient.publishAvro(topicQualifiedName, body, new HttpHeaders());
-    }
-
-    public WebTestClient.ResponseSpec publishAvro(String topicQualifiedName, byte[] body, MultiValueMap<String, String> headers) {
-        return frontendTestClient.publishAvro(topicQualifiedName, body, headers);
-    }
-
-    public WebTestClient.ResponseSpec publishJSON(String topicQualifiedName, String body) {
-        return frontendTestClient.publishJSON(topicQualifiedName, body, new HttpHeaders());
-    }
-
-    public Response publishChunked(String topicQualifiedName, String body) {
-        return frontendTestClient.publishChunked(topicQualifiedName, body);
-    }
-
-    public String publishSlowly(int clientTimeout, int pauseTimeBetweenChunks, int delayBeforeSendingFirstData,
-                                String topicName, boolean chunkedEncoding) throws IOException, InterruptedException {
-        return frontendTestClient.publishSlowly(clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topicName, chunkedEncoding);
-    }
-
-    public String publishSlowly(int clientTimeout, int pauseTimeBetweenChunks, int delayBeforeSendingFirstData, String topicName)
-            throws IOException, InterruptedException {
-        return publishSlowly(clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topicName, false);
-    }
-
-    public void blacklistTopic(String topicQualifiedName) {
-        managementTestClient.blacklistTopic(topicQualifiedName).expectStatus().is2xxSuccessful();
-    }
-
-    public WebTestClient.ResponseSpec blacklistTopicResponse(String topicQualifiedName) {
-        return managementTestClient.blacklistTopic(topicQualifiedName);
-    }
-
-    public void unblacklistTopic(String topicQualifiedName) {
-        managementTestClient.unblacklistTopic(topicQualifiedName).expectStatus().is2xxSuccessful();
-    }
-
-    public BlacklistStatus isTopicBlacklisted(String topicQualifiedName) {
-        return managementTestClient.isTopicBlacklisted(topicQualifiedName)
-                .expectStatus()
-                .is2xxSuccessful()
-                .expectBody(BlacklistStatus.class)
-                .returnResult()
-                .getResponseBody();
-    }
-
-    public WebTestClient.ResponseSpec unblacklistTopicResponse(String topicQualifiedName) {
-        return managementTestClient.unblacklistTopic(topicQualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec getLatestUndeliveredMessage(String topicQualifiedName, String subscriptionName) {
-        return managementTestClient.getLatestUndeliveredMessage(topicQualifiedName, subscriptionName);
-    }
-
-    public List<RunningSubscriptionStatus> getRunningSubscriptionsStatus() {
-        return consumerTestClient.getRunningSubscriptionsStatus()
-                .expectStatus()
-                .is2xxSuccessful()
-                .expectBodyList(RunningSubscriptionStatus.class)
-                .returnResult()
-                .getResponseBody();
-    }
-
-    public WebTestClient.ResponseSpec retransmit(String qualifiedName, String subscriptionName, OffsetRetransmissionDate retransmissionDate, boolean dryRun) {
-        return managementTestClient.retransmit(qualifiedName, subscriptionName, retransmissionDate, dryRun);
-    }
-
-    public WebTestClient.ResponseSpec getPreview(String qualifiedTopicName, String primaryKafkaClusterName, int partition, long offset) {
-        return managementTestClient.getPreview(qualifiedTopicName, primaryKafkaClusterName, partition, offset);
-    }
-
-    public WebTestClient.ResponseSpec getPreview(String qualifiedTopicName) {
-        return managementTestClient.getPreview(qualifiedTopicName);
-    }
-
-    public WebTestClient.ResponseSpec getTopicMetrics(String qualifiedName) {
-        return managementTestClient.getTopicMetrics(qualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec listSubscriptions(String qualifiedName) {
-        return managementTestClient.listSubscriptions(qualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec listTopics(String groupName) {
-        return managementTestClient.listTopics(groupName, false);
-    }
-
-    public WebTestClient.ResponseSpec getConsumersMetrics() {
-        return consumerTestClient.getMetrics();
-    }
-
-    public WebTestClient.ResponseSpec verifyFilters(String qualifiedTopicName,
-                                                    MessageFiltersVerificationInput input) {
-        return managementTestClient.verifyFilters(qualifiedTopicName, input);
-    }
-
-    public WebTestClient.ResponseSpec getManagementHealth() {
-        return managementTestClient.getStatusHealth();
-    }
-
-    public WebTestClient.ResponseSpec getManagementStats() {
-        return managementTestClient.getStats();
-    }
-    public WebTestClient.ResponseSpec setReadiness(String dc, boolean state) {
-        return managementTestClient.setReadiness(dc, state);
-    }
-
-    public WebTestClient.ResponseSpec getReadiness() {
-        return frontendTestClient.getStatusReady();
-    }
-
-    public WebTestClient.ResponseSpec getAllTopicClients(String topicQualifiedName) {
-        return managementTestClient.getAllTopicClients(topicQualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec getSubscriptionsForOwner(String source, String ownerId) {
-        return managementTestClient.getSubscriptionsForOwner(source, ownerId);
-    }
-
-    public WebTestClient.ResponseSpec deleteSubscription(String topicQualifiedName, String subscriptionName) {
-        return managementTestClient.deleteSubscription(topicQualifiedName, subscriptionName);
-    }
-
-    public WebTestClient.ResponseSpec getTopicsForOwner(String source, String ownerId) {
-        return managementTestClient.getTopicsForOwner(source, ownerId);
-    }
-
-    public WebTestClient.ResponseSpec deleteTopic(String topicQualifiedName) {
-        return managementTestClient.deleteTopic(topicQualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec listTrackedTopics(String groupName) {
-        return managementTestClient.listTopics(groupName, true);
-    }
-
-    public WebTestClient.ResponseSpec queryTopics(String group, String query) {
-        return managementTestClient.queryTopics(group, query);
-    }
-
-    public WebTestClient.ResponseSpec queryGroups(String query) {
-        return managementTestClient.queryGroups(query);
-    }
-
-    public WebTestClient.ResponseSpec queryTopics(String query) {
-        return managementTestClient.queryTopics(query);
-    }
-
-    public WebTestClient.ResponseSpec queryTopicMetrics(String query) {
-        return managementTestClient.queryTopicMetrics(query);
-    }
-
-    public WebTestClient.ResponseSpec querySubscriptionMetrics(String query) {
-        return managementTestClient.querySubscriptionMetrics(query);
-    }
-
-    public WebTestClient.ResponseSpec querySubscriptions(String query) {
-        return managementTestClient.querySubscriptions(query);
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthy() {
-        return managementTestClient.listUnhealthy();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyAsPlainText() {
-        return managementTestClient.listUnhealthyAsPlainText();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForOwner(String ownerId) {
-        return managementTestClient.listUnhealthy(ownerId);
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForOwnerAsPlainText(String ownerId) {
-        return managementTestClient.listUnhealthyAsPlainText(ownerId);
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForTopic(String qualifiedName) {
-        return managementTestClient.listUnhealthyForTopic(qualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForTopicAsPlainText(String qualifiedName) {
-        return managementTestClient.listUnhealthyForTopicAsPlainText(qualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForSubscription(String topicQualifiedName, String subscriptionName) {
-        return managementTestClient.listUnhealthyForSubscription(topicQualifiedName, subscriptionName);
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForSubscriptionAsPlainText(String topicQualifiedName, String subscriptionName) {
-        return managementTestClient.listUnhealthyForSubscriptionAsPlainText(topicQualifiedName, subscriptionName);
-    }
-
-    public WebTestClient.ResponseSpec createOAuthProvider(OAuthProvider provider) {
-        return managementTestClient.createOAuthProvider(provider);
-    }
-
-    public WebTestClient.ResponseSpec getOAuthProvider(String name) {
-        return managementTestClient.getOAuthProvider(name);
-    }
-
-    public WebTestClient.ResponseSpec removeOAuthProvider(String name) {
-        return managementTestClient.removeOAuthProvider(name);
-    }
-
-    public WebTestClient.ResponseSpec listOAuthProvider() {
-        return managementTestClient.listOAuthProvider();
-    }
-
-    public WebTestClient.ResponseSpec updateOAuthProvider(String name, PatchData patch) {
-        return managementTestClient.updateOAuthProvider(name, patch);
-    }
-}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/ManagementTestClient.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/ManagementTestClient.java
deleted file mode 100644
index d153ad93f8..0000000000
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/client/ManagementTestClient.java
+++ /dev/null
@@ -1,604 +0,0 @@
-package pl.allegro.tech.hermes.integrationtests.client;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.ws.rs.core.UriBuilder;
-import org.eclipse.jetty.client.HttpClient;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.reactive.ClientHttpConnector;
-import org.springframework.http.client.reactive.JettyClientHttpConnector;
-import org.springframework.test.web.reactive.server.WebTestClient;
-import pl.allegro.tech.hermes.api.Group;
-import pl.allegro.tech.hermes.api.MessageFiltersVerificationInput;
-import pl.allegro.tech.hermes.api.OAuthProvider;
-import pl.allegro.tech.hermes.api.OffsetRetransmissionDate;
-import pl.allegro.tech.hermes.api.PatchData;
-import pl.allegro.tech.hermes.api.Readiness;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicWithSchema;
-import reactor.core.publisher.Mono;
-
-import java.time.Duration;
-import java.util.List;
-
-public class ManagementTestClient {
-
-    private static final String TOPICS_PATH = "/topics";
-
-    private static final String TOPIC_PATH = "/topics/{topicName}";
-
-    private static final String SUBSCRIPTIONS_PATH = "/topics/{topicName}/subscriptions";
-
-    private static final String SUBSCRIPTION_PATH = "/topics/{topicName}/subscriptions/{subscriptionName}";
-
-    private static final String SUBSCRIPTION_STATE_PATH = "/topics/{topicName}/subscriptions/{subscriptionName}/state";
-
-    private static final String SUBSCRIPTION_METRICS_PATH = "/topics/{topicName}/subscriptions/{subscriptionName}/metrics";
-
-    private static final String GROUPS_PATH = "/groups";
-
-    private static final String RETRANSMISSION_PATH = "/topics/{topicName}/subscriptions/{subscriptionName}/retransmission";
-
-    private static final String BLACKLIST_TOPICS_PATH = "/blacklist/topics";
-
-    private static final String BLACKLIST_TOPIC_PATH = "/blacklist/topics/{topicName}";
-
-    private static final String LATEST_UNDELIVERED_MESSAGE = "/topics/{topicName}/subscriptions/{subscriptionName}/undelivered";
-
-    private static final String TOPIC_PREVIEW = "/topics/{topicName}/preview";
-
-    private static final String TOPIC_PREVIEW_OFFSET = "/topics/{topicName}/preview/cluster/{brokersClusterName}/partition/{partition}/offset/{offset}";
-
-    private static final String SET_READINESS = "/readiness/datacenters/{dc}";
-
-    private static final String TOPIC_SCHEMA = "/topics/{topicName}/schema";
-
-    private static final String ALL_TOPIC_CLIENTS = "/topics/{topicName}/clients";
-
-    private static final String SUBSCRIPTIONS_BY_OWNER = "/subscriptions/owner/{source}/{ownerId}";
-
-    private static final String TOPICS_BY_OWNER = "/topics/owner/{source}/{ownerId}";
-
-    private static final String TOPIC_METRICS_PATH = "/topics/{topicName}/metrics";
-
-    private static final String FILTERS = "/filters/{topicName}";
-
-    private static final String STATUS_HEALTH = "/status/health";
-
-    private static final String STATS = "/stats";
-
-    private static final String QUERY_GROUPS = "/query/groups";
-
-    private static final String QUERY_TOPICS = "/query/topics";
-
-    private static final String QUERY_SUBSCRIPTIONS = "/query/subscriptions";
-
-    private static final String QUERY_TOPIC_METRICS = "/query/topics/metrics";
-
-    private static final String QUERY_SUBSCRIPTION_METRICS = "/query/subscriptions/metrics";
-
-    private static final String OAUTH_PROVIDERS_PATH = "/oauth/providers";
-
-    private static final String OAUTH_PROVIDER_PATH = "/oauth/providers/{oAuthProviderName}";
-
-    private static final String UNHEALTHY_PATH = "/unhealthy";
-
-    private static final String TOPICS_QUERY = "/topics/query";
-
-    private final WebTestClient webTestClient;
-
-    private final String managementContainerUrl;
-
-    private final ObjectMapper objectMapper;
-
-    public ManagementTestClient(int managementPort) {
-        this.managementContainerUrl = "http://localhost:" + managementPort;
-        this.webTestClient = WebTestClient
-                .bindToServer(clientHttpConnector())
-                .responseTimeout(Duration.ofSeconds(30))
-                .baseUrl(managementContainerUrl)
-                .build();
-        this.objectMapper = new ObjectMapper();
-    }
-
-    private static ClientHttpConnector clientHttpConnector() {
-        HttpClient httpClient = new HttpClient();
-        httpClient.setMaxConnectionsPerDestination(256);
-        return new JettyClientHttpConnector(httpClient);
-    }
-
-    public WebTestClient.ResponseSpec createGroup(Group group) {
-        return sendCreateGroupRequest(group);
-    }
-
-    public List<String> getGroups() {
-        String jsonString = webTestClient.get().uri(GROUPS_PATH)
-                .exchange()
-                .expectBody(String.class)
-                .returnResult()
-                .getResponseBody();
-
-        return mapStringJsonToListOfString(jsonString);
-    }
-
-    public WebTestClient.ResponseSpec createTopic(TopicWithSchema topicWithSchema) {
-        return sendCreateTopicRequest(topicWithSchema);
-    }
-
-    public WebTestClient.ResponseSpec getTopic(String topicQualifiedName) {
-        return getSingleTopic(topicQualifiedName);
-    }
-
-    public WebTestClient.ResponseSpec createSubscription(Subscription subscription) {
-        return sendCreateSubscriptionRequest(subscription);
-    }
-
-    public WebTestClient.ResponseSpec updateSubscription(Topic topic, String subscription, PatchData patch) {
-        return webTestClient.put().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(SUBSCRIPTION_PATH)
-                        .build(topic.getQualifiedName(), subscription))
-                .body(Mono.just(patch), PatchData.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec updateSubscriptionState(Topic topic, String subscription, Subscription.State state) {
-        return webTestClient.put().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(SUBSCRIPTION_STATE_PATH)
-                        .build(topic.getQualifiedName(), subscription))
-                .body(Mono.just(state), Subscription.State.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getSubscription(String topicQualifiedName, String subscriptionName) {
-        return getSingleSubscription(topicQualifiedName, subscriptionName);
-    }
-
-    public WebTestClient.ResponseSpec getSubscriptionMetrics(String topicQualifiedName, String subscriptionName) {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(SUBSCRIPTION_METRICS_PATH)
-                        .build(topicQualifiedName, subscriptionName))
-                .exchange();
-    }
-
-    private WebTestClient.ResponseSpec getSingleTopic(String topicQualifiedName) {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(TOPIC_PATH)
-                                .build(topicQualifiedName))
-                .exchange();
-    }
-
-    private WebTestClient.ResponseSpec getSingleSubscription(String topicQualifiedName, String subscriptionName) {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(SUBSCRIPTION_PATH)
-                        .build(topicQualifiedName, subscriptionName))
-                .exchange();
-    }
-
-    private WebTestClient.ResponseSpec sendCreateTopicRequest(TopicWithSchema topicWithSchema) {
-        return webTestClient.post().uri(TOPICS_PATH)
-                .body(Mono.just(topicWithSchema), TopicWithSchema.class)
-                .exchange();
-    }
-
-    WebTestClient.ResponseSpec retransmit(String topicName, String subscriptionName, OffsetRetransmissionDate retransmissionDate, boolean dryRun) {
-        return webTestClient.put().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(RETRANSMISSION_PATH)
-                        .queryParam("dryRun", dryRun)
-                        .build(topicName, subscriptionName))
-                .body(Mono.just(retransmissionDate), OffsetRetransmissionDate.class)
-                .exchange();
-    }
-
-    private WebTestClient.ResponseSpec sendCreateSubscriptionRequest(Subscription subscription) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(SUBSCRIPTIONS_PATH)
-                        .build(subscription.getQualifiedTopicName()))
-                .body(Mono.just(subscription), Subscription.class)
-                .exchange();
-    }
-
-    private WebTestClient.ResponseSpec sendCreateGroupRequest(Group group) {
-        return webTestClient.post().uri(GROUPS_PATH)
-                .body(Mono.just(group), Group.class)
-                .exchange();
-    }
-
-    private List<String> mapStringJsonToListOfString(String jsonString) {
-        try {
-            return objectMapper.readValue(jsonString, new TypeReference<>() {
-            });
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public WebTestClient.ResponseSpec blacklistTopic(String topicQualifiedName) {
-        return webTestClient.post().uri(BLACKLIST_TOPICS_PATH)
-                .body(Mono.just(List.of(topicQualifiedName)), List.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec unblacklistTopic(String topicQualifiedName) {
-        return webTestClient.delete().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(BLACKLIST_TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec isTopicBlacklisted(String topicQualifiedName) {
-        return webTestClient.get().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(BLACKLIST_TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getLatestUndeliveredMessage(String topicQualifiedName, String subscriptionName) {
-        return webTestClient.get().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(LATEST_UNDELIVERED_MESSAGE)
-                        .build(topicQualifiedName, subscriptionName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getPreview(String qualifiedTopicName, String primaryKafkaClusterName, int partition, long offset) {
-        return webTestClient.get().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(TOPIC_PREVIEW_OFFSET)
-                        .build(qualifiedTopicName, primaryKafkaClusterName, partition, offset))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getPreview(String qualifiedTopicName) {
-        return webTestClient.get().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(TOPIC_PREVIEW)
-                        .build(qualifiedTopicName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec updateTopic(String qualifiedTopicName, PatchData patch) {
-        return webTestClient.put().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(TOPIC_PATH)
-                        .build(qualifiedTopicName))
-                .body(Mono.just(patch), PatchData.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getTopicMetrics(String qualifiedTopicName) {
-        return webTestClient.get().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(TOPIC_METRICS_PATH)
-                        .build(qualifiedTopicName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listSubscriptions(String qualifiedTopicName) {
-        return webTestClient.get().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(SUBSCRIPTIONS_PATH)
-                        .build(qualifiedTopicName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listTopics(String groupName, boolean tracked) {
-        return webTestClient.get().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(TOPICS_PATH)
-                        .queryParam("groupName", groupName)
-                        .queryParam("tracked", tracked)
-                        .build())
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec setReadiness(String dc, boolean state) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(SET_READINESS)
-                        .build(dc))
-                .body(Mono.just(new Readiness(state)), Readiness.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec saveSchema(String qualifiedTopicName, boolean validate, String schema) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(TOPIC_SCHEMA)
-                        .queryParam("validate", validate)
-                        .build(qualifiedTopicName))
-                .header("Content-Type", "application/json")
-                .body(Mono.just(schema), String.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec saveSchema(String qualifiedTopicName, String schema) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(TOPIC_SCHEMA)
-                        .build(qualifiedTopicName))
-                .header("Content-Type", "application/json")
-                .body(Mono.just(schema), String.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getSchema(String qualifiedTopicName) {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(TOPIC_SCHEMA)
-                        .build(qualifiedTopicName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec deleteSchema(String qualifiedTopicName) {
-        return webTestClient.delete().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(TOPIC_SCHEMA)
-                        .build(qualifiedTopicName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec verifyFilters(String qualifiedTopicName,
-                                                    MessageFiltersVerificationInput input) {
-        return webTestClient.post().uri(UriBuilder
-                .fromUri(managementContainerUrl)
-                .path(FILTERS)
-                .build(qualifiedTopicName)
-        ).contentType(MediaType.APPLICATION_JSON)
-                .body(Mono.just(input), MessageFiltersVerificationInput.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getStatusHealth() {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(STATUS_HEALTH)
-                        .build())
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getStats() {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(STATS)
-                        .build())
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec createOAuthProvider(OAuthProvider provider) {
-        return webTestClient.post().uri(OAUTH_PROVIDERS_PATH)
-                .body(Mono.just(provider), OAuthProvider.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getOAuthProvider(String name) {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(OAUTH_PROVIDER_PATH)
-                        .build(name))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec removeOAuthProvider(String name) {
-        return webTestClient.delete().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(OAUTH_PROVIDER_PATH)
-                        .build(name))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listOAuthProvider() {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(OAUTH_PROVIDERS_PATH)
-                        .build())
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec updateOAuthProvider(String name, PatchData patch) {
-        return webTestClient.put().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(OAUTH_PROVIDER_PATH)
-                        .build(name))
-                .body(Mono.just(patch), PatchData.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getAllTopicClients(String topicQualifiedName) {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(ALL_TOPIC_CLIENTS)
-                        .build(topicQualifiedName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getSubscriptionsForOwner(String source, String ownerId) {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(SUBSCRIPTIONS_BY_OWNER)
-                        .build(source, ownerId))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec deleteSubscription(String topicQualifiedName, String subscriptionName) {
-        return webTestClient.delete().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(SUBSCRIPTION_PATH)
-                        .build(topicQualifiedName, subscriptionName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec getTopicsForOwner(String source, String ownerId) {
-        return webTestClient.get().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(TOPICS_BY_OWNER)
-                        .build(source, ownerId))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec deleteTopic(String topicQualifiedName) {
-        return webTestClient.delete().uri(UriBuilder.fromUri(managementContainerUrl)
-                        .path(TOPIC_PATH)
-                        .build(topicQualifiedName))
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec queryTopics(String group, String query) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(TOPICS_QUERY)
-                        .queryParam("groupName", group)
-                        .build())
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(Mono.just(query), String.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec queryGroups(String query) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(QUERY_GROUPS)
-                        .build())
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(Mono.just(query), String.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec queryTopics(String query) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(QUERY_TOPICS)
-                        .build())
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(Mono.just(query), String.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec queryTopicMetrics(String query) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(QUERY_TOPIC_METRICS)
-                        .build())
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(Mono.just(query), String.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec querySubscriptionMetrics(String query) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(QUERY_SUBSCRIPTION_METRICS)
-                        .build())
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(Mono.just(query), String.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec querySubscriptions(String query) {
-        return webTestClient.post().uri(UriBuilder
-                        .fromUri(managementContainerUrl)
-                        .path(QUERY_SUBSCRIPTIONS)
-                        .build())
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(Mono.just(query), String.class)
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthy() {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(UNHEALTHY_PATH)
-                                .queryParam("respectMonitoringSeverity", "false")
-                                .build()
-                )
-                .header("Accept", "application/json")
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyAsPlainText() {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(UNHEALTHY_PATH)
-                                .queryParam("respectMonitoringSeverity", "false")
-                                .build()
-                )
-                .header("Accept", "text/plain")
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthy(String ownerId) {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(UNHEALTHY_PATH)
-                                .queryParam("ownerSourceName", "Plaintext")
-                                .queryParam("ownerId", ownerId)
-                                .queryParam("respectMonitoringSeverity", "false")
-                                .build()
-                )
-                .header("Accept", "application/json")
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyAsPlainText(String ownerId) {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(UNHEALTHY_PATH)
-                                .queryParam("ownerSourceName", "Plaintext")
-                                .queryParam("ownerId", ownerId)
-                                .queryParam("respectMonitoringSeverity", "false")
-                                .build()
-                )
-                .header("Accept", "text/plain")
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForTopic(String qualifiedName) {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(UNHEALTHY_PATH)
-                                .queryParam("qualifiedTopicNames", qualifiedName)
-                                .queryParam("respectMonitoringSeverity", "false")
-                                .build()
-                )
-                .header("Accept", "application/json")
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForTopicAsPlainText(String qualifiedName) {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(UNHEALTHY_PATH)
-                                .queryParam("qualifiedTopicNames", qualifiedName)
-                                .build()
-                )
-                .header("Accept", "text/plain")
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForSubscription(String topicQualifiedName, String subscriptionName) {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(UNHEALTHY_PATH)
-                                .queryParam("subscriptionNames", subscriptionName)
-                                .queryParam("qualifiedTopicNames", topicQualifiedName)
-                                .queryParam("respectMonitoringSeverity", "false")
-                                .build()
-                )
-                .header("Accept", "application/json")
-                .exchange();
-    }
-
-    public WebTestClient.ResponseSpec listUnhealthyForSubscriptionAsPlainText(String topicQualifiedName, String subscriptionName) {
-        return webTestClient.get().uri(
-                        UriBuilder.fromUri(managementContainerUrl)
-                                .path(UNHEALTHY_PATH)
-                                .queryParam("subscriptionNames", subscriptionName)
-                                .queryParam("qualifiedTopicNames", topicQualifiedName)
-                                .queryParam("respectMonitoringSeverity", "false")
-                                .build()
-                )
-                .header("Accept", "text/plain")
-                .exchange();
-    }
-}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/helpers/TraceHeaders.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/helpers/TraceHeaders.java
index 9340456d5c..68ce7649e1 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/helpers/TraceHeaders.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/helpers/TraceHeaders.java
@@ -1,17 +1,15 @@
 package pl.allegro.tech.hermes.integrationtests.helpers;
 
-import pl.allegro.tech.hermes.integrationtests.metadata.TraceContext;
-
 import java.util.Map;
+import pl.allegro.tech.hermes.integrationtests.metadata.TraceContext;
 
 public class TraceHeaders {
-    public static Map<String, String> fromTraceContext(TraceContext traceContext) {
-        return Map.of(
-                "Trace-Id", traceContext.getTraceId(),
-                "Span-Id", traceContext.getSpanId(),
-                "Parent-Span-Id", traceContext.getParentSpanId(),
-                "Trace-Sampled", traceContext.getTraceSampled(),
-                "Trace-Reported", traceContext.getTraceReported()
-        );
-    }
+  public static Map<String, String> fromTraceContext(TraceContext traceContext) {
+    return Map.of(
+        "Trace-Id", traceContext.traceId(),
+        "Span-Id", traceContext.spanId(),
+        "Parent-Span-Id", traceContext.parentSpanId(),
+        "Trace-Sampled", traceContext.traceSampled(),
+        "Trace-Reported", traceContext.traceReported());
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/metadata/TraceContext.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/metadata/TraceContext.java
index 6d7956da6d..df2de78570 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/metadata/TraceContext.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/metadata/TraceContext.java
@@ -1,103 +1,69 @@
 package pl.allegro.tech.hermes.integrationtests.metadata;
 
 import com.google.common.collect.ImmutableMap;
-
 import java.util.Map;
 import java.util.UUID;
 
-public class TraceContext {
-
-    private final String traceId;
-    private final String spanId;
-    private final String parentSpanId;
-    private final String traceSampled;
-    private final String traceReported;
-
-    public TraceContext(String traceId, String spanId, String parentSpanId, String traceSampled, String traceReported) {
-        this.traceId = traceId;
-        this.spanId = spanId;
-        this.parentSpanId = parentSpanId;
-        this.traceSampled = traceSampled;
-        this.traceReported = traceReported;
-    }
-
-    public String getTraceId() {
-        return traceId;
-    }
-
-    public String getSpanId() {
-        return spanId;
-    }
-
-    public String getParentSpanId() {
-        return parentSpanId;
+public record TraceContext(
+    String traceId, String spanId, String parentSpanId, String traceSampled, String traceReported) {
+
+  public Map<String, String> asMap() {
+
+    return ImmutableMap.<String, String>builder()
+        .put("Trace-Id", traceId)
+        .put("Span-Id", spanId)
+        .put("Parent-Span-Id", parentSpanId)
+        .put("Trace-Sampled", traceSampled)
+        .put("Trace-Reported", traceReported)
+        .build();
+  }
+
+  public static TraceContext random() {
+
+    return new Builder()
+        .withTraceId(UUID.randomUUID().toString())
+        .withSpanId(UUID.randomUUID().toString())
+        .withParentSpanId(UUID.randomUUID().toString())
+        .withTraceSampled("1")
+        .withTraceReported("0")
+        .build();
+  }
+
+  public static class Builder {
+
+    private String traceId;
+    private String spanId;
+    private String parentSpanId;
+    private String traceSampled;
+    private String traceReported;
+
+    public Builder withTraceId(String traceId) {
+      this.traceId = traceId;
+      return this;
     }
 
-    public String getTraceSampled() {
-        return traceSampled;
+    public Builder withSpanId(String spanId) {
+      this.spanId = spanId;
+      return this;
     }
 
-    public String getTraceReported() {
-        return traceReported;
+    public Builder withParentSpanId(String parentSpanId) {
+      this.parentSpanId = parentSpanId;
+      return this;
     }
 
-    public Map<String, String> asMap() {
-
-        return ImmutableMap.<String, String>builder()
-                .put("Trace-Id", traceId)
-                .put("Span-Id", spanId)
-                .put("Parent-Span-Id", parentSpanId)
-                .put("Trace-Sampled", traceSampled)
-                .put("Trace-Reported", traceReported)
-                .build();
+    public Builder withTraceSampled(String traceSampled) {
+      this.traceSampled = traceSampled;
+      return this;
     }
 
-    public static TraceContext random() {
-
-        return new Builder()
-                .withTraceId(UUID.randomUUID().toString())
-                .withSpanId(UUID.randomUUID().toString())
-                .withParentSpanId(UUID.randomUUID().toString())
-                .withTraceSampled("1")
-                .withTraceReported("0")
-                .build();
+    public Builder withTraceReported(String traceReported) {
+      this.traceReported = traceReported;
+      return this;
     }
 
-    public static class Builder {
-
-        private String traceId;
-        private String spanId;
-        private String parentSpanId;
-        private String traceSampled;
-        private String traceReported;
-
-        public Builder withTraceId(String traceId) {
-            this.traceId = traceId;
-            return this;
-        }
-
-        public Builder withSpanId(String spanId) {
-            this.spanId = spanId;
-            return this;
-        }
-
-        public Builder withParentSpanId(String parentSpanId) {
-            this.parentSpanId = parentSpanId;
-            return this;
-        }
-
-        public Builder withTraceSampled(String traceSampled) {
-            this.traceSampled = traceSampled;
-            return this;
-        }
-
-        public Builder withTraceReported(String traceReported) {
-            this.traceReported = traceReported;
-            return this;
-        }
-
-        public TraceContext build() {
-            return new TraceContext(traceId, spanId, parentSpanId, traceSampled, traceReported);
-        }
+    public TraceContext build() {
+      return new TraceContext(traceId, spanId, parentSpanId, traceSampled, traceReported);
     }
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/PrometheusExtension.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/PrometheusExtension.java
index ddd8513036..77be5dd796 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/PrometheusExtension.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/PrometheusExtension.java
@@ -1,125 +1,143 @@
 package pl.allegro.tech.hermes.integrationtests.prometheus;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient.forSubscription;
+import static pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient.forSubscriptionStatusCode;
+import static pl.allegro.tech.hermes.management.infrastructure.prometheus.PrometheusClient.forTopic;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.matching.AnythingPattern;
+import java.time.Duration;
+import java.util.List;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.TopicName;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.stream.Collectors;
+public class PrometheusExtension
+    implements AfterEachCallback, BeforeAllCallback, ExtensionContext.Store.CloseableResource {
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+  private static final WireMockServer wiremock = new WireMockServer(0);
+  private static boolean started = false;
+  private final ObjectMapper objectMapper = new ObjectMapper();
 
-public class PrometheusExtension implements AfterEachCallback, BeforeAllCallback, ExtensionContext.Store.CloseableResource {
+  @Override
+  public void beforeAll(ExtensionContext context) {
+    if (!started) {
+      wiremock.start();
+      started = true;
+    }
+  }
 
-    private static final WireMockServer wiremock = new WireMockServer(0);
-    private static boolean started = false;
-    private final ObjectMapper objectMapper = new ObjectMapper();
+  @Override
+  public void afterEach(ExtensionContext context) {
+    wiremock.resetAll();
+  }
 
-    @Override
-    public void beforeAll(ExtensionContext context) {
-        if (!started) {
-            wiremock.start();
-            started = true;
-        }
-    }
+  @Override
+  public void close() {
+    wiremock.shutdown();
+  }
 
-    @Override
-    public void afterEach(ExtensionContext context) {
-        wiremock.resetAll();
-    }
+  public String getEndpoint() {
+    return "http://localhost:" + wiremock.port();
+  }
 
-    @Override
-    public void close() {
-        wiremock.shutdown();
-    }
+  @SuppressWarnings("checkstyle:VariableDeclarationUsageDistance")
+  public void stubSubscriptionMetrics(SubscriptionMetrics metrics) {
+    SubscriptionName subName = metrics.name();
+    String deliveredQuery =
+        forSubscription("hermes_consumers_subscription_delivered_total", subName, "");
+    String timeoutsQuery =
+        forSubscription("hermes_consumers_subscription_timeouts_total", subName, "");
+    String retriesQuery =
+        forSubscription("hermes_consumers_subscription_retries_total", subName, "");
+    String throughputQuery =
+        forSubscription("hermes_consumers_subscription_throughput_bytes_total", subName, "");
+    String errorsQuery =
+        forSubscription("hermes_consumers_subscription_other_errors_total", subName, "");
+    String batchesQuery =
+        forSubscription("hermes_consumers_subscription_batches_total", subName, "");
+    String statusCodes2xxQuery =
+        forSubscriptionStatusCode(
+            "hermes_consumers_subscription_http_status_codes_total", subName, "2.*", "");
+    String statusCodes4xxQuery =
+        forSubscriptionStatusCode(
+            "hermes_consumers_subscription_http_status_codes_total", subName, "4.*", "");
+    String statusCodes5xxQuery =
+        forSubscriptionStatusCode(
+            "hermes_consumers_subscription_http_status_codes_total", subName, "5.*", "");
 
-    public String getEndpoint() {
-        return "http://localhost:" + wiremock.port();
-    }
+    stub(deliveredQuery, metrics.toPrometheusRateResponse());
+    stub(timeoutsQuery, metrics.toPrometheusDefaultResponse());
+    stub(retriesQuery, metrics.toPrometheusDefaultResponse());
+    stub(throughputQuery, metrics.toPrometheusThroughputResponse());
+    stub(errorsQuery, metrics.toPrometheusDefaultResponse());
+    stub(batchesQuery, metrics.toPrometheusDefaultResponse());
+    stub(statusCodes2xxQuery, metrics.toPrometheusStatusCodesResponse());
+    stub(statusCodes4xxQuery, metrics.toPrometheusStatusCodesResponse());
+    stub(statusCodes5xxQuery, metrics.toPrometheusStatusCodesResponse());
+  }
 
-    public void stubSubscriptionMetrics(SubscriptionMetrics metrics) {
-        SubscriptionName name = metrics.name();
-        String query = """
-                sum by (__name__, group, topic, subscription, status_code) (
-                  irate(
-                    {__name__=~'hermes_consumers_subscription_delivered_total|hermes_consumers_subscription_timeouts_total|hermes_consumers_subscription_throughput_bytes_total|hermes_consumers_subscription_other_errors_total|hermes_consumers_subscription_batches_total|hermes_consumers_subscription_http_status_codes_total', group='%s', topic='%s', subscription='%s', }[1m]
-                  ) keep_metric_names
-                )
-                """
-                .formatted(name.getTopicName().getGroupName(), name.getTopicName().getName(), name.getName())
-                .lines()
-                .map(String::stripLeading)
-                .collect(Collectors.joining());
-        wiremock.addStubMapping(
-                get(urlPathEqualTo("/api/v1/query"))
-                        .withQueryParam("query", equalTo(query))
-                        .willReturn(
-                                aResponse()
-                                        .withStatus(200)
-                                        .withHeader("Content-Type", "application/json")
-                                        .withBody(writeValueAsString(metrics.toPrometheusResponse()))
-                        )
-                        .build()
-        );
-    }
+  private void stub(String query, PrometheusResponse response) {
+    wiremock.addStubMapping(
+        get(urlPathEqualTo("/api/v1/query"))
+            .withQueryParam("query", equalTo(query))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withHeader("Content-Type", "application/json")
+                    .withBody(writeValueAsString(response)))
+            .build());
+  }
 
-    public void stubTopicMetrics(TopicMetrics metrics) {
-        TopicName name = metrics.name();
-        String query = """
-                sum by (__name__, group, topic) (
-                  irate(
-                    {__name__=~'hermes_frontend_topic_requests_total|hermes_consumers_subscription_delivered_total|hermes_frontend_topic_throughput_bytes_total', group='%s', topic='%s', }[1m]
-                  ) keep_metric_names
-                )
-                """
-                .formatted(name.getGroupName(), name.getName())
-                .lines()
-                .map(String::stripLeading)
-                .collect(Collectors.joining());
-        wiremock.addStubMapping(
-                get(urlPathEqualTo("/api/v1/query"))
-                        .withQueryParam("query", equalTo(query))
-                        .willReturn(
-                                aResponse()
-                                        .withStatus(200)
-                                        .withHeader("Content-Type", "application/json")
-                                        .withBody(writeValueAsString(metrics.toPrometheusResponse()))
-                        )
-                        .build()
-        );
-    }
+  public void stubTopicMetrics(TopicMetrics metrics) {
+    TopicName topicName = metrics.name();
+    String requestsQuery = forTopic("hermes_frontend_topic_requests_total", topicName, "");
+    String deliveredQuery =
+        forTopic("hermes_consumers_subscription_delivered_total", topicName, "");
+    String throughputQuery =
+        forTopic("hermes_frontend_topic_throughput_bytes_total", topicName, "");
 
-    public void stubDelay(Duration duration) {
-        var response = new PrometheusResponse("success", new PrometheusResponse.Data("vector", List.of()));
-        wiremock.addStubMapping(
-                get(urlPathEqualTo("/api/v1/query"))
-                        .withQueryParam("query", new AnythingPattern())
-                        .willReturn(
-                                aResponse()
-                                        .withStatus(200)
-                                        .withHeader("Content-Type", "application/json")
-                                        .withBody(writeValueAsString(response))
-                                        .withFixedDelay((int) duration.toMillis())
-                        )
-                        .build()
-        );
-    }
+    stub(requestsQuery, metrics.toPrometheusRequestsResponse());
+    stub(deliveredQuery, metrics.toDeliveredResponse());
+    stub(throughputQuery, metrics.toPrometheusThroughputResponse());
+  }
+
+  public void stubDelay(Duration duration) {
+    var response =
+        new PrometheusResponse("success", new PrometheusResponse.Data("vector", List.of()));
+    wiremock.addStubMapping(
+        get(urlPathEqualTo("/api/v1/query"))
+            .withQueryParam("query", new AnythingPattern())
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withHeader("Content-Type", "application/json")
+                    .withBody(writeValueAsString(response))
+                    .withFixedDelay((int) duration.toMillis()))
+            .build());
+  }
+
+  public void stub500Error() {
+    wiremock.addStubMapping(
+        get(urlPathEqualTo("/api/v1/query"))
+            .withQueryParam("query", new AnythingPattern())
+            .willReturn(aResponse().withStatus(500).withHeader("Content-Type", "application/json"))
+            .build());
+  }
 
-    private String writeValueAsString(Object o) {
-        try {
-            return objectMapper.writeValueAsString(o);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+  private String writeValueAsString(Object o) {
+    try {
+      return objectMapper.writeValueAsString(o);
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
     }
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/PrometheusResponse.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/PrometheusResponse.java
index f6aa84e197..3e92bbf33e 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/PrometheusResponse.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/PrometheusResponse.java
@@ -1,23 +1,13 @@
 package pl.allegro.tech.hermes.integrationtests.prometheus;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.List;
 
-record PrometheusResponse(@JsonProperty("status") String status,
-                          @JsonProperty("data") Data data) {
-
-    record Data(@JsonProperty("resultType") String resultType,
-                @JsonProperty("result") List<Result> results) {
-    }
+record PrometheusResponse(@JsonProperty("status") String status, @JsonProperty("data") Data data) {
 
-    record Result(@JsonProperty("metric") MetricName metricName,
-                  @JsonProperty("value") List<String> values) {
-    }
+  record Data(
+      @JsonProperty("resultType") String resultType,
+      @JsonProperty("result") List<Result> results) {}
 
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    record MetricName(@JsonProperty(value = "__name__") String name,
-                      @JsonProperty(value = "status_code") String statusCode) {
-    }
+  record Result(@JsonProperty("value") List<String> values) {}
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/SubscriptionMetrics.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/SubscriptionMetrics.java
index fbe2efbd0c..757b400385 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/SubscriptionMetrics.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/SubscriptionMetrics.java
@@ -1,73 +1,74 @@
 package pl.allegro.tech.hermes.integrationtests.prometheus;
 
-import pl.allegro.tech.hermes.api.SubscriptionName;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import pl.allegro.tech.hermes.api.SubscriptionName;
 
-public record SubscriptionMetrics(SubscriptionName name, int rate, int throughput, Map<String, Integer> ratePerStatusCode) {
+public record SubscriptionMetrics(
+    SubscriptionName name, int rate, int throughput, Map<String, Integer> ratePerStatusCode) {
 
-    private static final String TIMESTAMP = "1396860420";
-    private static final String SUBSCRIPTION_DELIVERED = "hermes_consumers_subscription_delivered_total";
-    private static final String SUBSCRIPTION_THROUGHPUT = "hermes_consumers_subscription_throughput_bytes_total";
-    private static final String SUBSCRIPTION_STATUS_CODES = "hermes_consumers_subscription_http_status_codes_total";
+  private static final String TIMESTAMP = "1396860420";
 
-    public static SubscriptionMetricsBuilder subscriptionMetrics(SubscriptionName name) {
-        return new SubscriptionMetricsBuilder(name);
-    }
+  public static SubscriptionMetricsBuilder subscriptionMetrics(SubscriptionName name) {
+    return new SubscriptionMetricsBuilder(name);
+  }
 
-    PrometheusResponse toPrometheusResponse() {
-        List<PrometheusResponse.Result> results = new ArrayList<>();
-        results.add(
-                new PrometheusResponse.Result(
-                        new PrometheusResponse.MetricName(SUBSCRIPTION_DELIVERED, null),
-                        List.of(TIMESTAMP, String.valueOf(rate)))
-        );
-        results.add(
-                new PrometheusResponse.Result(
-                        new PrometheusResponse.MetricName(SUBSCRIPTION_THROUGHPUT, null),
-                        List.of(TIMESTAMP, String.valueOf(throughput))
-                )
-        );
-        ratePerStatusCode.forEach((code, rate) -> results.add(
-                        new PrometheusResponse.Result(
-                                new PrometheusResponse.MetricName(SUBSCRIPTION_STATUS_CODES, code),
-                                List.of(TIMESTAMP, String.valueOf(rate))
-                        )
-                )
-        );
-        return new PrometheusResponse("success", new PrometheusResponse.Data("vector", results));
-    }
+  PrometheusResponse toPrometheusRateResponse() {
+    List<PrometheusResponse.Result> results = new ArrayList<>();
+    results.add(new PrometheusResponse.Result(List.of(TIMESTAMP, String.valueOf(rate))));
+    return new PrometheusResponse("success", new PrometheusResponse.Data("vector", results));
+  }
+
+  PrometheusResponse toPrometheusThroughputResponse() {
+    List<PrometheusResponse.Result> results = new ArrayList<>();
+    results.add(new PrometheusResponse.Result(List.of(TIMESTAMP, String.valueOf(throughput))));
+    return new PrometheusResponse("success", new PrometheusResponse.Data("vector", results));
+  }
 
-    public static class SubscriptionMetricsBuilder {
-        private final SubscriptionName name;
-        private int rate = 0;
-        private int throughput = 0;
-        private final Map<String, Integer> ratePerStatusCode = new HashMap<>();
+  PrometheusResponse toPrometheusStatusCodesResponse() {
+    List<PrometheusResponse.Result> results = new ArrayList<>();
+    ratePerStatusCode.forEach(
+        (code, rate) ->
+            results.add(new PrometheusResponse.Result(List.of(TIMESTAMP, String.valueOf(rate)))));
+    return new PrometheusResponse("success", new PrometheusResponse.Data("vector", results));
+  }
 
-        private SubscriptionMetricsBuilder(SubscriptionName name) {
-            this.name = name;
-        }
+  PrometheusResponse toPrometheusDefaultResponse() {
+    List<PrometheusResponse.Result> results = new ArrayList<>();
+    ratePerStatusCode.forEach(
+        (code, rate) -> results.add(new PrometheusResponse.Result(List.of(TIMESTAMP, "0.0"))));
+    return new PrometheusResponse("success", new PrometheusResponse.Data("vector", results));
+  }
 
-        public SubscriptionMetricsBuilder withRate(int rate) {
-            this.rate = rate;
-            return this;
-        }
+  public static class SubscriptionMetricsBuilder {
+    private final SubscriptionName name;
+    private int rate = 0;
+    private int throughput = 0;
+    private final Map<String, Integer> ratePerStatusCode = new HashMap<>();
 
-        public SubscriptionMetricsBuilder with500Rate(int rate) {
-            ratePerStatusCode.put("500", rate);
-            return this;
-        }
+    private SubscriptionMetricsBuilder(SubscriptionName name) {
+      this.name = name;
+    }
+
+    public SubscriptionMetricsBuilder withRate(int rate) {
+      this.rate = rate;
+      return this;
+    }
 
-        public SubscriptionMetricsBuilder withThroughput(int throughput) {
-            this.throughput = throughput;
-            return this;
-        }
+    public SubscriptionMetricsBuilder with500Rate(int rate) {
+      ratePerStatusCode.put("500", rate);
+      return this;
+    }
+
+    public SubscriptionMetricsBuilder withThroughput(int throughput) {
+      this.throughput = throughput;
+      return this;
+    }
 
-        public SubscriptionMetrics build() {
-            return new SubscriptionMetrics(name, rate, throughput, ratePerStatusCode);
-        }
+    public SubscriptionMetrics build() {
+      return new SubscriptionMetrics(name, rate, throughput, ratePerStatusCode);
     }
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/TopicMetrics.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/TopicMetrics.java
index 06ec44cf6b..321292f5e7 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/TopicMetrics.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/prometheus/TopicMetrics.java
@@ -1,70 +1,69 @@
 package pl.allegro.tech.hermes.integrationtests.prometheus;
 
-import pl.allegro.tech.hermes.api.TopicName;
-
 import java.util.List;
+import pl.allegro.tech.hermes.api.TopicName;
 
 public record TopicMetrics(TopicName name, int rate, int deliveryRate, int throughput) {
 
-    private static final String TIMESTAMP = "1396860420";
-    private static final String TOPIC_REQUESTS_TOTAL = "hermes_frontend_topic_requests_total";
-    private static final String TOPIC_DELIVERED_TOTAL = "hermes_consumers_subscription_delivered_total";
-    private static final String TOPIC_THROUGHPUT_TOTAL = "hermes_frontend_topic_throughput_bytes_total";
+  private static final String TIMESTAMP = "1396860420";
 
-    public static TopicMetricsBuilder topicMetrics(TopicName name) {
-        return new TopicMetricsBuilder(name);
-    }
+  public static TopicMetricsBuilder topicMetrics(TopicName name) {
+    return new TopicMetricsBuilder(name);
+  }
 
-    PrometheusResponse toPrometheusResponse() {
-        return new PrometheusResponse(
-                "success",
-                new PrometheusResponse.Data(
-                        "vector",
-                        List.of(
-                                new PrometheusResponse.Result(
-                                        new PrometheusResponse.MetricName(TOPIC_REQUESTS_TOTAL, null),
-                                        List.of(TIMESTAMP, String.valueOf(rate))
-                                ),
-                                new PrometheusResponse.Result(
-                                        new PrometheusResponse.MetricName(TOPIC_DELIVERED_TOTAL, null),
-                                        List.of(TIMESTAMP, String.valueOf(deliveryRate))
-                                ),
-                                new PrometheusResponse.Result(
-                                        new PrometheusResponse.MetricName(TOPIC_THROUGHPUT_TOTAL, null),
-                                        List.of(TIMESTAMP, String.valueOf(throughput))
-                                )
-                        )
-                )
-        );
-    }
+  PrometheusResponse toPrometheusRequestsResponse() {
+    return new PrometheusResponse(
+        "success",
+        new PrometheusResponse.Data(
+            "vector",
+            List.of(new PrometheusResponse.Result(List.of(TIMESTAMP, String.valueOf(rate))))));
+  }
 
-    public static class TopicMetricsBuilder {
-        private final TopicName name;
-        private int rate = 0;
-        private int deliveryRate = 0;
-        private int throughput = 0;
+  PrometheusResponse toDeliveredResponse() {
+    return new PrometheusResponse(
+        "success",
+        new PrometheusResponse.Data(
+            "vector",
+            List.of(
+                new PrometheusResponse.Result(List.of(TIMESTAMP, String.valueOf(deliveryRate))))));
+  }
 
-        private TopicMetricsBuilder(TopicName name) {
-            this.name = name;
-        }
+  PrometheusResponse toPrometheusThroughputResponse() {
+    return new PrometheusResponse(
+        "success",
+        new PrometheusResponse.Data(
+            "vector",
+            List.of(
+                new PrometheusResponse.Result(List.of(TIMESTAMP, String.valueOf(throughput))))));
+  }
 
-        public TopicMetricsBuilder withRate(int rate) {
-            this.rate = rate;
-            return this;
-        }
+  public static class TopicMetricsBuilder {
+    private final TopicName name;
+    private int rate = 0;
+    private int deliveryRate = 0;
+    private int throughput = 0;
 
-        public TopicMetricsBuilder withDeliveryRate(int deliveryRate) {
-            this.deliveryRate = deliveryRate;
-            return this;
-        }
+    private TopicMetricsBuilder(TopicName name) {
+      this.name = name;
+    }
 
-        public TopicMetricsBuilder withThroughput(int throughput) {
-            this.throughput = throughput;
-            return this;
-        }
+    public TopicMetricsBuilder withRate(int rate) {
+      this.rate = rate;
+      return this;
+    }
+
+    public TopicMetricsBuilder withDeliveryRate(int deliveryRate) {
+      this.deliveryRate = deliveryRate;
+      return this;
+    }
+
+    public TopicMetricsBuilder withThroughput(int throughput) {
+      this.throughput = throughput;
+      return this;
+    }
 
-        public TopicMetrics build() {
-            return new TopicMetrics(name, rate, deliveryRate, throughput);
-        }
+    public TopicMetrics build() {
+      return new TopicMetrics(name, rate, deliveryRate, throughput);
     }
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/GooglePubSubExtension.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/GooglePubSubExtension.java
index 2943486e47..6b7d3b136d 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/GooglePubSubExtension.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/GooglePubSubExtension.java
@@ -1,40 +1,39 @@
 package pl.allegro.tech.hermes.integrationtests.setup;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestGooglePubSubSubscriber;
 import pl.allegro.tech.hermes.test.helper.containers.GooglePubSubContainer;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 public class GooglePubSubExtension implements BeforeAllCallback, AfterAllCallback {
 
-    private final GooglePubSubContainer googlePubSubContainer = new GooglePubSubContainer();
-    private final List<TestGooglePubSubSubscriber> subscribers = new ArrayList<>();
-
-    @Override
-    public void beforeAll(ExtensionContext context) {
-        googlePubSubContainer.start();
-    }
-
-    @Override
-    public void afterAll(ExtensionContext context) {
-        for (TestGooglePubSubSubscriber subscriber : subscribers) {
-            subscriber.stop();
-        }
-        googlePubSubContainer.stop();
-    }
+  private final GooglePubSubContainer googlePubSubContainer = new GooglePubSubContainer();
+  private final List<TestGooglePubSubSubscriber> subscribers = new ArrayList<>();
 
-    public TestGooglePubSubSubscriber subscriber() throws IOException {
-        TestGooglePubSubSubscriber subscriber = new TestGooglePubSubSubscriber(getEmulatorEndpoint());
-        subscribers.add(subscriber);
-        return subscriber;
-    }
+  @Override
+  public void beforeAll(ExtensionContext context) {
+    googlePubSubContainer.start();
+  }
 
-    public String getEmulatorEndpoint() {
-        return googlePubSubContainer.getEmulatorEndpoint();
+  @Override
+  public void afterAll(ExtensionContext context) {
+    for (TestGooglePubSubSubscriber subscriber : subscribers) {
+      subscriber.stop();
     }
+    googlePubSubContainer.stop();
+  }
+
+  public TestGooglePubSubSubscriber subscriber() throws IOException {
+    TestGooglePubSubSubscriber subscriber = new TestGooglePubSubSubscriber(getEmulatorEndpoint());
+    subscribers.add(subscriber);
+    return subscriber;
+  }
+
+  public String getEmulatorEndpoint() {
+    return googlePubSubContainer.getEmulatorEndpoint();
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesConsumersTestApp.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesConsumersTestApp.java
index cfd207b007..1fb27df659 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesConsumersTestApp.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesConsumersTestApp.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.integrationtests.setup;
 
+import java.time.Duration;
+import java.util.List;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import pl.allegro.tech.hermes.consumers.HermesConsumers;
@@ -7,91 +9,91 @@
 import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
 import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
 import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
-
-import java.time.Duration;
-import java.util.List;
+import pl.allegro.tech.hermes.test.helper.environment.HermesTestApp;
 
 public class HermesConsumersTestApp implements HermesTestApp {
 
-    private final ZookeeperContainer hermesZookeeper;
-    private final KafkaContainerCluster kafka;
-    private final ConfluentSchemaRegistryContainer schemaRegistry;
+  private final ZookeeperContainer hermesZookeeper;
+  private final KafkaContainerCluster kafka;
+  private final ConfluentSchemaRegistryContainer schemaRegistry;
 
-    private int port = -1;
-    private SpringApplicationBuilder app = null;
-    private List<String> currentArgs = List.of();
-    private GooglePubSubExtension googlePubSub = null;
+  private int port = -1;
+  private SpringApplicationBuilder app = null;
+  private List<String> currentArgs = List.of();
+  private GooglePubSubExtension googlePubSub = null;
 
-    public HermesConsumersTestApp(ZookeeperContainer hermesZookeeper,
-                                  KafkaContainerCluster kafka,
-                                  ConfluentSchemaRegistryContainer schemaRegistry) {
-        this.hermesZookeeper = hermesZookeeper;
-        this.kafka = kafka;
-        this.schemaRegistry = schemaRegistry;
-    }
+  public HermesConsumersTestApp(
+      ZookeeperContainer hermesZookeeper,
+      KafkaContainerCluster kafka,
+      ConfluentSchemaRegistryContainer schemaRegistry) {
+    this.hermesZookeeper = hermesZookeeper;
+    this.kafka = kafka;
+    this.schemaRegistry = schemaRegistry;
+  }
 
-    @Override
-    public HermesTestApp start() {
-        app = new SpringApplicationBuilder(HermesConsumers.class)
-                .web(WebApplicationType.NONE);
-        currentArgs = createArgs();
-        app.run(currentArgs.toArray(new String[0]));
-        port = app.context().getBean(ConsumerHttpServer.class).getPort();
-        return this;
-    }
+  @Override
+  public HermesTestApp start() {
+    app = new SpringApplicationBuilder(HermesConsumers.class).web(WebApplicationType.NONE);
+    currentArgs = createArgs();
+    app.run(currentArgs.toArray(new String[0]));
+    port = app.context().getBean(ConsumerHttpServer.class).getPort();
+    return this;
+  }
 
-    @Override
-    public void stop() {
-        if (app != null) {
-            app.context().close();
-            app = null;
-        }
+  @Override
+  public void stop() {
+    if (app != null) {
+      app.context().close();
+      app = null;
     }
+  }
 
-    @Override
-    public int getPort() {
-        if (port == -1) {
-            throw new IllegalStateException("hermes-consumers port hasn't been initialized");
-        }
-        return port;
+  @Override
+  public int getPort() {
+    if (port == -1) {
+      throw new IllegalStateException("hermes-consumers port hasn't been initialized");
     }
+    return port;
+  }
 
-    boolean shouldBeRestarted() {
-        List<String> args = createArgs();
-        return !args.equals(currentArgs);
-    }
+  @Override
+  public boolean shouldBeRestarted() {
+    List<String> args = createArgs();
+    return !args.equals(currentArgs);
+  }
 
-    private List<String> createArgs() {
-        return List.of(
-                "--spring.profiles.active=integration",
-                "--consumer.healthCheckPort=0",
-                "--consumer.kafka.namespace=itTest",
-                "--consumer.kafka.clusters.[0].brokerList=" + kafka.getBootstrapServersForExternalClients(),
-                "--consumer.kafka.clusters.[0].clusterName=" + "primary-dc",
-                "--consumer.zookeeper.clusters.[0].connectionString=" + hermesZookeeper.getConnectionString(),
-                "--consumer.schema.repository.serverUrl=" + schemaRegistry.getUrl(),
-                "--consumer.backgroundSupervisor.interval=" + Duration.ofMillis(100),
-                "--consumer.workload.rebalanceInterval=" + Duration.ofSeconds(1),
-                "--consumer.commit.offset.period=" + Duration.ofSeconds(1),
-                "--consumer.metrics.micrometer.reportPeriod=" + Duration.ofSeconds(5),
-                "--consumer.schema.cache.enabled=true",
-                "--consumer.metrics.metric-registry.graphiteReporterEnabled=false",
-                "--consumer.google.pubsub.sender.transportChannelProviderAddress=" + getGooglePubSubEndpoint()
-        );
-    }
+  private List<String> createArgs() {
+    return List.of(
+        "--spring.profiles.active=integration",
+        "--consumer.healthCheckPort=0",
+        "--consumer.kafka.namespace=itTest",
+        "--consumer.kafka.clusters.[0].brokerList=" + kafka.getBootstrapServersForExternalClients(),
+        "--consumer.kafka.clusters.[0].clusterName=" + "primary-dc",
+        "--consumer.zookeeper.clusters.[0].connectionString="
+            + hermesZookeeper.getConnectionString(),
+        "--consumer.schema.repository.serverUrl=" + schemaRegistry.getUrl(),
+        "--consumer.backgroundSupervisor.interval=" + Duration.ofMillis(100),
+        "--consumer.workload.rebalanceInterval=" + Duration.ofSeconds(1),
+        "--consumer.commit.offset.period=" + Duration.ofSeconds(1),
+        "--consumer.metrics.micrometer.reportPeriod=" + Duration.ofSeconds(5),
+        "--consumer.schema.cache.enabled=true",
+        "--consumer.google.pubsub.sender.transportChannelProviderAddress="
+            + getGooglePubSubEndpoint());
+  }
 
-    private String getGooglePubSubEndpoint() {
-        if (googlePubSub == null) {
-            return "integration";
-        }
-        return googlePubSub.getEmulatorEndpoint();
+  private String getGooglePubSubEndpoint() {
+    if (googlePubSub == null) {
+      return "integration";
     }
+    return googlePubSub.getEmulatorEndpoint();
+  }
 
-    void withGooglePubSubEndpoint(GooglePubSubExtension googlePubSub) {
-        this.googlePubSub = googlePubSub;
-    }
+  void withGooglePubSubEndpoint(GooglePubSubExtension googlePubSub) {
+    this.googlePubSub = googlePubSub;
+  }
 
-    void restoreDefaultSettings() {
-        googlePubSub = null;
-    }
+  @Override
+  public void restoreDefaultSettings() {
+    googlePubSub = null;
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesExtension.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesExtension.java
index a61bd1af88..6f008480bd 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesExtension.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesExtension.java
@@ -1,157 +1,182 @@
 package pl.allegro.tech.hermes.integrationtests.setup;
 
-import com.jayway.awaitility.Duration;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.integrationtests.setup.HermesManagementTestApp.AUDIT_EVENT_PATH;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.stream.Stream;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.lifecycle.Startable;
 import pl.allegro.tech.hermes.api.Group;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.integrationtests.client.HermesTestClient;
+import pl.allegro.tech.hermes.domain.group.GroupNotEmptyException;
+import pl.allegro.tech.hermes.env.BrokerOperations;
+import pl.allegro.tech.hermes.integrationtests.prometheus.PrometheusExtension;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscriber;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
 import pl.allegro.tech.hermes.management.domain.group.GroupService;
 import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService;
 import pl.allegro.tech.hermes.management.domain.topic.TopicService;
-import pl.allegro.tech.hermes.integrationtests.prometheus.PrometheusExtension;
+import pl.allegro.tech.hermes.test.helper.client.integration.HermesInitHelper;
+import pl.allegro.tech.hermes.test.helper.client.integration.HermesTestClient;
 import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
 import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
 import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
-
-import java.util.List;
-import java.util.stream.Stream;
-
-import static pl.allegro.tech.hermes.integrationtests.setup.HermesManagementTestApp.AUDIT_EVENT_PATH;
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
-public class HermesExtension implements BeforeAllCallback, AfterAllCallback, ExtensionContext.Store.CloseableResource {
-
-    public static final TestSubscribersExtension auditEventsReceiver = new TestSubscribersExtension();
-
-    private static final ZookeeperContainer hermesZookeeper = new ZookeeperContainer("HermesZookeeper");
-    private static final KafkaContainerCluster kafka = new KafkaContainerCluster(1);
-    public static final ConfluentSchemaRegistryContainer schemaRegistry = new ConfluentSchemaRegistryContainer()
-            .withKafkaCluster(kafka);
-    private static final HermesConsumersTestApp consumers = new HermesConsumersTestApp(hermesZookeeper, kafka, schemaRegistry);
-    private static final HermesManagementTestApp management = new HermesManagementTestApp(hermesZookeeper, kafka, schemaRegistry);
-    private static final HermesFrontendTestApp frontend = new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry);
-    private HermesTestClient hermesTestClient;
-    private HermesInitHelper hermesInitHelper;
-    private static final RequestUser testUser = new TestUser();
-
-    private static boolean started = false;
-
-    public static TestSubscriber auditEvents;
-
-    @Override
-    public void beforeAll(ExtensionContext context) {
-        if (!started) {
-            Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::start);
-            schemaRegistry.start();
-            management.addEventAuditorListener(auditEventsReceiver.getPort());
-            management.start();
-            Stream.of(consumers, frontend).forEach(HermesTestApp::start);
-            started = true;
-        }
-        if (management.shouldBeRestarted()) {
-            management.stop();
-            management.start();
-        }
-        if (consumers.shouldBeRestarted()) {
-            consumers.stop();
-            consumers.start();
-        }
-        hermesTestClient = new HermesTestClient(management.getPort(), frontend.getPort(), consumers.getPort());
-        hermesInitHelper = new HermesInitHelper(management.getPort());
-        auditEvents = auditEventsReceiver.createSubscriberWithStrictPath(200, AUDIT_EVENT_PATH);
+import pl.allegro.tech.hermes.test.helper.environment.HermesTestApp;
+
+public class HermesExtension
+    implements BeforeAllCallback, AfterAllCallback, ExtensionContext.Store.CloseableResource {
+
+  private static final Logger logger = LoggerFactory.getLogger(HermesExtension.class);
+
+  public static final TestSubscribersExtension auditEventsReceiver = new TestSubscribersExtension();
+
+  private static final ZookeeperContainer hermesZookeeper =
+      new ZookeeperContainer("HermesZookeeper");
+  private static final KafkaContainerCluster kafka = new KafkaContainerCluster(1);
+  public static final ConfluentSchemaRegistryContainer schemaRegistry =
+      new ConfluentSchemaRegistryContainer().withKafkaCluster(kafka);
+  private static final HermesConsumersTestApp consumers =
+      new HermesConsumersTestApp(hermesZookeeper, kafka, schemaRegistry);
+  private static final HermesManagementTestApp management =
+      new HermesManagementTestApp(hermesZookeeper, kafka, schemaRegistry);
+  private static final HermesFrontendTestApp frontend =
+      new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry);
+  private HermesTestClient hermesTestClient;
+  private HermesInitHelper hermesInitHelper;
+  private static final RequestUser testUser = new TestUser();
+
+  private static boolean started = false;
+
+  public static TestSubscriber auditEvents;
+
+  public static BrokerOperations brokerOperations;
+
+  @Override
+  public void beforeAll(ExtensionContext context) {
+    if (!started) {
+      Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::start);
+      schemaRegistry.start();
+      management.addEventAuditorListener(auditEventsReceiver.getPort());
+      management.start();
+      Stream.of(consumers, frontend).forEach(HermesTestApp::start);
+      started = true;
     }
-
-    @Override
-    public void close() {
-        Stream.of(management, consumers, frontend).parallel().forEach(HermesTestApp::stop);
-        Stream.of(hermesZookeeper, kafka, schemaRegistry).parallel().forEach(Startable::stop);
-        started = false;
-    }
-
-    public int getFrontendPort() {
-        return frontend.getPort();
-    }
-
-    public HermesTestClient api() {
-        return hermesTestClient;
+    Stream.of(management, consumers, frontend)
+        .forEach(
+            app -> {
+              if (app.shouldBeRestarted()) {
+                app.stop();
+                app.start();
+              }
+            });
+    hermesTestClient =
+        new HermesTestClient(management.getPort(), frontend.getPort(), consumers.getPort());
+    hermesInitHelper = new HermesInitHelper(management.getPort());
+    auditEvents = auditEventsReceiver.createSubscriberWithStrictPath(200, AUDIT_EVENT_PATH);
+    brokerOperations =
+        new BrokerOperations(kafka.getBootstrapServersForExternalClients(), "itTest");
+  }
+
+  @Override
+  public void close() {
+    Stream.of(management, consumers, frontend).parallel().forEach(HermesTestApp::stop);
+    Stream.of(hermesZookeeper, kafka, schemaRegistry).parallel().forEach(Startable::stop);
+    started = false;
+  }
+
+  public int getFrontendPort() {
+    return frontend.getPort();
+  }
+
+  public HermesTestClient api() {
+    return hermesTestClient;
+  }
+
+  public HermesInitHelper initHelper() {
+    return hermesInitHelper;
+  }
+
+  public void cutOffConnectionsBetweenBrokersAndClients() {
+    kafka.cutOffConnectionsBetweenBrokersAndClients();
+  }
+
+  public void restoreConnectionsBetweenBrokersAndClients() {
+    kafka.restoreConnectionsBetweenBrokersAndClients();
+  }
+
+  private void removeSubscriptions() {
+    SubscriptionService service = management.subscriptionService();
+    List<Subscription> subscriptions = service.getAllSubscriptions();
+    for (Subscription subscription : subscriptions) {
+      service.removeSubscription(subscription.getTopicName(), subscription.getName(), testUser);
     }
 
-    public HermesInitHelper initHelper() {
-        return hermesInitHelper;
-    }
-
-    public void cutOffConnectionsBetweenBrokersAndClients() {
-        kafka.cutOffConnectionsBetweenBrokersAndClients();
-    }
-
-    public void restoreConnectionsBetweenBrokersAndClients() {
-        kafka.restoreConnectionsBetweenBrokersAndClients();
-    }
-
-    private void removeSubscriptions() {
-        SubscriptionService service = management.subscriptionService();
-        List<Subscription> subscriptions = service.getAllSubscriptions();
-        for (Subscription subscription : subscriptions) {
-            service.removeSubscription(subscription.getTopicName(), subscription.getName(), testUser);
-        }
-
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                Assertions.assertThat(service.getAllSubscriptions().size()).isEqualTo(0)
-        );
-    }
-
-    private void removeTopics() {
-        TopicService service = management.topicService();
-        List<Topic> topics = service.getAllTopics();
-        for (Topic topic : topics) {
-            service.removeTopicWithSchema(topic, testUser);
-        }
-
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                Assertions.assertThat(service.getAllTopics().size()).isEqualTo(0)
-        );
-    }
-
-    private void removeGroups() {
-        GroupService service = management.groupService();
-        List<Group> groups = service.listGroups();
-        for (Group group : groups) {
-            service.removeGroup(group.getGroupName(), testUser);
-        }
-
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() ->
-                Assertions.assertThat(service.listGroups().size()).isEqualTo(0)
-        );
-    }
-
-    public void clearManagementData() {
-        removeSubscriptions();
-        removeTopics();
-        removeGroups();
-    }
-
-    public HermesExtension withPrometheus(PrometheusExtension prometheus) {
-        management.withPrometheus(prometheus);
-        return this;
-    }
+    waitAtMost(adjust(Duration.ofMinutes(1)))
+        .untilAsserted(
+            () -> Assertions.assertThat(service.getAllSubscriptions().size()).isEqualTo(0));
+  }
 
-    public HermesExtension withGooglePubSub(GooglePubSubExtension googlePubSub) {
-        consumers.withGooglePubSubEndpoint(googlePubSub);
-        return this;
+  private void removeTopics() {
+    TopicService service = management.topicService();
+    List<Topic> topics = service.getAllTopics();
+    for (Topic topic : topics) {
+      service.removeTopicWithSchema(topic, testUser);
     }
 
-    @Override
-    public void afterAll(ExtensionContext context) {
-        management.restoreDefaultSettings();
-        consumers.restoreDefaultSettings();
+    waitAtMost(adjust(Duration.ofMinutes(1)))
+        .untilAsserted(() -> Assertions.assertThat(service.getAllTopics().size()).isEqualTo(0));
+  }
+
+  private void removeGroups() {
+    GroupService service = management.groupService();
+    List<Group> groups = service.listGroups();
+    for (Group group : groups) {
+      try {
+        service.removeGroup(group.getGroupName(), testUser);
+      } catch (GroupNotEmptyException e) {
+        logger.warn("Error during removing group: {}", group, e);
+      }
     }
+  }
+
+  public void clearManagementData() {
+    removeSubscriptions();
+    removeTopics();
+    removeGroups();
+  }
+
+  public HermesExtension withPrometheus(PrometheusExtension prometheus) {
+    management.withPrometheus(prometheus);
+    return this;
+  }
+
+  public HermesExtension withGooglePubSub(GooglePubSubExtension googlePubSub) {
+    consumers.withGooglePubSubEndpoint(googlePubSub);
+    return this;
+  }
+
+  public HermesExtension withFrontendProperty(String name, Object value) {
+    frontend.withProperty(name, value);
+    return this;
+  }
+
+  public HermesExtension withFrontendProfile(String profile) {
+    frontend.withSpringProfile(profile);
+    return this;
+  }
+
+  @Override
+  public void afterAll(ExtensionContext context) {
+    Stream.of(management, consumers, frontend).forEach(HermesTestApp::restoreDefaultSettings);
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesFrontendExtension.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesFrontendExtension.java
deleted file mode 100644
index f25e2d06c6..0000000000
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesFrontendExtension.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package pl.allegro.tech.hermes.integrationtests.setup;
-
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import pl.allegro.tech.hermes.integrationtests.client.FrontendTestClient;
-
-public class HermesFrontendExtension implements BeforeAllCallback, AfterAllCallback {
-
-    private final HermesFrontendTestApp frontend;
-    private FrontendTestClient client;
-
-    public HermesFrontendExtension(InfrastructureExtension infra) {
-        frontend = new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-    }
-
-    @Override
-    public void beforeAll(ExtensionContext context) {
-        frontend.start();
-        client = new FrontendTestClient(frontend.getPort());
-    }
-
-    @Override
-    public void afterAll(ExtensionContext context) {
-        frontend.stop();
-    }
-
-    public FrontendTestClient api() {
-        return client;
-    }
-}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesFrontendTestApp.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesFrontendTestApp.java
index 30099a71be..bac6553a69 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesFrontendTestApp.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesFrontendTestApp.java
@@ -1,17 +1,7 @@
 package pl.allegro.tech.hermes.integrationtests.setup;
 
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import pl.allegro.tech.hermes.frontend.HermesFrontend;
-import pl.allegro.tech.hermes.frontend.server.HermesServer;
-import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
-import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
-import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.AUTH_PASSWORD;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.AUTH_USERNAME;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_GRACEFUL_SHUTDOWN_ENABLED;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_HEADER_PROPAGATION_ALLOWED;
@@ -25,7 +15,6 @@
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_THROUGHPUT_FIXED_MAX;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_THROUGHPUT_TYPE;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.KAFKA_BROKER_LIST;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.KAFKA_NAMESPACE;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.KAFKA_PRODUCER_METADATA_MAX_AGE;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.METRICS_MICROMETER_REPORT_PERIOD;
@@ -34,126 +23,187 @@
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.SPRING_PROFILES_ACTIVE;
 import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.ZOOKEEPER_CONNECTION_STRING;
 
-public class HermesFrontendTestApp implements HermesTestApp {
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import pl.allegro.tech.hermes.frontend.HermesFrontend;
+import pl.allegro.tech.hermes.frontend.server.HermesServer;
+import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
+import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
+import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
+import pl.allegro.tech.hermes.test.helper.environment.HermesTestApp;
 
-    private final ZookeeperContainer hermesZookeeper;
-    private final KafkaContainerCluster kafka;
-    private final ConfluentSchemaRegistryContainer schemaRegistry;
-    private final SpringApplicationBuilder app = new SpringApplicationBuilder(HermesFrontend.class)
-            .web(WebApplicationType.NONE);
-
-    private int port = -1;
-    private boolean kafkaCheckEnabled = false;
-    private Duration metadataMaxAge = Duration.ofMinutes(5);
-    private Duration readinessCheckInterval = Duration.ofSeconds(1);
-    private final List<String> extraArgs = new ArrayList<>();
-
-    public HermesFrontendTestApp(ZookeeperContainer hermesZookeeper,
-                                 KafkaContainerCluster kafka,
-                                 ConfluentSchemaRegistryContainer schemaRegistry) {
-        this.hermesZookeeper = hermesZookeeper;
-        this.kafka = kafka;
-        this.schemaRegistry = schemaRegistry;
-    }
+public class HermesFrontendTestApp implements HermesTestApp {
 
-    public HermesFrontendTestApp withProperty(String name, Object value) {
-        this.extraArgs.add(getArgument(name, value));
-        return this;
+  private final ZookeeperContainer hermesZookeeper;
+  private final Map<String, KafkaContainerCluster> kafkaClusters;
+  private final ConfluentSchemaRegistryContainer schemaRegistry;
+  private SpringApplicationBuilder app;
+
+  private int port = -1;
+  private boolean kafkaCheckEnabled = false;
+  private Duration metadataMaxAge = Duration.ofMinutes(5);
+  private Duration readinessCheckInterval = Duration.ofSeconds(1);
+  private final Map<String, Object> extraArgs = new HashMap<>();
+  private final List<String> profiles = new ArrayList<>(List.of("integration"));
+  private List<String> currentArgs = List.of();
+
+  public HermesFrontendTestApp(
+      ZookeeperContainer hermesZookeeper,
+      KafkaContainerCluster kafka,
+      ConfluentSchemaRegistryContainer schemaRegistry) {
+    this.hermesZookeeper = hermesZookeeper;
+    this.schemaRegistry = schemaRegistry;
+    this.kafkaClusters = Map.of("dc", kafka);
+  }
+
+  public HermesFrontendTestApp(
+      ZookeeperContainer hermesZookeeper,
+      Map<String, KafkaContainerCluster> kafkaClusters,
+      ConfluentSchemaRegistryContainer schemaRegistry) {
+    this.hermesZookeeper = hermesZookeeper;
+    this.schemaRegistry = schemaRegistry;
+    this.kafkaClusters = kafkaClusters;
+  }
+
+  private String kafkaClusterProperty(int index, String name) {
+    return String.format("frontend.kafka.clusters[%d].%s", index, name);
+  }
+
+  public HermesFrontendTestApp withProperty(String name, Object value) {
+    this.extraArgs.put(name, value);
+    return this;
+  }
+
+  public HermesFrontendTestApp withSpringProfile(String profile) {
+    profiles.add(profile);
+    return this;
+  }
+
+  private List<String> createArgs() {
+    Map<String, Object> args = new HashMap<>();
+    args.put(SPRING_PROFILES_ACTIVE, String.join(",", profiles));
+    args.put(FRONTEND_PORT, 0);
+
+    args.put(KAFKA_NAMESPACE, "itTest");
+
+    var i = 0;
+    for (var entry : kafkaClusters.entrySet()) {
+      args.put(kafkaClusterProperty(i, "datacenter"), entry.getKey());
+      args.put(
+          kafkaClusterProperty(i, "brokerList"),
+          entry.getValue().getBootstrapServersForExternalClients());
+      i++;
     }
 
+    args.put(ZOOKEEPER_CONNECTION_STRING, hermesZookeeper.getConnectionString());
 
-    private  List<String> defaultFrontendArgs() {
-        List<String> args = new ArrayList<>();
-        args.add(getArgument(SPRING_PROFILES_ACTIVE, "integration"));
-        args.add(getArgument(FRONTEND_PORT, 0));
-
-        args.add(getArgument(KAFKA_NAMESPACE, "itTest"));
-        args.add(getArgument(KAFKA_BROKER_LIST, kafka.getBootstrapServersForExternalClients()));
-
-        args.add(getArgument(ZOOKEEPER_CONNECTION_STRING, hermesZookeeper.getConnectionString()));
-
-        args.add(getArgument(SCHEMA_CACHE_ENABLED, true));
-        args.add(getArgument(SCHEMA_REPOSITORY_SERVER_URL, schemaRegistry.getUrl()));
-
-        args.add(getArgument(FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED, kafkaCheckEnabled));
-        args.add(getArgument(FRONTEND_READINESS_CHECK_ENABLED, true));
-        args.add(getArgument(FRONTEND_READINESS_CHECK_INTERVAL_SECONDS, readinessCheckInterval));
-
-        args.add(getArgument(FRONTEND_HEADER_PROPAGATION_ENABLED, true));
-        args.add(getArgument(FRONTEND_HEADER_PROPAGATION_ALLOWED, "Trace-Id, Span-Id, Parent-Span-Id, Trace-Sampled, Trace-Reported"));
-
-        args.add(getArgument(KAFKA_PRODUCER_METADATA_MAX_AGE, metadataMaxAge));
-
-        args.add(getArgument(FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE,true));
-        args.add(getArgument(FRONTEND_IDLE_TIMEOUT, Duration.ofSeconds(2)));
-
-        args.add(getArgument(FRONTEND_THROUGHPUT_TYPE, "fixed"));
-        args.add(getArgument(FRONTEND_THROUGHPUT_FIXED_MAX,  50 * 1024L));
-
-        args.add(getArgument(FRONTEND_GRACEFUL_SHUTDOWN_ENABLED, false));
+    args.put(SCHEMA_CACHE_ENABLED, true);
+    args.put(SCHEMA_REPOSITORY_SERVER_URL, schemaRegistry.getUrl());
 
-        args.add(getArgument(METRICS_MICROMETER_REPORT_PERIOD, Duration.ofSeconds(1)));
+    args.put(FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED, kafkaCheckEnabled);
+    args.put(FRONTEND_READINESS_CHECK_ENABLED, true);
+    args.put(FRONTEND_READINESS_CHECK_INTERVAL_SECONDS, readinessCheckInterval);
 
-        args.add(getArgument(FRONTEND_MESSAGE_PREVIEW_ENABLED, true));
-        args.add(getArgument(FRONTEND_MESSAGE_PREVIEW_LOG_PERSIST_PERIOD, Duration.ofSeconds(1)));
+    args.put(FRONTEND_HEADER_PROPAGATION_ENABLED, true);
+    args.put(
+        FRONTEND_HEADER_PROPAGATION_ALLOWED,
+        "trace-id, span-id, parent-span-id, trace-sampled, trace-reported");
 
-        return args;
-    }
+    args.put(KAFKA_PRODUCER_METADATA_MAX_AGE, metadataMaxAge);
 
+    args.put(FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE, true);
+    args.put(FRONTEND_IDLE_TIMEOUT, Duration.ofSeconds(2));
 
-    @Override
-    public HermesTestApp start() {
-        List<String> args = defaultFrontendArgs();
-        args.addAll(extraArgs);
+    args.put(FRONTEND_THROUGHPUT_TYPE, "fixed");
+    args.put(FRONTEND_THROUGHPUT_FIXED_MAX, 50 * 1024L);
 
-        app.run(args.toArray(new String[0]));
+    args.put(FRONTEND_GRACEFUL_SHUTDOWN_ENABLED, false);
 
-        port = app.context().getBean(HermesServer.class).getPort();
-        return this;
-    }
+    args.put(METRICS_MICROMETER_REPORT_PERIOD, Duration.ofSeconds(1));
 
-    @Override
-    public void stop() {
-        app.context().close();
-    }
+    args.put(FRONTEND_MESSAGE_PREVIEW_ENABLED, true);
+    args.put(FRONTEND_MESSAGE_PREVIEW_LOG_PERSIST_PERIOD, Duration.ofSeconds(1));
 
-    @Override
-    public int getPort() {
-        if (port == -1) {
-            throw new IllegalStateException("hermes-frontend port hasn't been initialized");
-        }
-        return port;
-    }
+    args.put(AUTH_USERNAME, "username");
+    args.put(AUTH_PASSWORD, "password");
 
-    public int getSSLPort() {
-        return app.context().getBean(HermesServer.class).getSSLPort();
-    }
+    args.putAll(extraArgs);
 
-    public <T> T getBean(Class<T> clazz) {
-        return app.context().getBean(clazz);
-    }
+    return args.entrySet().stream().map(e -> getArgument(e.getKey(), e.getValue())).toList();
+  }
 
-    public HermesFrontendTestApp metadataMaxAgeInSeconds(int value) {
-        metadataMaxAge = Duration.ofSeconds(value);
-        return this;
-    }
-
-    public HermesFrontendTestApp readinessCheckIntervalInSeconds(int value) {
-        readinessCheckInterval = Duration.ofSeconds(value);
-        return this;
-    }
-
-    public HermesFrontendTestApp kafkaCheckEnabled() {
-        kafkaCheckEnabled = true;
-        return this;
-    }
+  @Override
+  public HermesTestApp start() {
+    app = new SpringApplicationBuilder(HermesFrontend.class).web(WebApplicationType.NONE);
+    currentArgs = createArgs();
+    app.run(currentArgs.toArray(new String[0]));
+    port = app.context().getBean(HermesServer.class).getPort();
+    return this;
+  }
 
-    public HermesFrontendTestApp kafkaCheckDisabled() {
-        kafkaCheckEnabled = false;
-        return this;
+  @Override
+  public void stop() {
+    if (app != null) {
+      app.context().close();
+      app = null;
     }
+  }
 
-    private static String getArgument(String config, Object value) {
-        return "--" + config + "=" + value;
+  @Override
+  public int getPort() {
+    if (port == -1) {
+      throw new IllegalStateException("hermes-frontend port hasn't been initialized");
     }
+    return port;
+  }
+
+  public int getSSLPort() {
+    return app.context().getBean(HermesServer.class).getSSLPort();
+  }
+
+  public <T> T getBean(Class<T> clazz) {
+    return app.context().getBean(clazz);
+  }
+
+  public HermesFrontendTestApp metadataMaxAgeInSeconds(int value) {
+    metadataMaxAge = Duration.ofSeconds(value);
+    return this;
+  }
+
+  public HermesFrontendTestApp readinessCheckIntervalInSeconds(int value) {
+    readinessCheckInterval = Duration.ofSeconds(value);
+    return this;
+  }
+
+  public HermesFrontendTestApp kafkaCheckEnabled() {
+    kafkaCheckEnabled = true;
+    return this;
+  }
+
+  public HermesFrontendTestApp kafkaCheckDisabled() {
+    kafkaCheckEnabled = false;
+    return this;
+  }
+
+  private static String getArgument(String config, Object value) {
+    return "--" + config + "=" + value;
+  }
+
+  @Override
+  public boolean shouldBeRestarted() {
+    List<String> args = createArgs();
+    return !args.equals(currentArgs);
+  }
+
+  @Override
+  public void restoreDefaultSettings() {
+    extraArgs.clear();
+    profiles.clear();
+    profiles.add("integration");
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesInitHelper.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesInitHelper.java
deleted file mode 100644
index 904d83791f..0000000000
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesInitHelper.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package pl.allegro.tech.hermes.integrationtests.setup;
-
-import com.jayway.awaitility.Duration;
-import pl.allegro.tech.hermes.api.Group;
-import pl.allegro.tech.hermes.api.OAuthProvider;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicWithSchema;
-import pl.allegro.tech.hermes.integrationtests.client.ManagementTestClient;
-
-import java.util.concurrent.TimeUnit;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class HermesInitHelper {
-
-    private final ManagementTestClient managementTestClient;
-
-    public HermesInitHelper(int managementPort) {
-        managementTestClient = new ManagementTestClient(managementPort);
-    }
-
-    public Topic createTopic(Topic topic) {
-        createGroupIfMissing(Group.from(topic.getName().getGroupName()));
-        managementTestClient.createTopic(TopicWithSchema.topicWithSchema(topic, null))
-                .expectStatus()
-                .is2xxSuccessful();
-        waitUntilTopicCreated(topic.getQualifiedName());
-        return topic;
-    }
-
-    public Topic createTopicWithSchema(TopicWithSchema topic) {
-        createGroupIfMissing(Group.from(topic.getName().getGroupName()));
-        managementTestClient.createTopic(topic)
-                .expectStatus()
-                .is2xxSuccessful();
-        waitUntilTopicCreated(topic.getQualifiedName());
-        return topic;
-    }
-
-    public Group createGroupIfMissing(Group group) {
-        if (managementTestClient.getGroups().contains(group.getGroupName())) {
-            return group;
-        }
-
-        managementTestClient.createGroup(group)
-                .expectStatus()
-                .is2xxSuccessful();
-        waitUntilGroupCreated(group.getGroupName());
-        return group;
-    }
-
-    public Group createGroup(Group group) {
-        managementTestClient.createGroup(group)
-            .expectStatus()
-            .is2xxSuccessful();
-        waitUntilGroupCreated(group.getGroupName());
-        return group;
-    }
-
-    private void waitUntilGroupCreated(String groupName) {
-        waitAtMost(new Duration(30, TimeUnit.SECONDS))
-            .until(() -> managementTestClient.getGroups().contains(groupName));
-    }
-
-    private void waitUntilTopicCreated(String topicQualifiedName) {
-        waitAtMost(Duration.TEN_SECONDS)
-            .until(() -> managementTestClient.getTopic(topicQualifiedName)
-                .expectStatus()
-                .is2xxSuccessful());
-    }
-
-    public Subscription createSubscription(Subscription subscription) {
-        managementTestClient.createSubscription(subscription)
-            .expectStatus()
-            .is2xxSuccessful();
-        waitUntilSubscriptionIsActive(subscription);
-        return subscription;
-    }
-
-    public void waitUntilSubscriptionIsActive(Subscription subscription) {
-        waitAtMost(Duration.TEN_SECONDS)
-            .until(() -> {
-                Subscription sub = managementTestClient.getSubscription(subscription.getQualifiedTopicName(), subscription.getName())
-                    .expectStatus()
-                    .is2xxSuccessful()
-                    .expectBody(Subscription.class)
-                    .returnResult()
-                    .getResponseBody();
-                assertThat(sub.getState()).isEqualTo(Subscription.State.ACTIVE);
-            });
-    }
-
-    public OAuthProvider createOAuthProvider(OAuthProvider provider) {
-        managementTestClient.createOAuthProvider(provider)
-                .expectStatus()
-                .is2xxSuccessful();
-        return provider;
-    }
-}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesManagementExtension.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesManagementExtension.java
index 6a30153742..260a4b2788 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesManagementExtension.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesManagementExtension.java
@@ -3,28 +3,30 @@
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import pl.allegro.tech.hermes.test.helper.client.integration.HermesInitHelper;
 
 public class HermesManagementExtension implements BeforeAllCallback, AfterAllCallback {
 
-    private final HermesManagementTestApp management;
-    private HermesInitHelper initHelper;
+  private final HermesManagementTestApp management;
+  private HermesInitHelper initHelper;
 
-    public HermesManagementExtension(InfrastructureExtension infra) {
-        management = new HermesManagementTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-    }
+  public HermesManagementExtension(InfrastructureExtension infra) {
+    management =
+        new HermesManagementTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
+  }
 
-    @Override
-    public void beforeAll(ExtensionContext context) {
-        management.start();
-        initHelper = new HermesInitHelper(management.getPort());
-    }
+  @Override
+  public void beforeAll(ExtensionContext context) {
+    management.start();
+    initHelper = new HermesInitHelper(management.getPort());
+  }
 
-    @Override
-    public void afterAll(ExtensionContext context) {
-        management.stop();
-    }
+  @Override
+  public void afterAll(ExtensionContext context) {
+    management.stop();
+  }
 
-    public HermesInitHelper initHelper() {
-        return initHelper;
-    }
+  public HermesInitHelper initHelper() {
+    return initHelper;
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesManagementTestApp.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesManagementTestApp.java
index 1a124fe890..4031abb32e 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesManagementTestApp.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesManagementTestApp.java
@@ -1,15 +1,9 @@
 package pl.allegro.tech.hermes.integrationtests.setup;
 
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.core.env.Environment;
-import pl.allegro.tech.hermes.integrationtests.prometheus.PrometheusExtension;
-import pl.allegro.tech.hermes.management.HermesManagement;
-import pl.allegro.tech.hermes.management.domain.group.GroupService;
-import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService;
-import pl.allegro.tech.hermes.management.domain.topic.TopicService;
-import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
-import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
-import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
 
 import java.io.IOException;
 import java.net.URI;
@@ -21,167 +15,199 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.core.env.Environment;
+import pl.allegro.tech.hermes.integrationtests.prometheus.PrometheusExtension;
+import pl.allegro.tech.hermes.management.HermesManagement;
+import pl.allegro.tech.hermes.management.domain.group.GroupService;
+import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService;
+import pl.allegro.tech.hermes.management.domain.topic.TopicService;
+import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
+import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
+import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
+import pl.allegro.tech.hermes.test.helper.environment.HermesTestApp;
 
 public class HermesManagementTestApp implements HermesTestApp {
 
-    private int port = -1;
-
-    private int auditEventPort = -1;
-
-    public static String AUDIT_EVENT_PATH = "/audit-events";
-
-    private final Map<String, ZookeeperContainer> hermesZookeepers;
-    private final Map<String, KafkaContainerCluster> kafkaClusters;
-    private final ConfluentSchemaRegistryContainer schemaRegistry;
-    private SpringApplicationBuilder app = null;
-    private List<String> currentArgs = List.of();
-    private PrometheusExtension prometheus = null;
-
-    public HermesManagementTestApp(ZookeeperContainer hermesZookeeper,
-                                   KafkaContainerCluster kafka,
-                                   ConfluentSchemaRegistryContainer schemaRegistry) {
-        this(Map.of(DEFAULT_DC_NAME, hermesZookeeper), Map.of(DEFAULT_DC_NAME, kafka), schemaRegistry);
-    }
-
-    public HermesManagementTestApp(Map<String, ZookeeperContainer> hermesZookeepers,
-                                   Map<String, KafkaContainerCluster> kafkaClusters,
-                                   ConfluentSchemaRegistryContainer schemaRegistry) {
-        this.hermesZookeepers = hermesZookeepers;
-        this.kafkaClusters = kafkaClusters;
-        this.schemaRegistry = schemaRegistry;
+  private int port = -1;
+
+  private int auditEventPort = -1;
+
+  public static String AUDIT_EVENT_PATH = "/audit-events";
+
+  private final Map<String, ZookeeperContainer> hermesZookeepers;
+  private final Map<String, KafkaContainerCluster> kafkaClusters;
+  private final ConfluentSchemaRegistryContainer schemaRegistry;
+  private SpringApplicationBuilder app = null;
+  private List<String> currentArgs = List.of();
+  private PrometheusExtension prometheus = null;
+
+  public HermesManagementTestApp(
+      ZookeeperContainer hermesZookeeper,
+      KafkaContainerCluster kafka,
+      ConfluentSchemaRegistryContainer schemaRegistry) {
+    this(Map.of(DEFAULT_DC_NAME, hermesZookeeper), Map.of(DEFAULT_DC_NAME, kafka), schemaRegistry);
+  }
+
+  public HermesManagementTestApp(
+      Map<String, ZookeeperContainer> hermesZookeepers,
+      Map<String, KafkaContainerCluster> kafkaClusters,
+      ConfluentSchemaRegistryContainer schemaRegistry) {
+    this.hermesZookeepers = hermesZookeepers;
+    this.kafkaClusters = kafkaClusters;
+    this.schemaRegistry = schemaRegistry;
+  }
+
+  @Override
+  public HermesTestApp start() {
+    currentArgs = createArgs();
+    app = new SpringApplicationBuilder(HermesManagement.class);
+    app.run(currentArgs.toArray(new String[0]));
+    String localServerPort =
+        app.context().getBean(Environment.class).getProperty("local.server.port");
+    if (localServerPort == null) {
+      throw new IllegalStateException("Cannot get hermes-management port");
     }
-
-    @Override
-    public HermesTestApp start() {
-        currentArgs = createArgs();
-        app = new SpringApplicationBuilder(HermesManagement.class);
-        app.run(currentArgs.toArray(new String[0]));
-        String localServerPort = app.context().getBean(Environment.class).getProperty("local.server.port");
-        if (localServerPort == null) {
-            throw new IllegalStateException("Cannot get hermes-management port");
-        }
-        port = Integer.parseInt(localServerPort);
-        waitUntilReady();
-        return this;
-    }
-
-    private void waitUntilReady() {
-        try {
-            HttpRequest request = HttpRequest.newBuilder()
-                    .uri(new URI("http://localhost:" + getPort() + "/mode"))
-                    .GET()
-                    .build();
-            HttpClient httpClient = HttpClient.newHttpClient();
-
-            waitAtMost(adjust(240), TimeUnit.SECONDS).until(() -> {
+    port = Integer.parseInt(localServerPort);
+    waitUntilReady();
+    return this;
+  }
+
+  private void waitUntilReady() {
+    try {
+      HttpRequest request =
+          HttpRequest.newBuilder()
+              .uri(new URI("http://localhost:" + getPort() + "/mode"))
+              .GET()
+              .build();
+      HttpClient httpClient = HttpClient.newHttpClient();
+
+      waitAtMost(adjust(240), TimeUnit.SECONDS)
+          .untilAsserted(
+              () -> {
                 try {
-                    HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-                    assertThat(response.body()).isEqualTo("readWrite");
+                  HttpResponse<String> response =
+                      httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+                  assertThat(response.body()).isEqualTo("readWrite");
                 } catch (IOException | InterruptedException e) {
-                    throw new AssertionError("Reading management mode failed", e);
+                  throw new AssertionError("Reading management mode failed", e);
                 }
-            });
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public int getPort() {
-        if (port == -1) {
-            throw new IllegalStateException("hermes-management port hasn't been initialized");
-        }
-        return port;
-    }
-
-    @Override
-    public void stop() {
-        if (app != null) {
-            app.context().close();
-            app = null;
-        }
-    }
-
-    public void addEventAuditorListener(int port) {
-        auditEventPort = port;
+              });
+    } catch (URISyntaxException e) {
+      throw new RuntimeException(e);
     }
+  }
 
-    void withPrometheus(PrometheusExtension prometheus) {
-        this.prometheus = prometheus;
+  @Override
+  public int getPort() {
+    if (port == -1) {
+      throw new IllegalStateException("hermes-management port hasn't been initialized");
     }
-
-    void restoreDefaultSettings() {
-        prometheus = null;
+    return port;
+  }
+
+  @Override
+  public void stop() {
+    if (app != null) {
+      app.context().close();
+      app = null;
     }
-
-    boolean shouldBeRestarted() {
-        List<String> args = createArgs();
-        return !args.equals(currentArgs);
+  }
+
+  public void addEventAuditorListener(int port) {
+    auditEventPort = port;
+  }
+
+  void withPrometheus(PrometheusExtension prometheus) {
+    this.prometheus = prometheus;
+  }
+
+  @Override
+  public void restoreDefaultSettings() {
+    prometheus = null;
+  }
+
+  @Override
+  public boolean shouldBeRestarted() {
+    List<String> args = createArgs();
+    return !args.equals(currentArgs);
+  }
+
+  private List<String> createArgs() {
+    List<String> args = new ArrayList<>();
+    args.add("--spring.profiles.active=integration");
+    args.add("--server.port=0");
+    args.add("--prometheus.client.enabled=true");
+    args.add("--prometheus.client.socketTimeoutMillis=500");
+    if (prometheus != null) {
+      args.add("--prometheus.client.externalMonitoringUrl=" + prometheus.getEndpoint());
+      args.add("--prometheus.client.cacheTtlSeconds=0");
     }
-
-    private List<String> createArgs() {
-        List<String> args = new ArrayList<>();
-        args.add("--spring.profiles.active=integration");
-        args.add("--server.port=0");
-        args.add("--prometheus.client.enabled=true");
-        args.add("--prometheus.client.socketTimeoutMillis=500");
-        if (prometheus != null) {
-            args.add("--prometheus.client.externalMonitoringUrl=" + prometheus.getEndpoint());
-            args.add("--prometheus.client.cacheTtlSeconds=0");
-        }
-        args.add("--topic.partitions=2");
-        args.add("--topic.uncleanLeaderElectionEnabled=false");
-        int smallestClusterSize =  kafkaClusters.values().stream()
-                .map(cluster -> cluster.getAllBrokers().size())
-                .min(Integer::compareTo)
-                .orElse(1);
-        args.add("--topic.replicationFactor=" + smallestClusterSize);
-        int idx = 0;
-        for (Map.Entry<String, ZookeeperContainer> zk : hermesZookeepers.entrySet()) {
-            args.add("--storage.clusters[" + idx + "].datacenter=" + zk.getKey());
-            args.add("--storage.clusters[" + idx + "].clusterName=zk");
-            args.add("--storage.clusters[" + idx + "].connectionString=" + zk.getValue().getConnectionString());
-            idx++;
-        }
-        idx = 0;
-        for (Map.Entry<String, KafkaContainerCluster> kafka : kafkaClusters.entrySet()) {
-            args.add("--kafka.clusters[" + idx + "].datacenter=" + kafka.getKey());
-            args.add("--kafka.clusters[" + idx + "].clusterName=primary");
-            args.add("--kafka.clusters[" + idx + "].bootstrapKafkaServer=" + kafka.getValue().getBootstrapServersForExternalClients());
-            args.add("--kafka.clusters[" + idx + "].namespace=itTest");
-            idx++;
-        }
-
-        args.add("--schema.repository.serverUrl=" + schemaRegistry.getUrl());
-        args.add("--topic.touchSchedulerEnabled=" + false);
-        args.add("--topic.allowRemoval=" + true);
-        args.add("--topic.allowedTopicLabels=" + "label-1, label-2, label-3");
-        if (auditEventPort != -1) {
-            args.add("--audit.isEventAuditEnabled=" + true);
-            args.add("--audit.eventUrl=" + "http://localhost:" + auditEventPort + AUDIT_EVENT_PATH);
-        }
-
-        args.add("--topic.removeSchema=" + true);
-        args.add("--schema.repository.type=schema_registry");
-        args.add("--schema.repository.deleteSchemaPathSuffix=");
-
-        return args;
+    args.add("--topic.partitions=2");
+    args.add("--topic.uncleanLeaderElectionEnabled=false");
+    int smallestClusterSize =
+        kafkaClusters.values().stream()
+            .map(cluster -> cluster.getAllBrokers().size())
+            .min(Integer::compareTo)
+            .orElse(1);
+    args.add("--topic.replicationFactor=" + smallestClusterSize);
+    int idx = 0;
+    for (Map.Entry<String, ZookeeperContainer> zk : hermesZookeepers.entrySet()) {
+      args.add("--storage.clusters[" + idx + "].datacenter=" + zk.getKey());
+      args.add("--storage.clusters[" + idx + "].clusterName=zk");
+      args.add(
+          "--storage.clusters["
+              + idx
+              + "].connectionString="
+              + zk.getValue().getConnectionString());
+      idx++;
     }
-
-    public SubscriptionService subscriptionService() {
-        return app.context().getBean(SubscriptionService.class);
+    idx = 0;
+    for (Map.Entry<String, KafkaContainerCluster> kafka : kafkaClusters.entrySet()) {
+      args.add("--kafka.clusters[" + idx + "].datacenter=" + kafka.getKey());
+      args.add("--kafka.clusters[" + idx + "].clusterName=primary");
+      args.add(
+          "--kafka.clusters["
+              + idx
+              + "].bootstrapKafkaServer="
+              + kafka.getValue().getBootstrapServersForExternalClients());
+      args.add("--kafka.clusters[" + idx + "].namespace=itTest");
+      idx++;
     }
 
-    public TopicService topicService() {
-        return app.context().getBean(TopicService.class);
+    args.add("--schema.repository.serverUrl=" + schemaRegistry.getUrl());
+    args.add("--topic.touchSchedulerEnabled=" + false);
+    args.add("--topic.allowRemoval=" + true);
+    args.add("--topic.allowedTopicLabels=" + "label-1, label-2, label-3");
+    if (auditEventPort != -1) {
+      args.add("--audit.isEventAuditEnabled=" + true);
+      args.add("--audit.eventUrl=" + "http://localhost:" + auditEventPort + AUDIT_EVENT_PATH);
     }
 
-    public GroupService groupService() {
-        return app.context().getBean(GroupService.class);
-    }
+    args.add("--topic.removeSchema=" + true);
+    args.add("--storage.pathPrefix=" + "/hermes");
+    args.add("--subscription.subscribersWithAccessToAnyTopic[0].ownerSource=" + "Plaintext");
+    args.add(
+        "--subscription.subscribersWithAccessToAnyTopic[0].ownerId="
+            + "subscriberAllowedToAccessAnyTopic");
+    args.add("--subscription.subscribersWithAccessToAnyTopic[0].protocols=" + "http, https");
+    args.add("--group.allowedGroupNameRegex=" + "[a-zA-Z0-9_.-]+");
+    args.add("--group.nonAdminCreationEnabled=" + true);
+    args.add("--schema.repository.type=schema_registry");
+    args.add("--schema.repository.deleteSchemaPathSuffix=");
+
+    return args;
+  }
+
+  public SubscriptionService subscriptionService() {
+    return app.context().getBean(SubscriptionService.class);
+  }
+
+  public TopicService topicService() {
+    return app.context().getBean(TopicService.class);
+  }
+
+  public GroupService groupService() {
+    return app.context().getBean(GroupService.class);
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesTestApp.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesTestApp.java
deleted file mode 100644
index e07fb57ed4..0000000000
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/HermesTestApp.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.allegro.tech.hermes.integrationtests.setup;
-
-public interface HermesTestApp {
-
-    HermesTestApp start();
-
-    void stop();
-
-    int getPort();
-}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/InfrastructureExtension.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/InfrastructureExtension.java
index fbddd75730..a8088266b2 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/InfrastructureExtension.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/InfrastructureExtension.java
@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.integrationtests.setup;
 
+import java.util.stream.Stream;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.testcontainers.lifecycle.Startable;
@@ -7,40 +8,40 @@
 import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
 import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
 
-import java.util.stream.Stream;
-
-public class InfrastructureExtension implements BeforeAllCallback, ExtensionContext.Store.CloseableResource {
-    private static final KafkaContainerCluster kafka = new KafkaContainerCluster(1);
-    private static final ZookeeperContainer hermesZookeeper = new ZookeeperContainer("HermesZookeeper");
-    private static final ConfluentSchemaRegistryContainer schemaRegistry = new ConfluentSchemaRegistryContainer()
-            .withKafkaCluster(kafka);
-
-    private static boolean started = false;
-
-    public KafkaContainerCluster kafka() {
-        return kafka;
-    }
-
-    public ZookeeperContainer hermesZookeeper() {
-        return hermesZookeeper;
-    }
-
-    public ConfluentSchemaRegistryContainer schemaRegistry() {
-        return schemaRegistry;
+public class InfrastructureExtension
+    implements BeforeAllCallback, ExtensionContext.Store.CloseableResource {
+  private static final KafkaContainerCluster kafka = new KafkaContainerCluster(1);
+  private static final ZookeeperContainer hermesZookeeper =
+      new ZookeeperContainer("HermesZookeeper");
+  private static final ConfluentSchemaRegistryContainer schemaRegistry =
+      new ConfluentSchemaRegistryContainer().withKafkaCluster(kafka);
+
+  private static boolean started = false;
+
+  public KafkaContainerCluster kafka() {
+    return kafka;
+  }
+
+  public ZookeeperContainer hermesZookeeper() {
+    return hermesZookeeper;
+  }
+
+  public ConfluentSchemaRegistryContainer schemaRegistry() {
+    return schemaRegistry;
+  }
+
+  @Override
+  public void beforeAll(ExtensionContext context) {
+    if (!started) {
+      Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::start);
+      schemaRegistry.start();
+      started = true;
     }
+  }
 
-    @Override
-    public void beforeAll(ExtensionContext context) {
-        if (!started) {
-            Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::start);
-            schemaRegistry.start();
-            started = true;
-        }
-    }
-
-    @Override
-    public void close() {
-        Stream.of(hermesZookeeper, kafka, schemaRegistry).parallel().forEach(Startable::stop);
-        started = false;
-    }
+  @Override
+  public void close() {
+    Stream.of(hermesZookeeper, kafka, schemaRegistry).parallel().forEach(Startable::stop);
+    started = false;
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/JmsStarter.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/JmsStarter.java
index d735c5b9e4..70197cf3b0 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/JmsStarter.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/JmsStarter.java
@@ -5,21 +5,21 @@
 
 public class JmsStarter implements Starter<EmbeddedJMS> {
 
-    private EmbeddedJMS jmsServer;
+  private EmbeddedJMS jmsServer;
 
-    @Override
-    public void start() throws Exception {
-        jmsServer = new EmbeddedJMS();
-        jmsServer.start();
-    }
+  @Override
+  public void start() throws Exception {
+    jmsServer = new EmbeddedJMS();
+    jmsServer.start();
+  }
 
-    @Override
-    public void stop() throws Exception {
-        jmsServer.stop();
-    }
+  @Override
+  public void stop() throws Exception {
+    jmsServer.stop();
+  }
 
-    @Override
-    public EmbeddedJMS instance() {
-        return jmsServer;
-    }
+  @Override
+  public EmbeddedJMS instance() {
+    return jmsServer;
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/TestUser.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/TestUser.java
index e3a32320a1..dac3b7a817 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/TestUser.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/TestUser.java
@@ -4,19 +4,18 @@
 import pl.allegro.tech.hermes.management.domain.auth.RequestUser;
 
 class TestUser implements RequestUser {
-    @Override
-    public String getUsername() {
-        return "test_user";
-    }
+  @Override
+  public String getUsername() {
+    return "test_user";
+  }
 
-    @Override
-    public boolean isAdmin() {
-        return true;
-    }
-
-    @Override
-    public boolean isOwner(OwnerId ownerId) {
-        return true;
-    }
-};
+  @Override
+  public boolean isAdmin() {
+    return true;
+  }
 
+  @Override
+  public boolean isOwner(OwnerId ownerId) {
+    return true;
+  }
+}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/TraceContext.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/TraceContext.java
index 60f153eb2a..ae766cb863 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/TraceContext.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/setup/TraceContext.java
@@ -2,88 +2,55 @@
 
 import java.util.UUID;
 
-public class TraceContext {
+public record TraceContext(
+    String traceId, String spanId, String parentSpanId, String traceSampled, String traceReported) {
 
-    private final String traceId;
-    private final String spanId;
-    private final String parentSpanId;
-    private final String traceSampled;
-    private final String traceReported;
+  public static TraceContext random() {
 
-    public TraceContext(String traceId, String spanId, String parentSpanId, String traceSampled, String traceReported) {
-        this.traceId = traceId;
-        this.spanId = spanId;
-        this.parentSpanId = parentSpanId;
-        this.traceSampled = traceSampled;
-        this.traceReported = traceReported;
-    }
+    return new Builder()
+        .withTraceId(UUID.randomUUID().toString())
+        .withSpanId(UUID.randomUUID().toString())
+        .withParentSpanId(UUID.randomUUID().toString())
+        .withTraceSampled("1")
+        .withTraceReported("0")
+        .build();
+  }
 
-    public String getTraceId() {
-        return traceId;
-    }
+  public static class Builder {
 
-    public String getSpanId() {
-        return spanId;
-    }
+    private String traceId;
+    private String spanId;
+    private String parentSpanId;
+    private String traceSampled;
+    private String traceReported;
 
-    public String getParentSpanId() {
-        return parentSpanId;
+    public Builder withTraceId(String traceId) {
+      this.traceId = traceId;
+      return this;
     }
 
-    public String getTraceSampled() {
-        return traceSampled;
+    public Builder withSpanId(String spanId) {
+      this.spanId = spanId;
+      return this;
     }
 
-    public String getTraceReported() {
-        return traceReported;
+    public Builder withParentSpanId(String parentSpanId) {
+      this.parentSpanId = parentSpanId;
+      return this;
     }
 
-    public static TraceContext random() {
-
-        return new Builder()
-                .withTraceId(UUID.randomUUID().toString())
-                .withSpanId(UUID.randomUUID().toString())
-                .withParentSpanId(UUID.randomUUID().toString())
-                .withTraceSampled("1")
-                .withTraceReported("0")
-                .build();
+    public Builder withTraceSampled(String traceSampled) {
+      this.traceSampled = traceSampled;
+      return this;
     }
 
-    public static class Builder {
-
-        private String traceId;
-        private String spanId;
-        private String parentSpanId;
-        private String traceSampled;
-        private String traceReported;
-
-        public Builder withTraceId(String traceId) {
-            this.traceId = traceId;
-            return this;
-        }
-
-        public Builder withSpanId(String spanId) {
-            this.spanId = spanId;
-            return this;
-        }
-
-        public Builder withParentSpanId(String parentSpanId) {
-            this.parentSpanId = parentSpanId;
-            return this;
-        }
-
-        public Builder withTraceSampled(String traceSampled) {
-            this.traceSampled = traceSampled;
-            return this;
-        }
-
-        public Builder withTraceReported(String traceReported) {
-            this.traceReported = traceReported;
-            return this;
-        }
+    public Builder withTraceReported(String traceReported) {
+      this.traceReported = traceReported;
+      return this;
+    }
 
-        public TraceContext build() {
-            return new TraceContext(traceId, spanId, parentSpanId, traceSampled, traceReported);
-        }
+    public TraceContext build() {
+      return new TraceContext(traceId, spanId, parentSpanId, traceSampled, traceReported);
     }
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestGooglePubSubSubscriber.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestGooglePubSubSubscriber.java
index 85616b5446..f7b576570c 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestGooglePubSubSubscriber.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestGooglePubSubSubscriber.java
@@ -1,5 +1,7 @@
 package pl.allegro.tech.hermes.integrationtests.subscriber;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.google.api.gax.core.CredentialsProvider;
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GrpcTransportChannel;
@@ -20,86 +22,91 @@
 import com.google.pubsub.v1.TopicName;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class TestGooglePubSubSubscriber {
 
-    private static final String GOOGLE_PUBSUB_PROJECT_ID = "test-project";
-    private static final AtomicInteger sequence = new AtomicInteger();
+  private static final String GOOGLE_PUBSUB_PROJECT_ID = "test-project";
+  private static final AtomicInteger sequence = new AtomicInteger();
 
-    private final CredentialsProvider credentialsProvider;
-    private final TransportChannelProvider transportChannelProvider;
-    private final ManagedChannel channel;
-    private final String endpoint;
-    private final String subscription;
-    private final List<ReceivedMessage> receivedMessages = new ArrayList<>();
+  private final CredentialsProvider credentialsProvider;
+  private final TransportChannelProvider transportChannelProvider;
+  private final ManagedChannel channel;
+  private final String endpoint;
+  private final String subscription;
+  private final List<ReceivedMessage> receivedMessages = new ArrayList<>();
 
-    public TestGooglePubSubSubscriber(String emulatorEndpoint) {
-        this.credentialsProvider = NoCredentialsProvider.create();
-        this.channel = ManagedChannelBuilder.forTarget(emulatorEndpoint).usePlaintext().build();
-        this.transportChannelProvider = FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
-        String topicId = "test-topic" + sequence.incrementAndGet();
-        String topic = TopicName.format(GOOGLE_PUBSUB_PROJECT_ID, topicId);
-        subscription = ProjectSubscriptionName.format(GOOGLE_PUBSUB_PROJECT_ID, "test-subscription" + sequence.incrementAndGet());
-        try {
-            createTopic(topic);
-            createSubscription(subscription, topic);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        endpoint = "googlepubsub://pubsub.googleapis.com:443/projects/%s/topics/%s".formatted(GOOGLE_PUBSUB_PROJECT_ID, topicId);
+  public TestGooglePubSubSubscriber(String emulatorEndpoint) {
+    this.credentialsProvider = NoCredentialsProvider.create();
+    this.channel = ManagedChannelBuilder.forTarget(emulatorEndpoint).usePlaintext().build();
+    this.transportChannelProvider =
+        FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
+    String topicId = "test-topic" + sequence.incrementAndGet();
+    String topic = TopicName.format(GOOGLE_PUBSUB_PROJECT_ID, topicId);
+    subscription =
+        ProjectSubscriptionName.format(
+            GOOGLE_PUBSUB_PROJECT_ID, "test-subscription" + sequence.incrementAndGet());
+    try {
+      createTopic(topic);
+      createSubscription(subscription, topic);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
     }
+    endpoint =
+        "googlepubsub://pubsub.googleapis.com:443/projects/%s/topics/%s"
+            .formatted(GOOGLE_PUBSUB_PROJECT_ID, topicId);
+  }
 
-    private void createTopic(String topicName) throws IOException {
-        TopicAdminSettings topicAdminSettings = TopicAdminSettings.newBuilder()
-                .setTransportChannelProvider(transportChannelProvider)
-                .setCredentialsProvider(credentialsProvider)
-                .build();
-        try (TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings)) {
-            topicAdminClient.createTopic(topicName);
-        }
+  private void createTopic(String topicName) throws IOException {
+    TopicAdminSettings topicAdminSettings =
+        TopicAdminSettings.newBuilder()
+            .setTransportChannelProvider(transportChannelProvider)
+            .setCredentialsProvider(credentialsProvider)
+            .build();
+    try (TopicAdminClient topicAdminClient = TopicAdminClient.create(topicAdminSettings)) {
+      topicAdminClient.createTopic(topicName);
     }
+  }
 
-    private void createSubscription(String subscriptionName, String topicName) throws IOException {
-        SubscriptionAdminSettings subscriptionAdminSettings = SubscriptionAdminSettings.newBuilder()
-                .setTransportChannelProvider(transportChannelProvider)
-                .setCredentialsProvider(credentialsProvider)
-                .build();
-        SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create(subscriptionAdminSettings);
-        subscriptionAdminClient.createSubscription(subscriptionName, topicName, PushConfig.getDefaultInstance(), 10);
-    }
+  private void createSubscription(String subscriptionName, String topicName) throws IOException {
+    SubscriptionAdminSettings subscriptionAdminSettings =
+        SubscriptionAdminSettings.newBuilder()
+            .setTransportChannelProvider(transportChannelProvider)
+            .setCredentialsProvider(credentialsProvider)
+            .build();
+    SubscriptionAdminClient subscriptionAdminClient =
+        SubscriptionAdminClient.create(subscriptionAdminSettings);
+    subscriptionAdminClient.createSubscription(
+        subscriptionName, topicName, PushConfig.getDefaultInstance(), 10);
+  }
 
-    public String getEndpoint() {
-        return endpoint;
-    }
+  public String getEndpoint() {
+    return endpoint;
+  }
 
-    public void waitUntilAnyMessageReceived()  throws IOException {
-        SubscriberStubSettings subscriberStubSettings = SubscriberStubSettings.newBuilder()
-                        .setTransportChannelProvider(transportChannelProvider)
-                        .setCredentialsProvider(credentialsProvider)
-                        .build();
-        try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
-            PullRequest pullRequest = PullRequest.newBuilder()
-                    .setMaxMessages(1)
-                    .setSubscription(subscription)
-                    .build();
-            PullResponse pullResponse = subscriber.pullCallable().call(pullRequest);
-            assertThat(pullResponse.getReceivedMessagesList()).isNotEmpty();
-            receivedMessages.addAll(pullResponse.getReceivedMessagesList());
-        }
+  public void waitUntilAnyMessageReceived() throws IOException {
+    SubscriberStubSettings subscriberStubSettings =
+        SubscriberStubSettings.newBuilder()
+            .setTransportChannelProvider(transportChannelProvider)
+            .setCredentialsProvider(credentialsProvider)
+            .build();
+    try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
+      PullRequest pullRequest =
+          PullRequest.newBuilder().setMaxMessages(1).setSubscription(subscription).build();
+      PullResponse pullResponse = subscriber.pullCallable().call(pullRequest);
+      assertThat(pullResponse.getReceivedMessagesList()).isNotEmpty();
+      receivedMessages.addAll(pullResponse.getReceivedMessagesList());
     }
+  }
 
-    public List<ReceivedMessage> getAllReceivedMessages() {
-        return receivedMessages;
-    }
+  public List<ReceivedMessage> getAllReceivedMessages() {
+    return receivedMessages;
+  }
 
-    public void stop() {
-        channel.shutdown();
-    }
+  public void stop() {
+    channel.shutdown();
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestJmsSubscriber.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestJmsSubscriber.java
index f8ecc77a27..fff3843b3d 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestJmsSubscriber.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestJmsSubscriber.java
@@ -1,12 +1,11 @@
 package pl.allegro.tech.hermes.integrationtests.subscriber;
 
-import com.jayway.awaitility.Duration;
-import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.api.jms.HornetQJMSClient;
-import org.hornetq.api.jms.JMSFactoryType;
-import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
 
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -15,75 +14,82 @@
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.Topic;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+import org.hornetq.api.core.TransportConfiguration;
+import org.hornetq.api.jms.HornetQJMSClient;
+import org.hornetq.api.jms.JMSFactoryType;
+import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
 
 public class TestJmsSubscriber {
 
-    private static final int DEFAULT_WAIT_TIME_IN_SEC = 10;
-
-    private final List<Message> receivedRequests = Collections.synchronizedList(new ArrayList<>());
+  private static final int DEFAULT_WAIT_TIME_IN_SEC = 10;
 
-    public TestJmsSubscriber(String topicName) {
-        initializeContext(topicName);
-    }
+  private final List<Message> receivedRequests = Collections.synchronizedList(new ArrayList<>());
 
-    private void initializeContext(String topicName) {
-        TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getName());
-        ConnectionFactory connectionFactory = HornetQJMSClient.createConnectionFactoryWithHA(
-                JMSFactoryType.TOPIC_CF,
-                transportConfiguration);
+  public TestJmsSubscriber(String topicName) {
+    initializeContext(topicName);
+  }
 
-        JMSContext jmsContext = connectionFactory.createContext();
+  private void initializeContext(String topicName) {
+    TransportConfiguration transportConfiguration =
+        new TransportConfiguration(NettyConnectorFactory.class.getName());
+    ConnectionFactory connectionFactory =
+        HornetQJMSClient.createConnectionFactoryWithHA(
+            JMSFactoryType.TOPIC_CF, transportConfiguration);
 
-        Topic topic = jmsContext.createTopic(topicName);
-        jmsContext.createConsumer(topic).setMessageListener(this::onRequestReceived);
+    JMSContext jmsContext = connectionFactory.createContext();
 
-    }
+    Topic topic = jmsContext.createTopic(topicName);
+    jmsContext.createConsumer(topic).setMessageListener(this::onRequestReceived);
+  }
 
-    void onRequestReceived(Message request) {
-        receivedRequests.add(request);
-    }
+  void onRequestReceived(Message request) {
+    receivedRequests.add(request);
+  }
 
-    public void waitUntilReceived(String body) {
-        awaitWithSyncRequests(() ->
-                assertThat(
-                        receivedRequests.stream()
-                                .filter(r -> {
-                                    try {
-                                        String s = new String(r.getBody(byte[].class), StandardCharsets.UTF_8);
-                                        return s.equals(body);
-                                    } catch (JMSException e) {
-                                        throw new RuntimeException(e);
-                                    }
-                                })
-                                .findFirst()
-                ).isNotEmpty());
-    }
+  public void waitUntilReceived(String body) {
+    awaitWithSyncRequests(
+        () ->
+            assertThat(
+                    receivedRequests.stream()
+                        .filter(
+                            r -> {
+                              try {
+                                String s =
+                                    new String(r.getBody(byte[].class), StandardCharsets.UTF_8);
+                                return s.equals(body);
+                              } catch (JMSException e) {
+                                throw new RuntimeException(e);
+                              }
+                            })
+                        .findFirst())
+                .isNotEmpty());
+  }
 
-    public void waitUntilMessageWithHeaderReceived(String headerName, String headerValue) {
-        awaitWithSyncRequests(() ->
-                assertThat(
-                        receivedRequests.stream()
-                                .filter(r -> {
-                                    try {
-                                        return r.getStringProperty(headerName).equals(headerValue);
-                                    } catch (JMSException e) {
-                                        throw new RuntimeException(e);
-                                    }
-                                })
-                                .findFirst())
-                        .isNotEmpty());
-    }
+  public void waitUntilMessageWithHeaderReceived(String headerName, String headerValue) {
+    awaitWithSyncRequests(
+        () ->
+            assertThat(
+                    receivedRequests.stream()
+                        .filter(
+                            r -> {
+                              try {
+                                return r.getStringProperty(headerName).equals(headerValue);
+                              } catch (JMSException e) {
+                                throw new RuntimeException(e);
+                              }
+                            })
+                        .findFirst())
+                .isNotEmpty());
+  }
 
-    private void awaitWithSyncRequests(Runnable runnable) {
-        await().atMost(adjust(new Duration(DEFAULT_WAIT_TIME_IN_SEC, SECONDS))).until(() -> {
-            synchronized (receivedRequests) {
+  private void awaitWithSyncRequests(Runnable runnable) {
+    await()
+        .atMost(adjust(Duration.ofSeconds(DEFAULT_WAIT_TIME_IN_SEC)))
+        .untilAsserted(
+            () -> {
+              synchronized (receivedRequests) {
                 runnable.run();
-            }
-        });
-    }
-}
\ No newline at end of file
+              }
+            });
+  }
+}
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestSubscriber.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestSubscriber.java
index d502051294..d20a33f6e6 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestSubscriber.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestSubscriber.java
@@ -1,10 +1,13 @@
 package pl.allegro.tech.hermes.integrationtests.subscriber;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import com.google.common.collect.Streams;
-import com.jayway.awaitility.Duration;
-
 import java.net.URI;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -13,122 +16,135 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static com.jayway.awaitility.Awaitility.await;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
 public class TestSubscriber {
 
-    private static final int DEFAULT_WAIT_TIME_IN_SEC = 10;
-    private final URI subscriberUrl;
-    private final List<LoggedRequest> receivedRequests = Collections.synchronizedList(new ArrayList<>());
+  private static final int DEFAULT_WAIT_TIME_IN_SEC = 10;
+  private final URI subscriberUrl;
+  private final List<LoggedRequest> receivedRequests =
+      Collections.synchronizedList(new ArrayList<>());
 
-    TestSubscriber(URI subscriberUrl) {
-        this.subscriberUrl = subscriberUrl;
-    }
+  TestSubscriber(URI subscriberUrl) {
+    this.subscriberUrl = subscriberUrl;
+  }
 
-    void onRequestReceived(LoggedRequest request) {
-        receivedRequests.add(request);
-    }
+  void onRequestReceived(LoggedRequest request) {
+    receivedRequests.add(request);
+  }
 
-    public String getEndpoint() {
-        return subscriberUrl.toString();
-    }
+  public String getEndpoint() {
+    return subscriberUrl.toString();
+  }
 
-    public int getPort() {
-        return subscriberUrl.getPort();
-    }
+  public int getPort() {
+    return subscriberUrl.getPort();
+  }
 
-    public String getPath() {
-        return subscriberUrl.getPath();
-    }
+  public String getPath() {
+    return subscriberUrl.getPath();
+  }
 
-    public void waitUntilReceived(String body) {
-        awaitWithSyncRequests(() ->
+  public void waitUntilReceived(String body) {
+    awaitWithSyncRequests(
+        () ->
             assertThat(
-                receivedRequests.stream()
-                .filter(r -> r.getBodyAsString().equals(body))
-                .findFirst()
-            ).isNotEmpty());
-    }
-
-    public void waitUntilAnyMessageReceived() {
-        await().atMost(adjust(new Duration(DEFAULT_WAIT_TIME_IN_SEC, SECONDS))).until(() ->
-            assertThat(receivedRequests.size()).isPositive());
-    }
-    public void waitUntilReceived(Duration duration, int numberOfExpectedMessages) {
-        await().atMost(adjust(duration)).until(() ->
-                assertThat(receivedRequests.size()).isEqualTo(numberOfExpectedMessages));
-    }
-
-    public void waitUntilRequestReceived(Consumer<LoggedRequest> requestConsumer) {
-        waitUntilAnyMessageReceived();
-
-        synchronized (receivedRequests) {
-            receivedRequests.forEach(requestConsumer);
-        }
-    }
-
-    public void waitUntilRequestsReceived(Consumer<List<LoggedRequest>> requestsConsumer) {
-        await().atMost(adjust(new Duration(DEFAULT_WAIT_TIME_IN_SEC, SECONDS))).until(
-                () -> {
-                    synchronized (receivedRequests) {
-                        requestsConsumer.accept(receivedRequests);
-                    }
-                }
-        );
-    }
-
-    public void noMessagesReceived() {
-        assertThat(receivedRequests).isEmpty();
-    }
-
-    public void waitUntilMessageWithHeaderReceived(String headerName, String headerValue) {
-        awaitWithSyncRequests(() ->
+                    receivedRequests.stream()
+                        .filter(r -> r.getBodyAsString().equals(body))
+                        .findFirst())
+                .isNotEmpty());
+  }
+
+  public void waitUntilReceived(Duration duration, int numberOfExpectedMessages) {
+    await()
+        .atMost(adjust(duration))
+        .untilAsserted(
+            () -> assertThat(receivedRequests.size()).isEqualTo(numberOfExpectedMessages));
+  }
+
+  public void waitUntilAnyMessageReceived() {
+    await()
+        .atMost(adjust(Duration.ofSeconds(DEFAULT_WAIT_TIME_IN_SEC)))
+        .untilAsserted(() -> assertThat(receivedRequests.size()).isPositive());
+  }
+
+  public void waitUntilRequestReceived(Consumer<LoggedRequest> requestConsumer) {
+    waitUntilAnyMessageReceived();
+
+    synchronized (receivedRequests) {
+      receivedRequests.forEach(requestConsumer);
+    }
+  }
+
+  public void waitUntilRequestsReceived(Consumer<List<LoggedRequest>> requestsConsumer) {
+    await()
+        .atMost(adjust(Duration.ofSeconds(DEFAULT_WAIT_TIME_IN_SEC)))
+        .untilAsserted(
+            () -> {
+              synchronized (receivedRequests) {
+                requestsConsumer.accept(receivedRequests);
+              }
+            });
+  }
+
+  public void noMessagesReceived() {
+    assertThat(receivedRequests).isEmpty();
+  }
+
+  public void waitUntilMessageWithHeaderReceived(String headerName, String headerValue) {
+    awaitWithSyncRequests(
+        () ->
             assertThat(
-                receivedRequests.stream()
-                .filter(r -> r.containsHeader(headerName) && r.getHeader(headerName).equals(headerValue))
-                .findFirst())
-            .isNotEmpty());
-    }
-
-    public java.time.Duration durationBetweenFirstAndLastRequest() {
-        return java.time.Duration.between(
-            getFirstReceivedRequest().getLoggedDate().toInstant(),
-            getLastReceivedRequest().getLoggedDate().toInstant());
-    }
-
-    private void awaitWithSyncRequests(Runnable runnable) {
-        await().atMost(adjust(new Duration(DEFAULT_WAIT_TIME_IN_SEC, SECONDS))).until(() -> {
-            synchronized (receivedRequests) {
+                    receivedRequests.stream()
+                        .filter(
+                            r ->
+                                r.containsHeader(headerName)
+                                    && r.getHeader(headerName).equals(headerValue))
+                        .findFirst())
+                .isNotEmpty());
+  }
+
+  public java.time.Duration durationBetweenFirstAndLastRequest() {
+    return java.time.Duration.between(
+        getFirstReceivedRequest().getLoggedDate().toInstant(),
+        getLastReceivedRequest().getLoggedDate().toInstant());
+  }
+
+  private void awaitWithSyncRequests(Runnable runnable) {
+    await()
+        .atMost(adjust(Duration.ofSeconds(DEFAULT_WAIT_TIME_IN_SEC)))
+        .untilAsserted(
+            () -> {
+              synchronized (receivedRequests) {
                 runnable.run();
-            }
+              }
+            });
+  }
+
+  private LoggedRequest getFirstReceivedRequest() {
+    synchronized (receivedRequests) {
+      return receivedRequests.stream().findFirst().orElseThrow(NoSuchElementException::new);
+    }
+  }
+
+  public LoggedRequest getLastReceivedRequest() {
+    synchronized (receivedRequests) {
+      return Streams.findLast(receivedRequests.stream()).orElseThrow(NoSuchElementException::new);
+    }
+  }
+
+  public void waitUntilAllReceivedStrict(Set<String> expectedBodies) {
+    awaitWithSyncRequests(
+        () -> {
+          int receivedCount = receivedRequests.size();
+          assertThat(receivedCount).isEqualTo(expectedBodies.size());
+          Set<String> actual =
+              receivedRequests.stream()
+                  .map(LoggedRequest::getBodyAsString)
+                  .collect(Collectors.toSet());
+          assertThat(actual).isEqualTo(expectedBodies);
         });
-    }
-
-    private LoggedRequest getFirstReceivedRequest() {
-        synchronized (receivedRequests) {
-            return receivedRequests.stream().findFirst().orElseThrow(NoSuchElementException::new);
-        }
-    }
-
-    public LoggedRequest getLastReceivedRequest() {
-        synchronized (receivedRequests) {
-            return Streams.findLast(receivedRequests.stream()).orElseThrow(NoSuchElementException::new);
-        }
-    }
+  }
 
-    public void waitUntilAllReceivedStrict(Set<String> expectedBodies) {
-        awaitWithSyncRequests(() -> {
-            int receivedCount = receivedRequests.size();
-            assertThat(receivedCount).isEqualTo(expectedBodies.size());
-            Set<String> actual = receivedRequests.stream().map(LoggedRequest::getBodyAsString).collect(Collectors.toSet());
-            assertThat(actual).isEqualTo(expectedBodies);
-        });
-    }
-
-    public void reset() {
-        this.receivedRequests.clear();
-    }
+  public void reset() {
+    this.receivedRequests.clear();
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestSubscribersExtension.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestSubscribersExtension.java
index c1a7d1e211..99aa994ff0 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestSubscribersExtension.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/integrationtests/subscriber/TestSubscribersExtension.java
@@ -1,135 +1,136 @@
 package pl.allegro.tech.hermes.integrationtests.subscriber;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
+import static jakarta.ws.rs.core.Response.Status.OK;
+
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.matching.EqualToPattern;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
-import static jakarta.ws.rs.core.Response.Status.OK;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 
 public class TestSubscribersExtension implements AfterEachCallback, AfterAllCallback {
 
-    private final WireMockServer service;
-    private final URI serviceUrl;
-    private final AtomicInteger subscriberIndex = new AtomicInteger();
-    private final Map<String, TestSubscriber> subscribersPerPath = new ConcurrentHashMap<>();
-
-    public TestSubscribersExtension() {
-        this(0);
-    }
-
-    public TestSubscribersExtension(int port) {
-        service = new WireMockServer(port);
-        service.start();
-        serviceUrl = URI.create("http://localhost:" + service.port());
-        service.addMockServiceRequestListener((request, response) -> {
-            TestSubscriber subscriber = subscribersPerPath.get(request.getUrl()); // getUrl() returns path here
-            if (subscriber != null) {
-                subscriber.onRequestReceived(LoggedRequest.createFrom(request));
-            }
+  private final WireMockServer service;
+  private final URI serviceUrl;
+  private final AtomicInteger subscriberIndex = new AtomicInteger();
+  private final Map<String, TestSubscriber> subscribersPerPath = new ConcurrentHashMap<>();
+
+  public TestSubscribersExtension() {
+    this(0);
+  }
+
+  public TestSubscribersExtension(int port) {
+    service = new WireMockServer(port);
+    service.start();
+    serviceUrl = URI.create("http://localhost:" + service.port());
+    service.addMockServiceRequestListener(
+        (request, response) -> {
+          TestSubscriber subscriber =
+              subscribersPerPath.get(request.getUrl()); // getUrl() returns path here
+          if (subscriber != null) {
+            subscriber.onRequestReceived(LoggedRequest.createFrom(request));
+          }
         });
-    }
-
-    public TestSubscriber createSubscriber(String endpointPathSuffix) {
-        return createSubscriber(OK.getStatusCode(), endpointPathSuffix);
-    }
-
-    public TestSubscriber createSubscriber() {
-        return createSubscriber("");
-    }
-
-    public TestSubscriber createSubscriber(int statusCode) {
-        return createSubscriber(statusCode, "");
-    }
-
-    public TestSubscriber createSubscriber(int statusCode, String endpointPathSuffix) {
-        String path = createPath(endpointPathSuffix);
-        return createSubscriberWithStrictPath(statusCode, path);
-    }
-
-    public TestSubscriber createSubscriberWithStrictPath(int statusCode, String path) {
-        service.addStubMapping(post(urlPathEqualTo(path)).willReturn(aResponse().withStatus(statusCode)).build());
-        TestSubscriber subscriber = new TestSubscriber(createSubscriberURI(path));
-        subscribersPerPath.put(path, subscriber);
-        return subscriber;
-    }
-
-    public TestSubscriber createSubscriberWithRetry(String message, int delay) {
-        String path = createPath("");
-        int firstStatusCode = 503;
-        int secondStatusCode = 200;
-        String scenarioName = "Retrying";
-        String secondScenarioState = "Retried";
-        service.addStubMapping(
-            post(urlEqualTo(path))
+  }
+
+  public TestSubscriber createSubscriber(String endpointPathSuffix) {
+    return createSubscriber(OK.getStatusCode(), endpointPathSuffix);
+  }
+
+  public TestSubscriber createSubscriber() {
+    return createSubscriber("");
+  }
+
+  public TestSubscriber createSubscriber(int statusCode) {
+    return createSubscriber(statusCode, "");
+  }
+
+  public TestSubscriber createSubscriber(int statusCode, String endpointPathSuffix) {
+    String path = createPath(endpointPathSuffix);
+    return createSubscriberWithStrictPath(statusCode, path);
+  }
+
+  public TestSubscriber createSubscriberWithStrictPath(int statusCode, String path) {
+    service.addStubMapping(
+        post(urlPathEqualTo(path)).willReturn(aResponse().withStatus(statusCode)).build());
+    TestSubscriber subscriber = new TestSubscriber(createSubscriberURI(path));
+    subscribersPerPath.put(path, subscriber);
+    return subscriber;
+  }
+
+  public TestSubscriber createSubscriberWithRetry(String message, int delay) {
+    String path = createPath("");
+    int firstStatusCode = 503;
+    int secondStatusCode = 200;
+    String scenarioName = "Retrying";
+    String secondScenarioState = "Retried";
+    service.addStubMapping(
+        post(urlEqualTo(path))
             .withRequestBody(new EqualToPattern(message))
             .inScenario(scenarioName)
             .whenScenarioStateIs(STARTED)
             .willSetStateTo(secondScenarioState)
-            .willReturn(aResponse()
-                .withStatus(firstStatusCode)
-                .withHeader("Retry-After", Integer.toString(delay))
-                .withFixedDelay(delay))
+            .willReturn(
+                aResponse()
+                    .withStatus(firstStatusCode)
+                    .withHeader("Retry-After", Integer.toString(delay))
+                    .withFixedDelay(delay))
             .build());
-        service.addStubMapping(
-            post(urlEqualTo(path))
+    service.addStubMapping(
+        post(urlEqualTo(path))
             .withRequestBody(new EqualToPattern(message))
             .inScenario(scenarioName)
             .whenScenarioStateIs(secondScenarioState)
-            .willReturn(aResponse()
-                .withStatus(secondStatusCode)
-                .withFixedDelay(delay))
+            .willReturn(aResponse().withStatus(secondStatusCode).withFixedDelay(delay))
             .build());
 
-        TestSubscriber subscriber = new TestSubscriber(createSubscriberURI(path));
-        subscribersPerPath.put(path, subscriber);
-        return subscriber;
-    }
-
-    private String createPath(String pathSuffix) {
-        return "/subscriber-" + subscriberIndex.incrementAndGet() + pathSuffix;
-    }
-
-    public interface SubscriberScenario {
-        void apply(WireMockServer subscriber, String endpoint);
-    }
-
-    public TestSubscriber createSubscriber(SubscriberScenario scenario) {
-        String path = createPath("");
-        scenario.apply(service, path);
-        TestSubscriber subscriber = new TestSubscriber(createSubscriberURI(path));
-        subscribersPerPath.put(path, subscriber);
-        return subscriber;
-    }
-
-    private URI createSubscriberURI(String path) {
-        return serviceUrl.resolve(path);
-    }
-
-    @Override
-    public void afterEach(ExtensionContext context) {
-        service.resetRequests();
-        subscribersPerPath.clear();
-    }
-
-    @Override
-    public void afterAll(ExtensionContext context) {
-        service.stop();
-    }
-
-    public int getPort() {
-        return service.port();
-    }
+    TestSubscriber subscriber = new TestSubscriber(createSubscriberURI(path));
+    subscribersPerPath.put(path, subscriber);
+    return subscriber;
+  }
+
+  private String createPath(String pathSuffix) {
+    return "/subscriber-" + subscriberIndex.incrementAndGet() + pathSuffix;
+  }
+
+  public interface SubscriberScenario {
+    void apply(WireMockServer subscriber, String endpoint);
+  }
+
+  public TestSubscriber createSubscriber(SubscriberScenario scenario) {
+    String path = createPath("");
+    scenario.apply(service, path);
+    TestSubscriber subscriber = new TestSubscriber(createSubscriberURI(path));
+    subscribersPerPath.put(path, subscriber);
+    return subscriber;
+  }
+
+  private URI createSubscriberURI(String path) {
+    return serviceUrl.resolve(path);
+  }
+
+  @Override
+  public void afterEach(ExtensionContext context) {
+    service.resetRequests();
+    subscribersPerPath.clear();
+  }
+
+  @Override
+  public void afterAll(ExtensionContext context) {
+    service.stop();
+  }
+
+  public int getPort() {
+    return service.port();
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/management/JsonToAvroKafkaNamesMappersConfiguration.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/management/JsonToAvroKafkaNamesMappersConfiguration.java
index 4b603c72fc..1239a13d5c 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/management/JsonToAvroKafkaNamesMappersConfiguration.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/management/JsonToAvroKafkaNamesMappersConfiguration.java
@@ -1,6 +1,6 @@
 package pl.allegro.tech.hermes.management;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -11,16 +11,16 @@
 import pl.allegro.tech.hermes.management.config.kafka.MultipleDcKafkaNamesMappersFactory;
 
 @Configuration
-public class JsonToAvroKafkaNamesMappersConfiguration implements MultipleDcKafkaNamesMappersFactory {
+@EnableConfigurationProperties(KafkaClustersProperties.class)
+public class JsonToAvroKafkaNamesMappersConfiguration
+    implements MultipleDcKafkaNamesMappersFactory {
 
-    @Autowired
-    KafkaClustersProperties kafkaClustersProperties;
-
-    @Bean
-    @Primary
-    @Profile("integration")
-    KafkaNamesMappers testKafkaNameMappers() {
-        return createKafkaNamesMapper(kafkaClustersProperties, namespace ->
-                new IntegrationTestKafkaNamesMapperFactory(namespace).create());
-    }
+  @Bean
+  @Primary
+  @Profile("integration")
+  KafkaNamesMappers testKafkaNameMappers(KafkaClustersProperties kafkaClustersProperties) {
+    return createKafkaNamesMapper(
+        kafkaClustersProperties,
+        namespace -> new IntegrationTestKafkaNamesMapperFactory(namespace).create());
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java
new file mode 100644
index 0000000000..b521cb1e06
--- /dev/null
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java
@@ -0,0 +1,78 @@
+package pl.allegro.tech.hermes.management;
+
+import static java.util.stream.Collectors.toSet;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.SecurityContext;
+import java.security.Principal;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.commons.lang3.NotImplementedException;
+import pl.allegro.tech.hermes.api.OwnerId;
+import pl.allegro.tech.hermes.management.api.auth.SecurityProvider;
+
+public class TestSecurityProvider implements SecurityProvider {
+
+  private static volatile boolean userIsAdmin = true;
+  private static final Set<OwnerId> ownerIds = ConcurrentHashMap.newKeySet();
+
+  public static void setUserIsAdmin(boolean userIsAdmin) {
+    TestSecurityProvider.userIsAdmin = userIsAdmin;
+  }
+
+  public static void setUserAsOwner(OwnerId... ownerIds) {
+    TestSecurityProvider.ownerIds.addAll(Arrays.stream(ownerIds).collect(toSet()));
+  }
+
+  public static void reset() {
+    userIsAdmin = true;
+    ownerIds.clear();
+  }
+
+  @Override
+  public HermesSecurity security(ContainerRequestContext requestContext) {
+    return new HermesSecurity(securityContext(), ownerIds::contains);
+  }
+
+  private SecurityContext securityContext() {
+
+    return new SecurityContext() {
+      @Override
+      public Principal getUserPrincipal() {
+        return new TestUserPrincipal();
+      }
+
+      @Override
+      public boolean isUserInRole(String role) {
+        return checkRoles(role);
+      }
+
+      @Override
+      public boolean isSecure() {
+        throw new NotImplementedException();
+      }
+
+      @Override
+      public String getAuthenticationScheme() {
+        throw new NotImplementedException();
+      }
+    };
+  }
+
+  private boolean checkRoles(String role) {
+    if (role.equalsIgnoreCase("admin")) {
+      return userIsAdmin;
+    } else {
+      return true;
+    }
+  }
+
+  private static class TestUserPrincipal implements Principal {
+
+    @Override
+    public String getName() {
+      return "test-user";
+    }
+  }
+}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProviderConfiguration.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/management/TestSecurityProviderConfiguration.java
similarity index 55%
rename from integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProviderConfiguration.java
rename to integration-tests/src/common/java/pl/allegro/tech/hermes/management/TestSecurityProviderConfiguration.java
index 9085785d15..ec21e99d78 100644
--- a/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProviderConfiguration.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/management/TestSecurityProviderConfiguration.java
@@ -2,14 +2,17 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import pl.allegro.tech.hermes.management.api.auth.SecurityProvider;
 
 @Configuration
 public class TestSecurityProviderConfiguration {
 
-    @Bean
-    SecurityProvider authorization() {
-        return new TestSecurityProvider();
-    }
-
+  @Bean
+  @Primary
+  @Profile("integration")
+  SecurityProvider testAuthorization() {
+    return new TestSecurityProvider();
+  }
 }
diff --git a/integration-tests/src/common/java/pl/allegro/tech/hermes/utils/Headers.java b/integration-tests/src/common/java/pl/allegro/tech/hermes/utils/Headers.java
index 75911b9590..75225335d7 100644
--- a/integration-tests/src/common/java/pl/allegro/tech/hermes/utils/Headers.java
+++ b/integration-tests/src/common/java/pl/allegro/tech/hermes/utils/Headers.java
@@ -1,13 +1,12 @@
 package pl.allegro.tech.hermes.utils;
 
-import org.springframework.http.HttpHeaders;
-
 import java.util.Map;
+import org.springframework.http.HttpHeaders;
 
 public class Headers {
-    public static HttpHeaders createHeaders(Map<String, String> map) {
-        HttpHeaders headers = new HttpHeaders();
-        map.forEach(headers::add);
-        return headers;
-    }
+  public static HttpHeaders createHeaders(Map<String, String> map) {
+    HttpHeaders headers = new HttpHeaders();
+    map.forEach(headers::add);
+    return headers;
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BasicAuthSubscribingTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BasicAuthSubscribingTest.java
index 3c5dea2995..ab653658b6 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BasicAuthSubscribingTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BasicAuthSubscribingTest.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.PatchData.patchData;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -9,52 +14,59 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.PatchData.patchData;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class BasicAuthSubscribingTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
 
-    @Test
-    public void shouldAuthorizeUsingBasicAuthWhenSubscriptionHasCredentials() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
+  @Test
+  public void shouldAuthorizeUsingBasicAuthWhenSubscriptionHasCredentials() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
 
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscription(
-            topic.getQualifiedName(),
-            "subscription",
-            "http://user:password@localhost:" + subscriber.getPort() + subscriber.getPath()).build());
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(
+                    topic.getQualifiedName(),
+                    "subscription",
+                    "http://user:password@localhost:" + subscriber.getPort() + subscriber.getPath())
+                .build());
 
-        TestMessage message = TestMessage.of("hello", "world");
+    TestMessage message = TestMessage.of("hello", "world");
 
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
 
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Basic dXNlcjpwYXNzd29yZA==");
-    }
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Basic dXNlcjpwYXNzd29yZA==");
+  }
 
-    @Test
-    public void shouldUpdateSubscriptionUsernameAndPassword() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscription(
-            topic.getQualifiedName(), "subscription", "http://user:password@localhost:1234").build());
+  @Test
+  public void shouldUpdateSubscriptionUsernameAndPassword() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(
+                    topic.getQualifiedName(), "subscription", "http://user:password@localhost:1234")
+                .build());
 
-        // when
-        hermes.api().updateSubscription(topic, "subscription",
+    // when
+    hermes
+        .api()
+        .updateSubscription(
+            topic,
+            "subscription",
             patchData().set("endpoint", "http://newuser:newpassword@localhost:1234").build());
 
-        // then
-        Subscription subscription = hermes.api().getSubscription(topic.getQualifiedName(), "subscription");
-        assertThat(subscription.getEndpoint().getUsername()).isEqualTo("newuser");
-    }
+    // then
+    Subscription subscription =
+        hermes.api().getSubscription(topic.getQualifiedName(), "subscription");
+    assertThat(subscription.getEndpoint().getUsername()).isEqualTo("newuser");
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BatchDeliveryTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BatchDeliveryTest.java
index ee2dfaa935..560c358bac 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BatchDeliveryTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BatchDeliveryTest.java
@@ -1,12 +1,30 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
+import static com.google.common.collect.ImmutableMap.of;
+import static java.util.Arrays.stream;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThatMetrics;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.awaitility.Duration;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.BatchSubscriptionPolicy;
 import pl.allegro.tech.hermes.api.ContentType;
+import pl.allegro.tech.hermes.api.MessageFilterSpecification;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
@@ -15,321 +33,415 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
-import static java.util.Arrays.stream;
-import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class BatchDeliveryTest {
 
-    private ObjectMapper mapper = new ObjectMapper();
-
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    private static final TestMessage[] SMALL_BATCH = TestMessage.simpleMessages(2);
-
-    private static final TestMessage SINGLE_MESSAGE = TestMessage.simple();
-
-    @Test
-    public void shouldDeliverMessagesInBatch() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        Subscription subscription = subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
-                .withSubscriptionPolicy(buildBatchPolicy()
-                        .withBatchSize(2)
-                        .withBatchTime(Integer.MAX_VALUE)
-                        .withBatchVolume(1024)
-                        .build()
-                ).build();
-
-        hermes.initHelper().createSubscription(subscription);
-
-        // when
-        publishAll(topic.getQualifiedName(), SMALL_BATCH);
-
-        // then
-        expectSingleBatch(subscriber, SMALL_BATCH);
-    }
-
-    @Test
-    public void shouldDeliverBatchInGivenTimePeriod() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        Subscription subscription = subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
-                .withSubscriptionPolicy(buildBatchPolicy()
-                        .withBatchSize(100)
-                        .withBatchTime(1)
-                        .withBatchVolume(1024)
-                        .build()
-                ).build();
-
-        hermes.initHelper().createSubscription(subscription);
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
-
-        // then
-        expectSingleBatch(subscriber, SINGLE_MESSAGE);
-    }
-
-    @Test
-    public void shouldDeliverBatchInGivenVolume() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        int batchVolumeThatFitsOneMessageOnly = 150;
-
-        Subscription subscription = subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
-                .withSubscriptionPolicy(buildBatchPolicy()
-                        .withBatchSize(100)
-                        .withBatchTime(Integer.MAX_VALUE)
-                        .withBatchVolume(batchVolumeThatFitsOneMessageOnly)
-                        .build()
-                ).build();
-
-        hermes.initHelper().createSubscription(subscription);
-
-        // when publishing more than buffer capacity
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
-
-        // then we expect to receive batch that has desired batch volume (one message only)
-        expectSingleBatch(subscriber, SINGLE_MESSAGE);
-    }
-
-    @Test
-    public void shouldDeliverAvroMessagesAsJsonBatch() {
-        // given
-        AvroUser user = new AvroUser("Bob", 50, "blue");
-
-        Topic topic = hermes.initHelper().createTopicWithSchema(
-                topicWithSchema(topicWithRandomName().build(), user.getSchemaAsString())
-        );
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        Subscription subscription = subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
-                .withSubscriptionPolicy(buildBatchPolicy()
-                        .withBatchSize(2)
-                        .withBatchTime(Integer.MAX_VALUE)
-                        .withBatchVolume(1024)
-                        .build()
-                ).build();
-
-        hermes.initHelper().createSubscription(subscription);
-
-        TestMessage[] avroBatch = {user.asTestMessage(), user.asTestMessage()};
-
-        // when
-        publishAll(topic.getQualifiedName(), avroBatch);
-
-        // then
-        expectSingleBatch(subscriber, avroBatch);
-    }
-
-
-    @Test
-    public void shouldPassSubscriptionHeaders() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        BatchSubscriptionPolicy policy = buildBatchPolicy()
-                .withBatchSize(100)
-                .withBatchTime(1)
-                .withBatchVolume(1024)
-                .build();
-        Subscription subscription = subscription(topic, "batchSubscription")
-                .withEndpoint(subscriber.getEndpoint())
-                .withContentType(ContentType.JSON)
-                .withSubscriptionPolicy(policy)
-                .withHeader("MY-HEADER", "myHeaderValue")
-                .withHeader("MY-OTHER-HEADER", "myOtherHeaderValue")
-                .build();
-
-        hermes.initHelper().createSubscription(subscription);
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
-
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            Assertions.assertThat(request.getHeader("MY-HEADER")).isEqualTo("myHeaderValue");
-            Assertions.assertThat(request.getHeader("MY-OTHER-HEADER")).isEqualTo("myOtherHeaderValue");
+  private final ObjectMapper mapper = new ObjectMapper();
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  static final AvroUser BOB = new AvroUser("Bob", 50, "blue");
+
+  static final AvroUser ALICE = new AvroUser("Alice", 20, "magenta");
+
+  private static final TestMessage[] SMALL_BATCH = TestMessage.simpleMessages(2);
+
+  private static final TestMessage SINGLE_MESSAGE = TestMessage.simple();
+
+  private static final TestMessage SINGLE_MESSAGE_FILTERED = BOB.asTestMessage();
+
+  private static final MessageFilterSpecification MESSAGE_NAME_FILTER =
+      new MessageFilterSpecification(of("type", "jsonpath", "path", ".name", "matcher", "^Bob.*"));
+
+  @Test
+  public void shouldDeliverMessagesInBatch() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+            .withSubscriptionPolicy(
+                buildBatchPolicy()
+                    .withBatchSize(2)
+                    .withBatchTime(Integer.MAX_VALUE)
+                    .withBatchVolume(1024)
+                    .build())
+            .build();
+
+    hermes.initHelper().createSubscription(subscription);
+
+    // when
+    publishAll(topic.getQualifiedName(), SMALL_BATCH);
+
+    // then
+    expectSingleBatch(subscriber, SMALL_BATCH);
+  }
+
+  @Test
+  public void shouldFilterIncomingEventsForBatch() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    final Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+                    .withSubscriptionPolicy(
+                        buildBatchPolicy()
+                            .withBatchSize(2)
+                            .withBatchTime(3)
+                            .withBatchVolume(1024)
+                            .build())
+                    .withFilter(MESSAGE_NAME_FILTER)
+                    .build());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB.asJson());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
+
+    // then
+    expectSingleBatch(subscriber, SINGLE_MESSAGE_FILTERED);
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .getConsumersMetrics()
+                    .expectStatus()
+                    .isOk()
+                    .expectBody(String.class)
+                    .value(
+                        (body) ->
+                            assertThatMetrics(body)
+                                .contains("hermes_consumers_subscription_filtered_out_total")
+                                .withLabels(
+                                    "group", topic.getName().getGroupName(),
+                                    "subscription", subscription.getName(),
+                                    "topic", topic.getName().getName())
+                                .withValue(1.0)));
+  }
+
+  @Test
+  public void shouldCommitFilteredMessagesForBatch() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    final Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+                    .withSubscriptionPolicy(
+                        buildBatchPolicy()
+                            .withBatchSize(10)
+                            .withBatchTime(Integer.MAX_VALUE)
+                            .withBatchVolume(1024)
+                            .build())
+                    .withFilter(MESSAGE_NAME_FILTER)
+                    .build());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .getConsumersMetrics()
+                    .expectStatus()
+                    .isOk()
+                    .expectBody(String.class)
+                    .value(
+                        (body) ->
+                            assertThatMetrics(body)
+                                .contains("hermes_consumers_subscription_filtered_out_total")
+                                .withLabels(
+                                    "group", topic.getName().getGroupName(),
+                                    "subscription", subscription.getName(),
+                                    "topic", topic.getName().getName())
+                                .withValue(3.0)));
+    hermes.api().waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
+  }
+
+  @Test
+  public void shouldDeliverBatchInGivenTimePeriod() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+            .withSubscriptionPolicy(
+                buildBatchPolicy()
+                    .withBatchSize(100)
+                    .withBatchTime(1)
+                    .withBatchVolume(1024)
+                    .build())
+            .build();
+
+    hermes.initHelper().createSubscription(subscription);
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
+
+    // then
+    expectSingleBatch(subscriber, SINGLE_MESSAGE);
+  }
+
+  @Test
+  public void shouldDeliverBatchInGivenVolume() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    int batchVolumeThatFitsOneMessageOnly = 150;
+
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+            .withSubscriptionPolicy(
+                buildBatchPolicy()
+                    .withBatchSize(100)
+                    .withBatchTime(Integer.MAX_VALUE)
+                    .withBatchVolume(batchVolumeThatFitsOneMessageOnly)
+                    .build())
+            .build();
+
+    hermes.initHelper().createSubscription(subscription);
+
+    // when publishing more than buffer capacity
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
+
+    // then we expect to receive batch that has desired batch volume (one message only)
+    expectSingleBatch(subscriber, SINGLE_MESSAGE);
+  }
+
+  @Test
+  public void shouldDeliverAvroMessagesAsJsonBatch() {
+    // given
+    AvroUser user = new AvroUser("Bob", 50, "blue");
+
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopicWithSchema(
+                topicWithSchema(topicWithRandomName().build(), user.getSchemaAsString()));
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+            .withSubscriptionPolicy(
+                buildBatchPolicy()
+                    .withBatchSize(2)
+                    .withBatchTime(Integer.MAX_VALUE)
+                    .withBatchVolume(1024)
+                    .build())
+            .build();
+
+    hermes.initHelper().createSubscription(subscription);
+
+    TestMessage[] avroBatch = {user.asTestMessage(), user.asTestMessage()};
+
+    // when
+    publishAll(topic.getQualifiedName(), avroBatch);
+
+    // then
+    expectSingleBatch(subscriber, avroBatch);
+  }
+
+  @Test
+  public void shouldPassSubscriptionHeaders() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    BatchSubscriptionPolicy policy =
+        buildBatchPolicy().withBatchSize(100).withBatchTime(1).withBatchVolume(1024).build();
+    Subscription subscription =
+        subscription(topic, "batchSubscription")
+            .withEndpoint(subscriber.getEndpoint())
+            .withContentType(ContentType.JSON)
+            .withSubscriptionPolicy(policy)
+            .withHeader("MY-HEADER", "myHeaderValue")
+            .withHeader("MY-OTHER-HEADER", "myOtherHeaderValue")
+            .build();
+
+    hermes.initHelper().createSubscription(subscription);
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          Assertions.assertThat(request.getHeader("MY-HEADER")).isEqualTo("myHeaderValue");
+          Assertions.assertThat(request.getHeader("MY-OTHER-HEADER"))
+              .isEqualTo("myOtherHeaderValue");
         });
-    }
-
-    @Test
-    public void shouldAttachSubscriptionIdentityHeadersWhenItIsEnabled() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        BatchSubscriptionPolicy policy = buildBatchPolicy()
-                .withBatchSize(100)
-                .withBatchTime(1)
-                .withBatchVolume(1024)
-                .build();
-        Subscription subscription = subscription(topic, "batchSubscription")
-                .withEndpoint(subscriber.getEndpoint())
-                .withContentType(ContentType.JSON)
-                .withSubscriptionPolicy(policy)
-                .withAttachingIdentityHeadersEnabled(true)
-                .build();
-
-        hermes.initHelper().createSubscription(subscription);
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
-
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            Assertions.assertThat(request.getHeader("Hermes-Topic-Name")).isEqualTo(topic.getQualifiedName());
-            Assertions.assertThat(request.getHeader("Hermes-Subscription-Name")).isEqualTo("batchSubscription");
+  }
+
+  @Test
+  public void shouldAttachSubscriptionIdentityHeadersWhenItIsEnabled() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    BatchSubscriptionPolicy policy =
+        buildBatchPolicy().withBatchSize(100).withBatchTime(1).withBatchVolume(1024).build();
+    Subscription subscription =
+        subscription(topic, "batchSubscription")
+            .withEndpoint(subscriber.getEndpoint())
+            .withContentType(ContentType.JSON)
+            .withSubscriptionPolicy(policy)
+            .withAttachingIdentityHeadersEnabled(true)
+            .build();
+
+    hermes.initHelper().createSubscription(subscription);
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          Assertions.assertThat(request.getHeader("Hermes-Topic-Name"))
+              .isEqualTo(topic.getQualifiedName());
+          Assertions.assertThat(request.getHeader("Hermes-Subscription-Name"))
+              .isEqualTo("batchSubscription");
         });
-    }
+  }
 
-    @Test
-    public void shouldNotAttachSubscriptionIdentityHeadersWhenItIsDisabled() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+  @Test
+  public void shouldNotAttachSubscriptionIdentityHeadersWhenItIsDisabled() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
 
-        TestSubscriber subscriber = subscribers.createSubscriber();
+    TestSubscriber subscriber = subscribers.createSubscriber();
 
-        BatchSubscriptionPolicy policy = buildBatchPolicy()
-                .withBatchSize(100)
-                .withBatchTime(1)
-                .withBatchVolume(1024)
-                .build();
+    BatchSubscriptionPolicy policy =
+        buildBatchPolicy().withBatchSize(100).withBatchTime(1).withBatchVolume(1024).build();
 
-        Subscription subscription = subscription(topic, "batchSubscription")
-                .withEndpoint(subscriber.getEndpoint())
-                .withContentType(ContentType.JSON)
-                .withSubscriptionPolicy(policy)
-                .withAttachingIdentityHeadersEnabled(false)
-                .build();
+    Subscription subscription =
+        subscription(topic, "batchSubscription")
+            .withEndpoint(subscriber.getEndpoint())
+            .withContentType(ContentType.JSON)
+            .withSubscriptionPolicy(policy)
+            .withAttachingIdentityHeadersEnabled(false)
+            .build();
 
-        hermes.initHelper().createSubscription(subscription);
+    hermes.initHelper().createSubscription(subscription);
 
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
 
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            Assertions.assertThat(request.getHeader("Hermes-Topic-Name")).isNull();
-            Assertions.assertThat(request.getHeader("Hermes-Subscription-Name")).isNull();
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          Assertions.assertThat(request.getHeader("Hermes-Topic-Name")).isNull();
+          Assertions.assertThat(request.getHeader("Hermes-Subscription-Name")).isNull();
         });
-    }
-
-    @Test
-    public void shouldTimeoutRequestToSlowlyRespondingClient() {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        // response chunk every 500ms, total 5s
-        int chunks = 10;
-        int totalResponseDuration = 5000;
-
-        TestSubscriber subscriber = subscribers.createSubscriber((service, endpoint) -> {
-            service.addStubMapping(
-                    post(urlEqualTo(endpoint))
-                            .inScenario("slowAndFast")
-                            .whenScenarioStateIs(STARTED)
-                            .willSetStateTo("slow")
-                            .willReturn(
-                                    aResponse()
-                                            .withStatus(200)
-                                            .withBody("I am very slow!")
-                                            .withChunkedDribbleDelay(chunks, totalResponseDuration)
-                            ).build()
-            );
-
-            service.addStubMapping(
-                    post(urlEqualTo(endpoint))
-                            .inScenario("slowAndFast")
-                            .whenScenarioStateIs("slow")
-                            .willReturn(
-                                    aResponse()
-                                            .withStatus(200)
-                                            .withFixedDelay(0)
-                            ).build()
-            );
+  }
+
+  @Test
+  public void shouldTimeoutRequestToSlowlyRespondingClient() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // response chunk every 500ms, total 5s
+    int chunks = 10;
+    int totalResponseDuration = 5000;
+
+    TestSubscriber subscriber =
+        subscribers.createSubscriber(
+            (service, endpoint) -> {
+              service.addStubMapping(
+                  post(urlEqualTo(endpoint))
+                      .inScenario("slowAndFast")
+                      .whenScenarioStateIs(STARTED)
+                      .willSetStateTo("slow")
+                      .willReturn(
+                          aResponse()
+                              .withStatus(200)
+                              .withBody("I am very slow!")
+                              .withChunkedDribbleDelay(chunks, totalResponseDuration))
+                      .build());
+
+              service.addStubMapping(
+                  post(urlEqualTo(endpoint))
+                      .inScenario("slowAndFast")
+                      .whenScenarioStateIs("slow")
+                      .willReturn(aResponse().withStatus(200).withFixedDelay(0))
+                      .build());
+            });
+
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+            .withSubscriptionPolicy(
+                buildBatchPolicy()
+                    .withBatchSize(1)
+                    .withBatchTime(1)
+                    .withBatchVolume(1024)
+                    .withRequestTimeout(1000)
+                    .build())
+            .build();
+
+    hermes.initHelper().createSubscription(subscription);
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
+
+    // then
+    // first request is retried because of timeout (with socket / idle timeout only, the request
+    // wouldn't be timed out because
+    // there are chunks of response every 500ms which is smaller than 1s timeout)
+    subscriber.waitUntilReceived(Duration.ofSeconds(5), 2);
+    Assertions.assertThat(subscriber.getLastReceivedRequest().getHeader("Hermes-Retry-Count"))
+        .isEqualTo("1");
+  }
+
+  private void publishAll(String topicQualifiedName, TestMessage... messages) {
+    stream(messages)
+        .forEach(message -> hermes.api().publishUntilSuccess(topicQualifiedName, message.body()));
+  }
+
+  private void expectSingleBatch(TestSubscriber subscriber, TestMessage... expectedContents) {
+    subscriber.waitUntilRequestReceived(
+        message -> {
+          List<Map<String, Object>> batch = readBatch(message.getBodyAsString());
+          Assertions.assertThat(batch).hasSize(expectedContents.length);
+          for (int i = 0; i < expectedContents.length; i++) {
+            Assertions.assertThat(batch.get(i).get("message"))
+                .isEqualTo(expectedContents[i].getContent());
+            Assertions.assertThat((String) ((Map) batch.get(i).get("metadata")).get("id"))
+                .isNotEmpty();
+          }
         });
-
-        Subscription subscription = subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
-                .withSubscriptionPolicy(buildBatchPolicy()
-                        .withBatchSize(1)
-                        .withBatchTime(1)
-                        .withBatchVolume(1024)
-                        .withRequestTimeout(1000)
-                        .build()
-                ).build();
-
-        hermes.initHelper().createSubscription(subscription);
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), SINGLE_MESSAGE.body());
-
-        // then
-        // first request is retried because of timeout (with socket / idle timeout only, the request wouldn't be timed out because
-        // there are chunks of response every 500ms which is smaller than 1s timeout)
-        subscriber.waitUntilReceived(Duration.FIVE_SECONDS, 2);
-        Assertions.assertThat(subscriber.getLastReceivedRequest().getHeader("Hermes-Retry-Count")).isEqualTo("1");
-    }
-
-    private void publishAll(String topicQualifiedName, TestMessage... messages) {
-        stream(messages).forEach(message -> hermes.api().publishUntilSuccess(topicQualifiedName, message.body()));
-    }
-
-    private void expectSingleBatch(TestSubscriber subscriber, TestMessage... expectedContents) {
-        subscriber.waitUntilRequestReceived(message -> {
-            List<Map<String, Object>> batch = readBatch(message.getBodyAsString());
-            Assertions.assertThat(batch).hasSize(expectedContents.length);
-            for (int i = 0; i < expectedContents.length; i++) {
-                Assertions.assertThat(batch.get(i).get("message")).isEqualTo(expectedContents[i].getContent());
-                Assertions.assertThat((String) ((Map) batch.get(i).get("metadata")).get("id")).isNotEmpty();
-            }
-        });
-    }
-
-    private BatchSubscriptionPolicy.Builder buildBatchPolicy() {
-        return batchSubscriptionPolicy()
-                .applyDefaults()
-                .withMessageTtl(100)
-                .withRequestTimeout(100)
-                .withMessageBackoff(10);
-    }
-
-    @SuppressWarnings("unchecked")
-    private List<Map<String, Object>> readBatch(String message) {
-        try {
-            return mapper.readValue(message, List.class);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+  }
+
+  private BatchSubscriptionPolicy.Builder buildBatchPolicy() {
+    return batchSubscriptionPolicy()
+        .applyDefaults()
+        .withMessageTtl(100)
+        .withRequestTimeout(100)
+        .withMessageBackoff(10);
+  }
+
+  @SuppressWarnings("unchecked")
+  private List<Map<String, Object>> readBatch(String message) {
+    try {
+      return mapper.readValue(message, List.class);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
     }
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BatchRetryPolicyTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BatchRetryPolicyTest.java
index 01b41854f0..dbd5f413b0 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BatchRetryPolicyTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BatchRetryPolicyTest.java
@@ -1,12 +1,25 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static org.apache.hc.core5.http.HttpStatus.SC_BAD_REQUEST;
+import static org.apache.hc.core5.http.HttpStatus.SC_CREATED;
+import static org.apache.hc.core5.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
+import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.stubbing.Scenario;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-import com.jayway.awaitility.Duration;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.BatchSubscriptionPolicy;
 import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.Subscription;
@@ -16,218 +29,238 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static org.apache.http.HttpStatus.SC_BAD_REQUEST;
-import static org.apache.http.HttpStatus.SC_CREATED;
-import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
-import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class BatchRetryPolicyTest {
 
-    private static final String HEALTHY = "healthy";
-    private static final String failedRequestBody = "{\"body\":\"failed\"}";
-    private static final String successfulRequestBody = "{\"body\":\"successful\"}";
-
-    private final ObjectMapper mapper = new ObjectMapper();
-
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    @Test
-    public void shouldRetryUntilRequestSuccessfulAndSendRetryCounterInHeader() {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        TestSubscriber subscriber = subscribers.createSubscriber((service, endpoint) -> {
-            service.addStubMapping(post(endpoint)
-                    .inScenario(topic.getQualifiedName())
-                    .whenScenarioStateIs(Scenario.STARTED)
-                    .willReturn(aResponse().withStatus(SC_INTERNAL_SERVER_ERROR))
-                    .willSetStateTo(HEALTHY)
-                    .build()
-            );
-
-            service.addStubMapping(post(endpoint)
-                    .inScenario(topic.getQualifiedName())
-                    .whenScenarioStateIs(HEALTHY)
-                    .willReturn(aResponse().withStatus(SC_CREATED)).build());
-        });
-
-        createSingleMessageBatchSubscription(topic, subscriber.getEndpoint());
-
-        //when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.simple().body());
-
-        //then
-        subscriber.waitUntilRequestsReceived(requests -> {
-            Assertions.assertThat(requests).hasSize(2);
-            Assertions.assertThat(requests.get(0).header("Hermes-Retry-Count").containsValue("0")).isTrue();
-            Assertions.assertThat(requests.get(1).header("Hermes-Retry-Count").containsValue("1")).isTrue();
-        });
-    }
-
-    @Test
-    public void shouldNotRetryIfRequestSuccessful() {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestMessage message = TestMessage.simple();
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        createSingleMessageBatchSubscription(topic, subscriber.getEndpoint());
-
-        //when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        //then
-        subscriber.waitUntilReceived(Duration.FIVE_SECONDS, 1);
-    }
-
-    @Test
-    public void shouldRetryUntilTtlExceeded() throws Throwable {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        TestSubscriber subscriber = subscribers.createSubscriber((service, endpoint) -> {
-            service.addStubMapping((post(endpoint))
-                    .withRequestBody(containing("failed"))
-                    .willReturn(aResponse().withStatus(SC_INTERNAL_SERVER_ERROR)).build());
-
-            service.addStubMapping((post(endpoint))
-                    .withRequestBody(containing("successful"))
-                    .willReturn(aResponse().withStatus(SC_CREATED)).build());
-        });
-
-        createSingleMessageBatchSubscription(topic, subscriber.getEndpoint(), 1, 10);
-
-        //when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), failedRequestBody);
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), successfulRequestBody);
-
-        //then
-        subscriber.waitUntilRequestsReceived(requests ->
-                Assertions.assertThat(requests)
-                        .extracting(LoggedRequest::getBodyAsString)
-                        .extracting(this::readMessage)
-                        .containsSequence(failedRequestBody, failedRequestBody, successfulRequestBody));
-    }
-
-    @Test
-    public void shouldRetryOnClientErrors() throws Throwable {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        TestSubscriber subscriber = subscribers.createSubscriber((service, endpoint) -> {
-            service.addStubMapping(post(endpoint)
-                    .inScenario(topic.getQualifiedName())
-                    .whenScenarioStateIs(Scenario.STARTED)
-                    .willReturn(aResponse().withStatus(SC_BAD_REQUEST))
-                    .willSetStateTo(HEALTHY).build());
-
-            service.addStubMapping(post(endpoint)
-                    .inScenario(topic.getQualifiedName())
-                    .whenScenarioStateIs(HEALTHY)
-                    .willReturn(aResponse().withStatus(SC_CREATED)).build());
+  private static final String HEALTHY = "healthy";
+  private static final String failedRequestBody = "{\"body\":\"failed\"}";
+  private static final String successfulRequestBody = "{\"body\":\"successful\"}";
+
+  private final ObjectMapper mapper = new ObjectMapper();
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  @Test
+  public void shouldRetryUntilRequestSuccessfulAndSendRetryCounterInHeader() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    TestSubscriber subscriber =
+        subscribers.createSubscriber(
+            (service, endpoint) -> {
+              service.addStubMapping(
+                  post(endpoint)
+                      .inScenario(topic.getQualifiedName())
+                      .whenScenarioStateIs(Scenario.STARTED)
+                      .willReturn(aResponse().withStatus(SC_INTERNAL_SERVER_ERROR))
+                      .willSetStateTo(HEALTHY)
+                      .build());
+
+              service.addStubMapping(
+                  post(endpoint)
+                      .inScenario(topic.getQualifiedName())
+                      .whenScenarioStateIs(HEALTHY)
+                      .willReturn(aResponse().withStatus(SC_CREATED))
+                      .build());
+            });
+
+    createSingleMessageBatchSubscription(topic, subscriber.getEndpoint());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.simple().body());
+
+    // then
+    subscriber.waitUntilRequestsReceived(
+        requests -> {
+          Assertions.assertThat(requests).hasSize(2);
+          Assertions.assertThat(requests.get(0).header("Hermes-Retry-Count").containsValue("0"))
+              .isTrue();
+          Assertions.assertThat(requests.get(1).header("Hermes-Retry-Count").containsValue("1"))
+              .isTrue();
         });
-
-        createSingleMessageBatchSubscription(topic, subscriber.getEndpoint(), true);
-
-        //when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.simple().body());
-
-        //then
-        subscriber.waitUntilRequestsReceived(requests -> Assertions.assertThat(requests.size()).isEqualTo(2));
+  }
+
+  @Test
+  public void shouldNotRetryIfRequestSuccessful() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestMessage message = TestMessage.simple();
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    createSingleMessageBatchSubscription(topic, subscriber.getEndpoint());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilReceived(Duration.ofSeconds(5), 1);
+  }
+
+  @Test
+  public void shouldRetryUntilTtlExceeded() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    TestSubscriber subscriber =
+        subscribers.createSubscriber(
+            (service, endpoint) -> {
+              service.addStubMapping(
+                  (post(endpoint))
+                      .withRequestBody(containing("failed"))
+                      .willReturn(aResponse().withStatus(SC_INTERNAL_SERVER_ERROR))
+                      .build());
+
+              service.addStubMapping(
+                  (post(endpoint))
+                      .withRequestBody(containing("successful"))
+                      .willReturn(aResponse().withStatus(SC_CREATED))
+                      .build());
+            });
+
+    createSingleMessageBatchSubscription(topic, subscriber.getEndpoint(), 1, 10);
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), failedRequestBody);
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), successfulRequestBody);
+
+    // then
+    subscriber.waitUntilRequestsReceived(
+        requests ->
+            Assertions.assertThat(requests)
+                .extracting(LoggedRequest::getBodyAsString)
+                .extracting(this::readMessage)
+                .containsSequence(failedRequestBody, failedRequestBody, successfulRequestBody));
+  }
+
+  @Test
+  public void shouldRetryOnClientErrors() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    TestSubscriber subscriber =
+        subscribers.createSubscriber(
+            (service, endpoint) -> {
+              service.addStubMapping(
+                  post(endpoint)
+                      .inScenario(topic.getQualifiedName())
+                      .whenScenarioStateIs(Scenario.STARTED)
+                      .willReturn(aResponse().withStatus(SC_BAD_REQUEST))
+                      .willSetStateTo(HEALTHY)
+                      .build());
+
+              service.addStubMapping(
+                  post(endpoint)
+                      .inScenario(topic.getQualifiedName())
+                      .whenScenarioStateIs(HEALTHY)
+                      .willReturn(aResponse().withStatus(SC_CREATED))
+                      .build());
+            });
+
+    createSingleMessageBatchSubscription(topic, subscriber.getEndpoint(), true);
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.simple().body());
+
+    // then
+    subscriber.waitUntilRequestsReceived(
+        requests -> Assertions.assertThat(requests.size()).isEqualTo(2));
+  }
+
+  @Test
+  public void shouldNotRetryOnClientErrors() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    TestSubscriber subscriber =
+        subscribers.createSubscriber(
+            (service, endpoint) -> {
+              service.addStubMapping(
+                  post(endpoint)
+                      .withRequestBody(containing("failed"))
+                      .willReturn(aResponse().withStatus(SC_BAD_REQUEST))
+                      .build());
+
+              service.addStubMapping(
+                  post(endpoint)
+                      .withRequestBody(containing("successful"))
+                      .willReturn(aResponse().withStatus(SC_CREATED))
+                      .build());
+            });
+
+    createSingleMessageBatchSubscription(topic, subscriber.getEndpoint());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), failedRequestBody);
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), successfulRequestBody);
+
+    // then
+    subscriber.waitUntilRequestsReceived(
+        requests ->
+            Assertions.assertThat(requests)
+                .extracting(LoggedRequest::getBodyAsString)
+                .extracting(this::readMessage)
+                .containsExactly(failedRequestBody, successfulRequestBody));
+  }
+
+  private void createSingleMessageBatchSubscription(
+      Topic topic, String endpoint, int messageTtl, int messageBackoff) {
+    createBatchSubscription(topic, endpoint, messageTtl, messageBackoff, 1, 1, 200, false);
+  }
+
+  private void createSingleMessageBatchSubscription(Topic topic, String endpoint) {
+    createSingleMessageBatchSubscription(topic, endpoint, false);
+  }
+
+  private void createSingleMessageBatchSubscription(
+      Topic topic, String endpoint, boolean retryOnClientErrors) {
+    createBatchSubscription(topic, endpoint, 1, 10, 1, 1, 500, retryOnClientErrors);
+  }
+
+  public void createBatchSubscription(
+      Topic topic,
+      String endpoint,
+      int messageTtl,
+      int messageBackoff,
+      int batchSize,
+      int batchTime,
+      int batchVolume,
+      boolean retryOnClientErrors) {
+    BatchSubscriptionPolicy policy =
+        batchSubscriptionPolicy()
+            .applyDefaults()
+            .withMessageTtl(messageTtl)
+            .withMessageBackoff(messageBackoff)
+            .withBatchSize(batchSize)
+            .withBatchTime(batchTime)
+            .withBatchVolume(batchVolume)
+            .withClientErrorRetry(retryOnClientErrors)
+            .withRequestTimeout(500)
+            .build();
+
+    createBatchSubscription(topic, endpoint, policy);
+  }
+
+  public void createBatchSubscription(
+      Topic topic, String endpoint, BatchSubscriptionPolicy policy) {
+    Subscription subscription =
+        subscription(topic, "batchSubscription")
+            .withEndpoint(endpoint)
+            .withContentType(ContentType.JSON)
+            .withSubscriptionPolicy(policy)
+            .build();
+
+    hermes.initHelper().createSubscription(subscription);
+  }
+
+  private String readMessage(String body) {
+    try {
+      return mapper.writeValueAsString(
+          ((Map) mapper.readValue(body, List.class).get(0)).get("message"));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
     }
-
-    @Test
-    public void shouldNotRetryOnClientErrors() throws Throwable {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-
-        TestSubscriber subscriber = subscribers.createSubscriber((service, endpoint) -> {
-
-            service.addStubMapping(post(endpoint)
-                    .withRequestBody(containing("failed"))
-                    .willReturn(aResponse().withStatus(SC_BAD_REQUEST)).build());
-
-            service.addStubMapping(post(endpoint)
-                    .withRequestBody(containing("successful"))
-                    .willReturn(aResponse().withStatus(SC_CREATED)).build());
-        });
-
-        createSingleMessageBatchSubscription(topic, subscriber.getEndpoint());
-
-        //when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), failedRequestBody);
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), successfulRequestBody);
-
-        //then
-        subscriber.waitUntilRequestsReceived(requests ->
-                Assertions.assertThat(requests)
-                        .extracting(LoggedRequest::getBodyAsString)
-                        .extracting(this::readMessage)
-                        .containsExactly(failedRequestBody, successfulRequestBody));
-    }
-
-
-    private void createSingleMessageBatchSubscription(Topic topic, String endpoint, int messageTtl, int messageBackoff) {
-        createBatchSubscription(
-                topic, endpoint, messageTtl, messageBackoff, 1, 1, 200, false
-        );
-    }
-
-    private void createSingleMessageBatchSubscription(Topic topic, String endpoint) {
-        createSingleMessageBatchSubscription(topic, endpoint, false);
-    }
-
-    private void createSingleMessageBatchSubscription(Topic topic, String endpoint, boolean retryOnClientErrors) {
-        createBatchSubscription(topic, endpoint, 1, 10, 1, 1, 500, retryOnClientErrors);
-    }
-
-    public void createBatchSubscription(Topic topic, String endpoint, int messageTtl, int messageBackoff, int batchSize, int batchTime,
-                                        int batchVolume, boolean retryOnClientErrors) {
-        BatchSubscriptionPolicy policy = batchSubscriptionPolicy()
-                .applyDefaults()
-                .withMessageTtl(messageTtl)
-                .withMessageBackoff(messageBackoff)
-                .withBatchSize(batchSize)
-                .withBatchTime(batchTime)
-                .withBatchVolume(batchVolume)
-                .withClientErrorRetry(retryOnClientErrors)
-                .withRequestTimeout(500)
-                .build();
-
-        createBatchSubscription(topic, endpoint, policy);
-    }
-
-    public void createBatchSubscription(Topic topic, String endpoint, BatchSubscriptionPolicy policy) {
-        Subscription subscription = subscription(topic, "batchSubscription")
-                .withEndpoint(endpoint)
-                .withContentType(ContentType.JSON)
-                .withSubscriptionPolicy(policy)
-                .build();
-
-        hermes.initHelper().createSubscription(subscription);
-    }
-
-    private String readMessage(String body) {
-        try {
-            return mapper.writeValueAsString(((Map) mapper.readValue(body, List.class).get(0)).get("message"));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BroadcastDeliveryTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BroadcastDeliveryTest.java
index 699d64d5d0..bf14a48a73 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BroadcastDeliveryTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/BroadcastDeliveryTest.java
@@ -1,6 +1,16 @@
 package pl.allegro.tech.hermes.integrationtests;
 
-import com.jayway.awaitility.Duration;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.stream.Stream;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -14,115 +24,113 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.util.List;
-import java.util.stream.Stream;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static com.jayway.awaitility.Duration.TEN_SECONDS;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class BroadcastDeliveryTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribersFactory = new TestSubscribersExtension();
-
-    @Test
-    public void shouldPublishAndConsumeMessageByAllServices() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestMessage message = TestMessage.random();
-
-        List<TestSubscriber> subscribers = succeedingSubscribers(4);
-        String endpointUrl = setUpSubscribersAndGetEndpoint(subscribers);
-
-        hermes.initHelper().createSubscription(
-                broadcastSubscription(topic, "subscription", endpointUrl)
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscribers.forEach(s -> s.waitUntilReceived(message.body()));
-    }
-
-    @Test
-    public void shouldPublishAndRetryOnlyForUndeliveredConsumers() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestMessage message = TestMessage.random();
-
-        List<TestSubscriber> subscribers = succeedingSubscribers(3);
-        TestSubscriber retryingSubscriber = subscribersFactory.createSubscriberWithRetry(message.body(), 1);
-        subscribers.add(retryingSubscriber);
-
-        String endpointUrl = setUpSubscribersAndGetEndpoint(subscribers);
-
-        hermes.initHelper().createSubscription(
-                broadcastSubscription(topic, "subscription", endpointUrl)
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscribers.forEach(s -> s.waitUntilReceived(message.body()));
-        retryingSubscriber.waitUntilReceived(Duration.ONE_MINUTE, 2);
-        Assertions.assertThat(retryingSubscriber.getLastReceivedRequest().getHeader("Hermes-Retry-Count")).isEqualTo("1");
-    }
-
-    @Test
-    public void shouldNotRetryForBadRequestsFromConsumers() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestMessage message = TestMessage.random();
-
-        List<TestSubscriber> subscribers = succeedingSubscribers(3);
-        subscribers.add(subscribersFactory.createSubscriber(400));
-
-        String endpointUrl = setUpSubscribersAndGetEndpoint(subscribers);
-
-
-        hermes.initHelper().createSubscription(
-                broadcastSubscription(topic, "subscription", endpointUrl)
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscribers.forEach(s -> s.waitUntilReceived(message.body()));
-        waitAtMost(TEN_SECONDS).until(() -> {
-            long discarded = hermes.api()
-                    .getSubscriptionMetrics(topic.getQualifiedName(), "subscription")
-                    .expectBody(SubscriptionMetrics.class).returnResult().getResponseBody().getDiscarded();
-            assertThat(discarded).isEqualTo(1);
-        });
-    }
-
-    private List<TestSubscriber> succeedingSubscribers(int subscribersCount) {
-        return Stream.generate(subscribersFactory::createSubscriber).limit(subscribersCount).collect(toList());
-    }
-
-    private Subscription broadcastSubscription(Topic topic, String subscriptionName, String endpoint) {
-        return subscription(topic, subscriptionName)
-                .withEndpoint(endpoint)
-                .withContentType(ContentType.JSON)
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults().build())
-                .withMode(SubscriptionMode.BROADCAST)
-                .build();
-    }
-
-    private String setUpSubscribersAndGetEndpoint(List<TestSubscriber> subscribers) {
-        return subscribers.stream().map(TestSubscriber::getEndpoint).collect(joining(";"));
-    }
-
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribersFactory = new TestSubscribersExtension();
+
+  @Test
+  public void shouldPublishAndConsumeMessageByAllServices() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestMessage message = TestMessage.random();
+
+    List<TestSubscriber> subscribers = succeedingSubscribers(4);
+    String endpointUrl = setUpSubscribersAndGetEndpoint(subscribers);
+
+    hermes
+        .initHelper()
+        .createSubscription(broadcastSubscription(topic, "subscription", endpointUrl));
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscribers.forEach(s -> s.waitUntilReceived(message.body()));
+  }
+
+  @Test
+  public void shouldPublishAndRetryOnlyForUndeliveredConsumers() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestMessage message = TestMessage.random();
+
+    List<TestSubscriber> subscribers = succeedingSubscribers(3);
+    TestSubscriber retryingSubscriber =
+        subscribersFactory.createSubscriberWithRetry(message.body(), 1);
+    subscribers.add(retryingSubscriber);
+
+    String endpointUrl = setUpSubscribersAndGetEndpoint(subscribers);
+
+    hermes
+        .initHelper()
+        .createSubscription(broadcastSubscription(topic, "subscription", endpointUrl));
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscribers.forEach(s -> s.waitUntilReceived(message.body()));
+    retryingSubscriber.waitUntilReceived(Duration.ofMinutes(1), 2);
+    Assertions.assertThat(
+            retryingSubscriber.getLastReceivedRequest().getHeader("Hermes-Retry-Count"))
+        .isEqualTo("1");
+  }
+
+  @Test
+  public void shouldNotRetryForBadRequestsFromConsumers() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestMessage message = TestMessage.random();
+
+    List<TestSubscriber> subscribers = succeedingSubscribers(3);
+    subscribers.add(subscribersFactory.createSubscriber(400));
+
+    String endpointUrl = setUpSubscribersAndGetEndpoint(subscribers);
+
+    hermes
+        .initHelper()
+        .createSubscription(broadcastSubscription(topic, "subscription", endpointUrl));
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscribers.forEach(s -> s.waitUntilReceived(message.body()));
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              long discarded =
+                  hermes
+                      .api()
+                      .getSubscriptionMetrics(topic.getQualifiedName(), "subscription")
+                      .expectBody(SubscriptionMetrics.class)
+                      .returnResult()
+                      .getResponseBody()
+                      .getDiscarded();
+              assertThat(discarded).isEqualTo(1);
+            });
+  }
+
+  private List<TestSubscriber> succeedingSubscribers(int subscribersCount) {
+    return Stream.generate(subscribersFactory::createSubscriber)
+        .limit(subscribersCount)
+        .collect(toList());
+  }
+
+  private Subscription broadcastSubscription(
+      Topic topic, String subscriptionName, String endpoint) {
+    return subscription(topic, subscriptionName)
+        .withEndpoint(endpoint)
+        .withContentType(ContentType.JSON)
+        .withSubscriptionPolicy(subscriptionPolicy().applyDefaults().build())
+        .withMode(SubscriptionMode.BROADCAST)
+        .build();
+  }
+
+  private String setUpSubscribersAndGetEndpoint(List<TestSubscriber> subscribers) {
+    return subscribers.stream().map(TestSubscriber::getEndpoint).collect(joining(";"));
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ConsumerProfilingTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ConsumerProfilingTest.java
new file mode 100644
index 0000000000..5294afba5a
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ConsumerProfilingTest.java
@@ -0,0 +1,313 @@
+package pl.allegro.tech.hermes.integrationtests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+import java.time.Duration;
+import java.util.List;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.slf4j.LoggerFactory;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.ConsumerRun;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.DefaultConsumerProfiler;
+import pl.allegro.tech.hermes.consumers.consumer.profiling.Measurement;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscriber;
+import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
+import pl.allegro.tech.hermes.test.helper.message.TestMessage;
+
+public class ConsumerProfilingTest {
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  private ListAppender<ILoggingEvent> listAppender;
+
+  @BeforeEach
+  void createLogAppender() {
+    Logger logWatcher = (Logger) LoggerFactory.getLogger(DefaultConsumerProfiler.class);
+
+    listAppender = new ListAppender<>();
+    listAppender.start();
+
+    logWatcher.addAppender(listAppender);
+  }
+
+  @AfterEach
+  void teardown() {
+    ((Logger) LoggerFactory.getLogger(DefaultConsumerProfiler.class)).detachAndStopAllAppenders();
+    hermes.clearManagementData();
+  }
+
+  @AfterAll
+  static void teardownClass() {
+    hermes.clearManagementData();
+  }
+
+  @Test
+  public void shouldNotProfileWhenProfilingIsDisabled() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+                    .withProfilingEnabled(false)
+                    .build());
+    TestMessage message = TestMessage.random();
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // when
+    subscriber.waitUntilReceived(message.body());
+
+    // then
+    List<ILoggingEvent> logsList =
+        listAppender.list.stream()
+            .filter(
+                log ->
+                    log.getFormattedMessage().contains(subscription.getQualifiedName().toString()))
+            .toList();
+    assertThat(logsList).hasSize(0);
+  }
+
+  @Test
+  public void shouldProfileEmptyRun() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName()).withProfilingEnabled(true).build());
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              List<ILoggingEvent> logsList =
+                  listAppender.list.stream()
+                      .filter(
+                          log ->
+                              log.getFormattedMessage()
+                                  .contains(subscription.getQualifiedName().toString()))
+                      .toList();
+              assertThat(logsList).hasSizeGreaterThan(0);
+              assertThat(logsList.get(0).getFormattedMessage())
+                  .contains(
+                      String.format(
+                          "Consumer profiler measurements for subscription %s and %s run:",
+                          subscription.getQualifiedName(), ConsumerRun.EMPTY),
+                      Measurement.SIGNALS_AND_SEMAPHORE_ACQUIRE,
+                      Measurement.MESSAGE_RECEIVER_NEXT,
+                      Measurement.MESSAGE_CONVERSION,
+                      "partialMeasurements",
+                      Measurement.SIGNALS_INTERRUPT_RUN);
+            });
+  }
+
+  @Test
+  public void shouldNotProfileRunsBelowThreshold() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+                    .withProfilingEnabled(true)
+                    .withProfilingThresholdMs(100_000)
+                    .build());
+    TestMessage message = TestMessage.random();
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // when
+    subscriber.waitUntilReceived(message.body());
+
+    // then
+    List<ILoggingEvent> logsList =
+        listAppender.list.stream()
+            .filter(
+                log ->
+                    log.getFormattedMessage().contains(subscription.getQualifiedName().toString()))
+            .toList();
+    assertThat(logsList).hasSize(0);
+  }
+
+  @Test
+  public void shouldProfileSuccessfulMessageProcessing() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+                    .withProfilingEnabled(true)
+                    .build());
+    TestMessage message = TestMessage.random();
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // when
+    subscriber.waitUntilReceived(message.body());
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              List<ILoggingEvent> logsList =
+                  listAppender.list.stream()
+                      .filter(
+                          log -> log.getFormattedMessage().contains(ConsumerRun.DELIVERED.name()))
+                      .toList();
+              assertThat(logsList).hasSizeGreaterThan(0);
+              assertThat(logsList.get(0).getFormattedMessage())
+                  .contains(
+                      String.format(
+                          "Consumer profiler measurements for subscription %s and %s run:",
+                          subscription.getQualifiedName(), ConsumerRun.DELIVERED),
+                      Measurement.SIGNALS_AND_SEMAPHORE_ACQUIRE,
+                      Measurement.MESSAGE_RECEIVER_NEXT,
+                      Measurement.MESSAGE_CONVERSION,
+                      Measurement.OFFER_INFLIGHT_OFFSET,
+                      Measurement.TRACKERS_LOG_INFLIGHT,
+                      Measurement.SCHEDULE_MESSAGE_SENDING,
+                      Measurement.ACQUIRE_RATE_LIMITER,
+                      Measurement.MESSAGE_SENDER_SEND,
+                      Measurement.HANDLERS,
+                      "partialMeasurements",
+                      Measurement.SIGNALS_INTERRUPT_RUN);
+            });
+  }
+
+  @Test
+  public void shouldProfileDiscardedMessageProcessing() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber(400);
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+                    .withProfilingEnabled(true)
+                    .build());
+    TestMessage message = TestMessage.random();
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // when
+    subscriber.waitUntilReceived(message.body());
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              List<ILoggingEvent> logsList =
+                  listAppender.list.stream()
+                      .filter(
+                          log -> log.getFormattedMessage().contains(ConsumerRun.DISCARDED.name()))
+                      .toList();
+              assertThat(logsList).hasSizeGreaterThan(0);
+              assertThat(logsList.get(0).getFormattedMessage())
+                  .contains(
+                      String.format(
+                          "Consumer profiler measurements for subscription %s and %s run:",
+                          subscription.getQualifiedName(), ConsumerRun.DISCARDED),
+                      Measurement.SIGNALS_AND_SEMAPHORE_ACQUIRE,
+                      Measurement.MESSAGE_RECEIVER_NEXT,
+                      Measurement.MESSAGE_CONVERSION,
+                      Measurement.OFFER_INFLIGHT_OFFSET,
+                      Measurement.TRACKERS_LOG_INFLIGHT,
+                      Measurement.SCHEDULE_MESSAGE_SENDING,
+                      Measurement.ACQUIRE_RATE_LIMITER,
+                      Measurement.MESSAGE_SENDER_SEND,
+                      Measurement.HANDLERS,
+                      "partialMeasurements",
+                      Measurement.SIGNALS_INTERRUPT_RUN);
+            });
+  }
+
+  @Test
+  public void shouldProfileRetriedMessageProcessing() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestMessage message = TestMessage.random();
+    TestSubscriber subscriber = subscribers.createSubscriberWithRetry(message.body(), 1);
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+                    .withProfilingEnabled(true)
+                    .build());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // when
+    subscriber.waitUntilReceived(Duration.ofSeconds(5), 2);
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              List<ILoggingEvent> retriedLogsList =
+                  listAppender.list.stream()
+                      .filter(log -> log.getFormattedMessage().contains(ConsumerRun.RETRIED.name()))
+                      .toList();
+              assertThat(retriedLogsList).hasSizeGreaterThan(0);
+              assertThat(retriedLogsList.get(0).getFormattedMessage())
+                  .contains(
+                      String.format(
+                          "Consumer profiler measurements for subscription %s and %s run:",
+                          subscription.getQualifiedName(), ConsumerRun.RETRIED),
+                      Measurement.SIGNALS_AND_SEMAPHORE_ACQUIRE,
+                      Measurement.MESSAGE_RECEIVER_NEXT,
+                      Measurement.MESSAGE_CONVERSION,
+                      Measurement.OFFER_INFLIGHT_OFFSET,
+                      Measurement.TRACKERS_LOG_INFLIGHT,
+                      Measurement.SCHEDULE_MESSAGE_SENDING,
+                      Measurement.ACQUIRE_RATE_LIMITER,
+                      Measurement.MESSAGE_SENDER_SEND,
+                      Measurement.HANDLERS,
+                      "partialMeasurements",
+                      Measurement.SIGNALS_INTERRUPT_RUN);
+            });
+
+    // and
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              List<ILoggingEvent> processedLogsList =
+                  listAppender.list.stream()
+                      .filter(
+                          log -> log.getFormattedMessage().contains(ConsumerRun.DELIVERED.name()))
+                      .toList();
+              assertThat(processedLogsList).hasSizeGreaterThan(0);
+              assertThat(processedLogsList.get(0).getFormattedMessage())
+                  .contains(
+                      String.format(
+                          "Consumer profiler measurements for subscription %s and %s run:",
+                          subscription.getQualifiedName(), ConsumerRun.DELIVERED),
+                      Measurement.SCHEDULE_RESEND,
+                      Measurement.MESSAGE_SENDER_SEND,
+                      Measurement.HANDLERS,
+                      "retryDelayMillis 1000");
+            });
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ConsumingHttp2Test.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ConsumingHttp2Test.java
index 68d23f2b5a..45a7b87537 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ConsumingHttp2Test.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ConsumingHttp2Test.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -9,37 +13,33 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class ConsumingHttp2Test {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    @Test
-    public void shouldDeliverMessageUsingHttp2() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
-                        .withHttp2Enabled(true)
-                        .build()
-        );
-        TestMessage message = TestMessage.of("hello", "world");
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilReceived(message.body());
-        LoggedRequest lastReceivedRequest = subscriber.getLastReceivedRequest();
-        assertThat(lastReceivedRequest.getHeader("Keep-Alive")).isNull();
-        assertThat(lastReceivedRequest.getProtocol()).isEqualTo("HTTP/2.0");
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  @Test
+  public void shouldDeliverMessageUsingHttp2() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .withHttp2Enabled(true)
+                .build());
+    TestMessage message = TestMessage.of("hello", "world");
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilReceived(message.body());
+    LoggedRequest lastReceivedRequest = subscriber.getLastReceivedRequest();
+    assertThat(lastReceivedRequest.getHeader("Keep-Alive")).isNull();
+    assertThat(lastReceivedRequest.getProtocol()).isEqualTo("HTTP/2.0");
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringAvroTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringAvroTest.java
index 5bfa5b2ede..36c1e171fa 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringAvroTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringAvroTest.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static com.google.common.collect.ImmutableMap.of;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.ContentType;
@@ -12,82 +19,74 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 
-import java.util.Set;
-
-import static com.google.common.collect.ImmutableMap.of;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class FilteringAvroTest {
 
-    private static final MessageFilterSpecification MESSAGE_NAME_FILTER =
-            new MessageFilterSpecification(of("type", "avropath", "path", ".name", "matcher", "Bob"));
-
-    private static final MessageFilterSpecification MESSAGE_COLOR_FILTER =
-            new MessageFilterSpecification(of("type", "avropath", "path", ".favoriteColor", "matcher", "grey"));
-
+  private static final MessageFilterSpecification MESSAGE_NAME_FILTER =
+      new MessageFilterSpecification(of("type", "avropath", "path", ".name", "matcher", "Bob"));
 
-    private static final AvroUser BOB = new AvroUser("Bob", 50, "blue");
-    private static final AvroUser ALICE = new AvroUser("Alice", 20, "magenta");
-    private static final AvroUser BOB_GREY = new AvroUser("Bob", 50, "grey");
+  private static final MessageFilterSpecification MESSAGE_COLOR_FILTER =
+      new MessageFilterSpecification(
+          of("type", "avropath", "path", ".favoriteColor", "matcher", "grey"));
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
+  private static final AvroUser BOB = new AvroUser("Bob", 50, "blue");
+  private static final AvroUser ALICE = new AvroUser("Alice", 20, "magenta");
+  private static final AvroUser BOB_GREY = new AvroUser("Bob", 50, "grey");
 
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-    @Test
-    public void shouldFilterIncomingEvents() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), BOB.getSchemaAsString());
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
 
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+  @Test
+  public void shouldFilterIncomingEvents() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), BOB.getSchemaAsString());
 
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        final Subscription subscription = subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
-                .withContentType(ContentType.JSON)
-                .withFilter(MESSAGE_NAME_FILTER)
-                .build();
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        hermes.initHelper().createSubscription(subscription);
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    final Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+            .withContentType(ContentType.JSON)
+            .withFilter(MESSAGE_NAME_FILTER)
+            .build();
 
-        // when
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), BOB.asJson());
+    hermes.initHelper().createSubscription(subscription);
 
-        // then
-        subscriber.waitUntilAllReceivedStrict(Set.of(BOB.asJson()));
-    }
+    // when
+    hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
+    hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), BOB.asJson());
 
-    @Test
-    public void shouldChainMultipleFilters() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), BOB.getSchemaAsString());
+    // then
+    subscriber.waitUntilAllReceivedStrict(Set.of(BOB.asJson()));
+  }
 
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+  @Test
+  public void shouldChainMultipleFilters() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), BOB.getSchemaAsString());
 
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        final Subscription subscription = subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
-                .withContentType(ContentType.JSON)
-                .withFilter(MESSAGE_NAME_FILTER)
-                .withFilter(MESSAGE_COLOR_FILTER)
-                .build();
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        hermes.initHelper().createSubscription(subscription);
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    final Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+            .withContentType(ContentType.JSON)
+            .withFilter(MESSAGE_NAME_FILTER)
+            .withFilter(MESSAGE_COLOR_FILTER)
+            .build();
 
-        // when
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), BOB.asJson());
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), BOB_GREY.asJson());
+    hermes.initHelper().createSubscription(subscription);
 
-        // then
-        subscriber.waitUntilAllReceivedStrict(Set.of(BOB_GREY.asJson()));
-    }
+    // when
+    hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), BOB.asJson());
+    hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), BOB_GREY.asJson());
 
+    // then
+    subscriber.waitUntilAllReceivedStrict(Set.of(BOB_GREY.asJson()));
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringHeadersTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringHeadersTest.java
index 19f83925eb..e4d9b3da99 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringHeadersTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringHeadersTest.java
@@ -1,5 +1,13 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static com.google.common.collect.ImmutableMap.of;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+import static pl.allegro.tech.hermes.utils.Headers.createHeaders;
+
+import java.util.Map;
+import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.MessageFilterSpecification;
@@ -9,51 +17,77 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 
-import java.util.Map;
-import java.util.Set;
-
-import static com.google.common.collect.ImmutableMap.of;
-import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-import static pl.allegro.tech.hermes.utils.Headers.createHeaders;
-
 public class FilteringHeadersTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
 
-    private static final MessageFilterSpecification TRACE_ID_HEADER_FILTER =
-            new MessageFilterSpecification(of("type", "header", "header", "Trace-Id", "matcher", "^vte.*"));
+  private static final MessageFilterSpecification TRACE_ID_HEADER_FILTER =
+      new MessageFilterSpecification(
+          of("type", "header", "header", "Trace-Id", "matcher", "^vte.*"));
 
-    private static final MessageFilterSpecification SPAN_ID_HEADER_FILTER =
-            new MessageFilterSpecification(of("type", "header", "header", "Span-Id", "matcher", ".*span$"));
+  private static final MessageFilterSpecification SPAN_ID_HEADER_FILTER =
+      new MessageFilterSpecification(
+          of("type", "header", "header", "Span-Id", "matcher", ".*span$"));
 
-    private static final AvroUser ALICE = new AvroUser("Alice", 20, "blue");
-    private static final AvroUser BOB = new AvroUser("Bob", 30, "red");
+  private static final AvroUser ALICE = new AvroUser("Alice", 20, "blue");
+  private static final AvroUser BOB = new AvroUser("Bob", 30, "red");
 
-    @Test
-    public void shouldFilterIncomingEventsByHeaders() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+  @Test
+  public void shouldFilterIncomingEventsByHeaders() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
 
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
                 .withFilter(TRACE_ID_HEADER_FILTER)
                 .withFilter(SPAN_ID_HEADER_FILTER)
                 .build());
 
-        // when
-        hermes.api().publish(topic.getQualifiedName(), ALICE.asJson(), createHeaders(Map.of("Trace-Id", "vte12", "Span-Id", "my-span", "Content-Type", TEXT_PLAIN))).expectStatus().is2xxSuccessful();
-        hermes.api().publish(topic.getQualifiedName(), BOB.asJson(), createHeaders(Map.of("Trace-Id", "vte12"))).expectStatus().is2xxSuccessful();
-        hermes.api().publish(topic.getQualifiedName(), BOB.asJson(), createHeaders(Map.of("Span-Id", "my-span"))).expectStatus().is2xxSuccessful();
-        hermes.api().publish(topic.getQualifiedName(), BOB.asJson(), createHeaders(Map.of("Trace-Id", "vte12", "Span-Id", "span-1"))).expectStatus().is2xxSuccessful();
-        hermes.api().publish(topic.getQualifiedName(), BOB.asJson(), createHeaders(Map.of("Trace-Id", "invalid", "Span-Id", "my-span"))).expectStatus().is2xxSuccessful();
+    // when
+    hermes
+        .api()
+        .publish(
+            topic.getQualifiedName(),
+            ALICE.asJson(),
+            createHeaders(
+                Map.of("Trace-Id", "vte12", "Span-Id", "my-span", "Content-Type", TEXT_PLAIN)))
+        .expectStatus()
+        .is2xxSuccessful();
+    hermes
+        .api()
+        .publish(topic.getQualifiedName(), BOB.asJson(), createHeaders(Map.of("Trace-Id", "vte12")))
+        .expectStatus()
+        .is2xxSuccessful();
+    hermes
+        .api()
+        .publish(
+            topic.getQualifiedName(), BOB.asJson(), createHeaders(Map.of("Span-Id", "my-span")))
+        .expectStatus()
+        .is2xxSuccessful();
+    hermes
+        .api()
+        .publish(
+            topic.getQualifiedName(),
+            BOB.asJson(),
+            createHeaders(Map.of("Trace-Id", "vte12", "Span-Id", "span-1")))
+        .expectStatus()
+        .is2xxSuccessful();
+    hermes
+        .api()
+        .publish(
+            topic.getQualifiedName(),
+            BOB.asJson(),
+            createHeaders(Map.of("Trace-Id", "invalid", "Span-Id", "my-span")))
+        .expectStatus()
+        .is2xxSuccessful();
 
-        // then
-        subscriber.waitUntilAllReceivedStrict(Set.of(ALICE.asJson()));
-    }
+    // then
+    subscriber.waitUntilAllReceivedStrict(Set.of(ALICE.asJson()));
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringJsonTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringJsonTest.java
index b0ffcaf4c0..84c3a78469 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringJsonTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/FilteringJsonTest.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static com.google.common.collect.ImmutableMap.of;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.MessageFilterSpecification;
@@ -10,89 +15,93 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 
-import java.util.Set;
-
-import static com.google.common.collect.ImmutableMap.of;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class FilteringJsonTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
 
-    private static final MessageFilterSpecification MESSAGE_NAME_FILTER =
-            new MessageFilterSpecification(of("type", "jsonpath", "path", ".name", "matcher", "^Bob.*"));
+  private static final MessageFilterSpecification MESSAGE_NAME_FILTER =
+      new MessageFilterSpecification(of("type", "jsonpath", "path", ".name", "matcher", "^Bob.*"));
 
-    private static final MessageFilterSpecification MESSAGE_COLOR_FILTER =
-            new MessageFilterSpecification(of("type", "jsonpath", "path", ".favoriteColor", "matcher", "grey"));
+  private static final MessageFilterSpecification MESSAGE_COLOR_FILTER =
+      new MessageFilterSpecification(
+          of("type", "jsonpath", "path", ".favoriteColor", "matcher", "grey"));
 
-    static final AvroUser BOB = new AvroUser("Bob", 50, "blue");
-    static final AvroUser ALICE = new AvroUser("Alice", 20, "magenta");
-    static final AvroUser ALICE_GREY = new AvroUser("Alice", 20, "grey");
-    static final AvroUser BOB_GREY = new AvroUser("Bob", 50, "grey");
+  static final AvroUser BOB = new AvroUser("Bob", 50, "blue");
+  static final AvroUser ALICE = new AvroUser("Alice", 20, "magenta");
+  static final AvroUser ALICE_GREY = new AvroUser("Alice", 20, "grey");
+  static final AvroUser BOB_GREY = new AvroUser("Bob", 50, "grey");
 
-    private static final SubscriptionPolicy SUBSCRIPTION_POLICY = new SubscriptionPolicy(100, 2000, 1000, 1000, true, 100, null, 0, 1, 600);
+  private static final SubscriptionPolicy SUBSCRIPTION_POLICY =
+      new SubscriptionPolicy(100, 2000, 1000, 1000, true, 100, null, 0, 1, 600);
 
-    @Test
-    public void shouldFilterIncomingEvents() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+  @Test
+  public void shouldFilterIncomingEvents() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
                 .withSubscriptionPolicy(SUBSCRIPTION_POLICY)
                 .withFilter(MESSAGE_NAME_FILTER)
                 .build());
 
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB.asJson());
-
-        // then
-        subscriber.waitUntilAllReceivedStrict(Set.of(BOB.asJson()));
-    }
-
-    @Test
-    public void shouldChainFilters() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB.asJson());
+
+    // then
+    subscriber.waitUntilAllReceivedStrict(Set.of(BOB.asJson()));
+  }
+
+  @Test
+  public void shouldChainFilters() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
                 .withSubscriptionPolicy(SUBSCRIPTION_POLICY)
                 .withFilter(MESSAGE_NAME_FILTER)
                 .withFilter(MESSAGE_COLOR_FILTER)
                 .build());
 
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE_GREY.asJson());
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB.asJson());
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB_GREY.asJson());
-
-        // then
-        subscriber.waitUntilAllReceivedStrict(Set.of(BOB_GREY.asJson()));
-    }
-
-    @Test
-    public void shouldPassSubscriptionHeadersWhenFilteringIsEnabledForIncomingEvents() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE_GREY.asJson());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB.asJson());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB_GREY.asJson());
+
+    // then
+    subscriber.waitUntilAllReceivedStrict(Set.of(BOB_GREY.asJson()));
+  }
+
+  @Test
+  public void shouldPassSubscriptionHeadersWhenFilteringIsEnabledForIncomingEvents() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
                 .withSubscriptionPolicy(SUBSCRIPTION_POLICY)
                 .withFilter(MESSAGE_NAME_FILTER)
                 .withHeader("MY-HEADER", "myHeaderValue")
                 .build());
 
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB.asJson());
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), ALICE.asJson());
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), BOB.asJson());
 
-        // then
-        subscriber.waitUntilAllReceivedStrict(Set.of(BOB.asJson()));
-        subscriber.waitUntilMessageWithHeaderReceived("MY-HEADER", "myHeaderValue");
-    }
+    // then
+    subscriber.waitUntilAllReceivedStrict(Set.of(BOB.asJson()));
+    subscriber.waitUntilMessageWithHeaderReceived("MY-HEADER", "myHeaderValue");
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/GooglePubSubConsumingTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/GooglePubSubConsumingTest.java
index e418da908e..0240b4d43d 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/GooglePubSubConsumingTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/GooglePubSubConsumingTest.java
@@ -1,6 +1,12 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import com.google.pubsub.v1.ReceivedMessage;
+import java.io.IOException;
+import java.util.List;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -10,45 +16,39 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestGooglePubSubSubscriber;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.io.IOException;
-import java.util.List;
-
-import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class GooglePubSubConsumingTest {
 
-    @Order(0)
-    @RegisterExtension
-    public static final GooglePubSubExtension googlePubSub = new GooglePubSubExtension();
-
-    @Order(1)
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension()
-            .withGooglePubSub(googlePubSub);
-
-    @Test
-    public void shouldDeliverMessageToGooglePubSub() throws IOException {
-        // given
-        TestGooglePubSubSubscriber subscriber = googlePubSub.subscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build()
-        );
-        TestMessage message = TestMessage.of("hello", "world");
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilAnyMessageReceived();
-        List<ReceivedMessage> allReceivedMessages = subscriber.getAllReceivedMessages();
-        assertThat(allReceivedMessages).hasSize(1);
-        assertThat(allReceivedMessages.get(0).getMessage())
-                .hasAttribute("tn")
-                .hasAttribute("id")
-                .hasAttribute("ts")
-                .hasBody(message.body());
-    }
+  @Order(0)
+  @RegisterExtension
+  public static final GooglePubSubExtension googlePubSub = new GooglePubSubExtension();
+
+  @Order(1)
+  @RegisterExtension
+  public static final HermesExtension hermes = new HermesExtension().withGooglePubSub(googlePubSub);
+
+  @Test
+  public void shouldDeliverMessageToGooglePubSub() throws IOException {
+    // given
+    TestGooglePubSubSubscriber subscriber = googlePubSub.subscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
+    TestMessage message = TestMessage.of("hello", "world");
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilAnyMessageReceived();
+    List<ReceivedMessage> allReceivedMessages = subscriber.getAllReceivedMessages();
+    assertThat(allReceivedMessages).hasSize(1);
+    assertThat(allReceivedMessages.get(0).getMessage())
+        .hasAttribute("tn")
+        .hasAttribute("id")
+        .hasAttribute("ts")
+        .hasBody(message.body());
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesClientPublishingTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesClientPublishingTest.java
index 813e0d9496..27bca9c938 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesClientPublishingTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesClientPublishingTest.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static jakarta.ws.rs.client.ClientBuilder.newClient;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.client.HermesClientBuilder.hermesClient;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import jakarta.ws.rs.core.UriBuilder;
 import okhttp3.OkHttpClient;
 import org.junit.jupiter.api.Test;
@@ -13,66 +18,62 @@
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import static jakarta.ws.rs.client.ClientBuilder.newClient;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.client.HermesClientBuilder.hermesClient;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class HermesClientPublishingTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-    private static final String FRONTEND_URI = "http://localhost:{frontendPort}";
-    private final TestMessage message = TestMessage.of("hello", "world");
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+  private static final String FRONTEND_URI = "http://localhost:{frontendPort}";
+  private final TestMessage message = TestMessage.of("hello", "world");
 
-    @Test
-    public void shouldPublishUsingJerseyClient() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        HermesClient client = hermesClient(
-                new JerseyHermesSender(newClient())).withURI(UriBuilder.fromUri(FRONTEND_URI).build(hermes.getFrontendPort())
-        ).build();
+  @Test
+  public void shouldPublishUsingJerseyClient() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    HermesClient client =
+        hermesClient(new JerseyHermesSender(newClient()))
+            .withURI(UriBuilder.fromUri(FRONTEND_URI).build(hermes.getFrontendPort()))
+            .build();
 
-        // when & then
-        runTestSuiteForHermesClient(client, topic);
-    }
+    // when & then
+    runTestSuiteForHermesClient(client, topic);
+  }
 
-    @Test
-    public void shouldPublishUsingOkHttpClient() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        HermesClient client = hermesClient(
-                new OkHttpHermesSender(new OkHttpClient())).withURI(UriBuilder.fromUri(FRONTEND_URI).build(hermes.getFrontendPort())
-        ).build();
+  @Test
+  public void shouldPublishUsingOkHttpClient() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    HermesClient client =
+        hermesClient(new OkHttpHermesSender(new OkHttpClient()))
+            .withURI(UriBuilder.fromUri(FRONTEND_URI).build(hermes.getFrontendPort()))
+            .build();
 
-        // when & then
-        runTestSuiteForHermesClient(client, topic);
-    }
+    // when & then
+    runTestSuiteForHermesClient(client, topic);
+  }
 
-    private void runTestSuiteForHermesClient(HermesClient client, Topic topic) {
-        shouldPublishUsingHermesClient(client, topic);
-        shouldNotPublishUsingHermesClient(client);
-    }
+  private void runTestSuiteForHermesClient(HermesClient client, Topic topic) {
+    shouldPublishUsingHermesClient(client, topic);
+    shouldNotPublishUsingHermesClient(client);
+  }
 
-    private void shouldPublishUsingHermesClient(HermesClient client, Topic topic) {
-        // when
-        HermesResponse response = client.publish(topic.getQualifiedName(), message.body()).join();
+  private void shouldPublishUsingHermesClient(HermesClient client, Topic topic) {
+    // when
+    HermesResponse response = client.publish(topic.getQualifiedName(), message.body()).join();
 
-        // then
-        assertThat(response.isSuccess()).isTrue();
-        assertThat(response.getMessageId()).isNotEmpty();
-        assertThat(response.getDebugLog()).contains("Sending message").contains("succeeded");
-    }
+    // then
+    assertThat(response.isSuccess()).isTrue();
+    assertThat(response.getMessageId()).isNotEmpty();
+    assertThat(response.getDebugLog()).contains("Sending message").contains("succeeded");
+  }
 
-    private void shouldNotPublishUsingHermesClient(HermesClient client) {
-        // given
-        TopicName topic = new TopicName("not", "existing");
+  private void shouldNotPublishUsingHermesClient(HermesClient client) {
+    // given
+    TopicName topic = new TopicName("not", "existing");
 
-        // when
-        HermesResponse response = client.publish(topic.qualifiedName(), message.body()).join();
+    // when
+    HermesResponse response = client.publish(topic.qualifiedName(), message.body()).join();
 
-        // then
-        assertThat(response.isFailure()).isTrue();
-        assertThat(response.getDebugLog()).contains("Sending message").contains("failed");
-    }
+    // then
+    assertThat(response.isFailure()).isTrue();
+    assertThat(response.getDebugLog()).contains("Sending message").contains("failed");
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/JmsConsumingTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/JmsConsumingTest.java
index 4c2eaab8c5..e002f80639 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/JmsConsumingTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/JmsConsumingTest.java
@@ -1,102 +1,109 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.UUID;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.http.HttpHeaders;
 import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.integrationtests.setup.TraceContext;
-import pl.allegro.tech.hermes.integrationtests.subscriber.TestJmsSubscriber;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.integrationtests.setup.JmsStarter;
+import pl.allegro.tech.hermes.integrationtests.setup.TraceContext;
+import pl.allegro.tech.hermes.integrationtests.subscriber.TestJmsSubscriber;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.util.UUID;
-
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class JmsConsumingTest {
 
-    private static final String JMS_TOPIC_NAME = "hermes";
-
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    private static final JmsStarter starter = new JmsStarter();
-
-    @BeforeAll
-    static void startJms() throws Exception {
-        starter.start();
-    }
-
-    @AfterAll
-    static void stopJms() throws Exception {
-        starter.stop();
-    }
-
-    @Test
-    public void shouldConsumeMessageOnJMSEndpoint() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestJmsSubscriber subscriber = new TestJmsSubscriber(JMS_TOPIC_NAME);
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), jmsEndpointAddress()).build());
-
-        // when
-        hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body());
-
-        // then
-        subscriber.waitUntilReceived(TestMessage.simple().body());
-    }
-
-    @Test
-    public void shouldPublishAndConsumeJmsMessageWithTraceId() {
-        // given
-        String traceId = UUID.randomUUID().toString();
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Trace-Id", traceId);
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestJmsSubscriber subscriber = new TestJmsSubscriber(JMS_TOPIC_NAME);
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), jmsEndpointAddress()).build());
-
-        // when
-        hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body(), headers);
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("TraceId", traceId);
-    }
-
-    @Test
-    public void shouldPublishAndConsumeJmsMessageWithTraceHeaders() {
-        // given
-        TraceContext trace = TraceContext.random();
-        HttpHeaders headers = new HttpHeaders();
-        addTraceHeaders(trace, headers);
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestJmsSubscriber subscriber = new TestJmsSubscriber(JMS_TOPIC_NAME);
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), jmsEndpointAddress()).build());
-
-        // when
-        hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body(), headers);
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("TraceId", trace.getTraceId());
-        subscriber.waitUntilMessageWithHeaderReceived("SpanId", trace.getSpanId());
-        subscriber.waitUntilMessageWithHeaderReceived("ParentSpanId", trace.getParentSpanId());
-        subscriber.waitUntilMessageWithHeaderReceived("TraceSampled", trace.getTraceSampled());
-        subscriber.waitUntilMessageWithHeaderReceived("TraceReported", trace.getTraceReported());
-    }
-
-    private void addTraceHeaders(TraceContext trace, HttpHeaders headers) {
-        headers.add("Trace-Id", trace.getTraceId());
-        headers.add("Span-Id", trace.getSpanId());
-        headers.add("Parent-Span-Id", trace.getParentSpanId());
-        headers.add("Trace-Sampled", trace.getTraceSampled());
-        headers.add("Trace-Reported", trace.getTraceReported());
-    }
-
-    private String jmsEndpointAddress() {
-        return "jms://guest:guest@localhost:5445/" + JmsConsumingTest.JMS_TOPIC_NAME;
-    }
+  private static final String JMS_TOPIC_NAME = "hermes";
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  private static final JmsStarter starter = new JmsStarter();
+
+  @BeforeAll
+  static void startJms() throws Exception {
+    starter.start();
+  }
+
+  @AfterAll
+  static void stopJms() throws Exception {
+    starter.stop();
+  }
+
+  @Test
+  public void shouldConsumeMessageOnJMSEndpoint() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestJmsSubscriber subscriber = new TestJmsSubscriber(JMS_TOPIC_NAME);
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), jmsEndpointAddress()).build());
+
+    // when
+    hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body());
+
+    // then
+    subscriber.waitUntilReceived(TestMessage.simple().body());
+  }
+
+  @Test
+  public void shouldPublishAndConsumeJmsMessageWithTraceId() {
+    // given
+    String traceId = UUID.randomUUID().toString();
+    HttpHeaders headers = new HttpHeaders();
+    headers.add("Trace-Id", traceId);
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestJmsSubscriber subscriber = new TestJmsSubscriber(JMS_TOPIC_NAME);
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), jmsEndpointAddress()).build());
+
+    // when
+    hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body(), headers);
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("TraceId", traceId);
+  }
+
+  @Test
+  public void shouldPublishAndConsumeJmsMessageWithTraceHeaders() {
+    // given
+    TraceContext trace = TraceContext.random();
+    HttpHeaders headers = new HttpHeaders();
+    addTraceHeaders(trace, headers);
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestJmsSubscriber subscriber = new TestJmsSubscriber(JMS_TOPIC_NAME);
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), jmsEndpointAddress()).build());
+
+    // when
+    hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body(), headers);
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("TraceId", trace.traceId());
+    subscriber.waitUntilMessageWithHeaderReceived("SpanId", trace.spanId());
+    subscriber.waitUntilMessageWithHeaderReceived("ParentSpanId", trace.parentSpanId());
+    subscriber.waitUntilMessageWithHeaderReceived("TraceSampled", trace.traceSampled());
+    subscriber.waitUntilMessageWithHeaderReceived("TraceReported", trace.traceReported());
+  }
+
+  private void addTraceHeaders(TraceContext trace, HttpHeaders headers) {
+    headers.add("Trace-Id", trace.traceId());
+    headers.add("Span-Id", trace.spanId());
+    headers.add("Parent-Span-Id", trace.parentSpanId());
+    headers.add("Trace-Sampled", trace.traceSampled());
+    headers.add("Trace-Reported", trace.traceReported());
+  }
+
+  private String jmsEndpointAddress() {
+    return "jms://guest:guest@localhost:5445/" + JmsConsumingTest.JMS_TOPIC_NAME;
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaProducerMetricsTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaProducerMetricsTest.java
new file mode 100644
index 0000000000..73b1444b8e
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaProducerMetricsTest.java
@@ -0,0 +1,50 @@
+package pl.allegro.tech.hermes.integrationtests;
+
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThatMetrics;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.integrationtests.assertions.PrometheusMetricsAssertion;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+
+public class KafkaProducerMetricsTest {
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldRegisterSendMetrics() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    double initialMetricValue = assertMetricsContainTotalSendMetric().withInitialValue();
+
+    // when
+    hermes.api().publish(topic.getQualifiedName(), "hello world");
+    hermes.api().publish(topic.getQualifiedName(), "hello world");
+
+    // then
+    await()
+        .atMost(10, TimeUnit.SECONDS)
+        .untilAsserted(
+            () -> assertMetricsContainTotalSendMetric().withValue(initialMetricValue + 2.0));
+  }
+
+  PrometheusMetricsAssertion.PrometheusMetricAssertion assertMetricsContainTotalSendMetric() {
+    return assertThatMetrics(
+            hermes
+                .api()
+                .getFrontendMetrics()
+                .expectStatus()
+                .isOk()
+                .expectBody(String.class)
+                .returnResult()
+                .getResponseBody())
+        .contains("hermes_frontend_kafka_producer_ack_leader_record_send_total")
+        .withLabels(
+            "storageDc", "dc",
+            "sender", "default");
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaRetransmissionServiceTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaRetransmissionServiceTest.java
index 86c78a9711..94c7eb8f43 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaRetransmissionServiceTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaRetransmissionServiceTest.java
@@ -1,8 +1,17 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static java.util.stream.IntStream.range;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.PatchData.patchData;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Multimaps;
-import com.jayway.awaitility.Duration;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -12,7 +21,6 @@
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.common.kafka.offset.PartitionOffset;
-import pl.allegro.tech.hermes.consumers.supervisor.process.RunningSubscriptionStatus;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscriber;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
@@ -20,170 +28,171 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.time.Clock;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Predicate;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static java.util.stream.IntStream.range;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.PatchData.patchData;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.COMMIT;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.UPDATE_TOPIC;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
-
-// TODO potentially should be moved to slow integrationTest
 public class KafkaRetransmissionServiceTest {
 
-    private static final String PRIMARY_KAFKA_CLUSTER_NAME = "primary-dc";
-
-    private final AvroUser avroUser = new AvroUser();
+  private static final String PRIMARY_KAFKA_CLUSTER_NAME = "primary-dc";
 
-    private final Clock clock = Clock.systemDefaultZone();
+  private final AvroUser avroUser = new AvroUser();
 
-    private final List<String> messages = new ArrayList<>() {{
-        range(0, 4).forEach(i -> add(TestMessage.random().body()));
-    }};
-
-    private final List<String> messages2 = new ArrayList<>() {{
-        range(5, 6).forEach(i -> add(TestMessage.random().body()));
-    }};
-
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    @Test
-    public void shouldMoveOffsetNearGivenTimestamp() throws InterruptedException {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
-        publishAndConsumeMessages(messages, topic, subscriber);
-        Thread.sleep(1000); //wait 1s because our date time format has seconds precision
-        final OffsetRetransmissionDate retransmissionDate = new OffsetRetransmissionDate(OffsetDateTime.now());
-        Thread.sleep(1000);
-        publishAndConsumeMessages(messages2, topic, subscriber);
-        waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().retransmit(topic.getQualifiedName(), subscription.getName(), retransmissionDate, false);
-
-        // then
-        response.expectStatus().isOk();
-        messages2.forEach(subscriber::waitUntilReceived);
-    }
-
-    @Test
-    public void shouldMoveOffsetInDryRunMode() throws InterruptedException {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
-        // we have 2 partitions, thus 4 messages to get 2 per partition
-        publishAndConsumeMessages(messages, topic, subscriber);
-        Thread.sleep(2000);
-        final OffsetRetransmissionDate retransmissionDate = new OffsetRetransmissionDate(OffsetDateTime.now());
-        publishAndConsumeMessages(messages2, topic, subscriber);
-        waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
-        subscriber.reset();
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().retransmit(topic.getQualifiedName(), subscription.getName(), retransmissionDate, true);
-
-        // then
-        response.expectStatus().isOk();
-        MultiDCOffsetChangeSummary summary = response.expectBody(MultiDCOffsetChangeSummary.class).returnResult().getResponseBody();
-
-        assert summary != null;
-        assertThat(summary.getPartitionOffsetListPerBrokerName().get(PRIMARY_KAFKA_CLUSTER_NAME).get(0).getOffset())
-                .isEqualTo(2);
-        subscriber.noMessagesReceived();
-    }
-
-//     TODO schema-registry required
-
-//    @Test
-//    public void shouldMoveOffsetInDryRunModeForTopicsMigratedToAvro() throws InterruptedException {
-//        // given
-//        TestSubscriber subscriber = subscribers.createSubscriber();
-//        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-//        Subscription subscription = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
-//
-//        hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body());
-//        waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
-//
-//        Thread.sleep(1000); //wait 1s because our date time format has seconds precision
-//        final OffsetRetransmissionDate retransmissionDate = new OffsetRetransmissionDate(OffsetDateTime.now());
-//
-//        hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body());
-//        waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
-//
-//        PatchData patch = patchData()
-//                .set("contentType", ContentType.AVRO)
-//                .set("migratedFromJsonType", true)
-//                .set("schema", avroUser.getSchemaAsString())
-//                .build();
-//
-//        hermes.initHelper().updateTopic(topic.getQualifiedName(), patch);
-//        waitUntilTopicIsUpdatedAfter(topic.getQualifiedName(), subscription.getName());
-//
-//        hermes.api().publishUntilSuccess(topic.getQualifiedName(), avroUser.asBytes());
-//        waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
-//
-//        // when
-//        WebTestClient.ResponseSpec response = hermes.api().retransmit(topic.getQualifiedName(), subscription.getName(), retransmissionDate, true);
-//
-//        // then
-//        response.expectStatus().isOk();
-//        MultiDCOffsetChangeSummary summary = response.expectBody(MultiDCOffsetChangeSummary.class).returnResult().getResponseBody();
-//        assert summary != null;
-//        PartitionOffsetsPerKafkaTopic offsets = PartitionOffsetsPerKafkaTopic.from(
-//                summary.getPartitionOffsetListPerBrokerName().get(PRIMARY_KAFKA_CLUSTER_NAME)
-//        );
-//        assertThat((Long) offsets.jsonPartitionOffsets.stream().mapToLong(PartitionOffset::getOffset).sum()).isEqualTo(1);
-//        assertThat((Long) offsets.avroPartitionOffsets.stream().mapToLong(PartitionOffset::getOffset).sum()).isEqualTo(0);
-//    }
-
-    private void publishAndConsumeMessages(List<String> messages, Topic topic, TestSubscriber subscriber) {
-        messages.forEach(message -> hermes.api().publish(topic.getQualifiedName(), message));
-        messages.forEach(subscriber::waitUntilReceived);
-    }
-
-    public void waitUntilTopicIsUpdatedAfter(String topicQualifiedName, String subscription) {
-        long currentTime = clock.millis();
-        until(Duration.TEN_SECONDS, topicQualifiedName, subscription, sub ->
-                sub.getSignalTimesheet().getOrDefault(UPDATE_TOPIC, 0L) > currentTime);
-    }
-
-    private void waitUntilConsumerCommitsOffset(String topicQualifiedName, String subscription) {
-        long currentTime = clock.millis();
-        until(Duration.TEN_SECONDS, topicQualifiedName, subscription, sub ->
-                sub.getSignalTimesheet().getOrDefault(COMMIT, 0L) > currentTime);
-    }
-
-    private void until(Duration duration, String topicQualifiedName, String subscription, Predicate<RunningSubscriptionStatus> predicate) {
-        waitAtMost(adjust(duration)).until(() ->
-                hermes.api().getRunningSubscriptionsStatus().stream()
-                        .filter(sub -> sub.getQualifiedName().equals(topicQualifiedName + "$" + subscription))
-                        .anyMatch(predicate));
-    }
-
-    private record PartitionOffsetsPerKafkaTopic(List<PartitionOffset> avroPartitionOffsets,
-                                                 List<PartitionOffset> jsonPartitionOffsets) {
+  private final List<String> messages =
+      new ArrayList<>() {
+        {
+          range(0, 4).forEach(i -> add(TestMessage.random().body()));
+        }
+      };
 
-        private static PartitionOffsetsPerKafkaTopic from(List<PartitionOffset> all) {
-                ImmutableListMultimap<Boolean, PartitionOffset> partitionOffsets = Multimaps.index(
-                        all, p -> p.getTopic().asString().endsWith("_avro")
-                );
-                return new PartitionOffsetsPerKafkaTopic(partitionOffsets.get(true), partitionOffsets.get(false));
-            }
+  private final List<String> messages2 =
+      new ArrayList<>() {
+        {
+          range(5, 6).forEach(i -> add(TestMessage.random().body()));
         }
+      };
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  @Test
+  public void shouldMoveOffsetNearGivenTimestamp() throws InterruptedException {
+    // given
+    final TestSubscriber subscriber = subscribers.createSubscriber();
+    final Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    final Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+    publishAndConsumeMessages(messages, topic, subscriber);
+    Thread.sleep(1000); // wait 1s because our date time format has seconds precision
+    final OffsetRetransmissionDate retransmissionDate =
+        new OffsetRetransmissionDate(OffsetDateTime.now());
+    Thread.sleep(1000);
+    publishAndConsumeMessages(messages2, topic, subscriber);
+    hermes.api().waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .retransmit(
+                topic.getQualifiedName(), subscription.getName(), retransmissionDate, false);
+
+    // then
+    response.expectStatus().isOk();
+    messages2.forEach(subscriber::waitUntilReceived);
+  }
+
+  @Test
+  public void shouldMoveOffsetInDryRunMode() throws InterruptedException {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    final Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+    // 4 messages
+    publishAndConsumeMessages(messages, topic, subscriber);
+    Thread.sleep(2000);
+    final OffsetRetransmissionDate retransmissionDate =
+        new OffsetRetransmissionDate(OffsetDateTime.now());
+    publishAndConsumeMessages(messages2, topic, subscriber);
+    hermes.api().waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
+    subscriber.reset();
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .retransmit(topic.getQualifiedName(), subscription.getName(), retransmissionDate, true);
+
+    // then
+    response.expectStatus().isOk();
+    MultiDCOffsetChangeSummary summary =
+        response.expectBody(MultiDCOffsetChangeSummary.class).returnResult().getResponseBody();
+
+    assert summary != null;
+    Long offsetSum =
+        summary.getPartitionOffsetListPerBrokerName().get(PRIMARY_KAFKA_CLUSTER_NAME).stream()
+            .collect(Collectors.summarizingLong(PartitionOffset::getOffset))
+            .getSum();
+    assertThat(offsetSum).isEqualTo(4);
+    subscriber.noMessagesReceived();
+  }
+
+  @Test
+  public void shouldMoveOffsetInDryRunModeForTopicsMigratedToAvro() throws InterruptedException {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+
+    hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body());
+    hermes.api().waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
+
+    Thread.sleep(1000); // wait 1s because our date time format has seconds precision
+    final OffsetRetransmissionDate retransmissionDate =
+        new OffsetRetransmissionDate(OffsetDateTime.now());
+
+    hermes.api().publish(topic.getQualifiedName(), TestMessage.simple().body());
+    hermes.api().waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
+
+    PatchData patch =
+        patchData()
+            .set("contentType", ContentType.AVRO)
+            .set("migratedFromJsonType", true)
+            .set("schema", avroUser.getSchemaAsString())
+            .build();
+
+    hermes.api().updateTopic(topic.getQualifiedName(), patch).expectStatus().isOk();
+
+    hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), avroUser.asBytes());
+    hermes.api().waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .retransmit(topic.getQualifiedName(), subscription.getName(), retransmissionDate, true);
+
+    // then
+    response.expectStatus().isOk();
+    MultiDCOffsetChangeSummary summary =
+        response.expectBody(MultiDCOffsetChangeSummary.class).returnResult().getResponseBody();
+    assert summary != null;
+    PartitionOffsetsPerKafkaTopic offsets =
+        PartitionOffsetsPerKafkaTopic.from(
+            summary.getPartitionOffsetListPerBrokerName().get(PRIMARY_KAFKA_CLUSTER_NAME));
+    assertThat(
+            (Long)
+                offsets.jsonPartitionOffsets.stream().mapToLong(PartitionOffset::getOffset).sum())
+        .isEqualTo(1);
+    assertThat(
+            (Long)
+                offsets.avroPartitionOffsets.stream().mapToLong(PartitionOffset::getOffset).sum())
+        .isEqualTo(0);
+  }
+
+  private void publishAndConsumeMessages(
+      List<String> messages, Topic topic, TestSubscriber subscriber) {
+    messages.forEach(message -> hermes.api().publish(topic.getQualifiedName(), message));
+    messages.forEach(subscriber::waitUntilReceived);
+  }
+
+  private record PartitionOffsetsPerKafkaTopic(
+      List<PartitionOffset> avroPartitionOffsets, List<PartitionOffset> jsonPartitionOffsets) {
+
+    private static PartitionOffsetsPerKafkaTopic from(List<PartitionOffset> all) {
+      ImmutableListMultimap<Boolean, PartitionOffset> partitionOffsets =
+          Multimaps.index(all, p -> p.getTopic().asString().endsWith("_avro"));
+      return new PartitionOffsetsPerKafkaTopic(
+          partitionOffsets.get(true), partitionOffsets.get(false));
+    }
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaSingleMessageReaderTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaSingleMessageReaderTest.java
index 4b6fa9aa27..5bf337789c 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaSingleMessageReaderTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaSingleMessageReaderTest.java
@@ -1,5 +1,14 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static java.util.stream.IntStream.range;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -11,138 +20,162 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import static java.util.stream.IntStream.range;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class KafkaSingleMessageReaderTest {
 
-    private static final int NUMBER_OF_PARTITIONS = 2;
-
-    private static final String PRIMARY_KAFKA_CLUSTER_NAME = "primary-dc";
-
-    private final AvroUser avroUser = new AvroUser("Bob", 50, "blue");
-
-    private final List<String> messages = new ArrayList<>() {{
-        range(0, 3).forEach(i -> add(TestMessage.random().body()));
-    }};
-
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
+  private static final int NUMBER_OF_PARTITIONS = 2;
 
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+  private static final String PRIMARY_KAFKA_CLUSTER_NAME = "primary-dc";
 
-    @Test
-    public void shouldFetchSingleMessageByTopicPartitionAndOffset() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
-        messages.forEach(message -> hermes.api().publish(topic.getQualifiedName(), message));
-        messages.forEach(subscriber::waitUntilReceived);
+  private final AvroUser avroUser = new AvroUser("Bob", 50, "blue");
 
-        // when
-        List<String> previews = fetchPreviewsFromAllPartitions(topic.getQualifiedName(), 10, true);
-
-        // then
-        assertThat(previews).containsAll(messages);
-    }
-
-    @Test
-    public void shouldFetchSingleAvroMessage() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        TopicWithSchema topic = topicWithSchema(topicWithRandomName().withContentType(AVRO).build(), avroUser.getSchemaAsString());
-        hermes.initHelper().createTopicWithSchema(topic);
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
-
-        hermes.api().publishAvro(topic.getQualifiedName(), avroUser.asBytes());
-        subscriber.waitUntilAnyMessageReceived();
-
-        // when
-        List<String> previews = fetchPreviewsFromAllPartitions(topic.getQualifiedName(), 10, false);
-
-        // then
-        boolean isMessagePresent = previews.stream().anyMatch(preview -> preview.contains(avroUser.getName()));
-        assertThat(isMessagePresent).isTrue();
-    }
-
-    @Test
-    public void shouldFetchSingleAvroMessageWithSchemaAwareSerialization() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        TopicWithSchema topic = topicWithSchema(topicWithRandomName().withContentType(AVRO).withSchemaIdAwareSerialization().build(), avroUser.getSchemaAsString());
-        hermes.initHelper().createTopicWithSchema(topic);
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
-
-        hermes.api().publishAvro(topic.getQualifiedName(), avroUser.asBytes());
-        subscriber.waitUntilAnyMessageReceived();
-
-        // when
-        List<String> previews = fetchPreviewsFromAllPartitions(topic.getQualifiedName(), 10, false);
-
-        // then
-        boolean isMessagePresent = previews.stream().anyMatch(preview -> preview.contains(avroUser.getName()));
-        assertThat(isMessagePresent).isTrue();
-    }
-
-    @Test
-    public void shouldReturnNotFoundErrorForNonExistingOffset() {
-        // given
-        long nonExistingOffset = 10L;
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
-        messages.forEach(message -> hermes.api().publish(topic.getQualifiedName(), message));
-        messages.forEach(subscriber::waitUntilReceived);
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().getPreview(topic.getQualifiedName(), PRIMARY_KAFKA_CLUSTER_NAME, 0, nonExistingOffset);
-
-        // then
-        response.expectStatus().isNotFound();
-    }
-
-    @Test
-    public void shouldReturnNotFoundErrorForNonExistingPartition() {
-        // given
-        int nonExistingPartition = 20;
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().getPreview(topic.getQualifiedName(), PRIMARY_KAFKA_CLUSTER_NAME, nonExistingPartition, 0L);
-
-        // then
-        response.expectStatus().isNotFound();
-    }
-
-
-    private List<String> fetchPreviewsFromAllPartitions(String qualifiedTopicName, int upToOffset, boolean unwrap) {
-        List<String> result = new ArrayList<>();
-        for (int partition = 0; partition < NUMBER_OF_PARTITIONS; partition++) {
-            long offset = 0;
-            while (offset <= upToOffset) {
-                try {
-                    String wrappedMessage = hermes.api().getPreview(qualifiedTopicName, PRIMARY_KAFKA_CLUSTER_NAME, partition, offset).expectBody(String.class).returnResult().getResponseBody();
-                    result.add(unwrap ? unwrap(wrappedMessage) : wrappedMessage);
-                    offset++;
-                } catch (Exception e) {
-                    break;
-                }
-            }
+  private final List<String> messages =
+      new ArrayList<>() {
+        {
+          range(0, 3).forEach(i -> add(TestMessage.random().body()));
         }
-        return result;
+      };
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  @Test
+  public void shouldFetchSingleMessageByTopicPartitionAndOffset() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+    messages.forEach(message -> hermes.api().publish(topic.getQualifiedName(), message));
+    messages.forEach(subscriber::waitUntilReceived);
+
+    // when
+    List<String> previews = fetchPreviewsFromAllPartitions(topic.getQualifiedName(), 10, true);
+
+    // then
+    assertThat(previews).containsAll(messages);
+  }
+
+  @Test
+  public void shouldFetchSingleAvroMessage() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    TopicWithSchema topic =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), avroUser.getSchemaAsString());
+    hermes.initHelper().createTopicWithSchema(topic);
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+
+    hermes.api().publishAvro(topic.getQualifiedName(), avroUser.asBytes());
+    subscriber.waitUntilAnyMessageReceived();
+
+    // when
+    List<String> previews = fetchPreviewsFromAllPartitions(topic.getQualifiedName(), 10, false);
+
+    // then
+    boolean isMessagePresent =
+        previews.stream().anyMatch(preview -> preview.contains(avroUser.getName()));
+    assertThat(isMessagePresent).isTrue();
+  }
+
+  @Test
+  public void shouldFetchSingleAvroMessageWithSchemaAwareSerialization() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    TopicWithSchema topic =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).withSchemaIdAwareSerialization().build(),
+            avroUser.getSchemaAsString());
+    hermes.initHelper().createTopicWithSchema(topic);
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+
+    hermes.api().publishAvro(topic.getQualifiedName(), avroUser.asBytes());
+    subscriber.waitUntilAnyMessageReceived();
+
+    // when
+    List<String> previews = fetchPreviewsFromAllPartitions(topic.getQualifiedName(), 10, false);
+
+    // then
+    boolean isMessagePresent =
+        previews.stream().anyMatch(preview -> preview.contains(avroUser.getName()));
+    assertThat(isMessagePresent).isTrue();
+  }
+
+  @Test
+  public void shouldReturnNotFoundErrorForNonExistingOffset() {
+    // given
+    final long nonExistingOffset = 10L;
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+    messages.forEach(message -> hermes.api().publish(topic.getQualifiedName(), message));
+    messages.forEach(subscriber::waitUntilReceived);
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .getPreview(topic.getQualifiedName(), PRIMARY_KAFKA_CLUSTER_NAME, 0, nonExistingOffset);
+
+    // then
+    response.expectStatus().isNotFound();
+  }
+
+  @Test
+  public void shouldReturnNotFoundErrorForNonExistingPartition() {
+    // given
+    int nonExistingPartition = 20;
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .getPreview(
+                topic.getQualifiedName(), PRIMARY_KAFKA_CLUSTER_NAME, nonExistingPartition, 0L);
+
+    // then
+    response.expectStatus().isNotFound();
+  }
+
+  private List<String> fetchPreviewsFromAllPartitions(
+      String qualifiedTopicName, int upToOffset, boolean unwrap) {
+    List<String> result = new ArrayList<>();
+    for (int partition = 0; partition < NUMBER_OF_PARTITIONS; partition++) {
+      long offset = 0;
+      while (offset <= upToOffset) {
+        try {
+          String wrappedMessage =
+              hermes
+                  .api()
+                  .getPreview(qualifiedTopicName, PRIMARY_KAFKA_CLUSTER_NAME, partition, offset)
+                  .expectBody(String.class)
+                  .returnResult()
+                  .getResponseBody();
+          result.add(unwrap ? unwrap(wrappedMessage) : wrappedMessage);
+          offset++;
+        } catch (Exception e) {
+          break;
+        }
+      }
     }
+    return result;
+  }
 
-    private String unwrap(String wrappedMessage) {
-        String msg = wrappedMessage.split("\"message\":", 2)[1];
-        return msg.substring(0, msg.length() - 1);
-    }
+  private String unwrap(String wrappedMessage) {
+    String msg = wrappedMessage.split("\"message\":", 2)[1];
+    return msg.substring(0, msg.length() - 1);
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/MetricsTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/MetricsTest.java
index 9df8ea2450..0030fae3ac 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/MetricsTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/MetricsTest.java
@@ -1,6 +1,21 @@
 package pl.allegro.tech.hermes.integrationtests;
 
-import com.jayway.awaitility.Duration;
+import static java.lang.Integer.MAX_VALUE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy;
+import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThatMetrics;
+import static pl.allegro.tech.hermes.integrationtests.prometheus.SubscriptionMetrics.subscriptionMetrics;
+import static pl.allegro.tech.hermes.integrationtests.prometheus.TopicMetrics.topicMetrics;
+import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.groupWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Duration;
+import java.util.Map;
+import java.util.UUID;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -20,395 +35,496 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.util.Map;
-import java.util.UUID;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static java.lang.Integer.MAX_VALUE;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy;
-import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
-import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThatMetrics;
-import static pl.allegro.tech.hermes.integrationtests.prometheus.SubscriptionMetrics.subscriptionMetrics;
-import static pl.allegro.tech.hermes.integrationtests.prometheus.TopicMetrics.topicMetrics;
-import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.groupWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class MetricsTest {
 
-    @Order(0)
-    @RegisterExtension
-    public static final PrometheusExtension prometheus = new PrometheusExtension();
-
-    @Order(1)
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension()
-            .withPrometheus(prometheus);
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    @Test
-    public void shouldIncreaseTopicMetricsAfterMessageHasBeenPublished() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build()
-        );
-        TestMessage message = TestMessage.simple();
-        int attempts = hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        waitAtMost(Duration.TEN_SECONDS).until(() -> {
-            // when
-            WebTestClient.ResponseSpec response = hermes.api().getTopicMetrics(topic.getQualifiedName());
-
-            // then
-            response.expectStatus().is2xxSuccessful();
-            TopicMetrics metrics = response.expectBody(TopicMetrics.class).returnResult().getResponseBody();
-            assertThat(metrics).isNotNull();
-            assertThat(metrics.getPublished()).isBetween(1L, (long) attempts);
-            assertThat(metrics.getVolume()).isGreaterThan(1);
-            assertThat(metrics.getSubscriptions()).isEqualTo(1);
-        });
-    }
-
-    @Test
-    public void shouldIncreaseSubscriptionDeliveredMetricsAfterMessageDelivered() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build()
-        );
-        TestMessage message = TestMessage.simple();
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-        subscriber.waitUntilReceived(message.body());
-
-        waitAtMost(Duration.TEN_SECONDS).until(() -> {
-            // when
-            WebTestClient.ResponseSpec response = hermes.api().getSubscriptionMetrics(topic.getQualifiedName(), subscription.getName());
-
-            // then
-            response.expectStatus().is2xxSuccessful();
-            SubscriptionMetrics metrics = response.expectBody(SubscriptionMetrics.class).returnResult().getResponseBody();
-            assertThat(metrics).isNotNull();
-            // potentially there were retries, therefore we cannot assume that only one message was delivered
-            assertThat(metrics.getDelivered()).isGreaterThan(0);
-            assertThat(metrics.getDiscarded()).isEqualTo(0);
-            assertThat(metrics.getVolume()).isGreaterThan(1);
-        });
-    }
-
-    @Test
-    public void shouldNotCreateNewSubscriptionWhenAskedForNonExistingMetrics() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        String randomSubscriptionName = UUID.randomUUID().toString();
-
-        // when
-        hermes.api().getSubscriptionMetrics(topic.getQualifiedName(), randomSubscriptionName);
-
-        // then
-        hermes.api().listSubscriptions(topic.getQualifiedName())
-                .expectStatus()
-                .isOk()
-                .expectBodyList(String.class)
-                .doesNotContain(randomSubscriptionName);
-    }
-
-    @Test
-    public void shouldNotCreateNewTopicWhenAskingForNonExistingMetrics() {
-        // given
-        Group group = hermes.initHelper().createGroup(groupWithRandomName().build());
-        TopicName nonexistentTopicName = new TopicName(group.getGroupName(), "nonexistentTopic");
-
-        // when
-        hermes.api().getTopicMetrics(nonexistentTopicName.qualifiedName());
-
-        // then
-        hermes.api().listTopics(group.getGroupName())
-                .expectStatus()
-                .isOk()
-                .expectBodyList(String.class)
-                .doesNotContain(nonexistentTopicName.qualifiedName());
-    }
-
-    @Test
-    public void shouldReportHttpErrorCodeMetrics() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber(404);
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(
-                subscription(topic, "subscription")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withSubscriptionPolicy(
-                                subscriptionPolicy()
-                                        .applyDefaults()
-                                        .withMessageTtl(0)
-                                        .build()
-                        )
-                        .build()
-        );
-        TestMessage message = TestMessage.simple();
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilReceived(message.body());
-        hermes.api().getConsumersMetrics()
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .value((body) -> assertThatMetrics(body)
-                        .contains("hermes_consumers_subscription_http_status_codes_total")
-                        .withLabels(
-                                "group", topic.getName().getGroupName(),
-                                "status_code", "404",
-                                "subscription", subscription.getName(),
-                                "topic", topic.getName().getName()
-                        )
-                        .withValue(1.0)
-                );
-    }
-
-    @Test
-    public void shouldReportHttpSuccessCodeMetrics() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(
+  @Order(0)
+  @RegisterExtension
+  public static final PrometheusExtension prometheus = new PrometheusExtension();
+
+  @Order(1)
+  @RegisterExtension
+  public static final HermesExtension hermes = new HermesExtension().withPrometheus(prometheus);
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  @Test
+  public void shouldIncreaseTopicMetricsAfterMessageHasBeenPublished() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
+    TestMessage message = TestMessage.simple();
+    int attempts = hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes.api().getTopicMetrics(topic.getQualifiedName());
+
+              // then
+              response.expectStatus().is2xxSuccessful();
+              TopicMetrics metrics =
+                  response.expectBody(TopicMetrics.class).returnResult().getResponseBody();
+              assertThat(metrics).isNotNull();
+              assertThat(metrics.getPublished()).isBetween(1L, (long) attempts);
+              assertThat(metrics.getVolume()).isGreaterThan(1);
+              assertThat(metrics.getSubscriptions()).isEqualTo(1);
+            });
+  }
+
+  @Test
+  public void shouldIncreaseSubscriptionDeliveredMetricsAfterMessageDelivered() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                    .build());
+    TestMessage message = TestMessage.simple();
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+    subscriber.waitUntilReceived(message.body());
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes
+                      .api()
+                      .getSubscriptionMetrics(topic.getQualifiedName(), subscription.getName());
+
+              // then
+              response.expectStatus().is2xxSuccessful();
+              SubscriptionMetrics metrics =
+                  response.expectBody(SubscriptionMetrics.class).returnResult().getResponseBody();
+              assertThat(metrics).isNotNull();
+              // potentially there were retries, therefore we cannot assume that only one message
+              // was delivered
+              assertThat(metrics.getDelivered()).isGreaterThan(0);
+              assertThat(metrics.getDiscarded()).isEqualTo(0);
+              assertThat(metrics.getVolume()).isGreaterThan(1);
+            });
+  }
+
+  @Test
+  public void shouldNotCreateNewSubscriptionWhenAskedForNonExistingMetrics() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    String randomSubscriptionName = UUID.randomUUID().toString();
+
+    // when
+    hermes.api().getSubscriptionMetrics(topic.getQualifiedName(), randomSubscriptionName);
+
+    // then
+    hermes
+        .api()
+        .listSubscriptions(topic.getQualifiedName())
+        .expectStatus()
+        .isOk()
+        .expectBodyList(String.class)
+        .doesNotContain(randomSubscriptionName);
+  }
+
+  @Test
+  public void shouldNotCreateNewTopicWhenAskingForNonExistingMetrics() {
+    // given
+    Group group = hermes.initHelper().createGroup(groupWithRandomName().build());
+    TopicName nonexistentTopicName = new TopicName(group.getGroupName(), "nonexistentTopic");
+
+    // when
+    hermes.api().getTopicMetrics(nonexistentTopicName.qualifiedName());
+
+    // then
+    hermes
+        .api()
+        .listTopics(group.getGroupName())
+        .expectStatus()
+        .isOk()
+        .expectBodyList(String.class)
+        .doesNotContain(nonexistentTopicName.qualifiedName());
+  }
+
+  @Test
+  public void shouldReportHttpErrorCodeMetrics() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber(404);
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
                 subscription(topic, "subscription")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withSubscriptionPolicy(
-                                subscriptionPolicy()
-                                        .applyDefaults()
-                                        .withMessageTtl(0)
-                                        .build()
-                        )
-                        .build()
-        );
-        TestMessage message = TestMessage.simple();
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilReceived(message.body());
-        hermes.api().getConsumersMetrics()
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .value((body) -> assertThatMetrics(body)
-                        .contains("hermes_consumers_subscription_http_status_codes_total")
-                        .withLabels(
-                                "group", topic.getName().getGroupName(),
-                                "status_code", "200",
-                                "subscription", subscription.getName(),
-                                "topic", topic.getName().getName()
-                        )
-                        .withValue(1.0)
-                );
-    }
-
-    @Test
-    public void shouldReportMetricForFilteredSubscription() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(
+                    .withEndpoint(subscriber.getEndpoint())
+                    .withSubscriptionPolicy(
+                        subscriptionPolicy().applyDefaults().withMessageTtl(0).build())
+                    .build());
+    TestMessage message = TestMessage.simple();
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilReceived(message.body());
+    hermes
+        .api()
+        .getConsumersMetrics()
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .value(
+            (body) ->
+                assertThatMetrics(body)
+                    .contains("hermes_consumers_subscription_http_status_codes_total")
+                    .withLabels(
+                        "group", topic.getName().getGroupName(),
+                        "status_code", "404",
+                        "subscription", subscription.getName(),
+                        "topic", topic.getName().getName())
+                    .withValue(1.0));
+  }
+
+  @Test
+  public void shouldReportHttpSuccessCodeMetrics() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
                 subscription(topic, "subscription")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withSubscriptionPolicy(
-                                subscriptionPolicy()
-                                        .applyDefaults()
-                                        .withMessageTtl(0)
-                                        .build()
-                        )
-                        .withFilter(filterMatchingHeaderByPattern("Trace-Id", "^vte.*"))
-                        .build()
-        );
-        TestMessage unfiltered = TestMessage.of("msg", "unfiltered");
-        TestMessage filtered = TestMessage.of("msg", "filtered");
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), unfiltered.body(), header("Trace-Id", "vte12"));
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), filtered.body(), header("Trace-Id", "otherTraceId"));
-
-        // then
-        subscriber.waitUntilReceived(unfiltered.body());
-        hermes.api().getConsumersMetrics()
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .value((body) -> assertThatMetrics(body)
-                        .contains("hermes_consumers_subscription_filtered_out_total")
-                        .withLabels(
-                                "group", topic.getName().getGroupName(),
-                                "subscription", subscription.getName(),
-                                "topic", topic.getName().getName()
-                        )
-                        .withValue(1.0)
-                );
-    }
-
-    @Test
-    public void shouldReportMetricsForSuccessfulBatchDelivery() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(
+                    .withEndpoint(subscriber.getEndpoint())
+                    .withSubscriptionPolicy(
+                        subscriptionPolicy().applyDefaults().withMessageTtl(0).build())
+                    .build());
+    TestMessage message = TestMessage.simple();
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilReceived(message.body());
+    hermes
+        .api()
+        .getConsumersMetrics()
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .value(
+            (body) ->
+                assertThatMetrics(body)
+                    .contains("hermes_consumers_subscription_http_status_codes_total")
+                    .withLabels(
+                        "group", topic.getName().getGroupName(),
+                        "status_code", "200",
+                        "subscription", subscription.getName(),
+                        "topic", topic.getName().getName())
+                    .withValue(1.0));
+  }
+
+  @Test
+  public void shouldReportMetricForFilteredSubscription() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    final Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
                 subscription(topic, "subscription")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withSubscriptionPolicy(
-                                batchSubscriptionPolicy()
-                                        .withBatchSize(2)
-                                        .withMessageTtl(MAX_VALUE)
-                                        .withRequestTimeout(MAX_VALUE)
-                                        .withBatchTime(MAX_VALUE)
-                                        .withBatchVolume(1024)
-                                        .build()
-                        )
-                        .build()
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("key1", "message").body());
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("key2", "message").body());
-
-        // then
-        subscriber.waitUntilAnyMessageReceived();
-        hermes.api().getConsumersMetrics()
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .value((body) -> {
+                    .withEndpoint(subscriber.getEndpoint())
+                    .withSubscriptionPolicy(
+                        subscriptionPolicy().applyDefaults().withMessageTtl(0).build())
+                    .withFilter(filterMatchingHeaderByPattern("Trace-Id", "^vte.*"))
+                    .build());
+    TestMessage unfiltered = TestMessage.of("msg", "unfiltered");
+    TestMessage filtered = TestMessage.of("msg", "filtered");
+
+    // when
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(), unfiltered.body(), header("Trace-Id", "vte12"));
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(), filtered.body(), header("Trace-Id", "otherTraceId"));
+
+    // then
+    subscriber.waitUntilReceived(unfiltered.body());
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .getConsumersMetrics()
+                    .expectStatus()
+                    .isOk()
+                    .expectBody(String.class)
+                    .value(
+                        (body) ->
                             assertThatMetrics(body)
-                                    .contains("hermes_consumers_subscription_delivered_total")
-                                    .withLabels(
-                                            "group", topic.getName().getGroupName(),
-                                            "subscription", subscription.getName(),
-                                            "topic", topic.getName().getName()
-                                    )
-                                    .withValue(2.0);
+                                .contains("hermes_consumers_subscription_filtered_out_total")
+                                .withLabels(
+                                    "group", topic.getName().getGroupName(),
+                                    "subscription", subscription.getName(),
+                                    "topic", topic.getName().getName())
+                                .withValue(1.0)));
+  }
+
+  @Test
+  public void shouldNotIncreaseInflightForFilteredSubscription() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber(503);
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    final Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscription(topic, "subscription")
+                    .withEndpoint(subscriber.getEndpoint())
+                    .withSubscriptionPolicy(
+                        subscriptionPolicy().withMessageTtl(3600).withInflightSize(1).build())
+                    .withFilter(filterMatchingHeaderByPattern("Trace-Id", "^vte.*"))
+                    .build());
+    TestMessage unfiltered = TestMessage.of("msg", "unfiltered");
+    TestMessage filtered = TestMessage.of("msg", "filtered");
+
+    // when
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(), filtered.body(), header("Trace-Id", "otherTraceId"));
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(), filtered.body(), header("Trace-Id", "otherTraceId"));
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .getConsumersMetrics()
+                    .expectStatus()
+                    .isOk()
+                    .expectBody(String.class)
+                    .value(
+                        (body) ->
                             assertThatMetrics(body)
-                                    .contains("hermes_consumers_subscription_batches_total")
-                                    .withLabels(
-                                            "group", topic.getName().getGroupName(),
-                                            "subscription", subscription.getName(),
-                                            "topic", topic.getName().getName()
-                                    )
-                                    .withValue(1.0);
+                                .contains("hermes_consumers_subscription_inflight")
+                                .withLabels(
+                                    "group", topic.getName().getGroupName(),
+                                    "subscription", subscription.getName(),
+                                    "topic", topic.getName().getName())
+                                .withValue(0.0)));
+
+    // when
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(), unfiltered.body(), header("Trace-Id", "vte12"));
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(), unfiltered.body(), header("Trace-Id", "vte12"));
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .getConsumersMetrics()
+                    .expectStatus()
+                    .isOk()
+                    .expectBody(String.class)
+                    .value(
+                        (body) ->
                             assertThatMetrics(body)
-                                    .contains("hermes_consumers_subscription_http_status_codes_total")
-                                    .withLabels(
-                                            "group", topic.getName().getGroupName(),
-                                            "status_code", "200",
-                                            "subscription", subscription.getName(),
-                                            "topic", topic.getName().getName()
-                                    )
-                                    .withValue(1.0);
-                        }
-                );
-    }
-
-    @Test
-    public void shouldReportMetricsForFailedBatchDelivery() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber(404);
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(
+                                .contains("hermes_consumers_subscription_inflight")
+                                .withLabels(
+                                    "group", topic.getName().getGroupName(),
+                                    "subscription", subscription.getName(),
+                                    "topic", topic.getName().getName())
+                                .withValue(1.0)));
+  }
+
+  @Test
+  public void shouldReportMetricsForSuccessfulBatchDelivery() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    final Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscription(topic, "subscription")
+                    .withEndpoint(subscriber.getEndpoint())
+                    .withSubscriptionPolicy(
+                        batchSubscriptionPolicy()
+                            .withBatchSize(2)
+                            .withMessageTtl(MAX_VALUE)
+                            .withRequestTimeout(MAX_VALUE)
+                            .withBatchTime(MAX_VALUE)
+                            .withBatchVolume(1024)
+                            .build())
+                    .build());
+
+    // when
+    hermes
+        .api()
+        .publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("key1", "message").body());
+    hermes
+        .api()
+        .publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("key2", "message").body());
+
+    // then
+    subscriber.waitUntilAnyMessageReceived();
+    hermes
+        .api()
+        .getConsumersMetrics()
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .value(
+            (body) -> {
+              assertThatMetrics(body)
+                  .contains("hermes_consumers_subscription_delivered_total")
+                  .withLabels(
+                      "group", topic.getName().getGroupName(),
+                      "subscription", subscription.getName(),
+                      "topic", topic.getName().getName())
+                  .withValue(2.0);
+              assertThatMetrics(body)
+                  .contains("hermes_consumers_subscription_batches_total")
+                  .withLabels(
+                      "group", topic.getName().getGroupName(),
+                      "subscription", subscription.getName(),
+                      "topic", topic.getName().getName())
+                  .withValue(1.0);
+              assertThatMetrics(body)
+                  .contains("hermes_consumers_subscription_http_status_codes_total")
+                  .withLabels(
+                      "group", topic.getName().getGroupName(),
+                      "status_code", "200",
+                      "subscription", subscription.getName(),
+                      "topic", topic.getName().getName())
+                  .withValue(1.0);
+            });
+  }
+
+  @Test
+  public void shouldReportMetricsForFailedBatchDelivery() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber(404);
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    final Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
                 subscription(topic, "subscription")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withSubscriptionPolicy(
-                                batchSubscriptionPolicy()
-                                        .withBatchSize(2)
-                                        .withMessageTtl(0)
-                                        .withRequestTimeout(MAX_VALUE)
-                                        .withBatchTime(MAX_VALUE)
-                                        .withBatchVolume(1024)
-                                        .build()
-                        )
-                        .build()
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("key1", "message").body());
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("key2", "message").body());
-
-        // then
-        subscriber.waitUntilAnyMessageReceived();
-        hermes.api().getConsumersMetrics()
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .value((body) -> assertThatMetrics(body)
-                        .contains("hermes_consumers_subscription_http_status_codes_total")
-                        .withLabels(
-                                "group", topic.getName().getGroupName(),
-                                "status_code", "404",
-                                "subscription", subscription.getName(),
-                                "topic", topic.getName().getName()
-                        )
-                        .withValue(1.0)
-                );
-    }
-
-    @Test
-    public void shouldReadTopicMetricsFromPrometheus() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic.getName())
-                        .withRate(10)
-                        .withDeliveryRate(15)
-                        .build()
-        );
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().getTopicMetrics(topic.getQualifiedName());
-
-        // then
-        response.expectStatus().is2xxSuccessful();
-        TopicMetrics metrics = response.expectBody(TopicMetrics.class).returnResult().getResponseBody();
-        assertThat(metrics).isNotNull();
-        assertThat(metrics.getRate()).isEqualTo(MetricDecimalValue.of("10.0"));
-        assertThat(metrics.getDeliveryRate()).isEqualTo(MetricDecimalValue.of("15.0"));
-    }
-
-    @Test
-    public void shouldReadSubscriptionMetricsFromPrometheus() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(
-                subscriptionWithRandomName(topic.getName(), "http://endpoint2").build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(subscription.getQualifiedName())
-                        .withRate(15)
-                        .build()
-        );
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().getSubscriptionMetrics(topic.getQualifiedName(), subscription.getName());
-
-        // then
-        response.expectStatus().is2xxSuccessful();
-        SubscriptionMetrics metrics = response.expectBody(SubscriptionMetrics.class).returnResult().getResponseBody();
-        assertThat(metrics).isNotNull();
-        assertThat(metrics.getRate()).isEqualTo(MetricDecimalValue.of("15.0"));
-    }
-
-    private static HttpHeaders header(String key, String value) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add(key, value);
-        return headers;
-    }
-
-    private static MessageFilterSpecification filterMatchingHeaderByPattern(String headerName, String pattern) {
-        return new MessageFilterSpecification(Map.of("type", "header", "header", headerName, "matcher", pattern));
-    }
+                    .withEndpoint(subscriber.getEndpoint())
+                    .withSubscriptionPolicy(
+                        batchSubscriptionPolicy()
+                            .withBatchSize(2)
+                            .withMessageTtl(0)
+                            .withRequestTimeout(MAX_VALUE)
+                            .withBatchTime(MAX_VALUE)
+                            .withBatchVolume(1024)
+                            .build())
+                    .build());
+
+    // when
+    hermes
+        .api()
+        .publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("key1", "message").body());
+    hermes
+        .api()
+        .publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("key2", "message").body());
+
+    // then
+    subscriber.waitUntilAnyMessageReceived();
+    hermes
+        .api()
+        .getConsumersMetrics()
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .value(
+            (body) ->
+                assertThatMetrics(body)
+                    .contains("hermes_consumers_subscription_http_status_codes_total")
+                    .withLabels(
+                        "group", topic.getName().getGroupName(),
+                        "status_code", "404",
+                        "subscription", subscription.getName(),
+                        "topic", topic.getName().getName())
+                    .withValue(1.0));
+  }
+
+  @Test
+  public void shouldReadTopicMetricsFromPrometheus() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName()).withRate(10).withDeliveryRate(15).build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().getTopicMetrics(topic.getQualifiedName());
+
+    // then
+    response.expectStatus().is2xxSuccessful();
+    TopicMetrics metrics = response.expectBody(TopicMetrics.class).returnResult().getResponseBody();
+    assertThat(metrics).isNotNull();
+    assertThat(metrics.getRate()).isEqualTo(MetricDecimalValue.of("10.0"));
+    assertThat(metrics.getDeliveryRate()).isEqualTo(MetricDecimalValue.of("15.0"));
+  }
+
+  @Test
+  public void shouldReadSubscriptionMetricsFromPrometheus() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), "http://endpoint2").build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(subscription.getQualifiedName()).withRate(15).build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().getSubscriptionMetrics(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    response.expectStatus().is2xxSuccessful();
+    SubscriptionMetrics metrics =
+        response.expectBody(SubscriptionMetrics.class).returnResult().getResponseBody();
+    assertThat(metrics).isNotNull();
+    assertThat(metrics.getRate()).isEqualTo(MetricDecimalValue.of("15.0"));
+  }
+
+  private static HttpHeaders header(String key, String value) {
+    HttpHeaders headers = new HttpHeaders();
+    headers.add(key, value);
+    return headers;
+  }
+
+  private static MessageFilterSpecification filterMatchingHeaderByPattern(
+      String headerName, String pattern) {
+    return new MessageFilterSpecification(
+        Map.of("type", "header", "header", headerName, "matcher", pattern));
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/OAuthIntegrationTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/OAuthIntegrationTest.java
index be76f491ef..1c7d8678ec 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/OAuthIntegrationTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/OAuthIntegrationTest.java
@@ -1,5 +1,17 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.not;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static org.apache.hc.core5.http.HttpStatus.SC_OK;
+import static org.apache.hc.core5.http.HttpStatus.SC_UNAUTHORIZED;
+import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.clientCredentialsGrantOAuthPolicy;
+import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.passwordGrantOAuthPolicy;
+import static pl.allegro.tech.hermes.test.helper.builder.OAuthProviderBuilder.oAuthProvider;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -14,170 +26,178 @@
 import pl.allegro.tech.hermes.test.helper.oauth.server.OAuthResourceOwner;
 import pl.allegro.tech.hermes.test.helper.oauth.server.OAuthTestServer;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.not;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static org.apache.http.HttpStatus.SC_OK;
-import static org.apache.http.HttpStatus.SC_UNAUTHORIZED;
-import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.clientCredentialsGrantOAuthPolicy;
-import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.passwordGrantOAuthPolicy;
-import static pl.allegro.tech.hermes.test.helper.builder.OAuthProviderBuilder.oAuthProvider;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class OAuthIntegrationTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    private static final OAuthTestServer oAuthTestServer = new OAuthTestServer();
-
-    private static final OAuthClient oAuthClient = new OAuthClient("client1", "secret1");
-
-    private static final OAuthResourceOwner resourceOwner = new OAuthResourceOwner("testUser1", "password1");
-
-    private final SubscriptionOAuthPolicy usernamePasswordOAuthPolicy = passwordGrantOAuthPolicy("provider1")
-            .withUsername(resourceOwner.username())
-            .withPassword(resourceOwner.password())
-            .build();
-
-    private final SubscriptionOAuthPolicy clientCredentialsOAuthPolicy = clientCredentialsGrantOAuthPolicy("provider1")
-            .build();
-
-    @BeforeAll
-    public static void initialize() {
-        oAuthTestServer.start();
-        hermes.initHelper().createOAuthProvider(
-                oAuthProvider("provider1")
-                        .withTokenEndpoint(oAuthTestServer.getTokenEndpoint())
-                        .withClientId(oAuthClient.clientId())
-                        .withClientSecret(oAuthClient.secret())
-                        .withRequestTimeout(10 * 1000)
-                        .withTokenRequestInitialDelay(100)
-                        .withTokenRequestMaxDelay(10000)
-                        .build()
-        );
-    }
-
-    @AfterAll
-    public static void tearDown() {
-        oAuthTestServer.stop();
-    }
-
-    @BeforeEach
-    public void initializeAlways() {
-        oAuthTestServer.reset();
-    }
-
-    @Test
-    public void shouldSendMessageToUsernamePasswordGrantOAuthSecuredEndpoint() {
-        // given
-        String token = oAuthTestServer.stubAccessTokenForPasswordGrant(oAuthClient, resourceOwner);
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(
-                subscription(topic, "subscription1")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withOAuthPolicy(usernamePasswordOAuthPolicy)
-                        .build()
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), "hello world");
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + token);
-    }
-
-    @Test
-    public void shouldRequestNewTokenIfPreviousIsInvalidForUsernamePasswordGrantOAuthSecuredEndpoint() {
-        // given
-        String invalidToken = oAuthTestServer.stubAccessTokenForPasswordGrant(oAuthClient, resourceOwner);
-        TestSubscriber subscriber = subscribers.createSubscriber((service, endpoint) -> {
-            service.addStubMapping((post(endpoint))
-                    .withHeader("Authorization", equalTo("Bearer " + invalidToken))
-                    .willReturn(aResponse().withStatus(SC_UNAUTHORIZED)).build());
-
-            service.addStubMapping((post(endpoint))
-                    .withHeader("Authorization", not(equalTo("Bearer " + invalidToken)))
-                    .willReturn(aResponse().withStatus(SC_OK)).build());
-        });
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(
-                subscription(topic, "subscription2")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withOAuthPolicy(usernamePasswordOAuthPolicy)
-                        .build()
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), "hello world");
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + invalidToken);
-
-        // and when
-        String validToken = oAuthTestServer.stubAccessTokenForPasswordGrant(oAuthClient, resourceOwner);
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + validToken);
-    }
-
-    @Test
-    public void shouldSendMessageToClientCredentialsGrantOAuthSecuredEndpoint() {
-        // given
-        String token = oAuthTestServer.stubAccessTokenForClientCredentials(oAuthClient);
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(
-                subscription(topic, "subscription3")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withOAuthPolicy(clientCredentialsOAuthPolicy)
-                        .build()
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), "hello world");
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + token);
-    }
-
-    @Test
-    public void shouldRequestNewTokenIfPreviousIsInvalidForClientCredentialsGrantSecuredEndpoint() {
-        // given
-        String invalidToken = oAuthTestServer.stubAccessTokenForClientCredentials(oAuthClient);
-        TestSubscriber subscriber = subscribers.createSubscriber((service, endpoint) -> {
-            service.addStubMapping((post(endpoint))
-                    .withHeader("Authorization", equalTo("Bearer " + invalidToken))
-                    .willReturn(aResponse().withStatus(SC_UNAUTHORIZED)).build());
-
-            service.addStubMapping((post(endpoint))
-                    .withHeader("Authorization", not(equalTo("Bearer " + invalidToken)))
-                    .willReturn(aResponse().withStatus(SC_OK)).build());
-        });
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(
-                subscription(topic, "subscription4")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withOAuthPolicy(clientCredentialsOAuthPolicy)
-                        .build()
-        );
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), "hello world");
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + invalidToken);
-
-        // and when
-        String validToken = oAuthTestServer.stubAccessTokenForClientCredentials(oAuthClient);
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + validToken);
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  private static final OAuthTestServer oAuthTestServer = new OAuthTestServer();
+
+  private static final OAuthClient oAuthClient = new OAuthClient("client1", "secret1");
+
+  private static final OAuthResourceOwner resourceOwner =
+      new OAuthResourceOwner("testUser1", "password1");
+
+  private final SubscriptionOAuthPolicy usernamePasswordOAuthPolicy =
+      passwordGrantOAuthPolicy("provider1")
+          .withUsername(resourceOwner.username())
+          .withPassword(resourceOwner.password())
+          .build();
+
+  private final SubscriptionOAuthPolicy clientCredentialsOAuthPolicy =
+      clientCredentialsGrantOAuthPolicy("provider1").build();
+
+  @BeforeAll
+  public static void initialize() {
+    oAuthTestServer.start();
+    hermes
+        .initHelper()
+        .createOAuthProvider(
+            oAuthProvider("provider1")
+                .withTokenEndpoint(oAuthTestServer.getTokenEndpoint())
+                .withClientId(oAuthClient.clientId())
+                .withClientSecret(oAuthClient.secret())
+                .withRequestTimeout(10 * 1000)
+                .withTokenRequestInitialDelay(100)
+                .withTokenRequestMaxDelay(10000)
+                .build());
+  }
+
+  @AfterAll
+  public static void tearDown() {
+    oAuthTestServer.stop();
+  }
+
+  @BeforeEach
+  public void initializeAlways() {
+    oAuthTestServer.reset();
+  }
+
+  @Test
+  public void shouldSendMessageToUsernamePasswordGrantOAuthSecuredEndpoint() {
+    // given
+    String token = oAuthTestServer.stubAccessTokenForPasswordGrant(oAuthClient, resourceOwner);
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic, "subscription1")
+                .withEndpoint(subscriber.getEndpoint())
+                .withOAuthPolicy(usernamePasswordOAuthPolicy)
+                .build());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), "hello world");
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + token);
+  }
+
+  @Test
+  public void
+      shouldRequestNewTokenIfPreviousIsInvalidForUsernamePasswordGrantOAuthSecuredEndpoint() {
+    // given
+    String invalidToken =
+        oAuthTestServer.stubAccessTokenForPasswordGrant(oAuthClient, resourceOwner);
+    TestSubscriber subscriber =
+        subscribers.createSubscriber(
+            (service, endpoint) -> {
+              service.addStubMapping(
+                  (post(endpoint))
+                      .withHeader("Authorization", equalTo("Bearer " + invalidToken))
+                      .willReturn(aResponse().withStatus(SC_UNAUTHORIZED))
+                      .build());
+
+              service.addStubMapping(
+                  (post(endpoint))
+                      .withHeader("Authorization", not(equalTo("Bearer " + invalidToken)))
+                      .willReturn(aResponse().withStatus(SC_OK))
+                      .build());
+            });
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic, "subscription2")
+                .withEndpoint(subscriber.getEndpoint())
+                .withOAuthPolicy(usernamePasswordOAuthPolicy)
+                .build());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), "hello world");
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + invalidToken);
+
+    // and when
+    String validToken = oAuthTestServer.stubAccessTokenForPasswordGrant(oAuthClient, resourceOwner);
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + validToken);
+  }
+
+  @Test
+  public void shouldSendMessageToClientCredentialsGrantOAuthSecuredEndpoint() {
+    // given
+    String token = oAuthTestServer.stubAccessTokenForClientCredentials(oAuthClient);
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic, "subscription3")
+                .withEndpoint(subscriber.getEndpoint())
+                .withOAuthPolicy(clientCredentialsOAuthPolicy)
+                .build());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), "hello world");
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + token);
+  }
+
+  @Test
+  public void shouldRequestNewTokenIfPreviousIsInvalidForClientCredentialsGrantSecuredEndpoint() {
+    // given
+    String invalidToken = oAuthTestServer.stubAccessTokenForClientCredentials(oAuthClient);
+    TestSubscriber subscriber =
+        subscribers.createSubscriber(
+            (service, endpoint) -> {
+              service.addStubMapping(
+                  (post(endpoint))
+                      .withHeader("Authorization", equalTo("Bearer " + invalidToken))
+                      .willReturn(aResponse().withStatus(SC_UNAUTHORIZED))
+                      .build());
+
+              service.addStubMapping(
+                  (post(endpoint))
+                      .withHeader("Authorization", not(equalTo("Bearer " + invalidToken)))
+                      .willReturn(aResponse().withStatus(SC_OK))
+                      .build());
+            });
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic, "subscription4")
+                .withEndpoint(subscriber.getEndpoint())
+                .withOAuthPolicy(clientCredentialsOAuthPolicy)
+                .build());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), "hello world");
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + invalidToken);
+
+    // and when
+    String validToken = oAuthTestServer.stubAccessTokenForClientCredentials(oAuthClient);
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("Authorization", "Bearer " + validToken);
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAndConsumingTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAndConsumingTest.java
index a05e993084..835f4dfeb9 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAndConsumingTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAndConsumingTest.java
@@ -1,6 +1,19 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static jakarta.ws.rs.core.Response.Status.CREATED;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+import static pl.allegro.tech.hermes.utils.Headers.createHeaders;
+
 import jakarta.ws.rs.core.Response;
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.time.Duration;
+import java.util.Map;
+import java.util.UUID;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -13,406 +26,476 @@
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicName;
 import pl.allegro.tech.hermes.integrationtests.helpers.TraceHeaders;
-import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.integrationtests.metadata.TraceContext;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscriber;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.io.IOException;
-import java.net.SocketTimeoutException;
-import java.time.Duration;
-import java.util.Map;
-import java.util.UUID;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static com.jayway.awaitility.Duration.TEN_SECONDS;
-import static jakarta.ws.rs.core.Response.Status.CREATED;
-import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
-import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-import static pl.allegro.tech.hermes.utils.Headers.createHeaders;
-
 public class PublishingAndConsumingTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    @Test
-    public void shouldPublishAndConsumeMessage() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription1", subscriber.getEndpoint()).build());
-        TestMessage message = TestMessage.of("hello", "world");
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilReceived(message.body());
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-    @Test
-    public void shouldConsumeMessagesOnMultipleSubscriptions() {
-        // given
-        TestMessage message = TestMessage.of("hello", "world");
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber1 = subscribers.createSubscriber();
-        TestSubscriber subscriber2 = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription1", subscriber1.getEndpoint()).build());
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription2", subscriber2.getEndpoint()).build());
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber1.waitUntilReceived(message.body());
-        subscriber2.waitUntilReceived(message.body());
-    }
-
-    @Test
-    public void shouldPublishMessageToEndpointWithURIInterpolatedFromMessageBody() {
-        // given
-        TestMessage message = TestMessage.of("template", "hello");
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        TestSubscriber subscriber = subscribers.createSubscriber("/hello/");
-        String interpolatedEndpoint = subscriber.getEndpoint().replace("/hello/", "/{template}/");
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription", interpolatedEndpoint).build());;
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilReceived(message.body());
-    }
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
 
-    @Test
-    public void shouldTreatMessageWithInvalidInterpolationAsUndelivered() {
-        // given
-        TestMessage message = TestMessage.of("hello", "world");
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber("/hello/");
-
-        String interpolatedEndpoint = subscriber.getEndpoint().replace("/hello/", "/{template}/");
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", interpolatedEndpoint)
-                        .withSubscriptionPolicy(SubscriptionPolicy.Builder.subscriptionPolicy().applyDefaults().withMessageTtl(1).build())
-                        .build());
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        waitAtMost(TEN_SECONDS).until(() -> {
-            long discarded = hermes.api()
-                    .getSubscriptionMetrics(topic.getQualifiedName(), "subscription")
-                    .expectBody(SubscriptionMetrics.class).returnResult().getResponseBody().getDiscarded();
-            assertThat(discarded).isEqualTo(1);
-        });
-        subscriber.noMessagesReceived();
-    }
-
-    @Test
-    public void shouldPassSubscriptionFixedHeaders() {
-        // given
-        TestMessage message = TestMessage.of("hello", "world");
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        Subscription subscription = SubscriptionBuilder.subscriptionWithRandomName(topic.getName())
-                .withEndpoint(subscriber.getEndpoint())
-                .withHeader("MY-HEADER", "myHeader123")
-                .build();
-        hermes.initHelper().createSubscription(subscription);
+  @Test
+  public void shouldPublishAndConsumeMessage() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription1", subscriber.getEndpoint())
+                .build());
+    TestMessage message = TestMessage.of("hello", "world");
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilReceived(message.body());
+  }
+
+  @Test
+  public void shouldConsumeMessagesOnMultipleSubscriptions() {
+    // given
+    TestMessage message = TestMessage.of("hello", "world");
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber1 = subscribers.createSubscriber();
+    TestSubscriber subscriber2 = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription1", subscriber1.getEndpoint())
+                .build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription2", subscriber2.getEndpoint())
+                .build());
 
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber1.waitUntilReceived(message.body());
+    subscriber2.waitUntilReceived(message.body());
+  }
+
+  @Test
+  public void shouldPublishMessageToEndpointWithURIInterpolatedFromMessageBody() {
+    // given
+    TestMessage message = TestMessage.of("template", "hello");
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    TestSubscriber subscriber = subscribers.createSubscriber("/hello/");
+    String interpolatedEndpoint = subscriber.getEndpoint().replace("/hello/", "/{template}/");
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", interpolatedEndpoint).build());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilReceived(message.body());
+  }
+
+  @Test
+  public void shouldTreatMessageWithInvalidInterpolationAsUndelivered() {
+    // given
+    TestMessage message = TestMessage.of("hello", "world");
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber("/hello/");
+
+    String interpolatedEndpoint = subscriber.getEndpoint().replace("/hello/", "/{template}/");
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", interpolatedEndpoint)
+                .withSubscriptionPolicy(
+                    SubscriptionPolicy.Builder.subscriptionPolicy()
+                        .applyDefaults()
+                        .withMessageTtl(1)
+                        .build())
+                .build());
 
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request).hasHeaderValue("MY-HEADER", "myHeader123");
-            assertThat(request.getHeader("Hermes-Message-Id")).isNotEmpty();
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              long discarded =
+                  hermes
+                      .api()
+                      .getSubscriptionMetrics(topic.getQualifiedName(), "subscription")
+                      .expectBody(SubscriptionMetrics.class)
+                      .returnResult()
+                      .getResponseBody()
+                      .getDiscarded();
+              assertThat(discarded).isEqualTo(1);
+            });
+    subscriber.noMessagesReceived();
+  }
+
+  @Test
+  public void shouldPassSubscriptionFixedHeaders() {
+    // given
+    TestMessage message = TestMessage.of("hello", "world");
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Subscription subscription =
+        SubscriptionBuilder.subscriptionWithRandomName(topic.getName())
+            .withEndpoint(subscriber.getEndpoint())
+            .withHeader("MY-HEADER", "myHeader123")
+            .build();
+    hermes.initHelper().createSubscription(subscription);
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(request).hasHeaderValue("MY-HEADER", "myHeader123");
+          assertThat(request.getHeader("Hermes-Message-Id")).isNotEmpty();
         });
-    }
-
-    @Test
-    public void shouldRetryWithDelayOnRetryAfterEndpointResponse() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestMessage message = TestMessage.of("hello", "world");
-        int retryAfterSeconds = 1;
-        TestSubscriber subscriber = subscribers.createSubscriberWithRetry(message.body(), retryAfterSeconds);
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilMessageWithHeaderReceived("Hermes-Retry-Count", "0");
-        subscriber.waitUntilMessageWithHeaderReceived("Hermes-Retry-Count", "1");
-        assertThat(subscriber.durationBetweenFirstAndLastRequest()).isGreaterThanOrEqualTo(Duration.ofSeconds(retryAfterSeconds));
-    }
-
-    @Test
-    public void shouldNotPublishMessageIfContentLengthDoNotMatch() throws IOException, InterruptedException {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        // when
-        publishEventWithInvalidContentLength(topic.getQualifiedName());
-
-        // then
-        subscriber.noMessagesReceived();
-    }
+  }
+
+  @Test
+  public void shouldRetryWithDelayOnRetryAfterEndpointResponse() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestMessage message = TestMessage.of("hello", "world");
+    int retryAfterSeconds = 1;
+    TestSubscriber subscriber =
+        subscribers.createSubscriberWithRetry(message.body(), retryAfterSeconds);
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
 
-    @Test
-    public void shouldConsumeMessageWithKeepAliveHeader() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription1", subscriber.getEndpoint()).build());
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilMessageWithHeaderReceived("Hermes-Retry-Count", "0");
+    subscriber.waitUntilMessageWithHeaderReceived("Hermes-Retry-Count", "1");
+    assertThat(subscriber.durationBetweenFirstAndLastRequest())
+        .isGreaterThanOrEqualTo(Duration.ofSeconds(retryAfterSeconds));
+  }
+
+  @Test
+  public void shouldNotPublishMessageIfContentLengthDoNotMatch()
+      throws IOException, InterruptedException {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    // when
+    publishEventWithInvalidContentLength(topic.getQualifiedName());
+
+    // then
+    subscriber.noMessagesReceived();
+  }
+
+  @Test
+  public void shouldConsumeMessageWithKeepAliveHeader() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription1", subscriber.getEndpoint())
+                .build());
 
-        TestMessage message = TestMessage.of("hello", "world");
+    TestMessage message = TestMessage.of("hello", "world");
 
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
 
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getBodyAsString()).isEqualTo(message.body());
-            assertThat(request).hasHeaderValue("Keep-Alive", "true");
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(request.getBodyAsString()).isEqualTo(message.body());
+          assertThat(request).hasHeaderValue("Keep-Alive", "true");
         });
-    }
-
-    @Test
-    public void shouldMarkSubscriptionAsActiveAfterReceivingFirstMessage() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription1", subscriber.getEndpoint()).build());
-
-        TestMessage message = TestMessage.of("hello", "world");
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+  }
+
+  @Test
+  public void shouldMarkSubscriptionAsActiveAfterReceivingFirstMessage() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription1", subscriber.getEndpoint())
+                .build());
 
-        // then
-        subscriber.waitUntilReceived(message.body());
+    TestMessage message = TestMessage.of("hello", "world");
 
-        assertThat(hermes.api().getSubscription(topic.getQualifiedName(), "subscription1").getState()).isEqualTo(Subscription.State.ACTIVE);
-    }
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
 
-    @Test
-    public void shouldNotConsumeMessagesWhenSubscriptionIsSuspended() {
-        // given
-        String subscriptionName = "subscription1";
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
+    // then
+    subscriber.waitUntilReceived(message.body());
 
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), subscriptionName, subscriber.getEndpoint()).build());
+    assertThat(hermes.api().getSubscription(topic.getQualifiedName(), "subscription1").getState())
+        .isEqualTo(Subscription.State.ACTIVE);
+  }
 
-        // when
-        hermes.api().waitUntilSubscriptionActivated(topic.getQualifiedName(), subscriptionName);
-        hermes.api().suspendSubscription(topic, subscriptionName);
-        hermes.api().waitUntilSubscriptionSuspended(topic.getQualifiedName(), subscriptionName);
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(),  TestMessage.of("hello", "world").body());
+  @Test
+  public void shouldNotConsumeMessagesWhenSubscriptionIsSuspended() {
+    // given
+    String subscriptionName = "subscription1";
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
 
-        // then
-        subscriber.noMessagesReceived();
-    }
-
-    @Test
-    public void shouldNotCreateTopicWhenPublishingToNonExistingTopic() throws Exception {
-        // given
-        TopicName nonExisting = TopicName.fromQualifiedName("nonExistingGroup.nonExistingTopic8326");
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), subscriptionName, subscriber.getEndpoint())
+                .build());
 
-        // when
-        WebTestClient.ResponseSpec responseForNonExisting = hermes.api().publish(nonExisting.qualifiedName(), TestMessage.simple().body());
+    // when
+    hermes.api().waitUntilSubscriptionActivated(topic.getQualifiedName(), subscriptionName);
+    hermes.api().suspendSubscription(topic, subscriptionName);
+    hermes.api().waitUntilSubscriptionSuspended(topic.getQualifiedName(), subscriptionName);
+    hermes
+        .api()
+        .publishUntilSuccess(topic.getQualifiedName(), TestMessage.of("hello", "world").body());
+
+    // then
+    subscriber.noMessagesReceived();
+  }
+
+  @Test
+  public void shouldNotCreateTopicWhenPublishingToNonExistingTopic() {
+    // given
+    TopicName nonExisting = TopicName.fromQualifiedName("nonExistingGroup.nonExistingTopic8326");
+
+    // when
+    WebTestClient.ResponseSpec responseForNonExisting =
+        hermes.api().publish(nonExisting.qualifiedName(), TestMessage.simple().body());
+
+    // then
+    responseForNonExisting.expectStatus().isNotFound();
+    hermes.api().getTopicResponse(nonExisting.qualifiedName()).expectStatus().isNotFound();
+  }
+
+  @Test
+  public void shouldNotOverrideHeadersAddedByMetadataAppendersWithSubscriptionHeaders() {
+    // given
+    TestMessage message = TestMessage.of("hello", "world");
+    String subscriptionName = "subscription";
+
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    hermes
+        .initHelper()
+        .createSubscription(
+            SubscriptionBuilder.subscription(topic, subscriptionName)
+                .withEndpoint(subscriber.getEndpoint())
+                .withHeader("Trace-Id", "defaultValue")
+                .build());
 
-        // then
-        responseForNonExisting.expectStatus().isNotFound();
-        hermes.api().getTopicResponse(nonExisting.qualifiedName()).expectStatus().isNotFound();
-    }
+    // when
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(),
+            message.body(),
+            createHeaders(Map.of("Trace-Id", "valueFromRequest")));
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(request.getBodyAsString()).isEqualTo(message.body());
+          assertThat(request.getHeader("Trace-Id")).isEqualTo("valueFromRequest");
+        });
+  }
 
-    @Test
-    public void shouldNotOverrideHeadersAddedByMetadataAppendersWithSubscriptionHeaders() {
-        // given
-        TestMessage message = TestMessage.of("hello", "world");
-        String subscriptionName = "subscription";
+  @Test
+  public void shouldAttachSubscriptionIdentityHeadersWhenItIsEnabled() {
+    // given
+    TestMessage message = TestMessage.of("hello", "world");
+    String subscriptionName = "subscription";
 
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
 
-        hermes.initHelper().createSubscription(
-                SubscriptionBuilder.subscription(topic, subscriptionName)
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withHeader("Trace-Id", "defaultValue")
-                        .build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            SubscriptionBuilder.subscription(topic, subscriptionName)
+                .withEndpoint(subscriber.getEndpoint())
+                .withAttachingIdentityHeadersEnabled(true)
+                .build());
 
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body(), createHeaders(Map.of("Trace-Id", "valueFromRequest")));
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
 
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getBodyAsString()).isEqualTo(message.body());
-            assertThat(request.getHeader("Trace-Id")).isEqualTo("valueFromRequest");
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(request.getBodyAsString()).isEqualTo(message.body());
+          assertThat(request.getHeader("Hermes-Topic-Name")).isEqualTo(topic.getQualifiedName());
+          assertThat(request.getHeader("Hermes-Subscription-Name")).isEqualTo(subscriptionName);
         });
-    }
+  }
+
+  @Test
+  public void shouldNotAttachSubscriptionIdentityHeadersWhenItIsDisabled() {
+    // given
+    TestMessage message = TestMessage.of("hello", "world");
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    hermes
+        .initHelper()
+        .createSubscription(
+            SubscriptionBuilder.subscription(topic, "subscription")
+                .withEndpoint(subscriber.getEndpoint())
+                .withAttachingIdentityHeadersEnabled(false)
+                .build());
 
-    @Test
-    public void shouldAttachSubscriptionIdentityHeadersWhenItIsEnabled() {
-        // given
-        TestMessage message = TestMessage.of("hello", "world");
-        String subscriptionName = "subscription";
-
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        hermes.initHelper().createSubscription(
-                SubscriptionBuilder.subscription(topic, subscriptionName)
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withAttachingIdentityHeadersEnabled(true)
-                        .build());
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getBodyAsString()).isEqualTo(message.body());
-            assertThat(request.getHeader("Hermes-Topic-Name")).isEqualTo(topic.getQualifiedName());
-            assertThat(request.getHeader("Hermes-Subscription-Name")).isEqualTo(subscriptionName);
-        });
-    }
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
 
-    @Test
-    public void shouldNotAttachSubscriptionIdentityHeadersWhenItIsDisabled() {
-        // given
-        TestMessage message = TestMessage.of("hello", "world");
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        hermes.initHelper().createSubscription(
-                SubscriptionBuilder.subscription(topic, "subscription")
-                        .withEndpoint(subscriber.getEndpoint())
-                        .withAttachingIdentityHeadersEnabled(false)
-                        .build());
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getBodyAsString()).isEqualTo(message.body());
-            Assertions.assertThat(request.getHeader("Hermes-Topic-Name")).isNull();
-            Assertions.assertThat(request.getHeader("Hermes-Subscription-Name")).isNull();
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(request.getBodyAsString()).isEqualTo(message.body());
+          Assertions.assertThat(request.getHeader("Hermes-Topic-Name")).isNull();
+          Assertions.assertThat(request.getHeader("Hermes-Subscription-Name")).isNull();
         });
-    }
-
-    @Test
-    public void shouldPublishAndConsumeMessageWithTraceId() {
-        // given
-        TestMessage message = TestMessage.of("hello", "world");
-        String traceId = UUID.randomUUID().toString();
-
-        // and
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body(), createHeaders(Map.of("Trace-Id", traceId)));
+  }
+
+  @Test
+  public void shouldPublishAndConsumeMessageWithTraceId() {
+    // given
+    TestMessage message = TestMessage.of("hello", "world");
+    String traceId = UUID.randomUUID().toString();
+
+    // and
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
 
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getBodyAsString()).isEqualTo(message.body());
-            assertThat(request).hasHeaderValue("Trace-Id", traceId);
+    // when
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(), message.body(), createHeaders(Map.of("Trace-Id", traceId)));
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(request.getBodyAsString()).isEqualTo(message.body());
+          assertThat(request).hasHeaderValue("Trace-Id", traceId);
         });
-    }
-
-    @Test
-    public void shouldPublishAndConsumeMessageWithTraceAndSpanHeaders() {
-        // given
-        TestMessage message = TestMessage.of("hello", "world");
-        TraceContext trace = TraceContext.random();
-
-        // and
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body(), createHeaders(TraceHeaders.fromTraceContext(trace)));
+  }
+
+  @Test
+  public void shouldPublishAndConsumeMessageWithTraceAndSpanHeaders() {
+    // given
+    TestMessage message = TestMessage.of("hello", "world");
+    TraceContext trace = TraceContext.random();
+
+    // and
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
 
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getBodyAsString()).isEqualTo(message.body());
-            assertThat(request).containsAllHeaders(trace.asMap());
+    // when
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(),
+            message.body(),
+            createHeaders(TraceHeaders.fromTraceContext(trace)));
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(request.getBodyAsString()).isEqualTo(message.body());
+          assertThat(request).containsAllHeaders(trace.asMap());
         });
-    }
-
-    @Test
-    public void shouldPublishWithDelayAndConsumeMessage() {
-        // given
-        int delay = 2000;
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        hermes.initHelper().createSubscription(
-                SubscriptionBuilder.subscription(topic, "subscription")
+  }
+
+  @Test
+  public void shouldPublishWithDelayAndConsumeMessage() {
+    // given
+    int delay = 2000;
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    hermes
+        .initHelper()
+        .createSubscription(
+            SubscriptionBuilder.subscription(topic, "subscription")
                 .withEndpoint(subscriber.getEndpoint())
                 .withContentType(ContentType.JSON)
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults()
-                        .withSendingDelay(delay)
-                        .build())
+                .withSubscriptionPolicy(
+                    subscriptionPolicy().applyDefaults().withSendingDelay(delay).build())
                 .withMode(SubscriptionMode.ANYCAST)
                 .build());
 
-
-        TestMessage message = TestMessage.of("hello", "world");
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-        long publishedTime = System.currentTimeMillis();
-
-        // then
-        subscriber.waitUntilReceived(message.body());
-        long receivedTime = System.currentTimeMillis();
-        assertThat(receivedTime - publishedTime).isGreaterThanOrEqualTo(delay);
-    }
-
-    @Test
-    public void shouldPublishMessageUsingChunkedEncoding() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        // when
-        Response response = hermes.api().publishChunked(topic.getQualifiedName(), "{}");
-
-        // then
-        assertThat(response).hasStatus(CREATED);
+    TestMessage message = TestMessage.of("hello", "world");
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+    long publishedTime = System.currentTimeMillis();
+
+    // then
+    subscriber.waitUntilReceived(message.body());
+    long receivedTime = System.currentTimeMillis();
+    assertThat(receivedTime - publishedTime).isGreaterThanOrEqualTo(delay);
+  }
+
+  @Test
+  public void shouldPublishMessageUsingChunkedEncoding() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    Response response = hermes.api().publishChunked(topic.getQualifiedName(), "{}");
+
+    // then
+    assertThat(response).hasStatus(CREATED);
+  }
+
+  /*
+      The only way we managed to bypass in-built server side Content-Length validation
+      is to close the connection before entire message is delivered. Unfortunately we
+      cannot verify response status code because connection is already closed. We tried
+      manually sending different Content-Length than the actual message but servlet
+      container is smart enough to not invoke ReadListener.onAllDataRead() in that case.
+  */
+  private void publishEventWithInvalidContentLength(String topic)
+      throws IOException, InterruptedException {
+    try {
+      hermes.api().publishSlowly(500, 100, 0, topic);
+    } catch (SocketTimeoutException e) {
+      // this is expected
     }
-
-    /*
-        The only way we managed to bypass in-built server side Content-Length validation
-        is to close the connection before entire message is delivered. Unfortunately we
-        cannot verify response status code because connection is already closed. We tried
-        manually sending different Content-Length than the actual message but servlet
-        container is smart enough to not invoke ReadListener.onAllDataRead() in that case.
-    */
-    private void publishEventWithInvalidContentLength(String topic) throws IOException, InterruptedException {
-        try {
-            hermes.api().publishSlowly(500, 100, 0, topic);
-        } catch (SocketTimeoutException e) {
-            // this is expected
-        }
-    }
-
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAuthenticationTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAuthenticationTest.java
new file mode 100644
index 0000000000..1ec391f295
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAuthenticationTest.java
@@ -0,0 +1,110 @@
+package pl.allegro.tech.hermes.integrationtests;
+
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.AUTH_PASSWORD;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.AUTH_USERNAME;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_ENABLED;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_MODE;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Base64;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+import pl.allegro.tech.hermes.test.helper.message.TestMessage;
+import pl.allegro.tech.hermes.utils.Headers;
+
+public class PublishingAuthenticationTest {
+
+  private static final String USERNAME = "someUser";
+  private static final String PASSWORD = "somePassword123";
+  private static final String MESSAGE = TestMessage.of("hello", "world").body();
+
+  @RegisterExtension
+  public static final HermesExtension hermes =
+      new HermesExtension()
+          .withFrontendProfile("authRequired")
+          .withFrontendProperty(AUTH_USERNAME, USERNAME)
+          .withFrontendProperty(AUTH_PASSWORD, PASSWORD)
+          .withFrontendProperty(FRONTEND_SSL_ENABLED, false)
+          .withFrontendProperty(FRONTEND_AUTHENTICATION_MODE, "pro_active")
+          .withFrontendProperty(FRONTEND_AUTHENTICATION_ENABLED, true);
+
+  @Test
+  public void shouldAuthenticateUsingBasicAuth() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes
+                      .api()
+                      .publish(
+                          topic.getQualifiedName(),
+                          MESSAGE,
+                          createAuthorizationHeader(USERNAME, PASSWORD));
+
+              // then
+              response.expectStatus().isCreated();
+            });
+  }
+
+  @Test
+  public void shouldNotAuthenticateUserWithInvalidCredentials() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes
+                      .api()
+                      .publish(
+                          topic.getQualifiedName(),
+                          MESSAGE,
+                          createAuthorizationHeader(USERNAME, "someInvalidPassword"));
+
+              // then
+              response.expectStatus().isUnauthorized();
+            });
+  }
+
+  @Test
+  public void shouldNotAuthenticateUserWithoutCredentials() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes.api().publish(topic.getQualifiedName(), MESSAGE);
+
+              // then
+              response.expectStatus().isUnauthorized();
+            });
+  }
+
+  private static HttpHeaders createAuthorizationHeader(String username, String password) {
+    String credentials = username + ":" + password;
+    Map<String, String> headers =
+        Map.of(
+            "Authorization",
+            "Basic "
+                + Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.UTF_8)));
+    return Headers.createHeaders(headers);
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAvroTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAvroTest.java
index 2303195e01..9dd6e576f3 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAvroTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAvroTest.java
@@ -1,9 +1,27 @@
 package pl.allegro.tech.hermes.integrationtests;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.awaitility.Duration;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+import static java.util.Collections.singletonMap;
+import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_JSON;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.ContentType.JSON;
+import static pl.allegro.tech.hermes.api.PatchData.patchData;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.client.HermesMessage.hermesMessage;
+import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.UPDATE_SUBSCRIPTION;
+import static pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader.load;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+import static pl.allegro.tech.hermes.utils.Headers.createHeaders;
+
+import java.time.Clock;
+import java.time.Duration;
+import java.util.Map;
+import java.util.UUID;
 import net.javacrumbs.jsonunit.core.Option;
 import org.apache.avro.Schema;
 import org.junit.jupiter.api.Test;
@@ -24,577 +42,641 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.time.Clock;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-import static java.util.Collections.singletonMap;
-import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_JSON;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.ContentType.JSON;
-import static pl.allegro.tech.hermes.api.PatchData.patchData;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.client.HermesMessage.hermesMessage;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.COMMIT;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.UPDATE_SUBSCRIPTION;
-import static pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader.load;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-import static pl.allegro.tech.hermes.utils.Headers.createHeaders;
-
 public class PublishingAvroTest {
 
-    private static final Logger logger = LoggerFactory.getLogger(PublishingAvroTest.class);
-
-    private final Clock clock = Clock.systemDefaultZone();
-
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    private static final AvroUser user = new AvroUser("Bob", 50, "blue");
-
-    private static final ObjectMapper objMapper = new ObjectMapper();
-
-    @Test
-    public void shouldConsumeJsonMessageWithDecimalFromAvroTopic() throws JsonProcessingException {
-        // given
-        String schema = """
-                {
-                    "namespace": "pl.allegro",
-                    "type": "record",
-                    "name": "User",
-                    "fields": [
-                        {
-                              "name": "__metadata",
-                              "type": ["null", {"type": "map", "values": "string"}],
-                              "default": null
-                        },
-                        {"name": "name", "type": "string"},
-                        {"name": "balance","type": {
-                            "type": "bytes",
-                            "logicalType": "decimal",
-                            "precision": 10,
-                            "scale": 2
-                            }
-                        }
-                    ]
-                }""";
-
-
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), schema);
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build()
-        );
-
-        Map<String, Object> map = Map.of(
-                "name", "Bob", "balance", "1.20"
-        );
-
-        String userWithBalance = objMapper.writeValueAsString(map);
-
-        // when
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), userWithBalance);
-
-        // then
-        subscriber.waitUntilAnyMessageReceived();
-
-        Map<String, Object> actual = objMapper.readValue(
-                subscriber.getLastReceivedRequest().getBodyAsString(),
-                new TypeReference<HashMap<String,Object>>() {});
-        assertThat(actual.get("balance")).isEqualTo("1.20");
-    }
-
-
-    @Test
-    public void shouldPublishAvroAndConsumeJsonMessage() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                        .withContentType(AVRO)
-                        .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build()
-        );
-
-        // when
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes());
-
-        // then
-        subscriber.waitUntilReceived(user.asJson());
-    }
-
-    @Test
-    public void shouldNotPublishAvroWhenMessageIsNotJsonOrAvro() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
+  private static final Logger logger = LoggerFactory.getLogger(PublishingAvroTest.class);
 
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build()
-        );
+  private final Clock clock = Clock.systemDefaultZone();
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().publish(topic.getQualifiedName(), user.asJson(), createHeaders(Map.of("Content-Type", TEXT_PLAIN)));
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-        // then
-        response.expectStatus().isBadRequest();
-    }
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
 
-    @Test
-    public void shouldPublishAvroAndConsumeAvroMessage() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
+  private static final AvroUser user = new AvroUser("Bob", 50, "blue");
 
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
-                        .withContentType(AVRO)
-                        .build()
-        );
+  @Test
+  public void shouldPublishAvroAndConsumeJsonMessage() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        // when
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes());
+    TestSubscriber subscriber = subscribers.createSubscriber();
 
-        // then
-        subscriber.waitUntilRequestReceived(request -> assertBodyDeserializesIntoUser(request.getBodyAsString(), user));
-    }
-
-    @Test
-    public void shouldSendAvroAfterSubscriptionContentTypeChanged() {
-        // given avro topic
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-
-        // and subscription with json content type
-        hermes.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
-                        .withContentType(JSON)
-                        .build()
-        );
-
-        // when first message is published
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes());
-
-        // then it is consumed as json
-        subscriber.waitUntilRequestReceived(request ->
-                assertThatJson(request.getBodyAsString()).when(Option.IGNORING_EXTRA_FIELDS).isEqualTo(user.asJson()));
-        subscriber.reset();
-
-        //when subscription content type is changed to avro
-        hermes.api().updateSubscription(topic, "subscription", patchData().set("contentType", ContentType.AVRO).build());
-        long currentTime = clock.millis();
-        waitUntilSubscriptionContentTypeChanged(topic, "subscription", ContentType.AVRO);
-        waitUntilConsumersUpdateSubscription(currentTime, topic, "subscription");
-
-        // and second message is published
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes());
-
-        // then it is consumed as avro
-        subscriber.waitUntilRequestReceived(request -> assertBodyDeserializesIntoUser(request.getBodyAsString(), user));
-    }
-
-    @Test
-    public void shouldGetBadRequestForPublishingInvalidMessageWithSchema() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().publishAvro(topic.getQualifiedName(), "invalidMessage".getBytes());
+    // when
+    hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes());
 
-        // then
-        response.expectStatus().isBadRequest();
-    }
+    // then
+    subscriber.waitUntilReceived(user.asJson());
+  }
 
-    @Test
-    public void shouldIgnoreValidationDryRunSettingForAvroTopic() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .withJsonToAvroDryRun(true)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+  @Test
+  public void shouldNotPublishAvroWhenMessageIsNotJsonOrAvro() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().publishAvro(topic.getQualifiedName(), "invalidMessage".getBytes());
+    TestSubscriber subscriber = subscribers.createSubscriber();
 
-        // then
-        response.expectStatus().isBadRequest();
-    }
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
 
-    @Test
-    public void shouldPublishJsonMessageConvertedToAvroForAvroTopics() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .publish(
+                topic.getQualifiedName(),
+                user.asJson(),
+                createHeaders(Map.of("Content-Type", TEXT_PLAIN)));
+
+    // then
+    response.expectStatus().isBadRequest();
+  }
+
+  @Test
+  public void shouldPublishAvroAndConsumeAvroMessage() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
                 .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+                .build());
 
-        // when & then
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), user.asJson());
-    }
+    // when
+    hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes());
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> assertBodyDeserializesIntoUser(request.getBodyAsString(), user));
+  }
+
+  @Test
+  public void shouldSendAvroAfterSubscriptionContentTypeChanged() {
+    // given avro topic
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    // and subscription with json content type
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .withContentType(JSON)
+                .build());
 
-    @Test
-    public void shouldPublishAvroEncodedJsonMessageConvertedToAvroForAvroTopics() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    // when first message is published
+    hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes());
+
+    // then it is consumed as json
+    subscriber.waitUntilRequestReceived(
+        request ->
+            assertThatJson(request.getBodyAsString())
+                .when(Option.IGNORING_EXTRA_FIELDS)
+                .isEqualTo(user.asJson()));
+    subscriber.reset();
+
+    // when subscription content type is changed to avro
+    hermes
+        .api()
+        .updateSubscription(
+            topic, "subscription", patchData().set("contentType", ContentType.AVRO).build());
+    long currentTime = clock.millis();
+    waitUntilSubscriptionContentTypeChanged(topic, "subscription", ContentType.AVRO);
+    waitUntilConsumersUpdateSubscription(currentTime, topic, "subscription");
+
+    // and second message is published
+    hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes());
+
+    // then it is consumed as avro
+    subscriber.waitUntilRequestReceived(
+        request -> assertBodyDeserializesIntoUser(request.getBodyAsString(), user));
+  }
+
+  @Test
+  public void shouldGetBadRequestForPublishingInvalidMessageWithSchema() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().publishAvro(topic.getQualifiedName(), "invalidMessage".getBytes());
+
+    // then
+    response.expectStatus().isBadRequest();
+  }
+
+  @Test
+  public void shouldIgnoreValidationDryRunSettingForAvroTopic() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).withJsonToAvroDryRun(true).build(),
+            user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().publishAvro(topic.getQualifiedName(), "invalidMessage".getBytes());
+
+    // then
+    response.expectStatus().isBadRequest();
+  }
+
+  @Test
+  public void shouldPublishJsonMessageConvertedToAvroForAvroTopics() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    // when & then
+    hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), user.asJson());
+  }
+
+  @Test
+  public void shouldPublishAvroEncodedJsonMessageConvertedToAvroForAvroTopics() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    // when & then
+    hermes
+        .api()
+        .publishUntilSuccess(
+            topic.getQualifiedName(),
+            user.asAvroEncodedJson(),
+            createHeaders(singletonMap("Content-Type", AVRO_JSON)));
+  }
+
+  @Test
+  public void shouldGetBadRequestForJsonNotMatchingWithAvroSchemaAndAvroContentType() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    String message = "{\"__metadata\":null,\"name\":\"john\",\"age\":\"string instead of int\"}";
+
+    // when / then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              WebTestClient.ResponseSpec response =
+                  hermes
+                      .api()
+                      .publish(
+                          topic.getQualifiedName(),
+                          message,
+                          createHeaders(Map.of("Content-Type", AVRO_JSON)));
+              response.expectStatus().isBadRequest();
+              response
+                  .expectBody(String.class)
+                  .isEqualTo(
+                      "{"
+                          + "\"message\":\"Invalid message: Failed to convert to AVRO: Expected int. Got VALUE_STRING.\","
+                          + "\"code\":\"VALIDATION_ERROR\""
+                          + "}");
+            });
+  }
+
+  @Test
+  public void shouldGetBadRequestForJsonNotMachingWithAvroSchemaAndJsonContentType() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    // when
+    String message = "{\"name\":\"john\",\"age\":\"string instead of int\"}";
+    WebTestClient.ResponseSpec response =
+        hermes.api().publishJSON(topic.getQualifiedName(), message);
+
+    // then
+    response.expectStatus().isBadRequest();
+    response
+        .expectBody(String.class)
+        .isEqualTo(
+            "{"
+                + "\"message\":\"Invalid message: Failed to convert JSON to Avro: Field age is expected to be type: java.lang.Number\","
+                + "\"code\":\"VALIDATION_ERROR\""
+                + "}");
+  }
+
+  @Test
+  public void shouldGetBadRequestForInvalidJsonWithAvroSchema() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().publishJSON(topic.getQualifiedName(), "{\"name\":\"Bob\"");
+
+    // then
+    response.expectStatus().isBadRequest();
+  }
+
+  @Test
+  public void shouldReturnBadRequestOnMissingSchemaAtSpecifiedVersion() {
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    // when
+    HermesMessage message = hermesMessage(topic.getQualifiedName(), user.asBytes()).avro(2).build();
+
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .publishAvro(
+                topic.getQualifiedName(), message.getBody(), createHeaders(message.getHeaders()));
+
+    // then
+    response.expectStatus().isBadRequest();
+    response
+        .expectBody(String.class)
+        .isEqualTo(
+            "{\"message\":\"Given schema version '2' does not exist\",\"code\":\"SCHEMA_VERSION_DOES_NOT_EXIST\"}");
+  }
+
+  @Test
+  public void shouldPublishJsonIncompatibleWithSchemaWhileJsonToAvroDryRunModeIsEnabled() {
+    // given
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName().withJsonToAvroDryRun(true).withContentType(JSON).build());
+    hermes.api().ensureSchemaSaved(topic.getQualifiedName(), false, user.getSchemaAsString());
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
 
-        // when & then
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), user.asAvroEncodedJson(), createHeaders(singletonMap("Content-Type", AVRO_JSON)));
-    }
+    TestMessage message = TestMessage.random();
+
+    // when
+    hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    subscriber.waitUntilReceived(message.body());
+  }
+
+  @Test
+  public void
+      shouldPublishJsonCompatibleWithSchemaWithoutMetadataWhileJsonToAvroDryRunModeIsEnabled() {
+    // given
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName().withJsonToAvroDryRun(true).withContentType(JSON).build());
+
+    Schema schema = AvroUserSchemaLoader.load("/schema/user_no_metadata.avsc");
+    hermes.api().ensureSchemaSaved(topic.getQualifiedName(), false, schema.toString());
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
 
-    @Test
-    public void shouldGetBadRequestForJsonNotMatchingWithAvroSchemaAndAvroContentType() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        // when
-        String message = "{\"__metadata\":null,\"name\":\"john\",\"age\":\"string instead of int\"}";
-        WebTestClient.ResponseSpec response = hermes.api().publish(topic.getQualifiedName(), message, createHeaders(Map.of("Content-Type", AVRO_JSON)));
-
-        // then
-        response.expectStatus().isBadRequest();
-        response.expectBody(String.class).isEqualTo(
-                "{" + "\"message\":\"Invalid message: Failed to convert to AVRO: Expected int. Got VALUE_STRING.\","
-                        + "\"code\":\"VALIDATION_ERROR\""
-                        + "}"
-        );
-    }
-
-    @Test
-    public void shouldGetBadRequestForJsonNotMachingWithAvroSchemaAndJsonContentType() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        // when
-        String message = "{\"name\":\"john\",\"age\":\"string instead of int\"}";
-        WebTestClient.ResponseSpec response = hermes.api().publishJSON(topic.getQualifiedName(), message);
-
-        // then
-        response.expectStatus().isBadRequest();
-        response.expectBody(String.class).isEqualTo(
-                "{" + "\"message\":\"Invalid message: Failed to convert JSON to Avro: Field age is expected to be type: java.lang.Number\","
-                        + "\"code\":\"VALIDATION_ERROR\""
-                        + "}"
-        );
-    }
-
-    @Test
-    public void shouldGetBadRequestForInvalidJsonWithAvroSchema() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    // when
+    hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), user.asJson());
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().publishJSON(topic.getQualifiedName(), "{\"name\":\"Bob\"");
+    // then
+    subscriber.waitUntilReceived(user.asJson());
+  }
 
-        // then
-        response.expectStatus().isBadRequest();
-    }
+  @Test
+  public void shouldPublishAvroAndConsumeJsonMessageWithTraceId() {
+    // given
+    final String traceId = UUID.randomUUID().toString();
 
-    @Test
-    public void shouldReturnBadRequestOnMissingSchemaAtSpecifiedVersion() {
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        // when
-        HermesMessage message = hermesMessage(topic.getQualifiedName(), user.asBytes())
-                .avro(2)
-                .build();
-
-        WebTestClient.ResponseSpec response = hermes.api().publishAvro(topic.getQualifiedName(), message.getBody(), createHeaders(message.getHeaders()));
-
-        // then
-        response.expectStatus().isBadRequest();
-        response.expectBody(String.class)
-                .isEqualTo("{\"message\":\"Given schema version '2' does not exist\",\"code\":\"SCHEMA_VERSION_DOES_NOT_EXIST\"}");
-    }
-
-    @Test
-    public void shouldPublishJsonIncompatibleWithSchemaWhileJsonToAvroDryRunModeIsEnabled() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(
-                topicWithRandomName()
-                        .withJsonToAvroDryRun(true)
-                        .withContentType(JSON)
-                        .build());
-        hermes.api().ensureSchemaSaved(topic.getQualifiedName(), false, user.getSchemaAsString());
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
-
-        TestMessage message = TestMessage.random();
-
-        // when
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), message.body());
-
-        // then
-        subscriber.waitUntilReceived(message.body());
-    }
-
-    @Test
-    public void shouldPublishJsonCompatibleWithSchemaWithoutMetadataWhileJsonToAvroDryRunModeIsEnabled() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(
-                topicWithRandomName()
-                        .withJsonToAvroDryRun(true)
-                        .withContentType(JSON)
-                        .build());
-
-        Schema schema = AvroUserSchemaLoader.load("/schema/user_no_metadata.avsc");
-        hermes.api().ensureSchemaSaved(topic.getQualifiedName(), false, schema.toString());
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
-
-        // when
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), user.asJson());
-
-        // then
-        subscriber.waitUntilReceived(user.asJson());
-    }
-
-    @Test
-    public void shouldPublishAvroAndConsumeJsonMessageWithTraceId() {
-        // given
-        final String traceId = UUID.randomUUID().toString();
-
-        // and
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
+    // and
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
 
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
                 .build());
 
-        // when
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), user.asBytes(), createHeaders(singletonMap("Trace-Id", traceId)));
-
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getBodyAsString()).isEqualTo(user.asJson());
-            assertThat(request.getHeader("Trace-Id")).isEqualTo(traceId);
+    // when
+    hermes
+        .api()
+        .publishAvroUntilSuccess(
+            topic.getQualifiedName(),
+            user.asBytes(),
+            createHeaders(singletonMap("Trace-Id", traceId)));
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(request.getBodyAsString()).isEqualTo(user.asJson());
+          assertThat(request.getHeader("Trace-Id")).isEqualTo(traceId);
         });
-    }
-
-    @Test
-    public void shouldUseExplicitSchemaVersionWhenPublishingAndConsuming() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
+  }
+
+  @Test
+  public void shouldUseExplicitSchemaVersionWhenPublishingAndConsuming() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).withSchemaIdAwareSerialization().build(),
+            user.getSchemaAsString());
+
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
                 .withContentType(AVRO)
-                .withSchemaIdAwareSerialization()
-                .build(), user.getSchemaAsString());
-
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
-                        .withContentType(AVRO)
                 .build());
 
-        hermes.api().ensureSchemaSaved(topic.getQualifiedName(), false, load("/schema/user_v2.avsc").toString());
-
-        // when
-        HermesMessage message = hermesMessage(topic.getQualifiedName(), user.asBytes())
-                .avro(1)
-                .build();
-
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), message.getBody(), createHeaders(message.getHeaders()));
-
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getHeaders().getHeader(HermesMessage.SCHEMA_VERSION_HEADER).firstValue()).isEqualTo("1");
-            assertBodyDeserializesIntoUser(request.getBodyAsString(), user);
+    hermes
+        .api()
+        .ensureSchemaSaved(
+            topic.getQualifiedName(), false, load("/schema/user_v2.avsc").toString());
+
+    // when
+    HermesMessage message = hermesMessage(topic.getQualifiedName(), user.asBytes()).avro(1).build();
+
+    hermes
+        .api()
+        .publishAvroUntilSuccess(
+            topic.getQualifiedName(), message.getBody(), createHeaders(message.getHeaders()));
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(
+                  request.getHeaders().getHeader(HermesMessage.SCHEMA_VERSION_HEADER).firstValue())
+              .isEqualTo("1");
+          assertBodyDeserializesIntoUser(request.getBodyAsString(), user);
         });
-    }
-
-    @Test
-    public void shouldUseExplicitSchemaVersionWhenPublishingAndConsumingWithLowercaseHeader() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .withSchemaIdAwareSerialization()
-                .build(), user.getSchemaAsString());
-
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
+  }
+
+  @Test
+  public void shouldUseExplicitSchemaVersionWhenPublishingAndConsumingWithLowercaseHeader() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).withSchemaIdAwareSerialization().build(),
+            user.getSchemaAsString());
+
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
                 .withContentType(AVRO)
                 .build());
 
-        hermes.api().ensureSchemaSaved(topic.getQualifiedName(), false, load("/schema/user_v2.avsc").toString());
-
-        // when
-        HermesMessage message = hermesMessage(topic.getQualifiedName(), user.asBytes())
-                .withHeader("schema-version", "1")
-                .build();
-
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), message.getBody(), createHeaders(message.getHeaders()));
-
-        // then
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getHeaders().getHeader(HermesMessage.SCHEMA_VERSION_HEADER).firstValue()).isEqualTo("1");
-            assertBodyDeserializesIntoUser(request.getBodyAsString(), user);
+    hermes
+        .api()
+        .ensureSchemaSaved(
+            topic.getQualifiedName(), false, load("/schema/user_v2.avsc").toString());
+
+    // when
+    HermesMessage message =
+        hermesMessage(topic.getQualifiedName(), user.asBytes())
+            .withHeader("schema-version", "1")
+            .build();
+
+    hermes
+        .api()
+        .publishAvroUntilSuccess(
+            topic.getQualifiedName(), message.getBody(), createHeaders(message.getHeaders()));
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(
+                  request.getHeaders().getHeader(HermesMessage.SCHEMA_VERSION_HEADER).firstValue())
+              .isEqualTo("1");
+          assertBodyDeserializesIntoUser(request.getBodyAsString(), user);
         });
-    }
-
-    @Test
-    public void shouldUpdateSchemaAndUseItImmediately() throws InterruptedException {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), user.getSchemaAsString());
-
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint())
+  }
+
+  @Test
+  public void shouldUpdateSchemaAndUseItImmediately() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
                 .withContentType(AVRO)
                 .build());
 
-        HermesMessage message = hermesMessage(topic.getQualifiedName(), user.asBytes()).build();
-
-        // when message is published with schema version 1
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), message.getBody(), createHeaders(message.getHeaders()));
-
-        // then it is consumed with schema version 1
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getHeaders().getHeader(HermesMessage.SCHEMA_VERSION_HEADER).firstValue()).isEqualTo("1");
-            assertBodyDeserializesIntoUser(request.getBodyAsString(), user);
+    HermesMessage message = hermesMessage(topic.getQualifiedName(), user.asBytes()).build();
+
+    // when message is published with schema version 1
+    hermes
+        .api()
+        .publishAvroUntilSuccess(
+            topic.getQualifiedName(), message.getBody(), createHeaders(message.getHeaders()));
+
+    // then it is consumed with schema version 1
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(
+                  request.getHeaders().getHeader(HermesMessage.SCHEMA_VERSION_HEADER).firstValue())
+              .isEqualTo("1");
+          assertBodyDeserializesIntoUser(request.getBodyAsString(), user);
         });
-        subscriber.reset();
-
-        Schema schemaV2 = load("/schema/user_v2.avsc");
-        AvroUser userV2 = new AvroUser(CompiledSchema.of(schemaV2, 2, 2), "Bob", 50, "blue");
-        HermesMessage messageV2 = hermesMessage(topic.getQualifiedName(), userV2.asBytes()).build();
-
-        // when schema is updated to version 2
-        hermes.api().ensureSchemaSaved(topic.getQualifiedName(), false, schemaV2.toString());
-
-        // and messages is published with schema version 2
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), messageV2.getBody(), createHeaders(messageV2.getHeaders()));
-
-        // then it is consumed with schema version 2
-        subscriber.waitUntilRequestReceived(request -> {
-            assertThat(request.getHeaders().getHeader(HermesMessage.SCHEMA_VERSION_HEADER).firstValue()).isEqualTo("2");
-            assertBodyDeserializesIntoUser(request.getBodyAsString(), userV2);
+    subscriber.reset();
+
+    Schema schemaV2 = load("/schema/user_v2.avsc");
+    AvroUser userV2 = new AvroUser(CompiledSchema.of(schemaV2, 2, 2), "Bob", 50, "blue");
+    HermesMessage messageV2 = hermesMessage(topic.getQualifiedName(), userV2.asBytes()).build();
+
+    // when schema is updated to version 2
+    hermes.api().ensureSchemaSaved(topic.getQualifiedName(), false, schemaV2.toString());
+
+    // and messages is published with schema version 2
+    hermes
+        .api()
+        .publishAvroUntilSuccess(
+            topic.getQualifiedName(), messageV2.getBody(), createHeaders(messageV2.getHeaders()));
+
+    // then it is consumed with schema version 2
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          assertThat(
+                  request.getHeaders().getHeader(HermesMessage.SCHEMA_VERSION_HEADER).firstValue())
+              .isEqualTo("2");
+          assertBodyDeserializesIntoUser(request.getBodyAsString(), userV2);
         });
-    }
-
-    @Test
-    public void shouldPublishAndConsumeJsonMessageAfterMigrationFromJsonToAvro() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        hermes.initHelper().createSubscription(subscription(topic.getQualifiedName(),
-                "subscription", subscriber.getEndpoint()).build());
-
-        TestMessage beforeMigrationMessage = new AvroUser("Bob", 50, "blue").asTestMessage();
-        AvroUser afterMigrationMessage = new AvroUser("Barney", 35, "yellow");
-
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), beforeMigrationMessage.body());
-        subscriber.waitUntilReceived(beforeMigrationMessage.body());
-        subscriber.reset();
-
-        waitUntilConsumerCommitsOffset(topic, "subscription");
-
-        PatchData patch = patchData()
-                .set("contentType", ContentType.AVRO)
-                .set("migratedFromJsonType", true)
-                .set("schema", user.getSchemaAsString())
-                .build();
-        hermes.api().updateTopic(topic.getQualifiedName(), patch);
-
-        // when
-        hermes.api().publishJSONUntilSuccess(topic.getQualifiedName(), afterMigrationMessage.asTestMessage().withEmptyAvroMetadata().body());
-
-        // then
-        subscriber.waitUntilReceived(afterMigrationMessage.asTestMessage().body());
-    }
-
-
-    private void assertBodyDeserializesIntoUser(String body, AvroUser user) {
-        AvroUser avroUser = AvroUser.create(user.getCompiledSchema(), body.getBytes());
-        assertThat(avroUser.getName()).isEqualTo(user.getName());
-        assertThat(avroUser.getAge()).isEqualTo(user.getAge());
-        assertThat(avroUser.getFavoriteColor()).isEqualTo(user.getFavoriteColor());
-    }
+  }
+
+  @Test
+  public void shouldPublishAndConsumeJsonMessageAfterMigrationFromJsonToAvro() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
 
-    private void waitUntilSubscriptionContentTypeChanged(Topic topic, String subscription, ContentType expected) {
-        waitAtMost(adjust(Duration.TEN_SECONDS)).until(() -> {
-            ContentType actual = hermes.api().getSubscription(topic.getQualifiedName(), subscription).getContentType();
-            logger.info("Expecting {} subscription endpoint address. Actual {}", expected, actual);
-            return expected.equals(actual);
+    final TestMessage beforeMigrationMessage = new AvroUser("Bob", 50, "blue").asTestMessage();
+    final AvroUser afterMigrationMessage = new AvroUser("Barney", 35, "yellow");
+
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), beforeMigrationMessage.body());
+    subscriber.waitUntilReceived(beforeMigrationMessage.body());
+    subscriber.reset();
+
+    hermes.api().waitUntilConsumerCommitsOffset(topic.getQualifiedName(), "subscription");
+
+    PatchData patch =
+        patchData()
+            .set("contentType", ContentType.AVRO)
+            .set("migratedFromJsonType", true)
+            .set("schema", user.getSchemaAsString())
+            .build();
+    hermes.api().updateTopic(topic.getQualifiedName(), patch);
+
+    // when
+    hermes
+        .api()
+        .publishJSONUntilSuccess(
+            topic.getQualifiedName(),
+            afterMigrationMessage.asTestMessage().withEmptyAvroMetadata().body());
+
+    // then
+    subscriber.waitUntilReceived(afterMigrationMessage.asTestMessage().body());
+  }
+
+  @Test
+  public void shouldSendMessageIdHeaderToSubscriber() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(), user.getSchemaAsString());
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .withContentType(AVRO)
+                .build());
+    String traceId = UUID.randomUUID().toString();
+
+    // when
+    hermes
+        .api()
+        .publishAvroUntilSuccess(
+            topic.getQualifiedName(),
+            user.asBytes(),
+            createHeaders(singletonMap("Trace-Id", traceId)));
+
+    // then
+    subscriber.waitUntilRequestReceived(
+        request -> {
+          String messageId = request.getHeader("Hermes-Message-Id");
+          assertThat(messageId).isNotBlank();
+          assertThat(request.getHeader("messageId")).isEqualTo(messageId);
+          assertThat(request.getHeader("Trace-Id")).isEqualTo(traceId);
         });
-    }
-
-    private void waitUntilConsumerCommitsOffset(Topic topic, String subscription) {
-        long currentTime = clock.millis();
-        waitAtMost(adjust(Duration.TEN_SECONDS)).until(() ->
-        hermes.api().getRunningSubscriptionsStatus().stream()
-                .filter(sub -> sub.getQualifiedName().equals(topic.getQualifiedName() + "$" + subscription))
-                .anyMatch(sub -> sub.getSignalTimesheet().getOrDefault(COMMIT, 0L) > currentTime));
-
-    }
-
-    private void waitUntilConsumersUpdateSubscription(final long currentTime, Topic topic, String subscription) {
-        waitAtMost(adjust(Duration.TEN_SECONDS)).until(() ->
+  }
+
+  private void assertBodyDeserializesIntoUser(String body, AvroUser user) {
+    AvroUser avroUser = AvroUser.create(user.getCompiledSchema(), body.getBytes());
+    assertThat(avroUser.getName()).isEqualTo(user.getName());
+    assertThat(avroUser.getAge()).isEqualTo(user.getAge());
+    assertThat(avroUser.getFavoriteColor()).isEqualTo(user.getFavoriteColor());
+  }
+
+  private void waitUntilSubscriptionContentTypeChanged(
+      Topic topic, String subscription, ContentType expected) {
+    waitAtMost(adjust(Duration.ofSeconds(10)))
+        .until(
+            () -> {
+              ContentType actual =
+                  hermes
+                      .api()
+                      .getSubscription(topic.getQualifiedName(), subscription)
+                      .getContentType();
+              logger.info(
+                  "Expecting {} subscription endpoint address. Actual {}", expected, actual);
+              return expected.equals(actual);
+            });
+  }
+
+  private void waitUntilConsumersUpdateSubscription(
+      final long currentTime, Topic topic, String subscription) {
+    waitAtMost(adjust(Duration.ofSeconds(10)))
+        .until(
+            () ->
                 hermes.api().getRunningSubscriptionsStatus().stream()
-                        .filter(sub -> sub.getQualifiedName().equals(topic.getQualifiedName() + "$" + subscription))
-                        .anyMatch(sub -> sub.getSignalTimesheet().getOrDefault(UPDATE_SUBSCRIPTION, 0L) > currentTime));
-    }
+                    .filter(
+                        sub ->
+                            sub.getQualifiedName()
+                                .equals(topic.getQualifiedName() + "$" + subscription))
+                    .anyMatch(
+                        sub ->
+                            sub.getSignalTimesheet().getOrDefault(UPDATE_SUBSCRIPTION, 0L)
+                                > currentTime));
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingTest.java
index e36db02694..7f8b7e61f8 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingTest.java
@@ -1,6 +1,8 @@
 package pl.allegro.tech.hermes.integrationtests;
 
-import org.apache.commons.lang.StringUtils;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.http.HttpStatus;
@@ -9,32 +11,34 @@
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class PublishingTest {
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @Test
-    public void shouldReturn429ForQuotaViolation() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        // Frontend is configured in integration test suite to block publisher after 50_000 kb/sec
-        TestMessage message = TestMessage.of("content", StringUtils.repeat("X", 60_000));
-
-        hermes.api().publishUntilStatus(topic.getQualifiedName(), message.body(), HttpStatus.TOO_MANY_REQUESTS.value());
-    }
-
-    @Test
-    public void shouldReturn4xxForTooLargeContent() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withMaxMessageSize(2048).build());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().publish(topic.getQualifiedName(), StringUtils.repeat("X", 2555));
-
-        // then
-        response.expectStatus().isBadRequest();
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldReturn429ForQuotaViolation() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // Frontend is configured in integration test suite to block publisher after 50_000 kb/sec
+    TestMessage message = TestMessage.of("content", StringUtils.repeat("X", 60_000));
+
+    hermes
+        .api()
+        .publishUntilStatus(
+            topic.getQualifiedName(), message.body(), HttpStatus.TOO_MANY_REQUESTS.value());
+  }
+
+  @Test
+  public void shouldReturn4xxForTooLargeContent() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withMaxMessageSize(2048).build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().publish(topic.getQualifiedName(), StringUtils.repeat("X", 2555));
+
+    // then
+    response.expectStatus().isBadRequest();
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingTimeoutTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingTimeoutTest.java
index 8d5e3424e5..4b3975b451 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingTimeoutTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingTimeoutTest.java
@@ -1,77 +1,96 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.io.IOException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.LoggerFactory;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 
-import java.io.IOException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class PublishingTimeoutTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-    @Test
-    public void shouldHandleRequestTimeout() throws IOException, InterruptedException {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        int clientTimeout = 5000;
-        int pauseTimeBetweenChunks = 300;
-        int delayBeforeSendingFirstData = 0;
+  @Test
+  public void shouldHandleRequestTimeout() throws IOException, InterruptedException {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    int clientTimeout = 5000;
+    int pauseTimeBetweenChunks = 300;
+    int delayBeforeSendingFirstData = 0;
 
-        // when
-        long start = System.currentTimeMillis();
-        String response = hermes.api().publishSlowly(clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topic.getQualifiedName());
-        long elapsed = System.currentTimeMillis() - start;
+    // when
+    long start = System.currentTimeMillis();
+    String response =
+        hermes
+            .api()
+            .publishSlowly(
+                clientTimeout,
+                pauseTimeBetweenChunks,
+                delayBeforeSendingFirstData,
+                topic.getQualifiedName());
+    long elapsed = System.currentTimeMillis() - start;
 
-        //then
-        assertThat(response).contains("408 Request Time-out");
-        assertThat(elapsed).isLessThan(2500);
-    }
+    // then
+    assertThat(response).contains("408 Request Time-out");
+    assertThat(elapsed).isLessThan(2500);
+  }
 
-    @Test
-    public void shouldCloseConnectionAfterSendingDelayData() throws IOException, InterruptedException {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        int clientTimeout = 5000;
-        int pauseTimeBetweenChunks = 0;
-        int delayBeforeSendingFirstData = 3000;
+  @Test
+  public void shouldCloseConnectionAfterSendingDelayData() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    int clientTimeout = 5000;
+    int pauseTimeBetweenChunks = 0;
+    int delayBeforeSendingFirstData = 3000;
 
-        //when
-        Exception thrown = assertThrows(Exception.class, () ->
-                hermes.api().publishSlowly(
-                        clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topic.getQualifiedName()
-                ));
+    // when
+    Exception thrown =
+        assertThrows(
+            Exception.class,
+            () ->
+                hermes
+                    .api()
+                    .publishSlowly(
+                        clientTimeout,
+                        pauseTimeBetweenChunks,
+                        delayBeforeSendingFirstData,
+                        topic.getQualifiedName()));
 
-        // then
-        LoggerFactory.getLogger(PublishingTimeoutTest.class).error("Caught exception", thrown);
-        assertTrue(thrown.getMessage().contains("Broken pipe"));
-    }
+    // then
+    LoggerFactory.getLogger(PublishingTimeoutTest.class).error("Caught exception", thrown);
+    assertThat(thrown.getMessage()).containsAnyOf("Broken pipe", "Connection reset by peer");
+  }
 
-    @Test
-    public void shouldHandleTimeoutForSlowRequestWithChunkedEncoding() throws IOException, InterruptedException {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        int clientTimeout = 5000;
-        int pauseTimeBetweenChunks = 300;
-        int delayBeforeSendingFirstData = 0;
-        boolean chunkedEncoding = true;
+  @Test
+  public void shouldHandleTimeoutForSlowRequestWithChunkedEncoding()
+      throws IOException, InterruptedException {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    int clientTimeout = 5000;
+    int pauseTimeBetweenChunks = 300;
+    int delayBeforeSendingFirstData = 0;
+    boolean chunkedEncoding = true;
 
-        // when
-        long start = System.currentTimeMillis();
-        String response = hermes.api().publishSlowly(
-                clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topic.getQualifiedName(), chunkedEncoding);
-        long elapsed = System.currentTimeMillis() - start;
+    // when
+    long start = System.currentTimeMillis();
+    String response =
+        hermes
+            .api()
+            .publishSlowly(
+                clientTimeout,
+                pauseTimeBetweenChunks,
+                delayBeforeSendingFirstData,
+                topic.getQualifiedName(),
+                chunkedEncoding);
+    long elapsed = System.currentTimeMillis() - start;
 
-        // then
-        assertThat(response).contains("408 Request Time-out");
-        assertThat(elapsed).isLessThan(2500);
-    }
+    // then
+    assertThat(response).contains("408 Request Time-out");
+    assertThat(elapsed).isLessThan(2500);
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingWithFailoverTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingWithFailoverTest.java
index 319808285e..0f4dcb0c66 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingWithFailoverTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingWithFailoverTest.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -9,36 +12,36 @@
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class PublishingWithFailoverTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    @Test
-    public void shouldReturn202IfKafkaFailedToRespondButMessageCanBeBufferedInMemory() {
-        //given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        TestMessage message = TestMessage.of("hello", "world");
-
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
-        //we must send first message to a working kafka because producer need to fetch metadata
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
-        subscriber.waitUntilReceived(message.body());
-
-        //when
-        hermes.cutOffConnectionsBetweenBrokersAndClients();
-        WebTestClient.ResponseSpec response = hermes.api().publish(topic.getQualifiedName(), message.body());
-        hermes.restoreConnectionsBetweenBrokersAndClients();
-
-        //then
-        response.expectStatus().isAccepted();
-        subscriber.waitUntilReceived(message.body());
-    }
-}
\ No newline at end of file
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  @Test
+  public void shouldReturn202IfKafkaFailedToRespondButMessageCanBeBufferedInMemory() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    TestMessage message = TestMessage.of("hello", "world");
+
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+    // we must send first message to a working kafka because producer need to fetch metadata
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), message.body());
+    subscriber.waitUntilReceived(message.body());
+
+    // when
+    hermes.cutOffConnectionsBetweenBrokersAndClients();
+    WebTestClient.ResponseSpec response =
+        hermes.api().publish(topic.getQualifiedName(), message.body());
+    hermes.restoreConnectionsBetweenBrokersAndClients();
+
+    // then
+    response.expectStatus().isAccepted();
+    subscriber.waitUntilReceived(message.body());
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ReadinessCheckTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ReadinessCheckTest.java
index 395ee8382c..ff0979f8bd 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ReadinessCheckTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/ReadinessCheckTest.java
@@ -1,40 +1,47 @@
 package pl.allegro.tech.hermes.integrationtests;
 
-import com.jayway.awaitility.Duration;
-import org.junit.jupiter.api.Disabled;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
+
+import java.time.Duration;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 
-import java.util.Objects;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
-
 public class ReadinessCheckTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    //TODO Fix this test later
-
-    @Test
-    @Disabled
-    public void shouldRespectReadinessStatusSetByAdmin() {
-        // when
-        hermes.api().setReadiness(DEFAULT_DC_NAME, false).expectStatus().isAccepted();
-
-        // then
-            waitAtMost(Duration.FIVE_SECONDS).until(
-                () -> Objects.equals(hermes.api().getReadiness().expectStatus().is5xxServerError().expectBody(String.class).returnResult().getResponseBody(), "NOT_READY")
-        );
-
-        // when
-        hermes.api().setReadiness(DEFAULT_DC_NAME, true).expectStatus().isAccepted();
-
-        // then
-        waitAtMost(Duration.FIVE_SECONDS).until(
-                () -> Objects.equals(hermes.api().getReadiness().expectStatus().isOk().expectBody(String.class).returnResult().getResponseBody(), "READY")
-        );
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldRespectReadinessStatusSetByAdmin() {
+    // when
+    hermes.api().setReadiness(DEFAULT_DC_NAME, false).expectStatus().isAccepted();
+
+    // then
+    waitAtMost(Duration.ofSeconds(5))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .getFrontendReadiness()
+                    .expectStatus()
+                    .is5xxServerError()
+                    .expectBody(String.class)
+                    .isEqualTo("NOT_READY"));
+
+    // when
+    hermes.api().setReadiness(DEFAULT_DC_NAME, true).expectStatus().isAccepted();
+
+    // then
+    waitAtMost(Duration.ofSeconds(5))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .getFrontendReadiness()
+                    .expectStatus()
+                    .isOk()
+                    .expectBody(String.class)
+                    .isEqualTo("READY"));
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicAuthorizationTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicAuthorizationTest.java
new file mode 100644
index 0000000000..bdca3bd712
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicAuthorizationTest.java
@@ -0,0 +1,191 @@
+package pl.allegro.tech.hermes.integrationtests;
+
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.AUTH_PASSWORD;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.AUTH_USERNAME;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_ENABLED;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_MODE;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Base64;
+import java.util.Map;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder;
+import pl.allegro.tech.hermes.test.helper.message.TestMessage;
+import pl.allegro.tech.hermes.utils.Headers;
+
+public class TopicAuthorizationTest {
+
+  private static final String USERNAME = "someUser";
+  private static final String PASSWORD = "somePassword123";
+  private static final String MESSAGE = TestMessage.of("hello", "world").body();
+  private static final String USERNAME2 = "foobar";
+
+  @RegisterExtension
+  public static final HermesExtension hermes =
+      new HermesExtension()
+          .withFrontendProfile("authNonRequired")
+          .withFrontendProperty(AUTH_USERNAME, USERNAME)
+          .withFrontendProperty(AUTH_PASSWORD, PASSWORD)
+          .withFrontendProperty(FRONTEND_SSL_ENABLED, false)
+          .withFrontendProperty(FRONTEND_AUTHENTICATION_MODE, "pro_active")
+          .withFrontendProperty(FRONTEND_AUTHENTICATION_ENABLED, true);
+
+  @ParameterizedTest
+  @MethodSource("publishWhenAuthenticatedTopics")
+  public void shouldPublishWhenAuthenticated(Topic topic) {
+    // given
+    hermes.initHelper().createTopic(topic);
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes
+                      .api()
+                      .publish(
+                          topic.getQualifiedName(),
+                          MESSAGE,
+                          createAuthorizationHeader(USERNAME, PASSWORD));
+
+              // then
+              response.expectStatus().isCreated();
+            });
+  }
+
+  static Stream<Topic> publishWhenAuthenticatedTopics() {
+    return Stream.of(
+        TopicBuilder.topicWithRandomName().build(),
+        TopicBuilder.topicWithRandomName().withPublisher(USERNAME).withAuthEnabled().build(),
+        TopicBuilder.topicWithRandomName()
+            .withPublisher(USERNAME)
+            .withPublisher(USERNAME2)
+            .withAuthEnabled()
+            .build(),
+        TopicBuilder.topicWithRandomName()
+            .withPublisher(USERNAME)
+            .withAuthEnabled()
+            .withUnauthenticatedAccessDisabled()
+            .build(),
+        TopicBuilder.topicWithRandomName()
+            .withPublisher(USERNAME)
+            .withPublisher(USERNAME2)
+            .withAuthEnabled()
+            .withUnauthenticatedAccessDisabled()
+            .build());
+  }
+
+  @ParameterizedTest
+  @MethodSource("publishAsGuestWhenAuthIsNotRequiredTopics")
+  public void shouldPublishAsGuestWhenAuthIsNotRequired(Topic topic) {
+    // given
+    hermes.initHelper().createTopic(topic);
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes.api().publish(topic.getQualifiedName(), MESSAGE);
+
+              // then
+              response.expectStatus().isCreated();
+            });
+  }
+
+  static Stream<Topic> publishAsGuestWhenAuthIsNotRequiredTopics() {
+    return Stream.of(
+        TopicBuilder.topicWithRandomName().build(),
+        TopicBuilder.topicWithRandomName().withAuthEnabled().build(),
+        TopicBuilder.topicWithRandomName().withPublisher(USERNAME2).withAuthEnabled().build());
+  }
+
+  @ParameterizedTest
+  @MethodSource("notPublishAsGuestWhenAuthIsRequiredTopics")
+  public void shouldNotPublishAsGuestWhenAuthIsRequired(Topic topic) {
+    // given
+    hermes.initHelper().createTopic(topic);
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes.api().publish(topic.getQualifiedName(), MESSAGE);
+
+              // then
+              response.expectStatus().isForbidden();
+            });
+  }
+
+  static Stream<Topic> notPublishAsGuestWhenAuthIsRequiredTopics() {
+    return Stream.of(
+        TopicBuilder.topicWithRandomName()
+            .withAuthEnabled()
+            .withUnauthenticatedAccessDisabled()
+            .build(),
+        TopicBuilder.topicWithRandomName()
+            .withPublisher(USERNAME2)
+            .withAuthEnabled()
+            .withUnauthenticatedAccessDisabled()
+            .build());
+  }
+
+  @ParameterizedTest
+  @MethodSource("notPublishWithoutPermissionWhenAuthenticatedTopics")
+  public void shouldNotPublishWithoutPermissionWhenAuthenticated(Topic topic) {
+    // given
+    hermes.initHelper().createTopic(topic);
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes
+                      .api()
+                      .publish(
+                          topic.getQualifiedName(),
+                          MESSAGE,
+                          createAuthorizationHeader(USERNAME, PASSWORD));
+
+              // then
+              response.expectStatus().isForbidden();
+            });
+  }
+
+  static Stream<Topic> notPublishWithoutPermissionWhenAuthenticatedTopics() {
+    return Stream.of(
+        TopicBuilder.topicWithRandomName().withAuthEnabled().build(),
+        TopicBuilder.topicWithRandomName().withPublisher(USERNAME2).withAuthEnabled().build(),
+        TopicBuilder.topicWithRandomName()
+            .withAuthEnabled()
+            .withUnauthenticatedAccessDisabled()
+            .build(),
+        TopicBuilder.topicWithRandomName()
+            .withPublisher(USERNAME2)
+            .withAuthEnabled()
+            .withUnauthenticatedAccessDisabled()
+            .build());
+  }
+
+  private static HttpHeaders createAuthorizationHeader(String username, String password) {
+    String credentials = username + ":" + password;
+    Map<String, String> headers =
+        Map.of(
+            "Authorization",
+            "Basic "
+                + Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.UTF_8)));
+    return Headers.createHeaders(headers);
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicBlacklistTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicBlacklistTest.java
index a198c89a00..d060d4ae59 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicBlacklistTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicBlacklistTest.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.BlacklistStatus.BLACKLISTED;
+import static pl.allegro.tech.hermes.api.BlacklistStatus.NOT_BLACKLISTED;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Duration;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -7,93 +14,99 @@
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.BlacklistStatus.BLACKLISTED;
-import static pl.allegro.tech.hermes.api.BlacklistStatus.NOT_BLACKLISTED;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class TopicBlacklistTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @Test
-    public void shouldRefuseMessageOnBlacklistedTopic() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestMessage message = TestMessage.of("hello", "world");
-
-        // when
-        hermes.api().blacklistTopic(topic.getQualifiedName());
-        WebTestClient.ResponseSpec response = hermes.api().publish(topic.getQualifiedName(), message.body());
-
-        // then
-        response.expectStatus().isForbidden();
-    }
-
-    @Test
-    public void shouldAcceptMessageOnUnblacklistedTopic() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        TestMessage message = TestMessage.of("hello", "world");
-        hermes.api().blacklistTopic(topic.getQualifiedName());
-
-        // when
-        hermes.api().unblacklistTopic(topic.getQualifiedName());
-        WebTestClient.ResponseSpec response = hermes.api().publish(topic.getQualifiedName(), message.body());
-
-        // then
-        response.expectStatus().is2xxSuccessful();
-    }
-
-    @Test
-    public void shouldBlacklistNonExistingTopic() {
-        // expect
-        WebTestClient.ResponseSpec response = hermes.api().blacklistTopicResponse("nonExisting.topic");
-
-        // then
-        response.expectStatus().isOk();
-    }
-
-
-    @Test
-    public void shouldUnBlacklistTopic() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.api().blacklistTopic(topic.getQualifiedName());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().unblacklistTopicResponse(topic.getQualifiedName());
-
-        // then
-        response.expectStatus().isOk();
-    }
-
-    @Test
-    public void shouldReportValidStatusOfTopic() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        // when
-        hermes.api().blacklistTopic(topic.getQualifiedName());
-
-        // then
-        assertThat(hermes.api().isTopicBlacklisted(topic.getQualifiedName())).isEqualTo(BLACKLISTED);
-
-        // when
-        hermes.api().unblacklistTopic(topic.getQualifiedName());
-
-        // then
-        assertThat(hermes.api().isTopicBlacklisted(topic.getQualifiedName())).isEqualTo(NOT_BLACKLISTED);
-    }
-
-    @Test
-    public void shouldReturnErrorOnNonBlacklistedUnblacklist() {
-        // when
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        WebTestClient.ResponseSpec response = hermes.api().unblacklistTopicResponse(topic.getQualifiedName());
-
-        // then
-        response.expectStatus().isBadRequest();
-    }
-}
\ No newline at end of file
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldRefuseMessageOnBlacklistedTopic() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestMessage message = TestMessage.of("hello", "world");
+
+    // when
+    hermes.api().blacklistTopic(topic.getQualifiedName());
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              WebTestClient.ResponseSpec response =
+                  hermes.api().publish(topic.getQualifiedName(), message.body());
+
+              // then
+              response.expectStatus().isForbidden();
+            });
+  }
+
+  @Test
+  public void shouldAcceptMessageOnUnblacklistedTopic() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestMessage message = TestMessage.of("hello", "world");
+    hermes.api().blacklistTopic(topic.getQualifiedName());
+
+    // when
+    hermes.api().unblacklistTopic(topic.getQualifiedName());
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              WebTestClient.ResponseSpec response =
+                  hermes.api().publish(topic.getQualifiedName(), message.body());
+
+              // then
+              response.expectStatus().is2xxSuccessful();
+            });
+  }
+
+  @Test
+  public void shouldBlacklistNonExistingTopic() {
+    // expect
+    WebTestClient.ResponseSpec response = hermes.api().blacklistTopicResponse("nonExisting.topic");
+
+    // then
+    response.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldUnBlacklistTopic() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes.api().blacklistTopic(topic.getQualifiedName());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().unblacklistTopicResponse(topic.getQualifiedName());
+
+    // then
+    response.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldReportValidStatusOfTopic() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    hermes.api().blacklistTopic(topic.getQualifiedName());
+
+    // then
+    assertThat(hermes.api().isTopicBlacklisted(topic.getQualifiedName())).isEqualTo(BLACKLISTED);
+
+    // when
+    hermes.api().unblacklistTopic(topic.getQualifiedName());
+
+    // then
+    assertThat(hermes.api().isTopicBlacklisted(topic.getQualifiedName()))
+        .isEqualTo(NOT_BLACKLISTED);
+  }
+
+  @Test
+  public void shouldReturnErrorOnNonBlacklistedUnblacklist() {
+    // when
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    WebTestClient.ResponseSpec response =
+        hermes.api().unblacklistTopicResponse(topic.getQualifiedName());
+
+    // then
+    response.expectStatus().isBadRequest();
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/UndeliveredLogTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/UndeliveredLogTest.java
index 01347d2985..54f6995595 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/UndeliveredLogTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/UndeliveredLogTest.java
@@ -1,36 +1,44 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Duration;
 import org.junit.jupiter.api.Test;
-import com.jayway.awaitility.Duration;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class UndeliveredLogTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    private static final String INVALID_ENDPOINT_URL = "http://localhost:60000";
-
-    @Test
-    public void shouldLogUndeliveredMessage() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName(), INVALID_ENDPOINT_URL).build());
-
-        // when
-        hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.simple().body());
-
-        // then
-        waitAtMost(Duration.TEN_SECONDS).until( () ->
-                hermes.api().getLatestUndeliveredMessage(topic.getQualifiedName(), subscription.getName()).expectStatus().is2xxSuccessful()
-        );
-    }
-}
\ No newline at end of file
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  private static final String INVALID_ENDPOINT_URL = "http://localhost:60000";
+
+  @Test
+  public void shouldLogUndeliveredMessage() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), INVALID_ENDPOINT_URL).build());
+
+    // when
+    hermes.api().publishUntilSuccess(topic.getQualifiedName(), TestMessage.simple().body());
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .getLatestUndeliveredMessage(topic.getQualifiedName(), subscription.getName())
+                    .expectStatus()
+                    .is2xxSuccessful());
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/FiltersVerificationTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/FiltersVerificationTest.java
index 18ac9f767e..511ba0a470 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/FiltersVerificationTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/FiltersVerificationTest.java
@@ -1,5 +1,15 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static com.google.common.collect.ImmutableMap.of;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.ERROR;
+import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.MATCHED;
+import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.NOT_MATCHED;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.MessageFilterSpecification;
@@ -11,84 +21,80 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
 
-import static com.google.common.collect.ImmutableMap.of;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.ERROR;
-import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.MATCHED;
-import static pl.allegro.tech.hermes.api.MessageFiltersVerificationResult.VerificationStatus.NOT_MATCHED;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class FiltersVerificationTest {
-    private static final MessageFilterSpecification FILTER_MATCHING_USERS_WITH_NAME_BOB = new MessageFilterSpecification(of(
-            "type", "avropath",
-            "path", ".name",
-            "matcher", "Bob"
-    ));
-
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @Test
-    void shouldReturnMatchedWhenGivenMessageMatchesFilter() {
-        //given
-        Topic topic = createTopicWithAvroUserSchema();
-        AvroUser bob = new AvroUser("Bob", 50, "blue");
-
-        //when
-        MessageFiltersVerificationResult result = verifyFilters(topic, FILTER_MATCHING_USERS_WITH_NAME_BOB, bob.asJson().getBytes());
-
-        //then
-        assertThat(result.getStatus()).isEqualTo(MATCHED);
-        assertThat(result.getErrorMessage()).isNull();
-    }
-
-    @Test
-    void shouldReturnNotMatchedWhenGivenMessageDoesNotMatchFilter() {
-        //given
-        Topic topic = createTopicWithAvroUserSchema();
-        AvroUser alice = new AvroUser("Alice", 50, "blue");
-
-        //when
-        MessageFiltersVerificationResult result = verifyFilters(topic, FILTER_MATCHING_USERS_WITH_NAME_BOB, alice.asJson().getBytes());
-
-        //then
-        assertThat(result.getStatus()).isEqualTo(NOT_MATCHED);
-        assertThat(result.getErrorMessage()).isNull();
-    }
-
-    @Test
-    void shouldReturnErrorWhenGivenMessageIsInvalid() {
-        //given
-        Topic topic = createTopicWithAvroUserSchema();
-
-        //when
-        MessageFiltersVerificationResult result = verifyFilters(topic, FILTER_MATCHING_USERS_WITH_NAME_BOB, "xyz".getBytes());
-
-        //then
-        assertThat(result.getStatus()).isEqualTo(ERROR);
-        assertThat(result.getErrorMessage()).contains("Failed to parse json to map format.");
-    }
-
-    private Topic createTopicWithAvroUserSchema() {
-        String schema = AvroUserSchemaLoader.load().toString();
-
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), schema);
-
-        return hermes.initHelper().createTopicWithSchema(topicWithSchema);
-    }
-
-    private MessageFiltersVerificationResult verifyFilters(Topic topic, MessageFilterSpecification specification, byte[] message) {
-        return hermes.api().verifyFilters(
-                topic.getQualifiedName(),
-                new MessageFiltersVerificationInput(singletonList(specification), message)
-        )
-                .expectStatus().isOk()
-                .expectBody(MessageFiltersVerificationResult.class)
-                .returnResult().getResponseBody();
-    }
+  private static final MessageFilterSpecification FILTER_MATCHING_USERS_WITH_NAME_BOB =
+      new MessageFilterSpecification(
+          of(
+              "type", "avropath",
+              "path", ".name",
+              "matcher", "Bob"));
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  void shouldReturnMatchedWhenGivenMessageMatchesFilter() {
+    // given
+    Topic topic = createTopicWithAvroUserSchema();
+    AvroUser bob = new AvroUser("Bob", 50, "blue");
+
+    // when
+    MessageFiltersVerificationResult result =
+        verifyFilters(topic, FILTER_MATCHING_USERS_WITH_NAME_BOB, bob.asJson().getBytes());
+
+    // then
+    assertThat(result.getStatus()).isEqualTo(MATCHED);
+    assertThat(result.getErrorMessage()).isNull();
+  }
+
+  @Test
+  void shouldReturnNotMatchedWhenGivenMessageDoesNotMatchFilter() {
+    // given
+    Topic topic = createTopicWithAvroUserSchema();
+    AvroUser alice = new AvroUser("Alice", 50, "blue");
+
+    // when
+    MessageFiltersVerificationResult result =
+        verifyFilters(topic, FILTER_MATCHING_USERS_WITH_NAME_BOB, alice.asJson().getBytes());
+
+    // then
+    assertThat(result.getStatus()).isEqualTo(NOT_MATCHED);
+    assertThat(result.getErrorMessage()).isNull();
+  }
+
+  @Test
+  void shouldReturnErrorWhenGivenMessageIsInvalid() {
+    // given
+    Topic topic = createTopicWithAvroUserSchema();
+
+    // when
+    MessageFiltersVerificationResult result =
+        verifyFilters(topic, FILTER_MATCHING_USERS_WITH_NAME_BOB, "xyz".getBytes());
+
+    // then
+    assertThat(result.getStatus()).isEqualTo(ERROR);
+    assertThat(result.getErrorMessage()).contains("Failed to parse json to map format.");
+  }
+
+  private Topic createTopicWithAvroUserSchema() {
+    String schema = AvroUserSchemaLoader.load().toString();
+
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(topicWithRandomName().withContentType(AVRO).build(), schema);
+
+    return hermes.initHelper().createTopicWithSchema(topicWithSchema);
+  }
+
+  private MessageFiltersVerificationResult verifyFilters(
+      Topic topic, MessageFilterSpecification specification, byte[] message) {
+    return hermes
+        .api()
+        .verifyFilters(
+            topic.getQualifiedName(),
+            new MessageFiltersVerificationInput(singletonList(specification), message))
+        .expectStatus()
+        .isOk()
+        .expectBody(MessageFiltersVerificationResult.class)
+        .returnResult()
+        .getResponseBody();
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/GroupManagementTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/GroupManagementTest.java
new file mode 100644
index 0000000000..e690dc492d
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/GroupManagementTest.java
@@ -0,0 +1,164 @@
+package pl.allegro.tech.hermes.integrationtests.management;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.ErrorCode.GROUP_NAME_IS_INVALID;
+import static pl.allegro.tech.hermes.api.ErrorCode.GROUP_NOT_EMPTY;
+import static pl.allegro.tech.hermes.integrationtests.management.TopicManagementTest.getErrorCode;
+import static pl.allegro.tech.hermes.integrationtests.setup.HermesExtension.auditEvents;
+import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.group;
+import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.groupWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Duration;
+import java.util.stream.Stream;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import pl.allegro.tech.hermes.api.Group;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+import pl.allegro.tech.hermes.management.TestSecurityProvider;
+
+public class GroupManagementTest {
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldEmitAuditEventWhenGroupCreated() {
+    // when
+    Group group = hermes.initHelper().createGroup(groupWithRandomName().build());
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("CREATED", group.getGroupName());
+  }
+
+  @Test
+  public void shouldEmitAuditEventWhenGroupRemoved() {
+    // given
+    Group group = hermes.initHelper().createGroup(groupWithRandomName().build());
+
+    // when
+    hermes.api().deleteGroup(group.getGroupName());
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("REMOVED", group.getGroupName());
+  }
+
+  @Test
+  public void shouldEmitAuditEventWhenGroupUpdated() {
+    // given
+    Group group = hermes.initHelper().createGroup(groupWithRandomName().build());
+
+    // when
+    hermes.api().updateGroup(group.getGroupName(), group);
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("UPDATED", group.getGroupName());
+  }
+
+  @Test
+  public void shouldCreateGroup() {
+    // given when
+    Group group = groupWithRandomName().build();
+    WebTestClient.ResponseSpec response = hermes.api().createGroup(group);
+
+    // then
+    response.expectStatus().isCreated();
+
+    assertThat(hermes.api().getGroups()).contains(group.getGroupName());
+  }
+
+  @Test
+  public void shouldListGroups() {
+    // given
+    Group group1 = hermes.initHelper().createGroup(groupWithRandomName().build());
+    Group group2 = hermes.initHelper().createGroup(groupWithRandomName().build());
+
+    // when then
+    Assertions.assertThat(hermes.api().getGroups())
+        .containsOnlyOnce(group1.getGroupName(), group2.getGroupName());
+  }
+
+  @Test
+  public void shouldReturnBadRequestStatusWhenAttemptToCreateGroupWithInvalidCharactersWasMade() {
+    // given
+    Group groupWithNameWithSpaces = group("group;` name with spaces").build();
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createGroup(groupWithNameWithSpaces);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(getErrorCode(response)).isEqualTo(GROUP_NAME_IS_INVALID);
+  }
+
+  @Test
+  public void shouldRemoveGroup() {
+    // given
+    Group group = hermes.initHelper().createGroup(groupWithRandomName().build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().deleteGroup(group.getGroupName());
+
+    // then
+    response.expectStatus().isOk();
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                Assertions.assertThat(hermes.api().getGroups())
+                    .doesNotContain(group.getGroupName()));
+  }
+
+  @Test
+  public void shouldAllowNonAdminUserToRemoveGroup() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(false);
+    Group group = hermes.initHelper().createGroup(groupWithRandomName().build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().deleteGroup(group.getGroupName());
+
+    // then
+    response.expectStatus().isOk();
+
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                Assertions.assertThat(hermes.api().getGroups())
+                    .doesNotContain(group.getGroupName()));
+
+    // cleanup
+    TestSecurityProvider.reset();
+  }
+
+  @Test
+  public void shouldNotAllowOnRemovingNonEmptyGroup() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().deleteGroup(topic.getName().getGroupName());
+
+    // then
+    response.expectStatus().isForbidden();
+    assertThat(getErrorCode(response)).isEqualTo(GROUP_NOT_EMPTY);
+  }
+
+  @Test
+  public void shouldNotAllowDollarSigns() {
+    Stream.of("$name", "na$me", "name$")
+        .forEach(
+            name -> {
+              // when
+              WebTestClient.ResponseSpec response = hermes.api().createGroup(group(name).build());
+
+              // then
+              response.expectStatus().isBadRequest();
+            });
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/HealthCheckTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/HealthCheckTest.java
index 0702d57d04..0eefed51c6 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/HealthCheckTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/HealthCheckTest.java
@@ -1,26 +1,23 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static org.awaitility.Awaitility.await;
+
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 
-import java.util.concurrent.TimeUnit;
-
-import static com.jayway.awaitility.Awaitility.await;
-
 public class HealthCheckTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-    @Test
-    public void shouldManagementBeHealthy() {
-        // given
-        WebTestClient.ResponseSpec response = hermes.api().getManagementHealth();
+  @Test
+  public void shouldManagementBeHealthy() {
+    // given
+    WebTestClient.ResponseSpec response = hermes.api().getManagementHealth();
 
-        // when & then
-        await().atMost(5, TimeUnit.SECONDS).until(() ->
-                response.expectStatus().isOk());
-    }
+    // when & then
+    await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> response.expectStatus().isOk());
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListClientsForTopicTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListClientsForTopicTest.java
index 69c7b72185..dcc8469689 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListClientsForTopicTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListClientsForTopicTest.java
@@ -1,58 +1,90 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.OwnerId;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+public class ListClientsForTopicTest {
 
-import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-public class ListClientsForTopicTest {
+  @Test
+  public void shouldListClientsForTopic() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    List<String> expectedResponse = Arrays.asList("Smurfs", "Admins");
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName())
+                .withOwner(new OwnerId("Plaintext", "Smurfs"))
+                .build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName())
+                .withOwner(new OwnerId("Plaintext", "Admins"))
+                .build());
+
+    // then
+    assertThat(listClientsForTopic(topic.getQualifiedName()))
+        .containsExactlyInAnyOrderElementsOf(expectedResponse);
+  }
+
+  @Test
+  public void shouldListClientsForTopicWithoutRepeating() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName())
+                .withOwner(new OwnerId("Plaintext", "Team A"))
+                .build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName())
+                .withOwner(new OwnerId("Plaintext", "Team A"))
+                .build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName())
+                .withOwner(new OwnerId("Plaintext", "Team B"))
+                .build());
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName())
+                .withOwner(new OwnerId("Plaintext", "Team B"))
+                .build());
+    List<String> expectedResponse = Arrays.asList("Team A", "Team B");
+
+    // then
+    assertThat(listClientsForTopic(topic.getQualifiedName()))
+        .containsExactlyInAnyOrderElementsOf(expectedResponse);
+  }
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @Test
-    public void shouldListClientsForTopic() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        List<String> expectedResponse = Arrays.asList("Smurfs", "Admins");
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "Smurfs")).build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "Admins")).build());
-
-        // then
-        assertThat(listClientsForTopic(topic.getQualifiedName())).containsExactlyInAnyOrderElementsOf(expectedResponse);
-    }
-
-    @Test
-    public void shouldListClientsForTopicWithoutRepeating() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "Team A")).build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "Team A")).build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "Team B")).build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "Team B")).build());
-        List<String> expectedResponse = Arrays.asList("Team A", "Team B");
-
-        // then
-        assertThat(listClientsForTopic(topic.getQualifiedName())).containsExactlyInAnyOrderElementsOf(expectedResponse);
-    }
-
-    private List<String> listClientsForTopic(String topicQualifiedName) {
-        return Arrays.asList(Objects.requireNonNull(
-                hermes.api().getAllTopicClients(topicQualifiedName)
-                        .expectStatus()
-                        .is2xxSuccessful()
-                        .expectBody(String[].class)
-                        .returnResult()
-                        .getResponseBody())
-        );
-    }
+  private List<String> listClientsForTopic(String topicQualifiedName) {
+    return Arrays.asList(
+        Objects.requireNonNull(
+            hermes
+                .api()
+                .getAllTopicClients(topicQualifiedName)
+                .expectStatus()
+                .is2xxSuccessful()
+                .expectBody(String[].class)
+                .returnResult()
+                .getResponseBody()));
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListSubscriptionForOwnerTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListSubscriptionForOwnerTest.java
index 2728ee6c74..a37b2aee86 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListSubscriptionForOwnerTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListSubscriptionForOwnerTest.java
@@ -1,5 +1,12 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -9,95 +16,149 @@
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class ListSubscriptionForOwnerTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    private static Topic topic;
-
-    @BeforeAll
-    public static void createTopic() {
-        topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-    }
-
-    @Test
-    public void shouldListSubscriptionsForOwnerId() {
-        // given
-        Subscription subscription1 = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team A")).build());
-        Subscription subscription2 = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team A")).build());
-        Subscription subscription3 = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team B")).build());
-
-        // then
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team A")).containsExactly(subscription1.getName(), subscription2.getName());
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team B")).containsExactly(subscription3.getName());
-    }
-
-    @Test
-    public void shouldListSubscriptionAfterNewSubscriptionIsAdded() {
-        // given
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team C")).isEmpty();
-
-        // when
-        Subscription subscription = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team C")).build());
-
-        // then
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team C")).containsExactly(subscription.getName());
-    }
-
-    @Test
-    public void shouldListSubscriptionAfterOwnerIsChanged() {
-        // given
-        Subscription subscription = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team D")).build());
-
-        // then
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team D")).containsExactly(subscription.getName());
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team E")).isEmpty();
-
-        // when
-        hermes.api().updateSubscription(topic, subscription.getName(),
-                PatchData.patchData().set("owner", new OwnerId("Plaintext", "ListSubForOwner - Team E")).build());
-
-        // then
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team D")).isEmpty();
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team E")).containsExactly(subscription.getName());
-    }
-
-    @Test
-    public void shouldNotListTopicAfterIsDeleted() {
-        // given
-        Subscription subscription1 = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team F")).build());
-        Subscription subscription2 = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team G")).build());
-
-        // then
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team F")).containsExactly(subscription1.getName());
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team G")).containsExactly(subscription2.getName());
-
-        // when
-        hermes.api().deleteSubscription(topic.getQualifiedName(), subscription1.getName()).expectStatus().is2xxSuccessful();
-
-        // then
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team F")).isEmpty();
-        assertThat(listSubscriptionsForOwner("ListSubForOwner - Team G")).containsExactly(subscription2.getName());
-    }
-
-    private List<String> listSubscriptionsForOwner(String ownerId) {
-        return Objects.requireNonNull(hermes.api().getSubscriptionsForOwner("Plaintext", ownerId)
-                        .expectStatus()
-                        .is2xxSuccessful()
-                        .expectBodyList(Subscription.class)
-                        .returnResult()
-                        .getResponseBody())
-                .stream()
-                .map(Subscription::getName)
-                .collect(Collectors.toList());
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  private static Topic topic;
+
+  @BeforeAll
+  public static void createTopic() {
+    topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+  }
+
+  @Test
+  public void shouldListSubscriptionsForOwnerId() {
+    // given
+    Subscription subscription1 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team A"))
+                    .build());
+    Subscription subscription2 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team A"))
+                    .build());
+    Subscription subscription3 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team B"))
+                    .build());
+
+    // then
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team A"))
+        .containsOnly(subscription1.getName(), subscription2.getName());
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team B"))
+        .containsExactly(subscription3.getName());
+  }
+
+  @Test
+  public void shouldListSubscriptionAfterNewSubscriptionIsAdded() {
+    // given
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team C")).isEmpty();
+
+    // when
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team C"))
+                    .build());
+
+    // then
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team C"))
+        .containsExactly(subscription.getName());
+  }
+
+  @Test
+  public void shouldListSubscriptionAfterOwnerIsChanged() {
+    // given
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team D"))
+                    .build());
+
+    // then
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team D"))
+        .containsExactly(subscription.getName());
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team E")).isEmpty();
+
+    // when
+    hermes
+        .api()
+        .updateSubscription(
+            topic,
+            subscription.getName(),
+            PatchData.patchData()
+                .set("owner", new OwnerId("Plaintext", "ListSubForOwner - Team E"))
+                .build());
+
+    // then
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team D")).isEmpty();
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team E"))
+        .containsExactly(subscription.getName());
+  }
+
+  @Test
+  public void shouldNotListTopicAfterIsDeleted() {
+    // given
+    Subscription subscription1 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team F"))
+                    .build());
+    Subscription subscription2 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withOwner(new OwnerId("Plaintext", "ListSubForOwner - Team G"))
+                    .build());
+
+    // then
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team F"))
+        .containsExactly(subscription1.getName());
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team G"))
+        .containsExactly(subscription2.getName());
+
+    // when
+    hermes
+        .api()
+        .deleteSubscription(topic.getQualifiedName(), subscription1.getName())
+        .expectStatus()
+        .is2xxSuccessful();
+
+    // then
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team F")).isEmpty();
+    assertThat(listSubscriptionsForOwner("ListSubForOwner - Team G"))
+        .containsExactly(subscription2.getName());
+  }
+
+  private List<String> listSubscriptionsForOwner(String ownerId) {
+    return Objects.requireNonNull(
+            hermes
+                .api()
+                .getSubscriptionsForOwner("Plaintext", ownerId)
+                .expectStatus()
+                .is2xxSuccessful()
+                .expectBodyList(Subscription.class)
+                .returnResult()
+                .getResponseBody())
+        .stream()
+        .map(Subscription::getName)
+        .collect(Collectors.toList());
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListTopicForOwnerTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListTopicForOwnerTest.java
index d765a59bc1..ab74274be6 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListTopicForOwnerTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListTopicForOwnerTest.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.OwnerId;
@@ -7,83 +13,124 @@
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class ListTopicForOwnerTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @Test
-    public void shouldListTopicsForOwnerId() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team A")).build());
-        Topic topic2 = hermes.initHelper().createTopic(topicWithRandomName().withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team A")).build());
-        Topic topic3 = hermes.initHelper().createTopic(topicWithRandomName().withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team B")).build());
-
-        // expect
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team A")).containsExactly(topic.getQualifiedName(), topic2.getQualifiedName());
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team B")).containsExactly(topic3.getQualifiedName());
-    }
-
-    @Test
-    public void shouldListTopicAfterNewTopicIsAdded() {
-        // expect empty list on start
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team C")).isEmpty();
-
-        // when
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team C")).build());
-
-        // then
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team C")).containsExactly(topic.getQualifiedName());
-    }
-
-    @Test
-    public void shouldListTopicAfterOwnerIsChanged() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team D")).build());
-
-        // then
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team D")).containsExactly(topic.getQualifiedName());
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team E")).isEmpty();
-
-        // when
-        hermes.api().updateTopic(topic.getQualifiedName(),
-                PatchData.patchData().set("owner", new OwnerId("Plaintext", "ListTopicForOwner - Team E")).build());
-
-        // then
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team D")).isEmpty();
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team E")).containsExactly(topic.getQualifiedName());
-    }
-
-    @Test
-    public void shouldNotListTopicAfterTopicIsDeleted() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team F")).build());
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team F")).containsExactly(topic.getQualifiedName());
-
-        // when
-        hermes.api().deleteTopic(topic.getQualifiedName()).expectStatus().is2xxSuccessful();
-
-        // then
-        assertThat(listTopicsForOwner("ListTopicForOwner - Team F")).isEmpty();
-    }
-
-    private List<String> listTopicsForOwner(String ownerId) {
-        return Objects.requireNonNull(hermes.api().getTopicsForOwner("Plaintext", ownerId)
-                        .expectStatus()
-                        .is2xxSuccessful()
-                        .expectBodyList(Topic.class)
-                        .returnResult()
-                        .getResponseBody())
-                .stream()
-                .map(Topic::getQualifiedName)
-                .collect(Collectors.toList());
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldListTopicsForOwnerId() {
+    // given
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName()
+                    .withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team A"))
+                    .build());
+    Topic topic2 =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName()
+                    .withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team A"))
+                    .build());
+    Topic topic3 =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName()
+                    .withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team B"))
+                    .build());
+
+    // expect
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team A"))
+        .containsExactly(topic.getQualifiedName(), topic2.getQualifiedName());
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team B"))
+        .containsExactly(topic3.getQualifiedName());
+  }
+
+  @Test
+  public void shouldListTopicAfterNewTopicIsAdded() {
+    // expect empty list on start
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team C")).isEmpty();
+
+    // when
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName()
+                    .withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team C"))
+                    .build());
+
+    // then
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team C"))
+        .containsExactly(topic.getQualifiedName());
+  }
+
+  @Test
+  public void shouldListTopicAfterOwnerIsChanged() {
+    // given
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName()
+                    .withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team D"))
+                    .build());
+
+    // then
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team D"))
+        .containsExactly(topic.getQualifiedName());
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team E")).isEmpty();
+
+    // when
+    hermes
+        .api()
+        .updateTopic(
+            topic.getQualifiedName(),
+            PatchData.patchData()
+                .set("owner", new OwnerId("Plaintext", "ListTopicForOwner - Team E"))
+                .build());
+
+    // then
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team D")).isEmpty();
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team E"))
+        .containsExactly(topic.getQualifiedName());
+  }
+
+  @Test
+  public void shouldNotListTopicAfterTopicIsDeleted() {
+    // given
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName()
+                    .withOwner(new OwnerId("Plaintext", "ListTopicForOwner - Team F"))
+                    .build());
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team F"))
+        .containsExactly(topic.getQualifiedName());
+
+    // when
+    hermes.api().deleteTopic(topic.getQualifiedName()).expectStatus().is2xxSuccessful();
+
+    // then
+    assertThat(listTopicsForOwner("ListTopicForOwner - Team F")).isEmpty();
+  }
+
+  private List<String> listTopicsForOwner(String ownerId) {
+    return Objects.requireNonNull(
+            hermes
+                .api()
+                .getTopicsForOwner("Plaintext", ownerId)
+                .expectStatus()
+                .is2xxSuccessful()
+                .expectBodyList(Topic.class)
+                .returnResult()
+                .getResponseBody())
+        .stream()
+        .map(Topic::getQualifiedName)
+        .collect(Collectors.toList());
+  }
 }
-
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListUnhealthySubscriptionsForOwnerTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListUnhealthySubscriptionsForOwnerTest.java
index c5a24d86cd..924ca0f593 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListUnhealthySubscriptionsForOwnerTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ListUnhealthySubscriptionsForOwnerTest.java
@@ -1,5 +1,15 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.MonitoringDetails.Severity;
+import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.malfunctioning;
+import static pl.allegro.tech.hermes.integrationtests.prometheus.SubscriptionMetrics.subscriptionMetrics;
+import static pl.allegro.tech.hermes.integrationtests.prometheus.TopicMetrics.topicMetrics;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Duration;
+import java.util.Set;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Order;
@@ -14,374 +24,332 @@
 import pl.allegro.tech.hermes.integrationtests.prometheus.PrometheusExtension;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 
-import java.time.Duration;
-import java.util.Set;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.MonitoringDetails.Severity;
-import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.malfunctioning;
-import static pl.allegro.tech.hermes.integrationtests.prometheus.SubscriptionMetrics.subscriptionMetrics;
-import static pl.allegro.tech.hermes.integrationtests.prometheus.TopicMetrics.topicMetrics;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class ListUnhealthySubscriptionsForOwnerTest {
 
-    @Order(0)
-    @RegisterExtension
-    public static final PrometheusExtension prometheus = new PrometheusExtension();
+  @Order(0)
+  @RegisterExtension
+  public static final PrometheusExtension prometheus = new PrometheusExtension();
 
-    @Order(1)
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension()
-            .withPrometheus(prometheus);
+  @Order(1)
+  @RegisterExtension
+  public static final HermesExtension hermes = new HermesExtension().withPrometheus(prometheus);
 
-    @BeforeAll
-    static void setup() {
-        hermes.clearManagementData();
-    }
+  @BeforeAll
+  static void setup() {
+    hermes.clearManagementData();
+  }
 
-    @AfterEach
-    void cleanup() {
-        hermes.clearManagementData();
-    }
+  @AfterEach
+  void cleanup() {
+    hermes.clearManagementData();
+  }
 
-    @Test
-    public void shouldNotListHealthySubscriptions() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription healthySubscription = createSubscriptionOwnedBy("Team A", topic);
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic.getName())
-                        .withRate(100)
-                        .withDeliveryRate(100)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(healthySubscription.getQualifiedName())
-                        .withRate(100)
-                        .build()
-        );
+  @Test
+  public void shouldNotListHealthySubscriptions() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription healthySubscription = createSubscriptionOwnedBy("Team A", topic);
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName()).withRate(100).withDeliveryRate(100).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(healthySubscription.getQualifiedName()).withRate(100).build());
 
-        // when / then
-        hermes.api().listUnhealthyForOwner("Team A")
-                .expectStatus()
-                .isOk()
-                .expectBodyList(UnhealthySubscription.class)
-                .hasSize(0);
-        hermes.api().listUnhealthyForOwnerAsPlainText("Team A")
-                .expectStatus()
-                .isOk()
-                .expectBody()
-                .isEmpty();
-    }
+    // when / then
+    hermes
+        .api()
+        .listUnhealthyForOwner("Team A")
+        .expectStatus()
+        .isOk()
+        .expectBodyList(UnhealthySubscription.class)
+        .hasSize(0);
+    hermes
+        .api()
+        .listUnhealthyForOwnerAsPlainText("Team A")
+        .expectStatus()
+        .isOk()
+        .expectBody()
+        .isEmpty();
+  }
 
-    @Test
-    public void shouldReturnOnlyUnhealthySubscriptionOfSingleOwner() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription healthySubscription = createSubscriptionOwnedBy("Team A", topic);
-        Subscription unhealthySubscription = createSubscriptionOwnedBy("Team A", topic);
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic.getName())
-                        .withRate(100)
-                        .withDeliveryRate(50)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(healthySubscription.getQualifiedName())
-                        .withRate(100)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(unhealthySubscription.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
+  @Test
+  public void shouldReturnOnlyUnhealthySubscriptionOfSingleOwner() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription healthySubscription = createSubscriptionOwnedBy("Team A", topic);
+    Subscription unhealthySubscription = createSubscriptionOwnedBy("Team A", topic);
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName()).withRate(100).withDeliveryRate(50).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(healthySubscription.getQualifiedName()).withRate(100).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(unhealthySubscription.getQualifiedName())
+            .withRate(50)
+            .with500Rate(11)
+            .build());
 
-        // when / then
-        hermes.api().listUnhealthyForOwner("Team A")
-                .expectStatus()
-                .isOk()
-                .expectBodyList(UnhealthySubscription.class)
-                .contains(malfunctioningSubscription(unhealthySubscription, 11));
-        hermes.api().listUnhealthyForOwnerAsPlainText("Team A")
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .isEqualTo("%s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"
-                        .formatted(unhealthySubscription.getName(), unhealthySubscription.getQualifiedName().toString())
-                );
-    }
+    // when / then
+    hermes
+        .api()
+        .listUnhealthyForOwner("Team A")
+        .expectStatus()
+        .isOk()
+        .expectBodyList(UnhealthySubscription.class)
+        .contains(malfunctioningSubscription(unhealthySubscription, 11));
+    hermes
+        .api()
+        .listUnhealthyForOwnerAsPlainText("Team A")
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .isEqualTo(
+            "%s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"
+                .formatted(
+                    unhealthySubscription.getName(),
+                    unhealthySubscription.getQualifiedName().toString()));
+  }
 
-    @Test
-    public void shouldReportAllUnhealthySubscriptions() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription healthySubscription = createSubscriptionOwnedBy("Team A", topic);
-        Subscription unhealthySubscription = createSubscriptionOwnedBy("Team A", topic);
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic.getName())
-                        .withRate(100)
-                        .withDeliveryRate(50)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(healthySubscription.getQualifiedName())
-                        .withRate(100)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(unhealthySubscription.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
+  @Test
+  public void shouldReportAllUnhealthySubscriptions() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription healthySubscription = createSubscriptionOwnedBy("Team A", topic);
+    Subscription unhealthySubscription = createSubscriptionOwnedBy("Team A", topic);
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName()).withRate(100).withDeliveryRate(50).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(healthySubscription.getQualifiedName()).withRate(100).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(unhealthySubscription.getQualifiedName())
+            .withRate(50)
+            .with500Rate(11)
+            .build());
 
-        // when / then
-        hermes.api().listUnhealthy()
-                .expectStatus()
-                .isOk()
-                .expectBodyList(UnhealthySubscription.class)
-                .contains(malfunctioningSubscription(unhealthySubscription, 11));
-        hermes.api().listUnhealthyAsPlainText()
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .isEqualTo("%s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"
-                        .formatted(unhealthySubscription.getName(), unhealthySubscription.getQualifiedName().toString())
-                );
-    }
+    // when / then
+    hermes
+        .api()
+        .listUnhealthy()
+        .expectStatus()
+        .isOk()
+        .expectBodyList(UnhealthySubscription.class)
+        .contains(malfunctioningSubscription(unhealthySubscription, 11));
+    hermes
+        .api()
+        .listUnhealthyAsPlainText()
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .isEqualTo(
+            "%s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"
+                .formatted(
+                    unhealthySubscription.getName(),
+                    unhealthySubscription.getQualifiedName().toString()));
+  }
 
-    @Test
-    public void shouldReturnUnhealthySubscriptionsFilteredByTopic() {
-        // given
-        Topic topic1 = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Topic topic2 = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription unhealthySubscriptionTopic1 = createSubscriptionOwnedBy("Team A", topic1);
-        Subscription unhealthySubscriptionTopic2 = createSubscriptionOwnedBy("Team A", topic2);
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic1.getName())
-                        .withRate(100)
-                        .withDeliveryRate(50)
-                        .build()
-        );
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic2.getName())
-                        .withRate(100)
-                        .withDeliveryRate(50)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(unhealthySubscriptionTopic1.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(unhealthySubscriptionTopic2.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
+  @Test
+  public void shouldReturnUnhealthySubscriptionsFilteredByTopic() {
+    // given
+    Topic topic1 = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Topic topic2 = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription unhealthySubscriptionTopic1 = createSubscriptionOwnedBy("Team A", topic1);
+    Subscription unhealthySubscriptionTopic2 = createSubscriptionOwnedBy("Team A", topic2);
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic1.getName()).withRate(100).withDeliveryRate(50).build());
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic2.getName()).withRate(100).withDeliveryRate(50).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(unhealthySubscriptionTopic1.getQualifiedName())
+            .withRate(50)
+            .with500Rate(11)
+            .build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(unhealthySubscriptionTopic2.getQualifiedName())
+            .withRate(50)
+            .with500Rate(11)
+            .build());
 
-        // when / then
-        hermes.api().listUnhealthyForTopic(topic2.getQualifiedName())
-                .expectStatus()
-                .isOk()
-                .expectBodyList(UnhealthySubscription.class)
-                .contains(malfunctioningSubscription(unhealthySubscriptionTopic2, 11));
-        hermes.api().listUnhealthyForTopicAsPlainText(topic2.getQualifiedName())
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .isEqualTo("%s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"
-                        .formatted(unhealthySubscriptionTopic2.getName(), unhealthySubscriptionTopic2.getQualifiedName().toString())
-                );
-    }
+    // when / then
+    hermes
+        .api()
+        .listUnhealthyForTopic(topic2.getQualifiedName())
+        .expectStatus()
+        .isOk()
+        .expectBodyList(UnhealthySubscription.class)
+        .contains(malfunctioningSubscription(unhealthySubscriptionTopic2, 11));
+    hermes
+        .api()
+        .listUnhealthyForTopicAsPlainText(topic2.getQualifiedName())
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .isEqualTo(
+            "%s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"
+                .formatted(
+                    unhealthySubscriptionTopic2.getName(),
+                    unhealthySubscriptionTopic2.getQualifiedName().toString()));
+  }
 
-    @Test
-    public void shouldReturnSpecificUnhealthySubscription() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription healthySubscription = createSubscriptionOwnedBy("Team A", topic);
-        Subscription unhealthySubscription = createSubscriptionOwnedBy("Team A", topic);
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic.getName())
-                        .withRate(100)
-                        .withDeliveryRate(50)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(healthySubscription.getQualifiedName())
-                        .withRate(100)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(unhealthySubscription.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
+  @Test
+  public void shouldReturnSpecificUnhealthySubscription() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription healthySubscription = createSubscriptionOwnedBy("Team A", topic);
+    Subscription unhealthySubscription = createSubscriptionOwnedBy("Team A", topic);
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName()).withRate(100).withDeliveryRate(50).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(healthySubscription.getQualifiedName()).withRate(100).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(unhealthySubscription.getQualifiedName())
+            .withRate(50)
+            .with500Rate(11)
+            .build());
 
-        // when / then
-        hermes.api().listUnhealthyForSubscription(topic.getQualifiedName(), healthySubscription.getName())
-                .expectStatus()
-                .isOk()
-                .expectBodyList(UnhealthySubscription.class)
-                .hasSize(0);
-        hermes.api().listUnhealthyForSubscriptionAsPlainText(topic.getQualifiedName(), healthySubscription.getName())
-                .expectStatus()
-                .isOk()
-                .expectBody()
-                .isEmpty();
-        hermes.api().listUnhealthyForSubscription(topic.getQualifiedName(), unhealthySubscription.getName())
-                .expectStatus()
-                .isOk()
-                .expectBodyList(UnhealthySubscription.class)
-                .contains(malfunctioningSubscription(unhealthySubscription, 11));
-        hermes.api().listUnhealthyForSubscriptionAsPlainText(topic.getQualifiedName(), unhealthySubscription.getName())
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .isEqualTo("%s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"
-                        .formatted(unhealthySubscription.getName(), unhealthySubscription.getQualifiedName().toString())
-                );
-    }
+    // when / then
+    hermes
+        .api()
+        .listUnhealthyForSubscription(topic.getQualifiedName(), healthySubscription.getName())
+        .expectStatus()
+        .isOk()
+        .expectBodyList(UnhealthySubscription.class)
+        .hasSize(0);
+    hermes
+        .api()
+        .listUnhealthyForSubscriptionAsPlainText(
+            topic.getQualifiedName(), healthySubscription.getName())
+        .expectStatus()
+        .isOk()
+        .expectBody()
+        .isEmpty();
+    hermes
+        .api()
+        .listUnhealthyForSubscription(topic.getQualifiedName(), unhealthySubscription.getName())
+        .expectStatus()
+        .isOk()
+        .expectBodyList(UnhealthySubscription.class)
+        .contains(malfunctioningSubscription(unhealthySubscription, 11));
+    hermes
+        .api()
+        .listUnhealthyForSubscriptionAsPlainText(
+            topic.getQualifiedName(), unhealthySubscription.getName())
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .isEqualTo(
+            "%s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"
+                .formatted(
+                    unhealthySubscription.getName(),
+                    unhealthySubscription.getQualifiedName().toString()));
+  }
 
-    @Test
-    public void shouldReportUnhealthySubscriptionsDisrespectingSeverity() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription1 = createSubscriptionOwnedBy("Team A", topic, Severity.CRITICAL);
-        Subscription subscription2 = createSubscriptionOwnedBy("Team A", topic, Severity.IMPORTANT);
-        Subscription subscription3 = createSubscriptionOwnedBy("Team A", topic, Severity.NON_IMPORTANT);
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic.getName())
-                        .withRate(100)
-                        .withDeliveryRate(50)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(subscription1.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(subscription2.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(subscription3.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
+  @Test
+  public void shouldReportUnhealthySubscriptionsDisrespectingSeverity() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription1 = createSubscriptionOwnedBy("Team A", topic, Severity.CRITICAL);
+    Subscription subscription2 = createSubscriptionOwnedBy("Team A", topic, Severity.IMPORTANT);
+    Subscription subscription3 = createSubscriptionOwnedBy("Team A", topic, Severity.NON_IMPORTANT);
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName()).withRate(100).withDeliveryRate(50).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(subscription1.getQualifiedName()).withRate(50).with500Rate(11).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(subscription2.getQualifiedName()).withRate(50).with500Rate(11).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(subscription3.getQualifiedName()).withRate(50).with500Rate(11).build());
 
-        // when / then
-        hermes.api().listUnhealthyForOwner("Team A")
-                .expectStatus()
-                .isOk()
-                .expectBodyList(UnhealthySubscription.class)
-                .contains(
-                        malfunctioningSubscription(subscription1, 11),
-                        malfunctioningSubscription(subscription2, 11),
-                        malfunctioningSubscription(subscription3, 11)
-                );
-        hermes.api().listUnhealthyForOwnerAsPlainText("Team A")
-                .expectStatus()
-                .isOk()
-                .expectBody(String.class)
-                .isEqualTo("""
+    // when / then
+    hermes
+        .api()
+        .listUnhealthyForOwner("Team A")
+        .expectStatus()
+        .isOk()
+        .expectBodyList(UnhealthySubscription.class)
+        .contains(
+            malfunctioningSubscription(subscription1, 11),
+            malfunctioningSubscription(subscription2, 11),
+            malfunctioningSubscription(subscription3, 11));
+    hermes
+        .api()
+        .listUnhealthyForOwnerAsPlainText("Team A")
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .isEqualTo(
+            """
                         %s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s\r
                         %s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s\r
                         %s - Consuming service returns a lot of 5xx codes for subscription %s, currently 11 5xx/s"""
-                        .formatted(
-                                subscription1.getName(), subscription1.getQualifiedName().toString(),
-                                subscription2.getName(), subscription2.getQualifiedName().toString(),
-                                subscription3.getName(), subscription3.getQualifiedName().toString()
-                        )
-                );
-    }
+                .formatted(
+                    subscription1.getName(), subscription1.getQualifiedName().toString(),
+                    subscription2.getName(), subscription2.getQualifiedName().toString(),
+                    subscription3.getName(), subscription3.getQualifiedName().toString()));
+  }
 
-    @Test
-    public void shouldTimeoutUnhealthySubscriptionsRequest() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        createSubscriptionOwnedBy("Team A", topic);
-        prometheus.stubDelay(Duration.ofMillis(3000));
+  @Test
+  public void shouldTimeoutUnhealthySubscriptionsRequest() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    createSubscriptionOwnedBy("Team A", topic);
+    prometheus.stubDelay(Duration.ofMillis(3000));
 
-        // when
-        long start = System.currentTimeMillis();
-        WebTestClient.ResponseSpec response = hermes.api().listUnhealthyAsPlainText();
-        long end = System.currentTimeMillis();
+    // when
+    long start = System.currentTimeMillis();
+    WebTestClient.ResponseSpec response = hermes.api().listUnhealthyAsPlainText();
+    long end = System.currentTimeMillis();
 
-        // then
-        response.expectStatus()
-                .isOk()
-                .expectBody()
-                .isEmpty();
-        assertThat(end - start).isLessThan(3000);
-    }
+    // then
+    response.expectStatus().isOk().expectBody().isEmpty();
+    assertThat(end - start).isLessThan(3000);
+  }
 
-    @Test
-    public void shouldReportSuspendedSubscriptionAsHealthy() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription unhealthySubscription = createSubscriptionOwnedBy("Team A", topic);
-        prometheus.stubTopicMetrics(
-                topicMetrics(topic.getName())
-                        .withRate(100)
-                        .withDeliveryRate(50)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(unhealthySubscription.getQualifiedName())
-                        .withRate(50)
-                        .with500Rate(11)
-                        .build()
-        );
+  @Test
+  public void shouldReportSuspendedSubscriptionAsHealthy() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription unhealthySubscription = createSubscriptionOwnedBy("Team A", topic);
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName()).withRate(100).withDeliveryRate(50).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(unhealthySubscription.getQualifiedName())
+            .withRate(50)
+            .with500Rate(11)
+            .build());
 
-        // when
-        hermes.api().suspendSubscription(topic, unhealthySubscription.getName());
+    // when
+    hermes.api().suspendSubscription(topic, unhealthySubscription.getName());
 
-        // then
-        hermes.api().listUnhealthy()
-                .expectStatus()
-                .isOk()
-                .expectBodyList(UnhealthySubscription.class)
-                .hasSize(0);
-        hermes.api().listUnhealthyAsPlainText()
-                .expectStatus()
-                .isOk()
-                .expectBody()
-                .isEmpty();
-    }
+    // then
+    hermes
+        .api()
+        .listUnhealthy()
+        .expectStatus()
+        .isOk()
+        .expectBodyList(UnhealthySubscription.class)
+        .hasSize(0);
+    hermes.api().listUnhealthyAsPlainText().expectStatus().isOk().expectBody().isEmpty();
+  }
 
-    private Subscription createSubscriptionOwnedBy(String ownerId, Topic topic) {
-        return createSubscriptionOwnedBy(ownerId, topic, Severity.IMPORTANT);
-    }
+  private Subscription createSubscriptionOwnedBy(String ownerId, Topic topic) {
+    return createSubscriptionOwnedBy(ownerId, topic, Severity.IMPORTANT);
+  }
 
-    private Subscription createSubscriptionOwnedBy(String ownerId, Topic topic, Severity severity) {
-        return hermes.initHelper().createSubscription(
-                subscriptionWithRandomName(topic.getName())
-                        .withOwner(new OwnerId("Plaintext", ownerId))
-                        .withMonitoringDetails(new MonitoringDetails(severity, ""))
-                        .withEndpoint("http://localhost:8080")
-                        .build()
-        );
-    }
+  private Subscription createSubscriptionOwnedBy(String ownerId, Topic topic, Severity severity) {
+    return hermes
+        .initHelper()
+        .createSubscription(
+            subscriptionWithRandomName(topic.getName())
+                .withOwner(new OwnerId("Plaintext", ownerId))
+                .withMonitoringDetails(new MonitoringDetails(severity, ""))
+                .withEndpoint("http://localhost:8080")
+                .build());
+  }
 
-    private static UnhealthySubscription malfunctioningSubscription(Subscription subscription, double code5xxErrorsRate) {
-        return new UnhealthySubscription(
-                subscription.getName(),
-                subscription.getTopicName().qualifiedName(),
-                subscription.getMonitoringDetails().getSeverity(),
-                Set.of(malfunctioning(code5xxErrorsRate, subscription.getQualifiedName().toString()))
-        );
-    }
+  private static UnhealthySubscription malfunctioningSubscription(
+      Subscription subscription, double code5xxErrorsRate) {
+    return new UnhealthySubscription(
+        subscription.getName(),
+        subscription.getTopicName().qualifiedName(),
+        subscription.getMonitoringDetails().getSeverity(),
+        Set.of(malfunctioning(code5xxErrorsRate, subscription.getQualifiedName().toString())));
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/MessagePreviewIntegrationTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/MessagePreviewIntegrationTest.java
index 1206a16e80..b3fe546b85 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/MessagePreviewIntegrationTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/MessagePreviewIntegrationTest.java
@@ -1,5 +1,14 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Duration;
+import java.util.List;
 import net.javacrumbs.jsonunit.core.Option;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -9,46 +18,43 @@
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class MessagePreviewIntegrationTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @Test
-    public void shouldReturnAvroMessageWithSchemaAwareSerialization() {
-        // given
-        AvroUser avroUser = new AvroUser("Bob", 50, "blue");
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .withSchemaIdAwareSerialization()
-                .build(), avroUser.getSchemaAsString());
-
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
-
-        hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), avroUser.asBytes());
-
-        await().atMost(10, TimeUnit.SECONDS).until(() -> {
-                    // when
-                    List<MessageTextPreview> previews = hermes.api().getPreview(topic.getQualifiedName())
-                            .expectStatus().isOk()
-                            .expectBodyList(MessageTextPreview.class).returnResult().getResponseBody();
-
-                    // then
-                    assertThat(previews).hasSize(1);
-                    assertThatJson(previews.get(0).getContent())
-                            .when(Option.IGNORING_EXTRA_FIELDS)
-                            .isEqualTo(avroUser.asJson());
-                }
-        );
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldReturnAvroMessageWithSchemaAwareSerialization() {
+    // given
+    AvroUser avroUser = new AvroUser("Bob", 50, "blue");
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).withSchemaIdAwareSerialization().build(),
+            avroUser.getSchemaAsString());
+
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+
+    hermes.api().publishAvroUntilSuccess(topic.getQualifiedName(), avroUser.asBytes());
+
+    await()
+        .atMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> {
+              // when
+              List<MessageTextPreview> previews =
+                  hermes
+                      .api()
+                      .getPreview(topic.getQualifiedName())
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(MessageTextPreview.class)
+                      .returnResult()
+                      .getResponseBody();
+
+              // then
+              assertThat(previews).hasSize(1);
+              assertThatJson(previews.get(0).getContent())
+                  .when(Option.IGNORING_EXTRA_FIELDS)
+                  .isEqualTo(avroUser.asJson());
+            });
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/OAuthProviderManagementTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/OAuthProviderManagementTest.java
index dec298de98..4bc203518f 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/OAuthProviderManagementTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/OAuthProviderManagementTest.java
@@ -1,5 +1,9 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.PatchData.patchData;
+import static pl.allegro.tech.hermes.test.helper.builder.OAuthProviderBuilder.oAuthProvider;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient.ResponseSpec;
@@ -9,84 +13,101 @@
 import pl.allegro.tech.hermes.api.PatchData;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.PatchData.patchData;
-import static pl.allegro.tech.hermes.test.helper.builder.OAuthProviderBuilder.oAuthProvider;
-
 public class OAuthProviderManagementTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @Test
-    public void shouldCreateOAuthProvider() {
-        // given
-        OAuthProvider oAuthProvider = oAuthProvider("myProvider").withSocketTimeout(200).build();
-
-        // when
-        ResponseSpec response = hermes.api().createOAuthProvider(oAuthProvider);
-
-        // then
-        response.expectStatus().isCreated();
-        OAuthProvider createdProvider = hermes.api().getOAuthProvider(oAuthProvider.getName())
-                .expectStatus().isOk()
-                .expectBody(OAuthProvider.class).returnResult().getResponseBody();
-        assertThat(createdProvider).isNotNull();
-        assertThat(createdProvider.getSocketTimeout()).isEqualTo(200);
-    }
-
-    @Test
-    public void shouldNotAllowCreatingTheSameOAuthProviderTwice() {
-        // given
-        OAuthProvider oAuthProvider = oAuthProvider("originalProvider").build();
-        hermes.initHelper().createOAuthProvider(oAuthProvider);
-
-        // when
-        ResponseSpec secondTryResponse = hermes.api().createOAuthProvider(oAuthProvider);
-
-        // then
-        ErrorDescription error = secondTryResponse
-                .expectStatus().isBadRequest()
-                .expectBody(ErrorDescription.class).returnResult().getResponseBody();
-        assertThat(error).isNotNull();
-        assertThat(error.getCode()).isEqualTo(ErrorCode.OAUTH_PROVIDER_ALREADY_EXISTS);
-    }
-
-    @Test
-    public void shouldUpdateOAuthProvider() {
-        // given
-        OAuthProvider oAuthProvider = oAuthProvider("myOtherProvider").build();
-        hermes.initHelper().createOAuthProvider(oAuthProvider);
-
-        // when
-        PatchData patch = patchData()
-                .set("tokenEndpoint", "http://other.example.com/other")
-                .set("socketTimeout", 100).build();
-        ResponseSpec updateResponse = hermes.api().updateOAuthProvider(oAuthProvider.getName(), patch);
-
-        // then
-        updateResponse.expectStatus().isOk();
-        OAuthProvider updatedProvider = hermes.api().getOAuthProvider(oAuthProvider.getName())
-                .expectStatus().isOk()
-                .expectBody(OAuthProvider.class).returnResult().getResponseBody();
-        assertThat(updatedProvider).isNotNull();
-        assertThat(updatedProvider.getTokenEndpoint()).isEqualTo("http://other.example.com/other");
-        assertThat(updatedProvider.getSocketTimeout()).isEqualTo(100);
-    }
-
-    @Test
-    public void shouldRemoveOAuthProvider() {
-        // given
-        OAuthProvider oAuthProvider = oAuthProvider("myProviderForRemoval").build();
-        hermes.initHelper().createOAuthProvider(oAuthProvider);
-
-        // when
-        ResponseSpec removalResponse = hermes.api().removeOAuthProvider(oAuthProvider.getName());
-
-        // then
-        removalResponse.expectStatus().isOk();
-        hermes.api().listOAuthProvider()
-                .expectStatus().isOk()
-                .expectBodyList(String.class).doesNotContain(oAuthProvider.getName());
-    }
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldCreateOAuthProvider() {
+    // given
+    OAuthProvider oAuthProvider = oAuthProvider("myProvider").withSocketTimeout(200).build();
+
+    // when
+    ResponseSpec response = hermes.api().createOAuthProvider(oAuthProvider);
+
+    // then
+    response.expectStatus().isCreated();
+    OAuthProvider createdProvider =
+        hermes
+            .api()
+            .getOAuthProvider(oAuthProvider.getName())
+            .expectStatus()
+            .isOk()
+            .expectBody(OAuthProvider.class)
+            .returnResult()
+            .getResponseBody();
+    assertThat(createdProvider).isNotNull();
+    assertThat(createdProvider.getSocketTimeout()).isEqualTo(200);
+  }
+
+  @Test
+  public void shouldNotAllowCreatingTheSameOAuthProviderTwice() {
+    // given
+    OAuthProvider oAuthProvider = oAuthProvider("originalProvider").build();
+    hermes.initHelper().createOAuthProvider(oAuthProvider);
+
+    // when
+    ResponseSpec secondTryResponse = hermes.api().createOAuthProvider(oAuthProvider);
+
+    // then
+    ErrorDescription error =
+        secondTryResponse
+            .expectStatus()
+            .isBadRequest()
+            .expectBody(ErrorDescription.class)
+            .returnResult()
+            .getResponseBody();
+    assertThat(error).isNotNull();
+    assertThat(error.getCode()).isEqualTo(ErrorCode.OAUTH_PROVIDER_ALREADY_EXISTS);
+  }
+
+  @Test
+  public void shouldUpdateOAuthProvider() {
+    // given
+    OAuthProvider oAuthProvider = oAuthProvider("myOtherProvider").build();
+    hermes.initHelper().createOAuthProvider(oAuthProvider);
+
+    // when
+    PatchData patch =
+        patchData()
+            .set("tokenEndpoint", "http://other.example.com/other")
+            .set("socketTimeout", 100)
+            .build();
+    ResponseSpec updateResponse = hermes.api().updateOAuthProvider(oAuthProvider.getName(), patch);
+
+    // then
+    updateResponse.expectStatus().isOk();
+    OAuthProvider updatedProvider =
+        hermes
+            .api()
+            .getOAuthProvider(oAuthProvider.getName())
+            .expectStatus()
+            .isOk()
+            .expectBody(OAuthProvider.class)
+            .returnResult()
+            .getResponseBody();
+    assertThat(updatedProvider).isNotNull();
+    assertThat(updatedProvider.getTokenEndpoint()).isEqualTo("http://other.example.com/other");
+    assertThat(updatedProvider.getSocketTimeout()).isEqualTo(100);
+  }
+
+  @Test
+  public void shouldRemoveOAuthProvider() {
+    // given
+    OAuthProvider oAuthProvider = oAuthProvider("myProviderForRemoval").build();
+    hermes.initHelper().createOAuthProvider(oAuthProvider);
+
+    // when
+    ResponseSpec removalResponse = hermes.api().removeOAuthProvider(oAuthProvider.getName());
+
+    // then
+    removalResponse.expectStatus().isOk();
+    hermes
+        .api()
+        .listOAuthProvider()
+        .expectStatus()
+        .isOk()
+        .expectBodyList(String.class)
+        .doesNotContain(oAuthProvider.getName());
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/OfflineRetransmissionManagementTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/OfflineRetransmissionManagementTest.java
new file mode 100644
index 0000000000..f53fda8397
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/OfflineRetransmissionManagementTest.java
@@ -0,0 +1,273 @@
+package pl.allegro.tech.hermes.integrationtests.management;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Instant;
+import java.util.List;
+import org.jetbrains.annotations.Nullable;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import pl.allegro.tech.hermes.api.Group;
+import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
+import pl.allegro.tech.hermes.api.OfflineRetransmissionTask;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+import pl.allegro.tech.hermes.management.TestSecurityProvider;
+
+public class OfflineRetransmissionManagementTest {
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  private static final String GROUP = "pl.allegro.retransmission";
+
+  @BeforeAll
+  public static void setupGroup() {
+    hermes.initHelper().createGroup(Group.from(GROUP));
+  }
+
+  @AfterEach
+  public void cleanup() {
+    deleteTasks();
+  }
+
+  @Test
+  public void shouldCreateRetransmissionTask() {
+    // given
+    Topic sourceTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Topic targetTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    OfflineRetransmissionRequest request =
+        createRequest(sourceTopic.getQualifiedName(), targetTopic.getQualifiedName(), null);
+    WebTestClient.ResponseSpec response = hermes.api().createOfflineRetransmissionTask(request);
+    Instant now = Instant.now();
+
+    // then
+    response.expectStatus().isCreated();
+
+    // and
+    List<OfflineRetransmissionTask> allTasks = getOfflineRetransmissionTasks();
+    assertThat(allTasks.size()).isEqualTo(1);
+    assertThat(allTasks.get(0).getStartTimestamp()).isEqualTo(request.getStartTimestamp());
+    assertThat(allTasks.get(0).getEndTimestamp()).isEqualTo(request.getEndTimestamp());
+    assertThat(allTasks.get(0).getSourceTopic()).isEqualTo(request.getSourceTopic());
+    assertThat(allTasks.get(0).getTargetTopic()).isEqualTo(request.getTargetTopic());
+    assertThat(allTasks.get(0).getCreatedAt()).isBefore(now);
+  }
+
+  @Test
+  public void shouldCreateRetransmissionTaskWithViewInsteadTopic() {
+    // given
+    var targetTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    var request = createRequest(null, targetTopic.getQualifiedName(), "testViewPath");
+    var response = hermes.api().createOfflineRetransmissionTask(request);
+    var now = Instant.now();
+
+    // then
+    response.expectStatus().isCreated();
+
+    // and
+    var allTasks = getOfflineRetransmissionTasks();
+    assertThat(allTasks.size()).isEqualTo(1);
+    assertThat(allTasks.get(0).getStartTimestamp()).isEqualTo(request.getStartTimestamp());
+    assertThat(allTasks.get(0).getEndTimestamp()).isEqualTo(request.getEndTimestamp());
+    assertThat(allTasks.get(0).getSourceTopic()).isEmpty();
+    assertThat(allTasks.get(0).getSourceViewPath()).hasValue("testViewPath");
+    assertThat(allTasks.get(0).getTargetTopic()).isEqualTo(request.getTargetTopic());
+    assertThat(allTasks.get(0).getCreatedAt()).isBefore(now);
+  }
+
+  @Test
+  public void shouldReturnEmptyListIfThereAreNoTasks() {
+    // expect
+    assertThat(getOfflineRetransmissionTasks().size()).isEqualTo(0);
+  }
+
+  @Test
+  public void shouldReturnClientErrorWhenRequestingRetransmissionWithEmptyData() {
+    // given
+    OfflineRetransmissionRequest request =
+        new OfflineRetransmissionRequest(null, "", "", null, null);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createOfflineRetransmissionTask(request);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            List.of(
+                "must contain one defined source of retransmission data - source topic or source view",
+                "startTimestamp must not be null",
+                "endTimestamp must not be null"));
+  }
+
+  @Test
+  public void shouldReturnClientErrorWhenRequestingRetransmissionWithNotExistingSourceTopic() {
+    // given
+    Topic targetTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    OfflineRetransmissionRequest request =
+        createRequest("not.existing.sourceTopic", targetTopic.getQualifiedName(), null);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createOfflineRetransmissionTask(request);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("Source topic does not exist");
+  }
+
+  @Test
+  public void shouldReturnClientErrorWhenRequestingRetransmissionWithNotExistingTargetTopic() {
+    // given
+    Topic sourceTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    OfflineRetransmissionRequest request =
+        createRequest(sourceTopic.getQualifiedName(), "not.existing.targetTopic", null);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createOfflineRetransmissionTask(request);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("Target topic does not exist");
+  }
+
+  @Test
+  public void shouldReturnClientErrorWhenRequestingRetransmissionWithNegativeTimeRange() {
+    // given
+    Topic sourceTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Topic targetTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    OfflineRetransmissionRequest request =
+        new OfflineRetransmissionRequest(
+            null,
+            sourceTopic.getQualifiedName(),
+            targetTopic.getQualifiedName(),
+            Instant.now().toString(),
+            Instant.now().minusSeconds(1).toString());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createOfflineRetransmissionTask(request);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("End timestamp must be greater than start timestamp");
+  }
+
+  @Test
+  public void shouldReturnClientErrorWhenRequestingRetransmissionWithTargetTopicStoredOffline() {
+    // given
+    Topic sourceTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Topic targetTopic =
+        hermes.initHelper().createTopic(topicWithRandomName().withOfflineStorage(1).build());
+    OfflineRetransmissionRequest request =
+        createRequest(sourceTopic.getQualifiedName(), targetTopic.getQualifiedName(), null);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createOfflineRetransmissionTask(request);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("Target topic must not be stored offline");
+  }
+
+  @Test
+  public void shouldDeleteRetransmissionTask() {
+    // given
+    Topic sourceTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Topic targetTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    OfflineRetransmissionRequest request =
+        createRequest(sourceTopic.getQualifiedName(), targetTopic.getQualifiedName(), null);
+    hermes.api().createOfflineRetransmissionTask(request);
+
+    List<OfflineRetransmissionTask> allTasks = getOfflineRetransmissionTasks();
+    assertThat(allTasks.size()).isEqualTo(1);
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().deleteOfflineRetransmissionTask(allTasks.get(0).getTaskId());
+
+    // then
+    response.expectStatus().isOk();
+    assertThat(getOfflineRetransmissionTasks().size()).isEqualTo(0);
+  }
+
+  @Test
+  public void shouldReturnClientErrorWhenTryingToDeleteNotExistingRetransmissionTask() {
+    // when
+    String notExistingTaskId = "notExistingId";
+    WebTestClient.ResponseSpec response =
+        hermes.api().deleteOfflineRetransmissionTask(notExistingTaskId);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("Retransmission task with id " + notExistingTaskId + " does not exist.");
+  }
+
+  @Test
+  public void
+      shouldThrowAccessDeniedWhenTryingToCreateTaskWithoutPermissionsToSourceAndTargetTopics() {
+    // given
+    Topic sourceTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Topic targetTopic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSecurityProvider.setUserIsAdmin(false);
+    OfflineRetransmissionRequest request =
+        createRequest(sourceTopic.getQualifiedName(), targetTopic.getQualifiedName(), null);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createOfflineRetransmissionTask(request);
+
+    // then
+    response.expectStatus().isForbidden();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("User needs permissions to source and target topics");
+    assertThat(getOfflineRetransmissionTasks().size()).isEqualTo(0);
+
+    // cleanup
+    TestSecurityProvider.reset();
+  }
+
+  private OfflineRetransmissionRequest createRequest(
+      String sourceTopic, String targetTopic, String sourceViewPath) {
+    return new OfflineRetransmissionRequest(
+        sourceViewPath,
+        sourceTopic,
+        targetTopic,
+        Instant.now().minusSeconds(1).toString(),
+        Instant.now().toString());
+  }
+
+  private void deleteTasks() {
+    getOfflineRetransmissionTasks()
+        .forEach(
+            task ->
+                hermes
+                    .api()
+                    .deleteOfflineRetransmissionTask(task.getTaskId())
+                    .expectStatus()
+                    .isOk());
+  }
+
+  @Nullable
+  private static List<OfflineRetransmissionTask> getOfflineRetransmissionTasks() {
+    return hermes
+        .api()
+        .getOfflineRetransmissionTasks()
+        .expectStatus()
+        .isOk()
+        .expectBodyList(OfflineRetransmissionTask.class)
+        .returnResult()
+        .getResponseBody();
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/QueryEndpointTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/QueryEndpointTest.java
index 6c18265780..42b3c51782 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/QueryEndpointTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/QueryEndpointTest.java
@@ -1,9 +1,33 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
-import com.jayway.awaitility.Duration;
+import static java.util.Arrays.asList;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.ContentType.JSON;
+import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.integrationtests.prometheus.SubscriptionMetrics.subscriptionMetrics;
+import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.groupWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.groupWithRandomNameContaining;
+import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.groupWithRandomNameEndedWith;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomNameContaining;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomNameEndedWith;
+import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -17,364 +41,739 @@
 import pl.allegro.tech.hermes.api.SubscriptionNameWithMetrics;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicNameWithMetrics;
+import pl.allegro.tech.hermes.api.TopicWithSchema;
 import pl.allegro.tech.hermes.api.TrackingMode;
 import pl.allegro.tech.hermes.integrationtests.prometheus.PrometheusExtension;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
 import pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static java.time.Duration.ofMinutes;
-import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.params.provider.Arguments.arguments;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.ContentType.JSON;
-import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.integrationtests.prometheus.SubscriptionMetrics.subscriptionMetrics;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
 public class QueryEndpointTest {
 
-    private static final String SCHEMA = AvroUserSchemaLoader.load().toString();
-
-    @Order(0)
-    @RegisterExtension
-    public static final PrometheusExtension prometheus = new PrometheusExtension();
-
-    @Order(1)
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension()
-            .withPrometheus(prometheus);
-
-    @BeforeAll
-    static void setup() {
-        hermes.clearManagementData();
-    }
-
-    @AfterEach
-    void cleanup() {
-        hermes.clearManagementData();
-    }
-
-    public static Stream<Arguments> groupData() {
-        return Stream.of(
-                arguments("{\"query\": {}}", asList(1, 2, 3, 4)),
-                arguments("{\"query\": {\"groupName\": \"testGroup1\"}}", asList(1)),
-                arguments("{\"query\": {\"groupName\": {\"like\": \".*Group2\"}}}", asList(3)),
-                arguments("{\"query\": {\"groupName\": {\"like\": \".*Group.*\"}}}", asList(1, 3, 4)));
-    }
-
-    @ParameterizedTest
-    @MethodSource("groupData")
-    public void shouldQueryGroup(String query, List<Integer> positions) {
-        // given
-        List<Group> groups = List.of(
-                new Group("testGroup1"),
-                new Group("testNot1"),
-                new Group("testGroup2"),
-                new Group("testGroup3")
-        );
-
-        groups.forEach(g -> hermes.initHelper().createGroup(g));
-
-        // when
-        List<Group> found = hermes.api().queryGroups(query)
-                .expectStatus().isOk()
-                .expectBodyList(Group.class).returnResult().getResponseBody();
-
-        // then
-        assertListMatches(groups, found, positions);
+  private static final String SCHEMA = AvroUserSchemaLoader.load().toString();
+
+  @Order(0)
+  @RegisterExtension
+  public static final PrometheusExtension prometheus = new PrometheusExtension();
+
+  @Order(1)
+  @RegisterExtension
+  public static final HermesExtension hermes = new HermesExtension().withPrometheus(prometheus);
+
+  @Test
+  public void shouldReturnAllGroupsWhenQueryIsEmpty() {
+    // given
+    createGroupWithRandomName();
+    createGroupWithRandomName();
+
+    // when
+    List<Group> found =
+        hermes
+            .api()
+            .queryGroups("{\"query\": {}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Group.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    assertThat(found)
+        .extracting(Group::getGroupName)
+        .containsExactlyInAnyOrderElementsOf(hermes.api().getGroups());
+  }
+
+  @Test
+  public void shouldReturnGroupsWithExactName() {
+    // given
+    Group group = createGroupWithRandomName();
+    createGroupWithRandomName();
+
+    // when
+    List<Group> found =
+        hermes
+            .api()
+            .queryGroups("{\"query\": {\"groupName\": \"" + group.getGroupName() + "\"}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Group.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    assertThat(found).containsExactly(group);
+  }
+
+  @Test
+  public void shouldReturnGroupsWithNameSuffix() {
+    // given
+    String suffix = "GroupSuffix";
+    hermes.initHelper().createGroup(groupWithRandomNameEndedWith(suffix).build());
+    createGroupWithRandomName();
+
+    // when
+    List<Group> found =
+        hermes
+            .api()
+            .queryGroups("{\"query\": {\"groupName\": {\"like\": \".*" + suffix + "\"}}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Group.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    List<String> groupsWithSuffix =
+        hermes.api().getGroups().stream().filter(name -> name.endsWith(suffix)).toList();
+    assertThat(found)
+        .extracting(Group::getGroupName)
+        .containsExactlyInAnyOrderElementsOf(groupsWithSuffix);
+  }
+
+  @Test
+  public void shouldReturnGroupsWithNameContainingString() {
+    // given
+    String string = "SomeString";
+    hermes.initHelper().createGroup(groupWithRandomNameContaining(string).build());
+    createGroupWithRandomName();
+
+    // when
+    List<Group> found =
+        hermes
+            .api()
+            .queryGroups("{\"query\": {\"groupName\": {\"like\": \".*" + string + ".*\"}}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Group.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    List<String> groupsContainingString =
+        hermes.api().getGroups().stream().filter(name -> name.contains(string)).toList();
+    assertThat(found)
+        .extracting(Group::getGroupName)
+        .containsExactlyInAnyOrderElementsOf(groupsContainingString);
+  }
+
+  @Test
+  public void shouldReturnAllTopicsWhenQueryIsEmpty() {
+    // given
+    createTopicWithRandomName();
+    createTopicWithRandomName();
+
+    // when
+    List<Topic> found =
+        hermes
+            .api()
+            .queryTopics("{\"query\": {}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Topic.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    assertThat(found).containsExactlyInAnyOrderElementsOf(listAllTopics());
+  }
+
+  @Test
+  public void shouldReturnTopicsWithExactName() {
+    // given
+    Topic topic = createTopicWithRandomName();
+    createTopicWithRandomName();
+
+    // when
+    List<Topic> found =
+        hermes
+            .api()
+            .queryTopics("{\"query\": {\"name\": \"" + topic.getQualifiedName() + "\"}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Topic.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    assertThat(found).containsExactly(topic);
+  }
+
+  @Test
+  public void shouldReturnTopicsWithNameSuffix() {
+    // given
+    String suffix = "TopicSuffix";
+    hermes.initHelper().createTopic(topicWithRandomNameEndedWith(suffix).build());
+    createTopicWithRandomName();
+
+    // when
+    List<Topic> found =
+        hermes
+            .api()
+            .queryTopics("{\"query\": {\"name\": {\"like\": \".*" + suffix + "\"}}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Topic.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    List<Topic> topicsWithSuffix =
+        listAllTopics().stream()
+            .filter(topic -> topic.getQualifiedName().endsWith(suffix))
+            .toList();
+    assertThat(found).containsExactlyInAnyOrderElementsOf(topicsWithSuffix);
+  }
+
+  @Test
+  public void shouldReturnTopicsWithNameContainingString() {
+    // given
+    String string = "SomeString";
+    hermes.initHelper().createTopic(topicWithRandomNameContaining(string).build());
+    createTopicWithRandomName();
+
+    // when
+    List<Topic> found =
+        hermes
+            .api()
+            .queryTopics("{\"query\": {\"name\": {\"like\": \".*" + string + ".*\"}}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Topic.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    List<Topic> topicsContainingString =
+        listAllTopics().stream()
+            .filter(topic -> topic.getQualifiedName().contains(string))
+            .toList();
+    assertThat(found).containsExactlyInAnyOrderElementsOf(topicsContainingString);
+  }
+
+  @Test
+  public void shouldReturnTopicsWithAllMatchingProperties() {
+    // given
+    Topic topic1 = topicWithRandomName().withContentType(AVRO).withTrackingEnabled(false).build();
+    Topic topic2 = topicWithRandomName().withContentType(JSON).withTrackingEnabled(false).build();
+    Topic topic3 = topicWithRandomName().withContentType(AVRO).withTrackingEnabled(true).build();
+    hermes.initHelper().createTopicWithSchema(topicWithSchema(topic1, SCHEMA));
+    hermes.initHelper().createTopicWithSchema(topicWithSchema(topic3, SCHEMA));
+    hermes.initHelper().createTopic(topic2);
+
+    // when
+    List<Topic> found =
+        hermes
+            .api()
+            .queryTopics(
+                "{\"query\": {\"and\": [{\"trackingEnabled\": \"true\"}, {\"contentType\": \"AVRO\"}]}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Topic.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    List<Topic> topicsWithAvroAndTracking =
+        listAllTopics().stream()
+            .filter(topic -> topic.getContentType() == AVRO && topic.isTrackingEnabled())
+            .toList();
+    assertThat(found).containsExactlyInAnyOrderElementsOf(topicsWithAvroAndTracking);
+  }
+
+  @Test
+  public void shouldReturnTopicsWithAtLeastOneMatchingProperty() {
+    // given
+    Topic topic1 = topicWithRandomName().withContentType(AVRO).withTrackingEnabled(false).build();
+    Topic topic2 = topicWithRandomName().withContentType(JSON).withTrackingEnabled(false).build();
+    Topic topic3 = topicWithRandomName().withContentType(AVRO).withTrackingEnabled(true).build();
+    hermes.initHelper().createTopicWithSchema(topicWithSchema(topic1, SCHEMA));
+    hermes.initHelper().createTopicWithSchema(topicWithSchema(topic3, SCHEMA));
+    hermes.initHelper().createTopic(topic2);
+
+    // when
+    List<Topic> found =
+        hermes
+            .api()
+            .queryTopics(
+                "{\"query\": {\"or\": [{\"trackingEnabled\": \"true\"}, {\"contentType\": \"AVRO\"}]}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Topic.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    List<Topic> topicsWithAvroOrTracking =
+        listAllTopics().stream()
+            .filter(topic -> topic.getContentType() == AVRO || topic.isTrackingEnabled())
+            .toList();
+    assertThat(found).containsExactlyInAnyOrderElementsOf(topicsWithAvroOrTracking);
+  }
+
+  @Test
+  public void shouldReturnTopicsWithExactOwnerId() {
+    // given
+    Topic topic =
+        topicWithRandomName()
+            .withContentType(JSON)
+            .withTrackingEnabled(true)
+            .withOwner(new OwnerId("Plaintext", "Team Alpha"))
+            .build();
+    hermes.initHelper().createTopic(topic);
+    createTopicWithRandomName();
+
+    // when
+    List<Topic> found =
+        hermes
+            .api()
+            .queryTopics("{\"query\": {\"owner.id\": \"Team Alpha\"}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Topic.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    List<Topic> topicsOwnerId =
+        listAllTopics().stream().filter(t -> t.getOwner().getId().equals("Team Alpha")).toList();
+    assertThat(found).containsExactlyInAnyOrderElementsOf(topicsOwnerId);
+  }
+
+  @Test
+  public void shouldReturnTopicsWithOwnerIdContainingString() {
+    // given
+    Topic topic =
+        topicWithRandomName()
+            .withContentType(JSON)
+            .withTrackingEnabled(true)
+            .withOwner(new OwnerId("Plaintext", "Team Alpha"))
+            .build();
+    hermes.initHelper().createTopic(topic);
+    createTopicWithRandomName();
+
+    // when
+    List<Topic> found =
+        hermes
+            .api()
+            .queryTopics("{\"query\": {\"owner.id\": {\"like\": \".*Alph.*\"}}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Topic.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    List<Topic> topicsOwnerId =
+        listAllTopics().stream().filter(t -> t.getOwner().getId().contains("Alph")).toList();
+    assertThat(found).containsExactlyInAnyOrderElementsOf(topicsOwnerId);
+  }
+
+  private List<Topic> listAllTopics() {
+    List<String> groups = hermes.api().getGroups();
+    List<Topic> topics = new ArrayList<>();
+    for (String groupName : groups) {
+      String[] topicNames =
+          hermes
+              .api()
+              .listTopics(groupName)
+              .expectStatus()
+              .isOk()
+              .expectBody(String[].class)
+              .returnResult()
+              .getResponseBody();
+      for (String topicName : topicNames) {
+        TopicWithSchema topic =
+            hermes
+                .api()
+                .getTopicResponse(topicName)
+                .expectBody(TopicWithSchema.class)
+                .returnResult()
+                .getResponseBody();
+        topics.add(topic.getTopic());
+      }
     }
-
-    public static Stream<Arguments> topicData() {
-        return Stream.of(
-                arguments("{\"query\": {}}", asList(1, 2, 3, 4)),
-                arguments("{\"query\": {\"name\": \"testGroup1.testTopic1\"}}", asList(1)),
-                arguments("{\"query\": {\"name\": {\"like\": \".*testTopic1\"}}}", asList(1)),
-                arguments("{\"query\": {\"name\": {\"like\": \".*testTopic.*\"}}}", asList(1, 2, 3)),
-                arguments("{\"query\": {\"trackingEnabled\": \"true\", \"contentType\": \"AVRO\"}}", asList(3)),
-                arguments("{\"query\": {\"and\": [{\"trackingEnabled\": \"true\"}, {\"contentType\": \"AVRO\"}]}}", asList(3)),
-                arguments("{\"query\": {\"or\": [{\"trackingEnabled\": \"true\"}, {\"contentType\": \"AVRO\"}]}}", asList(1, 3, 4)),
-                arguments("{\"query\": {\"owner.id\": \"Team Alpha\"}}", asList(4)),
-                arguments("{\"query\": {\"owner.id\": {\"like\": \".*Alph.*\"}}}", asList(4)));
-    }
-
-    @ParameterizedTest
-    @MethodSource("topicData")
-    public void shouldQueryTopic(String query, List<Integer> positions) {
-        // given
-        Topic topic1 = topic("testGroup1", "testTopic1").withContentType(AVRO).withTrackingEnabled(false).build();
-        Topic topic2 = topic("testGroup1", "testTopic2").withContentType(JSON).withTrackingEnabled(false).build();
-        Topic topic3 = topic("testGroup1", "testTopic3").withContentType(AVRO).withTrackingEnabled(true).build();
-        Topic topic4 = topic("testGroup2", "testOtherTopic").withContentType(JSON).withTrackingEnabled(true)
-                .withOwner(new OwnerId("Plaintext", "Team Alpha")).build();
-
-        hermes.initHelper().createTopicWithSchema(topicWithSchema(topic1, SCHEMA));
-        hermes.initHelper().createTopicWithSchema(topicWithSchema(topic3, SCHEMA));
-        hermes.initHelper().createTopic(topic2);
-        hermes.initHelper().createTopic(topic4);
-
-        List<Topic> topics = asList(topic1, topic2, topic3, topic4);
-
-        // when
-        List<Topic> found = hermes.api().queryTopics(query)
-                .expectStatus().isOk()
-                .expectBodyList(Topic.class).returnResult().getResponseBody();
-
-        // then
-        assertListMatches(topics, found, positions);
-    }
-
-
-    public static Stream<Arguments> subscriptionData() {
-        return Stream.of(
-                arguments("{\"query\": {}}", asList(1, 2, 3, 4)),
-                arguments("{\"query\": {\"name\": \"subscription1\"}}", asList(1)),
-                arguments("{\"query\": {\"name\": {\"like\": \".*cription1\"}}}", asList(1)),
-                arguments("{\"query\": {\"name\": {\"like\": \"subscript.*\"}}}", asList(1, 2, 4)),
-                arguments("{\"query\": {\"name\": \"subscription1\", \"endpoint\": \"http://endpoint1\"}}", asList(1)),
-                arguments("{\"query\": {\"and\": [{\"name\": \"subscription1\"}, {\"endpoint\": \"http://endpoint1\"}]}}", asList(1)),
-                arguments("{\"query\": {\"or\": [{\"name\": \"subscription1\"}, {\"endpoint\": \"http://endpoint1\"}]}}", asList(1, 3)),
-                arguments("{\"query\": {\"owner.id\": \"Team Alpha\"}}", asList(4)),
-                arguments("{\"query\": {\"owner.id\": {\"like\": \".*Alph.*\"}}}", asList(4)),
-                arguments("{\"query\": {\"endpoint\": \".*password.*\"}}", asList())
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("subscriptionData")
-    public void shouldQuerySubscription(String query, List<Integer> positions) {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        Subscription subscription1 = hermes.initHelper().createSubscription(
-                enrichSubscription(subscription(topic.getName(), "subscription1"), "http://endpoint1")
-        );
-
-        Subscription subscription2 = hermes.initHelper().createSubscription(
-                enrichSubscription(subscription(topic.getName(), "subscription2"), "http://endpoint2")
-        );
-
-        Subscription subscription3 = hermes.initHelper().createSubscription(
-                enrichSubscription(subscription(topic.getName(), "subTestScription3"), "http://login:password@endpoint1")
-        );
-
-        Subscription subscription4 = hermes.initHelper().createSubscription(enrichSubscription(subscription(topic.getName(), "subscription4")
-                .withOwner(new OwnerId("Plaintext", "Team Alpha")), "http://endpoint2")
-        );
-
-        List<Subscription> subscriptions = asList(subscription1, subscription2, subscription3.anonymize(), subscription4);
-
-        // when
-        List<Subscription> found = hermes.api().querySubscriptions(query)
-                .expectStatus().isOk()
-                .expectBodyList(Subscription.class).returnResult().getResponseBody();
-
-        // then
-        assertListMatches(subscriptions, found, positions);
-    }
-
-    @Test
-    public void shouldSkipEntitiesNotContainingQueriedField() {
-        // given
-        hermes.initHelper().createGroup(new Group("group"));
-
-        // when
-        List<Group> found = hermes.api().queryGroups("{\"query\": {\"missingField\": \"xxx\"}}")
-                .expectStatus().isOk()
-                .expectBodyList(Group.class).returnResult().getResponseBody();
-
-        // then
-        Assertions.assertThat(found).isEmpty();
-    }
-
-    @Test
-    public void shouldSkipEntitiesNotContainingQueriedNestedField() {
-        // given
-        hermes.initHelper().createGroup(new Group("group"));
-
-        // when
-        List<Group> found = hermes.api().queryGroups("{\"query\": {\"missing.nested.field\": \"xxx\"}}")
-                .expectStatus().isOk()
-                .expectBodyList(Group.class).returnResult().getResponseBody();
-
-        // then
-        Assertions.assertThat(found).isEmpty();
+    return topics;
+  }
+
+  public static Stream<Arguments> subscriptionData() {
+    return Stream.of(
+        arguments("{\"query\": {}}", asList(1, 2, 3, 4)),
+        arguments("{\"query\": {\"name\": \"subscription1\"}}", asList(1)),
+        arguments("{\"query\": {\"name\": {\"like\": \".*cription1\"}}}", asList(1)),
+        arguments("{\"query\": {\"name\": {\"like\": \"subscript.*\"}}}", asList(1, 2, 4)),
+        arguments(
+            "{\"query\": {\"name\": \"subscription1\", \"endpoint\": \"http://endpoint1\"}}",
+            asList(1)),
+        arguments(
+            "{\"query\": {\"and\": [{\"name\": \"subscription1\"}, {\"endpoint\": \"http://endpoint1\"}]}}",
+            asList(1)),
+        arguments(
+            "{\"query\": {\"or\": [{\"name\": \"subscription1\"}, {\"endpoint\": \"http://endpoint1\"}]}}",
+            asList(1, 3)),
+        arguments("{\"query\": {\"owner.id\": \"Team Alpha\"}}", asList(4)),
+        arguments("{\"query\": {\"owner.id\": {\"like\": \".*Alph.*\"}}}", asList(4)),
+        arguments("{\"query\": {\"endpoint\": \".*password.*\"}}", asList()));
+  }
+
+  @ParameterizedTest
+  @MethodSource("subscriptionData")
+  public void shouldQuerySubscription(String query, List<Integer> positions) {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    Subscription subscription1 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                enrichSubscription(
+                    subscription(topic.getName(), "subscription1"), "http://endpoint1"));
+
+    Subscription subscription2 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                enrichSubscription(
+                    subscription(topic.getName(), "subscription2"), "http://endpoint2"));
+
+    Subscription subscription3 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                enrichSubscription(
+                    subscription(topic.getName(), "subTestScription3"),
+                    "http://login:password@endpoint1"));
+
+    Subscription subscription4 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                enrichSubscription(
+                    subscription(topic.getName(), "subscription4")
+                        .withOwner(new OwnerId("Plaintext", "Team Alpha")),
+                    "http://endpoint2"));
+
+    List<Subscription> subscriptions =
+        asList(subscription1, subscription2, subscription3.anonymize(), subscription4);
+
+    // when
+    List<Subscription> found =
+        hermes
+            .api()
+            .querySubscriptions(query)
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Subscription.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    assertListMatches(subscriptions, found, positions);
+  }
+
+  @Test
+  public void shouldSkipEntitiesNotContainingQueriedField() {
+    // given
+    hermes.initHelper().createGroup(groupWithRandomName().build());
+
+    // when
+    List<Group> found =
+        hermes
+            .api()
+            .queryGroups("{\"query\": {\"missingField\": \"xxx\"}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Group.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    Assertions.assertThat(found).isEmpty();
+  }
+
+  @Test
+  public void shouldSkipEntitiesNotContainingQueriedNestedField() {
+    // given
+    hermes.initHelper().createGroup(groupWithRandomName().build());
+
+    // when
+    List<Group> found =
+        hermes
+            .api()
+            .queryGroups("{\"query\": {\"missing.nested.field\": \"xxx\"}}")
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Group.class)
+            .returnResult()
+            .getResponseBody();
+
+    // then
+    Assertions.assertThat(found).isEmpty();
+  }
+
+  public static Stream<Arguments> topicsMetricsFilteringData() {
+    return Stream.of(
+        arguments(
+            "testTopic1", "testTopic2", "{\"query\": {}}", asList("testTopic1", "testTopic2")),
+        arguments(
+            "testTopic3", "testTopic4", "{\"query\": {\"published\": {\"gt\": \"20\"}}}", asList()),
+        arguments(
+            "testTopic5",
+            "testTopic6",
+            "{\"query\": {\"published\": {\"gt\": \"3\"}}}",
+            asList("testTopic6")),
+        arguments(
+            "testTopic7",
+            "testTopic8",
+            "{\"query\": {\"published\": {\"lt\": \"3\"}}}",
+            asList("testTopic7")));
+  }
+
+  @ParameterizedTest
+  @MethodSource("topicsMetricsFilteringData")
+  public void shouldQueryTopicsMetrics(
+      String topicName1, String topicName2, String query, List<String> topicNames) {
+    // given
+    Group group = groupWithRandomName().build();
+    hermes.initHelper().createGroup(group);
+    hermes
+        .initHelper()
+        .createTopic(
+            topic(group.getGroupName(), topicName1)
+                .withContentType(JSON)
+                .withTrackingEnabled(false)
+                .build());
+    hermes
+        .initHelper()
+        .createTopic(
+            topic(group.getGroupName(), topicName2)
+                .withContentType(JSON)
+                .withTrackingEnabled(false)
+                .build());
+
+    hermes.api().publishUntilSuccess(group.getGroupName() + "." + topicName1, "testMessage1");
+    hermes.api().publishUntilSuccess(group.getGroupName() + "." + topicName2, "testMessage2");
+    hermes.api().publishUntilSuccess(group.getGroupName() + "." + topicName2, "testMessage3");
+    hermes.api().publishUntilSuccess(group.getGroupName() + "." + topicName2, "testMessage4");
+    hermes.api().publishUntilSuccess(group.getGroupName() + "." + topicName2, "testMessage5");
+
+    List<String> qualifiedNames =
+        topicNames.stream()
+            .map(topicName -> group.getGroupName() + "." + topicName)
+            .collect(toList());
+
+    waitAtMost(adjust(Duration.ofMinutes(1)))
+        .untilAsserted(
+            () -> {
+              // when
+              List<TopicNameWithMetrics> found =
+                  hermes
+                      .api()
+                      .queryTopicMetrics(query)
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(TopicNameWithMetrics.class)
+                      .returnResult()
+                      .getResponseBody();
+
+              // then
+              assertTopicMetricsMatchesToNames(found, qualifiedNames);
+
+              found.forEach(it -> Assertions.assertThat(it.getVolume()).isGreaterThanOrEqualTo(0));
+            });
+  }
+
+  @Test
+  public void shouldQuerySubscriptionsMetrics() {
+    // given
+    Topic topic1 = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Topic topic2 = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription1 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic1.getName(), "http://endpoint1").build());
+    Subscription subscription2 =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic2.getName(), "http://endpoint2").build());
+
+    final String queryGetAllSubscriptionsMetrics = "{\"query\": {}}";
+    final String queryGetSubscriptionsMetricsWithPositiveThroughput =
+        "{\"query\": {\"throughput\": {\"gt\": 0}}}";
+    final String queryGetSubscriptionsMetricsWithRateInRange =
+        "{\"query\": {\"or\": [{\"rate\": {\"gt\": 10}}, {\"rate\": {\"lt\": 50}}]}}";
+    final String queryGetSubscriptionsMetricsWithLagNegative =
+        "{\"query\": {\"lag\": {\"lt\": 0}}}";
+    final String queryGetSubscriptionsMetricsWithVolume = "{\"query\": {\"volume\": {\"gt\": -1}}}";
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(subscription1.getQualifiedName())
+            .withRate(100)
+            .withThroughput(0)
+            .build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(subscription2.getQualifiedName())
+            .withRate(40)
+            .withThroughput(10)
+            .build());
+
+    waitAtMost(adjust(Duration.ofMinutes(1)))
+        .untilAsserted(
+            () -> {
+              // when
+              final List<SubscriptionNameWithMetrics> allSubscriptions =
+                  hermes
+                      .api()
+                      .querySubscriptionMetrics(queryGetAllSubscriptionsMetrics)
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(SubscriptionNameWithMetrics.class)
+                      .returnResult()
+                      .getResponseBody();
+              final List<SubscriptionNameWithMetrics> subscriptionsWithPositiveThroughput =
+                  hermes
+                      .api()
+                      .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithPositiveThroughput)
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(SubscriptionNameWithMetrics.class)
+                      .returnResult()
+                      .getResponseBody();
+              final List<SubscriptionNameWithMetrics> subscriptionsWithRateInRange =
+                  hermes
+                      .api()
+                      .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithRateInRange)
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(SubscriptionNameWithMetrics.class)
+                      .returnResult()
+                      .getResponseBody();
+              final List<SubscriptionNameWithMetrics> subscriptionsWithNegativeLag =
+                  hermes
+                      .api()
+                      .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithLagNegative)
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(SubscriptionNameWithMetrics.class)
+                      .returnResult()
+                      .getResponseBody();
+              final List<SubscriptionNameWithMetrics> subscriptionsWithVolume =
+                  hermes
+                      .api()
+                      .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithVolume)
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(SubscriptionNameWithMetrics.class)
+                      .returnResult()
+                      .getResponseBody();
+
+              // then
+              subscriptionsMatchesToNamesAndTheirTopicsNames(
+                  allSubscriptions, subscription1, subscription2);
+              subscriptionsMatchesToNamesAndTheirTopicsNames(
+                  subscriptionsWithPositiveThroughput, subscription2);
+              subscriptionsMatchesToNamesAndTheirTopicsNames(
+                  subscriptionsWithRateInRange, subscription2);
+              subscriptionsMatchesToNamesAndTheirTopicsNames(
+                  subscriptionsWithNegativeLag, subscription1, subscription2);
+              subscriptionsMatchesToNamesAndTheirTopicsNames(
+                  subscriptionsWithVolume, subscription1, subscription2);
+            });
+  }
+
+  @Test
+  public void shouldHandleUnavailableSubscriptionsMetrics() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), "http://endpoint1").build());
+    String queryGetAllSubscriptionsMetrics = "{\"query\": {}}";
+    String queryGetSubscriptionsMetricsWithPositiveRate = "{\"query\": {\"rate\": {\"gt\": 0}}}";
+    prometheus.stubDelay(Duration.ofMillis(3000));
+
+    waitAtMost(adjust(Duration.ofMinutes(1)))
+        .untilAsserted(
+            () -> {
+              // when
+              List<SubscriptionNameWithMetrics> allSubscriptions =
+                  hermes
+                      .api()
+                      .querySubscriptionMetrics(queryGetAllSubscriptionsMetrics)
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(SubscriptionNameWithMetrics.class)
+                      .returnResult()
+                      .getResponseBody();
+              List<SubscriptionNameWithMetrics> subscriptionsWithPositiveRate =
+                  hermes
+                      .api()
+                      .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithPositiveRate)
+                      .expectStatus()
+                      .isOk()
+                      .expectBodyList(SubscriptionNameWithMetrics.class)
+                      .returnResult()
+                      .getResponseBody();
+
+              // then
+              assertThatRateIsUnavailable(allSubscriptions, subscription);
+              assertThatRateIsUnavailable(subscriptionsWithPositiveRate, subscription);
+            });
+  }
+
+  private static void assertThatRateIsUnavailable(
+      List<SubscriptionNameWithMetrics> allSubscriptions, Subscription... subscriptions) {
+    subscriptionsMatchesToNamesAndTheirTopicsNames(allSubscriptions, subscriptions);
+    for (SubscriptionNameWithMetrics metrics : allSubscriptions) {
+      assertThat(metrics.getRate().asString()).isEqualTo("unavailable");
     }
-
-    public static Stream<Arguments> topicsMetricsFilteringData() {
-        return Stream.of(
-                arguments("testTopic1", "testTopic2", "{\"query\": {}}", asList("testGroup.testTopic1", "testGroup.testTopic2")),
-                arguments("testTopic3", "testTopic4", "{\"query\": {\"published\": {\"gt\": \"5\"}}}", asList()),
-                arguments("testTopic5", "testTopic6", "{\"query\": {\"published\": {\"gt\": \"2\"}}}", asList("testGroup.testTopic6")),
-                arguments("testTopic7", "testTopic8", "{\"query\": {\"published\": {\"lt\": \"2\"}}}", asList("testGroup.testTopic7")));
-    }
-
-    @ParameterizedTest
-    @MethodSource("topicsMetricsFilteringData")
-    public void shouldQueryTopicsMetrics(String topicName1, String topicName2, String query, List<String> qualifiedNames) {
-        // given
-        hermes.initHelper().createTopic(topic("testGroup", topicName1).withContentType(JSON).withTrackingEnabled(false).build());
-        hermes.initHelper().createTopic(topic("testGroup", topicName2).withContentType(JSON).withTrackingEnabled(false).build());
-
-
-        hermes.api().publish("testGroup." + topicName1, "testMessage1");
-        hermes.api().publish("testGroup." + topicName2, "testMessage2");
-        hermes.api().publish("testGroup." + topicName2, "testMessage3");
-        hermes.api().publish("testGroup." + topicName2, "testMessage4");
-
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() -> {
-                    // when
-                    List<TopicNameWithMetrics> found = hermes.api().queryTopicMetrics(query)
-                            .expectStatus().isOk()
-                            .expectBodyList(TopicNameWithMetrics.class).returnResult().getResponseBody();
-
-                    // then
-                    assertTopicMetricsMatchesToNames(found, qualifiedNames);
-
-                    found.forEach(it -> Assertions.assertThat(it.getVolume()).isGreaterThanOrEqualTo(0));
-                }
-        );
-    }
-
-    @Test
-    public void shouldQuerySubscriptionsMetrics() {
-        // given
-        Topic topic1 = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Topic topic2 = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription1 = hermes.initHelper().createSubscription(
-                subscriptionWithRandomName(topic1.getName(), "http://endpoint1").build()
-        );
-        Subscription subscription2 = hermes.initHelper().createSubscription(
-                subscriptionWithRandomName(topic2.getName(), "http://endpoint2").build()
-        );
-
-        String queryGetAllSubscriptionsMetrics = "{\"query\": {}}";
-        String queryGetSubscriptionsMetricsWithPositiveThroughput = "{\"query\": {\"throughput\": {\"gt\": 0}}}";
-        String queryGetSubscriptionsMetricsWithRateInRange = "{\"query\": {\"or\": [{\"rate\": {\"gt\": 10}}, {\"rate\": {\"lt\": 50}}]}}";
-        String queryGetSubscriptionsMetricsWithLagNegative = "{\"query\": {\"lag\": {\"lt\": 0}}}";
-        String queryGetSubscriptionsMetricsWithVolume = "{\"query\": {\"volume\": {\"gt\": -1}}}";
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(subscription1.getQualifiedName())
-                        .withRate(100)
-                        .withThroughput(0)
-                        .build()
-        );
-        prometheus.stubSubscriptionMetrics(
-                subscriptionMetrics(subscription2.getQualifiedName())
-                        .withRate(40)
-                        .withThroughput(10)
-                        .build()
-        );
-
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() -> {
-            // when
-            List<SubscriptionNameWithMetrics> allSubscriptions = hermes.api()
-                    .querySubscriptionMetrics(queryGetAllSubscriptionsMetrics)
-                    .expectStatus().isOk()
-                    .expectBodyList(SubscriptionNameWithMetrics.class).returnResult().getResponseBody();
-            List<SubscriptionNameWithMetrics> subscriptionsWithPositiveThroughput = hermes.api()
-                    .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithPositiveThroughput)
-                    .expectStatus().isOk()
-                    .expectBodyList(SubscriptionNameWithMetrics.class).returnResult().getResponseBody();
-            List<SubscriptionNameWithMetrics> subscriptionsWithRateInRange = hermes.api()
-                    .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithRateInRange)
-                    .expectStatus().isOk()
-                    .expectBodyList(SubscriptionNameWithMetrics.class).returnResult().getResponseBody();
-            List<SubscriptionNameWithMetrics> subscriptionsWithNegativeLag = hermes.api()
-                    .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithLagNegative)
-                    .expectStatus().isOk()
-                    .expectBodyList(SubscriptionNameWithMetrics.class).returnResult().getResponseBody();
-            List<SubscriptionNameWithMetrics> subscriptionsWithVolume = hermes.api()
-                    .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithVolume)
-                    .expectStatus().isOk()
-                    .expectBodyList(SubscriptionNameWithMetrics.class).returnResult().getResponseBody();
-
-            // then
-            subscriptionsMatchesToNamesAndTheirTopicsNames(allSubscriptions, subscription1, subscription2);
-            subscriptionsMatchesToNamesAndTheirTopicsNames(subscriptionsWithPositiveThroughput, subscription2);
-            subscriptionsMatchesToNamesAndTheirTopicsNames(subscriptionsWithRateInRange, subscription2);
-            subscriptionsMatchesToNamesAndTheirTopicsNames(subscriptionsWithNegativeLag, subscription1, subscription2);
-            subscriptionsMatchesToNamesAndTheirTopicsNames(subscriptionsWithVolume, subscription1, subscription2);
-        });
-    }
-
-    @Test
-    public void shouldHandleUnavailableSubscriptionsMetrics() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(
-                subscriptionWithRandomName(topic.getName(), "http://endpoint1").build()
-        );
-        String queryGetAllSubscriptionsMetrics = "{\"query\": {}}";
-        String queryGetSubscriptionsMetricsWithPositiveRate = "{\"query\": {\"rate\": {\"gt\": 0}}}";
-        prometheus.stubDelay(ofMinutes(10));
-
-        waitAtMost(adjust(Duration.ONE_MINUTE)).until(() -> {
-            // when
-            List<SubscriptionNameWithMetrics> allSubscriptions = hermes.api()
-                    .querySubscriptionMetrics(queryGetAllSubscriptionsMetrics)
-                    .expectStatus().isOk()
-                    .expectBodyList(SubscriptionNameWithMetrics.class).returnResult().getResponseBody();
-            List<SubscriptionNameWithMetrics> subscriptionsWithPositiveRate = hermes.api()
-                    .querySubscriptionMetrics(queryGetSubscriptionsMetricsWithPositiveRate)
-                    .expectStatus().isOk()
-                    .expectBodyList(SubscriptionNameWithMetrics.class).returnResult().getResponseBody();
-
-            // then
-            assertThatRateIsUnavailable(allSubscriptions, subscription);
-            assertThatRateIsUnavailable(subscriptionsWithPositiveRate, subscription);
-        });
-    }
-
-    private static void assertThatRateIsUnavailable(List<SubscriptionNameWithMetrics> allSubscriptions, Subscription ... subscriptions) {
-        subscriptionsMatchesToNamesAndTheirTopicsNames(allSubscriptions, subscriptions);
-        for (SubscriptionNameWithMetrics metrics : allSubscriptions) {
-            assertThat(metrics.getRate().asString()).isEqualTo("unavailable");
-        }
-    }
-
-    private static void subscriptionsMatchesToNamesAndTheirTopicsNames(List<SubscriptionNameWithMetrics> found,
-                                                                       Subscription ... expectedSubscriptions) {
-        assertThat(found).isNotNull();
-        Map<String, String> foundSubscriptionsAndTheirTopicNames = found.stream()
-                .collect(Collectors.toMap(SubscriptionNameWithMetrics::getName, SubscriptionNameWithMetrics::getTopicName));
-        for (Subscription subscription : expectedSubscriptions) {
-            assertThat(foundSubscriptionsAndTheirTopicNames).containsKeys(subscription.getName());
-            assertThat(foundSubscriptionsAndTheirTopicNames.get(subscription.getName())).isEqualTo(subscription.getQualifiedTopicName());
-        }
-    }
-
-    private Subscription enrichSubscription(SubscriptionBuilder subscription, String endpoint) {
-        return subscription
-                .withTrackingMode(TrackingMode.TRACK_ALL)
-                .withSubscriptionPolicy(subscriptionPolicy().applyDefaults().build())
-                .withEndpoint(EndpointAddress.of(endpoint))
-                .build();
-    }
-
-    private <T> void assertListMatches(List<T> elements, List<T> found, List<Integer> positions) {
-        found.removeIf(o -> !elements.contains(o));
-        List<T> expected = positions.stream().map(i -> elements.get(i - 1)).collect(Collectors.toList());
-        Assertions.assertThat(found).isSubsetOf(expected);
-    }
-
-    private void assertTopicMetricsMatchesToNames(List<TopicNameWithMetrics> found, List<String> expectedQualifiedNames) {
-        List<String> foundQualifiedNames = found.stream()
-                .map(TopicNameWithMetrics::getName)
-                .collect(Collectors.toList());
-
-        Assertions.assertThat(foundQualifiedNames).containsAll(expectedQualifiedNames);
+  }
+
+  private static void subscriptionsMatchesToNamesAndTheirTopicsNames(
+      List<SubscriptionNameWithMetrics> found, Subscription... expectedSubscriptions) {
+    assertThat(found).isNotNull();
+    Map<String, String> foundSubscriptionsAndTheirTopicNames =
+        found.stream()
+            .collect(
+                Collectors.toMap(
+                    SubscriptionNameWithMetrics::getName,
+                    SubscriptionNameWithMetrics::getTopicName));
+    for (Subscription subscription : expectedSubscriptions) {
+      assertThat(foundSubscriptionsAndTheirTopicNames).containsKeys(subscription.getName());
+      assertThat(foundSubscriptionsAndTheirTopicNames.get(subscription.getName()))
+          .isEqualTo(subscription.getQualifiedTopicName());
     }
+  }
+
+  private Subscription enrichSubscription(SubscriptionBuilder subscription, String endpoint) {
+    return subscription
+        .withTrackingMode(TrackingMode.TRACK_ALL)
+        .withSubscriptionPolicy(subscriptionPolicy().applyDefaults().build())
+        .withEndpoint(EndpointAddress.of(endpoint))
+        .build();
+  }
+
+  private <T> void assertListMatches(List<T> elements, List<T> found, List<Integer> positions) {
+    found.removeIf(o -> !elements.contains(o));
+    List<T> expected = positions.stream().map(i -> elements.get(i - 1)).collect(toList());
+    Assertions.assertThat(found).isSubsetOf(expected);
+  }
+
+  private void assertTopicMetricsMatchesToNames(
+      List<TopicNameWithMetrics> found, List<String> expectedQualifiedNames) {
+    List<String> foundQualifiedNames =
+        found.stream().map(TopicNameWithMetrics::getName).collect(toList());
+
+    Assertions.assertThat(foundQualifiedNames).containsAll(expectedQualifiedNames);
+  }
+
+  private Topic createTopicWithRandomName() {
+    return hermes.initHelper().createTopic(topicWithRandomName().build());
+  }
+
+  private Group createGroupWithRandomName() {
+    return hermes.initHelper().createGroup(groupWithRandomName().build());
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ReadOnlyModeTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ReadOnlyModeTest.java
new file mode 100644
index 0000000000..831be62c29
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ReadOnlyModeTest.java
@@ -0,0 +1,91 @@
+package pl.allegro.tech.hermes.integrationtests.management;
+
+import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.groupWithRandomName;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+import pl.allegro.tech.hermes.management.TestSecurityProvider;
+import pl.allegro.tech.hermes.management.domain.mode.ModeService;
+
+public class ReadOnlyModeTest {
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @BeforeEach
+  public void initialize() {
+    TestSecurityProvider.setUserIsAdmin(true);
+    hermes.api().setMode(ModeService.READ_WRITE);
+  }
+
+  @AfterEach
+  public void cleanup() {
+    TestSecurityProvider.setUserIsAdmin(true);
+  }
+
+  @Test
+  public void shouldAllowModifyingOperations() {
+    // given
+    hermes.api().setMode(ModeService.READ_WRITE);
+    TestSecurityProvider.setUserIsAdmin(false);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createGroup(groupWithRandomName().build());
+
+    // then
+    response.expectStatus().isCreated();
+  }
+
+  @Test
+  public void shouldRestrictModifyingOperationsForNonAdminUsers() {
+    // given
+    hermes.api().setMode(ModeService.READ_ONLY);
+    TestSecurityProvider.setUserIsAdmin(false);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createGroup(groupWithRandomName().build());
+
+    // then
+    response.expectStatus().isEqualTo(503);
+  }
+
+  @Test
+  public void shouldNotRestrictModifyingOperationsForAdminUsers() {
+    // given
+    hermes.api().setMode(ModeService.READ_ONLY);
+    TestSecurityProvider.setUserIsAdmin(true);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createGroup(groupWithRandomName().build());
+
+    // then
+    response.expectStatus().isCreated();
+  }
+
+  @Test
+  public void shouldSwitchModeBack() {
+    // given
+    hermes.api().setMode(ModeService.READ_ONLY);
+    TestSecurityProvider.setUserIsAdmin(false);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createGroup(groupWithRandomName().build());
+
+    // then
+    response.expectStatus().isEqualTo(503);
+
+    // and
+    TestSecurityProvider.setUserIsAdmin(true);
+    hermes.api().setMode(ModeService.READ_WRITE).expectStatus().isOk();
+    TestSecurityProvider.setUserIsAdmin(false);
+
+    // when
+    response = hermes.api().createGroup(groupWithRandomName().build());
+
+    // then
+    response.expectStatus().isCreated();
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ReadinessManagementTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ReadinessManagementTest.java
new file mode 100644
index 0000000000..6fe38d2905
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/ReadinessManagementTest.java
@@ -0,0 +1,34 @@
+package pl.allegro.tech.hermes.integrationtests.management;
+
+import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.READY;
+import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import pl.allegro.tech.hermes.api.DatacenterReadiness;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+
+public class ReadinessManagementTest {
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldNotFailWhileSettingReadinessStatusForTheFirstTime() {
+    // when
+    hermes.api().setReadiness("unhealthy-dc", false);
+
+    // then
+    hermes
+        .api()
+        .getReadiness()
+        .expectStatus()
+        .isOk()
+        .expectBodyList(DatacenterReadiness.class)
+        // 'unhealthy-dc' should not be returned here, since it doesn't exist in management
+        // configuration
+        // In this test, we are just verifying if setting readiness status for the first time
+        // doesn't break anything.
+        .hasSize(1)
+        .contains(new DatacenterReadiness(DEFAULT_DC_NAME, READY));
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/SchemaManagementTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/SchemaManagementTest.java
index 463beee22b..667dafd955 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/SchemaManagementTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/SchemaManagementTest.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.ContentType.JSON;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -8,118 +13,109 @@
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
 
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.ContentType.JSON;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class SchemaManagementTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
 
-    private static final String SCHEMA_V1 = AvroUserSchemaLoader.load().toString();
+  private static final String SCHEMA_V1 = AvroUserSchemaLoader.load().toString();
 
-    private static final String SCHEMA_V2 = AvroUserSchemaLoader.load("/schema/user_v2.avsc").toString();
+  private static final String SCHEMA_V2 =
+      AvroUserSchemaLoader.load("/schema/user_v2.avsc").toString();
 
-    @Test
-    public void shouldNotSaveSchemaForInvalidTopic() {
-        // given && when
-        Topic topic = topicWithRandomName().build();
-        WebTestClient.ResponseSpec response = hermes.api().saveSchema(topic.getQualifiedName(), "{}");
+  @Test
+  public void shouldNotSaveSchemaForInvalidTopic() {
+    // given && when
+    Topic topic = topicWithRandomName().build();
+    WebTestClient.ResponseSpec response = hermes.api().saveSchema(topic.getQualifiedName(), "{}");
 
-        // then
-        response.expectStatus().isNotFound();
-    }
+    // then
+    response.expectStatus().isNotFound();
+  }
 
-    @Test
-    public void shouldSaveSchemaForExistingTopic() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), SCHEMA_V1);
+  @Test
+  public void shouldSaveSchemaForExistingTopic() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(topicWithRandomName().withContentType(AVRO).build(), SCHEMA_V1);
 
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().saveSchema(topic.getQualifiedName(), SCHEMA_V2);
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().saveSchema(topic.getQualifiedName(), SCHEMA_V2);
 
-        // then
-        response.expectStatus().isCreated();
-    }
+    // then
+    response.expectStatus().isCreated();
+  }
 
-    @Test
-    public void shouldReturnSchemaForTopic() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), SCHEMA_V1);
+  @Test
+  public void shouldReturnSchemaForTopic() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(topicWithRandomName().withContentType(AVRO).build(), SCHEMA_V1);
 
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().getSchema(topic.getQualifiedName());
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().getSchema(topic.getQualifiedName());
 
-        // then
-        response.expectStatus().isOk()
-                .expectBody(String.class).isEqualTo(SCHEMA_V1);
-    }
+    // then
+    response.expectStatus().isOk().expectBody(String.class).isEqualTo(SCHEMA_V1);
+  }
 
-    @Test
-    public void shouldRespondWithNoContentOnMissingSchema() {
-        // when
-        Topic topic = topicWithRandomName().build();
+  @Test
+  public void shouldRespondWithNoContentOnMissingSchema() {
+    // when
+    Topic topic = topicWithRandomName().build();
 
-        WebTestClient.ResponseSpec response = hermes.api().getSchema(topic.getQualifiedName());
+    WebTestClient.ResponseSpec response = hermes.api().getSchema(topic.getQualifiedName());
 
-        // then
-        response.expectStatus().isNoContent();
-    }
+    // then
+    response.expectStatus().isNoContent();
+  }
 
-    @Test
-    public void shouldSuccessfullyRemoveSchemaWhenSchemaRemovingIsEnabled() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), SCHEMA_V1);
+  @Test
+  public void shouldSuccessfullyRemoveSchemaWhenSchemaRemovingIsEnabled() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(topicWithRandomName().withContentType(AVRO).build(), SCHEMA_V1);
 
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().deleteSchema(topic.getQualifiedName());
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().deleteSchema(topic.getQualifiedName());
 
-        // then
-        response.expectStatus().isOk();
-    }
+    // then
+    response.expectStatus().isOk();
+  }
 
-    @Test
-    public void shouldNotSaveInvalidAvroSchema() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), SCHEMA_V1);
+  @Test
+  public void shouldNotSaveInvalidAvroSchema() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(topicWithRandomName().withContentType(AVRO).build(), SCHEMA_V1);
 
-        Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
+    Topic topic = hermes.initHelper().createTopicWithSchema(topicWithSchema);
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().saveSchema(topic.getQualifiedName(), "{");
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().saveSchema(topic.getQualifiedName(), "{");
 
-        // then
-        response.expectStatus().isBadRequest();
-    }
+    // then
+    response.expectStatus().isBadRequest();
+  }
 
-    @Test
-    public void shouldReturnBadRequestDueToNoSchemaValidatorForJsonTopic() {
-        // given
-        Topic topic = topicWithRandomName().withContentType(JSON).build();
+  @Test
+  public void shouldReturnBadRequestDueToNoSchemaValidatorForJsonTopic() {
+    // given
+    Topic topic = topicWithRandomName().withContentType(JSON).build();
 
-        hermes.initHelper().createTopic(topic);
+    hermes.initHelper().createTopic(topic);
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().saveSchema(topic.getQualifiedName(), true, SCHEMA_V1);
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().saveSchema(topic.getQualifiedName(), true, SCHEMA_V1);
 
-        // then
-        response.expectStatus().isBadRequest();
-    }
+    // then
+    response.expectStatus().isBadRequest();
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/StatsTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/StatsTest.java
index d83df905be..f75182b372 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/StatsTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/StatsTest.java
@@ -1,5 +1,10 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.UUID;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import pl.allegro.tech.hermes.api.ContentType;
@@ -12,74 +17,84 @@
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
 import pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder;
 
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class StatsTest {
 
-    private static final String SCHEMA = AvroUserSchemaLoader.load().toString();
-
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
-
-    @Test
-    public void shouldGetStats() {
-        // given
-        Stats initalStats = getStats();
-
-        TopicWithSchema topic1 = topicWithSchema(topic(Topic.Ack.ALL, ContentType.AVRO, true), SCHEMA);
-        Topic topic2 = topic(Topic.Ack.LEADER, ContentType.JSON, false);
-
-        hermes.initHelper().createTopicWithSchema(topic1);
-        hermes.initHelper().createTopic(topic2);
-        hermes.initHelper().createTopic(topic(Topic.Ack.ALL, ContentType.JSON, true));
-
-        hermes.initHelper().createSubscription(
-                subscription(topic1.getQualifiedName(), ContentType.AVRO, TrackingMode.TRACKING_OFF)
-        );
-
-        hermes.initHelper().createSubscription(
-                subscription(topic2.getQualifiedName(), ContentType.JSON, TrackingMode.TRACK_ALL)
-        );
-
-        hermes.initHelper().createSubscription(
-                subscription(topic2.getQualifiedName(), ContentType.AVRO, TrackingMode.TRACKING_OFF)
-        );
-
-        // when
-        Stats stats = getStats();
-
-        // then
-        assertThat(stats.getTopicStats().getTopicCount()).isEqualTo(initalStats.getTopicStats().getTopicCount() + 3);
-        assertThat(stats.getTopicStats().getAckAllTopicCount()).isEqualTo(initalStats.getTopicStats().getAckAllTopicCount() + 2);
-        assertThat(stats.getTopicStats().getTrackingEnabledTopicCount()).isEqualTo(initalStats.getTopicStats().getTrackingEnabledTopicCount() + 2);
-        assertThat(stats.getTopicStats().getAvroTopicCount()).isEqualTo(initalStats.getTopicStats().getAvroTopicCount() + 1);
-
-        assertThat(stats.getSubscriptionStats().getSubscriptionCount()).isEqualTo(initalStats.getSubscriptionStats().getSubscriptionCount() + 3);
-        assertThat(stats.getSubscriptionStats().getTrackingEnabledSubscriptionCount()).isEqualTo(initalStats.getSubscriptionStats().getTrackingEnabledSubscriptionCount() + 1);
-        assertThat(stats.getSubscriptionStats().getAvroSubscriptionCount()).isEqualTo(initalStats.getSubscriptionStats().getAvroSubscriptionCount() + 2);
-    }
-
-    private Topic topic(Topic.Ack ack, ContentType contentType, boolean trackingEnabled) {
-        return topicWithRandomName()
-                .withAck(ack)
-                .withContentType(contentType)
-                .withTrackingEnabled(trackingEnabled)
-                .build();
-    }
-
-    private Subscription subscription(String topicQualifiedName, ContentType contentType, TrackingMode trackingMode) {
-        return SubscriptionBuilder.subscription(topicQualifiedName, UUID.randomUUID().toString())
-                .withContentType(contentType)
-                .withTrackingMode(trackingMode)
-                .build();
-    }
-
-    private Stats getStats() {
-        return hermes.api().getManagementStats().expectStatus().isOk().expectBody(Stats.class).returnResult().getResponseBody();
-    }
-
+  private static final String SCHEMA = AvroUserSchemaLoader.load().toString();
+
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  @Test
+  public void shouldGetStats() {
+    // given
+    Stats initalStats = getStats();
+
+    TopicWithSchema topic1 = topicWithSchema(topic(Topic.Ack.ALL, ContentType.AVRO, true), SCHEMA);
+    Topic topic2 = topic(Topic.Ack.LEADER, ContentType.JSON, false);
+
+    hermes.initHelper().createTopicWithSchema(topic1);
+    hermes.initHelper().createTopic(topic2);
+    hermes.initHelper().createTopic(topic(Topic.Ack.ALL, ContentType.JSON, true));
+
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic1.getQualifiedName(), ContentType.AVRO, TrackingMode.TRACKING_OFF));
+
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic2.getQualifiedName(), ContentType.JSON, TrackingMode.TRACK_ALL));
+
+    hermes
+        .initHelper()
+        .createSubscription(
+            subscription(topic2.getQualifiedName(), ContentType.AVRO, TrackingMode.TRACKING_OFF));
+
+    // when
+    Stats stats = getStats();
+
+    // then
+    assertThat(stats.getTopicStats().getTopicCount())
+        .isEqualTo(initalStats.getTopicStats().getTopicCount() + 3);
+    assertThat(stats.getTopicStats().getAckAllTopicCount())
+        .isEqualTo(initalStats.getTopicStats().getAckAllTopicCount() + 2);
+    assertThat(stats.getTopicStats().getTrackingEnabledTopicCount())
+        .isEqualTo(initalStats.getTopicStats().getTrackingEnabledTopicCount() + 2);
+    assertThat(stats.getTopicStats().getAvroTopicCount())
+        .isEqualTo(initalStats.getTopicStats().getAvroTopicCount() + 1);
+
+    assertThat(stats.getSubscriptionStats().getSubscriptionCount())
+        .isEqualTo(initalStats.getSubscriptionStats().getSubscriptionCount() + 3);
+    assertThat(stats.getSubscriptionStats().getTrackingEnabledSubscriptionCount())
+        .isEqualTo(initalStats.getSubscriptionStats().getTrackingEnabledSubscriptionCount() + 1);
+    assertThat(stats.getSubscriptionStats().getAvroSubscriptionCount())
+        .isEqualTo(initalStats.getSubscriptionStats().getAvroSubscriptionCount() + 2);
+  }
+
+  private Topic topic(Topic.Ack ack, ContentType contentType, boolean trackingEnabled) {
+    return topicWithRandomName()
+        .withAck(ack)
+        .withContentType(contentType)
+        .withTrackingEnabled(trackingEnabled)
+        .build();
+  }
+
+  private Subscription subscription(
+      String topicQualifiedName, ContentType contentType, TrackingMode trackingMode) {
+    return SubscriptionBuilder.subscription(topicQualifiedName, UUID.randomUUID().toString())
+        .withContentType(contentType)
+        .withTrackingMode(trackingMode)
+        .build();
+  }
+
+  private Stats getStats() {
+    return hermes
+        .api()
+        .getManagementStats()
+        .expectStatus()
+        .isOk()
+        .expectBody(Stats.class)
+        .returnResult()
+        .getResponseBody();
+  }
 }
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/SubscriptionManagementTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/SubscriptionManagementTest.java
new file mode 100644
index 0000000000..3cf0ff68b5
--- /dev/null
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/SubscriptionManagementTest.java
@@ -0,0 +1,811 @@
+package pl.allegro.tech.hermes.integrationtests.management;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.PatchData.patchData;
+import static pl.allegro.tech.hermes.api.SubscriptionHealth.Status.NO_DATA;
+import static pl.allegro.tech.hermes.api.SubscriptionHealth.Status.UNHEALTHY;
+import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.malfunctioning;
+import static pl.allegro.tech.hermes.integrationtests.prometheus.SubscriptionMetrics.subscriptionMetrics;
+import static pl.allegro.tech.hermes.integrationtests.prometheus.TopicMetrics.topicMetrics;
+import static pl.allegro.tech.hermes.integrationtests.setup.HermesExtension.auditEvents;
+import static pl.allegro.tech.hermes.integrationtests.setup.HermesExtension.brokerOperations;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import com.google.common.collect.ImmutableMap;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import pl.allegro.tech.hermes.api.ConsumerGroup;
+import pl.allegro.tech.hermes.api.ContentType;
+import pl.allegro.tech.hermes.api.DeliveryType;
+import pl.allegro.tech.hermes.api.EndpointAddress;
+import pl.allegro.tech.hermes.api.OwnerId;
+import pl.allegro.tech.hermes.api.PatchData;
+import pl.allegro.tech.hermes.api.Subscription;
+import pl.allegro.tech.hermes.api.SubscriptionHealth;
+import pl.allegro.tech.hermes.api.SubscriptionPolicy;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.api.TopicName;
+import pl.allegro.tech.hermes.api.TopicPartition;
+import pl.allegro.tech.hermes.api.TrackingMode;
+import pl.allegro.tech.hermes.env.BrokerOperations;
+import pl.allegro.tech.hermes.integrationtests.prometheus.PrometheusExtension;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscriber;
+import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
+import pl.allegro.tech.hermes.management.TestSecurityProvider;
+import pl.allegro.tech.hermes.test.helper.message.TestMessage;
+
+public class SubscriptionManagementTest {
+
+  @Order(0)
+  @RegisterExtension
+  public static final PrometheusExtension prometheus = new PrometheusExtension();
+
+  @Order(1)
+  @RegisterExtension
+  public static final HermesExtension hermes = new HermesExtension().withPrometheus(prometheus);
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  public static final TestMessage MESSAGE = TestMessage.of("hello", "world");
+
+  public static final PatchData PATCH_DATA =
+      patchData()
+          .set("endpoint", EndpointAddress.of("http://localhost:7777/topics/test-topic"))
+          .build();
+
+  @AfterEach
+  public void cleanup() {
+    TestSecurityProvider.reset();
+  }
+
+  @Test
+  public void shouldEmitAuditEventWhenSubscriptionCreated() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("CREATED", subscription.getName());
+  }
+
+  @Test
+  public void shouldReturnSubscription() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    Subscription fetchedSubscription =
+        hermes.api().getSubscription(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    assertThat(fetchedSubscription.getName()).isEqualTo(subscription.getName());
+    assertThat(fetchedSubscription.isAutoDeleteWithTopicEnabled())
+        .isEqualTo(subscription.isAutoDeleteWithTopicEnabled());
+    assertThat(fetchedSubscription.getQualifiedTopicName()).isEqualTo(topic.getQualifiedName());
+    assertThat(fetchedSubscription.isTrackingEnabled()).isEqualTo(subscription.isTrackingEnabled());
+  }
+
+  @Test
+  public void shouldEmitAuditEventWhenSubscriptionRemoved() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    hermes.api().deleteSubscription(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("REMOVED", subscription.getName());
+  }
+
+  @Test
+  public void shouldEmitAuditEventWhenSubscriptionEndpointUpdated() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    hermes
+        .api()
+        .updateSubscription(
+            topic,
+            subscription.getName(),
+            patchData().set("endpoint", EndpointAddress.of("http://another-service")).build());
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("UPDATED", subscription.getName());
+  }
+
+  @Test
+  public void shouldCreateSubscriptionWithActiveStatus() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription = subscriptionWithRandomName(topic.getName()).build();
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isCreated();
+    hermes.api().waitUntilSubscriptionActivated(topic.getQualifiedName(), subscription.getName());
+  }
+
+  @Test
+  public void shouldNotRemoveSubscriptionAfterItsRecreation() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isBadRequest();
+
+    assertThat(
+            hermes
+                .api()
+                .getSubscription(topic.getQualifiedName(), subscription.getName())
+                .getName())
+        .isEqualTo(subscription.getName());
+  }
+
+  @Test
+  public void shouldNotCreateSubscriptionWithoutTopic() {
+    // given
+    Subscription subscription =
+        subscriptionWithRandomName(TopicName.fromQualifiedName("pl.group.non-existing")).build();
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isNotFound();
+  }
+
+  @Test
+  public void shouldSuspendSubscription() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().suspendSubscription(topic, subscription.getName());
+
+    // then
+    response.expectStatus().isOk();
+    hermes.api().waitUntilSubscriptionSuspended(topic.getQualifiedName(), subscription.getName());
+  }
+
+  @Test
+  public void shouldUpdateSubscriptionEndpoint() {
+    // given
+    EndpointAddress updatedEndpoint = EndpointAddress.of("http://another-service-endpoint");
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .updateSubscription(
+                topic,
+                subscription.getName(),
+                patchData().set("endpoint", updatedEndpoint).build());
+
+    // then
+    response.expectStatus().isOk();
+    waitAtMost(Duration.ofSeconds(10))
+        .until(
+            () ->
+                hermes
+                    .api()
+                    .getSubscriptionResponse(topic.getQualifiedName(), subscription.getName())
+                    .expectStatus()
+                    .is2xxSuccessful()
+                    .expectBody(Subscription.class)
+                    .returnResult()
+                    .getResponseBody()
+                    .getEndpoint()
+                    .equals(updatedEndpoint));
+  }
+
+  @Test
+  public void shouldUpdateSubscriptionPolicy() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+    PatchData patchData =
+        patchData()
+            .set(
+                "subscriptionPolicy",
+                ImmutableMap.builder()
+                    .put("inflightSize", 100)
+                    .put("messageBackoff", 100)
+                    .put("messageTtl", 3600)
+                    .put("rate", 300)
+                    .put("requestTimeout", 1000)
+                    .put("socketTimeout", 3000)
+                    .put("retryClientErrors", false)
+                    .put("sendingDelay", 1000)
+                    .build())
+            .build();
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateSubscription(topic, subscription.getName(), patchData);
+
+    // then
+    response.expectStatus().isOk();
+    SubscriptionPolicy policy =
+        hermes
+            .api()
+            .getSubscription(topic.getQualifiedName(), subscription.getName())
+            .getSerialSubscriptionPolicy();
+    assertThat(policy.getInflightSize()).isEqualTo(100);
+    assertThat(policy.getMessageBackoff()).isEqualTo(100);
+    assertThat(policy.getMessageTtl()).isEqualTo(3600);
+    assertThat(policy.getRate()).isEqualTo(300);
+    assertThat(policy.getRequestTimeout()).isEqualTo(1000);
+    assertThat(policy.getSocketTimeout()).isEqualTo(3000);
+    assertThat(policy.isRetryClientErrors()).isFalse();
+    assertThat(policy.getSendingDelay()).isEqualTo(1000);
+  }
+
+  @Test
+  public void shouldRemoveSubscription() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().deleteSubscription(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    response.expectStatus().isOk();
+    hermes
+        .api()
+        .getSubscriptionResponse(topic.getQualifiedName(), subscription.getName())
+        .expectStatus()
+        .isBadRequest();
+  }
+
+  @Test
+  public void shouldReturnSubscriptionsThatAreCurrentlyTrackedForGivenTopic() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription trackedSubscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withTrackingMode(TrackingMode.TRACK_ALL)
+                    .build());
+    hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().listTrackedSubscriptions(topic.getQualifiedName());
+
+    // then
+    response.expectStatus().isOk();
+    assertThat(response.expectBody(String[].class).returnResult().getResponseBody())
+        .containsExactly(trackedSubscription.getName());
+  }
+
+  @Test
+  public void shouldReturnsTrackedAndNotSuspendedSubscriptionsForGivenTopic() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription trackedSubscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withTrackingMode(TrackingMode.TRACK_ALL)
+                    .build());
+    Subscription trackedSubscriptionSuspended =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withTrackingMode(TrackingMode.TRACK_ALL)
+                    .build());
+    hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    hermes.api().suspendSubscription(topic, trackedSubscriptionSuspended.getName());
+
+    // and
+    String query =
+        "{\"query\": {\"trackingEnabled\": \"true\", \"state\": {\"ne\": \"SUSPENDED\"}}}";
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().querySubscriptions(topic.getQualifiedName(), query);
+
+    // then
+    assertThat(
+            Arrays.stream(
+                    Objects.requireNonNull(
+                        response.expectBody(String[].class).returnResult().getResponseBody()))
+                .toList())
+        .containsExactly(trackedSubscription.getName());
+  }
+
+  @Test
+  public void shouldNotAllowSubscriptionNameToContainDollarSign() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    Stream.of("$name", "na$me", "name$")
+        .forEach(
+            name -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes.api().createSubscription(subscription(topic, name).build());
+
+              // then
+              response.expectStatus().isBadRequest();
+            });
+  }
+
+  @Test
+  public void shouldReturnHealthyStatusForAHealthySubscription() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // and
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName())
+            .withDeliveryRate(100)
+            .withRate(100)
+            .withThroughput(0)
+            .build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(subscription.getQualifiedName()).withRate(100).build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().getSubscriptionHealth(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    assertThat(response.expectBody(SubscriptionHealth.class).returnResult().getResponseBody())
+        .isEqualTo(SubscriptionHealth.HEALTHY);
+  }
+
+  @Test
+  public void shouldReturnUnhealthyStatusWithAProblemForMalfunctioningSubscription() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // and
+    prometheus.stubTopicMetrics(
+        topicMetrics(topic.getName()).withDeliveryRate(100).withRate(50).withThroughput(0).build());
+    prometheus.stubSubscriptionMetrics(
+        subscriptionMetrics(subscription.getQualifiedName()).withRate(50).with500Rate(11).build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().getSubscriptionHealth(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    SubscriptionHealth subscriptionHealth =
+        response.expectBody(SubscriptionHealth.class).returnResult().getResponseBody();
+    assertThat(subscriptionHealth.getStatus()).isEqualTo(UNHEALTHY);
+    assertThat(subscriptionHealth.getProblems())
+        .containsOnly(malfunctioning(11, topic.getQualifiedName() + "$" + subscription.getName()));
+  }
+
+  @Test
+  public void shouldReturnNoDataStatusWhenPrometheusRespondsWithAnError() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // and
+    prometheus.stub500Error();
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().getSubscriptionHealth(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    SubscriptionHealth subscriptionHealth =
+        response.expectBody(SubscriptionHealth.class).returnResult().getResponseBody();
+    assertThat(subscriptionHealth.getStatus()).isEqualTo(NO_DATA);
+  }
+
+  @Test
+  public void shouldNotAllowSubscriptionWithBatchDeliveryAndAvroContentType() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        subscriptionWithRandomName(topic.getName())
+            .withDeliveryType(DeliveryType.BATCH)
+            .withContentType(ContentType.AVRO)
+            .build();
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isBadRequest();
+  }
+
+  @Test
+  public void shouldReturnConsumerGroupDescription() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint()).build());
+    hermes.api().publishUntilStatus(topic.getQualifiedName(), MESSAGE.body(), 201);
+    subscriber.waitUntilAnyMessageReceived();
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().getConsumerGroupsDescription(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    response.expectStatus().isOk();
+    List<ConsumerGroup> consumerGroups =
+        response.expectBodyList(ConsumerGroup.class).returnResult().getResponseBody();
+    assertThat(consumerGroups.size()).isGreaterThan(0);
+    assertThat(consumerGroups)
+        .flatExtracting("members")
+        .flatExtracting("partitions")
+        .usingRecursiveFieldByFieldElementComparatorIgnoringFields(
+            "partition", "topic", "offsetMetadata", "contentType")
+        .containsOnlyOnce(new TopicPartition(-1, "any", 0, 1, "any", topic.getContentType()));
+  }
+
+  @Test
+  public void shouldNotCreateSubscriptionNotOwnedByTheUser() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription")
+            .withOwner(new OwnerId("Plaintext", "subscriptionOwner"))
+            .build();
+    TestSecurityProvider.setUserIsAdmin(false);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            "Provide an owner that includes you, you would not be able to manage this subscription later");
+  }
+
+  @Test
+  public void shouldNotUpdateSubscriptionNotOwnedByTheUser() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+    TestSecurityProvider.setUserIsAdmin(false);
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateSubscription(topic, subscription.getName(), PATCH_DATA);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            "Provide an owner that includes you, you would not be able to manage this subscription later");
+  }
+
+  @Test
+  public void shouldAllowAdminToBypassSubscribingRestrictions() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withSubscribingRestricted().build());
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription")
+            .withEndpoint("http://localhost:8081/topics/test-topic")
+            .build();
+    TestSecurityProvider.setUserIsAdmin(true);
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isCreated();
+
+    // when
+    WebTestClient.ResponseSpec updateResponse =
+        hermes.api().updateSubscription(topic, subscription.getName(), PATCH_DATA);
+
+    // then
+    updateResponse.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldAllowTopicOwnerToBypassSubscribingRestrictions() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withSubscribingRestricted().build());
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription")
+            .withEndpoint("http://localhost:8081/topics/test-topic")
+            .build();
+    TestSecurityProvider.setUserIsAdmin(false);
+    TestSecurityProvider.setUserAsOwner(topic.getOwner(), subscription.getOwner());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isCreated();
+
+    // when
+    WebTestClient.ResponseSpec updateResponse =
+        hermes.api().updateSubscription(topic, subscription.getName(), PATCH_DATA);
+
+    // then
+    updateResponse.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldAllowPrivilegedSubscriberToBypassSubscribingRestrictions() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withSubscribingRestricted().build());
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription")
+            .withOwner(new OwnerId("Plaintext", "subscriberAllowedToAccessAnyTopic"))
+            .withEndpoint("http://localhost:8081/topics/test-topic")
+            .build();
+    TestSecurityProvider.setUserIsAdmin(false);
+    TestSecurityProvider.setUserAsOwner(subscription.getOwner());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isCreated();
+
+    // when
+    WebTestClient.ResponseSpec updateResponse =
+        hermes.api().updateSubscription(topic, subscription.getName(), PATCH_DATA);
+
+    // then
+    updateResponse.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldRespectPrivilegedSubscriberProtocolsWhileCreatingSubscription() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withSubscribingRestricted().build());
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription")
+            .withOwner(new OwnerId("Plaintext", "subscriberAllowedToAccessAnyTopic"))
+            .withEndpoint(
+                "googlepubsub://pubsub.googleapis.com:443/projects/test-project/topics/test-topic")
+            .build();
+    TestSecurityProvider.setUserIsAdmin(false);
+    TestSecurityProvider.setUserAsOwner(subscription.getOwner());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isForbidden();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            "Subscribing to this topic has been restricted. Contact the topic owner to create a new subscription.");
+  }
+
+  @Test
+  public void shouldRespectPrivilegedSubscriberProtocolsWhileUpdatingEndpoint() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withSubscribingRestricted().build());
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription")
+            .withOwner(new OwnerId("Plaintext", "subscriberAllowedToAccessAnyTopic"))
+            .withEndpoint("http://localhost:8081/topics/test-topic")
+            .build();
+    hermes.initHelper().createSubscription(subscription);
+    TestSecurityProvider.setUserIsAdmin(false);
+    TestSecurityProvider.setUserAsOwner(subscription.getOwner());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .updateSubscription(
+                topic,
+                subscription.getName(),
+                patchData()
+                    .set(
+                        "endpoint",
+                        EndpointAddress.of(
+                            "googlepubsub://pubsub.googleapis.com:443/projects/test-project/topics/test-topic"))
+                    .build());
+
+    // then
+    response.expectStatus().isForbidden();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            "Subscribing to this topic has been restricted. Contact the topic owner to modify the endpoint of this subscription.");
+  }
+
+  @Test
+  public void shouldNotAllowUnprivilegedUserToCreateSubscriptionWhenSubscribingIsRestricted() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withSubscribingRestricted().build());
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription")
+            .withOwner(new OwnerId("Plaintext", "subscriptionOwner"))
+            .build();
+    TestSecurityProvider.setUserIsAdmin(false);
+    TestSecurityProvider.setUserAsOwner(subscription.getOwner());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createSubscription(subscription);
+
+    // then
+    response.expectStatus().isForbidden();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            "Subscribing to this topic has been restricted. Contact the topic owner to create a new subscription.");
+  }
+
+  @Test
+  public void shouldNotAllowUnprivilegedUserToUpdateEndpointWhenSubscribingIsRestricted() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withSubscribingRestricted().build());
+    Subscription subscription =
+        subscription(topic.getQualifiedName(), "subscription")
+            .withOwner(new OwnerId("Plaintext", "subscriptionOwner"))
+            .withEndpoint("http://localhost:8081/topics/test-topic")
+            .build();
+    hermes.initHelper().createSubscription(subscription);
+    TestSecurityProvider.setUserIsAdmin(false);
+    TestSecurityProvider.setUserAsOwner(subscription.getOwner());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateSubscription(topic, subscription.getName(), PATCH_DATA);
+
+    // then
+    response.expectStatus().isForbidden();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            "Subscribing to this topic has been restricted. Contact the topic owner to modify the endpoint of this subscription.");
+  }
+
+  @Test
+  public void shouldSetInflightSizeToNullByDefault() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+    TestSecurityProvider.setUserIsAdmin(false);
+
+    // when
+    Subscription response =
+        hermes.api().getSubscription(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    assertThat(response.getSerialSubscriptionPolicy().getInflightSize()).isNull();
+  }
+
+  @Test
+  public void shouldReturnInflightSizeWhenSetToNonNullValue() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withSubscriptionPolicy(
+                        SubscriptionPolicy.Builder.subscriptionPolicy()
+                            .withInflightSize(42)
+                            .build())
+                    .build());
+    TestSecurityProvider.setUserIsAdmin(false);
+
+    // when
+    Subscription response =
+        hermes.api().getSubscription(topic.getQualifiedName(), subscription.getName());
+
+    // then
+    assertThat(response.getSerialSubscriptionPolicy().getInflightSize()).isEqualTo(42);
+  }
+
+  @Test
+  public void shouldMoveOffsetsToTheEnd() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber(503);
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName(), subscriber.getEndpoint())
+                    .withSubscriptionPolicy(SubscriptionPolicy.create(Map.of("messageTtl", 3600)))
+                    .build());
+    List<String> messages = List.of(MESSAGE.body(), MESSAGE.body(), MESSAGE.body(), MESSAGE.body());
+
+    // prevents from moving offsets during messages sending
+    messages.forEach(
+        message -> {
+          hermes.api().publishUntilSuccess(topic.getQualifiedName(), message);
+          subscriber.waitUntilReceived(message);
+        });
+
+    assertThat(allConsumerGroupOffsetsMovedToTheEnd(subscription)).isFalse();
+
+    hermes.api().deleteSubscription(topic.getQualifiedName(), subscription.getName());
+
+    // when
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () ->
+                hermes
+                    .api()
+                    .moveOffsetsToTheEnd(topic.getQualifiedName(), subscription.getName())
+                    .expectStatus()
+                    .isOk());
+
+    // then
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> assertThat(allConsumerGroupOffsetsMovedToTheEnd(subscription)).isTrue());
+  }
+
+  private boolean allConsumerGroupOffsetsMovedToTheEnd(Subscription subscription) {
+    List<BrokerOperations.ConsumerGroupOffset> partitionsOffsets =
+        brokerOperations.getTopicPartitionsOffsets(subscription.getQualifiedName());
+    return !partitionsOffsets.isEmpty()
+        && partitionsOffsets.stream().allMatch(BrokerOperations.ConsumerGroupOffset::movedToEnd);
+  }
+}
diff --git a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/TopicManagementTest.java b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/TopicManagementTest.java
index 693df0a172..df422b6c2f 100644
--- a/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/TopicManagementTest.java
+++ b/integration-tests/src/integrationTest/java/pl/allegro/tech/hermes/integrationtests/management/TopicManagementTest.java
@@ -1,8 +1,28 @@
 package pl.allegro.tech.hermes.integrationtests.management;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.ContentType.JSON;
+import static pl.allegro.tech.hermes.api.PatchData.patchData;
+import static pl.allegro.tech.hermes.api.PublishingChaosPolicy.ChaosMode.DATACENTER;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.integrationtests.setup.HermesExtension.auditEvents;
+import static pl.allegro.tech.hermes.integrationtests.setup.HermesExtension.brokerOperations;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.jayway.awaitility.Duration;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -11,578 +31,1022 @@
 import pl.allegro.tech.hermes.api.ErrorDescription;
 import pl.allegro.tech.hermes.api.Group;
 import pl.allegro.tech.hermes.api.PatchData;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy.ChaosPolicy;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicLabel;
 import pl.allegro.tech.hermes.api.TopicWithSchema;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesExtension;
+import pl.allegro.tech.hermes.management.TestSecurityProvider;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.ContentType.JSON;
-import static pl.allegro.tech.hermes.api.PatchData.patchData;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.integrationtests.setup.HermesExtension.auditEvents;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscriptionWithRandomName;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class TopicManagementTest {
 
-    @RegisterExtension
-    public static final HermesExtension hermes = new HermesExtension();
+  @RegisterExtension public static final HermesExtension hermes = new HermesExtension();
+
+  private static final String SCHEMA = AvroUserSchemaLoader.load().toString();
+
+  @AfterEach
+  public void cleanup() {
+    TestSecurityProvider.reset();
+  }
+
+  @Test
+  public void shouldEmitAuditEventWhenTopicCreated() {
+    // when
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("CREATED", "Topic", topic.getQualifiedName());
+  }
+
+  @Test
+  public void shouldEmitAuditEventWhenTopicRemoved() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    hermes.api().deleteTopic(topic.getQualifiedName()).expectStatus().isOk();
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("REMOVED", topic.getQualifiedName());
+  }
+
+  @Test
+  public void shouldEmitAuditEventWhenTopicUpdated() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    PatchData patchData = PatchData.from(ImmutableMap.of("maxMessageSize", 2048));
+
+    // when
+    hermes.api().updateTopic(topic.getQualifiedName(), patchData);
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("UPDATED", topic.getQualifiedName());
+  }
+
+  @Test
+  public void shouldEmitAuditEventBeforeUpdateWhenWrongPatchDataKeyProvided() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    PatchData patchData = PatchData.from(ImmutableMap.of("someValue", 2048));
+
+    // when
+    hermes.api().updateTopic(topic.getQualifiedName(), patchData);
+
+    // then
+    assertThat(auditEvents.getLastReceivedRequest().getBodyAsString())
+        .contains("BEFORE_UPDATE", topic.getQualifiedName(), "someValue", "2048");
+  }
+
+  @Test
+  public void shouldCreateTopic() {
+    // given
+    TopicWithSchema topic = TopicWithSchema.topicWithSchema(topicWithRandomName().build());
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isCreated();
+    hermes.api().getTopicResponse(topic.getQualifiedName()).expectStatus().isOk().expectBody();
+  }
+
+  @Test
+  public void shouldListTopics() {
+    // given
+    hermes.initHelper().createTopic(topic("listTopicsGroup.topic1").build());
+    hermes.api().createTopic(new TopicWithSchema(topic("listTopicsGroup.topic2").build(), null));
+
+    // when then
+    assertThat(getGroupTopicsList("listTopicsGroup"))
+        .containsExactly("listTopicsGroup.topic1", "listTopicsGroup.topic2");
+  }
+
+  @Test
+  public void shouldRemoveTopic() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().deleteTopic(topic.getQualifiedName());
+
+    // then
+    response.expectStatus().isOk();
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> assertThat(getGroupTopicsList(topic.getName().getGroupName())).isEmpty());
+  }
+
+  @Test
+  public void shouldUnblacklistTopicWhileDeleting() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes.api().blacklistTopic(topic.getQualifiedName());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().deleteTopic(topic.getQualifiedName());
+
+    // then
+    response.expectStatus().isOk();
+    waitAtMost(Duration.ofSeconds(10))
+        .untilAsserted(
+            () -> assertThat(getGroupTopicsList(topic.getName().getGroupName())).isEmpty());
+    assertThat(hermes.api().isTopicBlacklisted(topic.getQualifiedName()).isBlacklisted()).isFalse();
+  }
+
+  @Test
+  public void shouldNotAllowOnDeletingTopicWithSubscriptions() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().deleteTopic(topic.getQualifiedName());
+
+    // then
+    response.expectStatus().isForbidden();
+    assertThat(getErrorCode(response)).isEqualTo(ErrorCode.TOPIC_NOT_EMPTY);
+  }
+
+  @Test
+  public void shouldRemoveTopicWithRelatedSubscriptionsWhenAutoRemoveEnabled() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    Subscription subscription =
+        hermes
+            .initHelper()
+            .createSubscription(
+                subscriptionWithRandomName(topic.getName())
+                    .withAutoDeleteWithTopicEnabled(true)
+                    .build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().deleteTopic(topic.getQualifiedName());
+
+    // then
+    response.expectStatus().isOk();
+
+    // and
+    hermes
+        .api()
+        .getSubscriptionResponse(topic.getQualifiedName(), subscription.getName())
+        .expectStatus()
+        .isBadRequest();
+  }
+
+  @Test
+  public void shouldNotCreateInvalidTopic() {
+    // given
+    String groupName = "invalidTopicGroup";
+    hermes.initHelper().createGroup(Group.from(groupName));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes
+            .api()
+            .createTopic(
+                topicWithSchema(
+                    topic(groupName, "shouldNotCreateInvalidTopic")
+                        .withMaxMessageSize(Topic.MAX_MESSAGE_SIZE + 1)
+                        .build()));
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(getErrorCode(response)).isEqualTo(ErrorCode.VALIDATION_ERROR);
+    assertThat(getGroupTopicsList(groupName)).isEmpty();
+  }
+
+  @Test
+  public void shouldNotCreateTopicWithMissingGroup() {
+    // given no group
+
+    // when
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topic("nonExistingGroup", "topic")
+                .withContentType(AVRO)
+                .withTrackingEnabled(false)
+                .build(),
+            SCHEMA);
+    WebTestClient.ResponseSpec createTopicResponse = hermes.api().createTopic(topicWithSchema);
+    WebTestClient.ResponseSpec schemaResponse =
+        hermes.api().getSchema(topicWithSchema.getQualifiedName());
+
+    // then
+    createTopicResponse.expectStatus().isNotFound();
+    assertThat(getErrorCode(createTopicResponse)).isEqualTo(ErrorCode.GROUP_NOT_EXISTS);
+    schemaResponse.expectStatus().isNoContent();
+  }
+
+  @Test
+  public void shouldNotAllowOnCreatingSameTopicTwice() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().createTopic(new TopicWithSchema(topic, null));
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(getErrorCode(response)).isEqualTo(ErrorCode.TOPIC_ALREADY_EXISTS);
+  }
+
+  @Test
+  public void shouldAllowMigratingTopicFromJsonToAvroByExtendingTopicWithAvroSchema() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
+
+    // when
+    PatchData patch =
+        patchData()
+            .set("contentType", ContentType.AVRO)
+            .set("migratedFromJsonType", true)
+            .set("schema", AvroUserSchemaLoader.load().toString())
+            .build();
+    WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patch);
+
+    // when
+    response.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldNotAllowMigratingTopicFromJsonToAvroWhenProvidingInvalidSchema() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
+
+    // when
+    PatchData patch =
+        patchData()
+            .set("contentType", ContentType.AVRO)
+            .set("migratedFromJsonType", true)
+            .set("schema", "invalid...")
+            .build();
+    WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patch);
+
+    // when
+    response.expectStatus().isBadRequest();
+    assertThat(getErrorCode(response)).isEqualTo(ErrorCode.SCHEMA_BAD_REQUEST);
+  }
+
+  @Test
+  public void
+      shouldAllowMigratingTopicFromJsonToAvroWithoutProvidingAvroSchemaWhenItsAlreadyAvailableInRegistry() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
+    hermes
+        .api()
+        .saveSchema(topic.getQualifiedName(), false, AvroUserSchemaLoader.load().toString());
+
+    // when
+    PatchData patch =
+        patchData().set("contentType", ContentType.AVRO).set("migratedFromJsonType", true).build();
+    WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patch);
+
+    // when
+    response.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldReturnTopicsThatAreCurrentlyTracked() {
+    // given
+    Topic trackedTopic =
+        hermes.initHelper().createTopic(topicWithRandomName().withTrackingEnabled(true).build());
+    Topic untrackedTopic =
+        hermes.initHelper().createTopic(topicWithRandomName().withTrackingEnabled(false).build());
 
-    private static final String SCHEMA = AvroUserSchemaLoader.load().toString();
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().listTrackedTopics("");
+
+    // then
+    response.expectStatus().isOk();
+    assertThat(
+            Arrays.stream(
+                    Objects.requireNonNull(
+                        response.expectBody(String[].class).returnResult().getResponseBody()))
+                .toList())
+        .contains(trackedTopic.getQualifiedName())
+        .doesNotContain(untrackedTopic.getQualifiedName());
+  }
+
+  @Test
+  public void shouldReturnTopicsThatAreCurrentlyTrackedForGivenGroup() {
+    // given
+    String groupName = "mixedTrackedGroup1";
+    Topic trackedTopic =
+        hermes
+            .initHelper()
+            .createTopic(topic(groupName, "trackedTopic1").withTrackingEnabled(true).build());
+    hermes.initHelper().createTopic(topicWithRandomName().withTrackingEnabled(false).build());
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().listTrackedTopics(groupName);
+
+    // then
+    response.expectStatus().isOk();
+    assertThat(
+            Arrays.stream(
+                    Objects.requireNonNull(
+                        response.expectBody(String[].class).returnResult().getResponseBody()))
+                .toList())
+        .containsExactly(trackedTopic.getQualifiedName());
+  }
+
+  @Test
+  public void shouldReturnTrackedTopicsWithAvroContentType() {
+    // given
+    String group = "mixedTrackedGroup2";
+    Topic trackedTopicAvro =
+        hermes
+            .initHelper()
+            .createTopicWithSchema(
+                new TopicWithSchema(
+                    topic(group, "trackedAvroTopic2")
+                        .withTrackingEnabled(true)
+                        .withContentType(AVRO)
+                        .build(),
+                    SCHEMA));
+    Topic untrackedAvroTopic =
+        hermes
+            .initHelper()
+            .createTopicWithSchema(
+                new TopicWithSchema(
+                    topicWithRandomName().withTrackingEnabled(false).withContentType(AVRO).build(),
+                    SCHEMA));
+    Topic untrackedJsonTopic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName().withTrackingEnabled(false).withContentType(JSON).build());
+    Topic trackedJsonTopic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName().withTrackingEnabled(true).withContentType(JSON).build());
+
+    // and
+    String query = "{\"query\": {\"trackingEnabled\": \"true\", \"contentType\": \"AVRO\"}}";
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().queryTopics("", query);
+
+    // then
+    assertThat(
+            Arrays.stream(
+                    Objects.requireNonNull(
+                        response.expectBody(String[].class).returnResult().getResponseBody()))
+                .toList())
+        .contains(trackedTopicAvro.getQualifiedName())
+        .doesNotContain(
+            untrackedJsonTopic.getQualifiedName(),
+            untrackedAvroTopic.getQualifiedName(),
+            trackedJsonTopic.getQualifiedName());
+  }
+
+  @Test
+  public void shouldReturnTrackedTopicsWithAvroContentTypeForGivenGroup() {
+    // given
+    String group = "mixedTrackedGroup3";
+    Topic trackedTopicAvro =
+        hermes
+            .initHelper()
+            .createTopicWithSchema(
+                new TopicWithSchema(
+                    topic(group, "trackedAvroTopic3")
+                        .withTrackingEnabled(true)
+                        .withContentType(AVRO)
+                        .build(),
+                    SCHEMA));
+    hermes
+        .api()
+        .createTopic(
+            new TopicWithSchema(
+                topic(group, "untrackedAvroTopic")
+                    .withTrackingEnabled(false)
+                    .withContentType(AVRO)
+                    .build(),
+                SCHEMA));
+    hermes
+        .api()
+        .createTopic(
+            new TopicWithSchema(
+                topic(group, "untrackedJsonTopic")
+                    .withTrackingEnabled(false)
+                    .withContentType(JSON)
+                    .build(),
+                null));
+    hermes
+        .api()
+        .createTopic(
+            new TopicWithSchema(
+                topic(group, "trackedJsonTopic")
+                    .withTrackingEnabled(true)
+                    .withContentType(JSON)
+                    .build(),
+                null));
+
+    // and
+    String query = "{\"query\": {\"trackingEnabled\": \"true\", \"contentType\": \"AVRO\"}}";
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().queryTopics(group, query);
+
+    // then
+    assertThat(
+            Arrays.stream(
+                    Objects.requireNonNull(
+                        response.expectBody(String[].class).returnResult().getResponseBody()))
+                .toList())
+        .containsExactly(trackedTopicAvro.getQualifiedName())
+        .doesNotContain(
+            group + "." + "untrackedAvroTopic",
+            group + "." + "untrackedJsonTopic",
+            group + "." + "trackedJsonTopic");
+  }
+
+  @Test
+  public void shouldNotAllowDollarSign() {
+    // given
+    String group = "dollar";
+    hermes.initHelper().createGroup(Group.from(group));
+
+    Stream.of("$name", "na$me", "name$")
+        .forEach(
+            topicName -> {
+              // when
+              WebTestClient.ResponseSpec response =
+                  hermes
+                      .api()
+                      .createTopic(new TopicWithSchema(topic(group, topicName).build(), null));
+
+              // then
+              response.expectStatus().isBadRequest();
+            });
+  }
+
+  @Test
+  public void shouldCreateTopicWithMaxMessageSize() {
+    // given
+    TopicWithSchema topic =
+        new TopicWithSchema(topicWithRandomName().withMaxMessageSize(2048).build(), null);
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isCreated();
+    int fetchedMessageSize =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .getMaxMessageSize();
+    assertThat(fetchedMessageSize).isEqualTo(2048);
+  }
+
+  @Test
+  public void shouldUpdateTopicWithMaxMessageSize() {
+    // given
+    Topic topic =
+        hermes.initHelper().createTopic(topicWithRandomName().withMaxMessageSize(2048).build());
+    PatchData patchData = PatchData.from(ImmutableMap.of("maxMessageSize", 1024));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-    @Test
-    public void shouldEmmitAuditEventWhenTopicCreated() {
-        //when
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    // then
+    response.expectStatus().isOk();
+    int fetchedMessageSize =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .getMaxMessageSize();
+    assertThat(fetchedMessageSize).isEqualTo(1024);
+  }
+
+  @Test
+  public void shouldCreateTopicWithRestrictedSubscribing() {
+    // given
+    TopicWithSchema topic =
+        new TopicWithSchema(topicWithRandomName().withSubscribingRestricted().build(), null);
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isCreated();
+    boolean fetchedIsSubscribingRestricted =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .isSubscribingRestricted();
+    assertThat(fetchedIsSubscribingRestricted).isTrue();
+  }
+
+  @Test
+  public void shouldUpdateTopicWithRestrictedSubscribing() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    PatchData patchData = PatchData.from(ImmutableMap.of("subscribingRestricted", true));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-        //then
-        assertThat(
-                auditEvents.getLastReceivedRequest().getBodyAsString()
-        ).contains("CREATED", "Topic", topic.getQualifiedName());
-    }
+    // then
+    response.expectStatus().isOk();
+    boolean fetchedIsSubscribingRestricted =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .isSubscribingRestricted();
+    assertThat(fetchedIsSubscribingRestricted).isTrue();
+  }
+
+  @Test
+  public void shouldCreateTopicWithOfflineStorageSettings() {
+    // given
+    TopicWithSchema topic =
+        new TopicWithSchema(topicWithRandomName().withOfflineStorage(2).build(), null);
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isCreated();
+    int fetchedOfflineStorageDurationTime =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .getOfflineStorage()
+            .getRetentionTime()
+            .getDuration();
+    assertThat(fetchedOfflineStorageDurationTime).isEqualTo(2);
+  }
+
+  @Test
+  public void shouldUpdateTopicWithOfflineStorageSettings() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    PatchData patchData =
+        PatchData.from(ImmutableMap.of("offlineStorage", ImmutableMap.of("enabled", true)));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-    @Test
-    public void shouldEmmitAuditEventWhenTopicRemoved() {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    // then
+    response.expectStatus().isOk();
+    boolean fetchedIsOfflineStorageEnabled =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .getOfflineStorage()
+            .isEnabled();
+    assertThat(fetchedIsOfflineStorageEnabled).isTrue();
+  }
+
+  @Test
+  public void shouldCreateTopicWithLabels() {
+    // given
+    TopicWithSchema topic =
+        new TopicWithSchema(
+            topicWithRandomName()
+                .withLabels(
+                    ImmutableSet.of(
+                        new TopicLabel("label-1"),
+                        new TopicLabel("label-2"),
+                        new TopicLabel("label-3")))
+                .build(),
+            null);
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isCreated();
+    Set<TopicLabel> fetchedLabels =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .getLabels();
+    assertThat(fetchedLabels)
+        .containsAll(
+            ImmutableSet.of(
+                new TopicLabel("label-1"), new TopicLabel("label-2"), new TopicLabel("label-3")));
+  }
+
+  @Test
+  public void shouldUpdateTopicWithLabels() {
+    // given
+    TopicWithSchema topic =
+        new TopicWithSchema(
+            topicWithRandomName()
+                .withLabels(ImmutableSet.of(new TopicLabel("label-1"), new TopicLabel("label-3")))
+                .build(),
+            null);
+    hermes.initHelper().createTopic(topic);
+
+    // when
+    PatchData patchData =
+        PatchData.from(
+            ImmutableMap.of(
+                "labels",
+                ImmutableSet.of(
+                    new TopicLabel("label-1"),
+                    new TopicLabel("label-2"),
+                    new TopicLabel("label-3"))));
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-        //when
-        hermes.api().deleteTopic(topic.getQualifiedName()).expectStatus().isOk();
+    // then
+    response.expectStatus().isOk();
+    Set<TopicLabel> fetchedLabels =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .getLabels();
+    assertThat(fetchedLabels)
+        .containsAll(
+            ImmutableSet.of(
+                new TopicLabel("label-1"), new TopicLabel("label-2"), new TopicLabel("label-3")));
+  }
+
+  @Test
+  public void shouldNotCreateTopicWithDisallowedLabels() {
+    // given
+    TopicWithSchema topic =
+        new TopicWithSchema(
+            topicWithRandomName()
+                .withLabels(
+                    ImmutableSet.of(
+                        new TopicLabel("some-random-label"),
+                        new TopicLabel("label-2"),
+                        new TopicLabel("label-3")))
+                .build(),
+            null);
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(getErrorCode(response)).isEqualTo(ErrorCode.VALIDATION_ERROR);
+    hermes.api().getTopicResponse(topic.getQualifiedName()).expectStatus().isNotFound();
+  }
+
+  @Test
+  public void shouldNotUpdateTopicWithDisallowedLabels() {
+    // given
+    TopicWithSchema topic =
+        new TopicWithSchema(
+            topicWithRandomName()
+                .withLabels(ImmutableSet.of(new TopicLabel("label-1"), new TopicLabel("label-3")))
+                .build(),
+            null);
+    hermes.initHelper().createTopic(topic);
+
+    // when
+    PatchData patchData =
+        PatchData.from(
+            ImmutableMap.of(
+                "labels",
+                ImmutableSet.of(
+                    new TopicLabel("some-random-label"),
+                    new TopicLabel("label-2"),
+                    new TopicLabel("label-3"))));
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-        //then
-        assertThat(
-                auditEvents.getLastReceivedRequest().getBodyAsString()
-        ).contains("REMOVED", topic.getQualifiedName());
-    }
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(getErrorCode(response)).isEqualTo(ErrorCode.VALIDATION_ERROR);
+    Set<TopicLabel> fetchedLabels =
+        hermes
+            .api()
+            .getTopicResponse(topic.getQualifiedName())
+            .expectBody(TopicWithSchema.class)
+            .returnResult()
+            .getResponseBody()
+            .getLabels();
+    assertThat(fetchedLabels)
+        .containsAll(ImmutableSet.of(new TopicLabel("label-1"), new TopicLabel("label-3")));
+  }
+
+  @Test
+  public void shouldCreateTopicEvenIfExistsInBrokers() {
+    // given
+    String groupName = "existingTopicFromExternalBroker";
+    String topicName = "topic";
+    String qualifiedTopicName = groupName + "." + topicName;
+    hermes.initHelper().createGroup(Group.from(groupName));
+
+    brokerOperations.createTopic(qualifiedTopicName);
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().createTopic((topicWithSchema(topic(groupName, topicName).build())));
+
+    // then
+    response.expectStatus().isCreated();
+    hermes.api().getTopicResponse(qualifiedTopicName).expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldNotAllowNonAdminUserCreateTopicWithNonDefaultFallbackToRemoteDatacenter() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(false);
+    TopicWithSchema topic =
+        topicWithSchema(topicWithRandomName().withFallbackToRemoteDatacenterEnabled().build());
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("User is not allowed to set non-default fallback to remote datacenter");
+  }
+
+  @Test
+  public void shouldAllowAdminUserCreateTopicWithNonDefaultFallbackToRemoteDatacenterEnabled() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(true);
+    TopicWithSchema topic =
+        topicWithSchema(topicWithRandomName().withFallbackToRemoteDatacenterEnabled().build());
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isCreated();
+  }
+
+  @Test
+  public void shouldNotAllowNonAdminUserToChangeFallbackToRemoteDatacenter() {
+    // given
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(topicWithRandomName().withFallbackToRemoteDatacenterEnabled().build());
+    TestSecurityProvider.setUserIsAdmin(false);
+    PatchData patchData =
+        PatchData.from(ImmutableMap.of("fallbackToRemoteDatacenterEnabled", false));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-    @Test
-    public void shouldEmmitAuditEventWhenTopicUpdated() {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        PatchData patchData = PatchData.from(ImmutableMap.of("maxMessageSize", 2048));
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("User is not allowed to update fallback to remote datacenter for this topic");
+  }
+
+  @Test
+  public void shouldAllowAdminUserToChangeFallbackToRemoteDatacenter() {
+    // given
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(topicWithRandomName().withFallbackToRemoteDatacenterEnabled().build());
+    TestSecurityProvider.setUserIsAdmin(true);
+    PatchData patchData =
+        PatchData.from(ImmutableMap.of("fallbackToRemoteDatacenterEnabled", false));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-        //when
+    // then
+    response.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldAllowNonAdminUserToModifyTopicWithFallbackToRemoteDatacenterEnabled() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(true);
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(topicWithRandomName().withFallbackToRemoteDatacenterEnabled().build());
+    TestSecurityProvider.setUserIsAdmin(false);
+    PatchData patchData = PatchData.from(ImmutableMap.of("description", "new description"));
+
+    // when
+    WebTestClient.ResponseSpec response =
         hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-        //then
-        assertThat(
-                auditEvents.getLastReceivedRequest().getBodyAsString()
-        ).contains("UPDATED", topic.getQualifiedName());
-    }
+    // then
+    response.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldNotAllowNonAdminUserCreateTopicWithChaosEnabled() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(false);
+    TopicWithSchema topic =
+        topicWithSchema(
+            topicWithRandomName()
+                .withPublishingChaosPolicy(new PublishingChaosPolicy(DATACENTER, null, Map.of()))
+                .build());
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("User is not allowed to set chaos policy for this topic");
+  }
+
+  @Test
+  public void shouldAllowAdminUserCreateTopicWithChaosEnabled() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(true);
+    TopicWithSchema topic =
+        topicWithSchema(
+            topicWithRandomName()
+                .withPublishingChaosPolicy(new PublishingChaosPolicy(DATACENTER, null, Map.of()))
+                .build());
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isCreated();
+  }
+
+  @Test
+  public void shouldNotCreateTopicWithInvalidChaosPolicy() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(true);
+    TopicWithSchema topic =
+        topicWithSchema(
+            topicWithRandomName()
+                .withPublishingChaosPolicy(
+                    new PublishingChaosPolicy(
+                        DATACENTER, null, Map.of("dc1", new ChaosPolicy(100, 100, 99, false))))
+                .build());
+    hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
+
+    // when
+    WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            "Invalid chaos policy: 'delayFrom' and 'delayTo' must be >= 0, and 'delayFrom' <= 'delayTo'.");
+  }
+
+  @Test
+  public void shouldNotAllowNonAdminUserToEnableChaos() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSecurityProvider.setUserIsAdmin(false);
+    PatchData patchData =
+        PatchData.from(ImmutableMap.of("chaos", ImmutableMap.of("mode", DATACENTER)));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-    @Test
-    public void shouldEmmitAuditEventBeforeUpdateWhenWrongPatchDataKeyProvided() {
-        //given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        PatchData patchData = PatchData.from(ImmutableMap.of("someValue", 2048));
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains("User is not allowed to update chaos policy for this topic");
+  }
+
+  @Test
+  public void shouldAllowAdminUserToEnableChaos() {
+    // given
+    Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
+    TestSecurityProvider.setUserIsAdmin(true);
+    PatchData patchData =
+        PatchData.from(ImmutableMap.of("chaos", ImmutableMap.of("mode", DATACENTER)));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-        //when
+    // then
+    response.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldAllowNonAdminUserToModifyTopicWithChaosEnabled() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(true);
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName()
+                    .withPublishingChaosPolicy(
+                        new PublishingChaosPolicy(DATACENTER, null, Map.of()))
+                    .build());
+    TestSecurityProvider.setUserIsAdmin(false);
+    PatchData patchData = PatchData.from(ImmutableMap.of("description", "new description"));
+
+    // when
+    WebTestClient.ResponseSpec response =
         hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-        //then
-        assertThat(
-                auditEvents.getLastReceivedRequest().getBodyAsString()
-        ).contains("BEFORE_UPDATE", topic.getQualifiedName(), "someValue", "2048");
-    }
-
-    @Test
-    public void shouldCreateTopic() {
-        //given
-        TopicWithSchema topic = TopicWithSchema.topicWithSchema(topicWithRandomName().build());
-        hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
-
-        // then
-        response.expectStatus().isCreated();
-        hermes.api().getTopicResponse(topic.getQualifiedName()).expectStatus().isOk().expectBody();
-    }
-
-    @Test
-    public void shouldListTopics() {
-        // given
-        hermes.initHelper().createTopic(topic("listTopicsGroup.topic1").build());
-        hermes.api().createTopic( new TopicWithSchema(topic("listTopicsGroup.topic2").build(), null));
-
-        // when then
-        assertThat(getGroupTopicsList("listTopicsGroup")).containsExactly("listTopicsGroup.topic1", "listTopicsGroup.topic2");
-    }
-
-    @Test
-    public void shouldRemoveTopic() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().deleteTopic(topic.getQualifiedName());
-
-        // then
-        response.expectStatus().isOk();
-        waitAtMost(Duration.TEN_SECONDS).until(() -> assertThat(getGroupTopicsList(topic.getName().getGroupName())).isEmpty());
-    }
-
-    @Test
-    public void shouldUnblacklistTopicWhileDeleting() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.api().blacklistTopic(topic.getQualifiedName());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().deleteTopic(topic.getQualifiedName());
-
-        // then
-        response.expectStatus().isOk();
-        waitAtMost(Duration.TEN_SECONDS).until(() -> assertThat(getGroupTopicsList(topic.getName().getGroupName())).isEmpty());
-        assertThat(hermes.api().isTopicBlacklisted(topic.getQualifiedName()).isBlacklisted()).isFalse();
-    }
-
-    @Test
-    public void shouldNotAllowOnDeletingTopicWithSubscriptions() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName()).build());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().deleteTopic(topic.getQualifiedName());
-
-        // then
-        response.expectStatus().isForbidden();
-        assertThat(getErrorCode(response)).isEqualTo(ErrorCode.TOPIC_NOT_EMPTY);
-    }
-
-    @Test
-    public void shouldRemoveTopicWithRelatedSubscriptionsWhenAutoRemoveEnabled() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        Subscription subscription = hermes.initHelper().createSubscription(subscriptionWithRandomName(topic.getName())
-                .withAutoDeleteWithTopicEnabled(true).build());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().deleteTopic(topic.getQualifiedName());
-
-        // then
-        response.expectStatus().isOk();
-
-        // and
-        hermes.api().getSubscriptionResponse(topic.getQualifiedName(), subscription.getName()).expectStatus().isBadRequest();
-    }
-
-    @Test
-    public void shouldNotCreateInvalidTopic() {
-        // given
-        String groupName = "invalidTopicGroup";
-        hermes.initHelper().createGroup(Group.from(groupName));
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().createTopic(
-                topicWithSchema(topic(groupName, "shouldNotCreateInvalidTopic").withMaxMessageSize(Topic.MAX_MESSAGE_SIZE + 1).build()));
-
-        // then
-        response.expectStatus().isBadRequest();
-        assertThat(getErrorCode(response)).isEqualTo(ErrorCode.VALIDATION_ERROR);
-        assertThat(getGroupTopicsList(groupName)).isEmpty();
-    }
-
-    @Test
-    public void shouldNotCreateTopicWithMissingGroup() {
-        // given no group
-
-        // when
-        TopicWithSchema topicWithSchema = topicWithSchema(topic("nonExistingGroup", "topic")
-                .withContentType(AVRO)
-                .withTrackingEnabled(false).build(), SCHEMA);
-        WebTestClient.ResponseSpec createTopicResponse = hermes.api().createTopic(topicWithSchema);
-        WebTestClient.ResponseSpec schemaResponse = hermes.api().getSchema(topicWithSchema.getQualifiedName());
-
-        // then
-        createTopicResponse.expectStatus().isNotFound();
-        assertThat(getErrorCode(createTopicResponse)).isEqualTo(ErrorCode.GROUP_NOT_EXISTS);
-        schemaResponse.expectStatus().isNoContent();
-    }
-
-    @Test
-    public void shouldNotAllowOnCreatingSameTopicTwice() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().createTopic(new TopicWithSchema(topic, null));
-
-        // then
-        response.expectStatus().isBadRequest();
-        assertThat(getErrorCode(response)).isEqualTo(ErrorCode.TOPIC_ALREADY_EXISTS);
-    }
-
-    @Test
-    public void shouldAllowMigratingTopicFromJsonToAvroByExtendingTopicWithAvroSchema() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
-
-        // when
-        PatchData patch = patchData()
-                .set("contentType", ContentType.AVRO)
-                .set("migratedFromJsonType", true)
-                .set("schema", AvroUserSchemaLoader.load().toString())
-                .build();
-        WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patch);
-
-        // when
-        response.expectStatus().isOk();
-    }
-
-    @Test
-    public void shouldNotAllowMigratingTopicFromJsonToAvroWhenProvidingInvalidSchema() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
-
-        // when
-        PatchData patch = patchData()
-                .set("contentType", ContentType.AVRO)
-                .set("migratedFromJsonType", true)
-                .set("schema", "invalid...")
-                .build();
-        WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patch);
-
-        // when
-        response.expectStatus().isBadRequest();
-        assertThat(getErrorCode(response)).isEqualTo(ErrorCode.SCHEMA_BAD_REQUEST);
-    }
-
-    @Test
-    public void shouldAllowMigratingTopicFromJsonToAvroWithoutProvidingAvroSchemaWhenItsAlreadyAvailableInRegistry() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
-        hermes.api().saveSchema(topic.getQualifiedName(), false, AvroUserSchemaLoader.load().toString());
-
-        // when
-        PatchData patch = patchData()
-                .set("contentType", ContentType.AVRO)
-                .set("migratedFromJsonType", true)
-                .build();
-        WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patch);
-
-        // when
-        response.expectStatus().isOk();
-    }
-
-    @Test
-    public void shouldReturnTopicsThatAreCurrentlyTracked() {
-        // given
-        Topic trackedTopic = hermes.initHelper().createTopic(topicWithRandomName().withTrackingEnabled(true).build());
-        Topic untrackedTopic = hermes.initHelper().createTopic(topicWithRandomName().withTrackingEnabled(false).build());
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().listTrackedTopics("");
-
-        // then
-        response.expectStatus().isOk();
-        assertThat(
-                Arrays.stream(Objects.requireNonNull(response.expectBody(String[].class).returnResult().getResponseBody())).toList()
-        ).contains(trackedTopic.getQualifiedName()).doesNotContain(untrackedTopic.getQualifiedName());
-    }
-
-    @Test
-    public void shouldReturnTopicsThatAreCurrentlyTrackedForGivenGroup() {
-        // given
-        String groupName = "mixedTrackedGroup1";
-        Topic trackedTopic = hermes.initHelper().createTopic(topic(groupName, "trackedTopic1").withTrackingEnabled(true).build());
-        hermes.initHelper().createTopic(topicWithRandomName().withTrackingEnabled(false).build());
+    // then
+    response.expectStatus().isOk();
+  }
+
+  @Test
+  public void shouldNotUpdateTopicWithInvalidChaosPolicy() {
+    // given
+    TestSecurityProvider.setUserIsAdmin(true);
+    Topic topic =
+        hermes
+            .initHelper()
+            .createTopic(
+                topicWithRandomName()
+                    .withPublishingChaosPolicy(
+                        new PublishingChaosPolicy(
+                            DATACENTER, null, Map.of("dc1", new ChaosPolicy(100, 100, 100, false))))
+                    .build());
+    PatchData patchData =
+        PatchData.from(
+            ImmutableMap.of(
+                "chaos",
+                ImmutableMap.of(
+                    "datacenterPolicies", ImmutableMap.of("dc1", ImmutableMap.of("delayTo", 99)))));
+
+    // when
+    WebTestClient.ResponseSpec response =
+        hermes.api().updateTopic(topic.getQualifiedName(), patchData);
 
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().listTrackedTopics(groupName);
-
-        // then
-        response.expectStatus().isOk();
-        assertThat(
-                Arrays.stream(Objects.requireNonNull(response.expectBody(String[].class).returnResult().getResponseBody())).toList()
-        ).containsExactly(trackedTopic.getQualifiedName());
-    }
-
-    @Test
-    public void shouldReturnTrackedTopicsWithAvroContentType() {
-        // given
-        String group = "mixedTrackedGroup2";
-        Topic trackedTopicAvro = hermes.initHelper().createTopicWithSchema(new TopicWithSchema(topic(group, "trackedAvroTopic2").withTrackingEnabled(true).withContentType(AVRO).build(), SCHEMA));
-        Topic untrackedAvroTopic = hermes.initHelper().createTopicWithSchema(new TopicWithSchema(topicWithRandomName().withTrackingEnabled(false).withContentType(AVRO).build(), SCHEMA));
-        Topic untrackedJsonTopic = hermes.initHelper().createTopic(topicWithRandomName().withTrackingEnabled(false).withContentType(JSON).build());
-        Topic trackedJsonTopic = hermes.initHelper().createTopic(topicWithRandomName().withTrackingEnabled(true).withContentType(JSON).build());
-
-        // and
-        String query = "{\"query\": {\"trackingEnabled\": \"true\", \"contentType\": \"AVRO\"}}";
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().queryTopics("", query);
-
-        // then
-        assertThat(Arrays.stream(Objects.requireNonNull(response.expectBody(String[].class).returnResult().getResponseBody())).toList())
-                .contains(trackedTopicAvro.getQualifiedName())
-                .doesNotContain(untrackedJsonTopic.getQualifiedName(), untrackedAvroTopic.getQualifiedName(), trackedJsonTopic.getQualifiedName());
-    }
-
-    @Test
-    public void shouldReturnTrackedTopicsWithAvroContentTypeForGivenGroup() {
-        // given
-        String group = "mixedTrackedGroup3";
-        Topic trackedTopicAvro = hermes.initHelper().createTopicWithSchema(new TopicWithSchema(topic(group, "trackedAvroTopic3").withTrackingEnabled(true).withContentType(AVRO).build(), SCHEMA));
-        hermes.api().createTopic(new TopicWithSchema(topic(group, "untrackedAvroTopic").withTrackingEnabled(false).withContentType(AVRO).build(), SCHEMA));
-        hermes.api().createTopic(new TopicWithSchema(topic(group, "untrackedJsonTopic").withTrackingEnabled(false).withContentType(JSON).build(), null));
-        hermes.api().createTopic(new TopicWithSchema(topic(group, "trackedJsonTopic").withTrackingEnabled(true).withContentType(JSON).build(), null));
-
-        // and
-        String query = "{\"query\": {\"trackingEnabled\": \"true\", \"contentType\": \"AVRO\"}}";
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().queryTopics(group, query);
-
-        // then
-        assertThat(Arrays.stream(Objects.requireNonNull(response.expectBody(String[].class).returnResult().getResponseBody())).toList())
-                .containsExactly(trackedTopicAvro.getQualifiedName())
-                .doesNotContain(group + "." + "untrackedAvroTopic", group + "." + "untrackedJsonTopic", group + "." + "trackedJsonTopic");
-    }
-
-    @Test
-    public void shouldNotAllowDollarSign() {
-        // given
-        String group = "dollar";
-        hermes.initHelper().createGroup(Group.from(group));
-
-        Stream.of("$name", "na$me", "name$").forEach(topicName -> {
-            // when
-            WebTestClient.ResponseSpec response = hermes.api().createTopic(new TopicWithSchema(topic(group, topicName).build(), null));
-
-            // then
-            response.expectStatus().isBadRequest();
-        });
-    }
-
-    @Test
-    public void shouldCreateTopicWithMaxMessageSize() {
-        // given
-        TopicWithSchema topic = new TopicWithSchema(topicWithRandomName().withMaxMessageSize(2048).build(), null);
-        hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
-
-        // then
-        response.expectStatus().isCreated();
-        int fetchedMessageSize = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().getMaxMessageSize();
-        assertThat(fetchedMessageSize).isEqualTo(2048);
-    }
-
-    @Test
-    public void shouldUpdateTopicWithMaxMessageSize() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().withMaxMessageSize(2048).build());
-        PatchData patchData = PatchData.from(ImmutableMap.of("maxMessageSize", 1024));
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patchData);
-
-        // then
-        response.expectStatus().isOk();
-        int fetchedMessageSize = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().getMaxMessageSize();
-        assertThat(fetchedMessageSize).isEqualTo(1024);
-    }
-
-    @Test
-    public void shouldCreateTopicWithRestrictedSubscribing() {
-        // given
-        TopicWithSchema topic = new TopicWithSchema(topicWithRandomName().withSubscribingRestricted().build(), null);
-        hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
-
-        // then
-        response.expectStatus().isCreated();
-        boolean fetchedIsSubscribingRestricted = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().isSubscribingRestricted();
-        assertThat(fetchedIsSubscribingRestricted).isTrue();
-    }
-
-    @Test
-    public void shouldUpdateTopicWithRestrictedSubscribing() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        PatchData patchData = PatchData.from(ImmutableMap.of("subscribingRestricted", true));
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patchData);
-
-        // then
-        response.expectStatus().isOk();
-        boolean fetchedIsSubscribingRestricted = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().isSubscribingRestricted();
-        assertThat(fetchedIsSubscribingRestricted).isTrue();
-    }
-
-    @Test
-    public void shouldCreateTopicWithOfflineStorageSettings() {
-        // given
-        TopicWithSchema topic = new TopicWithSchema(topicWithRandomName().withOfflineStorage(2).build(), null);
-        hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
-
-        // then
-        response.expectStatus().isCreated();
-        int fetchedOfflineStorageDurationTime = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().getOfflineStorage().getRetentionTime().getDuration();
-        assertThat(fetchedOfflineStorageDurationTime).isEqualTo(2);
-    }
-
-    @Test
-    public void shouldUpdateTopicWithOfflineStorageSettings() {
-        // given
-        Topic topic = hermes.initHelper().createTopic(topicWithRandomName().build());
-        PatchData patchData = PatchData.from(ImmutableMap.of("offlineStorage", ImmutableMap.of("enabled", true)));
-
-        // when
-        WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patchData);
-
-        // then
-        response.expectStatus().isOk();
-        boolean fetchedIsOfflineStorageEnabled = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().getOfflineStorage().isEnabled();
-        assertThat(fetchedIsOfflineStorageEnabled).isTrue();
-    }
-
-    @Test
-    public void shouldCreateTopicWithLabels() {
-        //given
-        TopicWithSchema topic = new TopicWithSchema(topicWithRandomName()
-                .withLabels(ImmutableSet.of(
-                        new TopicLabel("label-1"),
-                        new TopicLabel("label-2"),
-                        new TopicLabel("label-3")
-                ))
-                .build(), null);
-        hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
-
-        //when
-        WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
-
-        //then
-        response.expectStatus().isCreated();
-        Set<TopicLabel> fetchedLabels = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().getLabels();
-        assertThat(fetchedLabels).containsAll(
-                ImmutableSet.of(
-                        new TopicLabel("label-1"),
-                        new TopicLabel("label-2"),
-                        new TopicLabel("label-3")
-                )
-        );
-    }
-
-    @Test
-    public void shouldUpdateTopicWithLabels() {
-        //given
-        TopicWithSchema topic = new TopicWithSchema(topicWithRandomName()
-                .withLabels(ImmutableSet.of(
-                        new TopicLabel("label-1"),
-                        new TopicLabel("label-3")
-                ))
-                .build(), null);
-        hermes.initHelper().createTopic(topic);
-
-        //when
-        PatchData patchData = PatchData.from(ImmutableMap.of(
-                "labels", ImmutableSet.of(
-                        new TopicLabel("label-1"),
-                        new TopicLabel("label-2"),
-                        new TopicLabel("label-3")
-                ))
-        );
-        WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patchData);
-
-        //then
-        response.expectStatus().isOk();
-        Set<TopicLabel> fetchedLabels = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().getLabels();
-        assertThat(fetchedLabels).containsAll(
-                ImmutableSet.of(
-                        new TopicLabel("label-1"),
-                        new TopicLabel("label-2"),
-                        new TopicLabel("label-3")
-                )
-        );
-    }
-
-    @Test
-    public void shouldNotCreateTopicWithDisallowedLabels() {
-        // given
-        TopicWithSchema topic = new TopicWithSchema(topicWithRandomName()
-                .withLabels(ImmutableSet.of(
-                        new TopicLabel("some-random-label"),
-                        new TopicLabel("label-2"),
-                        new TopicLabel("label-3")
-                ))
-                .build(), null);
-        hermes.initHelper().createGroup(Group.from(topic.getName().getGroupName()));
-
-        //when
-        WebTestClient.ResponseSpec response = hermes.api().createTopic(topic);
-
-        //then
-        response.expectStatus().isBadRequest();
-        assertThat(getErrorCode(response)).isEqualTo(ErrorCode.VALIDATION_ERROR);
-        hermes.api().getTopicResponse(topic.getQualifiedName()).expectStatus().isNotFound();
-    }
-
-    @Test
-    public void shouldNotUpdateTopicWithDisallowedLabels() {
-        //given
-        TopicWithSchema topic = new TopicWithSchema(topicWithRandomName()
-                .withLabels(ImmutableSet.of(
-                        new TopicLabel("label-1"),
-                        new TopicLabel("label-3")
-                ))
-                .build(), null);
-        hermes.initHelper().createTopic(topic);
-
-        //when
-        PatchData patchData = PatchData.from(ImmutableMap.of(
-                "labels", ImmutableSet.of(
-                        new TopicLabel("some-random-label"),
-                        new TopicLabel("label-2"),
-                        new TopicLabel("label-3")
-                ))
-        );
-        WebTestClient.ResponseSpec response = hermes.api().updateTopic(topic.getQualifiedName(), patchData);
-
-        //then
-        response.expectStatus().isBadRequest();
-        assertThat(getErrorCode(response)).isEqualTo(ErrorCode.VALIDATION_ERROR);
-        Set<TopicLabel> fetchedLabels = hermes.api().getTopicResponse(topic.getQualifiedName()).expectBody(TopicWithSchema.class).returnResult().getResponseBody().getLabels();
-        assertThat(fetchedLabels).containsAll(
-                ImmutableSet.of(
-                        new TopicLabel("label-1"),
-                        new TopicLabel("label-3")
-                )
-        );
-    }
-
-    private static List<String> getGroupTopicsList(String groupName) {
-        return Arrays.stream(Objects.requireNonNull(hermes.api().listTopics(groupName)
-                        .expectStatus()
-                        .isOk()
-                        .expectBody(String[].class)
-                        .returnResult()
-                        .getResponseBody()))
-                .toList();
-    }
-
-    private static ErrorCode getErrorCode(WebTestClient.ResponseSpec createTopicResponse) {
-        return Objects.requireNonNull(createTopicResponse.expectBody(ErrorDescription.class).returnResult().getResponseBody()).getCode();
-    }
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+        .contains(
+            "Invalid chaos policy: 'delayFrom' and 'delayTo' must be >= 0, and 'delayFrom' <= 'delayTo'.");
+  }
+
+  private static List<String> getGroupTopicsList(String groupName) {
+    return Arrays.stream(
+            Objects.requireNonNull(
+                hermes
+                    .api()
+                    .listTopics(groupName)
+                    .expectStatus()
+                    .isOk()
+                    .expectBody(String[].class)
+                    .returnResult()
+                    .getResponseBody()))
+        .toList();
+  }
+
+  public static ErrorCode getErrorCode(WebTestClient.ResponseSpec createTopicResponse) {
+    return Objects.requireNonNull(
+            createTopicResponse.expectBody(ErrorDescription.class).returnResult().getResponseBody())
+        .getCode();
+  }
 }
diff --git a/integration-tests/src/integrationTest/resources/allure.properties b/integration-tests/src/integrationTest/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/integration-tests/src/integrationTest/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/integration-tests/src/integrationTest/resources/logback.xml b/integration-tests/src/integrationTest/resources/logback.xml
index 6b79faabfb..25978ddfbd 100644
--- a/integration-tests/src/integrationTest/resources/logback.xml
+++ b/integration-tests/src/integrationTest/resources/logback.xml
@@ -8,6 +8,22 @@
     </appender>
 
     <logger name="pl.allegro.tech.hermes.infrastructure.zookeeper.cache" level="debug" />
+    <logger name="org.apache.zookeeper" level="warn" />
+    <logger name="kafka" level="warn" />
+    <logger name="org.apache.kafka" level="warn" />
+    <logger name="org.apache.kafka.common.network.Selector" level="error"/>
+    <logger name="org.apache.kafka.clients.consumer.internals.ConsumerCoordinator" level="OFF"/>
+    <logger name="org.eclipse.jetty.server.HttpChannel" level="error"/>
+    <logger name="pl.allegro.tech.hermes.consumers.supervisor.workload.selective.SelectiveWorkBalancer" level="warn" />
+    <logger name="pl.allegro.tech.hermes.consumers.supervisor.workload.BalancingJob" level="warn" />
+    <logger name="pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry" level="warn" />
+    <logger name="pl.allegro.tech.hermes.consumers.consumer.rate.maxrate.MaxRateCalculator" level="warn" />
+    <logger name="pl.allegro.tech.hermes.infrastructure.zookeeper.cache.HierarchicalCacheLevel" level="OFF" />
+    <logger name="pl.allegro.tech.hermes.infrastructure.zookeeper.cache.HierarchicalCache" level="OFF" />
+    <logger name="pl.allegro.tech.hermes.consumers.supervisor.workload.ClusterAssignmentCache" level="warn" />
+    <logger name="pl.allegro.tech.hermes.infrastructure.zookeeper.notifications.ZookeeperInternalNotificationBus" level="OFF" />
+    <logger name="pl.allegro.tech.hermes.management.infrastructure.kafka.service.KafkaRawMessageReader" level="OFF" />
+    <logger name="pl.allegro.tech.hermes.management.infrastructure.prometheus.RestTemplatePrometheusClient" level="OFF" />
 
     <root level="info">
         <appender-ref ref="STDOUT"/>
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/AttachingKeepAliveHeaderTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/AttachingKeepAliveHeaderTest.java
index 0595e1e351..60593ff0d1 100644
--- a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/AttachingKeepAliveHeaderTest.java
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/AttachingKeepAliveHeaderTest.java
@@ -1,83 +1,85 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_KEEP_ALIVE_HEADER_ENABLED;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_KEEP_ALIVE_HEADER_TIMEOUT;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.function.Consumer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.integrationtests.client.FrontendTestClient;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesFrontendTestApp;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesManagementExtension;
 import pl.allegro.tech.hermes.integrationtests.setup.InfrastructureExtension;
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.util.function.Consumer;
-
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_KEEP_ALIVE_HEADER_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_KEEP_ALIVE_HEADER_TIMEOUT;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class AttachingKeepAliveHeaderTest {
 
-    @Order(0)
-    @RegisterExtension
-    public static InfrastructureExtension infra = new InfrastructureExtension();
+  @Order(0)
+  @RegisterExtension
+  public static InfrastructureExtension infra = new InfrastructureExtension();
 
-    @Order(1)
-    @RegisterExtension
-    public static HermesManagementExtension management = new HermesManagementExtension(infra);
+  @Order(1)
+  @RegisterExtension
+  public static HermesManagementExtension management = new HermesManagementExtension(infra);
 
-    private static final String MESSAGE = TestMessage.of("hello", "world").body();
+  private static final String MESSAGE = TestMessage.of("hello", "world").body();
 
-    @Test
-    public void shouldAttachKeepAliveHeaderWhenEnabled() {
-        //given
-        HermesFrontendTestApp frontend = startFrontend(f -> {
-            f.withProperty(FRONTEND_KEEP_ALIVE_HEADER_ENABLED, true);
-            f.withProperty(FRONTEND_KEEP_ALIVE_HEADER_TIMEOUT, "2s");
-        });
+  @Test
+  public void shouldAttachKeepAliveHeaderWhenEnabled() {
+    // given
+    HermesFrontendTestApp frontend =
+        startFrontend(
+            f -> {
+              f.withProperty(FRONTEND_KEEP_ALIVE_HEADER_ENABLED, true);
+              f.withProperty(FRONTEND_KEEP_ALIVE_HEADER_TIMEOUT, "2s");
+            });
 
-        Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
+    Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
 
-        FrontendTestClient publisher = new FrontendTestClient(frontend.getPort());
+    FrontendTestClient publisher = new FrontendTestClient(frontend.getPort());
 
-        try {
-            //when
-            WebTestClient.ResponseSpec response = publisher.publish(topic.getQualifiedName(), MESSAGE);
+    try {
+      // when
+      WebTestClient.ResponseSpec response = publisher.publish(topic.getQualifiedName(), MESSAGE);
 
-            //then
-            response.expectHeader().valueEquals("Keep-Alive", "timeout=2");
-        } finally {
-            frontend.stop();
-        }
+      // then
+      response.expectHeader().valueEquals("Keep-Alive", "timeout=2");
+    } finally {
+      frontend.stop();
     }
+  }
 
-    @Test
-    public void shouldNotAttachKeepAliveHeaderWhenDisabled() {
-        //given
-        HermesFrontendTestApp frontend = startFrontend(f -> {
-            f.withProperty(FRONTEND_KEEP_ALIVE_HEADER_ENABLED, false);
-        });
-
-        Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
+  @Test
+  public void shouldNotAttachKeepAliveHeaderWhenDisabled() {
+    // given
+    HermesFrontendTestApp frontend =
+        startFrontend(f -> f.withProperty(FRONTEND_KEEP_ALIVE_HEADER_ENABLED, false));
 
-        FrontendTestClient publisher = new FrontendTestClient(frontend.getPort());
+    Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
 
-        try {
-            //when
-            WebTestClient.ResponseSpec response = publisher.publish(topic.getQualifiedName(), MESSAGE);
+    FrontendTestClient publisher = new FrontendTestClient(frontend.getPort());
 
-            //then
-            response.expectHeader().doesNotExist("Keep-Alive");
-        } finally {
-            frontend.stop();
-        }
-    }
+    try {
+      // when
+      WebTestClient.ResponseSpec response = publisher.publish(topic.getQualifiedName(), MESSAGE);
 
-    private HermesFrontendTestApp startFrontend(Consumer<HermesFrontendTestApp> frontendConfigUpdater) {
-        HermesFrontendTestApp frontend = new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-        frontendConfigUpdater.accept(frontend);
-        frontend.start();
-        return frontend;
+      // then
+      response.expectHeader().doesNotExist("Keep-Alive");
+    } finally {
+      frontend.stop();
     }
+  }
+
+  private HermesFrontendTestApp startFrontend(
+      Consumer<HermesFrontendTestApp> frontendConfigUpdater) {
+    HermesFrontendTestApp frontend =
+        new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
+    frontendConfigUpdater.accept(frontend);
+    frontend.start();
+    return frontend;
+  }
 }
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/BrokerLatencyReportingTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/BrokerLatencyReportingTest.java
new file mode 100644
index 0000000000..13f878f8d7
--- /dev/null
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/BrokerLatencyReportingTest.java
@@ -0,0 +1,78 @@
+package pl.allegro.tech.hermes.integrationtests;
+
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThatMetrics;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.time.Duration;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesFrontendTestApp;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesManagementExtension;
+import pl.allegro.tech.hermes.integrationtests.setup.InfrastructureExtension;
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient;
+import pl.allegro.tech.hermes.test.helper.message.TestMessage;
+
+public class BrokerLatencyReportingTest {
+
+  @Order(0)
+  @RegisterExtension
+  public static InfrastructureExtension infra = new InfrastructureExtension();
+
+  @Order(1)
+  @RegisterExtension
+  public static HermesManagementExtension management = new HermesManagementExtension(infra);
+
+  private static HermesFrontendTestApp frontend;
+
+  private static FrontendTestClient frontendTestClient;
+
+  @BeforeAll
+  public static void setup() {
+    frontend =
+        new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
+    frontend.withProperty(FrontendConfigurationProperties.BROKER_LATENCY_REPORTER_ENABLED, true);
+    frontend.start();
+    frontendTestClient = new FrontendTestClient(frontend.getPort());
+  }
+
+  @AfterAll
+  public static void tearDown() {
+    frontend.stop();
+  }
+
+  @Test
+  public void shouldReportBrokerLatencyMetrics() {
+    // given
+    Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
+
+    TestMessage message = TestMessage.of("hello", "world");
+
+    // when
+    frontendTestClient.publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then
+    waitAtMost(Duration.ofSeconds(5))
+        .untilAsserted(
+            () -> {
+              frontendTestClient
+                  .getMetrics()
+                  .expectStatus()
+                  .isOk()
+                  .expectBody(String.class)
+                  .value(
+                      (body) ->
+                          assertThatMetrics(body)
+                              .contains("hermes_frontend_broker_latency_seconds_count")
+                              .withLabels(
+                                  "ack", "LEADER",
+                                  "broker", "localhost")
+                              .withValueGreaterThan(0.0d));
+            });
+  }
+}
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesClientPublishingHttpsTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesClientPublishingHttpsTest.java
index b89d6c9229..a4848660f8 100644
--- a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesClientPublishingHttpsTest.java
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesClientPublishingHttpsTest.java
@@ -1,5 +1,17 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static pl.allegro.tech.hermes.client.HermesClientBuilder.hermesClient;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_HTTP2_ENABLED;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_KEYSTORE_SOURCE;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_PORT;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_TRUSTSTORE_SOURCE;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.net.URI;
+import java.time.Duration;
+import javax.net.ssl.X509TrustManager;
 import okhttp3.OkHttpClient;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -20,82 +32,78 @@
 import pl.allegro.tech.hermes.integrationtests.setup.InfrastructureExtension;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.net.URI;
-import javax.net.ssl.X509TrustManager;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.client.HermesClientBuilder.hermesClient;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_HTTP2_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_KEYSTORE_SOURCE;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_PORT;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_TRUSTSTORE_SOURCE;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class HermesClientPublishingHttpsTest {
 
-    @Order(0)
-    @RegisterExtension
-    public static InfrastructureExtension infra = new InfrastructureExtension();
-
-    @Order(1)
-    @RegisterExtension
-    public static HermesManagementExtension management = new HermesManagementExtension(infra);
-
-    private static HermesFrontendTestApp frontend;
-
-    @BeforeAll
-    public static void setup() {
-        frontend = new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-        frontend.withProperty(FRONTEND_SSL_ENABLED, true);
-        frontend.withProperty(FRONTEND_HTTP2_ENABLED, true);
-        frontend.withProperty(FRONTEND_SSL_PORT, 0);
-        frontend.withProperty(FRONTEND_SSL_KEYSTORE_SOURCE, "provided");
-        frontend.withProperty(FRONTEND_SSL_TRUSTSTORE_SOURCE, "provided");
-
-        frontend.start();
-    }
-
-    @AfterAll
-    public static void clean() {
-        frontend.stop();
-    }
-
-    @Test
-    public void shouldCommunicateWithHermesUsingHttp2() {
-        // given
-        Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
-        String message = TestMessage.of("hello", "world").body();
-
-        OkHttpHermesSender okHttpHermesSender = new OkHttpHermesSender(getOkHttpClientWithSslContextConfigured());
-        HermesClient client = hermesClient(okHttpHermesSender)
-                .withURI(URI.create("https://localhost:" + frontend.getSSLPort()))
-                .build();
-
-        // when
-        HermesResponse response = client.publish(topic.getQualifiedName(), message).join();
-
-        // then
-        assertThat(response.getProtocol()).isEqualTo("h2");
-        assertThat(response.isSuccess()).isTrue();
-    }
-
-    private OkHttpClient getOkHttpClientWithSslContextConfigured() {
-        String protocol = "TLS";
-        KeystoreProperties keystoreProperties = new KeystoreProperties("classpath:client.keystore", "JKS", "password");
-        KeystoreProperties truststoreProperties = new KeystoreProperties("classpath:client.truststore", "JKS", "password");
-        DefaultSslContextFactory sslContextFactory = new DefaultSslContextFactory(
-                protocol,
-                new ProvidedKeyManagersProvider(keystoreProperties),
-                new ProvidedTrustManagersProvider(truststoreProperties)
-        );
-        SSLContextHolder sslContextHolder = sslContextFactory.create();
-        return new OkHttpClient.Builder()
-                .sslSocketFactory(
-                        sslContextHolder.getSslContext().getSocketFactory(),
-                        (X509TrustManager) sslContextHolder.getTrustManagers()[0]
-                )
-                .build();
-    }
-
+  @Order(0)
+  @RegisterExtension
+  public static InfrastructureExtension infra = new InfrastructureExtension();
+
+  @Order(1)
+  @RegisterExtension
+  public static HermesManagementExtension management = new HermesManagementExtension(infra);
+
+  private static HermesFrontendTestApp frontend;
+
+  @BeforeAll
+  public static void setup() {
+    frontend =
+        new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
+    frontend.withProperty(FRONTEND_SSL_ENABLED, true);
+    frontend.withProperty(FRONTEND_HTTP2_ENABLED, true);
+    frontend.withProperty(FRONTEND_SSL_PORT, 0);
+    frontend.withProperty(FRONTEND_SSL_KEYSTORE_SOURCE, "provided");
+    frontend.withProperty(FRONTEND_SSL_TRUSTSTORE_SOURCE, "provided");
+
+    frontend.start();
+  }
+
+  @AfterAll
+  public static void clean() {
+    frontend.stop();
+  }
+
+  @Test
+  public void shouldCommunicateWithHermesUsingHttp2() {
+    // given
+    Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
+    String message = TestMessage.of("hello", "world").body();
+
+    OkHttpHermesSender okHttpHermesSender =
+        new OkHttpHermesSender(getOkHttpClientWithSslContextConfigured());
+    HermesClient client =
+        hermesClient(okHttpHermesSender)
+            .withRetries(5)
+            .withRetrySleep(Duration.ofSeconds(5).toMillis(), Duration.ofSeconds(10).toMillis())
+            .withURI(URI.create("https://localhost:" + frontend.getSSLPort()))
+            .build();
+
+    // when
+    HermesResponse response = client.publish(topic.getQualifiedName(), message).join();
+
+    // then
+    assertThat(response.getProtocol()).isEqualTo("h2");
+    assertThat(response.isSuccess()).isTrue();
+  }
+
+  private OkHttpClient getOkHttpClientWithSslContextConfigured() {
+    DefaultSslContextFactory sslContextFactory = getDefaultSslContextFactory();
+    SSLContextHolder sslContextHolder = sslContextFactory.create();
+    return new OkHttpClient.Builder()
+        .sslSocketFactory(
+            sslContextHolder.getSslContext().getSocketFactory(),
+            (X509TrustManager) sslContextHolder.getTrustManagers()[0])
+        .build();
+  }
+
+  private static DefaultSslContextFactory getDefaultSslContextFactory() {
+    String protocol = "TLS";
+    KeystoreProperties keystoreProperties =
+        new KeystoreProperties("classpath:client.keystore", "JKS", "password");
+    KeystoreProperties truststoreProperties =
+        new KeystoreProperties("classpath:client.truststore", "JKS", "password");
+    return new DefaultSslContextFactory(
+        protocol,
+        new ProvidedKeyManagersProvider(keystoreProperties),
+        new ProvidedTrustManagersProvider(truststoreProperties));
+  }
 }
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesServerGracefulShutdownTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesServerGracefulShutdownTest.java
index ddcddcfc6c..1e538e6ddc 100644
--- a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesServerGracefulShutdownTest.java
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/HermesServerGracefulShutdownTest.java
@@ -1,5 +1,8 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static org.awaitility.Awaitility.waitAtMost;
+
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -7,57 +10,58 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import pl.allegro.tech.hermes.frontend.server.HermesServer;
-import pl.allegro.tech.hermes.integrationtests.client.FrontendTestClient;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesFrontendTestApp;
 import pl.allegro.tech.hermes.integrationtests.setup.InfrastructureExtension;
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.util.concurrent.TimeUnit;
-
-import static org.awaitility.Awaitility.waitAtMost;
-
-public class HermesServerGracefulShutdownTest  {
-
-    @RegisterExtension
-    public static InfrastructureExtension infra = new InfrastructureExtension();
+public class HermesServerGracefulShutdownTest {
 
-    private HermesFrontendTestApp frontend;
-    private HermesServer hermesServer;
-    FrontendTestClient frontendClient;
+  @RegisterExtension public static InfrastructureExtension infra = new InfrastructureExtension();
 
-    @BeforeEach
-    public void beforeEach() {
-        frontend = new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-        frontend.start();
-        hermesServer = frontend.getBean(HermesServer.class);
-        frontendClient = new FrontendTestClient(frontend.getPort());
-    }
+  private HermesFrontendTestApp frontend;
+  private HermesServer hermesServer;
+  FrontendTestClient frontendClient;
 
-    @AfterEach
-    public void afterEach() {
-        frontend.stop();
-    }
+  @BeforeEach
+  public void beforeEach() {
+    frontend =
+        new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
+    frontend.start();
+    hermesServer = frontend.getBean(HermesServer.class);
+    frontendClient = new FrontendTestClient(frontend.getPort());
+  }
 
-    @Test
-    public void shouldShutdownGracefully() throws Throwable {
-        //given
-        hermesServer.prepareForGracefulShutdown();
+  @AfterEach
+  public void afterEach() {
+    frontend.stop();
+  }
 
-        //when
-        WebTestClient.ResponseSpec response = frontendClient.publish("topic", TestMessage.of("hello", "world").body());
+  @Test
+  public void shouldShutdownGracefully() throws Throwable {
+    // given
+    hermesServer.prepareForGracefulShutdown();
 
-        //then
-        response.expectStatus().isEqualTo(HttpStatus.SERVICE_UNAVAILABLE);
-    }
+    // when
+    WebTestClient.ResponseSpec response =
+        frontendClient.publish("topic", TestMessage.of("hello", "world").body());
 
-    @Test
-    public void shouldReturnCorrectHealthStatus() throws InterruptedException {
-        // when
-        hermesServer.prepareForGracefulShutdown();
+    // then
+    response.expectStatus().isEqualTo(HttpStatus.SERVICE_UNAVAILABLE);
+  }
 
-        // then
-        waitAtMost(5, TimeUnit.SECONDS)
-                .untilAsserted(() -> frontendClient.getStatusPing().expectStatus().isEqualTo(HttpStatus.SERVICE_UNAVAILABLE));
-    }
+  @Test
+  public void shouldReturnCorrectHealthStatus() throws InterruptedException {
+    // when
+    hermesServer.prepareForGracefulShutdown();
 
+    // then
+    waitAtMost(5, TimeUnit.SECONDS)
+        .untilAsserted(
+            () ->
+                frontendClient
+                    .getStatusPing()
+                    .expectStatus()
+                    .isEqualTo(HttpStatus.SERVICE_UNAVAILABLE));
+  }
 }
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaReadinessCheckTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaReadinessCheckTest.java
index 749ee7456c..d2cff160b2 100644
--- a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaReadinessCheckTest.java
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/KafkaReadinessCheckTest.java
@@ -1,208 +1,213 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.awaitility.Awaitility.await;
+import static org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE;
+import static pl.allegro.tech.hermes.api.Topic.Ack.ALL;
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThat;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.testcontainers.lifecycle.Startable;
 import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.integrationtests.client.FrontendTestClient;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesFrontendTestApp;
-import pl.allegro.tech.hermes.integrationtests.setup.HermesInitHelper;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesManagementTestApp;
-import pl.allegro.tech.hermes.integrationtests.setup.HermesTestApp;
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient;
+import pl.allegro.tech.hermes.test.helper.client.integration.HermesInitHelper;
 import pl.allegro.tech.hermes.test.helper.containers.BrokerId;
 import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
 import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
 import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE;
-import static pl.allegro.tech.hermes.api.Topic.Ack.ALL;
-import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+import pl.allegro.tech.hermes.test.helper.environment.HermesTestApp;
 
 public class KafkaReadinessCheckTest {
 
-    private static final ZookeeperContainer hermesZookeeper = new ZookeeperContainer("HermesZookeeper");
-    private static final KafkaContainerCluster kafka = new KafkaContainerCluster(3);
-    private static final ConfluentSchemaRegistryContainer schemaRegistry = new ConfluentSchemaRegistryContainer()
-            .withKafkaCluster(kafka);
-    private static Topic topic;
-
-    @BeforeAll
-    public static void setup() {
-        Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::start);
-        schemaRegistry.start();
-        HermesTestApp management = new HermesManagementTestApp(hermesZookeeper, kafka, schemaRegistry)
-                .start();
-
-        HermesInitHelper hermesInitHelper = new HermesInitHelper(management.getPort());
-        topic = hermesInitHelper.createTopic(
-                topicWithRandomName()
-                        .withAck(ALL)
-                        .build()
-        );
-        management.stop();
-    }
-
-    @AfterAll
-    public static void clean() {
-        Stream.of(hermesZookeeper, kafka, schemaRegistry).parallel().forEach(Startable::stop);
-    }
-
-    @Test
-    public void shouldNotBeReadyUntilKafkaClusterIsUp() {
-        // given
-        kafka.cutOffConnectionsBetweenBrokersAndClients();
-
-        // when
-        HermesTestApp hermesFrontend = new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
-                .metadataMaxAgeInSeconds(1)
-                .readinessCheckIntervalInSeconds(1)
-                .kafkaCheckEnabled()
-                .start();
-
-        // then
-        getStatusReady(hermesFrontend).expectStatus().isEqualTo(SERVICE_UNAVAILABLE);
-        getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
-
-        // when
-        kafka.restoreConnectionsBetweenBrokersAndClients();
-
-        // then
-        await().atMost(5, SECONDS)
-                .until(() -> getStatusReady(hermesFrontend).expectStatus().is2xxSuccessful());
-        getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
-
-        // cleanup
-        hermesFrontend.stop();
-    }
-
-    @Test
-    public void shouldRespectKafkaCheckEnabledFlag() {
-        // given
-        kafka.cutOffConnectionsBetweenBrokersAndClients();
-
-        // when
-        HermesTestApp hermesFrontend = new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
-                .metadataMaxAgeInSeconds(1)
-                .readinessCheckIntervalInSeconds(1)
-                .kafkaCheckDisabled()
-                .start();
-
-        // then
-        getStatusReady(hermesFrontend).expectStatus().is2xxSuccessful();
-        getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
-
-        // cleanup
-        kafka.restoreConnectionsBetweenBrokersAndClients();
-        hermesFrontend.stop();
-    }
-
-    @Test
-    public void shouldNotBeReadyUntilThereAreNoUnderReplicatedPartitions() throws Exception {
-        // given
-        List<BrokerId> brokers = kafka.getAllBrokers();
-        List<BrokerId> brokersToStop = brokers.subList(kafka.getMinInSyncReplicas() - 1, brokers.size());
-        kafka.stop(brokersToStop);
-        assertThat(kafka.countUnderReplicatedPartitions() > 0).isTrue();
-
-        // when
-        HermesTestApp hermesFrontend = new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
-                .metadataMaxAgeInSeconds(1)
-                .readinessCheckIntervalInSeconds(1)
-                .kafkaCheckEnabled()
-                .start();
-
-        // then
-        getStatusReady(hermesFrontend).expectStatus().isEqualTo(SERVICE_UNAVAILABLE);
-        getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
-
-        // when
-        kafka.start(selectOne(brokersToStop));
-
-        // then
-        await().atMost(5, SECONDS)
-                .until(() -> getStatusReady(hermesFrontend).expectStatus().is2xxSuccessful());
-        getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
-
-        // cleanup
-        kafka.startAllStoppedBrokers();
-        hermesFrontend.stop();
-    }
-
-    @Test
-    public void shouldNotBeReadyUntilThereAreNoOfflinePartitions() throws Exception {
-        // given: stop one of the brokers
-        List<BrokerId> brokers = kafka.getAllBrokers();
-        List<BrokerId> brokersToStop = selectOne(brokers);
-        kafka.stop(brokersToStop);
-
-        // and: send a message to remove stopped broker from in-sync replicas
-        publishSampleMessage(topic);
-
-        // and: stop all in-sync replicas
-        List<BrokerId> isr = selectAllOtherThan(brokers, brokersToStop);
-        kafka.stop(isr);
-
-        // and: start the broker that is not in in-sync replicas
-        kafka.start(brokersToStop);
-
-        // and: check if there is at least one offline partition
-        assertThat(kafka.countOfflinePartitions() > 0).isTrue();
-
-        // when
-        HermesTestApp hermesFrontend = new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
-                .metadataMaxAgeInSeconds(1)
-                .readinessCheckIntervalInSeconds(1)
-                .kafkaCheckEnabled()
-                .start();
-
-        // then
-        getStatusReady(hermesFrontend).expectStatus().isEqualTo(SERVICE_UNAVAILABLE);
-        getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
-
-        // when
-        kafka.start(isr);
-
-        // then
-        await().atMost(5, SECONDS)
-                .until(() -> getStatusReady(hermesFrontend).expectStatus().is2xxSuccessful());
-        getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
-
-        // cleanup
-        hermesFrontend.stop();
-    }
-
-    private static List<BrokerId> selectOne(List<BrokerId> brokerIds) {
-        return brokerIds.subList(0, 1);
-    }
-
-    private static List<BrokerId> selectAllOtherThan(List<BrokerId> brokerIds, List<BrokerId> toExclude) {
-        return brokerIds.stream().filter(b -> !toExclude.contains(b)).collect(Collectors.toList());
-    }
-
-    private void publishSampleMessage(Topic topic) {
-        HermesTestApp hermesFrontend = new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
-                .start();
-        FrontendTestClient client = new FrontendTestClient(hermesFrontend.getPort());
-        client.publishUntilSuccess(topic.getQualifiedName(), "message");
-        hermesFrontend.stop();
-    }
-
-    private WebTestClient.ResponseSpec getStatusHealth(HermesTestApp hermesFrontend) {
-        FrontendTestClient client = new FrontendTestClient(hermesFrontend.getPort());
-        return client.getStatusHealth();
-    }
-
-    private WebTestClient.ResponseSpec getStatusReady(HermesTestApp hermesFrontend) {
-        FrontendTestClient client = new FrontendTestClient(hermesFrontend.getPort());
-        return client.getStatusReady();
-    }
+  private static final ZookeeperContainer hermesZookeeper =
+      new ZookeeperContainer("HermesZookeeper");
+  private static final KafkaContainerCluster kafka = new KafkaContainerCluster(3);
+  private static final ConfluentSchemaRegistryContainer schemaRegistry =
+      new ConfluentSchemaRegistryContainer().withKafkaCluster(kafka);
+  private static Topic topic;
+
+  @BeforeAll
+  public static void setup() {
+    Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::start);
+    schemaRegistry.start();
+    HermesTestApp management =
+        new HermesManagementTestApp(hermesZookeeper, kafka, schemaRegistry).start();
+
+    HermesInitHelper hermesInitHelper = new HermesInitHelper(management.getPort());
+    topic = hermesInitHelper.createTopic(topicWithRandomName().withAck(ALL).build());
+    management.stop();
+  }
+
+  @AfterAll
+  public static void clean() {
+    Stream.of(hermesZookeeper, kafka, schemaRegistry).parallel().forEach(Startable::stop);
+  }
+
+  @Test
+  public void shouldNotBeReadyUntilKafkaClusterIsUp() {
+    // given
+    kafka.cutOffConnectionsBetweenBrokersAndClients();
+
+    // when
+    HermesTestApp hermesFrontend =
+        new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
+            .metadataMaxAgeInSeconds(1)
+            .readinessCheckIntervalInSeconds(1)
+            .kafkaCheckEnabled()
+            .start();
+
+    // then
+    getStatusReady(hermesFrontend).expectStatus().isEqualTo(SERVICE_UNAVAILABLE);
+    getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
+
+    // when
+    kafka.restoreConnectionsBetweenBrokersAndClients();
+
+    // then
+    await()
+        .atMost(5, SECONDS)
+        .untilAsserted(() -> getStatusReady(hermesFrontend).expectStatus().is2xxSuccessful());
+    getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
+
+    // cleanup
+    hermesFrontend.stop();
+  }
+
+  @Test
+  public void shouldRespectKafkaCheckEnabledFlag() {
+    // given
+    kafka.cutOffConnectionsBetweenBrokersAndClients();
+
+    // when
+    HermesTestApp hermesFrontend =
+        new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
+            .metadataMaxAgeInSeconds(1)
+            .readinessCheckIntervalInSeconds(1)
+            .kafkaCheckDisabled()
+            .start();
+
+    // then
+    getStatusReady(hermesFrontend).expectStatus().is2xxSuccessful();
+    getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
+
+    // cleanup
+    kafka.restoreConnectionsBetweenBrokersAndClients();
+    hermesFrontend.stop();
+  }
+
+  @Test
+  public void shouldNotBeReadyUntilThereAreNoUnderReplicatedPartitions() throws Exception {
+    // given
+    List<BrokerId> brokers = kafka.getAllBrokers();
+    List<BrokerId> brokersToStop =
+        brokers.subList(kafka.getMinInSyncReplicas() - 1, brokers.size());
+    kafka.stop(brokersToStop);
+    assertThat(kafka.countUnderReplicatedPartitions() > 0).isTrue();
+
+    // when
+    HermesTestApp hermesFrontend =
+        new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
+            .metadataMaxAgeInSeconds(1)
+            .readinessCheckIntervalInSeconds(1)
+            .kafkaCheckEnabled()
+            .start();
+
+    // then
+    getStatusReady(hermesFrontend).expectStatus().isEqualTo(SERVICE_UNAVAILABLE);
+    getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
+
+    // when
+    kafka.start(selectOne(brokersToStop));
+
+    // then
+    await()
+        .atMost(5, SECONDS)
+        .untilAsserted(() -> getStatusReady(hermesFrontend).expectStatus().is2xxSuccessful());
+    getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
+
+    // cleanup
+    kafka.startAllStoppedBrokers();
+    hermesFrontend.stop();
+  }
+
+  @Test
+  public void shouldNotBeReadyUntilThereAreNoOfflinePartitions() throws Exception {
+    // given: stop one of the brokers
+    List<BrokerId> brokers = kafka.getAllBrokers();
+    List<BrokerId> brokersToStop = selectOne(brokers);
+    kafka.stop(brokersToStop);
+
+    // and: send a message to remove stopped broker from in-sync replicas
+    publishSampleMessage(topic);
+
+    // and: stop all in-sync replicas
+    List<BrokerId> isr = selectAllOtherThan(brokers, brokersToStop);
+    kafka.stop(isr);
+
+    // and: start the broker that is not in in-sync replicas
+    kafka.start(brokersToStop);
+
+    // and: check if there is at least one offline partition
+    assertThat(kafka.countOfflinePartitions() > 0).isTrue();
+
+    // when
+    HermesTestApp hermesFrontend =
+        new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry)
+            .metadataMaxAgeInSeconds(1)
+            .readinessCheckIntervalInSeconds(1)
+            .kafkaCheckEnabled()
+            .start();
+
+    // then
+    getStatusReady(hermesFrontend).expectStatus().isEqualTo(SERVICE_UNAVAILABLE);
+    getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
+
+    // when
+    kafka.start(isr);
+
+    // then
+    await()
+        .atMost(5, SECONDS)
+        .untilAsserted(() -> getStatusReady(hermesFrontend).expectStatus().is2xxSuccessful());
+    getStatusHealth(hermesFrontend).expectStatus().is2xxSuccessful();
+
+    // cleanup
+    hermesFrontend.stop();
+  }
+
+  private static List<BrokerId> selectOne(List<BrokerId> brokerIds) {
+    return brokerIds.subList(0, 1);
+  }
+
+  private static List<BrokerId> selectAllOtherThan(
+      List<BrokerId> brokerIds, List<BrokerId> toExclude) {
+    return brokerIds.stream().filter(b -> !toExclude.contains(b)).collect(Collectors.toList());
+  }
+
+  private void publishSampleMessage(Topic topic) {
+    HermesTestApp hermesFrontend =
+        new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry).start();
+    FrontendTestClient client = new FrontendTestClient(hermesFrontend.getPort());
+    client.publishUntilSuccess(topic.getQualifiedName(), "message");
+    hermesFrontend.stop();
+  }
+
+  private WebTestClient.ResponseSpec getStatusHealth(HermesTestApp hermesFrontend) {
+    FrontendTestClient client = new FrontendTestClient(hermesFrontend.getPort());
+    return client.getStatusHealth();
+  }
+
+  private WebTestClient.ResponseSpec getStatusReady(HermesTestApp hermesFrontend) {
+    FrontendTestClient client = new FrontendTestClient(hermesFrontend.getPort());
+    return client.getStatusReady();
+  }
 }
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/MessageBufferLoadingTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/MessageBufferLoadingTest.java
index e048547dcf..77d547af2d 100644
--- a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/MessageBufferLoadingTest.java
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/MessageBufferLoadingTest.java
@@ -1,7 +1,22 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static jakarta.ws.rs.core.Response.Status.ACCEPTED;
+import static java.nio.charset.Charset.defaultCharset;
+import static java.time.Instant.now;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static pl.allegro.tech.hermes.api.ContentType.JSON;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.MESSAGES_LOCAL_STORAGE_DIRECTORY;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.MESSAGES_LOCAL_STORAGE_ENABLED;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.Files;
+import java.io.File;
+import java.time.Clock;
+import java.util.Collections;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Order;
@@ -15,141 +30,137 @@
 import pl.allegro.tech.hermes.frontend.buffer.chronicle.ChronicleMapMessageRepository;
 import pl.allegro.tech.hermes.frontend.publishing.message.JsonMessage;
 import pl.allegro.tech.hermes.frontend.publishing.message.MessageIdGenerator;
-import pl.allegro.tech.hermes.integrationtests.client.FrontendTestClient;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesConsumersTestApp;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesFrontendTestApp;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesManagementExtension;
 import pl.allegro.tech.hermes.integrationtests.setup.InfrastructureExtension;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscriber;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
-
-import java.io.File;
-import java.time.Clock;
-import java.util.Collections;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static jakarta.ws.rs.core.Response.Status.ACCEPTED;
-import static java.nio.charset.Charset.defaultCharset;
-import static java.time.Instant.now;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.Assertions.assertThat;
-import static pl.allegro.tech.hermes.api.ContentType.JSON;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.MESSAGES_LOCAL_STORAGE_DIRECTORY;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.MESSAGES_LOCAL_STORAGE_ENABLED;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient;
 
 public class MessageBufferLoadingTest {
 
-    private static final int ENTRIES = 100;
-    private static final int AVERAGE_MESSAGE_SIZE = 600;
-
-    @Order(0)
-    @RegisterExtension
-    public static InfrastructureExtension infra = new InfrastructureExtension();
-
-    @Order(1)
-    @RegisterExtension
-    public static HermesManagementExtension management = new HermesManagementExtension(infra);
-
-    private static final HermesConsumersTestApp consumers = new HermesConsumersTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-
-    @BeforeAll
-    public static void setup() {
-        consumers.start();
-    }
-
-    @AfterAll
-    public static void clean() {
-        consumers.stop();
-    }
-
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    @Test
-    public void shouldBackupMessage() {
-        // setup
-        String backupStorageDir = Files.createTempDir().getAbsolutePath();
-        HermesFrontendTestApp frontend = new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-        frontend.withProperty(MESSAGES_LOCAL_STORAGE_DIRECTORY, backupStorageDir);
-        frontend.withProperty(MESSAGES_LOCAL_STORAGE_ENABLED, true);
-        frontend.start();
-
-        FrontendTestClient publisher = new FrontendTestClient(frontend.getPort());
-
-        Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
-
-        try {
-            //given
-            final ChronicleMapMessageRepository backupRepository = createBackupRepository(backupStorageDir);
-
-            publisher.publishUntilSuccess(topic.getQualifiedName(), "message");
+  private static final int ENTRIES = 100;
+  private static final int AVERAGE_MESSAGE_SIZE = 600;
 
-            // when
-            infra.kafka().cutOffConnectionsBetweenBrokersAndClients();
+  @Order(0)
+  @RegisterExtension
+  public static InfrastructureExtension infra = new InfrastructureExtension();
 
-            publisher.publishUntilStatus(topic.getQualifiedName(), "message", ACCEPTED.getStatusCode());
+  @Order(1)
+  @RegisterExtension
+  public static HermesManagementExtension management = new HermesManagementExtension(infra);
 
-            // then
-            await().atMost(10, SECONDS).until(() -> assertThat(backupRepository.findAll()).hasSize(1));
+  private static final HermesConsumersTestApp consumers =
+      new HermesConsumersTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
 
-        } finally {
-            // after
-            infra.kafka().restoreConnectionsBetweenBrokersAndClients();
-            frontend.stop();
-        }
-    }
-
-    @Test
-    public void shouldLoadMessageFromBackupStorage() {
-        // given
-        String tempDirPath = Files.createTempDir().getAbsolutePath();
-        Topic topic = management.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
-        backupFileWithOneMessage(tempDirPath, topic);
-
-        TestSubscriber subscriber = subscribers.createSubscriber();
+  @BeforeAll
+  public static void setup() {
+    consumers.start();
+  }
 
-        management.initHelper().createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build()
-        );
+  @AfterAll
+  public static void clean() {
+    consumers.stop();
+  }
 
-        HermesFrontendTestApp frontend = new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-        frontend.withProperty(MESSAGES_LOCAL_STORAGE_DIRECTORY, tempDirPath);
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
 
-        // when
-        frontend.start();
+  @Test
+  public void shouldBackupMessage() {
+    // setup
+    String backupStorageDir = Files.createTempDir().getAbsolutePath();
+    HermesFrontendTestApp frontend =
+        new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
+    frontend.withProperty(MESSAGES_LOCAL_STORAGE_DIRECTORY, backupStorageDir);
+    frontend.withProperty(MESSAGES_LOCAL_STORAGE_ENABLED, true);
+    frontend.start();
 
-        // then
-        subscriber.waitUntilReceived("message");
+    FrontendTestClient publisher = new FrontendTestClient(frontend.getPort());
 
-        // after
-        frontend.stop();
-    }
-
-    private void backupFileWithOneMessage(String tempDirPath, Topic topic) {
-        File backup = new File(tempDirPath, "hermes-buffer-v3.dat");
+    Topic topic = management.initHelper().createTopic(topicWithRandomName().build());
 
-        MessageRepository messageRepository = new ChronicleMapMessageRepository(backup, ENTRIES, AVERAGE_MESSAGE_SIZE);
-        JsonMessageContentWrapper contentWrapper = new JsonMessageContentWrapper("message", "metadata", new ObjectMapper());
+    try {
+      // given
+      final ChronicleMapMessageRepository backupRepository =
+          createBackupRepository(backupStorageDir);
 
-        CompositeMessageContentWrapper wrapper = new CompositeMessageContentWrapper(contentWrapper, null, null, null, null, null);
+      publisher.publishUntilSuccess(topic.getQualifiedName(), "message");
 
-        String messageId = MessageIdGenerator.generate();
-        long timestamp = now().toEpochMilli();
-        byte[] content = wrapper.wrapJson("message".getBytes(defaultCharset()),
-                messageId, timestamp, Collections.emptyMap());
+      // when
+      infra.kafka().cutOffConnectionsBetweenBrokersAndClients();
 
-        messageRepository.save(new JsonMessage(messageId, content, timestamp, null), topic);
-        messageRepository.close();
+      publisher.publishUntilStatus(topic.getQualifiedName(), "message", ACCEPTED.getStatusCode());
 
-    }
+      // then
+      await()
+          .atMost(10, SECONDS)
+          .untilAsserted(() -> assertThat(backupRepository.findAll()).hasSize(1));
 
-    private ChronicleMapMessageRepository createBackupRepository(String storageDirPath) {
-        return new ChronicleMapMessageRepository(
-                new BackupFilesManager(storageDirPath, Clock.systemUTC()).getCurrentBackupFile(),
-                ENTRIES,
-                AVERAGE_MESSAGE_SIZE
-        );
+    } finally {
+      // after
+      infra.kafka().restoreConnectionsBetweenBrokersAndClients();
+      frontend.stop();
     }
+  }
+
+  @Test
+  public void shouldLoadMessageFromBackupStorage() {
+    // given
+    String tempDirPath = Files.createTempDir().getAbsolutePath();
+    Topic topic =
+        management.initHelper().createTopic(topicWithRandomName().withContentType(JSON).build());
+    backupFileWithOneMessage(tempDirPath, topic);
+
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    management
+        .initHelper()
+        .createSubscription(
+            subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint())
+                .build());
+
+    HermesFrontendTestApp frontend =
+        new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
+    frontend.withProperty(MESSAGES_LOCAL_STORAGE_DIRECTORY, tempDirPath);
+
+    // when
+    frontend.start();
+
+    // then
+    subscriber.waitUntilReceived("message");
+
+    // after
+    frontend.stop();
+  }
+
+  private void backupFileWithOneMessage(String tempDirPath, Topic topic) {
+    File backup = new File(tempDirPath, "hermes-buffer-v3.dat");
+
+    MessageRepository messageRepository =
+        new ChronicleMapMessageRepository(backup, ENTRIES, AVERAGE_MESSAGE_SIZE);
+    JsonMessageContentWrapper contentWrapper =
+        new JsonMessageContentWrapper("message", "metadata", new ObjectMapper());
+
+    CompositeMessageContentWrapper wrapper =
+        new CompositeMessageContentWrapper(contentWrapper, null, null, null, null, null);
+
+    String messageId = MessageIdGenerator.generate();
+    long timestamp = now().toEpochMilli();
+    byte[] content =
+        wrapper.wrapJson(
+            "message".getBytes(defaultCharset()), messageId, timestamp, Collections.emptyMap());
+
+    messageRepository.save(
+        new JsonMessage(messageId, content, timestamp, null, Collections.emptyMap()), topic);
+    messageRepository.close();
+  }
+
+  private ChronicleMapMessageRepository createBackupRepository(String storageDirPath) {
+    return new ChronicleMapMessageRepository(
+        new BackupFilesManager(storageDirPath, Clock.systemUTC()).getCurrentBackupFile(),
+        ENTRIES,
+        AVERAGE_MESSAGE_SIZE);
+  }
 }
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/MultiDatacenterPublishingAndSubscribingTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/MultiDatacenterPublishingAndSubscribingTest.java
index cbec6b5d66..b792c230f9 100644
--- a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/MultiDatacenterPublishingAndSubscribingTest.java
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/MultiDatacenterPublishingAndSubscribingTest.java
@@ -1,125 +1,115 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.Map;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.lifecycle.Startable;
 import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.integrationtests.client.FrontendTestClient;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesConsumersTestApp;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesFrontendTestApp;
-import pl.allegro.tech.hermes.integrationtests.setup.HermesInitHelper;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesManagementTestApp;
-import pl.allegro.tech.hermes.integrationtests.setup.HermesTestApp;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscriber;
 import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient;
+import pl.allegro.tech.hermes.test.helper.client.integration.HermesInitHelper;
 import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
 import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
 import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
+import pl.allegro.tech.hermes.test.helper.environment.HermesTestApp;
 import pl.allegro.tech.hermes.test.helper.message.TestMessage;
 
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
-
 public class MultiDatacenterPublishingAndSubscribingTest {
 
-    @RegisterExtension
-    public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
-
-    private static final ConfluentSchemaRegistryContainer schemaRegistry = new ConfluentSchemaRegistryContainer();
-    private static final HermesDatacenter dc1 = new HermesDatacenter();
-    private static final HermesDatacenter dc2 = new HermesDatacenter();
-
-    private static HermesManagementTestApp management;
-    private static HermesInitHelper initHelper;
-
-    @BeforeAll
-    public static void setup() {
-        Stream.of(dc1, dc2)
-                .parallel()
-                .forEach(HermesDatacenter::startKafkaAndZookeeper);
-        schemaRegistry.start();
-        management = new HermesManagementTestApp(
-                Map.of(DEFAULT_DC_NAME, dc1.hermesZookeeper, "dc2", dc2.hermesZookeeper),
-                Map.of(DEFAULT_DC_NAME, dc1.kafka, "dc2", dc2.kafka),
-                schemaRegistry
-        );
-        management.start();
-        initHelper = new HermesInitHelper(management.getPort());
-        Stream.of(dc1, dc2)
-                .parallel()
-                .forEach(HermesDatacenter::startConsumersAndFrontend);
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  private static final ConfluentSchemaRegistryContainer schemaRegistry =
+      new ConfluentSchemaRegistryContainer();
+  private static final HermesDatacenter dc1 = new HermesDatacenter();
+  private static final HermesDatacenter dc2 = new HermesDatacenter();
+
+  private static HermesManagementTestApp management;
+  private static HermesInitHelper initHelper;
+
+  @BeforeAll
+  public static void setup() {
+    Stream.of(dc1, dc2).parallel().forEach(HermesDatacenter::startKafkaAndZookeeper);
+    schemaRegistry.start();
+    management =
+        new HermesManagementTestApp(
+            Map.of(DEFAULT_DC_NAME, dc1.hermesZookeeper, "dc2", dc2.hermesZookeeper),
+            Map.of(DEFAULT_DC_NAME, dc1.kafka, "dc2", dc2.kafka),
+            schemaRegistry);
+    management.start();
+    initHelper = new HermesInitHelper(management.getPort());
+    dc1.startConsumersAndFrontend();
+    dc2.startConsumersAndFrontend();
+  }
+
+  @AfterAll
+  public static void clean() {
+    management.stop();
+    Stream.of(dc1, dc2).parallel().forEach(HermesDatacenter::stop);
+    schemaRegistry.stop();
+  }
+
+  @Test
+  public void shouldPublishAndConsumeThroughMultipleDatacenters() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    TestMessage messageDc1 = TestMessage.of("key1", "value1");
+    TestMessage messageDc2 = TestMessage.of("key2", "value2");
+    Topic topic = initHelper.createTopic(topicWithRandomName().build());
+    initHelper.createSubscription(
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
+
+    // when
+    dc1.api().publishUntilSuccess(topic.getQualifiedName(), messageDc1.body());
+    dc2.api().publishUntilSuccess(topic.getQualifiedName(), messageDc2.body());
+
+    // then
+    subscriber.waitUntilReceived(messageDc1.body());
+    subscriber.waitUntilReceived(messageDc2.body());
+  }
+
+  private static class HermesDatacenter {
+
+    private final ZookeeperContainer hermesZookeeper = new ZookeeperContainer("HermesZookeeper");
+    private final KafkaContainerCluster kafka = new KafkaContainerCluster(1);
+    private final HermesConsumersTestApp consumers =
+        new HermesConsumersTestApp(hermesZookeeper, kafka, schemaRegistry);
+    private final HermesFrontendTestApp frontend =
+        new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry);
+    private FrontendTestClient frontendClient;
+
+    public HermesDatacenter() {
+      schemaRegistry.withKafkaCluster(kafka);
+    }
+
+    void startKafkaAndZookeeper() {
+      Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::start);
     }
 
-    @AfterAll
-    public static void clean() {
-        management.stop();
-        Stream.of(dc1, dc2)
-                .parallel()
-                .forEach(HermesDatacenter::stop);
-        schemaRegistry.stop();
+    void startConsumersAndFrontend() {
+      frontend.start();
+      consumers.start();
+      frontendClient = new FrontendTestClient(frontend.getPort());
     }
 
-    @Test
-    public void shouldPublishAndConsumeThroughMultipleDatacenters() {
-        // given
-        TestSubscriber subscriber = subscribers.createSubscriber();
-        TestMessage messageDc1 = TestMessage.of("key1", "value1");
-        TestMessage messageDc2 = TestMessage.of("key2", "value2");
-        Topic topic = initHelper.createTopic(topicWithRandomName().build());
-        initHelper.createSubscription(
-                subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build()
-        );
-
-        // when
-        dc1.api().publishUntilSuccess(topic.getQualifiedName(), messageDc1.body());
-        dc2.api().publishUntilSuccess(topic.getQualifiedName(), messageDc2.body());
-
-        // then
-        subscriber.waitUntilReceived(messageDc1.body());
-        subscriber.waitUntilReceived(messageDc2.body());
+    void stop() {
+      Stream.of(consumers, frontend).parallel().forEach(HermesTestApp::stop);
+      Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::stop);
     }
 
-    private static class HermesDatacenter {
-
-        private final ZookeeperContainer hermesZookeeper = new ZookeeperContainer("HermesZookeeper");
-        private final KafkaContainerCluster kafka = new KafkaContainerCluster(1);
-        private final HermesConsumersTestApp consumers = new HermesConsumersTestApp(hermesZookeeper, kafka, schemaRegistry);
-        private final HermesFrontendTestApp frontend = new HermesFrontendTestApp(hermesZookeeper, kafka, schemaRegistry);
-        private FrontendTestClient frontendClient;
-
-        public HermesDatacenter() {
-            schemaRegistry.withKafkaCluster(kafka);
-        }
-
-        void startKafkaAndZookeeper() {
-            Stream.of(hermesZookeeper, kafka)
-                    .parallel()
-                    .forEach(Startable::start);
-        }
-
-        void startConsumersAndFrontend() {
-            Stream.of(consumers, frontend)
-                    .forEach(HermesTestApp::start);
-            frontendClient = new FrontendTestClient(frontend.getPort());
-        }
-
-        void stop() {
-            Stream.of(consumers, frontend)
-                    .parallel()
-                    .forEach(HermesTestApp::stop);
-            Stream.of(hermesZookeeper, kafka)
-                    .parallel()
-                    .forEach(Startable::stop);
-        }
-
-        FrontendTestClient api() {
-            return frontendClient;
-        }
+    FrontendTestClient api() {
+      return frontendClient;
     }
+  }
 }
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAvroOnTopicWithoutSchemaTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAvroOnTopicWithoutSchemaTest.java
index 5774b0e22e..ab79995124 100644
--- a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAvroOnTopicWithoutSchemaTest.java
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/PublishingAvroOnTopicWithoutSchemaTest.java
@@ -1,5 +1,11 @@
 package pl.allegro.tech.hermes.integrationtests;
 
+import static pl.allegro.tech.hermes.api.ContentType.AVRO;
+import static pl.allegro.tech.hermes.api.ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.SCHEMA_REPOSITORY_SERVER_URL;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.Options;
 import org.assertj.core.api.Assertions;
@@ -12,67 +18,68 @@
 import pl.allegro.tech.hermes.api.ErrorDescription;
 import pl.allegro.tech.hermes.api.Topic;
 import pl.allegro.tech.hermes.api.TopicWithSchema;
-import pl.allegro.tech.hermes.integrationtests.client.FrontendTestClient;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesFrontendTestApp;
 import pl.allegro.tech.hermes.integrationtests.setup.HermesManagementExtension;
 import pl.allegro.tech.hermes.integrationtests.setup.InfrastructureExtension;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUser;
 import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader;
-
-import static pl.allegro.tech.hermes.api.ContentType.AVRO;
-import static pl.allegro.tech.hermes.api.ErrorCode.SCHEMA_COULD_NOT_BE_LOADED;
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.SCHEMA_REPOSITORY_SERVER_URL;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+import pl.allegro.tech.hermes.test.helper.client.integration.FrontendTestClient;
 
 public class PublishingAvroOnTopicWithoutSchemaTest {
 
-    @Order(0)
-    @RegisterExtension
-    public static InfrastructureExtension infra = new InfrastructureExtension();
-
-    @Order(1)
-    @RegisterExtension
-    public static HermesManagementExtension management = new HermesManagementExtension(infra);
-
-    private static FrontendTestClient publisher;
-    private static HermesFrontendTestApp frontend;
-
-    private static final WireMockServer emptySchemaRegistryMock = new WireMockServer(Options.DYNAMIC_PORT);
-
-    @BeforeAll
-    public static void setup() {
-        emptySchemaRegistryMock.start();
-
-        frontend = new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
-        frontend.withProperty(SCHEMA_REPOSITORY_SERVER_URL, "http://localhost:" + emptySchemaRegistryMock.port());
-        frontend.start();
-
-        publisher = new FrontendTestClient(frontend.getPort());
-
-    }
-
-    @AfterAll
-    public static void clean() {
-        emptySchemaRegistryMock.stop();
-        frontend.stop();
-    }
-
-    @Test
-    public void shouldReturnServerInternalErrorResponseOnMissingSchema() {
-        // given
-        TopicWithSchema topicWithSchema = topicWithSchema(topicWithRandomName()
-                .withContentType(AVRO)
-                .build(), AvroUserSchemaLoader.load().toString());
-
-        Topic topic = management.initHelper().createTopicWithSchema(topicWithSchema);
-
-        // when
-        String message = new AvroUser("Bob", 50, "blue").asJson();
-        WebTestClient.ResponseSpec response = publisher.publish(topic.getQualifiedName(), message);
-
-        // then
-        response.expectStatus().is5xxServerError();
-        Assertions.assertThat(response.expectBody(ErrorDescription.class).returnResult().getResponseBody().getCode()).isEqualTo(SCHEMA_COULD_NOT_BE_LOADED);
-    }
+  @Order(0)
+  @RegisterExtension
+  public static InfrastructureExtension infra = new InfrastructureExtension();
+
+  @Order(1)
+  @RegisterExtension
+  public static HermesManagementExtension management = new HermesManagementExtension(infra);
+
+  private static FrontendTestClient publisher;
+  private static HermesFrontendTestApp frontend;
+
+  private static final WireMockServer emptySchemaRegistryMock =
+      new WireMockServer(Options.DYNAMIC_PORT);
+
+  @BeforeAll
+  public static void setup() {
+    emptySchemaRegistryMock.start();
+
+    frontend =
+        new HermesFrontendTestApp(infra.hermesZookeeper(), infra.kafka(), infra.schemaRegistry());
+    frontend.withProperty(
+        SCHEMA_REPOSITORY_SERVER_URL, "http://localhost:" + emptySchemaRegistryMock.port());
+    frontend.start();
+
+    publisher = new FrontendTestClient(frontend.getPort());
+  }
+
+  @AfterAll
+  public static void clean() {
+    emptySchemaRegistryMock.stop();
+    frontend.stop();
+  }
+
+  @Test
+  public void shouldReturnServerInternalErrorResponseOnMissingSchema() {
+    // given
+    TopicWithSchema topicWithSchema =
+        topicWithSchema(
+            topicWithRandomName().withContentType(AVRO).build(),
+            AvroUserSchemaLoader.load().toString());
+
+    Topic topic = management.initHelper().createTopicWithSchema(topicWithSchema);
+
+    // when
+    String message = new AvroUser("Bob", 50, "blue").asJson();
+    // ensure topic is created
+    publisher.publishUntilStatus(topic.getQualifiedName(), message, 500);
+    WebTestClient.ResponseSpec response = publisher.publish(topic.getQualifiedName(), message);
+
+    // then
+    response.expectStatus().isEqualTo(500);
+    Assertions.assertThat(
+            response.expectBody(ErrorDescription.class).returnResult().getResponseBody().getCode())
+        .isEqualTo(SCHEMA_COULD_NOT_BE_LOADED);
+  }
 }
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/RemoteDatacenterProduceFallbackTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/RemoteDatacenterProduceFallbackTest.java
new file mode 100644
index 0000000000..94fc0d80e1
--- /dev/null
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/RemoteDatacenterProduceFallbackTest.java
@@ -0,0 +1,290 @@
+package pl.allegro.tech.hermes.integrationtests;
+
+import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
+import static pl.allegro.tech.hermes.integrationtests.assertions.HermesAssertions.assertThatMetrics;
+import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topicWithRandomName;
+
+import java.util.Map;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.testcontainers.lifecycle.Startable;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy.ChaosMode;
+import pl.allegro.tech.hermes.api.PublishingChaosPolicy.ChaosPolicy;
+import pl.allegro.tech.hermes.api.Topic;
+import pl.allegro.tech.hermes.integrationtests.assertions.PrometheusMetricsAssertion;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesConsumersTestApp;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesFrontendTestApp;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesManagementTestApp;
+import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscriber;
+import pl.allegro.tech.hermes.integrationtests.subscriber.TestSubscribersExtension;
+import pl.allegro.tech.hermes.test.helper.client.integration.HermesInitHelper;
+import pl.allegro.tech.hermes.test.helper.client.integration.HermesTestClient;
+import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
+import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
+import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
+import pl.allegro.tech.hermes.test.helper.message.TestMessage;
+
+public class RemoteDatacenterProduceFallbackTest {
+
+  @RegisterExtension
+  public static final TestSubscribersExtension subscribers = new TestSubscribersExtension();
+
+  private static final ConfluentSchemaRegistryContainer schemaRegistry =
+      new ConfluentSchemaRegistryContainer();
+  private static final HermesDatacenter dc1 = new HermesDatacenter();
+  private static final HermesDatacenter dc2 = new HermesDatacenter();
+
+  private static HermesManagementTestApp management;
+  private static HermesInitHelper initHelper;
+  private static HermesFrontendTestApp frontendDC1;
+  private static HermesConsumersTestApp consumerDC1;
+  private static HermesConsumersTestApp consumerDC2;
+
+  private static HermesTestClient DC1;
+  private static final String REMOTE_DC_NAME = "dc2";
+
+  @BeforeAll
+  public static void setup() {
+    Stream.of(dc1, dc2).parallel().forEach(HermesDatacenter::startKafkaAndZookeeper);
+    schemaRegistry.start();
+    management =
+        new HermesManagementTestApp(
+            Map.of(DEFAULT_DC_NAME, dc1.hermesZookeeper, REMOTE_DC_NAME, dc2.hermesZookeeper),
+            Map.of(DEFAULT_DC_NAME, dc1.kafka, REMOTE_DC_NAME, dc2.kafka),
+            schemaRegistry);
+    management.start();
+    frontendDC1 =
+        new HermesFrontendTestApp(
+            dc1.hermesZookeeper,
+            Map.of("dc", dc1.kafka, REMOTE_DC_NAME, dc2.kafka),
+            schemaRegistry);
+    frontendDC1.start();
+
+    consumerDC1 = new HermesConsumersTestApp(dc1.hermesZookeeper, dc1.kafka, schemaRegistry);
+    consumerDC1.start();
+
+    consumerDC2 = new HermesConsumersTestApp(dc2.hermesZookeeper, dc2.kafka, schemaRegistry);
+    consumerDC2.start();
+
+    DC1 = new HermesTestClient(management.getPort(), frontendDC1.getPort(), consumerDC1.getPort());
+    initHelper = new HermesInitHelper(management.getPort());
+  }
+
+  @AfterAll
+  public static void clean() {
+    management.stop();
+    consumerDC2.stop();
+    frontendDC1.stop();
+    consumerDC1.stop();
+    schemaRegistry.stop();
+    Stream.of(dc1, dc2).parallel().forEach(HermesDatacenter::stop);
+  }
+
+  @AfterEach
+  public void afterEach() {
+    Stream.of(dc1, dc2).forEach(dc -> dc.kafka.restoreConnectionsBetweenBrokersAndClients());
+    DC1.setReadiness(DEFAULT_DC_NAME, true);
+    DC1.setReadiness(REMOTE_DC_NAME, true);
+  }
+
+  @Test
+  public void shouldPublishAndConsumeViaRemoteDCWhenLocalKafkaIsUnavailable() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic =
+        initHelper.createTopic(
+            topicWithRandomName().withFallbackToRemoteDatacenterEnabled().build());
+    initHelper.createSubscription(
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
+
+    double remoteDCInitialSendTotal = assertRemoteDCSendTotalMetric().withInitialValue();
+
+    // when dc1 is not available
+    dc1.kafka.cutOffConnectionsBetweenBrokersAndClients();
+
+    // and message is published to dc1
+    TestMessage message = TestMessage.of("key1", "value1");
+    DC1.publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then message is received in dc2
+    subscriber.waitUntilReceived(message.body());
+
+    // and metrics that message was published to remote dc is incremented
+    DC1.getFrontendMetrics()
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .value(
+            (body) -> {
+              assertThatMetrics(body)
+                  .contains("hermes_frontend_topic_published_total")
+                  .withLabels(
+                      "group", topic.getName().getGroupName(),
+                      "topic", topic.getName().getName(),
+                      "storageDc", REMOTE_DC_NAME)
+                  .withValue(1.0);
+              assertRemoteDCSendTotalMetric().withValueGreaterThan(remoteDCInitialSendTotal);
+            });
+  }
+
+  @Test
+  public void shouldReturn500whenBothDCsAreUnavailable() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic =
+        initHelper.createTopic(
+            topicWithRandomName().withFallbackToRemoteDatacenterEnabled().build());
+    initHelper.createSubscription(
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
+
+    // when both dcs are not available
+    dc1.kafka.cutOffConnectionsBetweenBrokersAndClients();
+    dc2.kafka.cutOffConnectionsBetweenBrokersAndClients();
+
+    // and message is published
+    TestMessage message = TestMessage.of("key1", "value1");
+    DC1.publishUntilStatus(topic.getQualifiedName(), message.body(), 503);
+
+    // then no messages are received
+    subscriber.noMessagesReceived();
+  }
+
+  @Test
+  public void shouldNotFallBackToNotReadyDatacenter() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+    Topic topic =
+        initHelper.createTopic(
+            topicWithRandomName().withFallbackToRemoteDatacenterEnabled().build());
+    initHelper.createSubscription(
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
+
+    // when local datacenter is not available and remote is not ready
+    dc1.kafka.cutOffConnectionsBetweenBrokersAndClients();
+    DC1.setReadiness(REMOTE_DC_NAME, false);
+
+    // and message is published
+    TestMessage message = TestMessage.of("key1", "value1");
+    DC1.publishUntilStatus(topic.getQualifiedName(), message.body(), 503);
+
+    // then no messages are received
+    subscriber.noMessagesReceived();
+  }
+
+  @Test
+  public void shouldPublishAndConsumeViaRemoteDCWhenChaosExperimentIsEnabledForLocalKafka() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    Topic topic =
+        initHelper.createTopic(
+            topicWithRandomName()
+                .withFallbackToRemoteDatacenterEnabled()
+                .withPublishingChaosPolicy(completeWithErrorForDatacenter(DEFAULT_DC_NAME))
+                .build());
+    initHelper.createSubscription(
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
+
+    // and message is published to dc1
+    TestMessage message = TestMessage.of("key1", "value1");
+    DC1.publishUntilSuccess(topic.getQualifiedName(), message.body());
+
+    // then message is received in dc2
+    subscriber.waitUntilReceived(message.body());
+
+    // and metrics that message was published to remote dc is incremented
+    DC1.getFrontendMetrics()
+        .expectStatus()
+        .isOk()
+        .expectBody(String.class)
+        .value(
+            (body) ->
+                assertThatMetrics(body)
+                    .contains("hermes_frontend_topic_published_total")
+                    .withLabels(
+                        "group", topic.getName().getGroupName(),
+                        "topic", topic.getName().getName(),
+                        "storageDc", REMOTE_DC_NAME)
+                    .withValue(1.0));
+  }
+
+  @Test
+  public void shouldReturnErrorWhenChaosExperimentIsEnabledForAllDatacenters() {
+    // given
+    TestSubscriber subscriber = subscribers.createSubscriber();
+
+    Topic topic =
+        initHelper.createTopic(
+            topicWithRandomName()
+                .withFallbackToRemoteDatacenterEnabled()
+                .withPublishingChaosPolicy(completeWithErrorForAllDatacenters())
+                .build());
+    initHelper.createSubscription(
+        subscription(topic.getQualifiedName(), "subscription", subscriber.getEndpoint()).build());
+    TestMessage message = TestMessage.of("key1", "value1");
+
+    // when
+    DC1.publishUntilStatus(topic.getQualifiedName(), message.body(), 500);
+
+    // then
+    subscriber.noMessagesReceived();
+  }
+
+  private static PublishingChaosPolicy completeWithErrorForAllDatacenters() {
+    int delayFrom = 100;
+    int delayTo = 200;
+    int probability = 100;
+    boolean completeWithError = true;
+    return new PublishingChaosPolicy(
+        ChaosMode.GLOBAL,
+        new ChaosPolicy(probability, delayFrom, delayTo, completeWithError),
+        null);
+  }
+
+  private static PublishingChaosPolicy completeWithErrorForDatacenter(String datacenter) {
+    int delayFrom = 100;
+    int delayTo = 200;
+    int probability = 100;
+    boolean completeWithError = true;
+    return new PublishingChaosPolicy(
+        ChaosMode.DATACENTER,
+        null,
+        Map.of(datacenter, new ChaosPolicy(probability, delayFrom, delayTo, completeWithError)));
+  }
+
+  private static class HermesDatacenter {
+
+    private final ZookeeperContainer hermesZookeeper = new ZookeeperContainer("HermesZookeeper");
+    private final KafkaContainerCluster kafka = new KafkaContainerCluster(1);
+
+    public HermesDatacenter() {
+      schemaRegistry.withKafkaCluster(kafka);
+    }
+
+    void startKafkaAndZookeeper() {
+      Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::start);
+    }
+
+    void stop() {
+      Stream.of(hermesZookeeper, kafka).parallel().forEach(Startable::stop);
+    }
+  }
+
+  PrometheusMetricsAssertion.PrometheusMetricAssertion assertRemoteDCSendTotalMetric() {
+    return assertThatMetrics(
+            DC1.getFrontendMetrics()
+                .expectStatus()
+                .isOk()
+                .expectBody(String.class)
+                .returnResult()
+                .getResponseBody())
+        .contains("hermes_frontend_kafka_producer_ack_leader_record_send_total")
+        .withLabels("storageDc", REMOTE_DC_NAME, "sender", "failFast");
+  }
+}
diff --git a/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicCreationRollbackTest.java b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicCreationRollbackTest.java
new file mode 100644
index 0000000000..94546e7b1d
--- /dev/null
+++ b/integration-tests/src/slowIntegrationTest/java/pl/allegro/tech/hermes/integrationtests/TopicCreationRollbackTest.java
@@ -0,0 +1,83 @@
+package pl.allegro.tech.hermes.integrationtests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
+import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
+import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
+
+import java.time.Duration;
+import java.util.Map;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.lifecycle.Startable;
+import pl.allegro.tech.hermes.api.Group;
+import pl.allegro.tech.hermes.env.BrokerOperations;
+import pl.allegro.tech.hermes.integrationtests.setup.HermesManagementTestApp;
+import pl.allegro.tech.hermes.test.helper.client.integration.HermesTestClient;
+import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
+import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
+import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
+
+public class TopicCreationRollbackTest {
+
+  private static HermesManagementTestApp management;
+
+  private static final ZookeeperContainer hermesZookeeper =
+      new ZookeeperContainer("HermesZookeeper");
+
+  private static final KafkaContainerCluster kafka1 = new KafkaContainerCluster(1);
+
+  private static final KafkaContainerCluster kafka2 = new KafkaContainerCluster(1);
+
+  private static final ConfluentSchemaRegistryContainer schemaRegistry =
+      new ConfluentSchemaRegistryContainer().withKafkaCluster(kafka1);
+  private static HermesTestClient hermesApi;
+
+  private static BrokerOperations brokerOperations1;
+
+  @BeforeAll
+  public static void setup() {
+    Stream.of(hermesZookeeper, kafka1, kafka2).parallel().forEach(Startable::start);
+    schemaRegistry.start();
+    management =
+        new HermesManagementTestApp(
+            Map.of(DEFAULT_DC_NAME, hermesZookeeper),
+            Map.of(DEFAULT_DC_NAME, kafka1, "dc2", kafka2),
+            schemaRegistry);
+    management.start();
+    hermesApi =
+        new HermesTestClient(management.getPort(), management.getPort(), management.getPort());
+    brokerOperations1 =
+        new BrokerOperations(kafka1.getBootstrapServersForExternalClients(), "itTest");
+  }
+
+  @AfterAll
+  public static void clean() {
+    management.stop();
+    Stream.of(hermesZookeeper, kafka1, kafka2).parallel().forEach(Startable::stop);
+    schemaRegistry.stop();
+  }
+
+  @Test
+  public void topicCreationRollbackShouldNotDeleteTopicOnBroker() {
+    // given
+    String groupName = "topicCreationRollbackShouldNotDeleteTopicOnBroker";
+    String topicName = "topic";
+    String qualifiedTopicName = groupName + "." + topicName;
+    hermesApi.createGroup(Group.from(groupName));
+
+    brokerOperations1.createTopic(qualifiedTopicName);
+    waitAtMost(Duration.ofMinutes(1))
+        .untilAsserted(
+            () -> assertThat(brokerOperations1.topicExists(qualifiedTopicName)).isTrue());
+
+    // when
+    hermesApi.createTopic((topicWithSchema(topic(groupName, topicName).build())));
+
+    // then
+    assertThat(brokerOperations1.topicExists(qualifiedTopicName)).isTrue();
+  }
+}
diff --git a/integration-tests/src/slowIntegrationTest/resources/allure.properties b/integration-tests/src/slowIntegrationTest/resources/allure.properties
new file mode 100644
index 0000000000..8c70baec64
--- /dev/null
+++ b/integration-tests/src/slowIntegrationTest/resources/allure.properties
@@ -0,0 +1 @@
+allure.results.directory=../build/allure-results
diff --git a/integration-tests/src/slowIntegrationTest/resources/logback.xml b/integration-tests/src/slowIntegrationTest/resources/logback.xml
index 6b79faabfb..25978ddfbd 100644
--- a/integration-tests/src/slowIntegrationTest/resources/logback.xml
+++ b/integration-tests/src/slowIntegrationTest/resources/logback.xml
@@ -8,6 +8,22 @@
     </appender>
 
     <logger name="pl.allegro.tech.hermes.infrastructure.zookeeper.cache" level="debug" />
+    <logger name="org.apache.zookeeper" level="warn" />
+    <logger name="kafka" level="warn" />
+    <logger name="org.apache.kafka" level="warn" />
+    <logger name="org.apache.kafka.common.network.Selector" level="error"/>
+    <logger name="org.apache.kafka.clients.consumer.internals.ConsumerCoordinator" level="OFF"/>
+    <logger name="org.eclipse.jetty.server.HttpChannel" level="error"/>
+    <logger name="pl.allegro.tech.hermes.consumers.supervisor.workload.selective.SelectiveWorkBalancer" level="warn" />
+    <logger name="pl.allegro.tech.hermes.consumers.supervisor.workload.BalancingJob" level="warn" />
+    <logger name="pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry" level="warn" />
+    <logger name="pl.allegro.tech.hermes.consumers.consumer.rate.maxrate.MaxRateCalculator" level="warn" />
+    <logger name="pl.allegro.tech.hermes.infrastructure.zookeeper.cache.HierarchicalCacheLevel" level="OFF" />
+    <logger name="pl.allegro.tech.hermes.infrastructure.zookeeper.cache.HierarchicalCache" level="OFF" />
+    <logger name="pl.allegro.tech.hermes.consumers.supervisor.workload.ClusterAssignmentCache" level="warn" />
+    <logger name="pl.allegro.tech.hermes.infrastructure.zookeeper.notifications.ZookeeperInternalNotificationBus" level="OFF" />
+    <logger name="pl.allegro.tech.hermes.management.infrastructure.kafka.service.KafkaRawMessageReader" level="OFF" />
+    <logger name="pl.allegro.tech.hermes.management.infrastructure.prometheus.RestTemplatePrometheusClient" level="OFF" />
 
     <root level="info">
         <appender-ref ref="STDOUT"/>
diff --git a/integration/build.gradle b/integration/build.gradle
deleted file mode 100644
index 972f9125cc..0000000000
--- a/integration/build.gradle
+++ /dev/null
@@ -1,98 +0,0 @@
-repositories {
-    mavenCentral()
-    maven { url 'https://repository.jboss.org/nexus/content/groups/public' }
-}
-
-project.configurations {
-    integration {
-        extendsFrom project.configurations.runtimeClasspath
-        description = 'Dependencies for integration tests'
-        transitive = true
-        visible = true
-    }
-}
-
-dependencies {
-    integration project(':hermes-common')
-    integration project(':hermes-consumers')
-    integration project(':hermes-frontend')
-    integration project(':hermes-management')
-    integration project(':hermes-client')
-    integration project(':hermes-tracker')
-
-    integration project(':hermes-test-helper')
-    integration group: 'com.googlecode.catch-exception', name: 'catch-exception', version: '1.2.0'
-    integration group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
-    integration group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
-    integration group: 'org.apache.curator', name: 'curator-test', version: versions.curator
-    integration group: 'org.springframework', name: 'spring-webflux', version: versions.spring_web
-    integration group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
-
-    integration group: 'org.testcontainers', name: 'testcontainers', version: versions.testcontainers
-    integration group: 'org.testcontainers', name: 'gcloud', version: versions.testcontainers
-
-    integration files('./lib/schema-repo-server-0.1.3-jersey2.jar');
-    integration group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: versions.jersey
-    integration group: 'org.freemarker', name: 'freemarker', version: '2.3.21'
-    integration group: 'org.schemarepo', name: 'schema-repo-common', version: '0.1.3'
-    integration group: 'org.glassfish.jersey.bundles.repackaged', name: 'jersey-guava', version: '2.23.2'
-
-    integration(group: 'org.hornetq', name: 'hornetq-jms-server', version: '2.4.1.Final') {
-        exclude module: 'hornetq-native'
-    }
-}
-
-project.sourceSets {
-    integration {
-        java.srcDir project.file('src/integration/java')
-
-        resources.srcDir project.file('src/integration/resources')
-        resources.srcDir project.sourceSets.test.resources
-        resources.srcDir project.sourceSets.main.resources
-
-        project.plugins.withType(GroovyPlugin) {
-            groovy.srcDir project.file('src/integration/groovy')
-        }
-
-        compileClasspath = project.sourceSets.main.output +
-                project.configurations.runtimeClasspath +
-                project.configurations.integration
-        runtimeClasspath = output + compileClasspath + project.configurations.runtimeClasspath
-    }
-}
-
-tasks.getByName('processIntegrationResources').doFirst() { duplicatesStrategy(DuplicatesStrategy.EXCLUDE) }
-
-task deprecatedIntegrationTest(type: Test) {
-    logging.captureStandardOutput LogLevel.INFO
-
-    def args = []
-    if (project.hasProperty('tests.timeout.multiplier')) {
-        args += "-Dtests.timeout.multiplier=${project.property('tests.timeout.multiplier')}"
-    }
-
-    if (project.hasProperty("confluentImagesTag")) {
-        args += "-DconfluentImagesTag=${project.property("confluentImagesTag")}"
-    }
-
-    args += chronicleMapJvmArgs
-
-    jvmArgs = args
-    minHeapSize "2000m"
-    maxHeapSize "3500m"
-
-    group = 'Verification'
-    description = 'Runs the integration tests.'
-
-    testClassesDirs = project.sourceSets.integration.output.classesDirs
-    classpath = project.sourceSets.integration.runtimeClasspath
-
-    useTestNG {
-        preserveOrder true
-    }
-
-    testLogging {
-        exceptionFormat = 'full'
-        events "passed", "skipped", "failed", "standardError", "standardOut"
-    }
-}
diff --git a/integration/lib/schema-repo-server-0.1.3-jersey2.jar b/integration/lib/schema-repo-server-0.1.3-jersey2.jar
deleted file mode 100644
index 5a82b532d5..0000000000
Binary files a/integration/lib/schema-repo-server-0.1.3-jersey2.jar and /dev/null differ
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/consumers/ConsumerConfigurationProperties.java b/integration/src/integration/java/pl/allegro/tech/hermes/consumers/ConsumerConfigurationProperties.java
deleted file mode 100644
index 7ed6dff920..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/consumers/ConsumerConfigurationProperties.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package pl.allegro.tech.hermes.consumers;
-
-public class ConsumerConfigurationProperties {
-
-    public static String KAFKA_CLUSTER_NAME = "consumer.kafka.clusters.[0].clusterName";
-    public static String CONSUMER_SSL_KEYSTORE_SOURCE = "consumer.ssl.keystoreSource";
-    public static String CONSUMER_SSL_TRUSTSTORE_SOURCE = "consumer.ssl.truststoreSource";
-    public static String CONSUMER_COMMIT_OFFSET_QUEUES_INFLIGHT_DRAIN_FULL = "consumer.commit.offset.queuesInflightDrainFullEnabled";
-    public static String CONSUMER_COMMIT_OFFSET_PERIOD = "consumer.commit.offset.period";
-    public static String GOOGLE_PUBSUB_TRANSPORT_CHANNEL_PROVIDER_ADDRESS = "consumer.google.pubsub.sender.transportChannelProviderAddress";
-    public static String CONSUMER_HEALTH_CHECK_PORT = "consumer.healthCheckPort";
-    public static String CONSUMER_USE_TOPIC_MESSAGE_SIZE = "consumer.useTopicMessageSize";
-    public static String METRICS_ZOOKEEPER_REPORTER_ENABLED = "consumer.metrics.zookeeperReporterEnabled";
-    public static String METRICS_GRAPHITE_REPORTER_ENABLED = "consumer.metrics.graphiteReporterEnabled";
-    public static String SCHEMA_CACHE_ENABLED = "consumer.schema.cache.enabled";
-    public static String SCHEMA_REPOSITORY_SERVER_URL = "consumer.schema.repository.serverUrl";
-    public static String ZOOKEEPER_CONNECTION_STRING = "consumer.zookeeper.clusters.[0].connectionString";
-    public static String KAFKA_AUTHORIZATION_ENABLED = "consumer.kafka.clusters.[0].authorization.enabled";
-    public static String KAFKA_BROKER_LIST = "consumer.kafka.clusters.[0].brokerList";
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/consumers/EndpointAddressResolverConfiguration.java b/integration/src/integration/java/pl/allegro/tech/hermes/consumers/EndpointAddressResolverConfiguration.java
deleted file mode 100644
index 676759d1bd..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/consumers/EndpointAddressResolverConfiguration.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package pl.allegro.tech.hermes.consumers;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import pl.allegro.tech.hermes.consumers.consumer.sender.resolver.EndpointAddressResolver;
-import pl.allegro.tech.hermes.test.helper.endpoint.MultiUrlEndpointAddressResolver;
-
-@Configuration
-public class EndpointAddressResolverConfiguration {
-
-    @Bean
-    @Primary
-    @Profile("integration")
-    public EndpointAddressResolver testMultiUrlEndpointAddressResolver() {
-        return new MultiUrlEndpointAddressResolver();
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/consumers/KafkaNamesMapperConfiguration.java b/integration/src/integration/java/pl/allegro/tech/hermes/consumers/KafkaNamesMapperConfiguration.java
deleted file mode 100644
index fdc4ed2f7b..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/consumers/KafkaNamesMapperConfiguration.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package pl.allegro.tech.hermes.consumers;
-
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-import pl.allegro.tech.hermes.consumers.config.KafkaClustersProperties;
-import pl.allegro.tech.hermes.integration.env.IntegrationTestKafkaNamesMapperFactory;
-
-@Configuration
-@EnableConfigurationProperties(KafkaClustersProperties.class)
-public class KafkaNamesMapperConfiguration {
-
-    @Bean
-    @Primary
-    @Profile("integration")
-    public KafkaNamesMapper testKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
-        return new IntegrationTestKafkaNamesMapperFactory(kafkaClustersProperties.getNamespace()).create();
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/frontend/AuthConfiguration.java b/integration/src/integration/java/pl/allegro/tech/hermes/frontend/AuthConfiguration.java
deleted file mode 100644
index 764e3f3548..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/frontend/AuthConfiguration.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package pl.allegro.tech.hermes.frontend;
-
-import com.google.common.collect.Lists;
-import io.undertow.security.impl.BasicAuthenticationMechanism;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.context.annotation.PropertySource;
-import pl.allegro.tech.hermes.frontend.server.auth.AuthenticationConfiguration;
-import pl.allegro.tech.hermes.integration.auth.SingleUserAwareIdentityManager;
-
-@Configuration
-@PropertySource("classpath:application-auth.properties")
-public class AuthConfiguration {
-
-    @Value("${auth.username}")
-    private String username;
-
-    @Value("${auth.password}")
-    private String password;
-
-    @Bean
-    @Profile("authRequired")
-    public AuthenticationConfiguration requiredAuthenticationConfiguration() {
-        return getAuthConfig(true);
-    }
-
-    @Bean
-    @Profile("authNonRequired")
-    public AuthenticationConfiguration notRequiredAuthenticationConfiguration() {
-        return getAuthConfig(false);
-    }
-
-    private AuthenticationConfiguration getAuthConfig(boolean isAuthenticationRequired) {
-        return new AuthenticationConfiguration(
-                exchange -> isAuthenticationRequired,
-                Lists.newArrayList(new BasicAuthenticationMechanism("basicAuthRealm")),
-                new SingleUserAwareIdentityManager(username, password));
-    }
-
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/frontend/FrontendConfigurationProperties.java b/integration/src/integration/java/pl/allegro/tech/hermes/frontend/FrontendConfigurationProperties.java
deleted file mode 100644
index 09004a7358..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/frontend/FrontendConfigurationProperties.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package pl.allegro.tech.hermes.frontend;
-
-public class FrontendConfigurationProperties {
-
-    public static String MESSAGES_LOCAL_STORAGE_DIRECTORY = "frontend.messages.local.storage.directory";
-    public static String MESSAGES_LOCAL_STORAGE_ENABLED = "frontend.messages.local.storage.enabled";
-    public static String FRONTEND_THROUGHPUT_TYPE = "frontend.throughput.type";
-    public static String FRONTEND_THROUGHPUT_FIXED_MAX = "frontend.throughput.fixedMax";
-    public static String FRONTEND_MESSAGE_PREVIEW_ENABLED = "frontend.message.preview.enabled";
-    public static String FRONTEND_MESSAGE_PREVIEW_LOG_PERSIST_PERIOD = "frontend.message.preview.logPersistPeriod";
-    public static String FRONTEND_READINESS_CHECK_ENABLED = "frontend.readiness.check.enabled";
-    public static String FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED = "frontend.readiness.check.kafkaCheckEnabled";
-    public static String FRONTEND_READINESS_CHECK_INTERVAL_SECONDS = "frontend.readiness.check.interval";
-    public static String FRONTEND_AUTHENTICATION_MODE = "frontend.handlers.authentication.mode";
-    public static String FRONTEND_AUTHENTICATION_ENABLED = "frontend.handlers.authentication.enabled";
-    public static String FRONTEND_KEEP_ALIVE_HEADER_ENABLED = "frontend.handlers.keepAliveHeader.enabled";
-    public static String FRONTEND_KEEP_ALIVE_HEADER_TIMEOUT = "frontend.handlers.keepAliveHeader.timeout";
-    public static String METRICS_ZOOKEEPER_REPORTER_ENABLED = "frontend.metrics.zookeeperReporterEnabled";
-    public static String METRICS_GRAPHITE_REPORTER_ENABLED = "frontend.metrics.graphiteReporterEnabled";
-    public static String GRAPHITE_PORT = "frontend.graphite.port";
-    public static String SCHEMA_CACHE_ENABLED = "frontend.schema.cache.enabled";
-    public static String SCHEMA_REPOSITORY_SERVER_URL = "frontend.schema.repository.serverUrl";
-    public static String FRONTEND_SSL_ENABLED = "frontend.ssl.enabled";
-    public static String FRONTEND_SSL_PORT = "frontend.ssl.port";
-    public static String FRONTEND_SSL_KEYSTORE_SOURCE = "frontend.ssl.keystoreSource";
-    public static String FRONTEND_SSL_TRUSTSTORE_SOURCE = "frontend.ssl.truststoreSource";
-    public static String FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE = "frontend.handlers.forceTopicMaxMessageSize";
-    public static String FRONTEND_HTTP2_ENABLED = "frontend.server.http2Enabled";
-    public static String FRONTEND_GRACEFUL_SHUTDOWN_ENABLED = "frontend.server.gracefulShutdownEnabled";
-    public static String FRONTEND_PORT = "frontend.server.port";
-    public static String ZOOKEEPER_CONNECTION_STRING = "frontend.zookeeper.clusters.[0].connectionString";
-    public static String KAFKA_PRODUCER_METADATA_MAX_AGE = "frontend.kafka.producer.metadataMaxAge";
-    public static String KAFKA_BROKER_LIST = "frontend.kafka.clusters.[0].brokerList";
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/frontend/HeadersPropagatorConfiguration.java b/integration/src/integration/java/pl/allegro/tech/hermes/frontend/HeadersPropagatorConfiguration.java
deleted file mode 100644
index b59ac343ac..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/frontend/HeadersPropagatorConfiguration.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package pl.allegro.tech.hermes.frontend;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import pl.allegro.tech.hermes.frontend.publishing.metadata.HeadersPropagator;
-import pl.allegro.tech.hermes.integration.metadata.TraceHeadersPropagator;
-
-@Configuration
-public class HeadersPropagatorConfiguration {
-
-    @Bean
-    @Primary
-    @Profile("integration")
-    HeadersPropagator traceHeadersPropagator() {
-        return new TraceHeadersPropagator();
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/frontend/KafkaNamesMapperConfiguration.java b/integration/src/integration/java/pl/allegro/tech/hermes/frontend/KafkaNamesMapperConfiguration.java
deleted file mode 100644
index d65080bfa2..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/frontend/KafkaNamesMapperConfiguration.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package pl.allegro.tech.hermes.frontend;
-
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-//todo change to frontend module
-import pl.allegro.tech.hermes.consumers.config.KafkaClustersProperties;
-import pl.allegro.tech.hermes.integration.env.IntegrationTestKafkaNamesMapperFactory;
-
-@Configuration
-@EnableConfigurationProperties(KafkaClustersProperties.class)
-public class KafkaNamesMapperConfiguration {
-
-    @Bean
-    @Primary
-    @Profile("integration")
-    public KafkaNamesMapper testKafkaNamesMapper(KafkaClustersProperties kafkaClustersProperties) {
-        return new IntegrationTestKafkaNamesMapperFactory(kafkaClustersProperties.getNamespace()).create();
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/IntegrationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/IntegrationTest.java
deleted file mode 100644
index c65011901e..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/IntegrationTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package pl.allegro.tech.hermes.integration;
-
-import com.google.common.collect.ImmutableMap;
-import jakarta.ws.rs.core.Response;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeClass;
-import pl.allegro.tech.hermes.integration.env.HermesIntegrationEnvironment;
-import pl.allegro.tech.hermes.integration.env.SharedServices;
-import pl.allegro.tech.hermes.integration.helper.AuditEventEndpoint;
-import pl.allegro.tech.hermes.integration.helper.Waiter;
-import pl.allegro.tech.hermes.test.helper.endpoint.BrokerOperations;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesAPIOperations;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesEndpoints;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher;
-
-import static jakarta.ws.rs.core.Response.Status.OK;
-import static pl.allegro.tech.hermes.integration.env.SharedServices.services;
-
-public class IntegrationTest extends HermesIntegrationEnvironment {
-
-    private static final Logger logger = LoggerFactory.getLogger(IntegrationTest.class);
-
-    protected HermesEndpoints management;
-
-    protected HermesPublisher publisher;
-
-    protected HermesAPIOperations operations;
-
-    protected Waiter wait;
-
-    protected BrokerOperations brokerOperations;
-
-    protected AuditEventEndpoint auditEvents;
-
-    @BeforeClass
-    public void initializeIntegrationTest() {
-        this.management = new HermesEndpoints(MANAGEMENT_ENDPOINT_URL, CONSUMER_ENDPOINT_URL);
-        this.publisher = new HermesPublisher(FRONTEND_URL);
-        this.brokerOperations = new BrokerOperations(
-                ImmutableMap.of(
-                        PRIMARY_KAFKA_CLUSTER_NAME, kafkaClusterOne.getBootstrapServersForExternalClients(),
-                        SECONDARY_KAFKA_CLUSTER_NAME, kafkaClusterTwo.getBootstrapServersForExternalClients()
-                ), KAFKA_NAMESPACE);
-        this.wait = new Waiter(management, services().zookeeper(), brokerOperations, PRIMARY_KAFKA_CLUSTER_NAME, KAFKA_NAMESPACE);
-        this.operations = new HermesAPIOperations(management, wait);
-        this.auditEvents = new AuditEventEndpoint(SharedServices.services().auditEventMock());
-    }
-
-    @AfterMethod
-    public void after() {
-        auditEvents.reset();
-        try {
-            removeSubscriptions(management, wait);
-            removeTopics(management, wait);
-        } catch (RuntimeException e) {
-            logger.error("Error while removing topics and subscriptions", e);
-        }
-    }
-
-    @AfterSuite
-    public void afterSuite() {
-        auditEvents.stop();
-    }
-
-    protected void removeSubscriptions(HermesEndpoints management, Waiter wait) {
-        management.query().querySubscriptions("{\"query\": {}}").forEach(sub -> {
-            Response response = management.subscription().remove(sub.getQualifiedTopicName(), sub.getName());
-            if (response.getStatus() == OK.getStatusCode()) {
-                wait.untilSubscriptionRemoved(sub);
-            } else {
-                logger.warn("Could not remove subscription {}. Received {} http status. Reason {}",
-                        sub.getQualifiedName().getQualifiedName(), response.getStatus(), response.readEntity(String.class));
-            }
-        });
-    }
-
-    protected void removeTopics(HermesEndpoints management, Waiter wait) {
-        management.query().queryTopics("{\"query\": {}}").forEach(topic -> {
-            Response response = management.topic().remove(topic.getQualifiedName());
-            if (response.getStatus() == OK.getStatusCode()) {
-                wait.untilTopicRemoved(topic);
-            } else {
-                logger.warn("Could not remove topic {}. Received {} http status. Reason {}",
-                        topic.getQualifiedName(), response.getStatus(), response.readEntity(String.class));
-            }
-        });
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/MetricsTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/MetricsTest.java
deleted file mode 100644
index 65a1cf0310..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/MetricsTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package pl.allegro.tech.hermes.integration;
-
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.integration.env.SharedServices;
-import pl.allegro.tech.hermes.integration.shame.Unreliable;
-import pl.allegro.tech.hermes.test.helper.endpoint.RemoteServiceEndpoint;
-import pl.allegro.tech.hermes.test.helper.message.TestMessage;
-
-import static jakarta.ws.rs.core.Response.Status.CREATED;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class MetricsTest extends IntegrationTest {
-
-    private RemoteServiceEndpoint remoteService;
-
-    @BeforeMethod
-    public void initializeAlways() {
-        this.remoteService = new RemoteServiceEndpoint(SharedServices.services().serviceMock());
-    }
-
-    @Unreliable
-    @Test(enabled = false)
-    public void shouldNotReportMetricsToConfigStorageForRemovedSubscription() {
-        // given
-        Topic topic = operations.buildTopic("metricsAfterSubscriptionRemovedGroup", "topic");
-        String subscriptionName1 = "subscription";
-        operations.createSubscription(topic, subscriptionName1, remoteService.getUrl());
-        remoteService.expectMessages(TestMessage.simple().body());
-
-        assertThat(publisher.publish(topic.getQualifiedName(), TestMessage.simple().body())).isEqualTo(CREATED);
-        remoteService.waitUntilReceived();
-
-        wait.untilSubscriptionMetricsIsCreated(topic.getName(), subscriptionName1);
-
-        // when
-        management.subscription().remove(topic.getQualifiedName(), subscriptionName1);
-
-        // then
-        wait.untilSubscriptionMetricsIsRemoved(topic.getName(), subscriptionName1);
-
-        String subscriptionName2 = "subscription2";
-        operations.createSubscription(topic, subscriptionName2, remoteService.getUrl());
-        management.topic().publishMessage(topic.getQualifiedName(), TestMessage.simple().body());
-        wait.untilSubscriptionMetricsIsCreated(topic.getName(), subscriptionName2);
-        wait.untilSubscriptionMetricsIsRemoved(topic.getName(), subscriptionName1);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/FrontendAuthenticationConfigurationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/FrontendAuthenticationConfigurationTest.java
deleted file mode 100644
index e05de1949f..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/FrontendAuthenticationConfigurationTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package pl.allegro.tech.hermes.integration.auth;
-
-import io.undertow.util.StatusCodes;
-import jakarta.ws.rs.core.Response;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties;
-import pl.allegro.tech.hermes.frontend.server.HermesServer;
-import pl.allegro.tech.hermes.integration.IntegrationTest;
-import pl.allegro.tech.hermes.integration.env.FrontendStarter;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher;
-import pl.allegro.tech.hermes.test.helper.message.TestMessage;
-import pl.allegro.tech.hermes.test.helper.util.Ports;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-
-import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.KAFKA_BROKER_LIST;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.SCHEMA_REPOSITORY_SERVER_URL;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.ZOOKEEPER_CONNECTION_STRING;
-import static pl.allegro.tech.hermes.integration.auth.SingleUserAwareIdentityManager.getHeadersWithAuthentication;
-import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat;
-
-public class FrontendAuthenticationConfigurationTest extends IntegrationTest {
-
-    public static final int FRONTEND_PORT = Ports.nextAvailable();
-    public static final String FRONTEND_URL = "http://127.0.0.1:" + FRONTEND_PORT;
-
-    private static final Logger logger = LoggerFactory.getLogger(FrontendAuthenticationConfigurationTest.class);
-    private static String USERNAME;
-    private static String PASSWORD;
-    private static final String MESSAGE = TestMessage.of("hello", "world").body();
-
-    protected HermesPublisher publisher;
-    protected HermesServer hermesServer;
-
-    private FrontendStarter frontendStarter;
-
-    @BeforeClass
-    public void setup() throws Exception {
-        loadCredentials();
-        frontendStarter = new FrontendStarter(FRONTEND_PORT);
-        frontendStarter.addSpringProfiles("authRequired");
-        frontendStarter.overrideProperty(FrontendConfigurationProperties.FRONTEND_PORT, FRONTEND_PORT);
-        frontendStarter.overrideProperty(FRONTEND_SSL_ENABLED, false);
-        frontendStarter.overrideProperty(FRONTEND_AUTHENTICATION_ENABLED, true);
-        frontendStarter.overrideProperty(KAFKA_BROKER_LIST, kafkaClusterOne.getBootstrapServersForExternalClients());
-        frontendStarter.overrideProperty(ZOOKEEPER_CONNECTION_STRING, hermesZookeeperOne.getConnectionString());
-        frontendStarter.overrideProperty(SCHEMA_REPOSITORY_SERVER_URL, schemaRegistry.getUrl());
-
-        frontendStarter.start();
-
-        hermesServer = frontendStarter.instance().getBean(HermesServer.class);
-        publisher = new HermesPublisher(FRONTEND_URL);
-    }
-
-    @BeforeMethod
-    public void after() {
-        operations.buildTopic("someGroup", "topicWithAuthorization");
-    }
-
-    @AfterClass
-    public void tearDown() throws Exception {
-        frontendStarter.stop();
-    }
-
-    @Test
-    public void shouldAuthenticateUsingBasicAuth() {
-        //given
-        Map<String, String> headers = getHeadersWithAuthentication(USERNAME, PASSWORD);
-
-        //when
-        Response response = publisher.publish("someGroup.topicWithAuthorization", MESSAGE, headers);
-
-        //then
-        logger.info("Expecting SUCCESSFUL status. Actual {}", response.getStatusInfo().getStatusCode());
-        assertThat(response.getStatusInfo().getFamily()).isEqualTo(SUCCESSFUL);
-    }
-
-    @Test
-    public void shouldNotAuthenticateUserWithInvalidCredentials() {
-        //given
-        Map<String, String> headers = getHeadersWithAuthentication(USERNAME, "someInvalidPassword");
-
-        //when
-        Response response = publisher.publish("someGroup.topicWithAuthorization", MESSAGE, headers);
-
-        //then
-        assertThat(response.getStatus()).isEqualTo(StatusCodes.UNAUTHORIZED);
-    }
-
-    @Test
-    public void shouldNotAuthenticateUserWithoutCredentials() {
-        //when
-        Response response = publisher.publish("someGroup.topicWithAuthorization", MESSAGE);
-
-        //then
-        assertThat(response.getStatus()).isEqualTo(StatusCodes.UNAUTHORIZED);
-    }
-
-    private static void loadCredentials() throws IOException {
-        Properties properties = new Properties();
-        try {
-            properties.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("application-auth.properties"));
-        } catch (IOException e) {
-            throw new IOException("Failed to load 'application-auth.properties' file", e);
-        }
-        USERNAME = properties.getProperty("auth.username");
-        PASSWORD = properties.getProperty("auth.password");
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/SingleUserAwareIdentityManager.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/SingleUserAwareIdentityManager.java
deleted file mode 100644
index 1d9db23744..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/SingleUserAwareIdentityManager.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package pl.allegro.tech.hermes.integration.auth;
-
-import io.undertow.security.idm.Account;
-import io.undertow.security.idm.Credential;
-import io.undertow.security.idm.IdentityManager;
-import io.undertow.security.idm.PasswordCredential;
-import org.apache.commons.codec.binary.Base64;
-import pl.allegro.tech.hermes.frontend.server.auth.Roles;
-
-import java.nio.charset.StandardCharsets;
-import java.security.Principal;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-public class SingleUserAwareIdentityManager implements IdentityManager {
-
-    private final String username;
-    private final String password;
-
-    public SingleUserAwareIdentityManager(String username, String password) {
-        this.username = username;
-        this.password = password;
-    }
-
-    @Override
-    public Account verify(Account account) {
-        return null;
-    }
-
-    @Override
-    public Account verify(String username, Credential credential) {
-        String password = new String(((PasswordCredential) credential).getPassword());
-        if (this.username.equals(username) && this.password.equals(password)) {
-            return new SomeUserAccount(username);
-        }
-        return null;
-    }
-
-    @Override
-    public Account verify(Credential credential) {
-        return null;
-    }
-
-    private final class SomeUserAccount implements Account {
-
-        private final Principal principal;
-
-        private SomeUserAccount(String username) {
-            this.principal = new SomeUserPrincipal(username);
-        }
-
-        @Override
-        public Principal getPrincipal() {
-            return principal;
-        }
-
-        @Override
-        public Set<String> getRoles() {
-            return Collections.singleton(Roles.PUBLISHER);
-        }
-    }
-
-    private final class SomeUserPrincipal implements Principal {
-
-        private final String username;
-
-        private SomeUserPrincipal(String username) {
-            this.username = username;
-        }
-
-        @Override
-        public String getName() {
-            return username;
-        }
-    }
-
-    static Map<String, String> getHeadersWithAuthentication(String username, String password) {
-        String credentials = username + ":" + password;
-        String token = "Basic " + Base64.encodeBase64String(credentials.getBytes(StandardCharsets.UTF_8));
-
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Authorization", token);
-        return headers;
-    }
-}
\ No newline at end of file
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/TopicAuthorisationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/TopicAuthorisationTest.java
deleted file mode 100644
index 4e1869c2df..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/TopicAuthorisationTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package pl.allegro.tech.hermes.integration.auth;
-
-import io.undertow.util.StatusCodes;
-import jakarta.ws.rs.core.Response;
-import org.assertj.core.description.Description;
-import org.assertj.core.description.TextDescription;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties;
-import pl.allegro.tech.hermes.integration.IntegrationTest;
-import pl.allegro.tech.hermes.integration.env.FrontendStarter;
-import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher;
-import pl.allegro.tech.hermes.test.helper.message.TestMessage;
-import pl.allegro.tech.hermes.test.helper.util.Ports;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_MODE;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.KAFKA_BROKER_LIST;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.SCHEMA_REPOSITORY_SERVER_URL;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.ZOOKEEPER_CONNECTION_STRING;
-import static pl.allegro.tech.hermes.integration.auth.SingleUserAwareIdentityManager.getHeadersWithAuthentication;
-import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat;
-
-public class TopicAuthorisationTest extends IntegrationTest {
-
-    public static final int FRONTEND_PORT = Ports.nextAvailable();
-    public static final String FRONTEND_URL = "http://127.0.0.1:" + FRONTEND_PORT;
-
-    private static final String USERNAME = "someUser";
-    private static final String PASSWORD = "somePassword123";
-    private static final String MESSAGE = TestMessage.of("hello", "world").body();
-
-    private static final String USERNAME2 = "foobar";
-
-    protected HermesPublisher publisher;
-
-    private FrontendStarter frontendStarter;
-
-    @BeforeClass
-    public void setup() throws Exception {
-        frontendStarter = new FrontendStarter(FRONTEND_PORT);
-        frontendStarter.addSpringProfiles("authNonRequired");
-        frontendStarter.overrideProperty(FrontendConfigurationProperties.FRONTEND_PORT, FRONTEND_PORT);
-        frontendStarter.overrideProperty(FRONTEND_SSL_ENABLED, false);
-        frontendStarter.overrideProperty(FRONTEND_AUTHENTICATION_MODE, "pro_active");
-        frontendStarter.overrideProperty(FRONTEND_AUTHENTICATION_ENABLED, true);
-        frontendStarter.overrideProperty(KAFKA_BROKER_LIST, kafkaClusterOne.getBootstrapServersForExternalClients());
-        frontendStarter.overrideProperty(ZOOKEEPER_CONNECTION_STRING, hermesZookeeperOne.getConnectionString());
-        frontendStarter.overrideProperty(SCHEMA_REPOSITORY_SERVER_URL, schemaRegistry.getUrl());
-
-        frontendStarter.start();
-        publisher = new HermesPublisher(FRONTEND_URL);
-        operations.buildTopic("someGroup", "topicWithAuthorization");
-    }
-
-    @AfterClass
-    public void tearDown() throws Exception {
-        frontendStarter.stop();
-    }
-
-    @Test
-    public void shouldPublishWhenAuthenticated() {
-        // given
-        List<Topic> topics = Arrays.asList(
-                TopicBuilder.topic("disabled.authenticated")
-                        .build(),
-                TopicBuilder.topic("enabled.authenticated_1Publisher")
-                        .withPublisher(USERNAME)
-                        .withAuthEnabled()
-                        .build(),
-                TopicBuilder.topic("enabled.authenticated_2Publishers")
-                        .withPublisher(USERNAME)
-                        .withPublisher(USERNAME2)
-                        .withAuthEnabled()
-                        .build(),
-                TopicBuilder.topic("required.authenticated_1Publisher")
-                        .withPublisher(USERNAME)
-                        .withAuthEnabled()
-                        .withUnauthenticatedAccessDisabled()
-                        .build(),
-                TopicBuilder.topic("required.authenticated_2Publishers")
-                        .withPublisher(USERNAME)
-                        .withPublisher(USERNAME2)
-                        .withAuthEnabled()
-                        .withUnauthenticatedAccessDisabled()
-                        .build()
-        );
-
-        topics.forEach(operations::buildTopic);
-
-        Map<String, String> headers = getHeadersWithAuthentication(USERNAME, PASSWORD);
-
-        topics.forEach(topic -> {
-            // when
-            Response response = publisher.publish(topic.getQualifiedName(), MESSAGE, headers);
-
-            // then
-            assertThat(response.getStatusInfo().getFamily()).as(description(topic)).isEqualTo(SUCCESSFUL);
-        });
-    }
-
-    @Test
-    public void shouldPublishAsGuestWhenAuthIsNotRequired() {
-        // given
-        List<Topic> topics = Arrays.asList(
-                TopicBuilder.topic("disabled.guest")
-                        .build(),
-                TopicBuilder.topic("enabled.guest_0Publishers")
-                        .withAuthEnabled()
-                        .build(),
-                TopicBuilder.topic("enabled.guest_1Publisher")
-                        .withPublisher(USERNAME2)
-                        .withAuthEnabled()
-                        .build()
-        );
-
-        topics.forEach(operations::buildTopic);
-
-        topics.forEach(topic -> {
-            // when
-            Response response = publisher.publish(topic.getQualifiedName(), MESSAGE);
-
-            // then
-            assertThat(response.getStatusInfo().getFamily()).as(description(topic)).isEqualTo(SUCCESSFUL);
-        });
-    }
-
-    @Test
-    public void shouldNotPublishAsGuestWhenAuthIsRequired() {
-        // given
-        List<Topic> topics = Arrays.asList(
-                TopicBuilder.topic("required.guest_0Publishers")
-                        .withAuthEnabled()
-                        .withUnauthenticatedAccessDisabled()
-                        .build(),
-                TopicBuilder.topic("required.guest_1Publisher")
-                        .withPublisher(USERNAME2)
-                        .withAuthEnabled()
-                        .withUnauthenticatedAccessDisabled()
-                        .build()
-        );
-
-        topics.forEach(operations::buildTopic);
-
-        topics.forEach(topic -> {
-            // when
-            Response response = publisher.publish(topic.getQualifiedName(), MESSAGE);
-
-            // then
-            assertThat(response.getStatus()).as(description(topic)).isEqualTo(StatusCodes.FORBIDDEN);
-        });
-    }
-
-    @Test
-    public void shouldNotPublishWithoutPermissionWhenAuthenticated() {
-        // given
-        List<Topic> topics = Arrays.asList(
-                TopicBuilder.topic("enabled.authenticated_no_permission_0Publishers")
-                        .withAuthEnabled()
-                        .build(),
-                TopicBuilder.topic("enabled.authenticated_no_permission_1Publisher")
-                        .withPublisher(USERNAME2)
-                        .withAuthEnabled()
-                        .build(),
-                TopicBuilder.topic("required.authenticated_no_permission_0Publishers")
-                        .withAuthEnabled()
-                        .withUnauthenticatedAccessDisabled()
-                        .build(),
-                TopicBuilder.topic("required.authenticated_no_permission_1Publisher")
-                        .withPublisher(USERNAME2)
-                        .withAuthEnabled()
-                        .withUnauthenticatedAccessDisabled()
-                        .build()
-        );
-
-        topics.forEach(operations::buildTopic);
-
-        Map<String, String> headers = getHeadersWithAuthentication(USERNAME, PASSWORD);
-
-        topics.forEach(topic -> {
-            // when
-            Response response = publisher.publish(topic.getQualifiedName(), MESSAGE, headers);
-
-            // then
-            assertThat(response.getStatus()).as(description(topic)).isEqualTo(StatusCodes.FORBIDDEN);
-        });
-    }
-
-    private Description description(Topic topic) {
-        return new TextDescription("topic=%s", topic.getQualifiedName());
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/client/SlowClient.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/client/SlowClient.java
deleted file mode 100644
index 089103e1b6..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/client/SlowClient.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package pl.allegro.tech.hermes.integration.client;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class SlowClient {
-
-    public static final String HOST = "localhost";
-    public static final int PORT = 18080;
-    public static final String MSG_BODY = "{\"field\": \"value\"}";
-
-    public static String msgHeadWithContentLenght(String topicName) {
-        return "POST /topics/" + topicName + " HTTP/1.1\n"
-             + "Host: " + HOST + ":" + PORT + "\n"
-             + "Content-Type: application/json\n"
-             + "Content-Length: " + MSG_BODY.length() + "\r\n\r\n";
-    }
-
-    private static String msgHeadWithChunkedEncoding(String topicName) {
-        return "POST /topics/" + topicName + " HTTP/1.1\n"
-                + "Host: " + HOST + ":" + PORT + "\n"
-                + "Content-Type: application/json\n"
-                + "Transfer-Encoding: chunked \r\n\r\n";
-    }
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(SlowClient.class);
-
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
-
-    public String slowEvent(int clientTimeout, int pauseTimeBetweenChunks, int delayBeforeSendingFirstData, String topicName)
-            throws IOException, InterruptedException {
-        return slowEvent(clientTimeout, pauseTimeBetweenChunks, delayBeforeSendingFirstData, topicName, false);
-    }
-
-    public String slowEvent(int clientTimeout, int pauseTimeBetweenChunks, int delayBeforeSendingFirstData,
-                            String topicName, boolean chunkedEncoding)
-            throws IOException, InterruptedException {
-
-        Socket clientSocket = new Socket(HOST, PORT);
-
-        Thread.sleep(delayBeforeSendingFirstData);
-
-        DataOutputStream outToServer = new DataOutputStream(clientSocket.getOutputStream());
-        BufferedReader inFromServer = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
-
-        clientSocket.setSoTimeout(clientTimeout);
-
-        if (chunkedEncoding) {
-            outToServer.writeBytes(msgHeadWithChunkedEncoding(topicName));
-            outToServer.flush();
-        } else {
-            outToServer.writeBytes(msgHeadWithContentLenght(topicName));
-            outToServer.flush();
-        }
-        sendBodyInChunks(outToServer, MSG_BODY, pauseTimeBetweenChunks, chunkedEncoding);
-
-        String response;
-        try {
-            response = readResponse(inFromServer);
-            LOGGER.info("Response: {}", response);
-        } catch (SocketTimeoutException e) {
-            LOGGER.warn("client timeout");
-            clientSocket.close();
-            throw e;
-        }
-
-        clientSocket.close();
-
-        return response;
-    }
-
-    private void sendBodyInChunks(DataOutputStream outToServer, String msgBody, int pauseTime, boolean encoded) {
-        executor.execute(() -> {
-            try {
-                for (int index = 0; index < msgBody.length(); index++) {
-                    outToServer.writeBytes(prepareChunk(msgBody, index, encoded));
-                    outToServer.flush();
-                    LOGGER.info("Sent chunk");
-                    if (pauseTime > 0) {
-                        Thread.sleep(pauseTime);
-                    }
-                }
-                if (encoded) {
-                    outToServer.writeBytes("0\r\n\r\n");
-                    outToServer.flush();
-                    LOGGER.info("Finished chunked encoding");
-                }
-            } catch (SocketException e) {
-                LOGGER.warn("Socket closed");
-            } catch (InterruptedException | IOException e) {
-                LOGGER.error("Something went wrong while sending data", e);
-            }
-        });
-    }
-
-    private String prepareChunk(String msg, int index, boolean encoded) {
-        return encoded ? String.format("1\n%c\r\n", msg.charAt(index)) : String.valueOf(msg.charAt(index));
-    }
-
-    private String readResponse(BufferedReader bufferedReader) throws IOException {
-        String line;
-        StringBuilder response = new StringBuilder();
-
-        while (!(line = bufferedReader.readLine()).equals("")) {
-            response.append(line);
-        }
-
-        return response.toString();
-    }
-}
\ No newline at end of file
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/AuditEventMockStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/AuditEventMockStarter.java
deleted file mode 100644
index 6644314b41..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/AuditEventMockStarter.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import pl.allegro.tech.hermes.test.helper.environment.WireMockStarter;
-
-public class AuditEventMockStarter extends WireMockStarter implements EnvironmentAware {
-
-    public AuditEventMockStarter() {
-        super(AUDIT_EVENT_PORT);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/ConsumersStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/ConsumersStarter.java
deleted file mode 100644
index c2c0ee859c..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/ConsumersStarter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.context.ConfigurableApplicationContext;
-import pl.allegro.tech.hermes.consumers.HermesConsumers;
-import pl.allegro.tech.hermes.test.helper.environment.Starter;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties.CONSUMER_COMMIT_OFFSET_PERIOD;
-import static pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties.CONSUMER_COMMIT_OFFSET_QUEUES_INFLIGHT_DRAIN_FULL;
-import static pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties.CONSUMER_SSL_KEYSTORE_SOURCE;
-import static pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties.CONSUMER_SSL_TRUSTSTORE_SOURCE;
-import static pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties.CONSUMER_USE_TOPIC_MESSAGE_SIZE;
-import static pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties.SCHEMA_CACHE_ENABLED;
-
-public class ConsumersStarter implements Starter<ConfigurableApplicationContext> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConsumersStarter.class);
-    private final List<String> args;
-    private final SpringApplication application = new SpringApplication(HermesConsumers.class);
-    private ConfigurableApplicationContext applicationContext;
-
-    public ConsumersStarter() {
-        args = new ArrayList<>();
-        application.setWebApplicationType(WebApplicationType.NONE);
-    }
-
-    @Override
-    public void start() throws Exception {
-        LOGGER.info("Starting Hermes Consumers");
-        overrideProperty(SCHEMA_CACHE_ENABLED, true);
-        overrideProperty(CONSUMER_USE_TOPIC_MESSAGE_SIZE, true);
-        overrideProperty(CONSUMER_SSL_KEYSTORE_SOURCE, "provided");
-        overrideProperty(CONSUMER_SSL_TRUSTSTORE_SOURCE, "provided");
-        overrideProperty(CONSUMER_COMMIT_OFFSET_QUEUES_INFLIGHT_DRAIN_FULL, true);
-        overrideProperty(CONSUMER_COMMIT_OFFSET_PERIOD, "1s");
-        setSpringProfiles("integration");
-
-        applicationContext = application.run(args.toArray(new String[0]));
-    }
-
-    @Override
-    public ConfigurableApplicationContext instance() {
-        return this.applicationContext;
-    }
-
-    @Override
-    public void stop() throws Exception {
-        LOGGER.info("Stopping Hermes Consumers");
-        instance().close();
-    }
-
-    public void overrideProperty(String config, Object value) {
-        args.add("--" + config + "=" + value);
-    }
-
-    public void setSpringProfiles(String... profiles) {
-        String profilesString = Arrays.stream(profiles).collect(Collectors.joining(",", "", ""));
-        args.add("--spring.profiles.active=" + profilesString);
-    }
-
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/EnvironmentAware.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/EnvironmentAware.java
deleted file mode 100644
index cbc598a057..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/EnvironmentAware.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-public interface EnvironmentAware {
-
-    int HTTP_ENDPOINT_PORT = 18081;
-
-    int MANAGEMENT_PORT = 18082;
-
-    int CONSUMER_PORT = 8000;
-
-    String HTTP_ENDPOINT_URL = "http://localhost:" + HTTP_ENDPOINT_PORT + "/";
-
-    int FRONTEND_PORT = 18080;
-
-    String FRONTEND_URL = "http://localhost:" + FRONTEND_PORT + "/";
-
-    String FRONTEND_TOPICS_ENDPOINT = FRONTEND_URL + "topics";
-
-    String MANAGEMENT_ENDPOINT_URL = "http://localhost:" + MANAGEMENT_PORT + "/";
-
-    String CONSUMER_ENDPOINT_URL = "http://localhost:" + CONSUMER_PORT + "/";
-
-    int GRAPHITE_HTTP_SERVER_PORT = 18089;
-
-    int PROMETHEUS_HTTP_SERVER_PORT = 18090;
-
-    int GRAPHITE_SERVER_PORT = 18023;
-
-    int OAUTH_SERVER_PORT = 19999;
-
-    int AUDIT_EVENT_PORT = 19998;
-
-    String PRIMARY_KAFKA_CLUSTER_NAME = "primary-dc";
-
-    String SECONDARY_KAFKA_CLUSTER_NAME = "secondary";
-
-    String KAFKA_NAMESPACE = "itTest";
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/FrontendStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/FrontendStarter.java
deleted file mode 100644
index d844af4b25..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/FrontendStarter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.context.ConfigurableApplicationContext;
-import pl.allegro.tech.hermes.frontend.HermesFrontend;
-import pl.allegro.tech.hermes.test.helper.environment.Starter;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Duration.TEN_SECONDS;
-import static jakarta.ws.rs.core.Response.Status.OK;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_GRACEFUL_SHUTDOWN_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_MESSAGE_PREVIEW_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_MESSAGE_PREVIEW_LOG_PERSIST_PERIOD;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_PORT;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_THROUGHPUT_FIXED_MAX;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_THROUGHPUT_TYPE;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.SCHEMA_CACHE_ENABLED;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
-public class FrontendStarter implements Starter<ConfigurableApplicationContext> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(FrontendStarter.class);
-
-    private final int port;
-    private final List<String> args = new ArrayList<>();
-    private final List<String> profiles = new ArrayList<>();
-    private final SpringApplication application = new SpringApplication(HermesFrontend.class);
-    private ConfigurableApplicationContext applicationContext;
-    private OkHttpClient client;
-
-    public FrontendStarter(int port) {
-        application.setWebApplicationType(WebApplicationType.NONE);
-        this.port = port;
-        addSpringProfiles("integration");
-    }
-
-    private FrontendStarter(int port, List<String> args) {
-        this(port);
-        this.args.addAll(args);
-    }
-
-    public static FrontendStarter withCommonIntegrationTestConfig(int port) {
-        return new FrontendStarter(port, commonIntegrationTestConfig(port));
-    }
-
-    public static FrontendStarter withCommonIntegrationTestConfig(int port, boolean sslEnabled) {
-        List<String> args = commonIntegrationTestConfig(port);
-        args.add(getArgument(FRONTEND_SSL_ENABLED, sslEnabled));
-        return new FrontendStarter(port, args);
-    }
-
-    private static List<String> commonIntegrationTestConfig(int port) {
-        List<String> args = new ArrayList<>();
-        args.add(getArgument(FRONTEND_PORT, port));
-        args.add(getArgument(SCHEMA_CACHE_ENABLED, true));
-        args.add(getArgument(FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE, true));
-        args.add(getArgument(FRONTEND_THROUGHPUT_TYPE, "fixed"));
-        args.add(getArgument(FRONTEND_THROUGHPUT_FIXED_MAX, 50 * 1024L));
-        args.add(getArgument(FRONTEND_GRACEFUL_SHUTDOWN_ENABLED, false));
-        args.add(getArgument(FRONTEND_MESSAGE_PREVIEW_ENABLED, true));
-        args.add(getArgument(FRONTEND_MESSAGE_PREVIEW_LOG_PERSIST_PERIOD, "1s"));
-        return args;
-    }
-
-    @Override
-    public void start() throws Exception {
-        LOGGER.info("Starting Hermes Frontend");
-        client = new OkHttpClient();
-        setSpringProfilesArg();
-        applicationContext = application.run(args.toArray(new String[0]));
-        waitForStartup();
-    }
-
-    @Override
-    public void stop() throws Exception {
-        LOGGER.info("Stopping Hermes Frontend");
-        instance().close();
-    }
-
-    @Override
-    public ConfigurableApplicationContext instance() {
-        return applicationContext;
-    }
-
-    public void overrideProperty(String config, Object value) {
-        args.add("--" + config + "=" + value);
-    }
-
-    public void addSpringProfiles(String... profiles) {
-        String profilesString = Arrays.stream(profiles).collect(Collectors.joining(",", "", ""));
-        this.profiles.add(profilesString);
-    }
-
-    private void setSpringProfilesArg() {
-        String profilesString = profiles.stream().collect(Collectors.joining(",", "", ""));
-        args.add("--spring.profiles.active=" + profilesString);
-    }
-
-    private void waitForStartup() {
-        Request request = new Request.Builder()
-                .url("http://localhost:" + port + "/status/ping")
-                .build();
-
-        await().atMost(adjust(TEN_SECONDS)).until(() -> client.newCall(request).execute().code() == OK.getStatusCode());
-    }
-
-    private static String getArgument(String config, Object value) {
-        return "--" + config + "=" + value;
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/GraphiteHttpMockStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/GraphiteHttpMockStarter.java
deleted file mode 100644
index dd996a4ee6..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/GraphiteHttpMockStarter.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import pl.allegro.tech.hermes.test.helper.environment.WireMockStarter;
-
-public class GraphiteHttpMockStarter extends WireMockStarter implements EnvironmentAware {
-
-    public GraphiteHttpMockStarter() {
-        super(GRAPHITE_HTTP_SERVER_PORT);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/HermesIntegrationEnvironment.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/HermesIntegrationEnvironment.java
deleted file mode 100644
index acbca72bba..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/HermesIntegrationEnvironment.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.lifecycle.Startable;
-import org.testng.ITestContext;
-import org.testng.ITestNGMethod;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties;
-import pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties;
-import pl.allegro.tech.hermes.integration.setup.HermesManagementInstance;
-import pl.allegro.tech.hermes.test.helper.containers.ConfluentSchemaRegistryContainer;
-import pl.allegro.tech.hermes.test.helper.containers.GooglePubSubContainer;
-import pl.allegro.tech.hermes.test.helper.containers.KafkaContainerCluster;
-import pl.allegro.tech.hermes.test.helper.containers.ZookeeperContainer;
-import pl.allegro.tech.hermes.test.helper.environment.Starter;
-import pl.allegro.tech.hermes.test.helper.environment.WireMockStarter;
-import pl.allegro.tech.hermes.test.helper.retry.Retry;
-import pl.allegro.tech.hermes.test.helper.retry.RetryListener;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties.GOOGLE_PUBSUB_TRANSPORT_CHANNEL_PROVIDER_ADDRESS;
-import static pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider.DEFAULT_DC_NAME;
-
-@Listeners({RetryListener.class})
-public class HermesIntegrationEnvironment implements EnvironmentAware {
-
-    private static final Logger logger = LoggerFactory.getLogger(HermesIntegrationEnvironment.class);
-
-    private static final Map<Class<?>, Starter<?>> STARTERS = new LinkedHashMap<>();
-
-    public static final String DC1 = DEFAULT_DC_NAME;
-    public static final String DC2 = "dc2";
-    private static final int NUMBER_OF_BROKERS_PER_CLUSTER = 3;
-
-    public static final KafkaContainerCluster kafkaClusterOne = new KafkaContainerCluster(NUMBER_OF_BROKERS_PER_CLUSTER);
-    public static final KafkaContainerCluster kafkaClusterTwo = new KafkaContainerCluster(NUMBER_OF_BROKERS_PER_CLUSTER);
-    public static final ZookeeperContainer hermesZookeeperOne = new ZookeeperContainer("ZookeeperContainerOne");
-    public static final ZookeeperContainer hermesZookeeperTwo = new ZookeeperContainer();
-    public static final GooglePubSubContainer googlePubSubEmulator = new GooglePubSubContainer();
-    public static final ConfluentSchemaRegistryContainer schemaRegistry = new ConfluentSchemaRegistryContainer()
-            .withKafkaCluster(kafkaClusterOne);
-    public static HermesManagementInstance managementStarter;
-    private static CuratorFramework zookeeper;
-
-    static {
-        // set properties before any other test initialization
-        System.setProperty("zookeeper.sasl.client", "false");
-        System.setProperty(
-                "java.security.auth.login.config",
-                HermesIntegrationEnvironment.class.getClassLoader().getResource("kafka_server_jaas.conf").getPath()
-        );
-    }
-
-    static {
-        STARTERS.put(WireMockStarter.class, new WireMockStarter(HTTP_ENDPOINT_PORT));
-        STARTERS.put(GraphiteHttpMockStarter.class, new GraphiteHttpMockStarter());
-        STARTERS.put(PrometheusHttpMockStarter.class, new PrometheusHttpMockStarter());
-        STARTERS.put(OAuthServerMockStarter.class, new OAuthServerMockStarter());
-        STARTERS.put(AuditEventMockStarter.class, new AuditEventMockStarter());
-        STARTERS.put(JmsStarter.class, new JmsStarter());
-    }
-
-    @BeforeSuite
-    public void prepareEnvironment(ITestContext context) {
-        try {
-            Stream.of(kafkaClusterOne, kafkaClusterTwo, hermesZookeeperOne, hermesZookeeperTwo, googlePubSubEmulator)
-                    .parallel()
-                    .forEach(Startable::start);
-
-            schemaRegistry.start();
-
-            for (Starter<?> starter : STARTERS.values()) {
-                starter.start();
-            }
-
-            managementStarter = HermesManagementInstance.starter()
-                    .port(MANAGEMENT_PORT)
-                    .addKafkaCluster(DC1, kafkaClusterOne.getBootstrapServersForExternalClients())
-                    .addZookeeperCluster(DC1, hermesZookeeperOne.getConnectionString())
-                    .schemaRegistry(schemaRegistry.getUrl())
-                    .replicationFactor(kafkaClusterOne.getAllBrokers().size())
-                    .uncleanLeaderElectionEnabled(false)
-                    .start();
-            // Since we don't start a management instance for DC2 we need to create the root path manually.
-            initializeRootPathInZookeeperTwo();
-
-            zookeeper = startZookeeperClient(hermesZookeeperOne.getConnectionString());
-
-            ConsumersStarter consumersStarter = new ConsumersStarter();
-            consumersStarter.overrideProperty(ConsumerConfigurationProperties.KAFKA_AUTHORIZATION_ENABLED, false);
-            consumersStarter.overrideProperty(ConsumerConfigurationProperties.KAFKA_CLUSTER_NAME, PRIMARY_KAFKA_CLUSTER_NAME);
-            consumersStarter.overrideProperty(
-                    ConsumerConfigurationProperties.KAFKA_BROKER_LIST, kafkaClusterOne.getBootstrapServersForExternalClients()
-            );
-            consumersStarter.overrideProperty(
-                    ConsumerConfigurationProperties.ZOOKEEPER_CONNECTION_STRING, hermesZookeeperOne.getConnectionString()
-            );
-            consumersStarter.overrideProperty(ConsumerConfigurationProperties.SCHEMA_REPOSITORY_SERVER_URL, schemaRegistry.getUrl());
-            consumersStarter.overrideProperty(GOOGLE_PUBSUB_TRANSPORT_CHANNEL_PROVIDER_ADDRESS, googlePubSubEmulator.getEmulatorEndpoint());
-            consumersStarter.start();
-
-            FrontendStarter frontendStarter = FrontendStarter.withCommonIntegrationTestConfig(FRONTEND_PORT);
-            frontendStarter.overrideProperty(
-                    FrontendConfigurationProperties.KAFKA_BROKER_LIST, kafkaClusterOne.getBootstrapServersForExternalClients()
-            );
-            frontendStarter.overrideProperty(
-                    FrontendConfigurationProperties.ZOOKEEPER_CONNECTION_STRING, hermesZookeeperOne.getConnectionString()
-            );
-            frontendStarter.overrideProperty(FrontendConfigurationProperties.SCHEMA_REPOSITORY_SERVER_URL, schemaRegistry.getUrl());
-            frontendStarter.overrideProperty(FrontendConfigurationProperties.METRICS_GRAPHITE_REPORTER_ENABLED, true);
-            frontendStarter.overrideProperty(FrontendConfigurationProperties.GRAPHITE_PORT, 18023);
-            frontendStarter.start();
-
-            for (ITestNGMethod method : context.getAllTestMethods()) {
-                method.setRetryAnalyzerClass(Retry.class);
-            }
-
-            SharedServices.initialize(STARTERS, zookeeper);
-            logger.info("Environment was prepared");
-        } catch (Exception e) {
-            throw new RuntimeException("Exception during environment preparation", e);
-        }
-    }
-
-    private CuratorFramework startZookeeperClient(String connectString) {
-        final CuratorFramework zookeeperClient = CuratorFrameworkFactory.builder()
-                .connectString(connectString)
-                .retryPolicy(new ExponentialBackoffRetry(1000, 3))
-                .build();
-        zookeeperClient.start();
-        return zookeeperClient;
-    }
-
-    private void initializeRootPathInZookeeperTwo() throws Exception {
-        try (CuratorFramework curatorFramework = startZookeeperClient(hermesZookeeperTwo.getConnectionString())) {
-            curatorFramework.create().creatingParentsIfNeeded().forPath("/hermes/groups");
-        }
-    }
-
-    @AfterSuite(alwaysRun = true)
-    public void cleanEnvironment() throws Exception {
-        try {
-            ArrayList<Starter<?>> reversedStarters = new ArrayList<>(STARTERS.values());
-            Collections.reverse(reversedStarters);
-
-            for (Starter<?> starter : reversedStarters) {
-                starter.stop();
-            }
-            zookeeper.close();
-
-            System.clearProperty("zookeeper.sasl.client");
-            System.clearProperty("java.security.auth.login.config");
-
-            logger.info("Environment cleaned");
-        } catch (Exception e) {
-            logger.error("Exception during environment cleaning", e);
-        }
-    }
-
-    @Test
-    public void shouldTriggerBeforeAndAfterMethods() {
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/IntegrationTestKafkaNamesMapperFactory.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/IntegrationTestKafkaNamesMapperFactory.java
deleted file mode 100644
index 44d466672a..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/IntegrationTestKafkaNamesMapperFactory.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import pl.allegro.tech.hermes.common.kafka.JsonToAvroMigrationKafkaNamesMapper;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-
-public class IntegrationTestKafkaNamesMapperFactory {
-
-    private final String namespace;
-
-    public IntegrationTestKafkaNamesMapperFactory(String namespace) {
-        this.namespace = namespace;
-    }
-
-    public KafkaNamesMapper create() {
-        return new JsonToAvroMigrationKafkaNamesMapper(namespace, "_");
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/JmsStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/JmsStarter.java
deleted file mode 100644
index 11b7581436..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/JmsStarter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import org.hornetq.jms.server.embedded.EmbeddedJMS;
-import pl.allegro.tech.hermes.test.helper.environment.Starter;
-
-public class JmsStarter implements Starter<EmbeddedJMS> {
-
-    private EmbeddedJMS jmsServer;
-
-    @Override
-    public void start() throws Exception {
-        jmsServer = new EmbeddedJMS();
-        jmsServer.setConfigResourcePath("hornetq-configuration.xml");
-        jmsServer.start();
-    }
-
-    @Override
-    public void stop() throws Exception {
-        jmsServer.stop();
-    }
-
-    @Override
-    public EmbeddedJMS instance() {
-        return jmsServer;
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/OAuthServerMockStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/OAuthServerMockStarter.java
deleted file mode 100644
index 81e6762b7d..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/OAuthServerMockStarter.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import pl.allegro.tech.hermes.test.helper.environment.WireMockStarter;
-
-public class OAuthServerMockStarter extends WireMockStarter implements EnvironmentAware {
-
-    public OAuthServerMockStarter() {
-        super(OAUTH_SERVER_PORT);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/PrometheusHttpMockStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/PrometheusHttpMockStarter.java
deleted file mode 100644
index f38e595616..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/PrometheusHttpMockStarter.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import pl.allegro.tech.hermes.test.helper.environment.WireMockStarter;
-
-public class PrometheusHttpMockStarter extends WireMockStarter implements EnvironmentAware {
-
-    public PrometheusHttpMockStarter() {
-        super(PROMETHEUS_HTTP_SERVER_PORT);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SchemaRepoStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SchemaRepoStarter.java
deleted file mode 100644
index eec754aca2..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SchemaRepoStarter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import org.glassfish.jersey.internal.ServiceFinder;
-import org.schemarepo.config.Config;
-import org.schemarepo.server.RepositoryServer;
-import pl.allegro.tech.hermes.test.helper.environment.Starter;
-
-import java.util.Properties;
-
-public class SchemaRepoStarter implements Starter<RepositoryServer> {
-    private final int port;
-    private RepositoryServer repositoryServer;
-
-    public SchemaRepoStarter(int port) {
-        this.port = port;
-    }
-
-    public static void main(String[] args) throws Exception {
-        new SchemaRepoStarter(8888).start();
-    }
-
-    @Override
-    public void start() throws Exception {
-
-        // temporarily overriding Jersey's default ServiceIteratorProvider
-        // in order to filter out SpringComponentProvider (available in classpath)
-        // which tries to initialize custom application context from an XML file
-        ServiceFinder.setIteratorProvider(SpringlessServiceIteratorProvider.INSTANCE);
-
-        Properties properties = new Properties();
-        properties.put(Config.REPO_CLASS, "org.schemarepo.InMemoryRepository");
-        properties.put(Config.JETTY_PORT, port);
-        repositoryServer = new RepositoryServer(properties);
-        repositoryServer.start();
-
-        ServiceFinder.setIteratorProvider(null);
-    }
-
-    @Override
-    public void stop() throws Exception {
-        repositoryServer.stop();
-    }
-
-    @Override
-    public RepositoryServer instance() {
-        return repositoryServer;
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SharedServices.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SharedServices.java
deleted file mode 100644
index d2774da76c..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SharedServices.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-import org.apache.curator.framework.CuratorFramework;
-import org.assertj.core.api.Assertions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ConfigurableApplicationContext;
-import pl.allegro.tech.hermes.test.helper.environment.Starter;
-import pl.allegro.tech.hermes.test.helper.environment.WireMockStarter;
-
-import java.util.Map;
-
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-
-public final class SharedServices {
-
-    Logger logger = LoggerFactory.getLogger(SharedServices.class);
-
-    private static SharedServices services;
-
-    private final Map<Class<?>, Starter<?>> starters;
-    private final CuratorFramework zookeeper;
-
-
-    private SharedServices(Map<Class<?>, Starter<?>> starters, CuratorFramework zookeeper) {
-        this.starters = starters;
-        this.zookeeper = zookeeper;
-    }
-
-    public static void initialize(Map<Class<?>, Starter<?>> starters, CuratorFramework zookeeper) {
-        services = new SharedServices(starters, zookeeper);
-    }
-
-    public static SharedServices services() {
-        Assertions.assertThat(services).isNotNull();
-        return services;
-    }
-
-    public WireMockServer serviceMock() {
-        WireMockStarter wireMockStarter = new WireMockStarter(wireMockConfig().dynamicPort().portNumber());
-        try {
-            wireMockStarter.start();
-        } catch (Exception exception) {
-            logger.error("Error while starting wiremock server");
-        }
-        return wireMockStarter.instance();
-    }
-
-    public WireMockServer graphiteHttpMock() {
-        return ((WireMockStarter) starters.get(GraphiteHttpMockStarter.class)).instance();
-    }
-
-    public WireMockServer prometheusHttpMock() {
-        return ((WireMockStarter) starters.get(PrometheusHttpMockStarter.class)).instance();
-    }
-
-    public WireMockServer auditEventMock() {
-        return ((WireMockStarter) starters.get(AuditEventMockStarter.class)).instance();
-    }
-
-    public CuratorFramework zookeeper() {
-        return zookeeper;
-    }
-
-    public ConfigurableApplicationContext consumers() {
-        return ((ConsumersStarter) starters.get(ConsumersStarter.class)).instance();
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SpringlessServiceIteratorProvider.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SpringlessServiceIteratorProvider.java
deleted file mode 100644
index 2f017c22af..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/SpringlessServiceIteratorProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package pl.allegro.tech.hermes.integration.env;
-
-import org.glassfish.jersey.internal.ServiceFinder;
-import org.glassfish.jersey.server.spring.SpringComponentProvider;
-
-import java.util.Iterator;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.StreamSupport;
-
-final class SpringlessServiceIteratorProvider extends ServiceFinder.ServiceIteratorProvider {
-
-    static final SpringlessServiceIteratorProvider INSTANCE = new SpringlessServiceIteratorProvider();
-
-    private static final ServiceFinder.ServiceIteratorProvider DELEGATE = new ServiceFinder.DefaultServiceIteratorProvider();
-
-    private SpringlessServiceIteratorProvider() {
-    }
-
-    @Override
-    public <T> Iterator<T> createIterator(Class<T> service,
-                                          String serviceName,
-                                          ClassLoader loader,
-                                          boolean ignoreOnClassNotFound) {
-        Iterator<T> iterator = DELEGATE.createIterator(service, serviceName, loader, ignoreOnClassNotFound);
-        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
-                .filter(o -> !o.getClass().getCanonicalName().equals(SpringComponentProvider.class.getCanonicalName()))
-                .iterator();
-    }
-
-    @Override
-    public <T> Iterator<Class<T>> createClassIterator(Class<T> service,
-                                                      String serviceName,
-                                                      ClassLoader loader,
-                                                      boolean ignoreOnClassNotFound) {
-        return DELEGATE.createClassIterator(service, serviceName, loader, ignoreOnClassNotFound);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/AuditEventEndpoint.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/AuditEventEndpoint.java
deleted file mode 100644
index 4f0995453b..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/AuditEventEndpoint.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package pl.allegro.tech.hermes.integration.helper;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-import com.google.common.collect.Iterables;
-import pl.allegro.tech.hermes.integration.env.EnvironmentAware;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-
-public class AuditEventEndpoint implements EnvironmentAware {
-
-    private static final String AUDIT_EVENT_URL = "/audit-events";
-
-    private final List<LoggedRequest> receivedRequests = Collections.synchronizedList(new ArrayList<>());
-    private final WireMock auditEventListener;
-    private final WireMockServer service;
-
-    public AuditEventEndpoint(WireMockServer wireMockServer) {
-        this.auditEventListener = new WireMock("localhost", wireMockServer.port());
-        this.service = wireMockServer;
-
-        service.resetMappings();
-        service.resetRequests();
-        service.resetScenarios();
-
-        service.addMockServiceRequestListener((request, response) -> {
-            if (AUDIT_EVENT_URL.equals(request.getUrl())) {
-                receivedRequests.add(LoggedRequest.createFrom(request));
-            }
-        });
-
-        auditEventListener.register(post(urlEqualTo(AUDIT_EVENT_URL))
-                .willReturn(aResponse().withStatus(201)));
-    }
-
-    public LoggedRequest getLastRequest() {
-        synchronized (receivedRequests) {
-            return Iterables.getLast(receivedRequests);
-        }
-    }
-
-    public void reset() {
-        receivedRequests.clear();
-    }
-
-    public void stop() {
-        auditEventListener.shutdown();
-        service.shutdown();
-    }
-
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/ClientBuilderHelper.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/ClientBuilderHelper.java
deleted file mode 100644
index d2b71845cc..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/ClientBuilderHelper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package pl.allegro.tech.hermes.integration.helper;
-
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.Invocation;
-import jakarta.ws.rs.client.WebTarget;
-import pl.allegro.tech.hermes.integration.metadata.TraceContext;
-
-public class ClientBuilderHelper {
-
-    public static Invocation.Builder createRequestWithTraceHeaders(String uri, String topicName, TraceContext traceContext) {
-
-        WebTarget client = ClientBuilder.newClient().target(uri).path("topics").path(topicName);
-        return client.request()
-                .header("Trace-Id", traceContext.getTraceId())
-                .header("Span-Id", traceContext.getSpanId())
-                .header("Parent-Span-Id", traceContext.getParentSpanId())
-                .header("Trace-Sampled", traceContext.getTraceSampled())
-                .header("Trace-Reported", traceContext.getTraceReported());
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/GraphiteEndpoint.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/GraphiteEndpoint.java
deleted file mode 100644
index f3ea7c0461..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/GraphiteEndpoint.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package pl.allegro.tech.hermes.integration.helper;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-import static java.lang.String.format;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-
-public class GraphiteEndpoint {
-
-    private static final String TIMESTAMP = "1396860420";
-
-    private static final String TOPIC_RESPONSE
-            = "[ "
-            + "{\"target\": \"sumSeries(stats.tech.hermes.producer.*.meter.TOPIC.m1_rate)\", \"datapoints\": "
-            + "[[RATE, TIMESTAMP]]},"
-            + "{\"target\": \"sumSeries(stats.tech.hermes.consumer.*.meter.TOPIC.m1_rate)\", \"datapoints\": "
-            + "[[DELIVERY, TIMESTAMP]]}"
-            + "]";
-
-    private static final String TOPIC_URL_PATTERN = "/.*sumSeries%28stats.tech.hermes\\."
-            + "(consumer|producer)\\.%2A\\.meter\\.GROUP\\.TOPIC\\.m1_rate%29.*";
-
-    private final WireMock graphiteListener;
-
-    public GraphiteEndpoint(WireMockServer graphiteMock) {
-        this.graphiteListener = new WireMock("localhost", graphiteMock.port());
-    }
-
-    public void returnMetricForTopic(String group, String topic, int rate, int deliveryRate) {
-        String response = TOPIC_RESPONSE.replaceAll("TOPIC", group + "." + topic)
-                .replaceAll("RATE", Integer.toString(rate))
-                .replaceAll("DELIVERY", Integer.toString(deliveryRate))
-                .replaceAll("TIMESTAMP", TIMESTAMP);
-        String urlPattern = TOPIC_URL_PATTERN.replace("GROUP", group).replace("TOPIC", topic);
-        graphiteListener.register(get(urlMatching(urlPattern))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(response)));
-    }
-
-    public void returnMetric(SubscriptionMetricsStubDefinition metricsStubDefinition) {
-        graphiteListener.register(get(urlMatching(metricsStubDefinition.toUrlPattern()))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(metricsStubDefinition.toBody())));
-    }
-
-    public void returnMetricWithDelay(SubscriptionMetricsStubDefinition metricsStubDefinition, int responseDelayInMs) {
-        graphiteListener.register(get(urlMatching(metricsStubDefinition.toUrlPattern()))
-                .willReturn(aResponse()
-                        .withFixedDelay(responseDelayInMs)
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(metricsStubDefinition.toBody())));
-    }
-
-    private record GraphiteStubResponse(String target, List<List<Object>> datapoints) {
-    }
-
-    private record SubscriptionMetricsStubDefinition(String subscription, List<GraphiteStubResponse> responseBody) {
-
-        private String toUrlPattern() {
-                return "/.*sumSeries%28stats.tech.hermes\\.consumer\\.%2A\\.meter\\." + subscription + "\\.m1_rate%29.*";
-            }
-
-            private String toBody() {
-                try {
-                    return new ObjectMapper().writeValueAsString(responseBody);
-                } catch (JsonProcessingException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-
-    public static class SubscriptionMetricsStubDefinitionBuilder {
-        private final String subscription;
-        private final List<GraphiteStubResponse> response = new ArrayList<>();
-
-        private SubscriptionMetricsStubDefinitionBuilder(String subscription) {
-            this.subscription = subscription;
-        }
-
-        public SubscriptionMetricsStubDefinitionBuilder withRate(int rate) {
-            String target = "sumSeries(stats.tech.hermes.consumer.*.meter." + subscription + ".m1_rate)";
-            response.add(new GraphiteStubResponse(target, dataPointOf(rate)));
-            return this;
-        }
-
-        public SubscriptionMetricsStubDefinitionBuilder withStatusRate(int httpStatus, int rate) {
-            String statusFamily = httpStatusFamily(httpStatus);
-            String target = "sumSeries(stats.tech.hermes.consumer.*.status." + subscription + "." + statusFamily + ".m1_rate)";
-            response.add(new GraphiteStubResponse(target, dataPointOf(rate)));
-            return this;
-        }
-
-        public SubscriptionMetricsStubDefinition build() {
-            return new SubscriptionMetricsStubDefinition(subscription, response);
-        }
-
-        private String httpStatusFamily(int statusCode) {
-            return format("%dxx", statusCode / 100);
-        }
-
-        private static List<List<Object>> dataPointOf(int rate) {
-            return singletonList(asList(rate, TIMESTAMP));
-        }
-    }
-
-    public static SubscriptionMetricsStubDefinitionBuilder subscriptionMetricsStub(String subscription) {
-        return new SubscriptionMetricsStubDefinitionBuilder(subscription);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/PrometheusEndpoint.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/PrometheusEndpoint.java
deleted file mode 100644
index dd6b645f76..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/PrometheusEndpoint.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package pl.allegro.tech.hermes.integration.helper;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.integration.env.EnvironmentAware;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-
-public class PrometheusEndpoint {
-
-    private static final String TIMESTAMP = "1396860420";
-
-    private static final String TOPIC_REQUESTS_TOTAL = "hermes_frontend_topic_requests_total";
-    private static final String TOPIC_DELIVERED_TOTAL = "hermes_consumers_subscription_delivered_total";
-    private static final String TOPIC_THROUGHPUT_TOTAL = "hermes_frontend_topic_throughput_bytes_total";
-
-    private static final String SUBSCRIPTION_DELIVERED = "hermes_consumers_subscription_delivered_total";
-    private static final String SUBSCRIPTION_THROUGHPUT = "hermes_consumers_subscription_throughput_bytes_total";
-    private static final String SUBSCRIPTION_STATUS_CODES = "hermes_consumers_subscription_http_status_codes_total";
-
-    private static final String TOPIC_QUERY_PATTERN = ".*hermes_frontend_topic_requests_total"
-            + ".*hermes_consumers_subscription_delivered_total.*"
-            + ".*hermes_frontend_topic_throughput_bytes_total.*GROUP.*TOPIC.*";
-
-    private static final String SUBSCRIPTION_QUERY_PATTERN = ".*hermes_consumers_subscription_delivered_total"
-            + ".*hermes_consumers_subscription_timeouts_total"
-            + ".*hermes_consumers_subscription_throughput_bytes_total"
-            + ".*hermes_consumers_subscription_other_errors_total"
-            + ".*hermes_consumers_subscription_batches_total"
-            + ".*hermes_consumers_subscription_http_status_codes_total.*GROUP.*TOPIC.*SUBSCRIPTION.*";
-
-    private final ObjectMapper objectMapper;
-    private final WireMock prometheusListener;
-
-    public PrometheusEndpoint(WireMockServer prometheus) {
-        this.prometheusListener = new WireMock("localhost", prometheus.port());
-        this.objectMapper = new ObjectMapper();
-    }
-
-    public void returnTopicMetrics(Topic topic, PrometheusTopicResponse topicStub) {
-        String response = generateTopicsMetricsResponse(topicStub.topicRate, topicStub.deliveredRate, topicStub.throughput);
-        String query = TOPIC_QUERY_PATTERN
-                .replaceAll("GROUP", topic.getName().getGroupName())
-                .replaceAll("TOPIC", topic.getName().getName());
-        prometheusListener.register(get(urlMatching(query))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(response)));
-    }
-
-    public void returnSubscriptionMetrics(Topic topic, String subscription, PrometheusSubscriptionResponse stub) {
-        String response = generateSubscriptionResponse(stub);
-        String query = SUBSCRIPTION_QUERY_PATTERN
-                .replaceAll("GROUP", topic.getName().getGroupName())
-                .replaceAll("TOPIC", topic.getName().getName())
-                .replaceAll("SUBSCRIPTION", subscription);
-        prometheusListener.register(get(urlMatching(query))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(response)));
-    }
-
-    public void returnSubscriptionMetricsWithDelay(Topic topic, String subscription, PrometheusSubscriptionResponse stub,
-                                                   int prometheusDelay) {
-        String response = generateSubscriptionResponse(stub);
-        String query = SUBSCRIPTION_QUERY_PATTERN
-                .replaceAll("GROUP", topic.getName().getGroupName())
-                .replaceAll("TOPIC", topic.getName().getName())
-                .replaceAll("SUBSCRIPTION", subscription);
-        prometheusListener.register(get(urlMatching(query))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withFixedDelay(prometheusDelay)
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(response)));
-    }
-
-    public void returnServerErrorForAllTopics() {
-        String query = TOPIC_QUERY_PATTERN
-                .replaceAll("GROUP", "")
-                .replaceAll("TOPIC", "");
-        prometheusListener.register(get(urlMatching(query))
-                .willReturn(aResponse()
-                        .withStatus(500)
-                        .withHeader("Content-Type", "application/json")));
-    }
-
-    private String generateTopicsMetricsResponse(int rate, int deliveryRate, int throughput) {
-        return writeToString(
-                new PrometheusResponse(
-                        "success",
-                        new PrometheusResponse.Data(
-                                "vector",
-                                List.of(
-                                        new PrometheusResponse.Result(
-                                                new PrometheusResponse.MetricName(TOPIC_REQUESTS_TOTAL, null),
-                                                List.of(TIMESTAMP, String.valueOf(rate))),
-                                        new PrometheusResponse.Result(
-                                                new PrometheusResponse.MetricName(TOPIC_DELIVERED_TOTAL, null),
-                                                List.of(TIMESTAMP, String.valueOf(deliveryRate))),
-                                        new PrometheusResponse.Result(
-                                                new PrometheusResponse.MetricName(TOPIC_THROUGHPUT_TOTAL, null),
-                                                List.of(TIMESTAMP, String.valueOf(throughput))))
-                        )));
-    }
-
-    private String generateSubscriptionResponse(PrometheusSubscriptionResponse stub) {
-        List<PrometheusResponse.Result> results = new ArrayList<>();
-        results.add(
-                new PrometheusResponse.Result(
-                        new PrometheusResponse.MetricName(SUBSCRIPTION_DELIVERED, null),
-                        List.of(TIMESTAMP, String.valueOf(stub.rate)))
-        );
-        results.add(
-                new PrometheusResponse.Result(
-                        new PrometheusResponse.MetricName(SUBSCRIPTION_THROUGHPUT, null),
-                        List.of(TIMESTAMP, String.valueOf(stub.throughput))
-                )
-        );
-        stub.statusCodes().forEach(s -> results.add(
-                new PrometheusResponse.Result(
-                        new PrometheusResponse.MetricName(SUBSCRIPTION_STATUS_CODES, s.code()),
-                        List.of(TIMESTAMP, String.valueOf(s.rate)))));
-        PrometheusResponse response = new PrometheusResponse(
-                "success", new PrometheusResponse.Data("vector", results));
-        return writeToString(response);
-    }
-
-    String writeToString(Object o) {
-        try {
-            return objectMapper.writeValueAsString(o);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public record PrometheusTopicResponse(int topicRate, int deliveredRate, int throughput) {
-    }
-
-    public record PrometheusSubscriptionResponse(int rate, int throughput, List<SubscriptionStatusCode> statusCodes) {
-    }
-
-    public record SubscriptionStatusCode(String code, int rate) {
-    }
-
-    public static class PrometheusSubscriptionResponseBuilder {
-        private int rate = 0;
-        private int throughput = 0;
-        private final List<SubscriptionStatusCode> statusCodes = new ArrayList<>();
-
-        private PrometheusSubscriptionResponseBuilder() {
-        }
-
-        public static PrometheusSubscriptionResponseBuilder builder() {
-            return new PrometheusSubscriptionResponseBuilder();
-        }
-
-        public PrometheusSubscriptionResponseBuilder withRate(int rate) {
-            this.rate = rate;
-            return this;
-        }
-
-        public PrometheusSubscriptionResponseBuilder withThroughput(int throughput) {
-            this.throughput = throughput;
-            return this;
-        }
-
-        public PrometheusSubscriptionResponseBuilder withRatedStatusCode(String statusCode, int rate) {
-            this.statusCodes.add(new SubscriptionStatusCode(statusCode, rate));
-            return this;
-        }
-
-        public PrometheusSubscriptionResponse build() {
-            return new PrometheusSubscriptionResponse(rate, throughput, statusCodes);
-        }
-    }
-
-    record PrometheusResponse(@JsonProperty("status") String status,
-                              @JsonProperty("data") Data data) {
-
-        record Data(@JsonProperty("resultType") String resultType,
-                    @JsonProperty("result") List<Result> results) {
-        }
-
-        record Result(
-                @JsonProperty("metric") MetricName metricName,
-                @JsonProperty("value") List<String> values) {
-        }
-
-        @JsonInclude(JsonInclude.Include.NON_NULL)
-        record MetricName(
-                @JsonProperty(value = "__name__") String name,
-                @JsonProperty(value = "status_code") String statusCode
-        ) {
-        }
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/RemoteOAuthEndpoint.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/RemoteOAuthEndpoint.java
deleted file mode 100644
index de39f60d4a..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/RemoteOAuthEndpoint.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package pl.allegro.tech.hermes.integration.helper;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.http.Request;
-import com.github.tomakehurst.wiremock.http.RequestListener;
-import com.github.tomakehurst.wiremock.http.Response;
-import com.google.common.collect.ImmutableMap;
-import pl.allegro.tech.hermes.integration.env.EnvironmentAware;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-import static com.google.common.net.UrlEscapers.urlFormParameterEscaper;
-import static java.lang.String.format;
-
-public class RemoteOAuthEndpoint implements EnvironmentAware {
-
-    public static final String AUTHORIZATION_PATH = "/authorization/ad";
-
-    private final WireMock listener;
-
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    public RemoteOAuthEndpoint(WireMockServer wireMockServer) {
-        listener = new WireMock("localhost", wireMockServer.port());
-        wireMockServer.addMockServiceRequestListener(new RequestListener() {
-            @Override
-            public void requestReceived(Request request, Response response) {
-                System.out.println(request);
-            }
-        });
-    }
-
-    public void expectAdminAuthorizationAndAllow(String authToken, String rootGroupName) {
-        expectAuthorization(authToken, rootGroupName, true);
-    }
-
-    public void expectAdminAuthorizationAndDeny(String authToken, String rootGroupName) {
-        expectAuthorization(authToken, rootGroupName, false);
-    }
-
-    public void expectGroupAuthorizationAndAllow(String authToken, String groupName) {
-        expectAuthorization(authToken, groupName, true);
-    }
-
-    public void expectGroupAuthorizationAndDeny(String authToken, String groupName) {
-        expectAuthorization(authToken, groupName, false);
-    }
-
-    private void expectAuthorization(String authToken, String groupName, boolean result) {
-        listener.resetMappings();
-        listener.register(post(urlMatching(AUTHORIZATION_PATH))
-            .withRequestBody(containing(format("resources=%s&token=%s", urlFormParameterEscaper().escape(groupName), authToken)))
-            .willReturn(aResponse()
-                    .withStatus(200)
-                    .withHeader("Content-Type", "application/json")
-                    .withBody(body(groupName, result))));
-    }
-
-    private String body(String rootGroupName, boolean result) {
-        try {
-            return objectMapper.writeValueAsString(ImmutableMap.of(rootGroupName, result));
-        } catch (JsonProcessingException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/Waiter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/Waiter.java
deleted file mode 100644
index 597ac63708..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/Waiter.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package pl.allegro.tech.hermes.integration.helper;
-
-import com.jayway.awaitility.Duration;
-import com.jayway.awaitility.core.ConditionFactory;
-import org.apache.curator.framework.CuratorFramework;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import pl.allegro.tech.hermes.api.ContentType;
-import pl.allegro.tech.hermes.api.EndpointAddress;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicName;
-import pl.allegro.tech.hermes.common.kafka.JsonToAvroMigrationKafkaNamesMapper;
-import pl.allegro.tech.hermes.common.kafka.KafkaNamesMapper;
-import pl.allegro.tech.hermes.consumers.config.ZookeeperProperties;
-import pl.allegro.tech.hermes.consumers.supervisor.process.RunningSubscriptionStatus;
-import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths;
-import pl.allegro.tech.hermes.test.helper.endpoint.BrokerOperations;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesEndpoints;
-
-import java.time.Clock;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.COMMIT;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.START;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.UPDATE_SUBSCRIPTION;
-import static pl.allegro.tech.hermes.consumers.supervisor.process.Signal.SignalType.UPDATE_TOPIC;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
-public class Waiter extends pl.allegro.tech.hermes.test.helper.endpoint.Waiter {
-
-    private static final Logger logger = LoggerFactory.getLogger(Waiter.class);
-
-    private final HermesEndpoints endpoints;
-
-    private final CuratorFramework zookeeper;
-
-    private final BrokerOperations brokerOperations;
-
-    private final String clusterName;
-
-    private final ZookeeperPaths zookeeperPaths;
-
-    private final KafkaNamesMapper kafkaNamesMapper;
-
-    private final Clock clock = Clock.systemDefaultZone();
-
-    public Waiter(HermesEndpoints endpoints, CuratorFramework zookeeper, BrokerOperations brokerOperations,
-                  String clusterName, String kafkaNamespace) {
-        super(endpoints);
-        this.endpoints = endpoints;
-        this.zookeeper = zookeeper;
-        this.brokerOperations = brokerOperations;
-        this.clusterName = clusterName;
-        this.kafkaNamesMapper = new JsonToAvroMigrationKafkaNamesMapper(kafkaNamespace, "_");
-        ZookeeperProperties zookeeperProperties = new ZookeeperProperties();
-        this.zookeeperPaths = new ZookeeperPaths(zookeeperProperties.getRoot());
-    }
-
-    public void untilHermesZookeeperNodeCreation(final String path) {
-        untilZookeeperNodeCreation(path, zookeeper);
-    }
-
-    public void untilHermesZookeeperNodeDeletion(final String path) {
-        untilZookeeperNodeDeletion(path, zookeeper);
-    }
-
-    public void untilSubscriptionMetricsIsCreated(TopicName topicName, String subscriptionName) {
-        untilHermesZookeeperNodeCreation(zookeeperPaths.subscriptionMetricsPath(topicName, subscriptionName));
-    }
-
-    public void untilSubscriptionMetricsIsRemoved(TopicName topicName, String subscriptionName) {
-        untilZookeeperNodeDeletion(zookeeperPaths.subscriptionMetricsPath(topicName, subscriptionName), zookeeper);
-    }
-
-    public void untilSubscriptionIsActivated(long currentTime, Topic topic, String subscription) {
-        until(Duration.TEN_SECONDS, topic, subscription, sub -> sub.getSignalTimesheet().getOrDefault(START, 0L) > currentTime);
-    }
-
-    public void untilSubscriptionIsActivated(Topic topic, String subscription) {
-        untilSubscriptionIsActivated(clock.millis(), topic, subscription);
-    }
-
-    public void untilSubscriptionIsSuspended(Topic topic, String subscription) {
-        untilSubscriptionHasState(topic, subscription, Subscription.State.SUSPENDED);
-
-        waitAtMost(adjust(Duration.TEN_SECONDS)).until(() ->
-                endpoints.consumer().listSubscriptions().stream()
-                        .noneMatch(sub -> sub.getQualifiedName().equals(topic.getQualifiedName() + "$" + subscription)));
-    }
-
-    private void until(Duration duration, Topic topic, String subscription, Predicate<RunningSubscriptionStatus> predicate) {
-        waitAtMost(adjust(duration)).until(() ->
-                endpoints.consumer().listSubscriptions().stream()
-                        .filter(sub -> sub.getQualifiedName().equals(topic.getQualifiedName() + "$" + subscription))
-                        .anyMatch(predicate));
-    }
-
-    public void until(Runnable runnable) {
-        awaitAtMost(adjust(new Duration(30, TimeUnit.SECONDS))).until(runnable);
-    }
-
-    public void untilTopicIsUpdatedAfter(final long currentTime, Topic topic, String subscription) {
-        until(Duration.TEN_SECONDS, topic, subscription, sub ->
-                sub.getSignalTimesheet().getOrDefault(UPDATE_TOPIC, 0L) > currentTime);
-    }
-
-    public void untilConsumersUpdateSubscription(final long currentTime, Topic topic, String subscription) {
-        until(Duration.TEN_SECONDS, topic, subscription, sub ->
-                sub.getSignalTimesheet().getOrDefault(UPDATE_SUBSCRIPTION, 0L) > currentTime);
-    }
-
-    public void untilConsumerCommitsOffset(Topic topic, String subscription) {
-        long currentTime = clock.millis();
-        until(Duration.TEN_SECONDS, topic, subscription, sub ->
-                sub.getSignalTimesheet().getOrDefault(COMMIT, 0L) > currentTime);
-    }
-
-    private void untilSubscriptionHasState(Topic topic, String subscription, Subscription.State expected) {
-        waitAtMost(adjust(Duration.TEN_SECONDS)).until(() -> {
-            Subscription.State actual = endpoints.subscription().get(topic.getQualifiedName(), subscription).getState();
-            logger.info("Expecting {} subscription state. Actual {}", expected, actual);
-            return expected == actual;
-        });
-    }
-
-    public void untilSubscriptionContentTypeChanged(Topic topic, String subscription, ContentType expected) {
-        waitAtMost(adjust(Duration.TEN_SECONDS)).until(() -> {
-            ContentType actual = endpoints.subscription().get(topic.getQualifiedName(), subscription).getContentType();
-            logger.info("Expecting {} subscription endpoint address. Actual {}", expected, actual);
-            return expected.equals(actual);
-        });
-    }
-
-    public void untilSubscriptionEndpointAddressChanged(Topic topic, String subscription, EndpointAddress expected) {
-        waitAtMost(adjust(Duration.TEN_SECONDS)).until(() -> {
-            EndpointAddress actual = endpoints.subscription().get(topic.getQualifiedName(), subscription).getEndpoint();
-            logger.info("Expecting {} subscription endpoint address. Actual {}", expected, actual);
-            return expected.equals(actual);
-        });
-    }
-
-    public void untilSubscriptionEndsReiteration(Topic topic, String subscription) {
-        untilSubscriptionHasState(topic, subscription, Subscription.State.ACTIVE);
-    }
-
-    public void untilTopicRemovedInKafka(Topic topic) {
-        kafkaNamesMapper.toKafkaTopics(topic).forEach(k ->
-                brokerOperations.topicExists(k.name().asString(), clusterName)
-        );
-    }
-
-    public void untilTopicBlacklisted(String qualifiedTopicName) {
-        untilHermesZookeeperNodeCreation(zookeeperPaths.blacklistedTopicPath(qualifiedTopicName));
-    }
-
-    public void untilTopicUnblacklisted(String qualifiedTopicName) {
-        untilHermesZookeeperNodeDeletion(zookeeperPaths.blacklistedTopicPath(qualifiedTopicName));
-    }
-
-    private void untilZookeeperNodeCreation(final String path, final CuratorFramework zookeeper) {
-        waitAtMost(adjust(60), TimeUnit.SECONDS).until(() -> zookeeper.checkExists().forPath(path) != null);
-    }
-
-    private void untilZookeeperNodeDeletion(final String path, final CuratorFramework zookeeper) {
-        waitAtMost(adjust(Duration.FIVE_SECONDS)).until(() -> zookeeper.checkExists().forPath(path) == null);
-    }
-
-    public ConditionFactory awaitAtMost(Duration duration) {
-        return waitAtMost(adjust(duration));
-    }
-
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/CrowdOwnerSourceIntegrationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/CrowdOwnerSourceIntegrationTest.java
deleted file mode 100644
index a94d3e08af..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/CrowdOwnerSourceIntegrationTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package pl.allegro.tech.hermes.integration.management;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
-import jakarta.ws.rs.InternalServerErrorException;
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.ErrorCode;
-import pl.allegro.tech.hermes.api.Owner;
-import pl.allegro.tech.hermes.integration.IntegrationTest;
-import pl.allegro.tech.hermes.management.domain.owner.CrowdOwnerSource;
-
-import java.util.List;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-import static org.assertj.core.api.Assertions.catchThrowable;
-import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat;
-
-public class CrowdOwnerSourceIntegrationTest extends IntegrationTest {
-
-    private static final int SERVICE_PORT = 18222;
-
-    private static final String BASE_API_PATH = "/crowd/rest/usermanagement/1/search";
-
-    private String firstTeam = "Scrum A";
-
-    private String secondTeam = "Scrum B";
-
-    private WireMock wireMock;
-
-    private WireMockServer server;
-
-    @BeforeClass
-    public void initialize() {
-        wireMock = new WireMock("localhost", SERVICE_PORT);
-        server = new WireMockServer(SERVICE_PORT);
-        server.start();
-    }
-
-    @AfterClass
-    public void cleanUp() {
-        server.stop();
-    }
-
-    @Test
-    public void shouldCrowdServiceBeCalledOnce() {
-        //given
-        wireMock.register(get(urlMatching(BASE_API_PATH + ".*"))
-            .withHeader(HttpHeaders.ACCEPT, equalTo(MediaType.APPLICATION_JSON))
-            .willReturn(aResponse()
-                .withStatus(200)
-                .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                    .withBody(String.format("{ \"expand\": \"group\", \"groups\": [ %s,%s ]}",
-                            groupResponse("http://main/crowd/groupname/A", firstTeam),
-                            groupResponse("http://main/crowd/groupname/B", secondTeam)))));
-
-
-        //when
-        management.owner().search(CrowdOwnerSource.NAME, "Scrum");
-
-        //then
-        wireMock.verifyThat(1, getRequestedFor(urlMatching(BASE_API_PATH + ".*")));
-    }
-
-    @Test
-    public void shouldReturnTwoResultsFromCrowd() {
-        //given
-        wireMock.register(get(urlMatching(BASE_API_PATH + ".*"))
-                .withHeader(HttpHeaders.ACCEPT, equalTo(MediaType.APPLICATION_JSON))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody(String.format("{ \"expand\": \"group\", \"groups\": [ %s,%s ]}",
-                                groupResponse("http://main/crowd/groupname/A", firstTeam),
-                                groupResponse("http://main/crowd/groupname/B", secondTeam)))));
-
-
-        //when
-        List<Owner> groups = management.owner().search(CrowdOwnerSource.NAME, "Scrum");
-
-        //then
-        assertThat(groups.stream().map(Owner::getId)).containsExactly(firstTeam, secondTeam);
-    }
-
-    @Test
-    public void shouldReturnNoResultsFromCrowd() {
-        //given
-        wireMock.register(get(urlMatching(BASE_API_PATH + ".*"))
-                .withHeader(HttpHeaders.ACCEPT, equalTo(MediaType.APPLICATION_JSON))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody("{ \"expand\": \"group\", \"groups\": []}")));
-
-
-        //when
-        List<Owner> groups = management.owner().search(CrowdOwnerSource.NAME, "Non Matching");
-
-        //then
-        assertThat(groups).isEmpty();
-    }
-
-    @Test
-    public void shouldGetAnExceptionOnReadTimeout() {
-        //given
-        wireMock.register(get(urlMatching(BASE_API_PATH + ".*"))
-                .withHeader(HttpHeaders.ACCEPT, equalTo(MediaType.APPLICATION_JSON))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                        .withBody("{ \"expand\": \"group\", \"groups\": []}")
-                        .withFixedDelay(3500)));
-
-
-        //when
-        InternalServerErrorException e = (InternalServerErrorException) catchThrowable(
-                () -> management.owner().search(CrowdOwnerSource.NAME, "Non Matching")
-        );
-
-        //then
-        assertThat(e.getResponse()).hasErrorCode(ErrorCode.CROWD_GROUPS_COULD_NOT_BE_LOADED);
-    }
-
-    private String groupResponse(String path, String name) {
-        return String.format("{ \"link\": { \"href\": \"%s\", \"rel\": \"self\" }, \"name\": \"%s\"}", path, name);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/GroupManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/GroupManagementTest.java
deleted file mode 100644
index 55a5802255..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/GroupManagementTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package pl.allegro.tech.hermes.integration.management;
-
-import jakarta.ws.rs.core.Response;
-import org.assertj.core.api.Assertions;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.ErrorCode;
-import pl.allegro.tech.hermes.api.Group;
-import pl.allegro.tech.hermes.integration.IntegrationTest;
-import pl.allegro.tech.hermes.management.TestSecurityProvider;
-
-import java.util.stream.Stream;
-
-import static pl.allegro.tech.hermes.api.ErrorCode.GROUP_NAME_IS_INVALID;
-import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.group;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
-public class GroupManagementTest extends IntegrationTest {
-
-    @Test
-    public void shouldEmmitAuditEventWhenGroupCreated() {
-        //when
-        management.group().create(group("exampleGroup").build());
-
-        //then
-        assertThat(
-                auditEvents.getLastRequest().getBodyAsString()
-        ).contains("CREATED", "exampleGroup");
-    }
-
-    @Test
-    public void shouldEmmitAuditEventWhenGroupRemoved() {
-        //given
-        operations.createGroup("anotherExampleGroup");
-
-        //when
-        management.group().delete("anotherExampleGroup");
-
-        //then
-        assertThat(
-                auditEvents.getLastRequest().getBodyAsString()
-        ).contains("REMOVED", "anotherExampleGroup");
-    }
-
-    @Test
-    public void shouldEmmitAuditEventWhenGroupUpdated() {
-        //given
-        operations.createGroup("anotherOneExampleGroup");
-
-        //when
-        management.group().update("anotherOneExampleGroup", group("anotherOneExampleGroup").build());
-
-        //then
-        assertThat(
-                auditEvents.getLastRequest().getBodyAsString()
-        ).contains("UPDATED", "anotherOneExampleGroup");
-    }
-
-    @Test
-    public void shouldCreateGroup() {
-        // given when
-        Response response = management.group().create(group("groupToCreate").build());
-
-        // then
-        assertThat(response).hasStatus(Response.Status.CREATED);
-        Assertions.assertThat(management.group().list()).contains("groupToCreate");
-    }
-
-    @Test
-    public void shouldListGroups() {
-        // given
-        operations.createGroup("listGroupsGroup1");
-        operations.createGroup("listGroupsGroup2");
-
-        // when then
-        Assertions.assertThat(management.group().list()).containsOnlyOnce("listGroupsGroup1", "listGroupsGroup2");
-    }
-
-    @Test
-    void shouldCreateAndFetchGroupDetails() {
-        //given
-        Group group = group("groupWithDetails").build();
-        management.group().create(group);
-
-        //when
-        Group fetchedGroup = management.group().get(group.getGroupName());
-
-        //then
-        Assertions.assertThat(fetchedGroup).isEqualTo(group);
-    }
-
-    @Test
-    public void shouldReturnBadRequestStatusWhenAttemptToCreateGroupWithInvalidCharactersWasMade() {
-        // given
-        Group groupWithNameWithSpaces = group("group;` name with spaces").build();
-
-        // when
-        Response response = management.group().create(groupWithNameWithSpaces);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST).hasErrorCode(GROUP_NAME_IS_INVALID);
-    }
-
-    @Test
-    public void shouldRemoveGroup() {
-        // given
-        operations.createGroup("removeGroup");
-
-        // when
-        Response response = management.group().delete("removeGroup");
-
-        // then
-        assertThat(response).hasStatus(Response.Status.OK);
-        assertThat(management.group().list()).doesNotContain("removeGroup");
-    }
-
-    @Test
-    public void shouldAllowNonAdminUserToRemoveGroup() {
-        // given
-        TestSecurityProvider.setUserIsAdmin(false);
-        operations.createGroup("removeGroup");
-
-        // when
-        Response response = management.group().delete("removeGroup");
-
-        // then
-        assertThat(response).hasStatus(Response.Status.OK);
-        assertThat(management.group().list()).doesNotContain("removeGroup");
-
-        // cleanup
-        TestSecurityProvider.reset();
-    }
-
-    @Test
-    public void shouldNotAllowOnRemovingNonEmptyGroup() {
-        // given
-        operations.createGroup("removeNonemptyGroup");
-        operations.createTopic(topic("removeNonemptyGroup", "topic").build());
-
-        // when
-        Response response = management.group().delete("removeNonemptyGroup");
-
-        // then
-        assertThat(response).hasStatus(Response.Status.FORBIDDEN).hasErrorCode(ErrorCode.GROUP_NOT_EMPTY);
-    }
-
-    @Test
-    public void shouldNotAllowDollarSigns() {
-        Stream.of("$name", "na$me", "name$").forEach(name -> {
-            // when
-            Response response = management.group().create(group(name).build());
-
-            // then
-            assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-        });
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OfflineRetransmissionManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OfflineRetransmissionManagementTest.java
deleted file mode 100644
index c9fd00cc0c..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OfflineRetransmissionManagementTest.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package pl.allegro.tech.hermes.integration.management;
-
-import jakarta.ws.rs.core.Response;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest;
-import pl.allegro.tech.hermes.api.OfflineRetransmissionTask;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.integration.IntegrationTest;
-import pl.allegro.tech.hermes.management.TestSecurityProvider;
-import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder;
-
-import java.time.Instant;
-import java.util.List;
-
-import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat;
-
-public class OfflineRetransmissionManagementTest extends IntegrationTest {
-    private static final String GROUP = "pl.allegro.retransmission";
-
-    @BeforeClass
-    public void setupClass() {
-        operations.createGroup(GROUP);
-    }
-
-    @AfterMethod
-    public void cleanup() {
-        deleteTasks();
-    }
-
-    @Test
-    public void shouldCreateRetransmissionTask() {
-        // given
-        Topic sourceTopic = createTopic();
-        Topic targetTopic = createTopic();
-
-        operations.buildTopic(sourceTopic);
-        operations.buildTopic(targetTopic);
-
-        // when
-        OfflineRetransmissionRequest request = createRequest(
-                sourceTopic.getQualifiedName(),
-                targetTopic.getQualifiedName());
-        Response response = management.offlineRetransmission().createRetransmissionTask(request);
-        Instant now = Instant.now();
-
-        // then
-        assertThat(response).hasStatus(Response.Status.CREATED);
-
-        // and
-        List<OfflineRetransmissionTask> allTasks = management.offlineRetransmission().getAllTasks();
-        assertThat(allTasks.size()).isEqualTo(1);
-        assertThat(allTasks.get(0).getStartTimestamp()).isEqualTo(request.getStartTimestamp());
-        assertThat(allTasks.get(0).getEndTimestamp()).isEqualTo(request.getEndTimestamp());
-        assertThat(allTasks.get(0).getSourceTopic()).isEqualTo(request.getSourceTopic());
-        assertThat(allTasks.get(0).getTargetTopic()).isEqualTo(request.getTargetTopic());
-        assertThat(allTasks.get(0).getCreatedAt()).isBefore(now);
-    }
-
-
-    @Test
-    public void shouldReturnEmptyListIfThereAreNoTasks() {
-        // expect
-        assertThat(management.offlineRetransmission().getAllTasks().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void shouldReturnClientErrorWhenRequestingRetransmissionWithEmptyData() {
-        // when
-        OfflineRetransmissionRequest request = new OfflineRetransmissionRequest(
-                "",
-                "",
-                null,
-                null
-        );
-        Response response = management.offlineRetransmission().createRetransmissionTask(request);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-        assertThat(response).containsMessages(
-                "sourceTopic must not be empty",
-                "targetTopic must not be empty",
-                "startTimestamp must not be null",
-                "endTimestamp must not be null");
-    }
-
-    @Test
-    public void shouldReturnClientErrorWhenRequestingRetransmissionWithNotExistingSourceTopic() {
-        // given
-        Topic targetTopic = createTopic();
-
-        // when
-        OfflineRetransmissionRequest request = createRequest("not.existing.topic",
-                targetTopic.getQualifiedName());
-        Response response = management.offlineRetransmission().createRetransmissionTask(request);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-        assertThat(response).containsMessage("Source topic does not exist");
-    }
-
-    @Test
-    public void shouldReturnClientErrorWhenRequestingRetransmissionWithNotExistingTargetTopic() {
-        // given
-        Topic sourceTopic = createTopic();
-        operations.buildTopic(sourceTopic);
-
-        // when
-        OfflineRetransmissionRequest request = createRequest(
-                sourceTopic.getQualifiedName(), "not.existing.topic");
-        Response response = management.offlineRetransmission().createRetransmissionTask(request);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-        assertThat(response).containsMessage("Target topic does not exist");
-    }
-
-    @Test
-    public void shouldReturnClientErrorWhenRequestingRetransmissionWithNegativeTimeRange() {
-        // given
-        Topic sourceTopic = createTopic();
-        Topic targetTopic = createTopic();
-
-        operations.buildTopic(sourceTopic);
-        operations.buildTopic(targetTopic);
-
-        // when
-        OfflineRetransmissionRequest request = new OfflineRetransmissionRequest(
-                sourceTopic.getQualifiedName(),
-                targetTopic.getQualifiedName(),
-                Instant.now(),
-                Instant.now().minusSeconds(1));
-
-        Response response = management.offlineRetransmission().createRetransmissionTask(request);
-        assertThat(response).containsMessage("End timestamp must be greater than start timestamp");
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-    }
-
-    @Test
-    public void shouldReturnClientErrorWhenRequestingRetransmissionWithTargetTopicStoredOffline() {
-        // given
-        Topic sourceTopic = createTopic();
-        Topic targetTopic = TopicBuilder
-                .randomTopic(GROUP, "test")
-                .withOfflineStorage(1)
-                .build();
-
-        operations.buildTopic(sourceTopic);
-        operations.buildTopic(targetTopic);
-
-        // when
-        OfflineRetransmissionRequest request = createRequest(
-                sourceTopic.getQualifiedName(), targetTopic.getQualifiedName());
-
-        Response response = management.offlineRetransmission().createRetransmissionTask(request);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-        assertThat(response).containsMessage("Target topic must not be stored offline");
-    }
-
-
-    @Test
-    public void shouldDeleteRetransmissionTask() {
-        // given
-        Topic sourceTopic = createTopic();
-        Topic targetTopic = createTopic();
-
-        operations.buildTopic(sourceTopic);
-        operations.buildTopic(targetTopic);
-
-        OfflineRetransmissionRequest request = createRequest(
-                sourceTopic.getQualifiedName(), targetTopic.getQualifiedName());
-        management.offlineRetransmission().createRetransmissionTask(request);
-
-        List<OfflineRetransmissionTask> allTasks = management.offlineRetransmission().getAllTasks();
-        assertThat(allTasks.size()).isEqualTo(1);
-
-        // when
-        Response response = management.offlineRetransmission().deleteRetransmissionTask(allTasks.get(0).getTaskId());
-
-        // then
-        assertThat(response).hasStatus(Response.Status.OK);
-        assertThat(management.offlineRetransmission().getAllTasks().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void shouldReturnClientErrorWhenTryingToDeleteNotExistingRetransmissionTask() {
-        // when
-        Response response = management.offlineRetransmission().deleteRetransmissionTask("notExistingId");
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-        assertThat(response).containsMessage("Retransmission task with id notExistingId does not exist.");
-    }
-
-    @Test
-    public void shouldThrowAccessDeniedWhenTryingToCreateTaskWithoutPermissionsToSourceAndTargetTopics() {
-        // given
-        Topic sourceTopic = createTopic();
-        Topic targetTopic = createTopic();
-
-        operations.buildTopic(sourceTopic);
-        operations.buildTopic(targetTopic);
-
-        // when
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        OfflineRetransmissionRequest request = createRequest(
-                sourceTopic.getQualifiedName(), targetTopic.getQualifiedName());
-        Response response = management.offlineRetransmission().createRetransmissionTask(request);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.FORBIDDEN);
-        assertThat(response).containsMessage("User needs permissions to source and target topics");
-        assertThat(management.offlineRetransmission().getAllTasks().size()).isEqualTo(0);
-
-        // cleanup
-        TestSecurityProvider.reset();
-    }
-
-    private OfflineRetransmissionRequest createRequest(String sourceTopic, String targetTopic) {
-        return new OfflineRetransmissionRequest(
-                sourceTopic,
-                targetTopic,
-                Instant.now().minusSeconds(1),
-                Instant.now()
-        );
-    }
-
-    private void deleteTasks() {
-        management.offlineRetransmission().getAllTasks().forEach(task ->
-                management.offlineRetransmission().deleteRetransmissionTask(task.getTaskId()));
-    }
-
-    private Topic createTopic() {
-        return TopicBuilder
-                .randomTopic(GROUP, "test")
-                .build();
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ReadOnlyModeTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ReadOnlyModeTest.java
deleted file mode 100644
index 7d1d241e82..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ReadOnlyModeTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package pl.allegro.tech.hermes.integration.management;
-
-import jakarta.ws.rs.core.Response;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.Group;
-import pl.allegro.tech.hermes.integration.IntegrationTest;
-import pl.allegro.tech.hermes.management.TestSecurityProvider;
-import pl.allegro.tech.hermes.management.domain.mode.ModeService;
-
-import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.group;
-
-public class ReadOnlyModeTest extends IntegrationTest {
-
-    @BeforeMethod
-    public void initialize() {
-        TestSecurityProvider.setUserIsAdmin(true);
-        management.modeEndpoint().setMode(ModeService.READ_WRITE);
-    }
-
-    @AfterMethod
-    public void cleanup() {
-        TestSecurityProvider.setUserIsAdmin(true);
-    }
-
-    @Test
-    public void shouldAllowNonModifyingOperations() {
-        // given
-        management.modeEndpoint().setMode(ModeService.READ_WRITE);
-        String groupName = "allowed-group";
-
-        // when
-        Response response = createGroup(groupName);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.CREATED);
-    }
-
-    @Test
-    public void shouldRestrictModifyingOperationsForNonAdminUsers() {
-        // given
-        management.modeEndpoint().setMode(ModeService.READ_ONLY);
-        String groupName = "not-allowed-group";
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        // when
-        Response response = createGroup(groupName);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.SERVICE_UNAVAILABLE);
-    }
-
-    @Test
-    public void shouldNotRestrictModifyingOperationsForAdminUsers() {
-        // given
-        management.modeEndpoint().setMode(ModeService.READ_ONLY);
-        String groupName = "not-allowed-group";
-        TestSecurityProvider.setUserIsAdmin(true);
-
-        // when
-        Response response = createGroup(groupName);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.CREATED);
-    }
-
-    @Test
-    public void shouldSwitchModeBack() {
-        // given
-        management.modeEndpoint().setMode(ModeService.READ_ONLY);
-        String groupName = "not-allowed-at-first-group";
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        // when
-        Response response = createGroup(groupName);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.SERVICE_UNAVAILABLE);
-
-        // and
-        TestSecurityProvider.setUserIsAdmin(true);
-        management.modeEndpoint().setMode(ModeService.READ_WRITE);
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        // when
-        response = createGroup(groupName);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.CREATED);
-    }
-
-    public Response createGroup(String groupName) {
-        Group group = group(groupName).build();
-        return management.group().create(group);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SubscriptionManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SubscriptionManagementTest.java
deleted file mode 100644
index 16c8afcd7f..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SubscriptionManagementTest.java
+++ /dev/null
@@ -1,853 +0,0 @@
-package pl.allegro.tech.hermes.integration.management;
-
-import com.google.common.collect.ImmutableMap;
-import com.jayway.awaitility.Duration;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.core.GenericType;
-import jakarta.ws.rs.core.Response;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.api.ConsumerGroup;
-import pl.allegro.tech.hermes.api.ContentType;
-import pl.allegro.tech.hermes.api.DeliveryType;
-import pl.allegro.tech.hermes.api.EndpointAddress;
-import pl.allegro.tech.hermes.api.OwnerId;
-import pl.allegro.tech.hermes.api.PatchData;
-import pl.allegro.tech.hermes.api.Subscription;
-import pl.allegro.tech.hermes.api.SubscriptionHealth;
-import pl.allegro.tech.hermes.api.SubscriptionPolicy;
-import pl.allegro.tech.hermes.api.Topic;
-import pl.allegro.tech.hermes.api.TopicPartition;
-import pl.allegro.tech.hermes.api.TrackingMode;
-import pl.allegro.tech.hermes.client.HermesClient;
-import pl.allegro.tech.hermes.client.jersey.JerseyHermesSender;
-import pl.allegro.tech.hermes.consumers.config.KafkaProperties;
-import pl.allegro.tech.hermes.integration.IntegrationTest;
-import pl.allegro.tech.hermes.integration.env.SharedServices;
-import pl.allegro.tech.hermes.integration.helper.PrometheusEndpoint;
-import pl.allegro.tech.hermes.integration.helper.PrometheusEndpoint.PrometheusTopicResponse;
-import pl.allegro.tech.hermes.integration.shame.Unreliable;
-import pl.allegro.tech.hermes.management.TestSecurityProvider;
-import pl.allegro.tech.hermes.test.helper.endpoint.BrokerOperations.ConsumerGroupOffset;
-import pl.allegro.tech.hermes.test.helper.endpoint.RemoteServiceEndpoint;
-import pl.allegro.tech.hermes.test.helper.message.TestMessage;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static jakarta.ws.rs.client.ClientBuilder.newClient;
-import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
-import static jakarta.ws.rs.core.Response.Status.CREATED;
-import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;
-import static jakarta.ws.rs.core.Response.Status.OK;
-import static java.net.URI.create;
-import static pl.allegro.tech.hermes.api.PatchData.patchData;
-import static pl.allegro.tech.hermes.api.SubscriptionHealth.Status.UNHEALTHY;
-import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.malfunctioning;
-import static pl.allegro.tech.hermes.client.HermesClientBuilder.hermesClient;
-import static pl.allegro.tech.hermes.integration.helper.PrometheusEndpoint.PrometheusSubscriptionResponseBuilder.builder;
-import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic;
-
-public class SubscriptionManagementTest extends IntegrationTest {
-
-    public static final TestMessage MESSAGE = TestMessage.of("hello", "world");
-
-    private final Client httpClient = ClientBuilder.newClient();
-
-    private RemoteServiceEndpoint remoteService;
-    private HermesClient client;
-    private PrometheusEndpoint prometheusEndpoint;
-
-    @BeforeMethod
-    public void initializeAlways() {
-        remoteService = new RemoteServiceEndpoint(SharedServices.services().serviceMock());
-        client = hermesClient(new JerseyHermesSender(newClient())).withURI(create("http://localhost:" + FRONTEND_PORT)).build();
-        prometheusEndpoint = new PrometheusEndpoint(SharedServices.services().prometheusHttpMock());
-    }
-
-    @AfterMethod
-    public void cleanup() {
-        TestSecurityProvider.reset();
-    }
-
-    @Test
-    public void shouldEmmitAuditEventWhenSubscriptionCreated() {
-        //given
-        Topic topic = operations.buildTopic(randomTopic("subscribeGroup", "topic").build());
-
-        //when
-        management.subscription().create(topic.getQualifiedName(), subscription(topic, "someSubscription").build());
-
-        //then
-        assertThat(
-                auditEvents.getLastRequest().getBodyAsString()
-        ).contains("CREATED", "someSubscription");
-    }
-
-    @Test
-    public void shouldReturnSubscription() {
-        //given
-        Topic topic = operations.buildTopic(randomTopic("subscribeGroup", "topic").build());
-        String subName = "checkFieldSub";
-        operations.createSubscription(topic,
-                subscription(topic, subName)
-                        .build());
-
-        //when
-        Subscription subscription = management.subscription()
-                .get(topic.getQualifiedName(), subName);
-
-        //then
-        assertThat(subscription.getName()).isEqualTo(subName);
-        assertThat(subscription.isAutoDeleteWithTopicEnabled()).isFalse();
-        assertThat(subscription.getQualifiedTopicName()).isEqualTo(topic.getQualifiedName());
-        assertThat(subscription.isTrackingEnabled()).isFalse();
-    }
-
-    @Test
-    public void shouldEmmitAuditEventWhenSubscriptionRemoved() {
-        //given
-        Topic topic = operations.buildTopic(randomTopic("subscribeGroup2", "topic").build());
-        operations.createSubscription(topic, subscription(topic, "anotherSubscription").build());
-
-        //when
-        management.subscription().remove(topic.getQualifiedName(), "anotherSubscription");
-
-        //then
-        assertThat(
-                auditEvents.getLastRequest().getBodyAsString()
-        ).contains("REMOVED", "anotherSubscription");
-    }
-
-    @Test
-    public void shouldEmmitAuditEventWhenSubscriptionEndpointUpdated() {
-        //given
-        Topic topic = operations.buildTopic(randomTopic("subscribeGroup3", "topic").build());
-        operations.createSubscription(topic, subscription(topic, "anotherOneSubscription").build());
-
-        //when
-        management.subscription().update(topic.getQualifiedName(), "anotherOneSubscription",
-                patchData().set("endpoint", EndpointAddress.of(remoteService.getUrl())).build());
-
-        //then
-        assertThat(
-                auditEvents.getLastRequest().getBodyAsString()
-        ).contains("UPDATED", "anotherOneSubscription");
-    }
-
-    @Test
-    public void shouldCreateSubscriptionWithActiveStatus() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("subscribeGroup", "topic").build());
-
-        // when
-        Response response = management.subscription().create(
-                topic.getQualifiedName(),
-                subscription(topic.getQualifiedName(), "subscription").build()
-        );
-
-        // then
-        assertThat(response).hasStatus(Response.Status.CREATED);
-        wait.untilSubscriptionCreated(topic, "subscription", false);
-        assertThat(management.subscription().list(topic.getQualifiedName(), false)).containsExactly("subscription");
-        wait.untilSubscriptionIsActivated(topic, "subscription");
-    }
-
-    @Test
-    public void shouldNotRemoveSubscriptionAfterItsRecreation() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("subscribeGroup", "topic").build());
-        Subscription subscription = subscription(topic, "sub").build();
-        Response response = management.subscription().create(topic.getQualifiedName(), subscription);
-        assertThat(response).hasStatus(Response.Status.CREATED);
-
-        // when
-        Response errorResponse = management.subscription().create(topic.getQualifiedName(), subscription);
-
-        // then
-        assertThat(errorResponse).hasStatus(Response.Status.BAD_REQUEST);
-        assertThat(
-                management.subscription().get(topic.getQualifiedName(), subscription.getName()).getName()
-        ).isEqualTo("sub");
-    }
-
-    @Test
-    public void shouldNotCreateSubscriptionWithoutTopicName() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("invalidGroup", "topic").build());
-
-        // when
-        Response response = httpClient.target(MANAGEMENT_ENDPOINT_URL + "topics/" + topic.getQualifiedName() + "/subscriptions")
-                .request()
-                .post(Entity.json("{\"name\": \"subscription\"}"));
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-    }
-
-    @Test
-    public void shouldSuspendSubscription() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("suspendSubscriptionGroup", "topic").build());
-        operations.createSubscription(topic, "subscription", remoteService.getUrl());
-        wait.untilSubscriptionIsActivated(topic, "subscription");
-
-        // when
-        Response response = management.subscription().updateState(
-                topic.getQualifiedName(),
-                "subscription", Subscription.State.SUSPENDED);
-
-        // then
-        assertThat(response).hasStatus(Response.Status.OK);
-        wait.untilSubscriptionIsSuspended(topic, "subscription");
-    }
-
-    @Test
-    public void shouldUpdateSubscriptionEndpoint() {
-        //given
-        Topic topic = operations.buildTopic(randomTopic("updateSubscriptionEndpointAddressGroup", "topic").build());
-        operations.createSubscription(topic, "subscription", remoteService.getUrl().toString() + "v1/");
-        wait.untilSubscriptionIsActivated(topic, "subscription");
-
-        // when
-        Response response = management.subscription().update(
-                topic.getQualifiedName(),
-                "subscription",
-                patchData().set("endpoint", EndpointAddress.of(remoteService.getUrl())).build()
-        );
-
-        // then
-        assertThat(response).hasStatus(Response.Status.OK);
-        wait.untilSubscriptionEndpointAddressChanged(topic, "subscription", EndpointAddress.of(remoteService.getUrl()));
-
-        publishMessage(topic.getQualifiedName(), MESSAGE.body());
-        auditEvents.getLastRequest();
-    }
-
-    @Test
-    public void shouldUpdateSubscriptionPolicy() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("updateSubscriptionPolicy", "topic").build());
-        operations.createSubscription(topic, "subscription", remoteService.getUrl().toString() + "v1/");
-        wait.untilSubscriptionIsActivated(topic, "subscription");
-
-        PatchData patchData = patchData().set("subscriptionPolicy", ImmutableMap.builder()
-                .put("inflightSize", 100)
-                .put("messageBackoff", 100)
-                .put("messageTtl", 3600)
-                .put("rate", 300)
-                .put("requestTimeout", 1000)
-                .put("socketTimeout", 3000)
-                .put("retryClientErrors", false)
-                .put("sendingDelay", 1000)
-                .build()
-        ).build();
-
-        // when
-        Response response = management.subscription().update(
-                topic.getQualifiedName(),
-                "subscription",
-                patchData
-        );
-
-        // then
-        assertThat(response).hasStatus(Response.Status.OK);
-        SubscriptionPolicy policy = management.subscription().get(topic.getQualifiedName(), "subscription").getSerialSubscriptionPolicy();
-        assertThat(policy.getInflightSize()).isEqualTo(100);
-        assertThat(policy.getMessageBackoff()).isEqualTo(100);
-        assertThat(policy.getMessageTtl()).isEqualTo(3600);
-        assertThat(policy.getRate()).isEqualTo(300);
-        assertThat(policy.getRequestTimeout()).isEqualTo(1000);
-        assertThat(policy.getSocketTimeout()).isEqualTo(3000);
-        assertThat(policy.isRetryClientErrors()).isFalse();
-        assertThat(policy.getSendingDelay()).isEqualTo(1000);
-    }
-
-    @Test
-    public void shouldRemoveSubscription() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("removeSubscriptionGroup", "topic").build());
-        operations.createSubscription(topic, "subscription", remoteService.getUrl());
-
-        // when
-        Response response = management.subscription().remove(topic.getQualifiedName(), "subscription");
-
-        // then
-        assertThat(response).hasStatus(Response.Status.OK);
-        assertThat(management.subscription().list(topic.getQualifiedName(), false)).doesNotContain(
-                "subscription");
-    }
-
-    @Test
-    public void shouldMoveOffsetsToTheEnd() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("moveSubscriptionOffsets", "topic").build());
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription", remoteService.getUrl())
-                // prevents discarding messages and moving offsets
-                .withSubscriptionPolicy(SubscriptionPolicy.create(Map.of("messageTtl", 3600)))
-                .build();
-        management.subscription().create(subscription.getQualifiedTopicName(), subscription);
-        List<String> messages = List.of(MESSAGE.body(), MESSAGE.body(), MESSAGE.body(), MESSAGE.body());
-
-        // prevents from moving offsets during messages sending
-        remoteService.setReturnedStatusCode(503);
-        remoteService.expectMessages(messages);
-        publishMessages(topic.getQualifiedName(), messages);
-        remoteService.waitUntilReceived();
-
-        assertThat(allConsumerGroupOffsetsMovedToTheEnd(subscription)).isFalse();
-
-        management.subscription().remove(topic.getQualifiedName(), subscription.getName());
-
-        // when
-        wait.awaitAtMost(Duration.TEN_SECONDS)
-                .until(() -> management
-                        .subscription()
-                        .moveOffsetsToTheEnd(topic.getQualifiedName(), subscription.getName()).getStatus() == 200);
-
-        // then
-        assertThat(allConsumerGroupOffsetsMovedToTheEnd(subscription)).isTrue();
-    }
-
-    @Unreliable
-    @Test(enabled = false)
-    public void shouldGetEventStatus() {
-        // given
-        final Topic topic = operations.buildTopic(randomTopic("eventStatus", "topic").withContentType(ContentType.JSON)
-                .withTrackingEnabled(true).build());
-        final String clusterName = new KafkaProperties().getClusterName();
-
-        final Subscription subscription = subscription(topic.getQualifiedName(), "subscription", remoteService.getUrl())
-                .withTrackingMode(TrackingMode.TRACK_ALL)
-                .build();
-
-        operations.createSubscription(topic, subscription);
-
-        // when
-        String messageId = publishMessage(topic.getQualifiedName(), MESSAGE.body());
-        auditEvents.getLastRequest();
-
-        // then
-        await().atMost(30, TimeUnit.SECONDS).until(() -> getMessageTrace(topic.getQualifiedName(), "subscription", messageId).size() == 3);
-
-        List<Map<String, String>> traces = getMessageTrace(topic.getQualifiedName(), "subscription", messageId);
-        traces.forEach(entry -> assertThat(entry).containsEntry("messageId", messageId));
-        assertThat(traces.get(0)).containsEntry("status", "SUCCESS").containsKey("cluster");
-        assertThat(traces.get(1)).containsEntry("status", "INFLIGHT").containsKey("cluster");
-        assertThat(traces.get(2)).containsEntry("status", "SUCCESS").containsKey("cluster");
-        traces.forEach(trace -> assertThat(trace).containsEntry("cluster", clusterName));
-    }
-
-    @Test
-    public void shouldReturnSubscriptionsThatAreCurrentlyTrackedForGivenTopic() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("tracked", "topic").build());
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription", remoteService.getUrl())
-                .withTrackingMode(TrackingMode.TRACK_ALL).build();
-        operations.createSubscription(topic, subscription);
-        operations.createSubscription(topic, "sub2", remoteService.getUrl());
-
-        // when
-        List<String> tracked = management.subscription().list(topic.getQualifiedName(), true);
-
-        // then
-        assertThat(tracked).containsExactly(subscription.getName());
-    }
-
-    @Test
-    public void shouldReturnsTrackedAndNotSuspendedSubscriptionsForGivenTopic() {
-
-        // given
-        Topic topic = operations.buildTopic(randomTopic("queried", "topic").build());
-        operations.createSubscription(
-                topic, subscription(topic.getQualifiedName(), "sub1").withTrackingMode(TrackingMode.TRACK_ALL).build()
-        );
-        operations.createSubscription(
-                topic, subscription(topic.getQualifiedName(), "sub2").withTrackingMode(TrackingMode.TRACK_ALL).build()
-        );
-        operations.createSubscription(topic, subscription(topic.getQualifiedName(), "sub3").build());
-        operations.suspendSubscription(topic, "sub2");
-
-        // and
-        String query = "{\"query\": {\"trackingEnabled\": \"true\", \"state\": {\"ne\": \"SUSPENDED\"}}}";
-
-        // when
-        List<String> tracked = management.subscription().queryList(topic.getQualifiedName(), query);
-
-        // then
-        assertThat(tracked).containsExactly("sub1");
-    }
-
-    @Test
-    public void shouldNotAllowSubscriptionNameToContainDollarSign() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("dollar", "topic").build());
-
-        Stream.of("$name", "na$me", "name$").forEach(name -> {
-            // when
-            Response response = management.subscription().create(
-                    topic.getQualifiedName(), subscription(topic.getQualifiedName(), name).build()
-            );
-            // then
-            assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-        });
-    }
-
-    @Test
-    public void shouldReturnHealthyStatusForAHealthySubscription() {
-        // given
-        Topic topic = randomTopic("healthHealthy", "topic").build();
-        String subscriptionName = "subscription";
-
-        // and
-        operations.buildTopic(topic);
-        operations.createSubscription(topic, subscriptionName, remoteService.getUrl());
-        prometheusEndpoint.returnTopicMetrics(topic, new PrometheusTopicResponse(100, 100, 0));
-        prometheusEndpoint.returnSubscriptionMetrics(topic, subscriptionName, builder().withRate(100).build());
-
-        // when
-        SubscriptionHealth subscriptionHealth = management.subscription().getHealth(topic.getQualifiedName(), subscriptionName);
-
-        // then
-        assertThat(subscriptionHealth).isEqualTo(SubscriptionHealth.HEALTHY);
-    }
-
-    @Test
-    public void shouldReturnUnhealthyStatusWithAProblemForMalfunctioningSubscription() {
-        // given
-        Topic topic = randomTopic("healthUnhealthy", "topic").build();
-        String subscriptionName = "subscription";
-
-        // and
-        operations.buildTopic(topic);
-        operations.createSubscription(topic, subscriptionName, remoteService.getUrl());
-        prometheusEndpoint.returnTopicMetrics(topic, new PrometheusTopicResponse(100, 50, 0));
-        prometheusEndpoint.returnSubscriptionMetrics(topic, "subscription",
-                builder().withRate(50).withRatedStatusCode("500", 11).build());
-
-        // when
-        SubscriptionHealth subscriptionHealth = management.subscription().getHealth(topic.getQualifiedName(), subscriptionName);
-
-        // then
-        assertThat(subscriptionHealth.getStatus()).isEqualTo(UNHEALTHY);
-        assertThat(subscriptionHealth.getProblems()).containsOnly(malfunctioning(11, topic.getQualifiedName() + "$subscription"));
-    }
-
-    @Test
-    public void shouldReturnNoDataStatusWhenPrometheusRespondsWithAnError() {
-        // given
-        Topic topic = randomTopic("healthNoData", "topic").build();
-        String subscriptionName = "subscription";
-
-        // and
-        operations.buildTopic(topic);
-        operations.createSubscription(topic, subscriptionName, remoteService.getUrl());
-        prometheusEndpoint.returnServerErrorForAllTopics();
-        prometheusEndpoint.returnSubscriptionMetrics(topic, "subscription",
-                builder().withRate(100).build());
-
-        // when
-        SubscriptionHealth subscriptionHealth = management.subscription().getHealth(topic.getQualifiedName(), subscriptionName);
-
-        // then
-        assertThat(subscriptionHealth).isEqualTo(SubscriptionHealth.NO_DATA);
-    }
-
-    @Test
-    public void shouldNotAllowSubscriptionWithBatchDeliveryAndAvroContentType() {
-        // given
-        Topic topic = operations.buildTopic(randomTopic("subscribeGroup", "topic").build());
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withDeliveryType(DeliveryType.BATCH)
-                .withContentType(ContentType.AVRO)
-                .build();
-
-        // when
-        Response response = management.subscription().create(
-                topic.getQualifiedName(),
-                subscription
-        );
-
-        // then
-        assertThat(response).hasStatus(Response.Status.BAD_REQUEST);
-    }
-
-    @Test
-    public void shouldReturnConsumerGroupDescription() {
-        // given
-        String subscriptionName = "subscription";
-        Topic topic = operations.buildTopic(randomTopic("topicGroup", "test").build());
-        operations.createSubscription(topic, subscriptionName, remoteService.getUrl());
-
-        TestMessage message = TestMessage.of("hello", "world");
-        remoteService.expectMessages(message.body());
-        publisher.publish(topic.getQualifiedName(), message.body());
-        remoteService.waitUntilReceived();
-
-        // when
-        List<ConsumerGroup> response = management.subscription().describeConsumerGroups(
-                topic.getQualifiedName(), subscriptionName);
-
-        // then
-        wait.until(() -> {
-            assertThat(response.size()).isGreaterThan(0);
-            assertThat(response)
-                    .flatExtracting("members")
-                    .flatExtracting("partitions")
-                    .usingRecursiveFieldByFieldElementComparatorIgnoringFields("partition", "topic", "offsetMetadata", "contentType")
-                    .containsOnlyOnce(new TopicPartition(-1, "any", 0, 1, "any", topic.getContentType()));
-        });
-    }
-
-    @Test
-    public void shouldNotCreateSubscriptionNotOwnedByTheUser() {
-        // given
-        Topic topic = createTopic();
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withOwner(new OwnerId("Plaintext", "subscriptionOwner"))
-                .build();
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        // when
-        Response response = management.subscription().create(topic.getQualifiedName(), subscription);
-
-        // then
-        assertThat(response)
-                .hasStatus(BAD_REQUEST)
-                .containsMessage("Provide an owner that includes you, you would not be able to manage this subscription later");
-    }
-
-    @Test
-    public void shouldNotUpdateSubscriptionNotOwnedByTheUser() {
-        // given
-        Topic topic = createTopic();
-        Subscription subscription = operations.createSubscription(topic, "subscription", "http://localhost:8081/topics/test-topic");
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        // when
-        Response response = management.subscription().update(
-                topic.getQualifiedName(),
-                subscription.getName(),
-                patchData().set("endpoint", EndpointAddress.of("http://localhost:7777/topics/test-topic")).build()
-        );
-
-        // then
-        assertThat(response)
-                .hasStatus(BAD_REQUEST)
-                .containsMessage("Provide an owner that includes you, you would not be able to manage this subscription later");
-    }
-
-    @Test
-    public void shouldAllowAdminToBypassSubscribingRestrictions() {
-        // given
-        Topic topic = createTopicWithSubscribingRestricted();
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withEndpoint("http://localhost:8081/topics/test-topic")
-                .build();
-        TestSecurityProvider.setUserIsAdmin(true);
-
-        // when
-        Response createResponse = management.subscription().create(topic.getQualifiedName(), subscription);
-
-        // then
-        assertThat(createResponse).hasStatus(CREATED);
-
-        // when
-        Response updateResponse = management.subscription().update(
-                topic.getQualifiedName(),
-                subscription.getName(),
-                patchData().set("endpoint", EndpointAddress.of("http://localhost:7777/topics/test-topic")).build()
-        );
-
-        // then
-        assertThat(updateResponse).hasStatus(OK);
-    }
-
-    @Test
-    public void shouldAllowTopicOwnerToBypassSubscribingRestrictions() {
-        // given
-        Topic topic = createTopicWithSubscribingRestricted();
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withEndpoint("http://localhost:8081/topics/test-topic")
-                .build();
-        TestSecurityProvider.setUserIsAdmin(false);
-        TestSecurityProvider.setUserAsOwner(topic.getOwner(), subscription.getOwner());
-
-        // when
-        Response response = management.subscription().create(topic.getQualifiedName(), subscription);
-
-        // then
-        assertThat(response).hasStatus(CREATED);
-
-        // when
-        Response updateResponse = management.subscription().update(
-                topic.getQualifiedName(),
-                subscription.getName(),
-                patchData().set("endpoint", EndpointAddress.of("http://localhost:7777/topics/test-topic")).build()
-        );
-
-        // then
-        assertThat(updateResponse).hasStatus(OK);
-    }
-
-    @Test
-    public void shouldAllowPrivilegedSubscriberToBypassSubscribingRestrictions() {
-        // given
-        Topic topic = createTopicWithSubscribingRestricted();
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withOwner(new OwnerId("Plaintext", "subscriberAllowedToAccessAnyTopic"))
-                .withEndpoint("http://localhost:8081/topics/test-topic")
-                .build();
-        TestSecurityProvider.setUserIsAdmin(false);
-        TestSecurityProvider.setUserAsOwner(subscription.getOwner());
-
-        // when
-        Response response = management.subscription().create(topic.getQualifiedName(), subscription);
-
-        // then
-        assertThat(response).hasStatus(CREATED);
-
-        // when
-        Response updateResponse = management.subscription().update(
-                topic.getQualifiedName(),
-                subscription.getName(),
-                patchData().set("endpoint", EndpointAddress.of("http://localhost:7777/topics/test-topic")).build()
-        );
-
-        // then
-        assertThat(updateResponse).hasStatus(OK);
-    }
-
-    @Test
-    public void shouldRespectPrivilegedSubscriberProtocolsWhileCreatingSubscription() {
-        // given
-        Topic topic = createTopicWithSubscribingRestricted();
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withOwner(new OwnerId("Plaintext", "subscriberAllowedToAccessAnyTopic"))
-                .withEndpoint("googlepubsub://pubsub.googleapis.com:443/projects/test-project/topics/test-topic")
-                .build();
-        TestSecurityProvider.setUserIsAdmin(false);
-        TestSecurityProvider.setUserAsOwner(subscription.getOwner());
-
-        // when
-        Response response = management.subscription().create(topic.getQualifiedName(), subscription);
-
-        // then
-        assertThat(response)
-                .hasStatus(FORBIDDEN)
-                .containsMessage("Subscribing to this topic has been restricted. Contact the topic owner to create a new subscription.");
-    }
-
-    @Test
-    @SuppressWarnings("checkstyle:LineLengthCheck")
-    public void shouldRespectPrivilegedSubscriberProtocolsWhileUpdatingEndpoint() {
-        // given
-        Topic topic = createTopicWithSubscribingRestricted();
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withOwner(new OwnerId("Plaintext", "subscriberAllowedToAccessAnyTopic"))
-                .withEndpoint("http://localhost:8081/topics/test-topic")
-                .build();
-        operations.createSubscription(topic, subscription);
-        TestSecurityProvider.setUserIsAdmin(false);
-        TestSecurityProvider.setUserAsOwner(subscription.getOwner());
-
-        // when
-        Response response = management.subscription().update(
-                topic.getQualifiedName(),
-                subscription.getName(),
-                patchData().set(
-                        "endpoint", EndpointAddress.of("googlepubsub://pubsub.googleapis.com:443/projects/test-project/topics/test-topic")
-                ).build()
-        );
-
-        // then
-        assertThat(response)
-                .hasStatus(FORBIDDEN)
-                .containsMessage(
-                        "Subscribing to this topic has been restricted. Contact the topic owner to modify the endpoint of this subscription."
-                );
-    }
-
-    @Test
-    public void shouldNotAllowUnprivilegedUserToCreateSubscriptionWhenSubscribingIsRestricted() {
-        // given
-        Topic topic = createTopicWithSubscribingRestricted();
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withOwner(new OwnerId("Plaintext", "subscriptionOwner"))
-                .build();
-        TestSecurityProvider.setUserIsAdmin(false);
-        TestSecurityProvider.setUserAsOwner(subscription.getOwner());
-
-        // when
-        Response response = management.subscription().create(topic.getQualifiedName(), subscription);
-
-        // then
-        assertThat(response)
-                .hasStatus(FORBIDDEN)
-                .containsMessage("Subscribing to this topic has been restricted. Contact the topic owner to create a new subscription.");
-    }
-
-    @Test
-    @SuppressWarnings("checkstyle:LineLengthCheck")
-    public void shouldNotAllowUnprivilegedUserToUpdateEndpointWhenSubscribingIsRestricted() {
-        // given
-        Topic topic = createTopicWithSubscribingRestricted();
-        Subscription subscription = subscription(topic.getQualifiedName(), "subscription")
-                .withOwner(new OwnerId("Plaintext", "subscriptionOwner"))
-                .withEndpoint("http://localhost:8081/topics/test-topic")
-                .build();
-        operations.createSubscription(topic, subscription);
-        TestSecurityProvider.setUserIsAdmin(false);
-        TestSecurityProvider.setUserAsOwner(subscription.getOwner());
-
-        // when
-        Response response = management.subscription().update(
-                topic.getQualifiedName(),
-                subscription.getName(),
-                patchData().set("endpoint", EndpointAddress.of("http://localhost:7777/topics/test-topic")).build()
-        );
-
-        // then
-        assertThat(response)
-                .hasStatus(FORBIDDEN)
-                .containsMessage(
-                        "Subscribing to this topic has been restricted. Contact the topic owner to modify the endpoint of this subscription."
-                );
-    }
-
-    @Test
-    public void shouldSetInflightSizeToNullByDefault() {
-        // given
-        Topic topic = createTopic();
-        Subscription subscription = operations.createSubscription(topic, "subscription", "http://localhost:8081/topics/test-topic");
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        // when
-        Subscription response = management.subscription().get(
-                topic.getQualifiedName(),
-                subscription.getName()
-        );
-
-        // then
-        assertThat(response.getSerialSubscriptionPolicy().getInflightSize()).isNull();
-    }
-
-    @Test
-    public void shouldReturnInflightSizeWhenSetToNonNullValue() {
-        // given
-        Topic topic = createTopic();
-        Subscription subscription = operations.createSubscription(topic,
-                subscriptionWithInflight(topic, "subscription", 42)
-        );
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        // when
-        Subscription response = management.subscription().get(
-                topic.getQualifiedName(),
-                subscription.getName()
-        );
-
-        // then
-        assertThat(response.getSerialSubscriptionPolicy().getInflightSize()).isEqualTo(42);
-    }
-
-    @Test
-    public void shouldNotAllowNonAdminUserToSetInflightSize() {
-        // given
-        Topic topic = createTopic();
-        Subscription subscription = operations.createSubscription(topic, "subscription", "http://localhost:8081/topics/test-topic");
-        TestSecurityProvider.setUserIsAdmin(false);
-
-        PatchData patchData = patchData().set("subscriptionPolicy", ImmutableMap.builder()
-                .put("inflightSize", 100)
-                .build()
-        ).build();
-
-        // when
-        Response response = management.subscription().update(
-                topic.getQualifiedName(),
-                subscription.getName(),
-                patchData
-        );
-
-        //then
-        assertThat(response).hasStatus(BAD_REQUEST).containsMessage("Subscription.serialSubscriptionPolicy.inflightSize must be null");
-    }
-
-    @Test
-    public void shouldAllowAdminUserToSetInflightSize() {
-        // given
-        Topic topic = createTopic();
-        Subscription subscription = operations.createSubscription(topic, "subscription", "http://localhost:8081/topics/test-topic");
-        TestSecurityProvider.setUserIsAdmin(true);
-
-        PatchData patchData = patchData().set("subscriptionPolicy", ImmutableMap.builder()
-                .put("inflightSize", 100)
-                .build()
-        ).build();
-
-        // when
-        Response response = management.subscription().update(
-                topic.getQualifiedName(),
-                subscription.getName(),
-                patchData
-        );
-
-        //then
-        assertThat(response).hasStatus(OK);
-    }
-
-
-    private Topic createTopic() {
-        return operations.buildTopic(
-                randomTopic("group", "topic")
-                        .withOwner(new OwnerId("Plaintext", "topicOwner"))
-                        .build()
-        );
-    }
-
-    private Topic createTopicWithSubscribingRestricted() {
-        return operations.buildTopic(
-                randomTopic("restrictedGroup", "topic")
-                        .withSubscribingRestricted()
-                        .withOwner(new OwnerId("Plaintext", "topicOwner"))
-                        .build()
-        );
-    }
-
-    private static Subscription subscriptionWithInflight(Topic topic, String subscriptionName, Integer inflightSize) {
-        return subscription(topic, subscriptionName)
-                .withSubscriptionPolicy(
-                        SubscriptionPolicy.Builder.subscriptionPolicy()
-                                .withInflightSize(inflightSize)
-                                .build()
-                ).build();
-    }
-
-    private List<Map<String, String>> getMessageTrace(String topic, String subscription, String messageId) {
-        Response response = management.subscription().getMessageTrace(topic, subscription, messageId);
-        return response.readEntity(new GenericType<>() {
-        });
-    }
-
-    private void publishMessages(String topic, List<String> messages) {
-        messages.forEach(it -> publishMessage(topic, it));
-    }
-
-    private String publishMessage(String topic, String body) {
-        return client.publish(topic, body).join().getMessageId();
-    }
-
-    private boolean allConsumerGroupOffsetsMovedToTheEnd(Subscription subscription) {
-        List<ConsumerGroupOffset> partitionsOffsets = brokerOperations.getTopicPartitionsOffsets(subscription.getQualifiedName());
-        return !partitionsOffsets.isEmpty() && partitionsOffsets.stream().allMatch(ConsumerGroupOffset::movedToEnd);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/TopicManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/TopicManagementTest.java
deleted file mode 100644
index 98f44f06f8..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/TopicManagementTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package pl.allegro.tech.hermes.integration.management;
-
-import jakarta.ws.rs.core.Response;
-import org.assertj.core.api.Assertions;
-import org.testng.annotations.Test;
-import pl.allegro.tech.hermes.integration.IntegrationTest;
-
-import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema;
-import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat;
-import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic;
-
-public class TopicManagementTest extends IntegrationTest {
-
-    @Test
-    public void shouldCreateTopicEvenIfExistsInBrokers() {
-        // given
-        String groupName = "existingTopicFromExternalBroker";
-        String topicName = "topic";
-        String qualifiedTopicName = groupName + "." + topicName;
-
-        brokerOperations.createTopic(qualifiedTopicName);
-        operations.createGroup(groupName);
-
-        // when
-        Response response = management.topic().create(topicWithSchema(topic(groupName, topicName).build()));
-
-        // then
-        assertThat(response).hasStatus(Response.Status.CREATED);
-        Assertions.assertThat(management.topic().get(qualifiedTopicName)).isNotNull();
-    }
-
-    @Test
-    public void topicCreationRollbackShouldNotDeleteTopicOnBroker() throws Throwable {
-        // given
-        String groupName = "topicCreationRollbackShouldNotDeleteTopicOnBroker";
-        String topicName = "topic";
-        String qualifiedTopicName = groupName + "." + topicName;
-
-        brokerOperations.createTopic(qualifiedTopicName, PRIMARY_KAFKA_CLUSTER_NAME);
-        operations.createGroup(groupName);
-
-        // when
-        management.topic().create(topicWithSchema(topic(groupName, topicName).build()));
-
-        // then
-        assertThat(brokerOperations.topicExists(qualifiedTopicName, PRIMARY_KAFKA_CLUSTER_NAME)).isTrue();
-        assertThat(brokerOperations.topicExists(qualifiedTopicName, SECONDARY_KAFKA_CLUSTER_NAME)).isFalse();
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/metadata/TraceContext.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/metadata/TraceContext.java
deleted file mode 100644
index 95ee7b3453..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/metadata/TraceContext.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package pl.allegro.tech.hermes.integration.metadata;
-
-import com.google.common.collect.ImmutableMap;
-
-import java.util.Map;
-import java.util.UUID;
-
-public class TraceContext {
-
-    private final String traceId;
-    private final String spanId;
-    private final String parentSpanId;
-    private final String traceSampled;
-    private final String traceReported;
-
-    public TraceContext(String traceId, String spanId, String parentSpanId, String traceSampled, String traceReported) {
-        this.traceId = traceId;
-        this.spanId = spanId;
-        this.parentSpanId = parentSpanId;
-        this.traceSampled = traceSampled;
-        this.traceReported = traceReported;
-    }
-
-    public String getTraceId() {
-        return traceId;
-    }
-
-    public String getSpanId() {
-        return spanId;
-    }
-
-    public String getParentSpanId() {
-        return parentSpanId;
-    }
-
-    public String getTraceSampled() {
-        return traceSampled;
-    }
-
-    public String getTraceReported() {
-        return traceReported;
-    }
-
-    public Map<String, String> asMap() {
-
-        return ImmutableMap.<String, String>builder()
-                .put("Trace-Id", traceId)
-                .put("Span-Id", spanId)
-                .put("Parent-Span-Id", parentSpanId)
-                .put("Trace-Sampled", traceSampled)
-                .put("Trace-Reported", traceReported)
-                .build();
-    }
-
-    public static TraceContext random() {
-
-        return new Builder()
-                .withTraceId(UUID.randomUUID().toString())
-                .withSpanId(UUID.randomUUID().toString())
-                .withParentSpanId(UUID.randomUUID().toString())
-                .withTraceSampled("1")
-                .withTraceReported("0")
-                .build();
-    }
-
-    public static class Builder {
-
-        private String traceId;
-        private String spanId;
-        private String parentSpanId;
-        private String traceSampled;
-        private String traceReported;
-
-        public Builder withTraceId(String traceId) {
-            this.traceId = traceId;
-            return this;
-        }
-
-        public Builder withSpanId(String spanId) {
-            this.spanId = spanId;
-            return this;
-        }
-
-        public Builder withParentSpanId(String parentSpanId) {
-            this.parentSpanId = parentSpanId;
-            return this;
-        }
-
-        public Builder withTraceSampled(String traceSampled) {
-            this.traceSampled = traceSampled;
-            return this;
-        }
-
-        public Builder withTraceReported(String traceReported) {
-            this.traceReported = traceReported;
-            return this;
-        }
-
-        public TraceContext build() {
-            return new TraceContext(traceId, spanId, parentSpanId, traceSampled, traceReported);
-        }
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/metadata/TraceHeadersPropagator.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/metadata/TraceHeadersPropagator.java
deleted file mode 100644
index 53e537db88..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/metadata/TraceHeadersPropagator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package pl.allegro.tech.hermes.integration.metadata;
-
-import com.google.common.collect.ImmutableSet;
-import pl.allegro.tech.hermes.frontend.publishing.metadata.HeadersPropagator;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class TraceHeadersPropagator implements HeadersPropagator {
-
-    private static final Set<String> HEADERS = ImmutableSet.of(
-            "Trace-Id", "Span-Id", "Parent-Span-Id", "Trace-Sampled", "Trace-Reported");
-
-    @Override
-    public Map<String, String> extract(Map<String, String> headers) {
-        return headers.entrySet()
-                .stream()
-                .filter(entry -> HEADERS.contains(entry.getKey()))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesFrontendInstance.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesFrontendInstance.java
deleted file mode 100644
index c320442858..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesFrontendInstance.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package pl.allegro.tech.hermes.integration.setup;
-
-import jakarta.ws.rs.core.Response;
-import pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties;
-import pl.allegro.tech.hermes.integration.env.FrontendStarter;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher;
-import pl.allegro.tech.hermes.test.helper.endpoint.JerseyClientFactory;
-import pl.allegro.tech.hermes.test.helper.util.Ports;
-
-import static jakarta.ws.rs.core.Response.Status.OK;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_HTTP2_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_READINESS_CHECK_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_READINESS_CHECK_INTERVAL_SECONDS;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.METRICS_GRAPHITE_REPORTER_ENABLED;
-import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.METRICS_ZOOKEEPER_REPORTER_ENABLED;
-
-public class HermesFrontendInstance {
-    private final String frontendUrl;
-    private final FrontendStarter frontend;
-    private final HermesPublisher publisher;
-
-    HermesFrontendInstance(int port, FrontendStarter frontend) {
-        this.frontendUrl = "http://localhost:" + port + "/";
-        this.frontend = frontend;
-        this.publisher = new HermesPublisher(frontendUrl);
-    }
-
-    public static Starter starter() {
-        return new Starter();
-    }
-
-    public HermesPublisher operations() {
-        return publisher;
-    }
-
-    public boolean isHealthy() {
-        return checkStatus("health");
-    }
-
-    public boolean isReady() {
-        return checkStatus("ready");
-    }
-
-    private boolean checkStatus(String name) {
-        Response response = JerseyClientFactory.create().target(frontendUrl).path("status").path(name).request().get();
-        return response.getStatus() == OK.getStatusCode();
-    }
-
-    public void stop() {
-        try {
-            frontend.stop();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static class Starter {
-        private final int port = Ports.nextAvailable();
-        private final FrontendStarter frontend = FrontendStarter.withCommonIntegrationTestConfig(port, false);
-
-        public Starter() {
-            frontend.overrideProperty(FRONTEND_HTTP2_ENABLED, false);
-            frontend.overrideProperty(METRICS_GRAPHITE_REPORTER_ENABLED, false);
-            frontend.overrideProperty(METRICS_ZOOKEEPER_REPORTER_ENABLED, false);
-            frontend.overrideProperty(FRONTEND_READINESS_CHECK_ENABLED, true);
-        }
-
-        public Starter metadataMaxAgeInSeconds(int seconds) {
-            frontend.overrideProperty(FrontendConfigurationProperties.KAFKA_PRODUCER_METADATA_MAX_AGE, seconds + "s");
-            return this;
-        }
-
-        public Starter readinessCheckIntervalInSeconds(int seconds) {
-            frontend.overrideProperty(FRONTEND_READINESS_CHECK_INTERVAL_SECONDS, seconds + "s");
-            return this;
-        }
-
-        public Starter zookeeperConnectionString(String connectionString) {
-            frontend.overrideProperty(FrontendConfigurationProperties.ZOOKEEPER_CONNECTION_STRING, connectionString);
-            return this;
-        }
-
-        public Starter kafkaConnectionString(String connectionString) {
-            frontend.overrideProperty(FrontendConfigurationProperties.KAFKA_BROKER_LIST, connectionString);
-            return this;
-        }
-
-        public Starter kafkaCheckEnabled() {
-            frontend.overrideProperty(FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED, true);
-            return this;
-        }
-
-        public Starter kafkaCheckDisabled() {
-            frontend.overrideProperty(FRONTEND_READINESS_CHECK_KAFKA_CHECK_ENABLED, false);
-            return this;
-        }
-
-        public HermesFrontendInstance start() {
-            try {
-                frontend.start();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-            return new HermesFrontendInstance(port, frontend);
-        }
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesManagementInstance.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesManagementInstance.java
deleted file mode 100644
index efe817f15f..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesManagementInstance.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package pl.allegro.tech.hermes.integration.setup;
-
-import com.google.common.collect.ImmutableMap;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.retry.ExponentialBackoffRetry;
-import pl.allegro.tech.hermes.integration.helper.Waiter;
-import pl.allegro.tech.hermes.management.HermesManagement;
-import pl.allegro.tech.hermes.test.helper.endpoint.BrokerOperations;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesAPIOperations;
-import pl.allegro.tech.hermes.test.helper.endpoint.HermesEndpoints;
-import pl.allegro.tech.hermes.test.helper.util.Ports;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust;
-
-public class HermesManagementInstance {
-
-    private final HermesAPIOperations operations;
-
-    private HermesManagementInstance(HermesAPIOperations operations) {
-        this.operations = operations;
-    }
-
-    public HermesAPIOperations operations() {
-        return operations;
-    }
-
-    public static Starter starter() {
-        return new Starter();
-    }
-
-    public static class Starter {
-        private static final String KAFKA_NAMESPACE = "itTest";
-
-        private int port = Ports.nextAvailable();
-        private final List<ClusterInfo> kafkaClusters = new ArrayList<>();
-        private final List<ClusterInfo> zkClusters = new ArrayList<>();
-        private int replicationFactor = 1;
-        private boolean uncleanLeaderElectionEnabled = false;
-        private String schemaRegistry;
-        private boolean avroContentTypeMetadataRequired = true;
-        private boolean graphiteExternalMetricsStorage = false;
-
-        public Starter port(int port) {
-            this.port = port;
-            return this;
-        }
-
-        public Starter schemaRegistry(String schemaRegistry) {
-            this.schemaRegistry = schemaRegistry;
-            return this;
-        }
-
-
-        public Starter replicationFactor(int replicationFactor) {
-            this.replicationFactor = replicationFactor;
-            return this;
-        }
-
-        public Starter uncleanLeaderElectionEnabled(boolean enabled) {
-            this.uncleanLeaderElectionEnabled = enabled;
-            return this;
-        }
-
-        public Starter addZookeeperCluster(String dc, String connectionString) {
-            zkClusters.add(new ClusterInfo(dc, connectionString));
-            return this;
-        }
-
-        public Starter addKafkaCluster(String dc, String connectionString) {
-            kafkaClusters.add(new ClusterInfo(dc, connectionString));
-            return this;
-        }
-
-        public Starter withGraphiteExternalStorageEnabled() {
-            this.graphiteExternalMetricsStorage = true;
-            return this;
-        }
-
-        public HermesManagementInstance start() {
-            try {
-                startManagement();
-                HermesAPIOperations operations = setupOperations(startZookeeperClient());
-                waitUntilManagementIsInReadWriteMode(operations);
-                return new HermesManagementInstance(operations);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        private void waitUntilManagementIsInReadWriteMode(HermesAPIOperations operations) {
-            waitAtMost(adjust(240), TimeUnit.SECONDS).until(operations::isInReadWriteMode);
-        }
-
-        private void startManagement() {
-            List<String> args = new ArrayList<>();
-            args.add("--server.port=" + port);
-            args.add("--spring.profiles.active=integration");
-            int kafkaClusterIndex = 0;
-            for (ClusterInfo kafkaCluster : kafkaClusters) {
-                args.add("--kafka.clusters[" + kafkaClusterIndex + "].datacenter=" + kafkaCluster.getDc());
-                args.add("--kafka.clusters[" + kafkaClusterIndex + "].clusterName=primary");
-                args.add("--kafka.clusters[" + kafkaClusterIndex + "].bootstrapKafkaServer=" + kafkaCluster.getConnectionString());
-                args.add("--kafka.clusters[" + kafkaClusterIndex + "].namespace=" + KAFKA_NAMESPACE);
-                kafkaClusterIndex++;
-            }
-            int zkClusterIndex = 0;
-            for (ClusterInfo zkCluster : zkClusters) {
-                args.add("--storage.clusters[" + zkClusterIndex + "].datacenter=" + zkCluster.getDc());
-                args.add("--storage.clusters[" + zkClusterIndex + "].clusterName=zk");
-                args.add("--storage.clusters[" + zkClusterIndex + "].connectionString=" + zkCluster.getConnectionString());
-                zkClusterIndex++;
-            }
-            args.add("--topic.replicationFactor=" + replicationFactor);
-            args.add("--topic.uncleanLeaderElectionEnabled=" + uncleanLeaderElectionEnabled);
-            args.add("--topic.avroContentTypeMetadataRequired=" + avroContentTypeMetadataRequired);
-            args.add("--schema.repository.serverUrl=" + schemaRegistry);
-
-            args.add("--graphite.client.enabled=" + graphiteExternalMetricsStorage);
-            args.add("--prometheus.client.enabled=" + !graphiteExternalMetricsStorage);
-            HermesManagement.main(args.toArray(new String[0]));
-        }
-
-        private HermesAPIOperations setupOperations(CuratorFramework zookeeper) {
-            BrokerOperations brokerOperations = new BrokerOperations(ImmutableMap.of(), "");
-            String managementUrl = "http://localhost:" + port + "/";
-            HermesEndpoints management = new HermesEndpoints(managementUrl, managementUrl);
-            Waiter wait = new Waiter(management, zookeeper, brokerOperations, null, KAFKA_NAMESPACE);
-            return new HermesAPIOperations(management, wait);
-        }
-
-        private CuratorFramework startZookeeperClient() {
-            final CuratorFramework zookeeperClient = buildCuratorFramework(zkClusters.get(0).getConnectionString());
-            zookeeperClient.start();
-            return zookeeperClient;
-        }
-
-        private List<CuratorFramework> startSeparateZookeeperClientPerCluster() {
-            final List<CuratorFramework> zookeeperClients =
-                    zkClusters.stream()
-                            .map(ClusterInfo::getConnectionString)
-                            .map(this::buildCuratorFramework)
-                            .collect(Collectors.toList());
-            zookeeperClients.forEach(CuratorFramework::start);
-            return zookeeperClients;
-        }
-
-        private CuratorFramework buildCuratorFramework(String connectString) {
-            return CuratorFrameworkFactory.builder()
-                    .connectString(connectString)
-                    .retryPolicy(new ExponentialBackoffRetry(1000, 3))
-                    .build();
-        }
-    }
-
-    private static class ClusterInfo {
-        private final String dc;
-        private final String connectionString;
-
-        private ClusterInfo(String dc, String connectionString) {
-            this.dc = dc;
-            this.connectionString = connectionString;
-        }
-
-        public String getDc() {
-            return dc;
-        }
-
-        public String getConnectionString() {
-            return connectionString;
-        }
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/shame/Unreliable.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/shame/Unreliable.java
deleted file mode 100644
index 9fca60c91f..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/shame/Unreliable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package pl.allegro.tech.hermes.integration.shame;
-
-
-public @interface Unreliable {
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HermesAssertions.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HermesAssertions.java
deleted file mode 100644
index 3333c813f9..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HermesAssertions.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pl.allegro.tech.hermes.integration.test;
-
-import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-import com.google.pubsub.v1.PubsubMessage;
-import jakarta.ws.rs.core.Response;
-import org.assertj.core.api.Assertions;
-
-import javax.jms.Message;
-
-public final class HermesAssertions extends Assertions {
-
-    private HermesAssertions() {
-    }
-
-    public static HttpResponseAssertion assertThat(Response response) {
-        return new HttpResponseAssertion(response);
-    }
-
-    public static WiremockRequestAssertion assertThat(LoggedRequest request) {
-        return new WiremockRequestAssertion(request);
-    }
-
-    public static JmsMessageAssertion assertThat(Message message) {
-        return new JmsMessageAssertion(message);
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HttpResponseAssertion.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HttpResponseAssertion.java
deleted file mode 100644
index 3143fb18ca..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HttpResponseAssertion.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package pl.allegro.tech.hermes.integration.test;
-
-import jakarta.ws.rs.core.Response;
-import org.assertj.core.api.AbstractAssert;
-import pl.allegro.tech.hermes.api.ErrorCode;
-import pl.allegro.tech.hermes.api.ErrorDescription;
-
-import java.util.Arrays;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class HttpResponseAssertion extends AbstractAssert<HttpResponseAssertion, Response> {
-
-    HttpResponseAssertion(Response actual) {
-        super(actual, HttpResponseAssertion.class);
-    }
-
-    public HttpResponseAssertion hasStatus(Response.Status status) {
-        assertThat(actual.getStatus()).isEqualTo(status.getStatusCode());
-        return this;
-    }
-
-    public HttpResponseAssertion hasStatusFamily(Response.Status.Family statusFamily) {
-        assertThat(actual.getStatusInfo().getFamily()).isEqualTo(statusFamily);
-        return this;
-    }
-
-    public HttpResponseAssertion hasErrorCode(ErrorCode errorCode) {
-        ErrorDescription error = actual.readEntity(ErrorDescription.class);
-        assertThat(error).isNotNull();
-        assertThat(error.getCode()).isEqualTo(errorCode);
-        return this;
-    }
-
-    public HttpResponseAssertion containsMessage(String msg) {
-        assertThat(actual.readEntity(String.class)).contains(msg);
-        return this;
-    }
-
-    public HttpResponseAssertion containsMessages(String... messages) {
-        String responseBody = actual.readEntity(String.class);
-        assertThat(Arrays.stream(messages).allMatch(responseBody::contains)).isTrue();
-        return this;
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/JmsMessageAssertion.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/JmsMessageAssertion.java
deleted file mode 100644
index 7a5a7ad7f7..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/JmsMessageAssertion.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package pl.allegro.tech.hermes.integration.test;
-
-import org.assertj.core.api.AbstractAssert;
-import org.assertj.core.api.Fail;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class JmsMessageAssertion extends AbstractAssert<JmsMessageAssertion, Message> {
-
-    protected JmsMessageAssertion(Message actual) {
-        super(actual, JmsMessageAssertion.class);
-    }
-
-    public JmsMessageAssertion assertStringProperty(String name, String value) {
-        try {
-            assertThat(actual.getStringProperty(name)).isEqualTo(value);
-        } catch (JMSException e) {
-            Fail.fail("Could not access property", e);
-        }
-        return this;
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/WiremockRequestAssertion.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/WiremockRequestAssertion.java
deleted file mode 100644
index 0877051f6d..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/WiremockRequestAssertion.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package pl.allegro.tech.hermes.integration.test;
-
-import com.github.tomakehurst.wiremock.verification.LoggedRequest;
-import org.assertj.core.api.AbstractAssert;
-
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class WiremockRequestAssertion extends AbstractAssert<WiremockRequestAssertion, LoggedRequest> {
-
-    protected WiremockRequestAssertion(LoggedRequest actual) {
-        super(actual, WiremockRequestAssertion.class);
-    }
-
-    public WiremockRequestAssertion hasHeaderValue(String header, String value) {
-        assertThat(actual.getHeader(header)).isEqualTo(value);
-        return this;
-    }
-
-    public WiremockRequestAssertion containsAllHeaders(Map<String, String> headers) {
-        headers.forEach((header, value) -> {
-            assertThat(actual.getHeader(header)).isEqualTo(value);
-        });
-        return this;
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/management/JsonToAvroKafkaNamesMappersConfiguration.java b/integration/src/integration/java/pl/allegro/tech/hermes/management/JsonToAvroKafkaNamesMappersConfiguration.java
deleted file mode 100644
index bea8f9b8ae..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/management/JsonToAvroKafkaNamesMappersConfiguration.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package pl.allegro.tech.hermes.management;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import pl.allegro.tech.hermes.integration.env.IntegrationTestKafkaNamesMapperFactory;
-import pl.allegro.tech.hermes.management.config.kafka.KafkaClustersProperties;
-import pl.allegro.tech.hermes.management.config.kafka.KafkaNamesMappers;
-import pl.allegro.tech.hermes.management.config.kafka.MultipleDcKafkaNamesMappersFactory;
-
-@Configuration
-public class JsonToAvroKafkaNamesMappersConfiguration implements MultipleDcKafkaNamesMappersFactory {
-
-    @Autowired
-    KafkaClustersProperties kafkaClustersProperties;
-
-    @Bean
-    KafkaNamesMappers kafkaNameMappers() {
-        return createKafkaNamesMapper(kafkaClustersProperties, namespace ->
-                new IntegrationTestKafkaNamesMapperFactory(namespace).create());
-    }
-}
diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java b/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java
deleted file mode 100644
index 80553233f4..0000000000
--- a/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package pl.allegro.tech.hermes.management;
-
-import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.core.SecurityContext;
-import org.apache.commons.lang.NotImplementedException;
-import pl.allegro.tech.hermes.api.OwnerId;
-import pl.allegro.tech.hermes.management.api.auth.SecurityProvider;
-
-import java.security.Principal;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static java.util.stream.Collectors.toSet;
-
-public class TestSecurityProvider implements SecurityProvider {
-
-    private static volatile boolean userIsAdmin = true;
-    private static final Set<OwnerId> ownerIds = ConcurrentHashMap.newKeySet();
-
-    public static void setUserIsAdmin(boolean userIsAdmin) {
-        TestSecurityProvider.userIsAdmin = userIsAdmin;
-    }
-
-    public static void setUserAsOwner(OwnerId... ownerIds) {
-        TestSecurityProvider.ownerIds.addAll(Arrays.stream(ownerIds).collect(toSet()));
-    }
-
-    public static void reset() {
-        userIsAdmin = true;
-        ownerIds.clear();
-    }
-
-    @Override
-    public HermesSecurity security(ContainerRequestContext requestContext) {
-        return new HermesSecurity(securityContext(), ownerIds::contains);
-    }
-
-    private SecurityContext securityContext() {
-
-        return new SecurityContext() {
-            @Override
-            public Principal getUserPrincipal() {
-                return new TestUserPrincipal();
-            }
-
-            @Override
-            public boolean isUserInRole(String role) {
-                return checkRoles(role);
-            }
-
-            @Override
-            public boolean isSecure() {
-                throw new NotImplementedException();
-            }
-
-            @Override
-            public String getAuthenticationScheme() {
-                throw new NotImplementedException();
-            }
-        };
-    }
-
-    private boolean checkRoles(String role) {
-        if (role.equalsIgnoreCase("admin")) {
-            return userIsAdmin;
-        } else {
-            return true;
-        }
-    }
-
-    private static class TestUserPrincipal implements Principal {
-
-        @Override
-        public String getName() {
-            return "test-user";
-        }
-    }
-}
diff --git a/integration/src/integration/resources/application-auth.properties b/integration/src/integration/resources/application-auth.properties
deleted file mode 100644
index f37b006504..0000000000
--- a/integration/src/integration/resources/application-auth.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-auth.username=someUser
-auth.password=somePassword123
diff --git a/integration/src/integration/resources/kafka_server_jaas.conf b/integration/src/integration/resources/kafka_server_jaas.conf
deleted file mode 100644
index 53c00c134a..0000000000
--- a/integration/src/integration/resources/kafka_server_jaas.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-KafkaServer {
-  org.apache.kafka.common.security.plain.PlainLoginModule required
-  serviceName="SASL_PLAINTEXT"
-  username="admin"
-  password="admin-secret"
-  user_admin="admin-secret"
-  user_hermes="alice-secret";
-};
-Server {
-   org.apache.zookeeper.server.auth.DigestLoginModule required
-   username="admin"
-   password="admin"
-   user_admin="admin"
-   user_zooclient="admin";
-};
diff --git a/integration/src/integration/resources/server-test-only.pem b/integration/src/integration/resources/server-test-only.pem
deleted file mode 100644
index 53d6e89671..0000000000
--- a/integration/src/integration/resources/server-test-only.pem
+++ /dev/null
@@ -1,47 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAumYcFtCUib7X6HEuLwa9iNhbARofhSis73aoBe2IngR62/NK
-Q1oFsWRGR2liRH0XeXAOQwqqRnG7VBy8C+AMsT3Smk7Tfwk7/ReUfjrhc1kjcUf4
-SBJ2/JRFUA5DB5nW8htxlo/qAdq3Iv6RUBnYlR4lSGR8sH1zLUZ+GQVj3k6nU3+E
-zsdr3+PHPBiEqtnvjpee/Idt76ZIoZkC2eg/ecxci9X086fl0ySdFrvoJD5XoZc2
-aS+fDxebBSQElWcpIn5S7oGOtBd/ce8Yxj42gCIkkOp+IPua5Vy9pRW4Bwd9hGvb
-5aBW1UprxqyZ1VRgKXr8vOaLozQebE2Deq61NQIDAQABAoIBAQCAsjmYowC7rlGi
-QmrRu0SntEH5G9FBfhkQ6QsPtLZL6+nr7SmMIR6nIQXJDoDzqq7HgM/ICBgStTnS
-1Fgdlt8MjRPYyK4MGxMZJuu2z+6TVqs67qcFFAKlV7YXlRFAsT4QQVSG0OyPxTQG
-7F7mQEIiiwLQ3didfrBERVSQ8ADJHrQOgT9Nwl3SzHAqEZFRm+u/WYs/sswPYmEJ
-A68WkJ09dKJSJbcZUIMDG+J0SXv7HASYelsinqMty6zxJzyMzAMMWb6tJ1MMzusE
-G+yFzElx0FUClwfdElpAvjh+vlEJTw3gKLJJAI+Qs7y/lrQgNSPOO3s1jIjRR1R3
-59Njy2ftAoGBAPFrGxOPkYOfp5LVLd3LVXTtsDkqQ/uhk41PsmnI4/QZY0DO5RO7
-b2c1bJthLr1/ESP0Chd9EW+LizQXYVnHvJia/VLA46EMyduu7VkYwQQQ1iOIyTm8
-rNkeUuIkrw4iH4VJggMMnsnbOLHgkea2yPqg25LbHR97TB3hnxbN9f6fAoGBAMWo
-RfL2xdJQxsauf3SWZzdKWj+7rZniaCiq358c7u640oWPCPw+54y4+7aktYsR2PH0
-5jlpSZ6499o1aacHkvkrgF9fjm/MwbS9cKrxuHhbM9GglxyvswqbZh1Chm0zpGfe
-ub5n5RWMpl2FHSDfDEa7UCMVMt9CrsnU4P74e7+rAoGBAMoN7ZyChbSXNEZlW70N
-SJnTsbE2ma2KPxd/g4CcHYWYlgSQ5RONxaCpCxxEyzzYk7z2rFeaWrR0I27WvqjI
-ziUfWzQesqWBMZVHI+l1GV7QxJj7DAfhzPzvL0mMkGMQ1jbVHhZ1QpUJgLsHjLV/
-eFijtwKDly1ZIYzE4ETS3rdbAoGAadVPFugBRjqQJIP8pN1/iMBcEHIaYyIyaUwN
-DrI8UUBPIMpUolPAQb4usT4CIuO8iNl7iFQS4lTiCUm+N3w7uwUK6IZOyxgUxAUH
-VdC12GPlHCJjpy2ArXZFt/cN6VzUc/Vy+TvCEsbLsZl73kTv2tOi9hX8tkSLOHCu
-xHciM58CgYEA7GVuqPYynG9ftuMBNXLNz6D+tgDxgh3MGzFIbFGw2cPeOWRZ1l/S
-N/8DXoax/r8YoIriT+fj+AS5V9BAnM+Jg9Pt4WccbTHGFtdJUereE2zvrejBomhq
-5kWFD740ocQ5Dn4tultNOtm/hVljuP3FCO5EmvjsdJliLEPaDU4KdpE=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDMjCCAhqgAwIBAgIEUPqtaDANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJH
-QjEOMAwGA1UECBMFU3RhdGUxDTALBgNVBAcTBENpdHkxDDAKBgNVBAoTA09yZzEL
-MAkGA1UECxMCT1UxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMzAxMTkxNDI3NTJa
-Fw0yMzAxMTcxNDI3NTJaMFsxCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVTdGF0ZTEN
-MAsGA1UEBxMEQ2l0eTEMMAoGA1UEChMDT3JnMQswCQYDVQQLEwJPVTESMBAGA1UE
-AxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAumYc
-FtCUib7X6HEuLwa9iNhbARofhSis73aoBe2IngR62/NKQ1oFsWRGR2liRH0XeXAO
-QwqqRnG7VBy8C+AMsT3Smk7Tfwk7/ReUfjrhc1kjcUf4SBJ2/JRFUA5DB5nW8htx
-lo/qAdq3Iv6RUBnYlR4lSGR8sH1zLUZ+GQVj3k6nU3+Ezsdr3+PHPBiEqtnvjpee
-/Idt76ZIoZkC2eg/ecxci9X086fl0ySdFrvoJD5XoZc2aS+fDxebBSQElWcpIn5S
-7oGOtBd/ce8Yxj42gCIkkOp+IPua5Vy9pRW4Bwd9hGvb5aBW1UprxqyZ1VRgKXr8
-vOaLozQebE2Deq61NQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBjO2dTMzvq++zk
-Ee8AS5LXbahPbrUvGlSKGs+cU0o78ieJTBlt+8zTO8Gfh2gdcj1sLLEXAOSrVuqZ
-nB5hurlxVz9Nq9On3eEhzZMKiTOBJHm1XG05mb4WOwDK0u1rjcf/ctMmSXkaDSlH
-D1OX1NMXo1t9KifW8xdNSCPSbwgP4Ff3GMnOoiAjarcynd3X1CgeybwQQR39nIvK
-boEFB+kLwMbfbJ9Y76wtaJLHk5XYDRySFI8TE0ptt8NVHQNX3lDNdMwa3/OXTlMF
-7lRZvzjib/yRc4EkjtChz0Ai0Ydv6gAWLrRg40ScLDFo2FXGRANXiPBBkvZeohdA
-oFalnAXq
------END CERTIFICATE-----
diff --git a/integration/src/test/resources/application.yaml b/integration/src/test/resources/application.yaml
deleted file mode 100644
index 1635892834..0000000000
--- a/integration/src/test/resources/application.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-owner:
-  crowd:
-    enabled: true
-    path: http://localhost:18222/crowd
-    connect-timeout: 2000
-    socket-timeout: 2000
-
-application:
-  name: hermes-management
-
-zookeeper:
-  enabled: false
-
-kafka:
-  clusters:
-    -
-      datacenter: dc
-      clusterName: primary
-      connectionTimeout: 10000
-      namespace: 'itTest'
-
-topic:
-  replicationFactor: 1
-  partitions: 2
-  allowRemoval: true
-  removeSchema: true
-  defaultContentType: AVRO
-  allowedContentTypes:
-    - AVRO
-    - JSON
-  touchSchedulerEnabled: false
-  allowedTopicLabels:
-    - label-1
-    - label-2
-    - label-3
-
-storage:
-  pathPrefix: /hermes
-  clusters:
-    -
-      datacenter: dc
-      clusterName: zk
-      connectionString: localhost:14192
-
-auth:
-  oauthServerUrl: http://localhost:19999
-
-graphite:
-  client:
-    enabled: false
-    cacheTtlSeconds: 1
-    externalMonitoringUrl: http://localhost:18089/
-
-prometheus:
-  client:
-    enabled: true
-    cacheTtlSeconds: 1
-
-spring:
-  jersey:
-    type: filter
-
-management:
-  endpoints:
-    web:
-      base-path: /status
-
-spring.groovy.template.check-template-location: false
-
-schema.repository:
-  type: schema_registry
-  deleteSchemaPathSuffix:
-
-topicOwnerCache:
-  refreshRateInSeconds: 300 # 5 minutes
-
-subscriptionOwnerCache:
-  refreshRateInSeconds: 300
-
-consistencyChecker:
-  threadPoolSize: 2
-
-subscription-health:
-  timeoutMillis: 200
-
-audit:
-  isLoggingAuditEnabled: false
-  isEventAuditEnabled: true
-  eventUrl: "http://localhost:19998/audit-events"
-
-group:
-  nonAdminCreationEnabled: true
-  allowedGroupNameRegex: "[a-zA-Z0-9_.-]+"
-
-subscription:
-  subscribersWithAccessToAnyTopic:
-    - ownerSource: 'Plaintext'
-      ownerId: 'subscriberAllowedToAccessAnyTopic'
-      protocols:
-        - http
-
-frontend:
-  metrics:
-    metric-registry:
-      graphiteReporterEnabled: true
-
-consumer:
-  metrics:
-    metric-registry:
-      graphiteReporterEnabled: true
\ No newline at end of file
diff --git a/integration/src/test/resources/logback-test.xml b/integration/src/test/resources/logback-test.xml
deleted file mode 100644
index d649953e20..0000000000
--- a/integration/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.apache.zookeeper" level="warn" />
-    <logger name="kafka" level="warn" />
-    <logger name="org.apache.kafka" level="warn" />
-    <logger name="org.apache.kafka.common.network.Selector" level="error"/>
-    <logger name="org.apache.kafka.clients.consumer.internals.ConsumerCoordinator" level="OFF"/>
-    <logger name="org.eclipse.jetty.server.HttpChannel" level="error"/>
-    <logger name="pl.allegro.tech.hermes.consumers.supervisor.workload.selective.SelectiveWorkBalancer" level="warn" />
-    <logger name="pl.allegro.tech.hermes.consumers.supervisor.workload.BalancingJob" level="warn" />
-    <logger name="pl.allegro.tech.hermes.consumers.registry.ConsumerNodesRegistry" level="warn" />
-    <logger name="pl.allegro.tech.hermes.consumers.consumer.rate.maxrate.MaxRateCalculator" level="warn" />
-
-    <logger name="org.mortbay.log" level="info" />
-
-    <root level="info">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>
diff --git a/settings.gradle b/settings.gradle
index 4850a36723..a24e6975bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,6 @@ include 'hermes-common',
         'hermes-consumers',
         'hermes-api',
         'hermes-client',
-        'integration',
         'hermes-test-helper',
         'hermes-tracker',
         'hermes-metrics',